From 0d7d874912d0147376826b55667a1deb6547ed91 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 21 五月 2026 15:25:27 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/resources/application-dev.yml | 26 ++++++++++++--------------
1 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 883f2aa..86a0846 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -7,7 +7,7 @@
# 鐗堟潈骞翠唤
copyrightYear: 2025
# 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /Users/mac/project/product-inventory-management/file
+ profile: D:/ruoyi/uploadPath
# 鑾峰彇ip鍦板潃寮�鍏�
addressEnabled: false
@@ -28,7 +28,7 @@
# 寮�鍙戠幆澧冮厤缃�
server:
# 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9009
+ port: 7003
servlet:
# 搴旂敤鐨勮闂矾寰�
context-path: /
@@ -57,7 +57,7 @@
accessKey: admin
secretKey: 12345678
preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: jxc
+ default-bucket: uploadPath
# 鐢ㄦ埛閰嶇疆
user:
password:
@@ -74,9 +74,9 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
- url: jdbc:mysql://1.15.17.182:9999/product-inventory-management-new-pro?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://localhost:3306/product-inventory-management-new-pro?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
- password: xd@123456..
+ password: 123456
# 浠庡簱鏁版嵁婧�
slave:
# 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
@@ -201,7 +201,7 @@
token:
# 浠ょ墝鑷畾涔夋爣璇�
header: Authorization
- # 浠ょ墝瀵嗛挜 鏂扮増jwt瀵嗛挜闀垮害蹇呴』64浣嶄互涓�
+ # 浠ょ墝瀵嗛挜
secret: xpAVjhCjQDaDB7mjPAzMDSbQWXNu2zYkTdDNUsPMS5Xx8QMmQVYN7n74eZrYJxDJ
# 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
expireTime: 450
@@ -254,19 +254,17 @@
# 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
allowOverwrite: false
-
-knowledge:
- one: D:\鏂扮枂澶х綏绱犱紒涓氫骇鍝佷綋绯昏鏄庢枃妗�.md
-
# 鏂囦欢涓婁紶閰嶇疆
file:
- temp-dir: /Users/mac/project/product-inventory-management/file/temp/uploads
- upload-dir: /Users/mac/project/product-inventory-management/file/prod/uploads
- path: /Users/mac/project/product-inventory-management/download/uploads # 涓婁紶鐩綍
+ temp-dir: D:/ruoyi/temp/uploads # 涓存椂鐩綍 鍚庢湡鍒犻櫎
+ upload-dir: D:/ruoyi/prod/uploads # 姝ｅ紡鐩綍 鍚庢湡鍒犻櫎
+ path: D:/ruoyi/prod/uploads # 涓婁紶鐩綍
urlPrefix: /common # 閾炬帴鍓嶇紑
- domain: http://127.0.0.1:9009 # 鍩熷悕鍓嶇紑
+ domain: http://127.0.0.1:7006 # 鍩熷悕鍓嶇紑
expired: 120 # 杩囨湡鏃堕棿(鍗曚綅:鍒嗛挓)
useLimit: 10 # 浣跨敤娆℃暟
compress: true # 鏄惁鍘嬬缉
needCompressSize: 10MB # 鍘嬬缉闃堝��
compressQuality: 0.5 # 鍘嬬缉璐ㄩ噺(0.0-1.0)
+knowledge:
+ one: D:\鏂扮枂澶х綏绱犱紒涓氫骇鍝佷綋绯昏鏄庢枃妗�.md
--
Gitblit v1.9.3