From 768e16999a8ce4bb500490ee76c659aa61ea1783 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 25 三月 2025 10:08:13 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/application.yml | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/north-glass-erp/src/main/resources/application.yml b/north-glass-erp/src/main/resources/application.yml
index bb342d6..fce62a7 100644
--- a/north-glass-erp/src/main/resources/application.yml
+++ b/north-glass-erp/src/main/resources/application.yml
@@ -1,6 +1,9 @@
server:
- port: 8080
+ port: 8086
+
+ip: localhost
+port: 3306
spring:
@@ -10,22 +13,30 @@
strict: false #璁剧疆涓ユ牸妯″紡,榛樿false涓嶅惎鍔�. 鍚姩鍚庡湪鏈尮閰嶅埌鎸囧畾鏁版嵁婧愭椂鍊欏洖鎶涘嚭寮傚父,涓嶅惎鍔ㄤ細浣跨敤榛樿鏁版嵁婧�.
datasource:
user_info:
- url: jdbc:mysql://10.153.19.150: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://10.153.19.150:3306/sd?serverTimezone=GMT%2b8
+ 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://localhost: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://localhost: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
\ No newline at end of file
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ log:
+ url: jdbc:mysql://${ip}:${port}/erp_log?serverTimezone=GMT%2b8
+ username: root
+ password: beibo.123/
+ driver-class-name: com.mysql.cj.jdbc.Driver
+#mybatis-plus:
+# configuration:
+# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
\ No newline at end of file
--
Gitblit v1.8.0