Merge branch 'dev_graceful_shutdown' into dev_temp

# Conflicts:
#	epmet-user/epmet-user-server/src/main/resources/bootstrap.yml

epmet-admin/epmet-admin-server/Dockerfile

@@ -8,4 +8,4 @@ COPY ./target/*.jar ./epmet-admin.jar
 
 EXPOSE 8082
 
-ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]
+ENTRYPOINT ["sh", "-c", "exec $RUN_INSTRUCT"]

epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml

@@ -127,3 +127,9 @@ hystrix:
 ribbon:
   ReadTimeout: 300000
   ConnectTimeout: 300000
+
+# 停机选项
+shutdown:
+  graceful:
+    enable: true #是否开启优雅停机
+    waitTimeSecs: 30 # 优雅停机等待时间，超过30秒，发出告警

epmet-auth/Dockerfile

@@ -8,4 +8,4 @@ COPY ./target/*.jar ./epmet-auth.jar
 
 EXPOSE 8081
 
-ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]
+ENTRYPOINT ["sh", "-c", "exec $RUN_INSTRUCT"]

epmet-auth/src/main/resources/bootstrap.yml

@@ -126,3 +126,9 @@ dingTalk:
   robot:
     webHook: @dingTalk.robot.webHook@
     secret: @dingTalk.robot.secret@
+
+# 停机选项
+shutdown:
+  graceful:
+    enable: true #是否开启优雅停机
+    waitTimeSecs: 30 # 优雅停机等待时间，超过30秒，发出告警

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/config/GracefulShutdownConfig.java → epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/config/shutdown/GracefulShutdownConfig.java

@@ -1,4 +1,4 @@
-package com.epmet.config;
+package com.epmet.commons.tools.config.shutdown;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/config/GracefulShutdownTomcat.java → epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/config/shutdown/GracefulShutdownTomcat.java

@@ -1,7 +1,5 @@
-package com.epmet.config;
+package com.epmet.commons.tools.config.shutdown;
 
-import com.epmet.commons.tools.exception.RenException;
-import net.bytebuddy.implementation.bytecode.Throw;
 import org.apache.catalina.connector.Connector;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/config/ShutdownProperties.java → epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/config/shutdown/ShutdownProperties.java

@@ -1,4 +1,4 @@
-package com.epmet.config;
+package com.epmet.commons.tools.config.shutdown;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

epmet-gateway/Dockerfile

@@ -8,4 +8,4 @@ COPY ./target/*.jar ./epmet-gateway.jar
 
 EXPOSE 8080
 
-ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]
+ENTRYPOINT ["sh", "-c", "exec $RUN_INSTRUCT"]

epmet-module/data-report/data-report-server/Dockerfile

@@ -8,4 +8,4 @@ COPY ./target/*.jar ./data-report.jar
 
 EXPOSE 8109
 
-ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]
+ENTRYPOINT ["sh", "-c", "exec $RUN_INSTRUCT"]

epmet-module/data-report/data-report-server/src/main/resources/bootstrap.yml

@@ -148,4 +148,10 @@ jwt:
     #秘钥
     secret: 7016867071f0ebf1c46f123eaaf4b9d6[elink.epmet]
     #token有效时长，默认7天，单位秒
-    expire: 604800
+    expire: 604800
+
+# 停机选项
+shutdown:
+  graceful:
+    enable: true #是否开启优雅停机
+    waitTimeSecs: 30 # 优雅停机等待时间，超过30秒，发出告警

epmet-module/data-statistical/data-statistical-server/Dockerfile

@@ -8,5 +8,4 @@ COPY ./target/*.jar ./data-stats.jar
 
 EXPOSE 8108
 
-#ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]
 ENTRYPOINT ["sh","-c","exec $RUN_INSTRUCT"]

epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml

@@ -198,3 +198,9 @@ dingTalk:
   robot:
     webHook: @dingTalk.robot.webHook@
     secret: @dingTalk.robot.secret@
+
+# 停机选项
+shutdown:
+  graceful:
+    enable: true #是否开启优雅停机
+    waitTimeSecs: 30 # 优雅停机等待时间，超过30秒，发出告警

epmet-module/epmet-activiti/epmet-activiti-server/Dockerfile

@@ -8,4 +8,4 @@ COPY ./target/*.jar ./epmet-activiti.jar
 
 EXPOSE 8086
 
-ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]
+ENTRYPOINT ["sh", "-c", "exec $RUN_INSTRUCT"]

epmet-module/epmet-common-service/common-service-server/Dockerfile

@@ -8,4 +8,4 @@ COPY ./target/*.jar ./common-service.jar
 
 EXPOSE 8103
 
-ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]
+ENTRYPOINT ["sh", "-c", "exec $RUN_INSTRUCT"]

epmet-module/epmet-common-service/common-service-server/src/main/resources/bootstrap.yml

@@ -130,4 +130,10 @@ elink:
 dingTalk:
   robot:
     webHook: @dingTalk.robot.webHook@
-    secret: @dingTalk.robot.secret@
+    secret: @dingTalk.robot.secret@
+
+# 停机选项
+shutdown:
+  graceful:
+    enable: true #是否开启优雅停机
+    waitTimeSecs: 30 # 优雅停机等待时间，超过30秒，发出告警

epmet-module/epmet-ext/epmet-ext-server/src/main/resources/bootstrap.yml

@@ -102,4 +102,10 @@ pagehelper:
 dingTalk:
   robot:
     webHook: @dingTalk.robot.webHook@
-    secret: @dingTalk.robot.secret@
+    secret: @dingTalk.robot.secret@
+
+# 停机选项
+shutdown:
+  graceful:
+    enable: true #是否开启优雅停机
+    waitTimeSecs: 30 # 优雅停机等待时间，超过30秒，发出告警

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml

@@ -138,3 +138,9 @@ dingTalk:
   robot:
     webHook: @dingTalk.robot.webHook@
     secret: @dingTalk.robot.secret@
+
+# 停机选项
+shutdown:
+  graceful:
+    enable: true #是否开启优雅停机
+    waitTimeSecs: 30 # 优雅停机等待时间，超过30秒，发出告警

epmet-module/epmet-job/epmet-job-server/Dockerfile

@@ -8,4 +8,4 @@ COPY ./target/*.jar ./epmet-job.jar
 
 EXPOSE 8084
 
-ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]
+ENTRYPOINT ["sh", "-c", "exec $RUN_INSTRUCT"]

epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml

@@ -122,3 +122,9 @@ dingTalk:
   robot:
     webHook: @dingTalk.robot.webHook@
     secret: @dingTalk.robot.secret@
+
+# 停机选项
+shutdown:
+  graceful:
+    enable: true #是否开启优雅停机
+    waitTimeSecs: 30 # 优雅停机等待时间，超过30秒，发出告警

epmet-module/epmet-message/epmet-message-server/Dockerfile

@@ -8,4 +8,4 @@ COPY ./target/*.jar ./epmet-message.jar
 
 EXPOSE 8085
 
-ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]
+ENTRYPOINT ["sh", "-c", "exec $RUN_INSTRUCT"]

epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml

@@ -131,4 +131,10 @@ thread:
 dingTalk:
   robot:
     webHook: @dingTalk.robot.webHook@
-    secret: @dingTalk.robot.secret@
+    secret: @dingTalk.robot.secret@
+
+# 停机选项
+shutdown:
+  graceful:
+    enable: true #是否开启优雅停机
+    waitTimeSecs: 30 # 优雅停机等待时间，超过30秒，发出告警

epmet-module/epmet-oss/epmet-oss-server/Dockerfile

@@ -8,4 +8,4 @@ COPY ./target/*.jar ./epmet-oss.jar
 
 EXPOSE 8083
 
-ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]
+ENTRYPOINT ["sh", "-c", "exec $RUN_INSTRUCT"]

epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml

@@ -133,4 +133,10 @@ pagehelper:
 dingTalk:
   robot:
     webHook: @dingTalk.robot.webHook@
-    secret: @dingTalk.robot.secret@
+    secret: @dingTalk.robot.secret@
+
+# 停机选项
+shutdown:
+  graceful:
+    enable: true #是否开启优雅停机
+    waitTimeSecs: 30 # 优雅停机等待时间，超过30秒，发出告警

epmet-module/epmet-point/epmet-point-server/Dockerfile

@@ -8,4 +8,4 @@ COPY ./target/*.jar ./epmet-point.jar
 
 EXPOSE 8090
 
-ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]
+ENTRYPOINT ["sh", "-c", "exec $RUN_INSTRUCT"]

epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml

@@ -121,4 +121,10 @@ pagehelper:
 dingTalk:
   robot:
     webHook: @dingTalk.robot.webHook@
-    secret: @dingTalk.robot.secret@
+    secret: @dingTalk.robot.secret@
+
+# 停机选项
+shutdown:
+  graceful:
+    enable: true #是否开启优雅停机
+    waitTimeSecs: 30 # 优雅停机等待时间，超过30秒，发出告警

epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml

@@ -138,4 +138,10 @@ third:
 dingTalk:
   robot:
     webHook: @dingTalk.robot.webHook@
-    secret: @dingTalk.robot.secret@
+    secret: @dingTalk.robot.secret@
+
+# 停机选项
+shutdown:
+  graceful:
+    enable: true #是否开启优雅停机
+    waitTimeSecs: 30 # 优雅停机等待时间，超过30秒，发出告警

epmet-module/gov-grid/gov-grid-server/Dockerfile

@@ -8,4 +8,4 @@ COPY ./target/*.jar ./gov-grid.jar
 
 EXPOSE 8097
 
-ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]
+ENTRYPOINT ["sh", "-c", "exec $RUN_INSTRUCT"]

epmet-module/gov-grid/gov-grid-server/src/main/resources/bootstrap.yml

@@ -79,4 +79,10 @@ pagehelper:
 dingTalk:
   robot:
     webHook: @dingTalk.robot.webHook@
-    secret: @dingTalk.robot.secret@
+    secret: @dingTalk.robot.secret@
+
+# 停机选项
+shutdown:
+  graceful:
+    enable: true #是否开启优雅停机
+    waitTimeSecs: 30 # 优雅停机等待时间，超过30秒，发出告警

epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml

@@ -121,3 +121,9 @@ dingTalk:
     webHook: @dingTalk.robot.webHook@
     secret: @dingTalk.robot.secret@
 
+# 停机选项
+shutdown:
+  graceful:
+    enable: true #是否开启优雅停机
+    waitTimeSecs: 30 # 优雅停机等待时间，超过30秒，发出告警
+

epmet-module/gov-mine/gov-mine-server/Dockerfile

@@ -8,4 +8,4 @@ COPY ./target/*.jar ./gov-mine.jar
 
 EXPOSE 8098
 
-ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]
+ENTRYPOINT ["sh", "-c", "exec $RUN_INSTRUCT"]

epmet-module/gov-mine/gov-mine-server/src/main/resources/bootstrap.yml

@@ -99,3 +99,9 @@ dingTalk:
   robot:
     webHook: @dingTalk.robot.webHook@
     secret: @dingTalk.robot.secret@
+
+# 停机选项
+shutdown:
+  graceful:
+    enable: true #是否开启优雅停机
+    waitTimeSecs: 30 # 优雅停机等待时间，超过30秒，发出告警

epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml

@@ -135,4 +135,10 @@ pagehelper:
 dingTalk:
   robot:
     webHook: @dingTalk.robot.webHook@
-    secret: @dingTalk.robot.secret@
+    secret: @dingTalk.robot.secret@
+
+# 停机选项
+shutdown:
+  graceful:
+    enable: true #是否开启优雅停机
+    waitTimeSecs: 30 # 优雅停机等待时间，超过30秒，发出告警

epmet-module/gov-project/gov-project-server/Dockerfile

@@ -8,4 +8,4 @@ COPY ./target/*.jar ./gov-project.jar
 
 EXPOSE 8102
 
-ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]
+ENTRYPOINT ["sh", "-c", "exec $RUN_INSTRUCT"]

epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml

@@ -119,4 +119,11 @@ pagehelper:
 dingTalk:
   robot:
     webHook: @dingTalk.robot.webHook@
-    secret: @dingTalk.robot.secret@
+    secret: @dingTalk.robot.secret@
+
+
+# 停机选项
+shutdown:
+  graceful:
+    enable: true #是否开启优雅停机
+    waitTimeSecs: 30 # 优雅停机等待时间，超过30秒，发出告警

epmet-module/gov-voice/gov-voice-server/Dockerfile

@@ -8,4 +8,4 @@ COPY ./target/*.jar ./gov-voice.jar
 
 EXPOSE 8105
 
-ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]
+ENTRYPOINT ["sh", "-c", "exec $RUN_INSTRUCT"]

epmet-module/gov-voice/gov-voice-server/src/main/resources/bootstrap.yml

@@ -119,4 +119,10 @@ pagehelper:
 dingTalk:
   robot:
     webHook: @dingTalk.robot.webHook@
-    secret: @dingTalk.robot.secret@
+    secret: @dingTalk.robot.secret@
+
+# 停机选项
+shutdown:
+  graceful:
+    enable: true #是否开启优雅停机
+    waitTimeSecs: 30 # 优雅停机等待时间，超过30秒，发出告警

epmet-module/oper-access/oper-access-server/Dockerfile

@@ -8,4 +8,4 @@ COPY ./target/*.jar ./oper-access.jar
 
 EXPOSE 8093
 
-ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]
+ENTRYPOINT ["sh", "-c", "exec $RUN_INSTRUCT"]

epmet-module/oper-access/oper-access-server/src/main/resources/bootstrap.yml

@@ -122,4 +122,10 @@ pagehelper:
 dingTalk:
   robot:
     webHook: @dingTalk.robot.webHook@
-    secret: @dingTalk.robot.secret@
+    secret: @dingTalk.robot.secret@
+
+# 停机选项
+shutdown:
+  graceful:
+    enable: true #是否开启优雅停机
+    waitTimeSecs: 30 # 优雅停机等待时间，超过30秒，发出告警

epmet-module/oper-crm/oper-crm-server/Dockerfile

@@ -8,4 +8,4 @@ COPY ./target/*.jar ./oper-crm.jar
 
 EXPOSE 8090
 
-ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]
+ENTRYPOINT ["sh", "-c", "exec $RUN_INSTRUCT"]

epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml

@@ -128,4 +128,10 @@ pagehelper:
 dingTalk:
   robot:
     webHook: @dingTalk.robot.webHook@
-    secret: @dingTalk.robot.secret@
+    secret: @dingTalk.robot.secret@
+
+# 停机选项
+shutdown:
+  graceful:
+    enable: true #是否开启优雅停机
+    waitTimeSecs: 30 # 优雅停机等待时间，超过30秒，发出告警

epmet-module/oper-customize/oper-customize-server/Dockerfile

@@ -8,4 +8,4 @@ COPY ./target/*.jar ./oper-customize.jar
 
 EXPOSE 8089
 
-ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]
+ENTRYPOINT ["sh", "-c", "exec $RUN_INSTRUCT"]

epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml

@@ -122,4 +122,10 @@ pagehelper:
 dingTalk:
   robot:
     webHook: @dingTalk.robot.webHook@
-    secret: @dingTalk.robot.secret@
+    secret: @dingTalk.robot.secret@
+
+# 停机选项
+shutdown:
+  graceful:
+    enable: true #是否开启优雅停机
+    waitTimeSecs: 30 # 优雅停机等待时间，超过30秒，发出告警

epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml

@@ -145,4 +145,4 @@ dingTalk:
 shutdown:
   graceful:
     enable: true #是否开启优雅停机
-    waitTimeSecs: 30 # 优雅停机等待时间，超过30秒，发出告警
+    waitTimeSecs: 30 # 优雅停机等待时间，每超过30秒，打印一次错误日志

epmet-module/resi-guide/resi-guide-server/Dockerfile

@@ -8,4 +8,4 @@ COPY ./target/*.jar ./resi-guide.jar
 
 EXPOSE 8091
 
-ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]
+ENTRYPOINT ["sh", "-c", "exec $RUN_INSTRUCT"]

epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml

@@ -123,4 +123,10 @@ pagehelper:
 dingTalk:
   robot:
     webHook: @dingTalk.robot.webHook@
-    secret: @dingTalk.robot.secret@
+    secret: @dingTalk.robot.secret@
+
+# 停机选项
+shutdown:
+  graceful:
+    enable: true #是否开启优雅停机
+    waitTimeSecs: 30 # 优雅停机等待时间，超过30秒，发出告警

epmet-module/resi-hall/resi-hall-server/src/main/resources/bootstrap.yml

@@ -75,3 +75,9 @@ dingTalk:
   robot:
     webHook: @dingTalk.robot.webHook@
     secret: @dingTalk.robot.secret@
+
+# 停机选项
+shutdown:
+  graceful:
+    enable: true #是否开启优雅停机
+    waitTimeSecs: 30 # 优雅停机等待时间，超过30秒，发出告警

epmet-module/resi-home/resi-home-server/Dockerfile

@@ -8,4 +8,4 @@ COPY ./target/*.jar ./resi-home.jar
 
 EXPOSE 8104
 
-ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]
+ENTRYPOINT ["sh", "-c", "exec $RUN_INSTRUCT"]

epmet-module/resi-home/resi-home-server/src/main/resources/bootstrap.yml

@@ -74,3 +74,9 @@ dingTalk:
   robot:
     webHook: @dingTalk.robot.webHook@
     secret: @dingTalk.robot.secret@
+
+# 停机选项
+shutdown:
+  graceful:
+    enable: true #是否开启优雅停机
+    waitTimeSecs: 30 # 优雅停机等待时间，超过30秒，发出告警

epmet-module/resi-mine/resi-mine-server/src/main/resources/bootstrap.yml

@@ -102,3 +102,9 @@ dingTalk:
   robot:
     webHook: @dingTalk.robot.webHook@
     secret: @dingTalk.robot.secret@
+
+# 停机选项
+shutdown:
+  graceful:
+    enable: true #是否开启优雅停机
+    waitTimeSecs: 30 # 优雅停机等待时间，超过30秒，发出告警

epmet-module/resi-partymember/resi-partymember-server/Dockerfile

@@ -8,4 +8,4 @@ COPY ./target/*.jar ./resi-partymember.jar
 
 EXPOSE 8096
 
-ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]
+ENTRYPOINT ["sh", "-c", "exec $RUN_INSTRUCT"]

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml

@@ -122,4 +122,10 @@ pagehelper:
 dingTalk:
   robot:
     webHook: @dingTalk.robot.webHook@
-    secret: @dingTalk.robot.secret@
+    secret: @dingTalk.robot.secret@
+
+# 停机选项
+shutdown:
+  graceful:
+    enable: true #是否开启优雅停机
+    waitTimeSecs: 30 # 优雅停机等待时间，超过30秒，发出告警

epmet-module/resi-voice/resi-voice-server/Dockerfile

@@ -8,4 +8,4 @@ COPY ./target/*.jar ./resi-voice.jar
 
 EXPOSE 8106
 
-ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]
+ENTRYPOINT ["sh", "-c", "exec $RUN_INSTRUCT"]

epmet-module/resi-voice/resi-voice-server/src/main/resources/bootstrap.yml

@@ -70,3 +70,9 @@ dingTalk:
   robot:
     webHook: @dingTalk.robot.webHook@
     secret: @dingTalk.robot.secret@
+
+# 停机选项
+shutdown:
+  graceful:
+    enable: true #是否开启优雅停机
+    waitTimeSecs: 30 # 优雅停机等待时间，超过30秒，发出告警

epmet-openapi/epmet-openapi-scan/Dockerfile

@@ -8,4 +8,4 @@ COPY ./target/*.jar ./epmet-openapi-scan.jar
 
 EXPOSE 8107
 
-ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]
+ENTRYPOINT ["sh", "-c", "exec $RUN_INSTRUCT"]

epmet-openapi/epmet-openapi-scan/src/main/resources/bootstrap.yml

@@ -82,3 +82,9 @@ dingTalk:
     webHook: @dingTalk.robot.webHook@
     secret: @dingTalk.robot.secret@
 
+# 停机选项
+shutdown:
+  graceful:
+    enable: true #是否开启优雅停机
+    waitTimeSecs: 30 # 优雅停机等待时间，超过30秒，发出告警
+

epmet-user/epmet-user-server/src/main/resources/bootstrap.yml

@@ -133,11 +133,6 @@ pagehelper:
   helper-dialect: mysql
   reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1
 
-dingTalk:
-  robot:
-    webHook: @dingTalk.robot.webHook@
-    secret: @dingTalk.robot.secret@
-
 openapi:
   scan:
     server:
@@ -146,3 +141,13 @@ openapi:
       imgSyncScan: /imgSyncScan
       textSyncScan: /textSyncScan
 
+dingTalk:
+  robot:
+    webHook: @dingTalk.robot.webHook@
+    secret: @dingTalk.robot.secret@
+
+# 停机选项
+shutdown:
+  graceful:
+    enable: true #是否开启优雅停机
+    waitTimeSecs: 30 # 优雅停机等待时间，超过30秒，发出告警