From 7aac0b821663de152ef665a030ebbef1d34b41f2 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 16 四月 2025 11:31:20 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/application.yml | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/north-glass-erp/src/main/resources/application.yml b/north-glass-erp/src/main/resources/application.yml
index 275c98a..fa7851d 100644
--- a/north-glass-erp/src/main/resources/application.yml
+++ b/north-glass-erp/src/main/resources/application.yml
@@ -3,6 +3,10 @@
port: 8086
ip: localhost
+port: 3306
+
+#sa-token:
+# timeout: 86400
spring:
@@ -12,27 +16,27 @@
strict: false #璁剧疆涓ユ牸妯″紡,榛樿false涓嶅惎鍔�. 鍚姩鍚庡湪鏈尮閰嶅埌鎸囧畾鏁版嵁婧愭椂鍊欏洖鎶涘嚭寮傚父,涓嶅惎鍔ㄤ細浣跨敤榛樿鏁版嵁婧�.
datasource:
user_info:
- url: jdbc:mysql://${ip}:3306/erp_user_info?serverTimezone=GMT%2b8
+ url: jdbc:mysql://${ip}:${port}/erp_user_info?serverTimezone=GMT%2b8
username: root
password: beibo.123/
driver-class-name: com.mysql.cj.jdbc.Driver
sd:
- url: jdbc:mysql://${ip}:3306/sd?serverTimezone=GMT%2b8&allowMultiQueries=true
+ url: jdbc:mysql://${ip}:${port}/sd?serverTimezone=GMT%2b8&allowMultiQueries=true
username: root
password: beibo.123/
driver-class-name: com.mysql.cj.jdbc.Driver
mm:
- url: jdbc:mysql://${ip}:3306/mm?serverTimezone=GMT%2b8
+ url: jdbc:mysql://${ip}:${port}/mm?serverTimezone=GMT%2b8
username: root
password: beibo.123/
driver-class-name: com.mysql.cj.jdbc.Driver
pp:
- url: jdbc:mysql://${ip}:3306/pp?serverTimezone=GMT%2b8
+ url: jdbc:mysql://${ip}:${port}/pp?serverTimezone=GMT%2b8
username: root
password: beibo.123/
driver-class-name: com.mysql.cj.jdbc.Driver
log:
- url: jdbc:mysql://${ip}:3306/erp_log?serverTimezone=GMT%2b8
+ url: jdbc:mysql://${ip}:${port}/erp_log?serverTimezone=GMT%2b8
username: root
password: beibo.123/
driver-class-name: com.mysql.cj.jdbc.Driver
--
Gitblit v1.8.0