Merge branch 'master' into feature/backend

# Conflicts:
#	game-server/app/servers/connector/handler/entryHandler.ts
#	game-server/app/servers/role/handler/itemHandler.ts
#	shared/consts/constModules/sysConst.ts
#	shared/pubUtils/util.ts
#	web-server/app.ts
#	web-server/app/service/Auth.ts

shared/db/Equip.ts

@@ -126,9 +126,10 @@ export default class Equip extends BaseModel {
         return result;
     }
     public static async deleteEquips(roleId: string, ids: Array<number>) {
-        let result = await EquipModel.deleteMany({ roleId, seqId: { $in: ids } });
+        let equips = await EquipModel.getEquips(roleId, ids);
+        await EquipModel.deleteMany({ roleId, seqId: { $in: ids } });
         await RoleModel.findOneAndUpdate({ roleId }, { $inc: { equipCount: -1 * ids.length } }, { new: true });
-        return result;
+        return equips;
     }
 
     public static async getEquipsByID(ids: Array<string>) {

shared/db/Item.ts

@@ -66,9 +66,9 @@ export default class Item extends BaseModel {
             if (!!rec) {
                 let index = findIndex(result,{id})
                 if (!!result[index]) {
-                    result[index] = { id: rec.id, count: rec.count }
+                    result[index] = { id: rec.id, count: rec.count, inc: -count }
                 } else {
-                    result.push({ id: rec.id, count: rec.count });
+                    result.push({ id: rec.id, count: rec.count, inc: -count });
                 }
                 updateItems.push({ id, count, ratio });
             } else {

shared/db/User.ts

@@ -190,10 +190,11 @@ export default class User extends BaseModel {
     let user: UserType = await UserModel.findUserByChannel(channelId);
     if (!user) {
       user = await UserModel.createUserWithChannel(channelId, channelType, channelInfo, token, platform, pkgName, serverType, deviceId, ip);
+      return { isCreate: true, user};
     } else {
       user = await UserModel.updateTokenByChannel(channelId, token, deviceId, ip, channelInfo);
+      return { isCreate: false, user};
     }
-    return user;
   }
 
   private static async encryptPass(password: string, salt?: string) {