From 6dde8c033a105f1fc32dc7f6a5fdf4d6900db07b Mon Sep 17 00:00:00 2001
From: 童刚 <pBP8jclM@8yTJ@4h>
Date: 星期五, 12 八月 2022 15:11:24 +0800
Subject: [PATCH] 11

---
 phi-sms-feign/src/main/java/com/hz/sms/feign/FCorpWXSendService.java           |   22 +++
 phi-sms-feign/src/main/java/com/hz/sms/feign/FSmsSendService.java              |   10 
 phi-sms-feign/src/main/java/com/hz/sms/feign/FWXSendService.java               |   19 --
 phi-sms-feign/src/main/java/com/hz/sms/platform/FSmsImmediatelyService.java    |   39 +++++
 phi-sms-feign/src/main/java/com/hz/sms/dto/ResponsesWxSendMpDto.java           |    2 
 phi-sms-feign/src/main/java/com/hz/sms/dto/TemplateMessageDto.java             |  109 ++++----------
 phi-sms-feign/src/main/java/com/hz/sms/platform/FWxImmediatelyService.java     |   33 ++++
 phi-sms-feign/src/main/java/com/hz/sms/platform/FCorpWxImmediatelyService.java |   23 +++
 phi-sms-feign/src/main/java/com/hz/sms/dto/SmsGeneralSendDto.java              |   89 +++---------
 phi-sms-feign/src/main/java/com/hz/sms/dto/ResponsesSendMessage.java           |   54 +------
 10 files changed, 193 insertions(+), 207 deletions(-)

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
index 0c35c35..782bea0 100644
--- 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
@@ -1,58 +1,26 @@
 package com.hz.sms.dto;
 
 
+import lombok.Data;
+
+
 /**
  * 鍙傛暟鐢ㄤ簬涓嬪彂灏忕▼搴忓拰鍏紬鍙风粺涓�鐨勬湇鍔℃秷鎭� (鍙傛暟瀹炰綋)
  */
+@Data
 public class ResponsesSendMessage {
-    //鏍囪瘑
+
+    //灏忕▼搴� appId
+    private String appId;
+
+    //鏍囪瘑 (璁板綍wx_wechat琛ㄦ暟鎹殑id) 涓嶇敤浼�
     private String id;
-    //鑾峰彇鍒扮殑鍑瘉
-    private String accessToken;
     //鐢ㄦ埛openid锛屽彲浠ユ槸灏忕▼搴忕殑openid锛屼篃鍙互鏄痬p_template_msg.appid瀵瑰簲鐨勫叕浼楀彿鐨刼penid
     private String touser;
     //灏忕▼搴忔ā鏉挎秷鎭浉鍏崇殑淇℃伅锛屽彲浠ュ弬鑰冨皬绋嬪簭妯℃澘娑堟伅鎺ュ彛; 鏈夋鑺傜偣鍒欎紭鍏堝彂閫佸皬绋嬪簭妯℃澘娑堟伅锛涳紙灏忕▼搴忔ā鏉挎秷鎭凡涓嬬嚎锛屼笉鐢ㄤ紶姝よ妭鐐癸級
     private WeAppTemplateMsg weapp_template_msg;
     //鍏紬鍙锋ā鏉挎秷鎭浉鍏崇殑淇℃伅锛屽彲浠ュ弬鑰冨叕浼楀彿妯℃澘娑堟伅鎺ュ彛锛涙湁姝よ妭鐐瑰苟涓旀病鏈墂eapp_template_msg鑺傜偣鏃讹紝鍙戦�佸叕浼楀彿妯℃澘娑堟伅
     private MpTemplateMsg mp_template_msg;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getAccessToken() {
-        return accessToken;
-    }
-
-    public void setAccessToken(String accessToken) {
-        this.accessToken = accessToken;
-    }
-
-    public String getTouser() {
-        return touser;
-    }
-
-    public void setTouser(String touser) {
-        this.touser = touser;
-    }
-
-    public WeAppTemplateMsg getWeapp_template_msg() {
-        return weapp_template_msg;
-    }
-
-    public void setWeapp_template_msg(WeAppTemplateMsg weapp_template_msg) {
-        this.weapp_template_msg = weapp_template_msg;
-    }
-
-    public MpTemplateMsg getMp_template_msg() {
-        return mp_template_msg;
-    }
-
-    public void setMp_template_msg(MpTemplateMsg mp_template_msg) {
-        this.mp_template_msg = mp_template_msg;
-    }
+    // 鍙戦�佺姸鎬� (0: 绔嬪嵆鍙戦��; 1:寮傛鍙戦��)
+    private Integer sendStatus;
 }
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
index 1355280..30808ee 100644
--- 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
@@ -24,6 +24,8 @@
     private String lang;
     /** 妯℃澘鍐呭*/
     private JSONObject data;
+    /** 鍙戦�佺姸鎬� (0: 绔嬪嵆鍙戦��; 1:寮傛鍙戦��)*/
+    private Integer sendStatus;
 
     public String getLang() {
         if (StringUtils.isEmpty(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 0102b19..efd1106 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,14 +1,25 @@
 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;
     /*鐭俊鍐呭*/
     private String msg;
     /*鎵嬫満鍙风爜*/
@@ -16,53 +27,17 @@
     /*瀹氭椂鍙戦�佺煭淇℃椂闂�*/
     private String sendtime;
     /*濡傞渶鐘舵�佹姤鍛婂垯浼爐rue*/
-    private String report = "false";
+    private String report;
     /*涓嬪彂鐭俊鍙风爜鎵╁睍鐮�*/
     private String extend;
     /*璇ユ潯鐭俊鍦ㄦ偍涓氬姟绯荤粺鍐呯殑ID*/
     private String uid;
+    /*鐭俊绫诲瀷*/
+    private Integer smsType;
+    /* 鍙戦�佺姸鎬� (0: 绔嬪嵆鍙戦��; 1:寮傛鍙戦��)*/
+    private Integer sendStatus;
 
 
-    public SmsGeneralSendDto() {
-    }
-
-    public SmsGeneralSendDto(String id, String msg, String phone, String sendtime, String report, String extend, String uid) {
-        this.id = id;
-        this.msg = msg;
-        this.phone = phone;
-        this.sendtime = sendtime;
-        this.report = report;
-        this.extend = extend;
-        this.uid = uid;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getMsg() {
-        return msg;
-    }
-
-    public void setMsg(String msg) {
-        this.msg = msg;
-    }
-
-    public String getPhone() {
-        return phone;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone;
-    }
-
-    public String getSendtime() {
-        return sendtime;
-    }
     public Date getDateSendTime(){
         try {
             Date dateSendTime = new SimpleDateFormat("yyyyMMddHHmm").parse(sendtime);
@@ -72,32 +47,10 @@
         }
     }
 
-    public void setSendtime(String sendtime) {
-        this.sendtime = sendtime;
-    }
-
     public String getReport() {
+        if (!StringUtils.isEmpty(report) && !"true".equals(report)){
+            return null;
+        }
         return report;
     }
-
-    public void setReport(String report) {
-        this.report = report;
-    }
-
-    public String getExtend() {
-        return extend;
-    }
-
-    public void setExtend(String extend) {
-        this.extend = extend;
-    }
-
-    public String getUid() {
-        return uid;
-    }
-
-    public void setUid(String uid) {
-        this.uid = uid;
-    }
-
 }
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 994cd6e..f093f8b 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
@@ -1,105 +1,62 @@
 package com.hz.sms.dto;
 
+import lombok.Data;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.util.ObjectUtils;
+
+@Data
 public class TemplateMessageDto {
-    /** 鏍囪瘑 */
+    /** 浼佷笟寰俊id*/
+    private String corpId;
+    /** 鍏宠仈灏忕▼搴廼d*/
+    private String appId;
+
+    /** 鏍囪瘑 (璁板綍corp_wx_application琛ㄦ暟鎹殑id) (涓嶇敤浼�)*/
     private String id;
-    /** 浼佷笟ID */
-    private String corpid;
     /** 鎴愬憳ID鍒楄〃锛堟秷鎭帴鏀惰�咃紝澶氫釜鎺ユ敹鑰呯敤鈥榺鈥欏垎闅旓紝鏈�澶氭敮鎸�1000涓級 */
-    private String touser;
+    private String touSer;
     /** 閮ㄩ棬ID鍒楄〃锛屽涓帴鏀惰�呯敤鈥榺鈥欏垎闅旓紝鏈�澶氭敮鎸�100涓�� */
     private String toparty;
     /** 鏍囩ID鍒楄〃锛屽涓帴鏀惰�呯敤鈥榺鈥欏垎闅旓紝鏈�澶氭敮鎸�100涓�� */
-    private String totag;
+    private String toTag;
     /** 娑堟伅绫诲瀷 ,姝ゆ椂鍥哄畾涓猴細miniprogram_notice */
-    private String msgtype = "miniprogram_notice";
+    private String msgType;
     /** 鍙傛暟鍐呭 */
     private TemplateMsgDto miniprogram_notice;
 
     /** 琛ㄧず鏄惁寮�鍚痠d杞瘧锛�0琛ㄧず鍚︼紝1琛ㄧず鏄紝榛樿0 */
-    private Integer enable_id_trans = 0;
+    private Integer enable_id_trans;
     /** 琛ㄧず鏄惁寮�鍚噸澶嶆秷鎭鏌ワ紝0琛ㄧず鍚︼紝1琛ㄧず鏄紝榛樿0 */
-    private Integer enable_duplicate_check = 0;
+    private Integer enable_duplicate_check;
     /** 琛ㄧず鏄惁閲嶅娑堟伅妫�鏌ョ殑鏃堕棿闂撮殧锛岄粯璁�1800s锛屾渶澶т笉瓒呰繃4灏忔椂 */
-    private Integer duplicate_check_interval = 1800;
+    private Integer duplicate_check_interval;
+    /** 鍙戦�佺姸鎬� (0: 绔嬪嵆鍙戦��; 1:寮傛鍙戦��)*/
+    private Integer sendStatus;
 
-    public String getId() {
-        return id;
+    public String getMsgType() {
+        if (!StringUtils.isEmpty(msgType) && !"miniprogram_notice".equals(msgType)){
+            return null;
+        }
+        return msgType;
     }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getCorpid() {
-        return corpid;
-    }
-
-    public void setCorpid(String corpid) {
-        this.corpid = corpid;
-    }
-
-    public String getTouser() {
-        return touser;
-    }
-
-    public void setTouser(String touser) {
-        this.touser = touser;
-    }
-
-    public String getToparty() {
-        return toparty;
-    }
-
-    public void setToparty(String toparty) {
-        this.toparty = toparty;
-    }
-
-    public String getTotag() {
-        return totag;
-    }
-
-    public void setTotag(String totag) {
-        this.totag = totag;
-    }
-
-    public String getMsgtype() {
-        return msgtype;
-    }
-
-    public void setMsgtype(String msgtype) {
-        this.msgtype = msgtype;
-    }
-
-    public TemplateMsgDto getMiniprogram_notice() {
-        return miniprogram_notice;
-    }
-
-    public void setMiniprogram_notice(TemplateMsgDto miniprogram_notice) {
-        this.miniprogram_notice = miniprogram_notice;
-    }
-
     public Integer getEnable_id_trans() {
+        if (ObjectUtils.isEmpty(enable_id_trans)){
+            return null;
+        }
         return enable_id_trans;
     }
 
-    public void setEnable_id_trans(Integer enable_id_trans) {
-        this.enable_id_trans = enable_id_trans;
-    }
-
     public Integer getEnable_duplicate_check() {
+        if (ObjectUtils.isEmpty(enable_duplicate_check)){
+            return null;
+        }
         return enable_duplicate_check;
     }
 
-    public void setEnable_duplicate_check(Integer enable_duplicate_check) {
-        this.enable_duplicate_check = enable_duplicate_check;
-    }
-
     public Integer getDuplicate_check_interval() {
+        if (ObjectUtils.isEmpty(duplicate_check_interval)){
+            return null;
+        }
         return duplicate_check_interval;
-    }
-
-    public void setDuplicate_check_interval(Integer duplicate_check_interval) {
-        this.duplicate_check_interval = duplicate_check_interval;
     }
 }
\ No newline at end of file
diff --git a/phi-sms-feign/src/main/java/com/hz/sms/feign/FCorpWXSendService.java b/phi-sms-feign/src/main/java/com/hz/sms/feign/FCorpWXSendService.java
new file mode 100644
index 0000000..6a48976
--- /dev/null
+++ b/phi-sms-feign/src/main/java/com/hz/sms/feign/FCorpWXSendService.java
@@ -0,0 +1,22 @@
+package com.hz.sms.feign;
+
+import com.hx.resultTool.Result;
+import com.hz.sms.dto.TemplateMessageDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
+ */
+@FeignClient(name="phi-sms-user",path = "/sms",contextId = "send-corpwx")
+public interface FCorpWXSendService {
+
+    /**
+     * 鍙戦�佷紒涓氬井淇″簲鐢ㄦ秷鎭�
+     * @param templateMessageDto
+     * @return
+     */
+    @PostMapping(value = "/corp-wx-send/application/message")
+    Result sendNoticeSms(@RequestBody TemplateMessageDto templateMessageDto);
+}
diff --git a/phi-sms-feign/src/main/java/com/hz/sms/feign/FSmsSendService.java b/phi-sms-feign/src/main/java/com/hz/sms/feign/FSmsSendService.java
index 8e5e10e..88b0f8e 100644
--- a/phi-sms-feign/src/main/java/com/hz/sms/feign/FSmsSendService.java
+++ b/phi-sms-feign/src/main/java/com/hz/sms/feign/FSmsSendService.java
@@ -2,16 +2,14 @@
 
 import com.hx.resultTool.Result;
 import com.hz.sms.dto.SmsGeneralSendDto;
-import com.hz.sms.dto.SmsSendDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.ResponseBody;
 
 /**
  * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
  */
-@FeignClient(name="phi-sms-user",path = "/sms",contextId = "sms-send")
+@FeignClient(name="phi-sms-user",path = "/sms",contextId = "send-sms")
 public interface FSmsSendService {
 
     /**
@@ -19,7 +17,7 @@
      * @param smsGeneralSendDto
      * @return
      */
-    @PostMapping(value = "/send/verification/code")
+    @PostMapping(value = "/send-general/item/send/verification/code")
     Result sendVerificationCode(@RequestBody SmsGeneralSendDto smsGeneralSendDto);
 
     /**
@@ -27,7 +25,7 @@
      * @param smsGeneralSendDto
      * @return
      */
-    @PostMapping(value = "/send/inform")
+    @PostMapping(value = "/send-general/item/send/inform")
     Result sendNoticeSms(@RequestBody SmsGeneralSendDto smsGeneralSendDto);
 
     /**
@@ -35,7 +33,7 @@
      * @param smsGeneralSendDto
      * @return
      */
-    @PostMapping(value = "/send/marketing")
+    @PostMapping(value = "/send-general/item/send/marketing")
     Result sendMarketingSend(@RequestBody SmsGeneralSendDto smsGeneralSendDto);
 
 }
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 a90e8cb..89eaeae 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
@@ -1,10 +1,9 @@
 package com.hz.sms.feign;
 
 import com.hx.resultTool.Result;
+
 import com.hz.sms.dto.ResponsesSendMessage;
 import com.hz.sms.dto.ResponsesWxSendMpDto;
-
-import com.hz.sms.dto.TemplateMessageDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -13,23 +12,15 @@
 /**
  * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
  */
-@FeignClient(name="phi-sms-user",path = "/sms",contextId = "sys-send")
+@FeignClient(name="phi-sms-user",path = "/sms",contextId = "send-wx")
 public interface FWXSendService {
-
-    /**
-     * 鍙戦�佷紒涓氬井淇″簲鐢ㄦ秷鎭�
-     * @param templateMessageDto
-     * @return
-     */
-    @PostMapping(value = "/application/message")
-    Result sendNoticeSms(@RequestBody TemplateMessageDto templateMessageDto);
 
     /**
      * 寰俊灏忕▼搴忎笅鍙戠粺涓�娑堟伅   锛堝簾闄わ級
      * @param responsesSendMessage
      * @return
      */
-    @PostMapping(value = "/applet/message")
+    @PostMapping(value = "/wx/send/applet/message")
     Result sendAppletMessage(@RequestBody ResponsesSendMessage responsesSendMessage);
 
     /**
@@ -37,7 +28,7 @@
      * @param responsesSendMessage
      * @return
      */
-    @PostMapping(value = "/wechat/message")
+    @PostMapping(value = "/wx/send/wechat/message")
     Result sendWeChatMessage(@RequestBody ResponsesSendMessage responsesSendMessage);
 
     /**
@@ -45,6 +36,6 @@
      * @param responsesWxSendMpDto
      * @return
      */
-    @RequestMapping(value = "/mp/subscribe/message")
+    @RequestMapping(value = "/wx/send/mp/subscribe/message")
     Result sendMpMessage(@RequestBody ResponsesWxSendMpDto responsesWxSendMpDto);
 }
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
new file mode 100644
index 0000000..12df32b
--- /dev/null
+++ b/phi-sms-feign/src/main/java/com/hz/sms/platform/FCorpWxImmediatelyService.java
@@ -0,0 +1,23 @@
+package com.hz.sms.platform;
+
+import com.hx.resultTool.Result;
+import com.hz.sms.dto.TemplateMessageDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
+ */
+@FeignClient(name="phi-sms-rocketmq", path = "/sms",contextId = "sms-corpwx")
+public interface FCorpWxImmediatelyService {
+
+    /**
+     * 鍙戦�佷紒涓氬井淇″簲鐢ㄦ秷鎭�
+     * @param templateMessageDto
+     * @return
+     */
+    @PostMapping(value = "/immediately/send/corp-wx/application/message")
+    Result sendNoticeSms(@RequestBody TemplateMessageDto templateMessageDto);
+
+}
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
new file mode 100644
index 0000000..749f1d1
--- /dev/null
+++ b/phi-sms-feign/src/main/java/com/hz/sms/platform/FSmsImmediatelyService.java
@@ -0,0 +1,39 @@
+package com.hz.sms.platform;
+
+import com.hx.resultTool.Result;
+import com.hz.sms.dto.SmsGeneralSendDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
+ */
+@FeignClient(name="phi-sms-rocketmq", path = "/sms",contextId = "sms")
+public interface FSmsImmediatelyService {
+
+    /**
+     * 鍙戦�佺煭淇¢獙璇佺爜
+     * @param smsGeneralSendDto
+     * @return
+     */
+    @PostMapping(value = "/immediately/send/sms/verification/code")
+    Result sendVerificationCode(@RequestBody SmsGeneralSendDto smsGeneralSendDto);
+
+    /**
+     * 鍙戦�侀�氱煡鐭俊
+     * @param smsGeneralSendDto
+     * @return
+     */
+    @PostMapping(value = "/immediately/send/sms/notice")
+    Result sendNoticeSms(@RequestBody SmsGeneralSendDto smsGeneralSendDto);
+
+    /**
+     * 鍙戦�佽惀閿�鐭俊
+     * @param smsGeneralSendDto
+     * @return
+     */
+    @PostMapping(value = "/immediately/send/sms/marketing")
+    Result sendMarketingSend(@RequestBody SmsGeneralSendDto smsGeneralSendDto);
+
+}
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
new file mode 100644
index 0000000..4827262
--- /dev/null
+++ b/phi-sms-feign/src/main/java/com/hz/sms/platform/FWxImmediatelyService.java
@@ -0,0 +1,33 @@
+package com.hz.sms.platform;
+
+import com.hx.resultTool.Result;
+import com.hz.sms.dto.ResponsesSendMessage;
+import com.hz.sms.dto.ResponsesWxSendMpDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
+ */
+@FeignClient(name="phi-sms-rocketmq", path = "/sms",contextId = "sms-wx")
+public interface FWxImmediatelyService {
+
+    /**
+     * 寰俊鍏紬鍙蜂笅鍙戠粺涓�娑堟伅
+     * @param responsesSendMessage
+     * @return
+     */
+    @PostMapping(value = "/immediately/send/wechat/message")
+    Result sendWeChatMessage(@RequestBody ResponsesSendMessage responsesSendMessage);
+
+    /**
+     *  寰俊灏忕▼搴忓彂閫佽闃呮秷鎭�
+     * @param responsesWxSendMpDto
+     * @return
+     */
+    @RequestMapping(value = "/immediately/send/mp/message")
+    Result sendMpMessage(@RequestBody ResponsesWxSendMpDto responsesWxSendMpDto);
+
+}

--
Gitblit v1.8.0