From 86089ed4cb7c294cda676947f5fc672c9561e4b3 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期四, 14 五月 2026 10:58:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_鹤壁_强信宇_pro' into dev_pro_河南鹤壁
---
src/main/resources/application-qxy.yml | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-qxy.yml
similarity index 90%
rename from src/main/resources/application-dev.yml
rename to src/main/resources/application-qxy.yml
index bda6bcf..a8e48d5 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-qxy.yml
@@ -1,3 +1,4 @@
+锘�
# 椤圭洰鐩稿叧閰嶇疆
ruoyi:
# 鍚嶇О
@@ -7,7 +8,7 @@
# 鐗堟潈骞翠唤
copyrightYear: 2025
# 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: D:/ruoyi/uploadPath
+ profile: /home/ruoyi/uploadPath
# 鑾峰彇ip鍦板潃寮�鍏�
addressEnabled: false
@@ -28,7 +29,7 @@
# 寮�鍙戠幆澧冮厤缃�
server:
# 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 7006
+ port: 7003
servlet:
# 搴旂敤鐨勮闂矾寰�
context-path: /
@@ -37,6 +38,9 @@
uri-encoding: UTF-8
# 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
accept-count: 1000
+ max-swallow-size: -1 # -1 琛ㄧず涓嶉檺鍒�
+ max-http-form-post-size: -1 # POST 璇锋眰浣撲笉闄愬埗
+ connection-timeout: 60000 # 杩炴帴瓒呮椂鏃堕棿(姣)
threads:
# tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
max: 800
@@ -74,9 +78,9 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
- url: jdbc:mysql://localhost:3306/product-inventory-management-new-pro?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://36.134.154.10:9002/product-inventory-management-qxy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
- password: 123456
+ password: qxy@123456..
# 浠庡簱鏁版嵁婧�
slave:
# 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
@@ -149,8 +153,8 @@
# redis 閰嶇疆
redis:
# 鍦板潃
- host: 127.0.0.1
- # host: 172.17.0.1
+ # host: 127.0.0.1
+ host: 172.17.0.1
# 绔彛锛岄粯璁や负6379
port: 6379
# 鏁版嵁搴撶储寮�
@@ -256,11 +260,11 @@
# 鏂囦欢涓婁紶閰嶇疆
file:
- temp-dir: D:/ruoyi/temp/uploads # 涓存椂鐩綍 鍚庢湡鍒犻櫎
- upload-dir: D:/ruoyi/prod/uploads # 姝ｅ紡鐩綍 鍚庢湡鍒犻櫎
- path: D:/ruoyi/prod/uploads # 涓婁紶鐩綍
+ temp-dir: /javaWork/product-inventory-management/file/temp/uploads # 涓存椂鐩綍 鍚庢湡鍒犻櫎
+ upload-dir: /javaWork/product-inventory-management/file/prod/uploads # 姝ｅ紡鐩綍 鍚庢湡鍒犻櫎
+ path: /javaWork/product-inventory-management/file/path/uploads # 涓婁紶鐩綍
urlPrefix: /common # 閾炬帴鍓嶇紑
- domain: http://127.0.0.1:7005 # 鍩熷悕鍓嶇紑
+ domain: http://127.0.0.1:7003 # 鍩熷悕鍓嶇紑
expired: 120 # 杩囨湡鏃堕棿(鍗曚綅:鍒嗛挓)
useLimit: 10 # 浣跨敤娆℃暟
compress: true # 鏄惁鍘嬬缉
@@ -268,4 +272,3 @@
compressQuality: 0.5 # 鍘嬬缉璐ㄩ噺(0.0-1.0)
knowledge:
one: D:\鏂扮枂澶х綏绱犱紒涓氫骇鍝佷綋绯昏鏄庢枃妗�.md
-
--
Gitblit v1.9.3