From 52de7f17805e4e4cf54581e0e4fac6c92afb03b7 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 2 Jul 2020 15:03:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E5=A4=B1=E8=B4=A5=E7=9C=8B=E4=B8=8D=E5=88=B0=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=EF=BC=8C=E8=B0=83=E6=95=B4=E7=9B=B8=E5=BA=94=E7=9A=84?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=BA=A7=E5=88=AB=EF=BC=8C=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E7=AB=AF=E6=B7=BB=E5=8A=A0=E5=BA=94=E7=94=A8=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E6=8B=A6=E6=88=AA=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/aspect/ServletExceptionHandler.java | 31 +++++ .../epmet/commons/tools/utils/IpUtils.java | 120 ++++++++++-------- .../commons/tools/utils/ModuleUtils.java | 4 + .../controller/StatsPublicityController.java | 5 + .../src/main/resources/logback-spring.xml | 2 +- ...PublicityArticleSummaryDailyStatsTask.java | 6 +- .../task/PublicityTagUsedDailyStatsTask.java | 6 +- .../PublicityTagUsedMonthlyStatsTask.java | 6 +- ...ityTagUsedQuarterlyAndYearlyStatsTask.java | 6 +- .../PublicityTagViewedDailyStatsTask.java | 6 +- .../PublicityTagViewedMonthlyStatsTask.java | 6 +- ...gViewedQuarterlyAndYearlyhlyStatsTask.java | 6 +- .../epmet/task/StatsGroupAgencyDailyTask.java | 6 +- .../task/StatsGroupAgencyMonthlyTask.java | 6 +- .../epmet/task/StatsGroupGridDailyTask.java | 6 +- .../java/com/epmet/task/StatsIssueTask.java | 8 +- .../epmet/task/StatsProjectAgencyTask.java | 6 +- .../com/epmet/task/StatsProjectGridTask.java | 6 +- .../java/com/epmet/task/StatsTopicTask.java | 6 +- .../java/com/epmet/task/StatsUserTask.java | 6 +- .../epmet/task/SyncVotingCacheAndDbTask.java | 6 +- .../main/java/com/epmet/task/TestTask.java | 6 +- .../src/main/resources/logback-spring.xml | 5 +- 23 files changed, 159 insertions(+), 112 deletions(-) create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/ServletExceptionHandler.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/ServletExceptionHandler.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/ServletExceptionHandler.java new file mode 100644 index 0000000000..c30add7d5c --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/ServletExceptionHandler.java @@ -0,0 +1,31 @@ +package com.epmet.commons.tools.aspect;/** + * @author jianjun liu + * @email liujianjun@yunzongnet.com + * @date 2020-07-02 14:08 + **/ + +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.utils.Result; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; + +import javax.servlet.ServletException; + +/** + * desc： + * + * @author lyn + * @date 2020/7/2 14:08 + */ +@Slf4j +@ControllerAdvice +public class ServletExceptionHandler { + + @ExceptionHandler(ServletException.class) + public Result globalException(ServletException e) { + log.error("globalException", e); + return new Result().error(EpmetErrorCode.SERVER_ERROR.getCode(), EpmetErrorCode.SERVER_ERROR.getMsg()); + + } +} diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IpUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IpUtils.java index bde12725d9..9ed1317906 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IpUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IpUtils.java @@ -1,8 +1,8 @@ /** * Copyright (c) 2018 人人开源 All rights reserved. - * + *

* https://www.renren.io - * + *

* 版权所有，侵权必究！ */ @@ -14,9 +14,7 @@ import org.slf4j.LoggerFactory; import javax.servlet.http.HttpServletRequest; import java.net.InetAddress; -import java.net.NetworkInterface; -import java.net.SocketException; -import java.util.Enumeration; +import java.util.regex.Pattern; /** * IP工具类 @@ -26,59 +24,69 @@ import java.util.Enumeration; */ public class IpUtils { private static Logger logger = LoggerFactory.getLogger(IpUtils.class); + public static final String LOCALHOST = "127.0.0.1"; + + public static final String ANYHOST = "0.0.0.0"; + + private static final Pattern IP_PATTERN = Pattern.compile("\\d{1,3}(\\.\\d{1,3}){3,5}$"); + + public static String getIpAddr(HttpServletRequest request) { + String ip = null; + try { + ip = request.getHeader("x-forwarded-for"); + if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) { + ip = request.getHeader("Proxy-Client-IP"); + } + if (StringUtils.isEmpty(ip) || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + ip = request.getHeader("WL-Proxy-Client-IP"); + } + if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) { + ip = request.getHeader("HTTP_CLIENT_IP"); + } + if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) { + ip = request.getHeader("HTTP_X_FORWARDED_FOR"); + } + if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) { + ip = request.getRemoteAddr(); + } + } catch (Exception e) { + logger.error("IpUtils ERROR ", e); + } - public static String getIpAddr(HttpServletRequest request) { - String ip = null; - try { - ip = request.getHeader("x-forwarded-for"); - if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) { - ip = request.getHeader("Proxy-Client-IP"); - } - if (StringUtils.isEmpty(ip) || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { - ip = request.getHeader("WL-Proxy-Client-IP"); - } - if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) { - ip = request.getHeader("HTTP_CLIENT_IP"); - } - if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) { - ip = request.getHeader("HTTP_X_FORWARDED_FOR"); - } - if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) { - ip = request.getRemoteAddr(); - } - } catch (Exception e) { - logger.error("IpUtils ERROR ", e); - } + return ip; + } - return ip; - } + /** + * desc:获取本地Ip + * @return + */ + public static String getServerIp() { + String SERVER_IP = ""; + try { + /** + * 遍历本地网卡的方式，在云平台虚拟机取不到真正的ip + * @return + */ + InetAddress localAddress = InetAddress.getLocalHost(); + if (isValidAddress(localAddress)) { + return localAddress.getHostAddress(); + } + logger.warn("Could not get local host ip address"); + return null; + } catch (Exception e) { + logger.error("IpUtils getServerIp exception ", e); + } - /** - * desc:获取本地Ip - * @return - */ - public static String getServerIp(){ - String SERVER_IP = ""; - try { - Enumeration netInterfaces = NetworkInterface.getNetworkInterfaces(); - InetAddress ip = null; - while (netInterfaces.hasMoreElements()) { - NetworkInterface ni = (NetworkInterface) netInterfaces - .nextElement(); - ip = ni.getInetAddresses().nextElement(); - SERVER_IP = ip.getHostAddress(); - if (!ip.isSiteLocalAddress() && !ip.isLoopbackAddress() - && ip.getHostAddress().indexOf(":") == -1) { - SERVER_IP = ip.getHostAddress(); - break; - }else{ - ip = null; - } - } - } catch (SocketException e) { - logger.error("IpUtils getServerIp exception ", e); - } + return SERVER_IP; + } - return SERVER_IP; - } + private static boolean isValidAddress(InetAddress address) { + if (address == null || address.isLoopbackAddress()) + return false; + String name = address.getHostAddress(); + return (name != null + && !ANYHOST.equals(name) + && !LOCALHOST.equals(name) + && IP_PATTERN.matcher(name).matches()); + } } diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ModuleUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ModuleUtils.java index 0e13174032..7516f8c2cd 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ModuleUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ModuleUtils.java @@ -2,6 +2,7 @@ package com.epmet.commons.tools.utils; import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.constant.StrConstant; +import com.epmet.commons.tools.dto.form.DingTalkTextMsg; import com.epmet.commons.tools.exception.RenException; import lombok.extern.slf4j.Slf4j; import org.apache.commons.codec.CharEncoding; @@ -37,6 +38,9 @@ public class ModuleUtils { String errorMessage = "Failure to connect " + serverName; String errorLog = errorMessage + "::[method]->{}::[params]->{}"; log.error(errorLog, methodName, JSON.toJSONString(params)); + DingdingMsgSender msgSender = new DingdingMsgSender(); + DingTalkTextMsg dingTalkTextMsg = new DingTalkTextMsg(); + msgSender.sendMsgAsync(dingTalkTextMsg); return new Result().error(); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsPublicityController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsPublicityController.java index d979c9d3eb..c544d2d3b2 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsPublicityController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsPublicityController.java @@ -59,6 +59,7 @@ public class StatsPublicityController { */ @PostMapping(value = "tagUsedMonthlyStatsjob") public Result tagUsedMonthlyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO) { + log.debug("tagUsedMonthlyStatsjob param:{}", JSON.toJSONString(formDTO)); return new Result().ok(statsPublicityService.tagUsedMonthlyStatsjob(formDTO)); } @@ -70,6 +71,7 @@ public class StatsPublicityController { */ @PostMapping(value = "tagUsedQuarterlyStatsjob") public Result tagUsedQuarterlyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO) { + log.debug("tagUsedQuarterlyStatsjob param:{}", JSON.toJSONString(formDTO)); return new Result().ok(statsPublicityService.tagUsedQuarterlyStatsjob(formDTO)); } @@ -81,6 +83,7 @@ public class StatsPublicityController { */ @PostMapping(value = "tagViewedDailyStatsjob") public Result tagViewedDailyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO) { + log.debug("tagViewedDailyStatsjob param:{}", JSON.toJSONString(formDTO)); return new Result().ok(statsPublicityService.tagViewedDailyStatsjob(formDTO)); } @@ -92,6 +95,7 @@ public class StatsPublicityController { */ @PostMapping(value = "tagViewedMonthlyStatsjob") public Result tagViewedMonthlyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO) { + log.debug("tagViewedMonthlyStatsjob param:{}", JSON.toJSONString(formDTO)); return new Result().ok(statsPublicityService.tagViewedMonthlyStatsjob(formDTO)); } @@ -103,6 +107,7 @@ public class StatsPublicityController { */ @PostMapping(value = "tagViewedQuarterlyStatsjob") public Result tagViewedQuarterlyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO) { + log.debug("tagViewedQuarterlyStatsjob param:{}", JSON.toJSONString(formDTO)); return new Result().ok(statsPublicityService.tagViewedQuarterlyStatsjob(formDTO)); } } 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 fb3deaefb1..39e86ff5ba 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 @@ -125,7 +125,7 @@ 15 - + ERROR ACCEPT diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityArticleSummaryDailyStatsTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityArticleSummaryDailyStatsTask.java index 1b2f7a37e8..c54d33e9fc 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityArticleSummaryDailyStatsTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityArticleSummaryDailyStatsTask.java @@ -23,16 +23,16 @@ public class PublicityArticleSummaryDailyStatsTask implements ITask { @Override public void run(String params) { - logger.debug("publicityArticleSummaryDailyStatsTask定时任务正在执行，参数为：{}", params); + logger.info("publicityArticleSummaryDailyStatsTask定时任务正在执行，参数为：{}", params); StatsFormDTO formDTO = null; if (StringUtils.isNotBlank(params)){ formDTO = JSON.parseObject(params,StatsFormDTO.class); } Result result = statsPublicityTaskService.articleSummaryDailyStatsjob(formDTO); if (result.success()) { - logger.debug("publicityArticleSummaryDailyStatsTask定时任务正在执行定时任务执行成功"); + logger.info("publicityArticleSummaryDailyStatsTask定时任务执行成功"); } else { - logger.debug("publicityArticleSummaryDailyStatsTask定时任务正在执行定时任务执行失败:" + result.getMsg()); + logger.error("publicityArticleSummaryDailyStatsTask定时任务正在执行定时任务执行失败:" + result.getMsg()); } } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedDailyStatsTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedDailyStatsTask.java index 7888be0829..5a24815c26 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedDailyStatsTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedDailyStatsTask.java @@ -23,16 +23,16 @@ public class PublicityTagUsedDailyStatsTask implements ITask { @Override public void run(String params) { - logger.debug("publicityTagUsedDailyStatsjob定时任务正在执行，参数为：{}", params); + logger.info("publicityTagUsedDailyStatsTask定时任务正在执行，参数为：{}", params); StatsFormDTO formDTO = null; if (StringUtils.isNotBlank(params)){ formDTO = JSON.parseObject(params,StatsFormDTO.class); } Result result = statsPublicityTaskService.tagUsedDailyStatsjob(formDTO); if (result.success()) { - logger.debug("publicityTagUsedDailyStatsjob定时任务正在执行定时任务执行成功"); + logger.info("publicityTagUsedDailyStatsTask定时任务执行成功"); } else { - logger.debug("publicityTagUsedDailyStatsjob定时任务正在执行定时任务执行失败:" + result.getMsg()); + logger.error("publicityTagUsedDailyStatsTask定时任务执行失败:" + result.getMsg()); } } } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedMonthlyStatsTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedMonthlyStatsTask.java index 09857791e3..19d437e0f9 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedMonthlyStatsTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedMonthlyStatsTask.java @@ -23,16 +23,16 @@ public class PublicityTagUsedMonthlyStatsTask implements ITask { @Override public void run(String params) { - logger.debug("publicityTagUsedMonthlyStatsjob定时任务正在执行，参数为：{}", params); + logger.info("publicityTagUsedMonthlyStatsTask定时任务正在执行，参数为：{}", params); StatsFormDTO formDTO = null; if (StringUtils.isNotBlank(params)){ formDTO = JSON.parseObject(params,StatsFormDTO.class); } Result result = statsPublicityTaskService.tagUsedMonthlyStatsjob(formDTO); if (result.success()) { - logger.debug("publicityTagUsedMonthlyStatsjob定时任务正在执行定时任务执行成功"); + logger.info("publicityTagUsedMonthlyStatsTask定时任务执行成功"); } else { - logger.debug("publicityTagUsedMonthlyStatsjob定时任务正在执行定时任务执行失败:" + result.getMsg()); + logger.error("publicityTagUsedMonthlyStatsTask定时任务执行失败:" + result.getMsg()); } } } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedQuarterlyAndYearlyStatsTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedQuarterlyAndYearlyStatsTask.java index 40b570a036..cfa9b2dc0e 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedQuarterlyAndYearlyStatsTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedQuarterlyAndYearlyStatsTask.java @@ -23,16 +23,16 @@ public class PublicityTagUsedQuarterlyAndYearlyStatsTask implements ITask { @Override public void run(String params) { - logger.debug("publicityTagUsedMonthlyStatsjob定时任务正在执行，参数为：{}", params); + logger.info("publicityTagUsedQuarterlyAndYearlyStatsTask定时任务正在执行，参数为：{}", params); StatsFormDTO formDTO = null; if (StringUtils.isNotBlank(params)){ formDTO = JSON.parseObject(params,StatsFormDTO.class); } Result result = statsPublicityTaskService.tagUsedQuarterlyStatsjob(formDTO); if (result.success()) { - logger.debug("publicityTagUsedMonthlyStatsjob定时任务正在执行定时任务执行成功"); + logger.info("publicityTagUsedQuarterlyAndYearlyStatsTask定时任务执行成功"); } else { - logger.debug("publicityTagUsedMonthlyStatsjob定时任务正在执行定时任务执行失败:" + result.getMsg()); + logger.error("publicityTagUsedQuarterlyAndYearlyStatsTask定时任务执行失败:" + result.getMsg()); } } } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedDailyStatsTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedDailyStatsTask.java index 83376f511c..14450ac329 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedDailyStatsTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedDailyStatsTask.java @@ -23,16 +23,16 @@ public class PublicityTagViewedDailyStatsTask implements ITask { @Override public void run(String params) { - logger.debug("publicityTagViewedDailyStatsTask定时任务正在执行，参数为：{}", params); + logger.info("publicityTagViewedDailyStatsTask定时任务正在执行，参数为：{}", params); StatsFormDTO formDTO = null; if (StringUtils.isNotBlank(params)){ formDTO = JSON.parseObject(params,StatsFormDTO.class); } Result result = statsPublicityTaskService.tagViewedDailyStatsjob(formDTO); if (result.success()) { - logger.debug("publicityTagViewedDailyStatsTask定时任务正在执行定时任务执行成功"); + logger.info("publicityTagViewedDailyStatsTask定时任务执行成功"); } else { - logger.debug("publicityTagViewedDailyStatsTask定时任务正在执行定时任务执行失败:" + result.getMsg()); + logger.error("publicityTagViewedDailyStatsTask定时任务执行失败:" + result.getMsg()); } } } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedMonthlyStatsTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedMonthlyStatsTask.java index a42e1d02ee..09056774a1 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedMonthlyStatsTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedMonthlyStatsTask.java @@ -23,16 +23,16 @@ public class PublicityTagViewedMonthlyStatsTask implements ITask { @Override public void run(String params) { - logger.debug("publicityTagViewedMonthlyStatsTask定时任务正在执行，参数为：{}", params); + logger.info("publicityTagViewedMonthlyStatsTask定时任务正在执行，参数为：{}", params); StatsFormDTO formDTO = null; if (StringUtils.isNotBlank(params)){ formDTO = JSON.parseObject(params,StatsFormDTO.class); } Result result = statsPublicityTaskService.tagViewedMonthlyStatsjob(formDTO); if (result.success()) { - logger.debug("publicityTagViewedMonthlyStatsTask定时任务正在执行定时任务执行成功"); + logger.info("publicityTagViewedMonthlyStatsTask定时任务执行成功"); } else { - logger.debug("publicityTagViewedMonthlyStatsTask定时任务正在执行定时任务执行失败:" + result.getMsg()); + logger.error("publicityTagViewedMonthlyStatsTask定时任务执行失败:" + result.getMsg()); } } } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedQuarterlyAndYearlyhlyStatsTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedQuarterlyAndYearlyhlyStatsTask.java index 837f7066f2..3b7ed865bb 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedQuarterlyAndYearlyhlyStatsTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedQuarterlyAndYearlyhlyStatsTask.java @@ -23,16 +23,16 @@ public class PublicityTagViewedQuarterlyAndYearlyhlyStatsTask implements ITask { @Override public void run(String params) { - logger.debug("publicityTagViewedMonthlyStatsTask定时任务正在执行，参数为：{}", params); + logger.info("publicityTagViewedMonthlyStatsTask定时任务正在执行，参数为：{}", params); StatsFormDTO formDTO = null; if (StringUtils.isNotBlank(params)){ formDTO = JSON.parseObject(params,StatsFormDTO.class); } Result result = statsPublicityTaskService.tagViewedQuarterlyStatsjob(formDTO); if (result.success()) { - logger.debug("publicityTagViewedMonthlyStatsTask定时任务正在执行定时任务执行成功"); + logger.info("publicityTagViewedMonthlyStatsTask定时任务执行成功"); } else { - logger.debug("publicityTagViewedMonthlyStatsTask定时任务正在执行定时任务执行失败:" + result.getMsg()); + logger.error("publicityTagViewedMonthlyStatsTask定时任务执行失败:" + result.getMsg()); } } } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupAgencyDailyTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupAgencyDailyTask.java index 57bd68bfc8..f5ff55f74e 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupAgencyDailyTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupAgencyDailyTask.java @@ -23,12 +23,12 @@ public class StatsGroupAgencyDailyTask implements ITask { @Override public void run(String params) { - logger.debug("StatsGroupAgencyDailyTask定时任务正在执行，参数为：{}", params); + logger.info("StatsGroupAgencyDailyTask定时任务正在执行，参数为：{}", params); Result result = statsGroupService.groupAgencyDaily(params); if (result.success()){ - logger.debug("StatsGroupAgencyDailyTask定时任务正在执行定时任务执行成功"); + logger.info("StatsGroupAgencyDailyTask定时任务执行成功"); }else { - logger.debug("StatsGroupAgencyDailyTask定时任务正在执行定时任务执行失败:" + result.getMsg()); + logger.error("StatsGroupAgencyDailyTask定时任务执行失败:" + result.getMsg()); } } } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupAgencyMonthlyTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupAgencyMonthlyTask.java index 3841ed339e..503f8937fb 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupAgencyMonthlyTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupAgencyMonthlyTask.java @@ -23,12 +23,12 @@ public class StatsGroupAgencyMonthlyTask implements ITask { @Override public void run(String params) { - logger.debug("StatsGroupAgencyMonthlyTask定时任务正在执行，参数为：{}", params); + logger.info("StatsGroupAgencyMonthlyTask定时任务正在执行，参数为：{}", params); Result result = statsGroupService.groupAgencyMonthly(params); if (result.success()){ - logger.debug("StatsGroupAgencyMonthlyTask定时任务正在执行定时任务执行成功"); + logger.info("StatsGroupAgencyMonthlyTask定时任务执行成功"); }else { - logger.debug("StatsGroupAgencyMonthlyTask定时任务正在执行定时任务执行失败:" + result.getMsg()); + logger.error("StatsGroupAgencyMonthlyTask定时任务执行失败:" + result.getMsg()); } } } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupGridDailyTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupGridDailyTask.java index f666e4340c..7d9ad946a5 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupGridDailyTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupGridDailyTask.java @@ -24,12 +24,12 @@ public class StatsGroupGridDailyTask implements ITask { @Override public void run(String params) { - logger.debug("StatsGroupGridDailyTask定时任务正在执行，参数为：{}", params); + logger.info("StatsGroupGridDailyTask定时任务正在执行，参数为：{}", params); Result result = statsGroupService.groupGridDaily(params); if (result.success()){ - logger.debug("StatsGroupGridDailyTask定时任务正在执行定时任务执行成功"); + logger.info("StatsGroupGridDailyTask定时任务执行成功"); }else { - logger.debug("StatsGroupGridDailyTask定时任务正在执行定时任务执行失败:" + result.getMsg()); + logger.error("StatsGroupGridDailyTask定时任务执行失败:" + result.getMsg()); } } } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsIssueTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsIssueTask.java index 742974bb50..a69eebd61a 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsIssueTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsIssueTask.java @@ -3,10 +3,8 @@ package com.epmet.task; import com.epmet.commons.tools.utils.Result; import com.epmet.service.StatsIssueService; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.logging.Log; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import org.springframework.stereotype.Service; /** * @author zhaoqifeng @@ -21,12 +19,12 @@ public class StatsIssueTask implements ITask { @Override public void run(String params) { - log.debug("StatsGroupGridDailyTask定时任务正在执行，参数为：{}", params); + log.info("StatsGroupGridDailyTask定时任务正在执行，参数为：{}", params); Result result = statsIssueService.agencyGridIssueStats(params); if (result.success()){ - log.debug("StatsGroupGridDailyTask定时任务正在执行定时任务执行成功"); + log.info("StatsGroupGridDailyTask定时任务执行成功"); }else { - log.debug("StatsGroupGridDailyTask定时任务正在执行定时任务执行失败:" + result.getMsg()); + log.error("StatsGroupGridDailyTask定时任务执行失败:" + result.getMsg()); } } } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsProjectAgencyTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsProjectAgencyTask.java index f257476159..652a429082 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsProjectAgencyTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsProjectAgencyTask.java @@ -21,12 +21,12 @@ public class StatsProjectAgencyTask implements ITask { @Override public void run(String params) { - log.debug("StatsProjectAgencyTask定时任务正在执行，参数为：{}", params); + log.info("StatsProjectAgencyTask定时任务正在执行，参数为：{}", params); Result result = statsProjectService.agencyProjectStats(params); if (result.success()){ - log.debug("StatsProjectAgencyTask定时任务正在执行定时任务执行成功"); + log.info("StatsProjectAgencyTask定时任务执行成功"); }else { - log.debug("StatsProjectAgencyTask定时任务正在执行定时任务执行失败:" + result.getMsg()); + log.error("StatsProjectAgencyTask定时任务执行失败:" + result.getMsg()); } } } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsProjectGridTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsProjectGridTask.java index 8d858bdde0..f8c66fd0e6 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsProjectGridTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsProjectGridTask.java @@ -24,12 +24,12 @@ public class StatsProjectGridTask implements ITask { @Override public void run(String params) { - log.debug("StatsProjectGridTask定时任务正在执行，参数为：{}", params); + log.info("StatsProjectGridTask定时任务正在执行，参数为：{}", params); Result result = statsProjectService.gridProjectStats(params); if (result.success()){ - log.debug("StatsProjectGridTask定时任务正在执行定时任务执行成功"); + log.info("StatsProjectGridTask定时任务执行成功"); }else { - log.debug("StatsProjectGridTask定时任务正在执行定时任务执行失败:" + result.getMsg()); + log.error("StatsProjectGridTask定时任务执行失败:" + result.getMsg()); } } } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsTopicTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsTopicTask.java index 6570e33b24..1f454d0f79 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsTopicTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsTopicTask.java @@ -23,12 +23,12 @@ public class StatsTopicTask implements ITask { @Override public void run(String params) { - logger.debug("StatsTopicTask定时任务正在执行，参数为：{}", params); + logger.info("StatsTopicTask定时任务正在执行，参数为：{}", params); Result result = statsTopicService.execTopicStatistical(params); if (result.success()){ - logger.debug("StatsTopicTask定时任务正在执行定时任务执行成功"); + logger.info("StatsTopicTask定时任务执行成功"); }else { - logger.debug("StatsTopicTask定时任务正在执行定时任务执行失败:" + result.getMsg()); + logger.error("StatsTopicTask定时任务执行失败:" + result.getMsg()); } } } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsUserTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsUserTask.java index 9fda8cfc88..d8d5fffe80 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsUserTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsUserTask.java @@ -23,12 +23,12 @@ public class StatsUserTask implements ITask { @Override public void run(String params) { - logger.debug("StatsUserTask定时任务正在执行，参数为：{}", params); + logger.info("StatsUserTask定时任务正在执行，参数为：{}", params); Result result = statsUserService.execUserStatistical(params); if (result.success()){ - logger.debug("StatsUserTask定时任务正在执行定时任务执行成功"); + logger.info("StatsUserTask定时任务执行成功"); }else { - logger.debug("StatsUserTask定时任务正在执行定时任务执行失败:" + result.getMsg()); + logger.error("StatsUserTask定时任务执行失败:" + result.getMsg()); } } } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/SyncVotingCacheAndDbTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/SyncVotingCacheAndDbTask.java index 9eed75bb68..6aa67834da 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/SyncVotingCacheAndDbTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/SyncVotingCacheAndDbTask.java @@ -22,12 +22,12 @@ public class SyncVotingCacheAndDbTask implements ITask { @Override public void run(String params) { - logger.debug("syncVotingCacheAndDbTask定时任务正在执行，参数为：{}", params); + logger.info("syncVotingCacheAndDbTask定时任务正在执行，参数为：{}", params); Result result = syncVotingCacheAndDbService.syncVotingCacheAndDb(); if(result.success()){ - logger.debug("syncVotingCacheAndDbTask定时任务正在执行定时任务执行成功"); + logger.info("syncVotingCacheAndDbTask定时任务执行成功"); }else{ - logger.debug("syncVotingCacheAndDbTask定时任务正在执行定时任务执行失败:"+result.getMsg()); + logger.debug("syncVotingCacheAndDbTask定时任务执行失败:"+result.getMsg()); } } } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/TestTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/TestTask.java index dad7a9c129..d04984b1db 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/TestTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/TestTask.java @@ -30,12 +30,12 @@ public class TestTask implements ITask{ private TestTaskService testTaskService; @Override public void run(String params){ - logger.debug("TestTask定时任务正在执行，参数为：{}", params); + logger.info("TestTask定时任务正在执行，参数为：{}", params); Result result=testTaskService.testTask(params); if(result.success()){ - logger.debug("TestTask定时任务执行成功"); + logger.info("TestTask定时任务执行成功"); }else{ - logger.debug("TestTask定时任务执行失败:"+result.getMsg()); + logger.error("TestTask定时任务执行失败:"+result.getMsg()); } } } 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 623abe55c8..ba7a073bbe 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 @@ -125,11 +125,12 @@ 15 - - + ERROR ACCEPT DENY + https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c + SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19