From fb9a4fdf9ba08eaf300803dff945e0e431b717c4 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 13 十月 2025 10:35:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/aerjiliya' into aerjiliya
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml | 21 ++++-----------------
1 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
index 51356c7..f6baa40 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
@@ -1,9 +1,9 @@
server:
- port: 8082
+ port: 10012
spring:
profiles:
- active: yw
+ active: dev
application:
name: cacheVerticalGlass
liquibase:
@@ -28,19 +28,6 @@
glassGap: 250 #鐜荤拑闂磋窛
xMaxSize: 2800
slotMaxHeight: 2500
+ slotMaxthickness: 12
temperingOutTargetPosition: 930
- artificialOutTargetPosition: 931
-
- scan:
- ip: 192.168.30.199
- port: 5000
-kangaroohy:
- milo:
- enabled: false
- primary: default
- config:
- default:
- endpoint: opc.tcp://192.168.2.100:49320
- security-policy: basic256sha256
- username: admin
- password: 1qaz2wsx3edc4rfv
\ No newline at end of file
+ artificialOutTargetPosition: 931
\ No newline at end of file
--
Gitblit v1.8.0