From f3a394ee5cb52db40878816b5913c0311f0151de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Mon, 11 Oct 2021 10:02:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=B3=BB=E7=BB=9Furl=EF=BC=8C=E5=B0=8F?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/common/enums/CompanyMessageEnums.java | 18 +++++++++--------- .../service/impl/SendMessageServiceImpl.java | 15 +++++++++++++++ .../src/main/resources/application-dev.yml | 6 +++++- .../src/main/resources/application-prod.yml | 6 +++++- .../src/main/resources/application-test.yml | 4 ++++ 5 files changed, 38 insertions(+), 11 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/CompanyMessageEnums.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/CompanyMessageEnums.java index d9dcee93..16d99fa3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/CompanyMessageEnums.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/CompanyMessageEnums.java @@ -12,18 +12,18 @@ import org.apache.commons.lang3.StringUtils; */ public enum CompanyMessageEnums { - MSG1("QY_1_HYTZ_WORK_GROUP_CREATE","会议通知","meetingName"),//点击跳转到报名页面，meetingName，busId - MSG2("QY_2_HYTZ_WORK_GROUP_SIGN_UP","会议通知","meetingName"),//弹窗：查看该会议详情，meetingName - MSG3("QY_3_HYTZ_WORK_GROUP_UPLOAD","会议通知","meetingName"),//弹窗：查看该会议详情，meetingName - MSG4("QY_4_HYTZ_WORK_GROUP_NOT_UPLOAD","会议通知","meetingName"),//弹窗：查看该会议详情，meetingName + MSG1("QY_1_HYTZ_WORK_GROUP_CREATE","会议通知","meetingName,busId"),//点击跳转到报名页面，meetingName，busId + MSG2("QY_2_HYTZ_WORK_GROUP_SIGN_UP","会议通知","meetingName,systemAddress,wxName"),//弹窗：查看该会议详情，meetingName，systemUrl，wxName + MSG3("QY_3_HYTZ_WORK_GROUP_UPLOAD","会议通知","meetingName,systemAddress,wxName"),//弹窗：查看该会议详情，meetingName，systemUrl，wxName + MSG4("QY_4_HYTZ_WORK_GROUP_NOT_UPLOAD","会议通知","meetingName,systemAddress,wxName"),//弹窗：查看该会议详情，meetingName，systemUrl，wxName MSG5("QY_5_HYTZ_NOT_AUDIT","会议通知","meetingName"),//弹窗：上传汇款凭证，meetingName - MSG6("QY_6_HYTZ_AUDIT","会议通知","meetingName"),//弹窗：查看该会议详情，meetingName - MSG7("QY_7_WJTZ_MEETING_SEND","文件通知","meetingName"),//弹窗：查看该会议详情，meetingName - MSG8("QY_8_HTTZ_PHASE","合同通知","contractName,num,amount"),//无，contract，num，amount + MSG6("QY_6_HYTZ_AUDIT","会议通知","meetingName,systemAddress,wxName"),//弹窗：查看该会议详情，meetingName，systemUrl，wxName + MSG7("QY_7_WJTZ_MEETING_SEND","文件通知","meetingName,systemAddress,wxName"),//弹窗：查看该会议详情，meetingName，systemUrl，wxName + MSG8("QY_8_HTTZ_PHASE","合同通知","contractName,num,amount"),//无，contract，num，amount 已去掉 MSG9("QY_9_YJTZ_MAIL","邮寄通知","projectName"),//查看该物流信息，projectName MSG10("QY_10_YJTZ_MAIL_CONTRACT","邮寄通知","contractName"),//查看该物流信息，contractName - MSG11("QY_11_CKTZ_PAY","催款通知","projectName"),//弹窗：查看该项目详情，projectName - MSG12("QY_12_WJTZ_WORK_GROUP_SEND","文件通知","workGroupName");//弹窗：查看该项目详情，workGroupName + MSG11("QY_11_CKTZ_PAY","催款通知","projectName"),//弹窗：查看该项目详情 + MSG12("QY_12_WJTZ_WORK_GROUP_SEND","文件通知","workGroupName,systemAddress,wxName");//弹窗：查看该项目详情，workGroupName，systemUrl，wxName private String code; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java index a03f909c..a1e9d603 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java @@ -29,6 +29,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; +import org.springframework.core.env.Environment; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -49,6 +50,8 @@ public class SendMessageServiceImpl implements SendMessageService { private ISysAnnouncementSendService sysAnnouncementSendService; @Resource private WebSocket webSocket; + @Resource + private Environment env; @Override public void SendMessageService(SendMessageDTO sendMessageDTO) { @@ -71,10 +74,22 @@ public class SendMessageServiceImpl implements SendMessageService { String content = sysSmsTemplate.getTemplateContent(); HashMap map = sendMessageDTO.getTemplateParam(); if(!Objects.isNull(map)) { + // 替换企业端系统url与小程序名称 + // todo 替换系统地址，小程序名称 + if(Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG2.getCode()) + || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG3.getCode()) + || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG4.getCode()) + || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG6.getCode()) + || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG7.getCode()) + || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG12.getCode())){ + map.put("systemAddress",env.getProperty("message.systemUrl")); + map.put("wxName",env.getProperty("message.wxName")); + } for (Map.Entry entry : map.entrySet()) { String str = "${" + entry.getKey() + "}"; content = content.replace(str, entry.getValue()); } + } // 1短信 2邮件 3系统 // 发送邮件 true diff --git a/jero-boot-single-startup/src/main/resources/application-dev.yml b/jero-boot-single-startup/src/main/resources/application-dev.yml index 5ffc3a66..3655f50c 100644 --- a/jero-boot-single-startup/src/main/resources/application-dev.yml +++ b/jero-boot-single-startup/src/main/resources/application-dev.yml @@ -316,4 +316,8 @@ huaWeiSms: standards: url: http://localhost:8081/api token: Aa123456!! - uesrname: admin \ No newline at end of file + uesrname: admin +#消息模板替换，系统url，小程序名称 +message: + systemUrl: https://www.baidu.com/ + wxName: '小程序名称' \ No newline at end of file diff --git a/jero-boot-single-startup/src/main/resources/application-prod.yml b/jero-boot-single-startup/src/main/resources/application-prod.yml index b7112cfa..7eb58962 100644 --- a/jero-boot-single-startup/src/main/resources/application-prod.yml +++ b/jero-boot-single-startup/src/main/resources/application-prod.yml @@ -286,4 +286,8 @@ justauth: cache: type: default prefix: 'demo::' - timeout: 1h \ No newline at end of file + timeout: 1h +#消息模板替换，系统url，小程序名称 +message: + systemUrl: https://www.baidu.com/ + wxName: '小程序名称' \ No newline at end of file diff --git a/jero-boot-single-startup/src/main/resources/application-test.yml b/jero-boot-single-startup/src/main/resources/application-test.yml index ac7de9c8..97f2bc8b 100644 --- a/jero-boot-single-startup/src/main/resources/application-test.yml +++ b/jero-boot-single-startup/src/main/resources/application-test.yml @@ -287,3 +287,7 @@ justauth: type: default prefix: 'demo::' timeout: 1h +#消息模板替换，系统url，小程序名称 +message: + systemUrl: https://www.baidu.com/ + wxName: '小程序名称'