From 6485c1ffa31a8723945f873525beed331efeab08 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 11 三月 2025 09:27:09 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application-dev.yml | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application-dev.yml b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application-dev.yml
index 3097382..25a2304 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application-dev.yml
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application-dev.yml
@@ -1,19 +1,22 @@
spring:
datasource:
dynamic:
- primary: hangzhoumes #璁剧疆榛樿鐨勬暟鎹簮鎴栬�呮暟鎹簮缁�,榛樿鍊煎嵆涓簃aster
+ primary: northGlassMes #璁剧疆榛樿鐨勬暟鎹簮鎴栬�呮暟鎹簮缁�,榛樿鍊煎嵆涓簃aster
strict: false #璁剧疆涓ユ牸妯″紡,榛樿false涓嶅惎鍔�. 鍚姩鍚庡湪鏈尮閰嶅埌鎸囧畾鏁版嵁婧愭椂鍊欏洖鎶涘嚭寮傚父,涓嶅惎鍔ㄤ細浣跨敤榛樿鏁版嵁婧�.
datasource:
- hangzhoumes:
- url: jdbc:mysql://127.0.0.1:3306/hangzhoumes?serverTimezone=GMT%2b8
+ northGlassMes:
+ url: jdbc:mysql://127.0.0.1:3306/north_glass_mes?serverTimezone=GMT%2b8&allowMultiQueries=true
username: root
password: beibo.123/
driver-class-name: com.mysql.cj.jdbc.Driver
- salve_hangzhoumes:
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=hangzhoumes
+ salve_northGlassMes:
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=north_glass_mes
username: sa
password: beibo.123/
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+ druid:
+ wall:
+ multi-statement-allow: true
cloud:
nacos:
discovery:
@@ -23,3 +26,13 @@
host: 127.0.0.1
port: 6379
password: 123456
+kangaroohy:
+ milo:
+ enabled: true
+ primary: default
+ config:
+ default:
+ endpoint: opc.tcp://10.153.19.150:49320
+ security-policy: basic256sha256
+ username: admin
+ password: 1qaz2wsx3edc4rfv
--
Gitblit v1.8.0