From 15ab196977489471fc747d898ebe0cb9ece5cab7 Mon Sep 17 00:00:00 2001
From: 童刚 <pBP8jclM@8yTJ@4h>
Date: 星期五, 12 八月 2022 18:00:03 +0800
Subject: [PATCH] 1. 修改属性参数(驼峰命名)
---
phi-sms-feign/src/main/java/com/hz/sms/dto/WeAppTemplateMsg.java | 49 +----------
phi-sms-feign/src/main/java/com/hz/sms/platform/FSmsImmediatelyService.java | 8 +-
phi-sms-feign/src/main/java/com/hz/sms/dto/ResponsesWxSendMpDto.java | 4
phi-sms-feign/src/main/java/com/hz/sms/dto/TemplateMessageDto.java | 26 +++---
phi-sms-feign/src/main/java/com/hz/sms/platform/FWxImmediatelyService.java | 2
phi-sms-feign/src/main/java/com/hz/sms/dto/Keyword.java | 23 +++++
phi-sms-feign/src/main/java/com/hz/sms/platform/FCorpWxImmediatelyService.java | 2
phi-sms-feign/src/main/java/com/hz/sms/dto/SmsGeneralSendDto.java | 8 +-
phi-sms-feign/src/main/java/com/hz/sms/dto/TemplateMsgDto.java | 30 +++---
phi-sms-feign/src/main/java/com/hz/sms/dto/ResponsesSendMessage.java | 10 +-
phi-sms-feign/src/main/java/com/hz/sms/dto/MpTemplateMsg.java | 62 ++-------------
11 files changed, 82 insertions(+), 142 deletions(-)
diff --git a/phi-sms-feign/src/main/java/com/hz/sms/dto/Keyword.java b/phi-sms-feign/src/main/java/com/hz/sms/dto/Keyword.java
new file mode 100644
index 0000000..8593f80
--- /dev/null
+++ b/phi-sms-feign/src/main/java/com/hz/sms/dto/Keyword.java
@@ -0,0 +1,23 @@
+package com.hz.sms.dto;
+
+public class Keyword {
+ private String value;
+
+ private String color;
+
+ public String getColor() {
+ return color;
+ }
+
+ public void setColor(String color) {
+ this.color = color;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+}
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 a1a29d1..5042ab3 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,66 +1,20 @@
package com.hz.sms.dto;
+import lombok.Data;
+import java.util.Map;
+
+@Data
public class MpTemplateMsg {
//鍏紬鍙穉ppid锛岃姹備笌灏忕▼搴忔湁缁戝畾涓斿悓涓讳綋
- private String appid;
+ private String appId;
//鍏紬鍙锋ā鏉縤d
- private String template_id;
+ private String templateId;
//鍏紬鍙锋ā鏉挎秷鎭墍瑕佽烦杞殑url
private String url;
//鍏紬鍙锋ā鏉挎秷鎭墍瑕佽烦杞殑灏忕▼搴忥紝灏忕▼搴忕殑蹇呴』涓庡叕浼楀彿鍏锋湁缁戝畾鍏崇郴
- private String miniprogram;
+ private String minIProgram;
//鍏紬鍙锋ā鏉挎秷鎭殑鏁版嵁
- private String data;
+ private Map<String, Keyword> 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
index 782bea0..cbab517 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
@@ -16,11 +16,11 @@
//鏍囪瘑 (璁板綍wx_wechat琛ㄦ暟鎹殑id) 涓嶇敤浼�
private String id;
//鐢ㄦ埛openid锛屽彲浠ユ槸灏忕▼搴忕殑openid锛屼篃鍙互鏄痬p_template_msg.appid瀵瑰簲鐨勫叕浼楀彿鐨刼penid
- private String touser;
+ private String touSer;
//灏忕▼搴忔ā鏉挎秷鎭浉鍏崇殑淇℃伅锛屽彲浠ュ弬鑰冨皬绋嬪簭妯℃澘娑堟伅鎺ュ彛; 鏈夋鑺傜偣鍒欎紭鍏堝彂閫佸皬绋嬪簭妯℃澘娑堟伅锛涳紙灏忕▼搴忔ā鏉挎秷鎭凡涓嬬嚎锛屼笉鐢ㄤ紶姝よ妭鐐癸級
- private WeAppTemplateMsg weapp_template_msg;
+ private WeAppTemplateMsg weAppTemplateMsg;
//鍏紬鍙锋ā鏉挎秷鎭浉鍏崇殑淇℃伅锛屽彲浠ュ弬鑰冨叕浼楀彿妯℃澘娑堟伅鎺ュ彛锛涙湁姝よ妭鐐瑰苟涓旀病鏈墂eapp_template_msg鑺傜偣鏃讹紝鍙戦�佸叕浼楀彿妯℃澘娑堟伅
- private MpTemplateMsg mp_template_msg;
- // 鍙戦�佺姸鎬� (0: 绔嬪嵆鍙戦��; 1:寮傛鍙戦��)
- private Integer sendStatus;
+ 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
index 30808ee..3f054ef 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,8 +24,8 @@
private String lang;
/** 妯℃澘鍐呭*/
private JSONObject data;
- /** 鍙戦�佺姸鎬� (0: 绔嬪嵆鍙戦��; 1:寮傛鍙戦��)*/
- private Integer sendStatus;
+ /** 鍙戦�佹ā寮� (0: 绔嬪嵆鍙戦��; 1:寮傛鍙戦��)*/
+ private Integer sendModel;
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 efd1106..623778c 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
@@ -25,7 +25,7 @@
/*鎵嬫満鍙风爜*/
private String phone;
/*瀹氭椂鍙戦�佺煭淇℃椂闂�*/
- private String sendtime;
+ private String sendTime;
/*濡傞渶鐘舵�佹姤鍛婂垯浼爐rue*/
private String report;
/*涓嬪彂鐭俊鍙风爜鎵╁睍鐮�*/
@@ -34,13 +34,13 @@
private String uid;
/*鐭俊绫诲瀷*/
private Integer smsType;
- /* 鍙戦�佺姸鎬� (0: 绔嬪嵆鍙戦��; 1:寮傛鍙戦��)*/
- private Integer sendStatus;
+ /* 鍙戦�佹ā寮� (0: 绔嬪嵆鍙戦��; 1:寮傛鍙戦��)*/
+ private Integer sendModel;
public Date getDateSendTime(){
try {
- Date dateSendTime = new SimpleDateFormat("yyyyMMddHHmm").parse(sendtime);
+ Date dateSendTime = new SimpleDateFormat("yyyyMMddHHmm").parse(sendTime);
return dateSendTime;
}catch (Exception e){
return null;
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 f093f8b..1b537d6 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
@@ -16,22 +16,22 @@
/** 鎴愬憳ID鍒楄〃锛堟秷鎭帴鏀惰�咃紝澶氫釜鎺ユ敹鑰呯敤鈥榺鈥欏垎闅旓紝鏈�澶氭敮鎸�1000涓級 */
private String touSer;
/** 閮ㄩ棬ID鍒楄〃锛屽涓帴鏀惰�呯敤鈥榺鈥欏垎闅旓紝鏈�澶氭敮鎸�100涓�� */
- private String toparty;
+ private String toParty;
/** 鏍囩ID鍒楄〃锛屽涓帴鏀惰�呯敤鈥榺鈥欏垎闅旓紝鏈�澶氭敮鎸�100涓�� */
private String toTag;
/** 娑堟伅绫诲瀷 ,姝ゆ椂鍥哄畾涓猴細miniprogram_notice */
private String msgType;
/** 鍙傛暟鍐呭 */
- private TemplateMsgDto miniprogram_notice;
+ private TemplateMsgDto minIProgramNotice;
/** 琛ㄧず鏄惁寮�鍚痠d杞瘧锛�0琛ㄧず鍚︼紝1琛ㄧず鏄紝榛樿0 */
- private Integer enable_id_trans;
+ private Integer enableIdTrans;
/** 琛ㄧず鏄惁寮�鍚噸澶嶆秷鎭鏌ワ紝0琛ㄧず鍚︼紝1琛ㄧず鏄紝榛樿0 */
- private Integer enable_duplicate_check;
+ private Integer enableDuplicateCheck;
/** 琛ㄧず鏄惁閲嶅娑堟伅妫�鏌ョ殑鏃堕棿闂撮殧锛岄粯璁�1800s锛屾渶澶т笉瓒呰繃4灏忔椂 */
- private Integer duplicate_check_interval;
- /** 鍙戦�佺姸鎬� (0: 绔嬪嵆鍙戦��; 1:寮傛鍙戦��)*/
- private Integer sendStatus;
+ private Integer duplicateCheckInterval;
+ /** 鍙戦�佹ā寮� (0: 绔嬪嵆鍙戦��; 1:寮傛鍙戦��)*/
+ private Integer sendModel;
public String getMsgType() {
if (!StringUtils.isEmpty(msgType) && !"miniprogram_notice".equals(msgType)){
@@ -40,23 +40,23 @@
return msgType;
}
public Integer getEnable_id_trans() {
- if (ObjectUtils.isEmpty(enable_id_trans)){
+ if (ObjectUtils.isEmpty(enableIdTrans)){
return null;
}
- return enable_id_trans;
+ return enableIdTrans;
}
public Integer getEnable_duplicate_check() {
- if (ObjectUtils.isEmpty(enable_duplicate_check)){
+ if (ObjectUtils.isEmpty(enableDuplicateCheck)){
return null;
}
- return enable_duplicate_check;
+ return enableDuplicateCheck;
}
public Integer getDuplicate_check_interval() {
- if (ObjectUtils.isEmpty(duplicate_check_interval)){
+ if (ObjectUtils.isEmpty(duplicateCheckInterval)){
return null;
}
- return duplicate_check_interval;
+ return duplicateCheckInterval;
}
}
\ 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 1be18d1..7a75e24 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
@@ -5,7 +5,7 @@
public class TemplateMsgDto {
/** 灏忕▼搴廰ppid锛屽繀椤绘槸涓庡綋鍓嶅簲鐢ㄥ叧鑱旂殑灏忕▼搴� */
- private String appid;
+ private String appId;
/** 鐐瑰嚮娑堟伅鍗＄墖鍚庣殑灏忕▼搴忛〉闈紝鏈�闀�1024涓瓧鑺傦紝浠呴檺鏈皬绋嬪簭鍐呯殑椤甸潰銆傝瀛楁涓嶅～鍒欐秷鎭偣鍑诲悗涓嶈烦杞�� */
private String page;
/** 娑堟伅鏍囬锛岄暱搴﹂檺鍒�4-12涓眽瀛楋紙鏀寔id杞瘧锛�*/
@@ -13,16 +13,16 @@
/** 娑堟伅鎻忚堪锛岄暱搴﹂檺鍒�4-12涓眽瀛楋紙鏀寔id杞瘧锛�*/
private String description;
/** 鏄惁鏀惧ぇ绗竴涓猚ontent_item*/
- private boolean emphasis_first_item;
+ private boolean emphasisFirstItem;
/** 娑堟伅鍐呭閿�煎锛屾渶澶氬厑璁�10涓猧tem*/
- private List<ContentItemDto> content_item;
+ private List<ContentItemDto> contentItem;
- public String getAppid() {
- return appid;
+ public String getAppId() {
+ return appId;
}
- public void setAppid(String appid) {
- this.appid = appid;
+ public void setAppId(String appId) {
+ this.appId = appId;
}
public String getPage() {
@@ -49,19 +49,19 @@
this.description = description;
}
- public boolean isEmphasis_first_item() {
- return emphasis_first_item;
+ public boolean isEmphasisFirstItem() {
+ return emphasisFirstItem;
}
- public void setEmphasis_first_item(boolean emphasis_first_item) {
- this.emphasis_first_item = emphasis_first_item;
+ public void setEmphasisFirstItem(boolean emphasisFirstItem) {
+ this.emphasisFirstItem = emphasisFirstItem;
}
- public List<ContentItemDto> getContent_item() {
- return content_item;
+ public List<ContentItemDto> getContentItem() {
+ return contentItem;
}
- public void setContent_item(List<ContentItemDto> content_item) {
- this.content_item = content_item;
+ public void setContentItem(List<ContentItemDto> contentItem) {
+ this.contentItem = contentItem;
}
}
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
index 0ff9ba2..4cc6ad1 100644
--- 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
@@ -1,54 +1,17 @@
package com.hz.sms.dto;
+import lombok.Data;
+
+@Data
public class WeAppTemplateMsg {
//灏忕▼搴忔ā鏉縄D
- private String template_id;
+ private String templateId;
//灏忕▼搴忛〉闈㈣矾寰�
private String page;
//灏忕▼搴忔ā鏉挎秷鎭痜ormid
- private String from_id;
+ private String fromId;
//灏忕▼搴忔ā鏉挎斁澶у叧閿瘝
- private String emphasis_keyword;
+ private String emphasisKeyword;
//灏忕▼搴忔ā鏉挎暟鎹�
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/platform/FCorpWxImmediatelyService.java b/phi-sms-feign/src/main/java/com/hz/sms/platform/FCorpWxImmediatelyService.java
index 12df32b..f660e4b 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
@@ -9,7 +9,7 @@
/**
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
*/
-@FeignClient(name="phi-sms-rocketmq", path = "/sms",contextId = "sms-corpwx")
+@FeignClient(name="phi-sms-rocketmq", path = "/sms-mq",contextId = "sms-corpwx")
public interface FCorpWxImmediatelyService {
/**
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 749f1d1..0e7122f 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
@@ -9,7 +9,7 @@
/**
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
*/
-@FeignClient(name="phi-sms-rocketmq", path = "/sms",contextId = "sms")
+@FeignClient(name="phi-sms-rocketmq", path = "/sms-mq",contextId = "sms")
public interface FSmsImmediatelyService {
/**
@@ -17,7 +17,7 @@
* @param smsGeneralSendDto
* @return
*/
- @PostMapping(value = "/immediately/send/sms/verification/code")
+ @PostMapping(value = "/immediately/send/verification/code")
Result sendVerificationCode(@RequestBody SmsGeneralSendDto smsGeneralSendDto);
/**
@@ -25,7 +25,7 @@
* @param smsGeneralSendDto
* @return
*/
- @PostMapping(value = "/immediately/send/sms/notice")
+ @PostMapping(value = "/immediately/send/notice")
Result sendNoticeSms(@RequestBody SmsGeneralSendDto smsGeneralSendDto);
/**
@@ -33,7 +33,7 @@
* @param smsGeneralSendDto
* @return
*/
- @PostMapping(value = "/immediately/send/sms/marketing")
+ @PostMapping(value = "/immediately/send/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
index 4827262..c20b5ca 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
@@ -11,7 +11,7 @@
/**
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
*/
-@FeignClient(name="phi-sms-rocketmq", path = "/sms",contextId = "sms-wx")
+@FeignClient(name="phi-sms-rocketmq", path = "/sms-mq",contextId = "sms-wx")
public interface FWxImmediatelyService {
/**
--
Gitblit v1.8.0