diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java index 68915220c9..95b1afaa41 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java @@ -710,6 +710,7 @@ public class WorkActServiceImpl implements WorkActService { if(sendMessageRes.success()){ logger.info("给审核通过的用户发送消息成功"); } + logger.info("取消活动,开始推送微信订阅消息"); Result wxmpMsg = epmetMessageOpenFeignClient.sendWxSubscribeMessage(msgList); if (wxmpMsg.success()) { logger.info("给审核通过的用户推送微信订阅消息成功"); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java index 9e58336c61..735c82dda1 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java @@ -671,6 +671,7 @@ public class WorkActUserServiceImpl implements WorkActUserService { msg.setMessageContent(String.format(ActMessageConstant.AUDIT_REFUSED, actInfo.getTitle(), actUserRelationEntity.getFailureReason())); } list.add(msg); + logger.info("活动报名审核,开始推送微信订阅消息"); Result result = epmetMessageOpenFeignClient.sendWxSubscribeMessage(list); if (result.success()) { logger.info("审核成功,已成功发送微信订阅消息"); diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/constant/WxmpMessageConstant.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/constant/WxmpMessageConstant.java index 29c5df90c3..62c9e16dcb 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/constant/WxmpMessageConstant.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/constant/WxmpMessageConstant.java @@ -20,8 +20,6 @@ public interface WxmpMessageConstant { String AUTHORIZER_ACCESS_TOKEN = "authorizerAccessToken"; - String ACCESS_TOKEN_KEY_PRE = "epmet:wechartthird:authorizerrefreshtoken:"; - String RESI = "resi"; String GOV_REDIS = "work"; diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java index 962e44ac7f..68d33ded01 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java @@ -156,7 +156,7 @@ public class WxmpMessageServiceImpl implements WxmpMessageService { if (WxmpMessageConstant.GOV_DB.equals(msg.getClientType())) { clientTypeRedis = WxmpMessageConstant.GOV_REDIS; } - StringBuilder key = new StringBuilder(WxmpMessageConstant.ACCESS_TOKEN_KEY_PRE).append(msg.getCustomerId()).append(":").append(clientTypeRedis); + StringBuilder key = new StringBuilder(msg.getCustomerId()).append(":").append(clientTypeRedis); Map authorizerRefreshToken = new HashMap<>(); try { authorizerRefreshToken = wxmpMessageRedis.getAuthorizerRefreshToken(key.toString()); diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 2a72c38dc7..f2e814a0a4 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -496,6 +496,7 @@ public class IssueServiceImpl extends BaseServiceImpl imp msgIssue.setUserId(entity.getCreatedBy()); msgList.add(msgIssue); } + logger.info("议题关闭,开始推送微信订阅消息"); return epmetMessageOpenFeignClient.sendWxSubscribeMessage(msgList); } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java index c9cdefdf32..2532fee7ba 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java @@ -61,6 +61,8 @@ import com.epmet.service.ProjectService; import com.epmet.service.ProjectStaffService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -80,6 +82,7 @@ import java.util.stream.Collectors; @Slf4j public class ProjectProcessServiceImpl extends BaseServiceImpl implements ProjectProcessService { + protected static final Logger logger = LoggerFactory.getLogger(ProjectProcessServiceImpl.class); @Autowired private ProjectProcessRedis projectProcessRedis; @Autowired @@ -354,7 +357,8 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl implements ArticleService { + private Logger logger = LogManager.getLogger(ArticleServiceImpl.class); @Autowired private GovOrgOpenFeignClient govOrgOpenFeignClient; @Autowired @@ -1191,6 +1194,7 @@ public class ArticleServiceImpl extends BaseServiceImpl