From 261698358e2b756a61e992bc1651e01b3f45290b Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 23 十月 2025 16:50:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml | 24 ++++++------------------
1 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
index f9d58e6..5520b25 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 8082
+ port: 10012
spring:
profiles:
@@ -15,8 +15,8 @@
thread-name-prefix: task-cacheVertical
mybatis-plus:
mapper-locations: classpath*:mapper/*.xml
- configuration:
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+# configuration:
+# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
mes:
sequence:
order: true
@@ -27,19 +27,7 @@
outCarMaxSize: 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