Browse Source

部署通知 添加 服务版本号的获取

master
jianjun 5 years ago
parent
commit
651722d42e
  1. 3
      epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml
  2. 1
      epmet-auth/src/main/resources/bootstrap.yml
  3. 5
      epmet-commons/epmet-commons-tools/pom.xml
  4. 81
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/CustomerApplicationRunner.java
  5. 1
      epmet-gateway/src/main/resources/bootstrap.yml
  6. 3
      epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml
  7. 3
      epmet-module/data-report/data-report-server/src/main/resources/bootstrap.yml
  8. 1
      epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml
  9. 1
      epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/bootstrap.yml
  10. 3
      epmet-module/epmet-common-service/common-service-server/src/main/resources/bootstrap.yml
  11. 1
      epmet-module/epmet-demo/epmet-demo-server/src/main/resources/bootstrap.yml
  12. 3
      epmet-module/epmet-ext/epmet-ext-server/src/main/resources/bootstrap.yml
  13. 3
      epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml
  14. 1
      epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml
  15. 3
      epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml
  16. 3
      epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml
  17. 3
      epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml
  18. 7
      epmet-module/epmet-third/epmet-third-server/pom.xml
  19. 3
      epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml
  20. 3
      epmet-module/gov-access/gov-access-server/src/main/resources/bootstrap.yml
  21. 3
      epmet-module/gov-grid/gov-grid-server/src/main/resources/bootstrap.yml
  22. 1
      epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml
  23. 1
      epmet-module/gov-mine/gov-mine-server/src/main/resources/bootstrap.yml
  24. 3
      epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml
  25. 3
      epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml
  26. 3
      epmet-module/gov-voice/gov-voice-server/src/main/resources/bootstrap.yml
  27. 3
      epmet-module/oper-access/oper-access-server/src/main/resources/bootstrap.yml
  28. 3
      epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml
  29. 3
      epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml
  30. 3
      epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml
  31. 3
      epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml
  32. 1
      epmet-module/resi-hall/resi-hall-server/src/main/resources/bootstrap.yml
  33. 1
      epmet-module/resi-home/resi-home-server/src/main/resources/bootstrap.yml
  34. 1
      epmet-module/resi-mine/resi-mine-server/src/main/resources/bootstrap.yml
  35. 3
      epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml
  36. 1
      epmet-module/resi-voice/resi-voice-server/src/main/resources/bootstrap.yml
  37. 3
      epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/resources/bootstrap.yml
  38. 1
      epmet-openapi/epmet-openapi-scan/src/main/resources/bootstrap.yml
  39. 3
      epmet-user/epmet-user-server/src/main/resources/bootstrap.yml
  40. 28
      pom.xml

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

@ -1,5 +1,6 @@
server:
port: @server.port@
version: @version@
servlet:
context-path: /sys
@ -132,4 +133,4 @@ ribbon:
shutdown:
graceful:
enable: true #是否开启优雅停机
waitTimeSecs: 30 # 优雅停机等待时间,超过30秒,发出告警
waitTimeSecs: 30 # 优雅停机等待时间,超过30秒,发出告警

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

@ -1,5 +1,6 @@
server:
port: @server.port@
version: @version@
servlet:
context-path: /auth

5
epmet-commons/epmet-commons-tools/pom.xml

@ -149,6 +149,11 @@
<artifactId>commons-httpclient</artifactId>
<version>3.1</version>
</dependency>
<!-- 钉钉机器人 -->
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>alibaba-dingtalk-service-sdk</artifactId>
</dependency>
</dependencies>
<build>

81
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/CustomerApplicationRunner.java

@ -8,11 +8,17 @@
package com.epmet.commons.tools.aspect;
import com.alibaba.fastjson.JSON;
import com.dingtalk.api.DefaultDingTalkClient;
import com.dingtalk.api.DingTalkClient;
import com.dingtalk.api.request.OapiRobotSendRequest;
import com.dingtalk.api.response.OapiRobotSendResponse;
import com.epmet.commons.tools.dto.form.DingTalkTextMsg;
import com.epmet.commons.tools.enums.EnvEnum;
import com.epmet.commons.tools.utils.HttpClientManager;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.utils.SpringContextUtils;
import com.taobao.api.ApiException;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Value;
@ -35,32 +41,69 @@ public class CustomerApplicationRunner implements ApplicationRunner {
private static Logger logger = LogManager.getLogger(CustomerApplicationRunner.class);
@Value("${spring.application.name}")
private String appName;
@Value("${server.version}")
private String version;
@Override
public void run(ApplicationArguments args) {
//发送启动成功消息
EnvEnum currentEnv = EnvEnum.getCurrentEnv();
logger.info(currentEnv);
if (!EnvEnum.DEV.getCode().equals(currentEnv.getCode()) && !EnvEnum.LOCAL.getCode().equals(currentEnv.getCode())) {
InetUtils inetUtils = SpringContextUtils.getBean(InetUtils.class);
String serverIp = inetUtils.findFirstNonLoopbackHostInfo().getIpAddress();
//sendDingTextMsg();
sendDingMarkDownMsg();
}
}
private void sendDingTextMsg() {
//发送启动成功消息
InetUtils inetUtils = SpringContextUtils.getBean(InetUtils.class);
String serverIp = inetUtils.findFirstNonLoopbackHostInfo().getIpAddress();
//开发小组 群机器人地址
String url = "https://oapi.dingtalk.com/robot/send?access_token=ffd7c972b0525e249283df1a16b65a8b9d0012601f3a458dfc588c2eac497bb5";
StringBuilder stringBuilder = new StringBuilder();
stringBuilder.append(EnvEnum.getCurrentEnv().getName())
.append("【")
.append(appName)
.append("】")
.append("ip地址: ")
.append(serverIp)
.append("部署完毕!");
DingTalkTextMsg msg = new DingTalkTextMsg();
msg.setWebHook(url);
msg.setAtAll(true);
msg.setContent(stringBuilder.toString());
Result<String> stringResult = HttpClientManager.getInstance().sendPostByJSON(url, msg.getMsgContent());
logger.info(stringResult);
}
private String getServerIp() {
InetUtils inetUtils = SpringContextUtils.getBean(InetUtils.class);
return inetUtils.findFirstNonLoopbackHostInfo().getIpAddress();
}
private void sendDingMarkDownMsg() {
DingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/robot/send?access_token=ffd7c972b0525e249283df1a16b65a8b9d0012601f3a458dfc588c2eac497bb5");
OapiRobotSendRequest request = new OapiRobotSendRequest();
request.setMsgtype("markdown");
OapiRobotSendRequest.Markdown markdown = new OapiRobotSendRequest.Markdown();
markdown.setTitle("部署成功通知");
//开发小组 群机器人地址
String url = "https://oapi.dingtalk.com/robot/send?access_token=ffd7c972b0525e249283df1a16b65a8b9d0012601f3a458dfc588c2eac497bb5";
StringBuilder stringBuilder = new StringBuilder();
stringBuilder.append(EnvEnum.getCurrentEnv().getName())
.append("【")
.append(appName)
.append("】")
.append("ip地址: ")
.append(serverIp)
.append("部署完毕!");
DingTalkTextMsg msg = new DingTalkTextMsg();
msg.setWebHook(url);
msg.setAtAll(true);
msg.setContent(stringBuilder.toString());
Result<String> stringResult = HttpClientManager.getInstance().sendPostByJSON(url, msg.getMsgContent());
logger.info(stringResult);
markdown.setText("部署成功通知 \n" +
"> 服务:" + appName + "\n\n" +
"> 版本:" + version + "\n\n" +
"> 环境:" + EnvEnum.getCurrentEnv().getName() + "\n\n" +
"> IP: " + getServerIp() + "\n\n"
);
request.setMarkdown(markdown);
OapiRobotSendRequest.At at = new OapiRobotSendRequest.At();
at.setIsAtAll(true);
request.setAt(at);
try {
OapiRobotSendResponse execute = client.execute(request);
logger.info("=====通知结果===>" + JSON.toJSONString(execute));
} catch (ApiException e) {
logger.error("sendDingMarkDownMsg exception", e);
}
}

1
epmet-gateway/src/main/resources/bootstrap.yml

@ -2,6 +2,7 @@ server:
tomcat:
max-swallow-size: 100MB
port: @server.port@
version: @version@
servlet:
context-path: /api
spring:

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

@ -1,5 +1,6 @@
server:
port: @server.port@
version: @version@
servlet:
context-path: /data/aggregator
@ -153,4 +154,4 @@ dingTalk:
logging:
level:
com.epmet.dataaggre: debug
com.epmet.dataaggre: debug

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

@ -1,5 +1,6 @@
server:
port: @server.port@
version: @version@
servlet:
context-path: /data/report
@ -154,4 +155,4 @@ jwt:
shutdown:
graceful:
enable: true #是否开启优雅停机
waitTimeSecs: 30 # 优雅停机等待时间,超过30秒,发出告警
waitTimeSecs: 30 # 优雅停机等待时间,超过30秒,发出告警

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

@ -1,5 +1,6 @@
server:
port: @server.port@
version: @version@
servlet:
context-path: /data/stats

1
epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/bootstrap.yml

@ -1,5 +1,6 @@
server:
port: @server.port@
version: @version@
servlet:
context-path: /activiti

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

@ -1,5 +1,6 @@
server:
port: @server.port@
version: @version@
servlet:
context-path: /commonservice
@ -136,4 +137,4 @@ dingTalk:
shutdown:
graceful:
enable: true #是否开启优雅停机
waitTimeSecs: 30 # 优雅停机等待时间,超过30秒,发出告警
waitTimeSecs: 30 # 优雅停机等待时间,超过30秒,发出告警

1
epmet-module/epmet-demo/epmet-demo-server/src/main/resources/bootstrap.yml

@ -1,5 +1,6 @@
server:
port: @server.port@
version: @version@
servlet:
context-path: /demo

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

@ -1,5 +1,6 @@
server:
port: @server.port@
version: @version@
servlet:
context-path: /epmet/ext
@ -108,4 +109,4 @@ dingTalk:
shutdown:
graceful:
enable: true #是否开启优雅停机
waitTimeSecs: 30 # 优雅停机等待时间,超过30秒,发出告警
waitTimeSecs: 30 # 优雅停机等待时间,超过30秒,发出告警

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

@ -1,5 +1,6 @@
server:
port: @server.port@
version: @version@
servlet:
context-path: /heart
@ -143,4 +144,4 @@ dingTalk:
shutdown:
graceful:
enable: true #是否开启优雅停机
waitTimeSecs: 30 # 优雅停机等待时间,超过30秒,发出告警
waitTimeSecs: 30 # 优雅停机等待时间,超过30秒,发出告警

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

@ -1,5 +1,6 @@
server:
port: @server.port@
version: @version@
servlet:
context-path: /job

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

@ -1,5 +1,6 @@
server:
port: @server.port@
version: @version@
servlet:
context-path: /message
@ -142,4 +143,4 @@ shutdown:
rocketmq:
name-server: @rocketmq.nameserver@
producer:
group: @rocketmq.producer.group@
group: @rocketmq.producer.group@

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

@ -1,5 +1,6 @@
server:
port: @server.port@
version: @version@
servlet:
context-path: /oss
@ -139,4 +140,4 @@ dingTalk:
shutdown:
graceful:
enable: true #是否开启优雅停机
waitTimeSecs: 30 # 优雅停机等待时间,超过30秒,发出告警
waitTimeSecs: 30 # 优雅停机等待时间,超过30秒,发出告警

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

@ -1,5 +1,6 @@
server:
port: @server.port@
version: @version@
servlet:
context-path: /point
@ -135,4 +136,4 @@ dingTalk:
shutdown:
graceful:
enable: true #是否开启优雅停机
waitTimeSecs: 30 # 优雅停机等待时间,超过30秒,发出告警
waitTimeSecs: 30 # 优雅停机等待时间,超过30秒,发出告警

7
epmet-module/epmet-third/epmet-third-server/pom.xml

@ -148,13 +148,6 @@
<scope>compile</scope>
</dependency>
<!-- 钉钉机器人 -->
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>alibaba-dingtalk-service-sdk</artifactId>
<version>1.0.1</version>
</dependency>
</dependencies>
<build>

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

@ -1,5 +1,6 @@
server:
port: @server.port@
version: @version@
servlet:
context-path: /third
@ -145,4 +146,4 @@ dingTalk:
shutdown:
graceful:
enable: true #是否开启优雅停机
waitTimeSecs: 30 # 优雅停机等待时间,超过30秒,发出告警
waitTimeSecs: 30 # 优雅停机等待时间,超过30秒,发出告警

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

@ -1,5 +1,6 @@
server:
port: @server.port@
version: @version@
servlet:
context-path: /gov/access
@ -122,4 +123,4 @@ pagehelper:
#feign 日志需要该配置
logging:
level:
com.epmet: debug
com.epmet: debug

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

@ -1,5 +1,6 @@
server:
port: @server.port@
version: @version@
servlet:
context-path: /gov/grid
@ -85,4 +86,4 @@ dingTalk:
shutdown:
graceful:
enable: true #是否开启优雅停机
waitTimeSecs: 30 # 优雅停机等待时间,超过30秒,发出告警
waitTimeSecs: 30 # 优雅停机等待时间,超过30秒,发出告警

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

@ -1,5 +1,6 @@
server:
port: @server.port@
version: @version@
servlet:
context-path: /gov/issue

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

@ -1,5 +1,6 @@
server:
port: @server.port@
version: @version@
servlet:
context-path: /gov/mine

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

@ -1,5 +1,6 @@
server:
port: @server.port@
version: @version@
servlet:
context-path: /gov/org
@ -144,4 +145,4 @@ shutdown:
waitTimeSecs: 30 # 优雅停机等待时间,超过30秒,发出告警
rocketmq:
name-server: @rocketmq.nameserver@
name-server: @rocketmq.nameserver@

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

@ -1,5 +1,6 @@
server:
port: @server.port@
version: @version@
servlet:
context-path: /gov/project
@ -126,4 +127,4 @@ dingTalk:
shutdown:
graceful:
enable: true #是否开启优雅停机
waitTimeSecs: 30 # 优雅停机等待时间,超过30秒,发出告警
waitTimeSecs: 30 # 优雅停机等待时间,超过30秒,发出告警

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

@ -1,5 +1,6 @@
server:
port: @server.port@
version: @version@
servlet:
context-path: /gov/voice
@ -125,4 +126,4 @@ dingTalk:
shutdown:
graceful:
enable: true #是否开启优雅停机
waitTimeSecs: 30 # 优雅停机等待时间,超过30秒,发出告警
waitTimeSecs: 30 # 优雅停机等待时间,超过30秒,发出告警

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

@ -1,5 +1,6 @@
server:
port: @server.port@
version: @version@
servlet:
context-path: /oper/access
@ -128,4 +129,4 @@ dingTalk:
shutdown:
graceful:
enable: true #是否开启优雅停机
waitTimeSecs: 30 # 优雅停机等待时间,超过30秒,发出告警
waitTimeSecs: 30 # 优雅停机等待时间,超过30秒,发出告警

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

@ -1,5 +1,6 @@
server:
port: @server.port@
version: @version@
servlet:
context-path: /oper/crm
@ -134,4 +135,4 @@ dingTalk:
shutdown:
graceful:
enable: true #是否开启优雅停机
waitTimeSecs: 30 # 优雅停机等待时间,超过30秒,发出告警
waitTimeSecs: 30 # 优雅停机等待时间,超过30秒,发出告警

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

@ -1,5 +1,6 @@
server:
port: @server.port@
version: @version@
servlet:
context-path: /oper/customize
@ -131,4 +132,4 @@ rocketmq:
shutdown:
graceful:
enable: true #是否开启优雅停机
waitTimeSecs: 30 # 优雅停机等待时间,超过30秒,发出告警
waitTimeSecs: 30 # 优雅停机等待时间,超过30秒,发出告警

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

@ -1,5 +1,6 @@
server:
port: @server.port@
version: @version@
servlet:
context-path: /resi/group
@ -155,4 +156,4 @@ elink:
shutdown:
graceful:
enable: true #是否开启优雅停机
waitTimeSecs: 30 # 优雅停机等待时间,每超过30秒,打印一次错误日志
waitTimeSecs: 30 # 优雅停机等待时间,每超过30秒,打印一次错误日志

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

@ -1,5 +1,6 @@
server:
port: @server.port@
version: @version@
servlet:
context-path: /resi/guide
@ -129,4 +130,4 @@ dingTalk:
shutdown:
graceful:
enable: true #是否开启优雅停机
waitTimeSecs: 30 # 优雅停机等待时间,超过30秒,发出告警
waitTimeSecs: 30 # 优雅停机等待时间,超过30秒,发出告警

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

@ -1,5 +1,6 @@
server:
port: @server.port@
version: @version@
servlet:
context-path: /resi/hall

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

@ -1,5 +1,6 @@
server:
port: @server.port@
version: @version@
servlet:
context-path: /resi/home

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

@ -1,5 +1,6 @@
server:
port: @server.port@
version: @version@
servlet:
context-path: /resi/mine

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

@ -1,5 +1,6 @@
server:
port: @server.port@
version: @version@
servlet:
context-path: /resi/partymember
@ -128,4 +129,4 @@ dingTalk:
shutdown:
graceful:
enable: true #是否开启优雅停机
waitTimeSecs: 30 # 优雅停机等待时间,超过30秒,发出告警
waitTimeSecs: 30 # 优雅停机等待时间,超过30秒,发出告警

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

@ -1,5 +1,6 @@
server:
port: @server.port@
version: @version@
servlet:
context-path: /resi/voice

3
epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/resources/bootstrap.yml

@ -1,5 +1,6 @@
server:
port: @server.port@
version: @version@
servlet:
context-path: /adv
@ -136,4 +137,4 @@ pagehelper:
dingTalk:
robot:
webHook: @dingTalk.robot.webHook@
secret: @dingTalk.robot.secret@
secret: @dingTalk.robot.secret@

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

@ -1,5 +1,6 @@
server:
port: @server.port@
version: @version@
servlet:
context-path: /epmetscan

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

@ -1,5 +1,6 @@
server:
port: @server.port@
version: @version@
servlet:
context-path: /epmetuser
@ -153,4 +154,4 @@ rocketmq:
shutdown:
graceful:
enable: true #是否开启优雅停机
waitTimeSecs: 30 # 优雅停机等待时间,超过30秒,发出告警
waitTimeSecs: 30 # 优雅停机等待时间,超过30秒,发出告警

28
pom.xml

@ -76,17 +76,23 @@
<artifactId>springfox-swagger-ui</artifactId>
<version>${swagger.version}</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
</dependency>
<!--<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
<version>2.1.1.RELEASE</version>
</dependency>-->
</dependencies>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
</dependency>
<!--<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
<version>2.1.1.RELEASE</version>
</dependency>-->
<!-- 钉钉机器人 -->
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>alibaba-dingtalk-service-sdk</artifactId>
<version>1.0.1</version>
</dependency>
</dependencies>
</dependencyManagement>
<repositories>

Loading…
Cancel
Save