登录：修改登录逻辑，游客时间交给客户端判断

web-server/app/service/Auth.ts

@@ -30,7 +30,6 @@ export default class Auth extends Service {
         const ctx = this.ctx;
 
         let user = await UserModel.findUserByToken(token);
-        let loginType = 1;
 
         if (!user) {
             if(isGuest) {
@@ -38,22 +37,11 @@ export default class Auth extends Service {
                 const token = ctx.service.utils.generateStr(256);
                 let lastGuest = await UserModel.getLastDeviceGuest(deviceId, token);
                 if(lastGuest) {
-                    let guestTime = lastGuest.guestTime;
+                    let param = this.getReturnParam(lastGuest);
-                    if(guestTime > GUEST_MAX_TIME) {
+                    return this.ctx.service.utils.resResult(STATUS.SUCCESS, {
-                        loginType = 3;
+                        canLogin: true, // 未设置密码等于未创建账号
-                        return this.ctx.service.utils.resResult(STATUS.SUCCESS, {
+                        ...param
-                            canLogin: true,
+                    });
-                            loginType
-                        });
-                    } else {
-
-                        let param = this.getReturnParam(lastGuest);
-                        return this.ctx.service.utils.resResult(STATUS.SUCCESS, {
-                            canLogin: true, // 未设置密码等于未创建账号
-                            loginType,
-                            ...param
-                        });
-                    }
                 } else {
 
                     user = await UserModel.createUser(isGuest, tel, token, platform, pkgName, serverType, deviceId);
@@ -61,7 +49,6 @@ export default class Auth extends Service {
 
                     return this.ctx.service.utils.resResult(STATUS.SUCCESS, {
                         canLogin: true,
-                        loginType,
                         ...param
                     });
                 }
@@ -77,14 +64,10 @@ export default class Auth extends Service {
             user = await UserModel.updateToken(user.tel, token, deviceId);
             let param = this.getReturnParam(user);
 
-            if(param.isGuest && param.guestTime > GUEST_MAX_TIME) {
-                loginType = 2;
-            }
             let canLogin = true;
             if(!user.isGuest && !user.hasSetPw) canLogin = false;
             return this.ctx.service.utils.resResult(STATUS.SUCCESS, {
                 canLogin, // 未设置密码等于未创建账号
-                loginType,
                 ...param
             });
         }