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/CacheGlassModule/src/main/resources/application.yml |   32 ++++++++++++++------------------
 1 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml
index 386bbaf..e5cbbfb 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml
@@ -1,13 +1,18 @@
 server:
-  port: 8081
+  port: 10011
 
 spring:
   profiles:
-    active: cz
+    active: yw
   application:
     name: cacheGlass
   liquibase:
     enabled: false
+  task:
+    scheduling:
+      pool:
+        size: 10
+      thread-name-prefix: task-cache
 mybatis-plus:
   mapper-locations: classpath*:mapper/*.xml
 #  configuration:
@@ -23,22 +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
+  maxThickness: 8
   sequence:
     order: false
-kangaroohy:
-  milo:
-    enabled: false
-    primary: default
-    config:
-      default:
-        endpoint: opc.tcp://zidonghua:49320
-        security-policy: basic256sha256
-        username: zsh
-        password: 1qaz2wsx3edc4rfv

--
Gitblit v1.8.0