From 8a0526e7b94a7e9a39d97495ca48d593bd06e724 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 22 Oct 2021 17:54:01 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=B7=A5=E4=BD=9C=E7=BB=84=E4=BC=9A?= =?UTF-8?q?=E8=AE=AE=E5=8F=91=E5=B8=83=E5=90=8E=EF=BC=8C=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=B8=AD=E7=9A=84=E9=93=BE=E6=8E=A5=E5=92=8C?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E4=B8=8D=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/jero/common/enums/MessageUrlEnums.java | 2 +- .../jero/common/service/impl/SendMessageServiceImpl.java | 6 +++++- .../src/main/resources/application-dev.yml | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageUrlEnums.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageUrlEnums.java index d1664c4e..d37f10d3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageUrlEnums.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageUrlEnums.java @@ -22,7 +22,7 @@ public enum MessageUrlEnums { M_OPEN_TYPE8("M_OPEN_TYPE8","url","/incomePayments/meetManage/SignUpInfoDetail"), M_OPEN_TYPE9("M_OPEN_TYPE9","url","/businessManagement/BusinessManagement"), // todo 待定企业端 - C_OPEN_TYPE1("C_OPEN_TYPE1","href","http://localhost:3000/signUpEntrance?id"), + C_OPEN_TYPE1("C_OPEN_TYPE1","href",""), C_OPEN_TYPE2("C_OPEN_TYPE2","component","MessagePage/MeetingDetailModal"), C_OPEN_TYPE3("C_OPEN_TYPE3","component","MessagePage/MeetingDetailModal"), C_OPEN_TYPE4("C_OPEN_TYPE4","component","MessagePage/MeetingDetailModal"), 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 482c4ce1..3cf1ddb6 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 @@ -159,7 +159,11 @@ public class SendMessageServiceImpl implements SendMessageService { announcement.setBusType(busType); if(!StringUtils.isEmpty(busType)){ announcement.setOpenType(MessageUrlEnums.getByType(busType).getOpenType()); - announcement.setOpenPage(MessageUrlEnums.getByType(busType).getOpenPage()); + String openPage = MessageUrlEnums.getByType(busType).getOpenPage(); + if (StringUtils.isBlank(openPage)){ + openPage = env.getProperty("message.openPage"); + } + announcement.setOpenPage(openPage); } announcement.setTemplateCode(sendMessageDTO.getTemplateCode()); sysAnnouncementService.save(announcement); 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 bccfb115..c19dd59d 100644 --- a/jero-boot-single-startup/src/main/resources/application-dev.yml +++ b/jero-boot-single-startup/src/main/resources/application-dev.yml @@ -323,5 +323,6 @@ standards: # uesrname: admin #消息模板替换，系统url，小程序名称 message: - systemUrl: http://10.10.10.46:8055/ + systemUrl: http://localhost:3000/ wxName: '小程序名称' + openPage: http://localhost:3000/signUpEntrance?id