From 250e2cd3c6b63605d2d23d496884ff18fac5e536 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 23 十二月 2024 17:15:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml
index 54b8ece..8861765 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml
@@ -3,7 +3,7 @@
spring:
profiles:
- active: cz
+ active: dev
application:
name: cacheGlass
liquibase:
@@ -28,13 +28,13 @@
secondLength: 2500
min:
one: #绗竴鏉＄（杈圭嚎鐨勬渶灏忓昂瀵镐俊鎭�
- firstLength: 500
- secondLength: 400
+ firstLength: 460
+ secondLength: 390
two: #绗簩鏉＄（杈圭嚎鐨勬渶灏忓昂瀵镐俊鎭�
- firstLength: 400
- secondLength: 400
- glassGap: 300
- cellLength: 2700
+ firstLength: 300
+ secondLength: 300
+ glassGap: 2500
+ cellLength: 2500
sequence:
order: false
kangaroohy:
@@ -43,8 +43,8 @@
primary: default
config:
default:
- endpoint: opc.tcp://192.168.10.241:49320
+ endpoint: opc.tcp://192.168.2.100:49320
security-policy: basic256sha256
- username: liu
+ username: admin
password: 1qaz2wsx3edc4rfv
--
Gitblit v1.8.0