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 |   43 ++++++++++++++++++++++++++-----------------
 1 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
index 29a0efb..5520b25 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
@@ -1,24 +1,33 @@
 server:
-  port: 8082
+  port: 10012
 
 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: yw
   application:
     name: cacheVerticalGlass
-  redis:
-    database: 0
-    host: 10.153.19.150
-    port: 6379
-    password: 123456
+  liquibase:
+    enabled: false
+  task:
+    scheduling:
+      pool:
+        size: 10
+      thread-name-prefix: task-cacheVertical
 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:
+  sequence:
+    order: true
+  minCount: 30
+  carWidth: 6200   #澶ц溅瀹藉害
+  slotWidth: 6200   #澶ц溅瀹藉害
+  inCarMaxSize: 5    #杩涚墖澶ц溅鏈�澶у瓨鏀剧幓鐠冩暟閲�
+  outCarMaxSize: 6     #鍑虹墖澶ц溅鏈�澶у瓨鏀剧幓鐠冩暟閲�
+  glassGap: 250  #鐜荤拑闂磋窛
+  xMaxSize: 2800
+  slotMaxHeight: 2500
+  slotMaxthickness: 12
+  temperingOutTargetPosition: 930
+  artificialOutTargetPosition: 931
\ No newline at end of file

--
Gitblit v1.8.0