From 2bdf6b86c427cd8a0f433d6a559d532eed67b733 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 13 八月 2026 13:40:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_意博凯信' into dev_天津_意博凯信
---
src/main/resources/application-ybkx-test.yml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/application-xlgs.yml b/src/main/resources/application-ybkx-test.yml
similarity index 95%
rename from src/main/resources/application-xlgs.yml
rename to src/main/resources/application-ybkx-test.yml
index 0cdbd39..67c41a0 100644
--- a/src/main/resources/application-xlgs.yml
+++ b/src/main/resources/application-ybkx-test.yml
@@ -73,7 +73,7 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-xlgs?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://36.213.180.217:11101/product-inventory-management-ybkx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: xd@123456..
# 浠庡簱鏁版嵁婧�
@@ -145,14 +145,14 @@
# redis 閰嶇疆
data:
mongodb:
- uri: mongodb://114.132.189.42:9028/chat_memory_db_xlgs
+ uri: mongodb://114.132.189.42:9028/chat_memory_db_ybkx
# redis 閰嶇疆
redis:
# 鍦板潃
-# host: 127.0.0.1
+ # host: 127.0.0.1
host: 172.17.0.1
# 绔彛锛岄粯璁や负6379
- port: 6379
+ port: 11102
# 鏁版嵁搴撶储寮�
database: 0
# 瀵嗙爜
@@ -260,7 +260,7 @@
upload-dir: /javaWork/product-inventory-management/file/prod/uploads # 姝ｅ紡鐩綍
path: /javaWork/product-inventory-management/file # 涓婁紶鐩綍
urlPrefix: /prod-api/common # 閾炬帴鍓嶇紑
- domain: http://1.15.17.182:9091 # 鍩熷悕鍓嶇紑
+ domain: http://36.213.180.217:9522 # 鍩熷悕鍓嶇紑
expired: 120 # 杩囨湡鏃堕棿(鍗曚綅:鍒嗛挓)
useLimit: 10 # 浣跨敤娆℃暟
compress: true # 鏄惁鍘嬬缉
--
Gitblit v1.9.3