修改消息体

2433ceee · giaogiao · f119af69 · 2433ceee · 2433ceee · 2433ceee
Commit 2433ceee authored Jun 07, 2021 by giaogiao
8 changed files
--- a/bootstrap/src/test/java/io/geekidea/springbootplus/test/FirebaseTest.java
+++ b/bootstrap/src/test/java/io/geekidea/springbootplus/test/FirebaseTest.java
@@ -13,11 +13,21 @@ import java.net.URL;
 @Slf4j
 public class FirebaseTest {
    public static void main(String[] args) {
-        String to = "";
+        for (int i = 0; i < 3; i++) {
+            extracted();
+        }
+    }
-        String key = "";
+    private static void extracted() {
+        //        System.set
+        // SOCKS 代理，支持 HTTP 和 HTTPS 请求
+        // 注意：如果设置了 SOCKS 代理就不要设 HTTP/HTTPS 代理
+        System.setProperty("socksProxyHost", "127.0.0.1");
+        System.setProperty("socksProxyPort", "7891");
+        String to = "ck_oO93kR42WlkmzBVjzcA:APA91bGTcXlFq9_AOvGOJSIB4Z38EOqhP3_6HQ18_XIn3othxSWTeRr_IaQn-75AB9FvD5CiTig03Y56VtZDEEihismai0OOMPyxB7R4ajaFrQszEQRbCBw3iUgaAyjK7e1RFeq22tRC";
+        String key = "AAAA7PNYwIg:APA91bG2PZlTpC9sxqeIxtKDJJGzGZlh1ca13_bR4c5qkv9pEvRxcDfgO8VQqV2g-7cCTZz3oDtpWAgcQ5TyMKGdlD7Zp3bEmFkpNYDJAIcshSbyW-BtjCbknT2R5px5THmEJrlTJuDi";
        String jsonStr = null;
        try {
@@ -35,7 +45,7 @@ public class FirebaseTest {
            //推送到哪台客户端机器
            json.put("to", to);
            JSONObject info = new JSONObject();
-            info.put("title", "新消息");
+            info.put("title", "33新消息11");
            info.put("body", "点击查看");
            //数据消息data  通知消息 notification
            json.put("notification", info);
@@ -47,7 +57,9 @@ public class FirebaseTest {
            InputStream inputStream = conn.getInputStream();
            InputStreamReader in = new InputStreamReader(inputStream);
            BufferedReader reader = new BufferedReader(in);
-//            String line = null;
+            String line = reader.readLine();
+            log.debug(line);
            wr.close();
            reader.close();

--- a/common/src/main/java/com/wecloud/im/controller/ImMessageController.java
+++ b/common/src/main/java/com/wecloud/im/controller/ImMessageController.java
 package com.wecloud.im.controller;
 import com.wecloud.im.param.ImHistoryMessagePageParam;
+import com.wecloud.im.param.add.ImMsgUpdate;
 import com.wecloud.im.service.ImMessageService;
 import com.wecloud.im.vo.ImMessageOfflineListVo;
 import com.wecloud.im.vo.OfflineMsgDto;
@@ -36,6 +37,14 @@ public class ImMessageController extends BaseController {
    @Autowired
    private ImMessageService imMessageService;
+    /**
+     * 修改消息体
+     */
+    @PostMapping("/updateMsgById")
+    @ApiOperation(value = "修改消息体")
+    public ApiResult<Boolean> updateMsgById(@RequestBody ImMsgUpdate imMsgUpdate) throws Exception {
+        return imMessageService.updateMsgById(imMsgUpdate);
+    }
    /**
     * 离线消息列表
@@ -47,7 +56,6 @@ public class ImMessageController extends BaseController {
        return ApiResult.ok(offlineList);
    }
    /**
     * 查询某个会话历史消息分页列表
     */

--- a/common/src/main/java/com/wecloud/im/param/add/ImMsgUpdate.java
+++ b/common/src/main/java/com/wecloud/im/param/add/ImMsgUpdate.java
+package com.wecloud.im.param.add;
+import io.geekidea.springbootplus.framework.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.HashMap;
+/**
+ * 修改消息
+ *
+ * @author wei
+ * @since 2021-04-27
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "ImMsgUpdate")
+public class ImMsgUpdate extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+    @ApiModelProperty("消息id")
+    private Long id;
+    @ApiModelProperty("内容")
+    private HashMap content;
+}
--- a/common/src/main/java/com/wecloud/im/service/ImMessageService.java
+++ b/common/src/main/java/com/wecloud/im/service/ImMessageService.java
@@ -4,8 +4,10 @@ import com.wecloud.im.entity.ImMessage;
 import com.wecloud.im.param.ImHistoryMessagePageParam;
 import com.wecloud.im.param.ImMessagePageParam;
 import com.wecloud.im.param.ImMessageQueryVo;
+import com.wecloud.im.param.add.ImMsgUpdate;
 import com.wecloud.im.vo.ImMessageOfflineListVo;
 import com.wecloud.im.vo.OfflineMsgDto;
+import io.geekidea.springbootplus.framework.common.api.ApiResult;
 import io.geekidea.springbootplus.framework.common.service.BaseService;
 import io.geekidea.springbootplus.framework.core.pagination.Paging;
@@ -20,6 +22,14 @@ import java.util.List;
 public interface ImMessageService extends BaseService<ImMessage> {
    /**
+     * 修改消息体
+     *
+     * @param imMsgUpdate
+     * @return
+     */
+    ApiResult<Boolean> updateMsgById(ImMsgUpdate imMsgUpdate);
+    /**
     * 保存
     *
     * @param imMessage

--- a/common/src/main/java/com/wecloud/im/service/impl/ImMessageServiceImpl.java
+++ b/common/src/main/java/com/wecloud/im/service/impl/ImMessageServiceImpl.java
@@ -3,6 +3,8 @@ package com.wecloud.im.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.wecloud.im.entity.ImClient;
 import com.wecloud.im.entity.ImConversation;
 import com.wecloud.im.entity.ImMessage;
@@ -10,11 +12,13 @@ import com.wecloud.im.mapper.ImMessageMapper;
 import com.wecloud.im.param.ImHistoryMessagePageParam;
 import com.wecloud.im.param.ImMessagePageParam;
 import com.wecloud.im.param.ImMessageQueryVo;
+import com.wecloud.im.param.add.ImMsgUpdate;
 import com.wecloud.im.service.ImClientService;
 import com.wecloud.im.service.ImConversationService;
 import com.wecloud.im.service.ImMessageService;
 import com.wecloud.im.vo.ImMessageOfflineListVo;
 import com.wecloud.im.vo.OfflineMsgDto;
+import io.geekidea.springbootplus.framework.common.api.ApiResult;
 import io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl;
 import io.geekidea.springbootplus.framework.core.pagination.PageInfo;
 import io.geekidea.springbootplus.framework.core.pagination.Paging;
@@ -45,6 +49,32 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
    @Autowired
    private ImConversationService imConversationService;
+    @Override
+    public ApiResult<Boolean> updateMsgById(ImMsgUpdate imMsgUpdate) {
+//        ImClient client = imClientService.getClient();
+        ImMessage imMessage = new ImMessage();
+        imMessage.setId(imMessage.getId());
+        JsonMapper jsonMapper = new JsonMapper();
+        try {
+            String content = jsonMapper.writeValueAsString(imMsgUpdate.getContent());
+            imMessage.setContent(content);
+        } catch (JsonProcessingException e) {
+            e.printStackTrace();
+        }
+        boolean isOK = this.updateById(imMessage);
+        if (isOK) {
+            return ApiResult.ok();
+        } else {
+            return ApiResult.fail();
+        }
+    }
    @Transactional(rollbackFor = Exception.class)
    @Override
    public boolean saveImMessage(ImMessage imMessage) throws Exception {

--- a/common/src/main/java/com/wecloud/im/tillo/app_ws/strategy/concrete/ImConcreteReceiveStrategy.java
+++ b/common/src/main/java/com/wecloud/im/tillo/app_ws/strategy/concrete/ImConcreteReceiveStrategy.java
@@ -100,7 +100,7 @@ public class ImConcreteReceiveStrategy extends AbstractReceiveStrategy {
            e.printStackTrace();
        }
-        //  保存离线消息
+        //  保存消息
        ImMessage imMessage = new ImMessage();
        imMessage.setId(messageId);
        imMessage.setCreateTime(new Date());
@@ -133,8 +133,6 @@ public class ImConcreteReceiveStrategy extends AbstractReceiveStrategy {
        imMessageOnlineSend.setContent(receiveModel.getData());
        imMessageOnlineSend.setConversationId(toConversationId);
        // 遍历发送
        for (ImConversationMembers conversationMembers : membersList) {
            // 排除发送者

--- a/config/src/main/resources/config/application-prod.yml
+++ b/config/src/main/resources/config/application-prod.yml
@@ -14,18 +14,15 @@ spring-boot-plus:
      request-log-format: false
      response-log-format: false
-server:
-  port: 8181
 spring:
  datasource:
-    url: jdbc:mysql://127.0.0.1:3316/sien?serverTimezone=UTC&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://172.31.38.183:3316/wecloud_im?serverTimezone=UTC&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
-    username: sien
+    username: web
-    password: v39uBc6bQ8
+    password: 74DXJwJE7wYehHr5VFJbc2w8
  # Redis配置
  redis:
    database: 0
-    host: 127.0.0.1
+    host: 172.31.38.183
-    password: gmk52Kw3e4SG2r9D
+    password: qZ8yzTz8chSZE1ZbbRbK
    port: 6379
--- a/config/src/main/resources/config/application-test.yml
+++ b/config/src/main/resources/config/application-test.yml
@@ -2,7 +2,7 @@ spring-boot-plus:
  # 是否启用ansi控制台输出有颜色的字体，local环境建议开启，服务器环境设置为false
  enable-ansi: false
  # 当前环境服务IP地址
-  server-ip: 47.99.47.225
+  server-ip: 172.31.32.111
  # 文件上传下载配置
  upload-path: /opt/upload/
  # AOP配置
@@ -16,15 +16,15 @@ spring-boot-plus:
 spring:
  datasource:
-    url: jdbc:mysql://47.99.47.225:3306/Jumeirah?serverTimezone=UTC&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://172.31.32.111:3306/wecloud_im?serverTimezone=UTC&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
-    username: root
+    username: web
-    password: temple123456
+    password: axT8knPN5hAP
  # Redis配置
  redis:
    database: 0
-    host: 127.0.0.1
+    host: 172.31.32.111
-    password: temple123456
+    password: JH86uc53r8Ca
    port: 6379
 # 打印SQL语句和结果集，本地开发环境可开启，线上注释掉