发送订阅5

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/WxSubscribeMessageFormDTO.java

@@ -59,20 +59,4 @@ public class WxSubscribeMessageFormDTO implements Serializable {
      */
     @NotBlank(message = "模板id不能为空")
     private String templateId;
-
-    /**
-     * 点击模板卡片后的跳转页面，仅限本小程序内的页面。支持带参数,（示例index?foo=bar）。该字段不填则模板无跳转。
-     */
-    private String page;
-
-    /**
-     * 跳转小程序类型：developer为开发版；trial为体验版；formal为正式版；默认为正式版
-     */
-    private String miniprogramState;
-
-    /**
-     * 进入小程序查看”的语言类型，支持zh_CN(简体中文)、en_US(英文)、zh_HK(繁体中文)、zh_TW(繁体中文)，默认为zh_CN
-     */
-    private String lang;
-
 }

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/constant/WxmpMessageConstant.java

@@ -42,9 +42,16 @@ public interface WxmpMessageConstant {
 
     String MINIPROGRAM_STATE = "miniprogram_state";
 
-    String LANG = "lang";
-
     String SUCCESS = "success";
 
     String ERROR = "error";
+
+    String PAGE_RESI = "";
+
+    String PAGE_WORK = "";
+
+    String STATE_DEV = "developer";
+
+    String STATE_TEST = "trial";
+
 }

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java

@@ -20,6 +20,7 @@ package com.epmet.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.enums.EnvEnum;
 import com.epmet.commons.tools.exception.ValidateException;
 import com.epmet.commons.tools.utils.HttpClientManager;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -182,16 +183,22 @@ public class WxmpMessageServiceImpl implements WxmpMessageService {
 				data.put(WxmpMessageConstant.MESSAGE_CONTENT, new JSONObject().put("value", msg.getMessageContent()));
 				data.put(WxmpMessageConstant.MESSAGE_TIME, new JSONObject().put("value", msg.getMessageTime()));
 				jsonObject.put(WxmpMessageConstant.DATA, data);
+				EnvEnum envEnum = EnvEnum.getCurrentEnv();
 				//选填项
-				if (StringUtils.isNotBlank(msg.getPage())) {
-					jsonObject.put(WxmpMessageConstant.PAGE, msg.getPage());
+				if (WxmpMessageConstant.RESI.equals(clientType)) {
+					jsonObject.put(WxmpMessageConstant.PAGE, WxmpMessageConstant.PAGE_RESI);
+				} else if (WxmpMessageConstant.WORK.equals(clientType)) {
+					jsonObject.put(WxmpMessageConstant.PAGE, WxmpMessageConstant.PAGE_WORK);
 				}
-				if (StringUtils.isNotBlank(msg.getMiniprogramState())) {
-					jsonObject.put(WxmpMessageConstant.MINIPROGRAM_STATE, msg.getMiniprogramState());
+				//开发环境
+				if ("dev".equals(envEnum.getCode())){
+					jsonObject.put(WxmpMessageConstant.MINIPROGRAM_STATE, WxmpMessageConstant.STATE_DEV);
 				}
-				if (StringUtils.isNotBlank(msg.getLang())) {
-					jsonObject.put(WxmpMessageConstant.LANG, msg.getLang());
+				//测试环境
+				if ("test".equals(envEnum.getCode())){
+					jsonObject.put(WxmpMessageConstant.MINIPROGRAM_STATE, WxmpMessageConstant.STATE_TEST);
 				}
+
 				String resultStr = HttpClientManager.getInstance().sendPostByJSON(WxmpMessageConstant.SEND_MESSAGE + accessToken, JSON.toJSONString(jsonObject)).getData();
 				Map<String, Object> resultMap = JSON.parseObject(resultStr, Map.class);
 				Object errcode = resultMap.get(WxmpMessageConstant.ERR_CODE);