Merge branch 'master' of http://111.47.29.214:3000/udream-cxs/lift-server

lift-ud-service/src/main/java/cn/com/ty/lift/ud/chat/mapper/ChatSessionMapper.xml

@@ -352,6 +352,7 @@
   <select id="findAllSession" resultType="cn.com.ty.lift.ud.chat.mapper.entity.ChatSessionEntity" >
     select
         usr.name username,
+        usr.user_id userIdd,
         usr.avatar_url avatarUrl,
         cas.data_table caseType,
         cas.accept_status acceptStatus,

lift-ud-service/src/main/java/cn/com/ty/lift/ud/chat/mapper/entity/ChatSessionEntity.java

@@ -85,4 +85,6 @@ public class ChatSessionEntity extends BaseEntity {
     private transient String lastMsg;
     private transient Long lastTime;
     private transient String kindlyName;
+    //有用，别删除，chat_session user_id 数据格式是123,456。userIdd用来接受一个id的
+    private transient String userIdd;
 }

lift-ud-service/src/main/java/cn/com/ty/lift/ud/neety/process/ChatProcessor.java

@@ -60,7 +60,7 @@ public class ChatProcessor extends WebSoketSupport implements ProcessorInterface
         /*List<IMMessage> chats = Optional.ofNullable(redis.get("ALLCHATS:" + sessionId, List.class)).orElse(new ArrayList());
         chats.add(request);
         redis.setValue("ALLCHATS:" + sessionId, chats);*/
-        redis.lLeftPush("ALLCHATS:" + sessionId, JSONObject.toJSONString(request));
+        redis.lRightPush("ALLCHATS:" + sessionId, JSONObject.toJSONString(request));
 //        ChatMsgEntity entity = new ChatMsgEntity();
 //        entity.setMsg(request.getMsg());
 //        entity.setFromUser(request.getFromUser());

lift-ud-service/src/main/java/cn/com/ty/lift/ud/neety/task/RedisRunner.java

@@ -61,7 +61,7 @@ public class RedisRunner implements CommandLineRunner {
             List<UserInfo> users = new ArrayList<>();
             for (ChatSessionEntity chatSessionEntity : userList) {
                 UserInfo user = new UserInfo();
-                user.setUserId(chatSessionEntity.getUserId());
+                user.setUserId(chatSessionEntity.getUserIdd());
                 user.setAvatarUrl(chatSessionEntity.getAvatarUrl());
                 user.setUserName(chatSessionEntity.getUserName());
                 user.setIsRed(0);