8/16 平台优化/切换登录 修改token传入方式

server/src/main/java/com/pica/cloud/account/account/server/controller/LoginController.java

@@ -436,14 +436,8 @@ public class LoginController extends AccountBaseController {
     @ApiOperation(value = "切换登录")
     @PostMapping("/login/switch")
     @EnabledLoginValidate
-    public PicaResponse<String> loginSwitch() {
-        OneClickLoginReq req = new OneClickLoginReq();
-        req.setProductType(super.getProductType());
-        req.setSourceType(super.getSourceType());
-        req.setLoginIp(super.getIpAddr());
-        req.setUserTokenTourist(super.getUserTokenTourist());
-        req.setToken(super.getToken());
-        loginService.loginSwitch(req, super.getAccountUser());
+    public PicaResponse<String> loginSwitch(@RequestBody Map<String, String> req) {
+        loginService.loginSwitch(super.getAccountUser(), super.getRedisClient().getToken(req.get("token"), AccountUser.class));
         return PicaResponse.toResponse();
     }
 

server/src/main/java/com/pica/cloud/account/account/server/service/LoginService.java

@@ -103,6 +103,6 @@ public interface LoginService {
 
     LoginResult loginQRCode(BaseRequest request);
 
-    void loginSwitch(OneClickLoginReq req, AccountUser accountUser);
+    void loginSwitch(AccountUser oldUser, AccountUser loginUser);
 
 }

server/src/main/java/com/pica/cloud/account/account/server/service/impl/LoginServiceImpl.java

@@ -12,6 +12,7 @@ import com.pica.cloud.account.account.server.entity.*;
 import com.pica.cloud.account.account.server.enums.AccountExceptionEnum;
 import com.pica.cloud.account.account.server.enums.AccountTypeEnum;
 import com.pica.cloud.account.account.server.enums.SourceTypeEnum;
+import com.pica.cloud.account.account.server.exception.AccountException;
 import com.pica.cloud.account.account.server.log.AccountLogEntityUtils;
 import com.pica.cloud.account.account.server.log.AccountLogUtils;
 import com.pica.cloud.account.account.server.mapper.*;
@@ -48,6 +49,7 @@ import java.security.PublicKey;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
 @Service
 public class LoginServiceImpl implements LoginService {
@@ -1086,19 +1088,21 @@ public class LoginServiceImpl implements LoginService {
 
     /**
      *切换登录
-     * @param req
      */
     @Override
-    public void loginSwitch(OneClickLoginReq req, AccountUser accountUser) {
-        tokenUtils.tokenContinueTime(req.getToken(), req.getSourceType(), 0);
+    public void loginSwitch(AccountUser oldUser, AccountUser loginUser) {
+        if (Objects.isNull(loginUser)) {
+            throw new AccountException(AccountExceptionEnum.PICA_LOGIN_AGAIN);
+        }
+        tokenUtils.tokenContinueTime(loginUser.getToken(), oldUser.getLoginFrom(), 0);
         //记录登录日志
         LogLoginEntity entity = AccountLogEntityUtils.getLogLoginEntity(
-                Integer.valueOf(String.valueOf(accountUser.getAcctId())),
-                req.getProductType(), req.getSourceType(),
+                Integer.valueOf(String.valueOf(loginUser.getAcctId())),
+                oldUser.getLoginPlatform(), oldUser.getLoginFrom(),
                 AccountTypeEnum.LOGIN_WE_CHAT.getCode(),
-                req.getLoginIp(),
+                oldUser.getLoginIp(),
                 AccountTypeEnum.LOGIN_STATUS_SUCCESS.getCode(),
-                AccountTypeEnum.LOG_TYPE_LOGIN.getCode(), req.getToken(), 1, req.getUserTokenTourist());
+                AccountTypeEnum.LOG_TYPE_LOGIN.getCode(), loginUser.getToken(), 1, oldUser.getUserTokenTourist());
         picaLogUtils.info(entity);
     }
 }