From 6ca78abf8369455848c0caca9d3b6d7abe393386 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 3 Jul 2020 10:48:27 +0800 Subject: [PATCH 1/6] =?UTF-8?q?resigroup+1=EF=BC=9A=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=AF=9D=E9=A2=98=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi-group/resi-group-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/resi-group/resi-group-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml index da59714c77..d82eb93305 100644 --- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.55 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.56 ports: - "8095:8095" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index ee5b14c6f8..eca8e1153f 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.55 + 0.3.56 com.epmet resi-group From 5c5272d82743f6d400e16fb53ce79c724dfb1dc0 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 3 Jul 2020 11:13:00 +0800 Subject: [PATCH 2/6] =?UTF-8?q?gateway=E6=8E=92=E9=99=A4=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/GatewayApplication.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/epmet-gateway/src/main/java/com/epmet/GatewayApplication.java b/epmet-gateway/src/main/java/com/epmet/GatewayApplication.java index 352ae0df92..5c8d111813 100644 --- a/epmet-gateway/src/main/java/com/epmet/GatewayApplication.java +++ b/epmet-gateway/src/main/java/com/epmet/GatewayApplication.java @@ -8,11 +8,13 @@ package com.epmet; +import com.epmet.commons.tools.aspect.ServletExceptionHandler; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.FilterType; /** * 网关服务 @@ -20,9 +22,10 @@ import org.springframework.context.annotation.ComponentScan; * @author Mark sunlightcs@gmail.com * @since 1.0.0 */ -@SpringBootApplication +@SpringBootApplication() @EnableDiscoveryClient @EnableFeignClients +@ComponentScan(basePackages = {"com.epmet.*"}, excludeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = {ServletExceptionHandler.class})) public class GatewayApplication { public static void main(String[] args) { From 63a9b33551198fa6a9bb40bc118a43ff03c021a4 Mon Sep 17 00:00:00 2001 From: wangchao Date: Fri, 3 Jul 2020 11:38:54 +0800 Subject: [PATCH 3/6] =?UTF-8?q?user=E3=80=81group=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7+1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi-group/resi-group-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/resi-group/resi-group-server/pom.xml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-dev.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml index d82eb93305..794e3f1eb6 100644 --- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.56 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.57 ports: - "8095:8095" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index eca8e1153f..caa5ac9e36 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.56 + 0.3.57 com.epmet resi-group diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml index 7151b2b15d..8c9ec5d70f 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.68 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.69 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index e1f620d602..cd2023d224 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.68 + 0.3.69 com.epmet epmet-user From cf0402bb51f31ffaf8fa846b56f1e95d7b742e75 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 3 Jul 2020 13:09:54 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E9=92=89=E9=92=89=E6=9C=BA=E5=99=A8?= =?UTF-8?q?=E4=BA=BA=E6=B6=88=E6=81=AF=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/commons/tools/enums/EnvEnum.java | 44 +++++++++++ .../tools/filter/LogMsgSendFilter.java | 10 +++ .../tools/utils/DingdingMsgSender.java | 73 +++++++++++++++++-- .../data-statistical-server/pom.xml | 8 ++ .../com/epmet/controller/DemoController.java | 6 +- .../src/main/resources/bootstrap.yml | 7 +- .../src/main/resources/logback-spring.xml | 8 +- .../epmet-job/epmet-job-server/pom.xml | 8 +- .../src/main/resources/bootstrap.yml | 5 ++ .../src/main/resources/logback-spring.xml | 8 +- 10 files changed, 163 insertions(+), 14 deletions(-) create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/EnvEnum.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/EnvEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/EnvEnum.java new file mode 100644 index 0000000000..ed265248e6 --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/EnvEnum.java @@ -0,0 +1,44 @@ +package com.epmet.commons.tools.enums; + +/** + * 系统环境变量枚举类 + * dev|test|prod + * + * @author jianjun liu + * @date 2020-07-03 11:14 + **/ +public enum EnvEnum { + DEV("dev", "开发环境"), + TEST("test", "体验环境"), + PROD("prod", "生产环境"), + UN_KNOWN("un_known", "未知"), + ; + + private String code; + private String name; + + + + EnvEnum(String code, String name) { + this.code = code; + this.name = name; + } + + public static EnvEnum getEnum(String code) { + EnvEnum[] values = EnvEnum.values(); + for (EnvEnum value : values) { + if (code != null && value.getCode().equals(code)) { + return value; + } + } + return EnvEnum.UN_KNOWN; + } + + public String getCode() { + return code; + } + + public String getName() { + return name; + } +} diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java index f3c70840d6..2ffe50a5f4 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java @@ -7,6 +7,7 @@ import ch.qos.logback.classic.spi.IThrowableProxy; import ch.qos.logback.classic.spi.StackTraceElementProxy; import ch.qos.logback.core.spi.FilterReply; import com.epmet.commons.tools.dto.form.DingTalkTextMsg; +import com.epmet.commons.tools.enums.EnvEnum; import com.epmet.commons.tools.utils.DingdingMsgSender; import com.epmet.commons.tools.utils.IpUtils; import org.apache.commons.lang3.StringUtils; @@ -26,6 +27,7 @@ public class LogMsgSendFilter extends LevelFilter { private DingdingMsgSender msgSender = new DingdingMsgSender(); private String webHook; private String secret; + private String activeEnv; @Override public FilterReply decide(ILoggingEvent event) { @@ -39,6 +41,10 @@ public class LogMsgSendFilter extends LevelFilter { stringBuilder.append("告警级别：" + event.getLevel()); stringBuilder.append("\n"); + if (StringUtils.isNotBlank(activeEnv)) { + stringBuilder.append("告警环境：" + EnvEnum.getEnum(activeEnv).getName()); + stringBuilder.append("\n"); + } String serverIp = IpUtils.getServerIp(); if (StringUtils.isNotBlank(serverIp)) { stringBuilder.append("IP地址：" + serverIp); @@ -112,6 +118,10 @@ public class LogMsgSendFilter extends LevelFilter { return dateFormat.format(timestamp); } + public void setActiveEnv(String activeEnv) { + this.activeEnv = activeEnv; + } + public void setWebHook(String webHook) { this.webHook = webHook; } diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DingdingMsgSender.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DingdingMsgSender.java index 4250c158b8..59016ccc88 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DingdingMsgSender.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DingdingMsgSender.java @@ -2,6 +2,7 @@ package com.epmet.commons.tools.utils; import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.dto.form.DingTalkTextMsg; +import com.epmet.commons.tools.exception.EpmetErrorCode; import com.google.common.collect.Lists; import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang3.StringUtils; @@ -12,7 +13,12 @@ import org.springframework.stereotype.Component; import javax.annotation.PreDestroy; import javax.crypto.Mac; import javax.crypto.spec.SecretKeySpec; +import java.io.BufferedReader; import java.io.IOException; +import java.io.InputStreamReader; +import java.io.PrintWriter; +import java.net.URL; +import java.net.URLConnection; import java.net.URLEncoder; import java.util.concurrent.ArrayBlockingQueue; @@ -48,7 +54,7 @@ public class DingdingMsgSender { //阻塞取元素 msg = msgQueue.take(); if (msg != null) { - sendPostByJSON(msg); + sendMsg(msg); } else { Thread.sleep(1000); } @@ -81,7 +87,7 @@ public class DingdingMsgSender { DingTalkTextMsg param = new DingTalkTextMsg(); param.setContent("待发送消息队列已满,当前队列个数" + msgQueue.size() + "\n" + "最新消息内容:" + JSON.toJSONString(messageParam)); param.setWebHook(messageParam.getWebHook()); - sendPostByJSON(param); + sendMsg(param); } return flag; } @@ -94,7 +100,7 @@ public class DingdingMsgSender { * @throws IOException */ public Result sendMsgSync(DingTalkTextMsg messageParam) { - return sendPostByJSON(messageParam); + return sendMsg(messageParam); } private Thread getThread() { @@ -121,7 +127,7 @@ public class DingdingMsgSender { * @param param 请求参数，JSON格式 * @return */ - private Result sendPostByJSON(DingTalkTextMsg param) { + private Result sendMsg(DingTalkTextMsg param) { if (StringUtils.isBlank(param.getWebHook())) { param.setWebHook(webHook); } @@ -139,13 +145,70 @@ public class DingdingMsgSender { String url = param.getWebHook(); url = url.concat("×tamp=" + timestamp + "&sign=" + sign); String jsonStrParam = param.getMsgContent(); - result = HttpClientManager.getInstance().sendPostByJSON(url, jsonStrParam); + result = this.sendPostByJSON(url, jsonStrParam); } catch (Exception e) { logger.warn("sendPostByJSON error", e); } return result; } + /** + * 发送POST 请求 + * + * @param url 发送请求的 URL + * @param param 请求参数，JSON格式 + * @return + */ + public Result sendPostByJSON(String url, String param) throws IOException { + if (StringUtils.isEmpty(url) || StringUtils.isEmpty(param)) { + throw new IllegalArgumentException("参数不能为空"); + } + PrintWriter out = null; + BufferedReader in = null; + String result = ""; + try { + URL realUrl = new URL(url); + // 打开和URL之间的连接 + URLConnection conn = realUrl.openConnection(); + // 设置通用的请求属性 + conn.setRequestProperty("accept", "*/*"); + conn.setRequestProperty("Content-Type", "application/json"); + conn.setRequestProperty("connection", "Keep-Alive"); + conn.setRequestProperty("user-agent", + "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)"); + // 发送POST请求必须设置如下两行 + conn.setDoOutput(true); + conn.setDoInput(true); + // 获取URLConnection对象对应的输出流 + out = new PrintWriter(conn.getOutputStream()); + // 发送请求参数 + out.print(param); + // flush输出流的缓冲 + out.flush(); + // 定义BufferedReader输入流来读取URL的响应 + in = new BufferedReader( + new InputStreamReader(conn.getInputStream())); + String line; + while ((line = in.readLine()) != null) { + result += line; + } + } catch (Exception e) { + logger.warn("sendPostByJSON error", e); + return new Result().error(EpmetErrorCode.SERVER_ERROR.getCode(), e.getMessage()); + } finally { + try { + if (out != null) { + out.close(); + } + if (in != null) { + in.close(); + } + } catch (IOException ex) { + } + + } + return new Result().ok(result); + } public static void main(String[] args) { for (int i = 0; i < 50; i++) { diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 35dc700f49..5c343b5600 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -175,6 +175,10 @@ 8 10 30 + + + https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c + SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19 @@ -257,6 +261,10 @@ 8 10 30 + + + https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c + SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java index 5f562630dc..2bc11e4e43 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java @@ -27,9 +27,9 @@ public class DemoController { @GetMapping("testAlarm") public void testAlarm() { - for (int i = 0; i < 20; i++) { - log.error("测试消息"+i); - } + //for (int i = 0; i < 20; i++) { + log.error("测试消息"); + //} } @GetMapping("testtx") diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml index ad6caadfa5..c2ed87bf1e 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml @@ -162,4 +162,9 @@ thread: corePoolSize: @thread.pool.core-pool-size@ maxPoolSize: @thread.pool.max-pool-size@ queueCapacity: @thread.pool.queue-capacity@ - keepAlive: @thread.pool.keep-alive@ \ No newline at end of file + keepAlive: @thread.pool.keep-alive@ + +dingTalk: + robot: + webHook: @dingTalk.robot.webHook@ + secret: @dingTalk.robot.secret@ \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml index 39e86ff5ba..3d93d8a331 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml @@ -5,6 +5,9 @@ + + + ${appname} @@ -130,8 +133,9 @@ ERROR ACCEPT DENY - https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c - SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19 + ${activeEnv} + ${webHook} + ${secret} diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index 96844937f4..2458788f69 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -130,11 +130,14 @@ false + + https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c + SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19 test - @@ -162,6 +165,9 @@ true + + https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c + SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1 diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml index e7ace5304a..b8faf3661a 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml @@ -113,3 +113,8 @@ hystrix: ribbon: ReadTimeout: 300000 ConnectTimeout: 300000 + +dingTalk: + robot: + webHook: @dingTalk.robot.webHook@ + secret: @dingTalk.robot.secret@ diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-job/epmet-job-server/src/main/resources/logback-spring.xml index ba7a073bbe..9f63b9901f 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/resources/logback-spring.xml +++ b/epmet-module/epmet-job/epmet-job-server/src/main/resources/logback-spring.xml @@ -5,6 +5,9 @@ + + + ${appname} @@ -129,8 +132,9 @@ ERROR ACCEPT DENY - https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c - SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19 + ${activeEnv} + ${webHook} + ${secret} From 81d8a6c82b861f4261e51195d1b098a8b4664aee Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 3 Jul 2020 13:22:49 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E9=92=89=E9=92=89=E6=9C=BA=E5=99=A8?= =?UTF-8?q?=E4=BA=BA=E6=B6=88=E6=81=AF=E6=94=B9=E9=80=A0-=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=BA=94=E7=94=A8=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/filter/LogMsgSendFilter.java | 9 +++++ .../src/main/resources/logback-spring.xml | 1 + .../com/epmet/controller/DemoController.java | 33 +++++++++++++++++++ .../src/main/resources/logback-spring.xml | 1 + 4 files changed, 44 insertions(+) create mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/controller/DemoController.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java index 2ffe50a5f4..f97e405ed0 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java @@ -28,6 +28,7 @@ public class LogMsgSendFilter extends LevelFilter { private String webHook; private String secret; private String activeEnv; + private String appName; @Override public FilterReply decide(ILoggingEvent event) { @@ -41,6 +42,10 @@ public class LogMsgSendFilter extends LevelFilter { stringBuilder.append("告警级别：" + event.getLevel()); stringBuilder.append("\n"); + if (StringUtils.isNotBlank(appName)) { + stringBuilder.append("服务名称：" + appName); + stringBuilder.append("\n"); + } if (StringUtils.isNotBlank(activeEnv)) { stringBuilder.append("告警环境：" + EnvEnum.getEnum(activeEnv).getName()); stringBuilder.append("\n"); @@ -122,6 +127,10 @@ public class LogMsgSendFilter extends LevelFilter { this.activeEnv = activeEnv; } + public void setAppName(String appName) { + this.appName = appName; + } + public void setWebHook(String webHook) { this.webHook = webHook; } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml index 3d93d8a331..9a76a9c74f 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml @@ -136,6 +136,7 @@ ${activeEnv} ${webHook} ${secret} + ${appname} diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/controller/DemoController.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/controller/DemoController.java new file mode 100644 index 0000000000..ccb3d23d6a --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/controller/DemoController.java @@ -0,0 +1,33 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.epmet.controller; + +import io.swagger.annotations.Api; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 定时任务 + * + * @author Mark sunlightcs@gmail.com + */ +@Slf4j +@RestController +@RequestMapping("demo") +@Api(tags="定时任务") +public class DemoController { + @GetMapping("testAlarm") + public void testAlarm() { + //for (int i = 0; i < 20; i++) { + log.error("测试消息"); + //} + } +} diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-job/epmet-job-server/src/main/resources/logback-spring.xml index 9f63b9901f..fcfb1de19e 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/resources/logback-spring.xml +++ b/epmet-module/epmet-job/epmet-job-server/src/main/resources/logback-spring.xml @@ -135,6 +135,7 @@ ${activeEnv} ${webHook} ${secret} + ${appname} From a6f8e96cc2afb4c540a3d011a079addb5ceb03c5 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 3 Jul 2020 13:28:54 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E9=83=A8=E7=BD=B2job=20stats=20gateway?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-gateway/deploy/docker-compose-dev.yml | 2 +- epmet-gateway/pom.xml | 2 +- .../data-statistical-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- .../epmet-job/epmet-job-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-job/epmet-job-server/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/epmet-gateway/deploy/docker-compose-dev.yml b/epmet-gateway/deploy/docker-compose-dev.yml index f378a02aa6..531e9d965d 100644 --- a/epmet-gateway/deploy/docker-compose-dev.yml +++ b/epmet-gateway/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-gateway-server: container_name: epmet-gateway-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.19 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.20 ports: - "8080:8080" network_mode: host # 使用现有网络 diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index 9567738a36..511b0bd1cc 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.19 + 0.3.20 com.epmet epmet-cloud diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml index 4be99dbdd1..9e28314672 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.33 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.34 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index add9bb7ac4..351aa17623 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.33 + 0.3.34 data-statistical com.epmet diff --git a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml index d708a35ccd..a24b925af0 100644 --- a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-job-server: container_name: epmet-job-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.19 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.20 ports: - "8084:8084" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index 2458788f69..32aa2b4f6a 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.19 + 0.3.20 com.epmet epmet-job