Merge branch 'master' of http://gitlab.corp.qinqinxiaobao.com:9880/uniplat/customer-service

database/index.ts

@@ -158,10 +158,6 @@ class ChatCacheDatabaseController {
                         p.eid && (chat.last_msg_sender = p.eid);
                         p.eid && (chat.last_msg_sender = p.eid);
                         p.type && (chat.last_msg_type = p.type);
                         p.type && (chat.last_msg_type = p.type);
                         p.msg && (chat.last_msg_content = p.msg);
                         p.msg && (chat.last_msg_content = p.msg);
-                        p.unread && chat.unread_msg_count++;
-                        if (p.unread === 0) {
-                            chat.unread_msg_count = 0;
-                        }
                         const u = store.put(chat, chat.id);
                         const u = store.put(chat, chat.id);
                         u.onsuccess = () => resolve();
                         u.onsuccess = () => resolve();
                         u.onerror = () => resolve();
                         u.onerror = () => resolve();

model/index.ts

@@ -52,7 +52,7 @@ export const enum ImEnvironment {
 
 
 export const socketMapping = new Map<ImEnvironment, string>([
 export const socketMapping = new Map<ImEnvironment, string>([
     [ImEnvironment.Dev, 'ws://hro.channel.jinsehuaqin.com:8080/ws'],
     [ImEnvironment.Dev, 'ws://hro.channel.jinsehuaqin.com:8080/ws'],
-    [ImEnvironment.Stage, ''],
+    [ImEnvironment.Stage, 'wss://pre-channel.qinqinxiaobao.com/ws'],
     [ImEnvironment.Pro, 'wss://channel.qinqinxiaobao.com/ws'],
     [ImEnvironment.Pro, 'wss://channel.qinqinxiaobao.com/ws'],
 ]);
 ]);