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/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) {