From 4b06b886f355a45ee829871e1d8bf2130be5afcb Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Fri, 3 Jul 2020 15:46:46 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/log/controller/LogbackController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/log/controller/LogbackController.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/log/controller/LogbackController.java index 6dc83f5f5a..6fe7d96c16 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/log/controller/LogbackController.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/log/controller/LogbackController.java @@ -33,8 +33,8 @@ public class LogbackController { public String updateLogbackLevel( @RequestParam(value="level") String level, @RequestParam(value="packageName",defaultValue = "-1") String packageName) throws Exception { LoggerContext loggerContext =(LoggerContext) LoggerFactory.getILoggerFactory(); - log.info("动态修改日志级别入参, 日志级别level：", level); - log.info("动态修改日志级别入参, 包名packageName：", packageName); + log.info("动态修改日志级别入参, 日志级别level:" + level); + log.info("动态修改日志级别入参, 包名packageName:" + packageName); Logger logger= null; if("-1".equals(packageName)) { // 默认值-1，更改全局日志级别；否则按传递的包名或类名修改日志级别。 @@ -43,7 +43,7 @@ public class LogbackController { logger= loggerContext.getLogger(packageName); } logger.setLevel(Level.toLevel(level)); - log.info("动态修改日志级别, 修改后, 当前的日志级别", String.valueOf(logger.getLevel())); + log.info("动态修改日志级别, 修改后, 当前的日志级别:" + String.valueOf(logger.getLevel())); return String.valueOf(logger.getLevel()); } } From 8d71e5897175f69322858d98e87e544db9a2b019 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 3 Jul 2020 17:03:17 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=BA=A7=E5=88=AB=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../log/controller/LogbackController.java | 60 ++++++++++--------- 1 file changed, 33 insertions(+), 27 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/log/controller/LogbackController.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/log/controller/LogbackController.java index 6fe7d96c16..ad75129359 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/log/controller/LogbackController.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/log/controller/LogbackController.java @@ -1,8 +1,8 @@ package com.epmet.commons.tools.log.controller; -import ch.qos.logback.classic.LoggerContext; -import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.Level; +import ch.qos.logback.classic.Logger; +import ch.qos.logback.classic.LoggerContext; import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RestController; * logback日志级别动态切换 * 请求路径 .../log/setlevel * 根据参数(level、packageName)，设置某一个包或者具体的某一个类的日志打印级别 + * * @Auther: zhangyong * @Date: 2020-07-03 11:09 */ @@ -20,30 +21,35 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("/log") @RestController public class LogbackController { - private org.slf4j.Logger log = LoggerFactory.getLogger(LogbackController.class); + private org.slf4j.Logger log = LoggerFactory.getLogger(LogbackController.class); - /** - * logback动态修改包名的日志级别 - * @param level 日志级别 - * @param packageName 包名 - * @return 当前的日志级别 - * @throws Exception - */ - @GetMapping("/setlevel") - public String updateLogbackLevel( @RequestParam(value="level") String level, - @RequestParam(value="packageName",defaultValue = "-1") String packageName) throws Exception { - LoggerContext loggerContext =(LoggerContext) LoggerFactory.getILoggerFactory(); - log.info("动态修改日志级别入参, 日志级别level:" + level); - log.info("动态修改日志级别入参, 包名packageName:" + packageName); - Logger logger= null; - if("-1".equals(packageName)) { - // 默认值-1，更改全局日志级别；否则按传递的包名或类名修改日志级别。 - logger= loggerContext.getLogger("root"); - } else { - logger= loggerContext.getLogger(packageName); - } - logger.setLevel(Level.toLevel(level)); - log.info("动态修改日志级别, 修改后, 当前的日志级别:" + String.valueOf(logger.getLevel())); - return String.valueOf(logger.getLevel()); - } + /** + * logback动态修改包名的日志级别 排查完问题记得改回原来的级别 + * + * @param level 日志级别 + * @param packageName 包名或类名 + * @return 修改后的日志级别 + */ + @GetMapping("/setlevel") + public String updateLogbackLevel(@RequestParam(value = "level") String level, + @RequestParam(value = "packageName", defaultValue = "-1") String packageName) { + try { + LoggerContext loggerContext = (LoggerContext) LoggerFactory.getILoggerFactory(); + log.info("动态修改日志级别入参, 日志级别level:{},包名packageName:", level, packageName); + Logger logger = null; + if ("-1".equals(packageName)) { + // 默认值-1，更改全局日志级别；否则按传递的包名或类名修改日志级别。 + logger = loggerContext.getLogger("root"); + } else { + logger = loggerContext.getLogger(packageName); + } + Level preLevel = logger.getLevel(); + logger.setLevel(Level.toLevel(level)); + log.info("动态修改日志级别由【{}】 修改为【{}】", preLevel, logger.getLevel()); + return String.valueOf(logger.getLevel()); + } catch (Exception e) { + log.error("动态修改日志级别失败", e); + } + return null; + } } From 6467acd69fadc3bf7e4d4e6333076988af76def1 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 3 Jul 2020 17:04:27 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=BA=A7=E5=88=AB=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/commons/tools/log/controller/LogbackController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/log/controller/LogbackController.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/log/controller/LogbackController.java index ad75129359..44d856f0fe 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/log/controller/LogbackController.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/log/controller/LogbackController.java @@ -35,7 +35,7 @@ public class LogbackController { @RequestParam(value = "packageName", defaultValue = "-1") String packageName) { try { LoggerContext loggerContext = (LoggerContext) LoggerFactory.getILoggerFactory(); - log.info("动态修改日志级别入参, 日志级别level:{},包名packageName:", level, packageName); + log.info("动态修改日志级别入参, 日志级别level:{},包名packageName:{}", level, packageName); Logger logger = null; if ("-1".equals(packageName)) { // 默认值-1，更改全局日志级别；否则按传递的包名或类名修改日志级别。 From 183e8b355a8e106ef5d78075f86185ab7658ad0e Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 3 Jul 2020 17:09:27 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=92=89=E9=92=89=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical/data-statistical-server/pom.xml | 7 +++---- epmet-module/epmet-job/epmet-job-server/pom.xml | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 5c343b5600..4e473815d5 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -261,10 +261,9 @@ 8 10 30 - - - https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c - SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1 + + https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c + SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19 diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index 2458788f69..20df285c08 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -165,9 +165,9 @@ true - - https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c - SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1 + + https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c + SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19