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/howllowGlassModule/src/main/resources/application.yml | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/resources/application.yml
index c16715a..71d5812 100644
--- a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/resources/application.yml
@@ -3,16 +3,16 @@
spring:
profiles:
- active: dev
+ active: yw
application:
name: hollowGlass
liquibase:
enabled: false
- task:
- scheduling:
- pool:
- size: 10
- thread-name-prefix: task-hollowGlass
+# task:
+# scheduling:
+# pool:
+# size: 10
+# thread-name-prefix: task-hollowGlass
mybatis-plus:
mapper-locations: classpath*:mapper/*.xml
configuration:
@@ -29,13 +29,11 @@
xMaxSize: 2800
temperingOutTargetPosition: 930
artificialOutTargetPosition: 931
-
- scan:
- ip: 192.168.30.199
- port: 5000
+ slotMaxHeight: 2500
+ slotMaxthickness: 12
kangaroohy:
milo:
- enabled: false
+ enabled: true
primary: default
config:
default:
--
Gitblit v1.8.0