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