Merge branch 'lopdop'

Author: Traeric

CrazyChatParent/parent/group/src/main/java/com/crazychat/group/controller/GroupController.java

@@ -111,8 +111,8 @@ public Result groupMembers(@PathVariable("group_id") String groupId) {
      * @return
      */
     @GetMapping("/name/{group_id}")
-    public String getGroupNameById(@PathVariable("group_id") String groupId) {
-        return groupService.getGroupById(groupId).getName();
+    public byte[] getGroupNameById(@PathVariable("group_id") String groupId) {
+        return groupService.getGroupById(groupId).getName().getBytes();
     }
 
     /**
@@ -172,8 +172,8 @@ public Result createGroup(@RequestBody Map<String, Object> map) {
      * @return
      */
     @GetMapping("/group_picture/{group_id}")
-    public String getGroupPictureById(@PathVariable("group_id") String groupId) {
-        return groupService.getGroupById(groupId).getPicture();
+    public byte[] getGroupPictureById(@PathVariable("group_id") String groupId) {
+        return groupService.getGroupById(groupId).getPicture().getBytes();
     }
 
     /**

CrazyChatParent/parent/relationchat/src/main/java/com/crazychat/relationchat/client/GroupClient.java

@@ -16,13 +16,13 @@ public interface GroupClient {
      * @return
      */
     @GetMapping("/group/name/{group_id}")
-    String getGroupNameById(@PathVariable("group_id") String groupId);
+    byte[] getGroupNameById(@PathVariable("group_id") String groupId);
 
     /**
      * 获取群聊的图片
      * @param groupId
      * @return
      */
     @GetMapping("/group/group_picture/{group_id}")
-    String getGroupPictureById(@PathVariable("group_id") String groupId);
+    byte[] getGroupPictureById(@PathVariable("group_id") String groupId);
 }

CrazyChatParent/parent/relationchat/src/main/java/com/crazychat/relationchat/client/impl/GroupClientImpl.java

@@ -8,12 +8,12 @@
 public class GroupClientImpl implements GroupClient {
 
     @Override
-    public String getGroupNameById(String groupId) {
-        return "NOT AVALIABLE";
+    public byte[] getGroupNameById(String groupId) {
+        return "NOT AVALIABLE".getBytes();
     }
 
     @Override
-    public String getGroupPictureById(String groupId) {
-        return "NOT AVALIABLE";
+    public byte[] getGroupPictureById(String groupId) {
+        return "NOT AVALIABLE".getBytes();
     }
 }

CrazyChatParent/parent/relationchat/src/main/java/com/crazychat/relationchat/service/RelationChatService.java

@@ -31,9 +31,6 @@ public class RelationChatService {
     @Resource
     private ChatClient chatClient;
 
-    @Resource(name = "idWorker")
-    private IdWorker idCreater;
-
     @Resource
     private RedisTemplate redisTemplate;
 
@@ -65,9 +62,9 @@ public List<Map<String, Object>> getRelatioChatList(String userId) {
                 map.put("lastMsg", message);
             } else {
                 // 群
-                String groupName = groupClient.getGroupNameById(relationChat.getOtherId());
+                String groupName = new String(groupClient.getGroupNameById(relationChat.getOtherId()));
                 map.put("name", groupName);
-                String picture = groupClient.getGroupPictureById(relationChat.getOtherId());
+                String picture = new String(groupClient.getGroupPictureById(relationChat.getOtherId()));
                 map.put("picture", picture);
                 // 返回的data数据
                 Map<String, String> map1 = new HashMap<>();

CrazyChatParent/parent/user/src/main/resources/application.yml

@@ -4,9 +4,6 @@ server:
 web-resource-path: C:\Users\Eric Jin\Desktop\static\
 
 spring:
-  # 配置静态路径
-  resources:
-    static-locations: classpath:/META-INF/resources/, classpath:/static, classpath:/resources/, classpath:/public/, file:${web-resource-path}
   application:
     name: crazychat-user
   datasource:   # 配置数据源

CrazyChatParent/parent/web/src/main/resources/application.yml

@@ -1,8 +1,15 @@
 server:
   port: 4140
+
+
+web-resource-path: C:\Users\Eric Jin\Desktop\static\
 spring:
   application:
     name: crazychat-web
+    # 配置静态路径
+  resources:
+    static-locations: classpath:/META-INF/resources/, classpath:/static, classpath:/resources/, classpath:/public/, file:${web-resource-path}
+
 eureka:
   client:
     serviceUrl: