From 503bdbd7381bc27474a30a85bf994f36ed6e00b1 Mon Sep 17 00:00:00 2001
From: Kurisu <makise_kurisuu@outlook.jp>
Date: Sat, 25 Sep 2021 16:18:44 +0800
Subject: [PATCH] :zap: 调整参数

---
 README.md                                                                             |  3 ++-
 fw-hestia-domain/src/main/java/cn/fw/hestia/domain/db/MessageHistory.java             |  6 +++++-
 fw-hestia-domain/src/main/java/cn/fw/hestia/domain/vo/MessageHistoryVO.java           |  7 ++++++-
 fw-hestia-sdk/src/main/java/cn/fw/hestia/sdk/params/TemplateMessageParam.java         | 13 +++++++++++--
 fw-hestia-service/src/main/java/cn/fw/hestia/service/buz/MessageCenterBizService.java |  3 ++-
 5 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index e6ccb6f..6bacd37 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,8 @@
 |参数名|必须|类型|说明|
 |----|:----:|:----:|:----|
 |memberId|是 | Long| 会员id|
-|title| 是 | String| 标题内容。|
+|title| 是 | String| 标题|
+|content|是|String|内容|
 |changeType| 是 | String| 变更类型|
 |changeResult| 是 | String| 变更结果。|
 |remark| 否 | String| 备注。|
diff --git a/fw-hestia-domain/src/main/java/cn/fw/hestia/domain/db/MessageHistory.java b/fw-hestia-domain/src/main/java/cn/fw/hestia/domain/db/MessageHistory.java
index bd8e82f..38993fa 100644
--- a/fw-hestia-domain/src/main/java/cn/fw/hestia/domain/db/MessageHistory.java
+++ b/fw-hestia-domain/src/main/java/cn/fw/hestia/domain/db/MessageHistory.java
@@ -31,10 +31,14 @@ public class MessageHistory extends Model<MessageHistory> {
      */
     private String templateCode;
     /**
-     * 消息内容
+     * 消息标题
      */
     private String title;
     /**
+     * 消息内容
+     */
+    private String content;
+    /**
      * 关键词参数 （json字符串）
      */
     private String keywords;
diff --git a/fw-hestia-domain/src/main/java/cn/fw/hestia/domain/vo/MessageHistoryVO.java b/fw-hestia-domain/src/main/java/cn/fw/hestia/domain/vo/MessageHistoryVO.java
index f2db9f1..0054d08 100644
--- a/fw-hestia-domain/src/main/java/cn/fw/hestia/domain/vo/MessageHistoryVO.java
+++ b/fw-hestia-domain/src/main/java/cn/fw/hestia/domain/vo/MessageHistoryVO.java
@@ -22,10 +22,14 @@ public class MessageHistoryVO {
      */
     private Long memberId;
     /**
-     * 消息内容
+     * 消息标题
      */
     private String title;
     /**
+     * 消息内容
+     */
+    private String content;
+    /**
      * 备注
      */
     private String remark;
@@ -46,6 +50,7 @@ public class MessageHistoryVO {
         vo.setMessageId(history.getId());
         vo.setMemberId(history.getMemberId());
         vo.setTitle(history.getTitle());
+        vo.setContent(history.getContent());
         vo.setReadz(history.getReadz());
         vo.setRemark(history.getRemark());
         vo.setMessageTime(history.getCreateTime());
diff --git a/fw-hestia-sdk/src/main/java/cn/fw/hestia/sdk/params/TemplateMessageParam.java b/fw-hestia-sdk/src/main/java/cn/fw/hestia/sdk/params/TemplateMessageParam.java
index 1320280..547463f 100644
--- a/fw-hestia-sdk/src/main/java/cn/fw/hestia/sdk/params/TemplateMessageParam.java
+++ b/fw-hestia-sdk/src/main/java/cn/fw/hestia/sdk/params/TemplateMessageParam.java
@@ -3,8 +3,10 @@ package cn.fw.hestia.sdk.params;
 import lombok.Data;
 import lombok.ToString;
 
+import javax.validation.constraints.Max;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 import java.util.Map;
 
 /**
@@ -34,11 +36,18 @@ public class TemplateMessageParam {
     @NotNull(message = "会员id不能为空")
     private Long memberId;
     /**
-     * 标题内容 对应「first」字段
+     * 标题 小程序展示用
+     * maxLength 32
      */
-    @NotBlank(message = "标题内容不能为空")
+    @NotBlank(message = "标题不能为空")
+    @Size(max = 32, message = "标题太长")
     private String title;
     /**
+     * 消息内容 对应「first」字段
+     */
+    @NotBlank(message = "消息内容不能为空")
+    private String content;
+    /**
      * 备注
      */
     private String remark;
diff --git a/fw-hestia-service/src/main/java/cn/fw/hestia/service/buz/MessageCenterBizService.java b/fw-hestia-service/src/main/java/cn/fw/hestia/service/buz/MessageCenterBizService.java
index b6be9b2..879a27d 100644
--- a/fw-hestia-service/src/main/java/cn/fw/hestia/service/buz/MessageCenterBizService.java
+++ b/fw-hestia-service/src/main/java/cn/fw/hestia/service/buz/MessageCenterBizService.java
@@ -228,6 +228,7 @@ public class MessageCenterBizService {
         messageHistory.setMemberId(param.getMemberId());
         messageHistory.setTemplateCode(getTemplateCode());
         messageHistory.setTitle(param.getTitle());
+        messageHistory.setContent(param.getContent());
         messageHistory.setRemark(param.getRemark());
         messageHistory.setPagePath(param.getPath());
         messageHistory.setReadz(Boolean.FALSE);
@@ -249,7 +250,7 @@ public class MessageCenterBizService {
     private TMParam createTmParam(MessageHistory history) {
         TMParam tmParam = new TMParam();
         tmParam.setSceneToken(history.getId());
-        tmParam.setTitle(history.getTitle());
+        tmParam.setTitle(history.getContent());
         tmParam.setRemark(history.getRemark());
         tmParam.setPath(history.getPagePath());
         tmParam.setTemplateCode(history.getTemplateCode());
--
libgit2 0.22.2