diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/SendMessageServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/SendMessageServiceImpl.java index 0cca9b3e..81bc47be 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/SendMessageServiceImpl.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/SendMessageServiceImpl.java @@ -39,8 +39,6 @@ public class SendMessageServiceImpl implements SendMessageAPI { private ISysMessageTemplateService sysMessageTemplateService; @Value("${hiwork.isSend}") private Boolean isSend; - @Value("${hiwork.isHiworkDingDingSend}") - private Boolean isHiworkDingDingSend; @Value("${hiwork.hiworkUrlPrefix}") private String hiworkUrlPrefix; @@ -99,12 +97,13 @@ public class SendMessageServiceImpl implements SendMessageAPI { if ("5".equals(type)) { // Hiwork钉钉消息 sendMsgHandle = new DingDingSendMsgHandle(); - sendMsgHandle.SendMsg(sendMessageDTO.getToUserId(), sysMessageTemplate.getTemplateName(), sysMessageTemplate.getTemplateContent(), null, null); - + if (isSend) { + sendMsgHandle.SendMsg(sendMessageDTO.getToUserId(), sysMessageTemplate.getTemplateName(), sysMessageTemplate.getTemplateContent(), null, null); + } } else if ("6".equals(type)) { // Hiwork系统消息 sendMsgHandle = new SystemSendMsgHandle(); - if (isHiworkDingDingSend) { + if (isSend) { String messageUrl = hiworkUrlPrefix + finalOpenPage; sendMsgHandle.SendMsg(sendMessageDTO.getToUserId(), sysMessageTemplate.getTemplateName(), sysMessageTemplate.getTemplateContent(), finalOpenType, messageUrl); } diff --git a/laws-single-startup/src/main/resources/application-dev.yml b/laws-single-startup/src/main/resources/application-dev.yml index 33ce39e5..ea7a8648 100644 --- a/laws-single-startup/src/main/resources/application-dev.yml +++ b/laws-single-startup/src/main/resources/application-dev.yml @@ -416,8 +416,6 @@ hiwork: #hiwork单点登录 appkey: dingshfclphtivrd0r7k appsecret: dqhom_17n6BC8pmLeaf5wNp4aV_4XSt_aYn-dNBo8z__-79NjVvZhDJ_M2REdxRc - # dingding和Hiwork是否发送消息 - isHiworkSend: false #hiwork消息跳转前缀 hiworkUrlPrefix: "http://srms-test.sinotruk.com" diff --git a/laws-single-startup/src/main/resources/application-prod.yml b/laws-single-startup/src/main/resources/application-prod.yml index 143d5606..f78a8a40 100644 --- a/laws-single-startup/src/main/resources/application-prod.yml +++ b/laws-single-startup/src/main/resources/application-prod.yml @@ -388,8 +388,6 @@ hiwork: url: https://iam.sinotruk.com:7011/idp/oauth2/authorize?&state=123&client_id=SRMS&response_type=code&redirect_uri= fontUrl: http://srms.sinotruk.com{url}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId} fontAppUrl: http://222.175.158.138:8120/mobile{url}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId} - # dingding和Hiwork是否发送消息 - isHiworkDingDingSend: false #hiwork消息跳转前缀 hiworkUrlPrefix: "http://srms-test.sinotruk.com" diff --git a/laws-single-startup/src/main/resources/application-test.yml b/laws-single-startup/src/main/resources/application-test.yml index 0f8824a1..0c87c0de 100644 --- a/laws-single-startup/src/main/resources/application-test.yml +++ b/laws-single-startup/src/main/resources/application-test.yml @@ -388,8 +388,6 @@ hiwork: url: https://iam-uat.sinotruk.com:7011/idp/oauth2/authorize?&state=123&client_id=SRMS&response_type=code&redirect_uri= fontUrl: http://srms-test.sinotruk.com{url}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId} fontAppUrl: http://222.175.158.140:8120/mobile{url}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId} - # dingding和Hiwork是否发送消息 - isHiworkDingDingSend: true #hiwork消息跳转前缀 hiworkUrlPrefix: "http://srms-test.sinotruk.com"