From 5ed8aa196eda2e6be4ad8cc632693ec16c8565a6 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 18 八月 2022 20:14:41 +0800
Subject: [PATCH] 整改
---
phi-sms-feign/src/main/java/com/hz/sms/dto/mq/WeCatMessageMqDto.java | 21 +++
phi-sms-feign/src/main/java/com/hz/sms/feign/FWXSendService.java | 16 +-
phi-sms-feign/src/main/java/com/hz/sms/dto/mq/CorpMessageMqDto.java | 16 ++
phi-sms-feign/src/main/java/com/hz/sms/dto/entity/Miniprogram.java | 17 ++
phi-sms-feign/src/main/java/com/hz/sms/dto/mq/MpMessageMqDto.java | 18 ++
phi-sms-feign/src/main/java/com/hz/sms/dto/mq/SmsMassegeMqDto.java | 18 ++
phi-sms-feign/src/main/java/com/hz/sms/dto/MpMessageDto.java | 41 +++++
phi-sms-feign/src/main/java/com/hz/sms/platform/FCorpWxImmediatelyService.java | 5
phi-sms-feign/src/main/java/com/hz/sms/dto/WeCatMessageDto.java | 26 +++
phi-sms-feign/src/main/java/com/hz/sms/dto/SmsGeneralSendDto.java | 68 ++++-----
phi-sms-feign/src/main/java/com/hz/sms/dto/TemplateMsgDto.java | 13 +
phi-sms-feign/src/main/java/com/hz/sms/dto/MpTemplateMsg.java | 19 +-
/dev/null | 17 --
phi-sms-feign/src/main/java/com/hz/sms/platform/FSmsImmediatelyService.java | 13 +
phi-sms-feign/src/main/java/com/hz/sms/dto/TemplateMessageDto.java | 71 ++++------
phi-sms-feign/src/main/java/com/hz/sms/platform/FWxImmediatelyService.java | 12
16 files changed, 259 insertions(+), 132 deletions(-)
diff --git a/phi-sms-feign/src/main/java/com/hz/sms/dto/MpMessageDto.java b/phi-sms-feign/src/main/java/com/hz/sms/dto/MpMessageDto.java
new file mode 100644
index 0000000..a15e4d0
--- /dev/null
+++ b/phi-sms-feign/src/main/java/com/hz/sms/dto/MpMessageDto.java
@@ -0,0 +1,41 @@
+package com.hz.sms.dto;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hx.util.StringUtils;
+import lombok.Data;
+
+/**灏忕▼搴忔湇鍔℃秷鎭�*/
+@Data
+public class MpMessageDto {
+
+ /** 灏忕▼搴廰ppId - Y*/
+ private String mpId;
+ /** 鎵�闇�涓嬪彂鐨勮闃呮ā鏉縤d - Y*/
+ private String templateId;
+ /** 鎺ュ彛璋冪敤鍑瘉锛岃鍙傛暟涓� URL 鍙傛暟锛岄潪 Body 鍙傛暟 - Y*/
+ private String page;
+ /** 鎺ユ敹鑰咃紙鐢ㄦ埛锛夌殑 openid - Y*/
+ private String touSer;
+ /** 璺宠浆灏忕▼搴忕被鍨嬶細developer涓哄紑鍙戠増锛泃rial涓轰綋楠岀増锛沠ormal涓烘寮忕増锛涢粯璁や负姝ｅ紡鐗� - Y*/
+ private String minIpGramState;
+ /** 杩涘叆灏忕▼搴忔煡鐪嬧�濈殑璇█绫诲瀷锛屾敮鎸亃h_CN(绠�浣撲腑鏂�)銆乪n_US(鑻辨枃)銆亃h_HK(绻佷綋涓枃)銆亃h_TW(绻佷綋涓枃)锛岄粯璁や负zh_CN - Y*/
+ private String lang = LANGUAGE_ZH_CN;
+ /** 妯℃澘鍐呭*/
+ private JSONObject data;
+ /** 鍙戦�佹ā寮� (0: 绔嬪嵆鍙戦��; 1:寮傛鍙戦��)*/
+ private Integer sendModel = SEND_TYPE_ASYNCHRONOUS;
+
+ /**鍙戦�佺被鍨�-绔嬪嵆鍙戦��*/
+ public static final int SEND_TYPE_IMMEDIATELY = 0;
+ /**鍙戦�佺被鍨�-寮傛鍙戦��*/
+ public static final int SEND_TYPE_ASYNCHRONOUS = 1;
+
+ /**璇█ - 绠�浣撲腑鏂�*/
+ public static final String LANGUAGE_ZH_CN = "zh_CN";
+ /**璇█ - 鑻辨枃*/
+ public static final String LANGUAGE_EN_US = "en_US";
+ /**璇█ - 绻佷綋涓枃锛堥娓級*/
+ public static final String LANGUAGE_ZH_HK = "zh_HK";
+ /**璇█ - 绻佷綋涓枃锛堝彴婀撅級*/
+ public static final String LANGUAGE_ZH_TW = "zh_TW";
+}
diff --git a/phi-sms-feign/src/main/java/com/hz/sms/dto/MpTemplateMsg.java b/phi-sms-feign/src/main/java/com/hz/sms/dto/MpTemplateMsg.java
index 5042ab3..8506b8b 100644
--- a/phi-sms-feign/src/main/java/com/hz/sms/dto/MpTemplateMsg.java
+++ b/phi-sms-feign/src/main/java/com/hz/sms/dto/MpTemplateMsg.java
@@ -1,20 +1,23 @@
package com.hz.sms.dto;
+import com.hz.sms.dto.entity.Miniprogram;
import lombok.Data;
import java.util.Map;
-
+/**
+ * 鍙傛暟鐢ㄤ簬涓嬪彂灏忕▼搴忓拰鍏紬鍙风粺涓�鐨勬湇鍔℃秷鎭� (鍙傛暟瀹炰綋)锛屽瓙妯″潡
+ */
@Data
public class MpTemplateMsg {
- //鍏紬鍙穉ppid锛岃姹備笌灏忕▼搴忔湁缁戝畾涓斿悓涓讳綋
+ /**鍏紬鍙穉ppid锛岃姹備笌灏忕▼搴忔湁缁戝畾涓斿悓涓讳綋 - Y*/
private String appId;
- //鍏紬鍙锋ā鏉縤d
+ /**鍏紬鍙锋ā鏉縤d - Y*/
private String templateId;
- //鍏紬鍙锋ā鏉挎秷鎭墍瑕佽烦杞殑url
+ /**鍏紬鍙锋ā鏉挎秷鎭墍瑕佽烦杞殑url - N*/
private String url;
- //鍏紬鍙锋ā鏉挎秷鎭墍瑕佽烦杞殑灏忕▼搴忥紝灏忕▼搴忕殑蹇呴』涓庡叕浼楀彿鍏锋湁缁戝畾鍏崇郴
- private String minIProgram;
- //鍏紬鍙锋ā鏉挎秷鎭殑鏁版嵁
- private Map<String, Keyword> data;;
+ /**鍏紬鍙锋ā鏉挎秷鎭墍瑕佽烦杞殑灏忕▼搴忥紝灏忕▼搴忕殑蹇呴』涓庡叕浼楀彿鍏锋湁缁戝畾鍏崇郴 - N*/
+ private Miniprogram minIProgram;
+ /**鍏紬鍙锋ā鏉挎秷鎭殑鏁版嵁 - Y*/
+ private Map<String, Keyword> data;
}
diff --git a/phi-sms-feign/src/main/java/com/hz/sms/dto/ResponsesSendMessage.java b/phi-sms-feign/src/main/java/com/hz/sms/dto/ResponsesSendMessage.java
deleted file mode 100644
index cbab517..0000000
--- a/phi-sms-feign/src/main/java/com/hz/sms/dto/ResponsesSendMessage.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.hz.sms.dto;
-
-
-import lombok.Data;
-
-
-/**
- * 鍙傛暟鐢ㄤ簬涓嬪彂灏忕▼搴忓拰鍏紬鍙风粺涓�鐨勬湇鍔℃秷鎭� (鍙傛暟瀹炰綋)
- */
-@Data
-public class ResponsesSendMessage {
-
- //灏忕▼搴� appId
- private String appId;
-
- //鏍囪瘑 (璁板綍wx_wechat琛ㄦ暟鎹殑id) 涓嶇敤浼�
- private String id;
- //鐢ㄦ埛openid锛屽彲浠ユ槸灏忕▼搴忕殑openid锛屼篃鍙互鏄痬p_template_msg.appid瀵瑰簲鐨勫叕浼楀彿鐨刼penid
- private String touSer;
- //灏忕▼搴忔ā鏉挎秷鎭浉鍏崇殑淇℃伅锛屽彲浠ュ弬鑰冨皬绋嬪簭妯℃澘娑堟伅鎺ュ彛; 鏈夋鑺傜偣鍒欎紭鍏堝彂閫佸皬绋嬪簭妯℃澘娑堟伅锛涳紙灏忕▼搴忔ā鏉挎秷鎭凡涓嬬嚎锛屼笉鐢ㄤ紶姝よ妭鐐癸級
- private WeAppTemplateMsg weAppTemplateMsg;
- //鍏紬鍙锋ā鏉挎秷鎭浉鍏崇殑淇℃伅锛屽彲浠ュ弬鑰冨叕浼楀彿妯℃澘娑堟伅鎺ュ彛锛涙湁姝よ妭鐐瑰苟涓旀病鏈墂eapp_template_msg鑺傜偣鏃讹紝鍙戦�佸叕浼楀彿妯℃澘娑堟伅
- private MpTemplateMsg mpTemplateMsg;
- /* 鍙戦�佹ā寮� (0: 绔嬪嵆鍙戦��; 1:寮傛鍙戦��)*/
- private Integer sendModel;
-}
diff --git a/phi-sms-feign/src/main/java/com/hz/sms/dto/ResponsesWxSendMpDto.java b/phi-sms-feign/src/main/java/com/hz/sms/dto/ResponsesWxSendMpDto.java
deleted file mode 100644
index 3f054ef..0000000
--- a/phi-sms-feign/src/main/java/com/hz/sms/dto/ResponsesWxSendMpDto.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.hz.sms.dto;
-
-import com.alibaba.fastjson.JSONObject;
-import com.hx.util.StringUtils;
-import lombok.Data;
-
-@Data
-public class ResponsesWxSendMpDto {
- /** 鏍囪瘑 (璁板綍wx_mp琛ㄦ暟鎹殑id) 涓嶇敤浼�*/
- private String id;
-
- /** 灏忕▼搴廰ppId*/
- private String mpId;
-
- /** 鎵�闇�涓嬪彂鐨勮闃呮ā鏉縤d*/
- private String templateId;
- /** 鎺ュ彛璋冪敤鍑瘉锛岃鍙傛暟涓� URL 鍙傛暟锛岄潪 Body 鍙傛暟*/
- private String Page;
- /** 鎺ユ敹鑰咃紙鐢ㄦ埛锛夌殑 openid*/
- private String touSer;
- /** 璺宠浆灏忕▼搴忕被鍨嬶細developer涓哄紑鍙戠増锛泃rial涓轰綋楠岀増锛沠ormal涓烘寮忕増锛涢粯璁や负姝ｅ紡鐗�*/
- private String minIpGramState;
- /** 杩涘叆灏忕▼搴忔煡鐪嬧�濈殑璇█绫诲瀷锛屾敮鎸亃h_CN(绠�浣撲腑鏂�)銆乪n_US(鑻辨枃)銆亃h_HK(绻佷綋涓枃)銆亃h_TW(绻佷綋涓枃)锛岄粯璁や负zh_CN*/
- private String lang;
- /** 妯℃澘鍐呭*/
- private JSONObject data;
- /** 鍙戦�佹ā寮� (0: 绔嬪嵆鍙戦��; 1:寮傛鍙戦��)*/
- private Integer sendModel;
-
- public String getLang() {
- if (StringUtils.isEmpty(lang)){
- return "zh_CN";
- }
- return lang;
- }
-}
diff --git a/phi-sms-feign/src/main/java/com/hz/sms/dto/SmsGeneralSendDto.java b/phi-sms-feign/src/main/java/com/hz/sms/dto/SmsGeneralSendDto.java
index 7018162..28d1f27 100644
--- a/phi-sms-feign/src/main/java/com/hz/sms/dto/SmsGeneralSendDto.java
+++ b/phi-sms-feign/src/main/java/com/hz/sms/dto/SmsGeneralSendDto.java
@@ -1,56 +1,48 @@
package com.hz.sms.dto;
-
-import com.hx.util.StringUtils;
import lombok.Data;
-
-import java.text.SimpleDateFormat;
import java.util.Date;
@Data
public class SmsGeneralSendDto {
- /**鏍囪瘑 (璁板綍sms_general_item琛ㄦ暟鎹殑id)*/
- private String id;
- /**璐﹀彿*/
- private String account;
- /**瀵嗙爜*/
- private String password;
- /**绛惧悕*/
- private String sign;
- /**瀹氭椂鐭俊鏃堕棿锛屾牸寮忎负yyyyMMddHHmm锛屽�煎皬浜庢垨绛変簬褰撳墠鏃堕棿鍒欑珛鍗冲彂閫侊紝榛樿绔嬪嵆鍙戦��*/
- private String timestamp;
- /**鐭俊鍐呭*/
+ /**鐭俊绫诲瀷 - Y*/
+ private Integer smsType;
+ /**鐭俊鍐呭 - Y*/
private String msg;
- /**鎵嬫満鍙风爜*/
+ /**鎺ユ敹浜哄悕绉� - N*/
+ private String receiveMan;
+ /**鎵嬫満鍙风爜 - Y*/
private String phone;
- /**瀹氭椂鍙戦�佺煭淇℃椂闂�*/
- private String sendTime;
+ /**瀹氭椂鍙戦�佺煭淇℃椂闂达紝鍊煎皬浜庢垨绛変簬褰撳墠鏃堕棿鍒欑珛鍗冲彂閫侊紝榛樿绔嬪嵆鍙戦�侊細鏍煎紡yyyy-MM-dd HH:mm:dd*/
+ private Date sendTime;
/**濡傞渶鐘舵�佹姤鍛婂垯浼爐rue*/
private String report;
- /**涓嬪彂鐭俊鍙风爜鎵╁睍鐮�*/
+ /**涓嬪彂鐭俊鍙风爜鎵╁睍鐮� - N*/
private String extend;
- /**璇ユ潯鐭俊鍦ㄦ偍涓氬姟绯荤粺鍐呯殑ID*/
+ /**璇ユ潯鐭俊鍦ㄦ偍涓氬姟绯荤粺鍐呯殑ID锛屽彲涓嶅～ - N*/
private String uid;
- /**鐭俊绫诲瀷*/
- private Integer smsType;
- /** 鍙戦�佹ā寮� (0: 绔嬪嵆鍙戦��; 1:寮傛鍙戦��)*/
- private Integer sendModel;
+ /** 鍙戦�佹ā寮� (0: 绔嬪嵆鍙戦��; 1:寮傛鍙戦�侊紝榛樿1) - Y*/
+ private Integer sendModel = SEND_TYPE_ASYNCHRONOUS;
+
+ /**鐭俊绫诲瀷-鐭俊楠岃瘉鐮�*/
+ public static final int SMS_TYPE_VERIFICATION = 0;
+ /**鐭俊绫诲瀷-閫氱煡鐭俊*/
+ public static final int SMS_TYPE_NOTICE = 1;
+ /**鐭俊绫诲瀷-钀ラ攢鐭俊*/
+ public static final int SMS_TYPE_MARKETING= 2;
+
+ /**鍙戦�佺被鍨�-绔嬪嵆鍙戦��*/
+ public static final int SEND_TYPE_IMMEDIATELY = 0;
+ /**鍙戦�佺被鍨�-寮傛鍙戦��*/
+ public static final int SEND_TYPE_ASYNCHRONOUS = 1;
+
+ /**鏁板瓧0*/
+ public static final int NUMBER_0 = 0;
+ /**鏁板瓧1*/
+ public static final int NUMBER_1 = 1;
- public Date getDateSendTime(){
- try {
- Date dateSendTime = new SimpleDateFormat("yyyyMMddHHmm").parse(sendTime);
- return dateSendTime;
- }catch (Exception e){
- return null;
- }
- }
- public String getReport() {
- if (!StringUtils.isEmpty(report) && !"true".equals(report)){
- return null;
- }
- return report;
- }
+
}
diff --git a/phi-sms-feign/src/main/java/com/hz/sms/dto/TemplateMessageDto.java b/phi-sms-feign/src/main/java/com/hz/sms/dto/TemplateMessageDto.java
index 1b537d6..cdc806a 100644
--- a/phi-sms-feign/src/main/java/com/hz/sms/dto/TemplateMessageDto.java
+++ b/phi-sms-feign/src/main/java/com/hz/sms/dto/TemplateMessageDto.java
@@ -6,57 +6,44 @@
@Data
public class TemplateMessageDto {
- /** 浼佷笟寰俊id*/
+
+ /** 浼佷笟寰俊id - Y*/
private String corpId;
- /** 鍏宠仈灏忕▼搴廼d*/
+ /** 鍏宠仈灏忕▼搴廼d - Y*/
private String appId;
- /** 鏍囪瘑 (璁板綍corp_wx_application琛ㄦ暟鎹殑id) (涓嶇敤浼�)*/
- private String id;
- /** 鎴愬憳ID鍒楄〃锛堟秷鎭帴鏀惰�咃紝澶氫釜鎺ユ敹鑰呯敤鈥榺鈥欏垎闅旓紝鏈�澶氭敮鎸�1000涓級 */
+ /** 鎴愬憳ID鍒楄〃锛堟秷鎭帴鏀惰�咃紝澶氫釜鎺ユ敹鑰呯敤鈥榺鈥欏垎闅旓紝鏈�澶氭敮鎸�1000涓級 - Y*/
private String touSer;
- /** 閮ㄩ棬ID鍒楄〃锛屽涓帴鏀惰�呯敤鈥榺鈥欏垎闅旓紝鏈�澶氭敮鎸�100涓�� */
+ /** 閮ㄩ棬ID鍒楄〃锛屽涓帴鏀惰�呯敤鈥榺鈥欏垎闅旓紝鏈�澶氭敮鎸�100涓��- O */
private String toParty;
- /** 鏍囩ID鍒楄〃锛屽涓帴鏀惰�呯敤鈥榺鈥欏垎闅旓紝鏈�澶氭敮鎸�100涓�� */
+ /** 鏍囩ID鍒楄〃锛屽涓帴鏀惰�呯敤鈥榺鈥欏垎闅旓紝鏈�澶氭敮鎸�100涓��- O */
private String toTag;
- /** 娑堟伅绫诲瀷 ,姝ゆ椂鍥哄畾涓猴細miniprogram_notice */
- private String msgType;
- /** 鍙傛暟鍐呭 */
+ /** 娑堟伅绫诲瀷 ,姝ゆ椂鍥哄畾涓猴細miniprogram_notice - Y*/
+ private String msgType = "miniprogram_notice";
+ /** 鍙傛暟鍐呭 - Y*/
private TemplateMsgDto minIProgramNotice;
+ /** 鍙戦�佹ā寮� (0: 绔嬪嵆鍙戦��; 1:寮傛鍙戦�侊紝榛樿1) - Y*/
+ private Integer sendModel = SEND_TYPE_ASYNCHRONOUS;
- /** 琛ㄧず鏄惁寮�鍚痠d杞瘧锛�0琛ㄧず鍚︼紝1琛ㄧず鏄紝榛樿0 */
- private Integer enableIdTrans;
- /** 琛ㄧず鏄惁寮�鍚噸澶嶆秷鎭鏌ワ紝0琛ㄧず鍚︼紝1琛ㄧず鏄紝榛樿0 */
- private Integer enableDuplicateCheck;
- /** 琛ㄧず鏄惁閲嶅娑堟伅妫�鏌ョ殑鏃堕棿闂撮殧锛岄粯璁�1800s锛屾渶澶т笉瓒呰繃4灏忔椂 */
- private Integer duplicateCheckInterval;
- /** 鍙戦�佹ā寮� (0: 绔嬪嵆鍙戦��; 1:寮傛鍙戦��)*/
- private Integer sendModel;
+ /** 琛ㄧず鏄惁寮�鍚痠d杞瘧锛�0琛ㄧず鍚︼紝1琛ㄧず鏄紝榛樿0 - N*/
+ private Integer enableIdTrans = NUMBER_0;
+ /** 琛ㄧず鏄惁寮�鍚噸澶嶆秷鎭鏌ワ紝0琛ㄧず鍚︼紝1琛ㄧず鏄紝榛樿0 - N*/
+ private Integer enableDuplicateCheck = NUMBER_0;
+ /** 琛ㄧず鏄惁閲嶅娑堟伅妫�鏌ョ殑鏃堕棿闂撮殧锛岄粯璁�1800s锛屾渶澶т笉瓒呰繃4灏忔椂 - N*/
+ private Integer duplicateCheckInterval = REPEAT_TIME_SECOND;
- public String getMsgType() {
- if (!StringUtils.isEmpty(msgType) && !"miniprogram_notice".equals(msgType)){
- return null;
- }
- return msgType;
- }
- public Integer getEnable_id_trans() {
- if (ObjectUtils.isEmpty(enableIdTrans)){
- return null;
- }
- return enableIdTrans;
- }
+ /**鏁板瓧0*/
+ public static final int NUMBER_0 = 0;
+ /**鏁板瓧1*/
+ public static final int NUMBER_1 = 1;
- public Integer getEnable_duplicate_check() {
- if (ObjectUtils.isEmpty(enableDuplicateCheck)){
- return null;
- }
- return enableDuplicateCheck;
- }
+ /**鍙戦�佺被鍨�-绔嬪嵆鍙戦��*/
+ public static final int SEND_TYPE_IMMEDIATELY = 0;
+ /**鍙戦�佺被鍨�-寮傛鍙戦��*/
+ public static final int SEND_TYPE_ASYNCHRONOUS = 1;
- public Integer getDuplicate_check_interval() {
- if (ObjectUtils.isEmpty(duplicateCheckInterval)){
- return null;
- }
- return duplicateCheckInterval;
- }
+ /**閲嶅娑堟伅妫�鏌ョ殑鏃堕棿闂撮殧 - 绉�*/
+ public static final int REPEAT_TIME_SECOND = 1800;
+
+
}
\ No newline at end of file
diff --git a/phi-sms-feign/src/main/java/com/hz/sms/dto/TemplateMsgDto.java b/phi-sms-feign/src/main/java/com/hz/sms/dto/TemplateMsgDto.java
index 7a75e24..58e0164 100644
--- a/phi-sms-feign/src/main/java/com/hz/sms/dto/TemplateMsgDto.java
+++ b/phi-sms-feign/src/main/java/com/hz/sms/dto/TemplateMsgDto.java
@@ -4,19 +4,22 @@
import java.util.List;
public class TemplateMsgDto {
- /** 灏忕▼搴廰ppid锛屽繀椤绘槸涓庡綋鍓嶅簲鐢ㄥ叧鑱旂殑灏忕▼搴� */
+ /** 灏忕▼搴廰ppid锛屽繀椤绘槸涓庡綋鍓嶅簲鐢ㄥ叧鑱旂殑灏忕▼搴� - Y*/
private String appId;
/** 鐐瑰嚮娑堟伅鍗＄墖鍚庣殑灏忕▼搴忛〉闈紝鏈�闀�1024涓瓧鑺傦紝浠呴檺鏈皬绋嬪簭鍐呯殑椤甸潰銆傝瀛楁涓嶅～鍒欐秷鎭偣鍑诲悗涓嶈烦杞�� */
private String page;
- /** 娑堟伅鏍囬锛岄暱搴﹂檺鍒�4-12涓眽瀛楋紙鏀寔id杞瘧锛�*/
+ /** 娑堟伅鏍囬锛岄暱搴﹂檺鍒�4-12涓眽瀛楋紙鏀寔id杞瘧锛�- Y*/
private String title;
- /** 娑堟伅鎻忚堪锛岄暱搴﹂檺鍒�4-12涓眽瀛楋紙鏀寔id杞瘧锛�*/
+ /** 娑堟伅鎻忚堪锛岄暱搴﹂檺鍒�4-12涓眽瀛楋紙鏀寔id杞瘧锛�- Y*/
private String description;
- /** 鏄惁鏀惧ぇ绗竴涓猚ontent_item*/
- private boolean emphasisFirstItem;
+ /** 鏄惁鏀惧ぇ绗竴涓猚ontent_item锛岄粯璁alse - N*/
+ private boolean emphasisFirstItem = BOOLEAN_FALSE;
/** 娑堟伅鍐呭閿�煎锛屾渶澶氬厑璁�10涓猧tem*/
private List<ContentItemDto> contentItem;
+ public static final boolean BOOLEAN_FALSE = false;
+ public static final boolean BOOLEAN_TRUE = false;
+
public String getAppId() {
return appId;
}
diff --git a/phi-sms-feign/src/main/java/com/hz/sms/dto/WeAppTemplateMsg.java b/phi-sms-feign/src/main/java/com/hz/sms/dto/WeAppTemplateMsg.java
deleted file mode 100644
index 4cc6ad1..0000000
--- a/phi-sms-feign/src/main/java/com/hz/sms/dto/WeAppTemplateMsg.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.hz.sms.dto;
-
-import lombok.Data;
-
-@Data
-public class WeAppTemplateMsg {
- //灏忕▼搴忔ā鏉縄D
- private String templateId;
- //灏忕▼搴忛〉闈㈣矾寰�
- private String page;
- //灏忕▼搴忔ā鏉挎秷鎭痜ormid
- private String fromId;
- //灏忕▼搴忔ā鏉挎斁澶у叧閿瘝
- private String emphasisKeyword;
- //灏忕▼搴忔ā鏉挎暟鎹�
- private String data;
-}
diff --git a/phi-sms-feign/src/main/java/com/hz/sms/dto/WeCatMessageDto.java b/phi-sms-feign/src/main/java/com/hz/sms/dto/WeCatMessageDto.java
new file mode 100644
index 0000000..93a4a49
--- /dev/null
+++ b/phi-sms-feign/src/main/java/com/hz/sms/dto/WeCatMessageDto.java
@@ -0,0 +1,26 @@
+package com.hz.sms.dto;
+
+
+import lombok.Data;
+
+
+/**
+ * 鍙傛暟鐢ㄤ簬涓嬪彂灏忕▼搴忓拰鍏紬鍙风粺涓�鐨勬湇鍔℃秷鎭� (鍙傛暟瀹炰綋)
+ */
+@Data
+public class WeCatMessageDto {
+
+ /**鍏紬鍙� appId*/
+ private String appId;
+ /**鐢ㄦ埛openid锛屽彲浠ユ槸灏忕▼搴忕殑openid锛屼篃鍙互鏄痬p_template_msg.appid瀵瑰簲鐨勫叕浼楀彿鐨刼penid - Y*/
+ private String touSer;
+ /**鍏紬鍙锋ā鏉挎秷鎭浉鍏崇殑淇℃伅锛屽彲浠ュ弬鑰冨叕浼楀彿妯℃澘娑堟伅鎺ュ彛锛涙湁姝よ妭鐐瑰苟涓旀病鏈墂eapp_template_msg鑺傜偣鏃讹紝鍙戦�佸叕浼楀彿妯℃澘娑堟伅 - Y*/
+ private MpTemplateMsg mpTemplateMsg;
+ /**鍙戦�佹ā寮� (0: 绔嬪嵆鍙戦��; 1:寮傛鍙戦�侊紝榛樿1) - Y*/
+ private Integer sendModel = SEND_TYPE_ASYNCHRONOUS;
+
+ /**鍙戦�佺被鍨�-绔嬪嵆鍙戦��*/
+ public static final int SEND_TYPE_IMMEDIATELY = 0;
+ /**鍙戦�佺被鍨�-寮傛鍙戦��*/
+ public static final int SEND_TYPE_ASYNCHRONOUS = 1;
+}
diff --git a/phi-sms-feign/src/main/java/com/hz/sms/dto/entity/Miniprogram.java b/phi-sms-feign/src/main/java/com/hz/sms/dto/entity/Miniprogram.java
new file mode 100644
index 0000000..8ad0d45
--- /dev/null
+++ b/phi-sms-feign/src/main/java/com/hz/sms/dto/entity/Miniprogram.java
@@ -0,0 +1,17 @@
+package com.hz.sms.dto.entity;
+
+import com.hz.sms.dto.TemplateMessageDto;
+import lombok.Data;
+
+/**灏忕▼搴忕粺涓�娑堟伅-鍏紬鍙峰瓙鏁版嵁浣�
+ *
+ */
+@Data
+public class Miniprogram {
+
+ /** 灏忕▼搴廰ppId */
+ private String appId;
+ /**灏忕▼搴忚烦杞〉闈�*/
+ private String pagepath;
+
+}
\ No newline at end of file
diff --git a/phi-sms-feign/src/main/java/com/hz/sms/dto/mq/CorpMessageMqDto.java b/phi-sms-feign/src/main/java/com/hz/sms/dto/mq/CorpMessageMqDto.java
new file mode 100644
index 0000000..b457427
--- /dev/null
+++ b/phi-sms-feign/src/main/java/com/hz/sms/dto/mq/CorpMessageMqDto.java
@@ -0,0 +1,16 @@
+package com.hz.sms.dto.mq;
+
+import com.hz.sms.dto.TemplateMessageDto;
+import lombok.Data;
+
+@Data
+public class CorpMessageMqDto {
+
+ /** 娑堟伅鏍囪瘑 */
+ private String idCode;
+ /**璇锋眰骞冲彴appId*/
+ private String platAppId;
+ /**鍙戦�佹秷鎭綋*/
+ private TemplateMessageDto templateMessageDto;
+
+}
\ No newline at end of file
diff --git a/phi-sms-feign/src/main/java/com/hz/sms/dto/mq/MpMessageMqDto.java b/phi-sms-feign/src/main/java/com/hz/sms/dto/mq/MpMessageMqDto.java
new file mode 100644
index 0000000..23d7619
--- /dev/null
+++ b/phi-sms-feign/src/main/java/com/hz/sms/dto/mq/MpMessageMqDto.java
@@ -0,0 +1,18 @@
+package com.hz.sms.dto.mq;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hx.util.StringUtils;
+import com.hz.sms.dto.MpMessageDto;
+import lombok.Data;
+
+/**灏忕▼搴忔湇鍔℃秷鎭�*/
+@Data
+public class MpMessageMqDto {
+ /** 娑堟伅鏍囪瘑 */
+ private String idCode;
+ /**璇锋眰骞冲彴appId*/
+ private String platAppId;
+ /**灏忕▼搴忚闃呮秷鎭疄浣�*/
+ private MpMessageDto mpMessageDto;
+
+}
diff --git a/phi-sms-feign/src/main/java/com/hz/sms/dto/mq/SmsMassegeMqDto.java b/phi-sms-feign/src/main/java/com/hz/sms/dto/mq/SmsMassegeMqDto.java
new file mode 100644
index 0000000..2678be6
--- /dev/null
+++ b/phi-sms-feign/src/main/java/com/hz/sms/dto/mq/SmsMassegeMqDto.java
@@ -0,0 +1,18 @@
+package com.hz.sms.dto.mq;
+
+
+import com.hz.sms.dto.SmsGeneralSendDto;
+import lombok.Data;
+
+@Data
+public class SmsMassegeMqDto {
+
+ /** 娑堟伅鏍囪瘑 */
+ private String idCode;
+ /**璇锋眰骞冲彴appId*/
+ private String platAppId;
+ /**鍙戦�佹秷鎭綋*/
+ private SmsGeneralSendDto smsGeneralSendDto;
+
+
+}
diff --git a/phi-sms-feign/src/main/java/com/hz/sms/dto/mq/WeCatMessageMqDto.java b/phi-sms-feign/src/main/java/com/hz/sms/dto/mq/WeCatMessageMqDto.java
new file mode 100644
index 0000000..8e3338e
--- /dev/null
+++ b/phi-sms-feign/src/main/java/com/hz/sms/dto/mq/WeCatMessageMqDto.java
@@ -0,0 +1,21 @@
+package com.hz.sms.dto.mq;
+
+
+import com.hz.sms.dto.WeCatMessageDto;
+import lombok.Data;
+
+
+/**
+ * 鍙傛暟鐢ㄤ簬涓嬪彂灏忕▼搴忓拰鍏紬鍙风粺涓�鐨勬湇鍔℃秷鎭� (鍙傛暟瀹炰綋)
+ */
+@Data
+public class WeCatMessageMqDto {
+
+ /** 娑堟伅鏍囪瘑 */
+ private String idCode;
+ /**璇锋眰骞冲彴appId*/
+ private String platAppId;
+ /**鍙戦�佹秷鎭綋*/
+ private WeCatMessageDto weCatMessageDto;
+
+}
diff --git a/phi-sms-feign/src/main/java/com/hz/sms/feign/FWXSendService.java b/phi-sms-feign/src/main/java/com/hz/sms/feign/FWXSendService.java
index 89eaeae..385ee2d 100644
--- a/phi-sms-feign/src/main/java/com/hz/sms/feign/FWXSendService.java
+++ b/phi-sms-feign/src/main/java/com/hz/sms/feign/FWXSendService.java
@@ -2,8 +2,8 @@
import com.hx.resultTool.Result;
-import com.hz.sms.dto.ResponsesSendMessage;
-import com.hz.sms.dto.ResponsesWxSendMpDto;
+import com.hz.sms.dto.WeCatMessageDto;
+import com.hz.sms.dto.MpMessageDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -17,25 +17,25 @@
/**
* 寰俊灏忕▼搴忎笅鍙戠粺涓�娑堟伅 锛堝簾闄わ級
- * @param responsesSendMessage
+ * @param weCatMessageDto
* @return
*/
@PostMapping(value = "/wx/send/applet/message")
- Result sendAppletMessage(@RequestBody ResponsesSendMessage responsesSendMessage);
+ Result sendAppletMessage(@RequestBody WeCatMessageDto weCatMessageDto);
/**
* 寰俊鍏紬鍙蜂笅鍙戠粺涓�娑堟伅
- * @param responsesSendMessage
+ * @param weCatMessageDto
* @return
*/
@PostMapping(value = "/wx/send/wechat/message")
- Result sendWeChatMessage(@RequestBody ResponsesSendMessage responsesSendMessage);
+ Result sendWeChatMessage(@RequestBody WeCatMessageDto weCatMessageDto);
/**
* 寰俊灏忕▼搴忓彂閫佽闃呮秷鎭�
- * @param responsesWxSendMpDto
+ * @param mpMessageDto
* @return
*/
@RequestMapping(value = "/wx/send/mp/subscribe/message")
- Result sendMpMessage(@RequestBody ResponsesWxSendMpDto responsesWxSendMpDto);
+ Result sendMpMessage(@RequestBody MpMessageDto mpMessageDto);
}
diff --git a/phi-sms-feign/src/main/java/com/hz/sms/platform/FCorpWxImmediatelyService.java b/phi-sms-feign/src/main/java/com/hz/sms/platform/FCorpWxImmediatelyService.java
index 726898f..b7d368c 100644
--- a/phi-sms-feign/src/main/java/com/hz/sms/platform/FCorpWxImmediatelyService.java
+++ b/phi-sms-feign/src/main/java/com/hz/sms/platform/FCorpWxImmediatelyService.java
@@ -2,6 +2,7 @@
import com.hx.resultTool.Result;
import com.hz.sms.dto.TemplateMessageDto;
+import com.hz.sms.dto.mq.CorpMessageMqDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -14,10 +15,10 @@
/**
* 鍙戦�佷紒涓氬井淇″簲鐢ㄦ秷鎭�
- * @param templateMessageDto
+ * @param corpMessageMqDto 娑堟伅浣�
* @return
*/
@PostMapping(value = "/corp-wx/send/application/message")
- Result sendNoticeSms(@RequestBody TemplateMessageDto templateMessageDto);
+ Result sendNoticeSms(@RequestBody CorpMessageMqDto corpMessageMqDto);
}
diff --git a/phi-sms-feign/src/main/java/com/hz/sms/platform/FSmsImmediatelyService.java b/phi-sms-feign/src/main/java/com/hz/sms/platform/FSmsImmediatelyService.java
index 78b5317..f660224 100644
--- a/phi-sms-feign/src/main/java/com/hz/sms/platform/FSmsImmediatelyService.java
+++ b/phi-sms-feign/src/main/java/com/hz/sms/platform/FSmsImmediatelyService.java
@@ -2,6 +2,7 @@
import com.hx.resultTool.Result;
import com.hz.sms.dto.SmsGeneralSendDto;
+import com.hz.sms.dto.mq.SmsMassegeMqDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -14,26 +15,26 @@
/**
* 鍙戦�佺煭淇￠獙璇佺爜
- * @param smsGeneralSendDto
+ * @param smsMassegeMqDto 娑堟伅浣�
* @return
*/
@PostMapping(value = "/sms/send/verification/code")
- Result sendVerificationCode(@RequestBody SmsGeneralSendDto smsGeneralSendDto);
+ Result sendVerificationCode(@RequestBody SmsMassegeMqDto smsMassegeMqDto);
/**
* 鍙戦�侀�氱煡鐭俊
- * @param smsGeneralSendDto
+ * @param smsMassegeMqDto
* @return
*/
@PostMapping(value = "/sms/send/notice")
- Result sendNoticeSms(@RequestBody SmsGeneralSendDto smsGeneralSendDto);
+ Result sendNoticeSms(@RequestBody SmsMassegeMqDto smsMassegeMqDto);
/**
* 鍙戦�佽惀閿�鐭俊
- * @param smsGeneralSendDto
+ * @param smsMassegeMqDto
* @return
*/
@PostMapping(value = "/sms/send/marketing")
- Result sendMarketingSend(@RequestBody SmsGeneralSendDto smsGeneralSendDto);
+ Result sendMarketingSend(@RequestBody SmsMassegeMqDto smsMassegeMqDto);
}
diff --git a/phi-sms-feign/src/main/java/com/hz/sms/platform/FWxImmediatelyService.java b/phi-sms-feign/src/main/java/com/hz/sms/platform/FWxImmediatelyService.java
index a900154..fe3b1a4 100644
--- a/phi-sms-feign/src/main/java/com/hz/sms/platform/FWxImmediatelyService.java
+++ b/phi-sms-feign/src/main/java/com/hz/sms/platform/FWxImmediatelyService.java
@@ -1,8 +1,8 @@
package com.hz.sms.platform;
import com.hx.resultTool.Result;
-import com.hz.sms.dto.ResponsesSendMessage;
-import com.hz.sms.dto.ResponsesWxSendMpDto;
+import com.hz.sms.dto.mq.MpMessageMqDto;
+import com.hz.sms.dto.mq.WeCatMessageMqDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -16,18 +16,18 @@
/**
* 寰俊鍏紬鍙蜂笅鍙戠粺涓�娑堟伅
- * @param responsesSendMessage
+ * @param weCatMessageMqDto 瀹炰綋
* @return
*/
@PostMapping(value = "/wx/send/wechat/issue/message")
- Result sendWeChatMessage(@RequestBody ResponsesSendMessage responsesSendMessage);
+ Result sendWeChatMessage(@RequestBody WeCatMessageMqDto weCatMessageMqDto);
/**
* 寰俊灏忕▼搴忓彂閫佽闃呮秷鎭�
- * @param responsesWxSendMpDto
+ * @param mpMessageMqDto
* @return
*/
@RequestMapping(value = "/wx/send/mp/message")
- Result sendMpMessage(@RequestBody ResponsesWxSendMpDto responsesWxSendMpDto);
+ Result sendMpMessage(@RequestBody MpMessageMqDto mpMessageMqDto);
}
--
Gitblit v1.8.0