From 24bc065e9009bfb3c778e762921268a389aeaf49 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 10 十二月 2024 09:00:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/moduleService/howllowGlassModule/src/main/resources/application.yml |   18 +++++++-----------
 1 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/resources/application.yml
index 56609e7..7ff2747 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: yw
+    active: dev
   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,9 @@
   xMaxSize: 2800
   temperingOutTargetPosition: 930
   artificialOutTargetPosition: 931
-
-  scan:
-    ip: 192.168.30.199
-    port: 5000
 kangaroohy:
   milo:
-    enabled: true
+    enabled: false
     primary: default
     config:
       default:

--
Gitblit v1.8.0