From 7e80174d9b796f0088353e0d63513ec8e1a59bcb Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 21 三月 2025 16:01:45 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject

---
 hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml |   37 ++++++++++++++++++++-----------------
 1 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml
index bf3f011..c71e71e 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml
@@ -1,23 +1,26 @@
 server:
-  port: 8084
+  port: 10016
 spring:
-  datasource:
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://10.153.19.150:3306/hangzhoumes?serverTimezone=GMT%2b8&characterEncoding=utf-8&useSSL=false
-    username: root
-    password: beibo.123/
-  cloud:
-    nacos:
-      discovery:
-        server-addr: 10.153.19.150:8848
+  profiles:
+    active: dev
   application:
     name: temperingGlass
-  redis:
-    database: 0
-    host: 10.153.19.150
-    port: 6379
-    password: 123456
+  liquibase:
+    enabled: false
 mybatis-plus:
   mapper-locations: classpath*:mapper/*.xml
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
\ No newline at end of file
+#  configuration:
+#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+mes:
+  width: 2800
+  height: 5000
+kangaroohy:
+  milo:
+    enabled: false
+    primary: default
+    config:
+      default:
+        endpoint: opc.tcp://10.153.19.150:49320
+        security-policy: basic256sha256
+        username: admin
+        password: 1qaz2wsx3edc4rfv
\ No newline at end of file

--
Gitblit v1.8.0