Browse Source

Merge branch 'dev_graceful_shutdown' into dev

# Conflicts:
#	epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml
dev_shibei_match
sunyuchao 5 years ago
parent
commit
ce79ec7ec0
  1. 2
      epmet-admin/epmet-admin-server/Dockerfile
  2. 6
      epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml
  3. 2
      epmet-auth/Dockerfile
  4. 6
      epmet-auth/src/main/resources/bootstrap.yml
  5. 24
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/config/shutdown/GracefulShutdownConfig.java
  6. 52
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/config/shutdown/GracefulShutdownTomcat.java
  7. 17
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/config/shutdown/ShutdownProperties.java
  8. 2
      epmet-gateway/Dockerfile
  9. 2
      epmet-module/data-report/data-report-server/Dockerfile
  10. 8
      epmet-module/data-report/data-report-server/src/main/resources/bootstrap.yml
  11. 1
      epmet-module/data-statistical/data-statistical-server/Dockerfile
  12. 6
      epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml
  13. 2
      epmet-module/epmet-activiti/epmet-activiti-server/Dockerfile
  14. 2
      epmet-module/epmet-common-service/common-service-server/Dockerfile
  15. 8
      epmet-module/epmet-common-service/common-service-server/src/main/resources/bootstrap.yml
  16. 8
      epmet-module/epmet-ext/epmet-ext-server/src/main/resources/bootstrap.yml
  17. 6
      epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml
  18. 2
      epmet-module/epmet-job/epmet-job-server/Dockerfile
  19. 6
      epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml
  20. 2
      epmet-module/epmet-message/epmet-message-server/Dockerfile
  21. 8
      epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml
  22. 2
      epmet-module/epmet-oss/epmet-oss-server/Dockerfile
  23. 8
      epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml
  24. 2
      epmet-module/epmet-point/epmet-point-server/Dockerfile
  25. 8
      epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml
  26. 8
      epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml
  27. 2
      epmet-module/gov-grid/gov-grid-server/Dockerfile
  28. 8
      epmet-module/gov-grid/gov-grid-server/src/main/resources/bootstrap.yml
  29. 6
      epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml
  30. 2
      epmet-module/gov-mine/gov-mine-server/Dockerfile
  31. 6
      epmet-module/gov-mine/gov-mine-server/src/main/resources/bootstrap.yml
  32. 8
      epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml
  33. 2
      epmet-module/gov-project/gov-project-server/Dockerfile
  34. 9
      epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml
  35. 2
      epmet-module/gov-voice/gov-voice-server/Dockerfile
  36. 8
      epmet-module/gov-voice/gov-voice-server/src/main/resources/bootstrap.yml
  37. 2
      epmet-module/oper-access/oper-access-server/Dockerfile
  38. 8
      epmet-module/oper-access/oper-access-server/src/main/resources/bootstrap.yml
  39. 2
      epmet-module/oper-crm/oper-crm-server/Dockerfile
  40. 8
      epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml
  41. 2
      epmet-module/oper-customize/oper-customize-server/Dockerfile
  42. 8
      epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml
  43. 9
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/test/TestController.java
  44. 8
      epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml
  45. 2
      epmet-module/resi-guide/resi-guide-server/Dockerfile
  46. 8
      epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml
  47. 6
      epmet-module/resi-hall/resi-hall-server/src/main/resources/bootstrap.yml
  48. 2
      epmet-module/resi-home/resi-home-server/Dockerfile
  49. 6
      epmet-module/resi-home/resi-home-server/src/main/resources/bootstrap.yml
  50. 6
      epmet-module/resi-mine/resi-mine-server/src/main/resources/bootstrap.yml
  51. 2
      epmet-module/resi-partymember/resi-partymember-server/Dockerfile
  52. 8
      epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml
  53. 2
      epmet-module/resi-voice/resi-voice-server/Dockerfile
  54. 6
      epmet-module/resi-voice/resi-voice-server/src/main/resources/bootstrap.yml
  55. 2
      epmet-openapi/epmet-openapi-scan/Dockerfile
  56. 6
      epmet-openapi/epmet-openapi-scan/src/main/resources/bootstrap.yml
  57. 8
      epmet-user/epmet-user-server/src/main/resources/bootstrap.yml

2
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"]

6
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秒,发出告警

2
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"]

6
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秒,发出告警

24
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/config/shutdown/GracefulShutdownConfig.java

@ -0,0 +1,24 @@
package com.epmet.commons.tools.config.shutdown;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
import org.springframework.boot.web.servlet.server.ServletWebServerFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
/**
* 优雅停机配置
* matchIfMissing:当缺少shutdown.graceful.enable配置的时候是否加载该配置类true:缺少也加载false:默认的缺少配置不加载即不生效
*/
@Configuration
@ConditionalOnProperty(prefix = "shutdown.graceful", name = "enable", havingValue = "true", matchIfMissing = false)
public class GracefulShutdownConfig {
@Bean
public ServletWebServerFactory servletContainer(GracefulShutdownTomcat gracefulShutdownTomcat) {
TomcatServletWebServerFactory tomcat = new TomcatServletWebServerFactory();
tomcat.addConnectorCustomizers(gracefulShutdownTomcat);
return tomcat;
}
}

52
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/config/shutdown/GracefulShutdownTomcat.java

@ -0,0 +1,52 @@
package com.epmet.commons.tools.config.shutdown;
import org.apache.catalina.connector.Connector;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.web.embedded.tomcat.TomcatConnectorCustomizer;
import org.springframework.context.ApplicationListener;
import org.springframework.context.event.ContextClosedEvent;
import org.springframework.stereotype.Component;
import java.util.concurrent.Executor;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
@EnableConfigurationProperties(ShutdownProperties.class)
@Component
@ConditionalOnProperty(prefix = "shutdown.graceful", name = "enable", havingValue = "true", matchIfMissing = false)
public class GracefulShutdownTomcat implements TomcatConnectorCustomizer, ApplicationListener<ContextClosedEvent> {
private static final Logger logger = LoggerFactory.getLogger(GracefulShutdownTomcat.class);
@Autowired
private ShutdownProperties shutdownProperties;
private volatile Connector connector;
@Override
public void customize(Connector connector) {
this.connector = connector;
}
@Override
public void onApplicationEvent(ContextClosedEvent contextClosedEvent) {
this.connector.pause();
Executor executor = this.connector.getProtocolHandler().getExecutor();
long waitTimeSecs = shutdownProperties.getGraceful().getWaitTimeSecs();
if (executor instanceof ThreadPoolExecutor) {
try {
ThreadPoolExecutor threadPoolExecutor = (ThreadPoolExecutor) executor;
threadPoolExecutor.shutdown();
if (!threadPoolExecutor.awaitTermination(waitTimeSecs, TimeUnit.SECONDS)) {
String msg = String.format("Tomcat在【%s】秒内优雅停机失败,请手动处理", waitTimeSecs);
logger.error(msg);
}
} catch (InterruptedException ex) {
Thread.currentThread().interrupt();
}
}
}
}

17
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/config/shutdown/ShutdownProperties.java

@ -0,0 +1,17 @@
package com.epmet.commons.tools.config.shutdown;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
@ConfigurationProperties(prefix = "shutdown")
@Data
public class ShutdownProperties {
private GracefulShutdownProperties graceful;
@Data
public static class GracefulShutdownProperties {
private long waitTimeSecs = 30;
}
}

2
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"]

2
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"]

8
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秒,发出告警

1
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"]

6
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秒,发出告警

2
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"]

2
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"]

8
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秒,发出告警

8
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秒,发出告警

6
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秒,发出告警

2
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"]

6
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秒,发出告警

2
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"]

8
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秒,发出告警

2
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"]

8
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秒,发出告警

2
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"]

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

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

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

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

2
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"]

8
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秒,发出告警

6
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秒,发出告警

2
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"]

6
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秒,发出告警

8
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秒,发出告警

2
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"]

9
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秒,发出告警

2
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"]

8
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秒,发出告警

2
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"]

8
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秒,发出告警

2
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"]

8
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秒,发出告警

2
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"]

8
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秒,发出告警

9
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/test/TestController.java

@ -18,4 +18,13 @@ public class TestController {
return new Result().ok(requestServerNameAndPort);
}
@PostMapping("shutdown")
public Result testShutdown() throws InterruptedException {
for (int i = 1; i <= 10; i++) {
System.out.println(i);
Thread.sleep(1000l);
}
return new Result();
}
}

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

@ -149,4 +149,10 @@ elink:
appId: @elink.mq.appId@ #项目接入亿联云的应用Id
token: @elink.mq.token@ #项目接入亿联云的应用token 相当于secret
host: @elink.mq.host@ #亿联云消息网关服务地址
sendMsgPath: @elink.mq.sendMsgPath@ #发送消息路径
sendMsgPath: @elink.mq.sendMsgPath@ #发送消息路径
# 停机选项
shutdown:
graceful:
enable: true #是否开启优雅停机
waitTimeSecs: 30 # 优雅停机等待时间,每超过30秒,打印一次错误日志

2
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"]

8
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秒,发出告警

6
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秒,发出告警

2
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"]

6
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秒,发出告警

6
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秒,发出告警

2
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"]

8
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秒,发出告警

2
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"]

6
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秒,发出告警

2
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"]

6
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秒,发出告警

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

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