From 6de4e86086a1c7ab346e5f57e3ad10e2cf79c544 Mon Sep 17 00:00:00 2001 From: 童刚 <pBP8jclM@8yTJ@4h> Date: 星期二, 02 八月 2022 18:05:56 +0800 Subject: [PATCH] 1.修改短信发送方式 2.增加Feign调用服务 --- phi-sms-feign/src/main/java/com/hz/sms/dto/WeAppTemplateMsg.java | 54 +++++ phi-sms-feign/src/main/java/com/hz/sms/feign/FSmsSendService.java | 25 ++ phi-sms-feign/src/main/java/com/hz/sms/dto/TemplateMessageDto.java | 105 ++++++++++ phi-sms-feign/src/main/java/com/hz/sms/dto/SmsGeneralSendDto.java | 103 ++++++++++ phi-sms-feign/src/main/java/com/hz/sms/dto/ContentItemDto.java | 25 ++ phi-sms-feign/src/main/java/com/hz/sms/dto/TemplateMsgDto.java | 67 ++++++ phi-sms-feign/src/main/java/com/hz/sms/feign/FSysSendService.java | 41 ++++ phi-sms-feign/src/main/java/com/hz/sms/dto/ResponsesSendMessage.java | 58 +++++ phi-sms-feign/src/main/java/com/hz/sms/dto/MpTemplateMsg.java | 66 ++++++ 9 files changed, 544 insertions(+), 0 deletions(-) diff --git a/phi-sms-feign/src/main/java/com/hz/sms/dto/ContentItemDto.java b/phi-sms-feign/src/main/java/com/hz/sms/dto/ContentItemDto.java new file mode 100644 index 0000000..2c7d1a3 --- /dev/null +++ b/phi-sms-feign/src/main/java/com/hz/sms/dto/ContentItemDto.java @@ -0,0 +1,25 @@ +package com.hz.sms.dto; + + +public class ContentItemDto { + /** 闀垮害10涓眽瀛椾互鍐� */ + private String key; + /** 闀垮害30涓眽瀛椾互鍐咃紙鏀寔id杞瘧锛� */ + private String value; + + public String getKey() { + return key; + } + + public void setKey(String key) { + this.key = key; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } +} \ No newline at end of file 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 new file mode 100644 index 0000000..a1a29d1 --- /dev/null +++ b/phi-sms-feign/src/main/java/com/hz/sms/dto/MpTemplateMsg.java @@ -0,0 +1,66 @@ +package com.hz.sms.dto; + + +public class MpTemplateMsg { + //鍏紬鍙穉ppid锛岃姹備笌灏忕▼搴忔湁缁戝畾涓斿悓涓讳綋 + private String appid; + //鍏紬鍙锋ā鏉縤d + private String template_id; + //鍏紬鍙锋ā鏉挎秷鎭墍瑕佽烦杞殑url + private String url; + //鍏紬鍙锋ā鏉挎秷鎭墍瑕佽烦杞殑灏忕▼搴忥紝灏忕▼搴忕殑蹇呴』涓庡叕浼楀彿鍏锋湁缁戝畾鍏崇郴 + private String miniprogram; + //鍏紬鍙锋ā鏉挎秷鎭殑鏁版嵁 + private String data; + + public String getAppid() { + return appid; + } + + public void setAppid(String appid) { + this.appid = appid; + } + + public String getTemplate_id() { + return template_id; + } + + public void setTemplate_id(String template_id) { + this.template_id = template_id; + } + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } + + public String getMiniprogram() { + return miniprogram; + } + + public void setMiniprogram(String miniprogram) { + this.miniprogram = miniprogram; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + @Override + public String toString() { + return "MpTemplateMsg{" + + "appid='" + appid + '\'' + + ", template_id='" + template_id + '\'' + + ", url='" + url + '\'' + + ", miniprogram='" + miniprogram + '\'' + + ", data='" + 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 new file mode 100644 index 0000000..0c35c35 --- /dev/null +++ b/phi-sms-feign/src/main/java/com/hz/sms/dto/ResponsesSendMessage.java @@ -0,0 +1,58 @@ +package com.hz.sms.dto; + + +/** + * 鍙傛暟鐢ㄤ簬涓嬪彂灏忕▼搴忓拰鍏紬鍙风粺涓�鐨勬湇鍔℃秷鎭� (鍙傛暟瀹炰綋) + */ +public class ResponsesSendMessage { + //鏍囪瘑 + 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; + } +} 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 new file mode 100644 index 0000000..0102b19 --- /dev/null +++ b/phi-sms-feign/src/main/java/com/hz/sms/dto/SmsGeneralSendDto.java @@ -0,0 +1,103 @@ +package com.hz.sms.dto; + + +import java.text.SimpleDateFormat; +import java.util.Date; + + +public class SmsGeneralSendDto { + + /*鏍囪瘑*/ + private String id; + /*鐭俊鍐呭*/ + private String msg; + /*鎵嬫満鍙风爜*/ + private String phone; + /*瀹氭椂鍙戦�佺煭淇℃椂闂�*/ + private String sendtime; + /*濡傞渶鐘舵�佹姤鍛婂垯浼爐rue*/ + private String report = "false"; + /*涓嬪彂鐭俊鍙风爜鎵╁睍鐮�*/ + private String extend; + /*璇ユ潯鐭俊鍦ㄦ偍涓氬姟绯荤粺鍐呯殑ID*/ + private String uid; + + + 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); + return dateSendTime; + }catch (Exception e){ + return null; + } + } + + public void setSendtime(String sendtime) { + this.sendtime = sendtime; + } + + public String getReport() { + 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 new file mode 100644 index 0000000..994cd6e --- /dev/null +++ b/phi-sms-feign/src/main/java/com/hz/sms/dto/TemplateMessageDto.java @@ -0,0 +1,105 @@ +package com.hz.sms.dto; + +public class TemplateMessageDto { + /** 鏍囪瘑 */ + private String id; + /** 浼佷笟ID */ + private String corpid; + /** 鎴愬憳ID鍒楄〃锛堟秷鎭帴鏀惰�咃紝澶氫釜鎺ユ敹鑰呯敤鈥榺鈥欏垎闅旓紝鏈�澶氭敮鎸�1000涓級 */ + private String touser; + /** 閮ㄩ棬ID鍒楄〃锛屽涓帴鏀惰�呯敤鈥榺鈥欏垎闅旓紝鏈�澶氭敮鎸�100涓�� */ + private String toparty; + /** 鏍囩ID鍒楄〃锛屽涓帴鏀惰�呯敤鈥榺鈥欏垎闅旓紝鏈�澶氭敮鎸�100涓�� */ + private String totag; + /** 娑堟伅绫诲瀷 ,姝ゆ椂鍥哄畾涓猴細miniprogram_notice */ + private String msgtype = "miniprogram_notice"; + /** 鍙傛暟鍐呭 */ + private TemplateMsgDto miniprogram_notice; + + /** 琛ㄧず鏄惁寮�鍚痠d杞瘧锛�0琛ㄧず鍚︼紝1琛ㄧず鏄紝榛樿0 */ + private Integer enable_id_trans = 0; + /** 琛ㄧず鏄惁寮�鍚噸澶嶆秷鎭鏌ワ紝0琛ㄧず鍚︼紝1琛ㄧず鏄紝榛樿0 */ + private Integer enable_duplicate_check = 0; + /** 琛ㄧず鏄惁閲嶅娑堟伅妫�鏌ョ殑鏃堕棿闂撮殧锛岄粯璁�1800s锛屾渶澶т笉瓒呰繃4灏忔椂 */ + private Integer duplicate_check_interval = 1800; + + public String getId() { + return id; + } + + 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() { + 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() { + 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() { + 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/dto/TemplateMsgDto.java b/phi-sms-feign/src/main/java/com/hz/sms/dto/TemplateMsgDto.java new file mode 100644 index 0000000..1be18d1 --- /dev/null +++ b/phi-sms-feign/src/main/java/com/hz/sms/dto/TemplateMsgDto.java @@ -0,0 +1,67 @@ +package com.hz.sms.dto; + + +import java.util.List; + +public class TemplateMsgDto { + /** 灏忕▼搴廰ppid锛屽繀椤绘槸涓庡綋鍓嶅簲鐢ㄥ叧鑱旂殑灏忕▼搴� */ + private String appid; + /** 鐐瑰嚮娑堟伅鍗$墖鍚庣殑灏忕▼搴忛〉闈紝鏈�闀�1024涓瓧鑺傦紝浠呴檺鏈皬绋嬪簭鍐呯殑椤甸潰銆傝瀛楁涓嶅~鍒欐秷鎭偣鍑诲悗涓嶈烦杞�� */ + private String page; + /** 娑堟伅鏍囬锛岄暱搴﹂檺鍒�4-12涓眽瀛楋紙鏀寔id杞瘧锛�*/ + private String title; + /** 娑堟伅鎻忚堪锛岄暱搴﹂檺鍒�4-12涓眽瀛楋紙鏀寔id杞瘧锛�*/ + private String description; + /** 鏄惁鏀惧ぇ绗竴涓猚ontent_item*/ + private boolean emphasis_first_item; + /** 娑堟伅鍐呭閿�煎锛屾渶澶氬厑璁�10涓猧tem*/ + private List<ContentItemDto> content_item; + + public String getAppid() { + return appid; + } + + public void setAppid(String appid) { + this.appid = appid; + } + + public String getPage() { + return page; + } + + public void setPage(String page) { + this.page = page; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public boolean isEmphasis_first_item() { + return emphasis_first_item; + } + + public void setEmphasis_first_item(boolean emphasis_first_item) { + this.emphasis_first_item = emphasis_first_item; + } + + public List<ContentItemDto> getContent_item() { + return content_item; + } + + public void setContent_item(List<ContentItemDto> content_item) { + this.content_item = content_item; + } +} 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 new file mode 100644 index 0000000..0ff9ba2 --- /dev/null +++ b/phi-sms-feign/src/main/java/com/hz/sms/dto/WeAppTemplateMsg.java @@ -0,0 +1,54 @@ +package com.hz.sms.dto; + +public class WeAppTemplateMsg { + //灏忕▼搴忔ā鏉縄D + private String template_id; + //灏忕▼搴忛〉闈㈣矾寰� + private String page; + //灏忕▼搴忔ā鏉挎秷鎭痜ormid + private String from_id; + //灏忕▼搴忔ā鏉挎斁澶у叧閿瘝 + private String emphasis_keyword; + //灏忕▼搴忔ā鏉挎暟鎹� + private String data; + + public String getTemplate_id() { + return template_id; + } + + public void setTemplate_id(String template_id) { + this.template_id = template_id; + } + + public String getPage() { + return page; + } + + public void setPage(String page) { + this.page = page; + } + + public String getFrom_id() { + return from_id; + } + + public void setFrom_id(String from_id) { + this.from_id = from_id; + } + + public String getEmphasis_keyword() { + return emphasis_keyword; + } + + public void setEmphasis_keyword(String emphasis_keyword) { + this.emphasis_keyword = emphasis_keyword; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } +} 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 2861133..cd16e21 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 @@ -1,10 +1,12 @@ package com.hz.sms.feign; 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墠缂� @@ -27,5 +29,28 @@ @PostMapping(value = "/sms/identicalSend") Result sendIdenticalsend(@RequestBody SmsSendDto smsSendDto); + /** + * 鍙戦�佺煭淇¢獙璇佺爜 + * @param smsGeneralSendDto + * @return + */ + @PostMapping(value = "/verification/code") + Result sendVerificationCode(@RequestBody SmsGeneralSendDto smsGeneralSendDto); + + /** + * 鍙戦�侀�氱煡鐭俊 + * @param smsGeneralSendDto + * @return + */ + @PostMapping(value = "/inform/sms") + Result sendNoticeSms(@RequestBody SmsGeneralSendDto smsGeneralSendDto); + + /** + * 鍙戦�佽惀閿�鐭俊 + * @param smsGeneralSendDto + * @return + */ + @PostMapping(value = "/marketing/sms") + Result sendMarketingSend(@RequestBody SmsGeneralSendDto smsGeneralSendDto); } diff --git a/phi-sms-feign/src/main/java/com/hz/sms/feign/FSysSendService.java b/phi-sms-feign/src/main/java/com/hz/sms/feign/FSysSendService.java new file mode 100644 index 0000000..d50089f --- /dev/null +++ b/phi-sms-feign/src/main/java/com/hz/sms/feign/FSysSendService.java @@ -0,0 +1,41 @@ +package com.hz.sms.feign; + +import com.hx.resultTool.Result; +import com.hz.sms.dto.ResponsesSendMessage; +import com.hz.sms.dto.SmsGeneralSendDto; +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 = "/sys",contextId = "sys-send") +public interface FSysSendService { + + /** + * 鍙戦�佷紒涓氬井淇″簲鐢ㄦ秷鎭� + * @param templateMessageDto + * @return + */ + @PostMapping(value = "/application/message") + Result sendNoticeSms(@RequestBody TemplateMessageDto templateMessageDto); + + /** + * 寰俊灏忕▼搴忎笅鍙戠粺涓�娑堟伅 + * @param responsesSendMessage + * @return + */ + @PostMapping(value = "/applet/message") + Result sendAppletMessage(@RequestBody ResponsesSendMessage responsesSendMessage); + + /** + * 寰俊鍏紬鍙蜂笅鍙戠粺涓�娑堟伅 + * @param responsesSendMessage + * @return + */ + @PostMapping(value = "/public/message") + Result sendPublicMessage(@RequestBody ResponsesSendMessage responsesSendMessage); + +} -- Gitblit v1.8.0