From 3ecf92240aca57d8fb7165aab8330aa70d095cfb Mon Sep 17 00:00:00 2001
From: MaxKey <shimingxy@qq.com>
Date: Sat, 9 Apr 2022 10:05:51 +0800
Subject: [PATCH] monitor

---
 build.gradle                                                  | 4 ++--
 gradle.properties                                             | 2 +-
 .../maxkey-boot-monitor => maxkey-monitor}/build.gradle       | 0
 .../maxkey-boot-monitor => maxkey-monitor}/readme.txt         | 2 +-
 .../main/java/org/maxkey/boot/monitor/MaxKeyBootMonitor.java  | 0
 .../org/maxkey/boot/monitor/MonitorSecurityConfigurer.java    | 0
 .../src/main/resources/application.properties                 | 0
 .../src/main/resources/bootstrap.properties                   | 0
 .../src/main/resources/log4j2.xml                             | 0
 settings.gradle                                               | 2 +-
 10 files changed, 5 insertions(+), 5 deletions(-)
 rename {maxkey-webs/maxkey-boot-monitor => maxkey-monitor}/build.gradle (100%)
 rename {maxkey-webs/maxkey-boot-monitor => maxkey-monitor}/readme.txt (92%)
 rename {maxkey-webs/maxkey-boot-monitor => maxkey-monitor}/src/main/java/org/maxkey/boot/monitor/MaxKeyBootMonitor.java (100%)
 rename {maxkey-webs/maxkey-boot-monitor => maxkey-monitor}/src/main/java/org/maxkey/boot/monitor/MonitorSecurityConfigurer.java (100%)
 rename {maxkey-webs/maxkey-boot-monitor => maxkey-monitor}/src/main/resources/application.properties (100%)
 rename {maxkey-webs/maxkey-boot-monitor => maxkey-monitor}/src/main/resources/bootstrap.properties (100%)
 rename {maxkey-webs/maxkey-boot-monitor => maxkey-monitor}/src/main/resources/log4j2.xml (100%)

diff --git a/build.gradle b/build.gradle
index 29e961ad9..4bdcfc0da 100644
--- a/build.gradle
+++ b/build.gradle
@@ -53,7 +53,7 @@ def libjarsmapper=[
     'maxkey-synchronizer-dingtalk'          :'maxkey_mgt',
     'maxkey-synchronizer-workweixin'        :'maxkey_mgt',
 	'maxkey-synchronizer-reorgdept'         :'maxkey_mgt',
-    'maxkey-boot-monitor'                   :'maxkey_monitor'
+    'maxkey-monitor'                        :'maxkey_monitor'
 ]
 
 configurations.all {
@@ -510,7 +510,7 @@ project('maxkey-common')  {
 }
 
 //copy Dep Jars to /build/maxkey-depjars,only maxkey-boot-monitor deps
-project('maxkey-webs:maxkey-boot-monitor')  {
+project('maxkey-monitor')  {
     task copyDepJars(type:Copy) {
         dependsOn   assemble
         //项目名 项目所在的group version 版本号
diff --git a/gradle.properties b/gradle.properties
index 90b69ed7c..6d9b4f5c4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -109,7 +109,7 @@ xmltoolingVersion               =1.4.6
 javasupportVersion              =7.5.1
 #others
 thymeleafVersion                =3.0.14.RELEASE
-springbootadminVersion          =2.6.3
+springbootadminVersion          =2.6.5
 nettyVersion                    =4.1.66.Final
 hazelcastVersion                =4.2.2
 jakartaannotationVersion        =2.0.0
diff --git a/maxkey-webs/maxkey-boot-monitor/build.gradle b/maxkey-monitor/build.gradle
similarity index 100%
rename from maxkey-webs/maxkey-boot-monitor/build.gradle
rename to maxkey-monitor/build.gradle
diff --git a/maxkey-webs/maxkey-boot-monitor/readme.txt b/maxkey-monitor/readme.txt
similarity index 92%
rename from maxkey-webs/maxkey-boot-monitor/readme.txt
rename to maxkey-monitor/readme.txt
index ecef53460..5f52bc7c8 100644
--- a/maxkey-webs/maxkey-boot-monitor/readme.txt
+++ b/maxkey-monitor/readme.txt
@@ -1,7 +1,7 @@
 maxkey monitor service 
 
 spring-boot-admin-server 
-version 2.5.0
+version 2.5.6
 Admin UI for administration of spring boot applications
 https://github.com/codecentric/spring-boot-admin
 Apache-2.0 License
diff --git a/maxkey-webs/maxkey-boot-monitor/src/main/java/org/maxkey/boot/monitor/MaxKeyBootMonitor.java b/maxkey-monitor/src/main/java/org/maxkey/boot/monitor/MaxKeyBootMonitor.java
similarity index 100%
rename from maxkey-webs/maxkey-boot-monitor/src/main/java/org/maxkey/boot/monitor/MaxKeyBootMonitor.java
rename to maxkey-monitor/src/main/java/org/maxkey/boot/monitor/MaxKeyBootMonitor.java
diff --git a/maxkey-webs/maxkey-boot-monitor/src/main/java/org/maxkey/boot/monitor/MonitorSecurityConfigurer.java b/maxkey-monitor/src/main/java/org/maxkey/boot/monitor/MonitorSecurityConfigurer.java
similarity index 100%
rename from maxkey-webs/maxkey-boot-monitor/src/main/java/org/maxkey/boot/monitor/MonitorSecurityConfigurer.java
rename to maxkey-monitor/src/main/java/org/maxkey/boot/monitor/MonitorSecurityConfigurer.java
diff --git a/maxkey-webs/maxkey-boot-monitor/src/main/resources/application.properties b/maxkey-monitor/src/main/resources/application.properties
similarity index 100%
rename from maxkey-webs/maxkey-boot-monitor/src/main/resources/application.properties
rename to maxkey-monitor/src/main/resources/application.properties
diff --git a/maxkey-webs/maxkey-boot-monitor/src/main/resources/bootstrap.properties b/maxkey-monitor/src/main/resources/bootstrap.properties
similarity index 100%
rename from maxkey-webs/maxkey-boot-monitor/src/main/resources/bootstrap.properties
rename to maxkey-monitor/src/main/resources/bootstrap.properties
diff --git a/maxkey-webs/maxkey-boot-monitor/src/main/resources/log4j2.xml b/maxkey-monitor/src/main/resources/log4j2.xml
similarity index 100%
rename from maxkey-webs/maxkey-boot-monitor/src/main/resources/log4j2.xml
rename to maxkey-monitor/src/main/resources/log4j2.xml
diff --git a/settings.gradle b/settings.gradle
index 64b591fe3..0de2d5ed6 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -56,7 +56,7 @@ include (
 	//management(mgt)
 	'maxkey-webs:maxkey-web-mgt',
 	//monitor
-	'maxkey-webs:maxkey-boot-monitor',
+	'maxkey-monitor',
 	//gataway
 	'maxkey-gataway'
 )
\ No newline at end of file