代码还原

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

@@ -78,9 +78,9 @@ public class AccountController extends AccountBaseController {
         return PicaResponse.toResponse(newToken);
     }
 
-    //    @ApiOperation("密码或验证码登录")
-//    @PostMapping("/login")
-    public PicaResponse<LoginResult> login(@RequestBody AccountReq req) {
+    @ApiOperation("密码或验证码登录")
+    @PostMapping("/login")
+    public PicaResponse<String> login(@RequestBody AccountReq req) {
         this.checkMobilePhone(req.getMobilePhone());
         Account account = accountService.getByMobilePhone(req.getMobilePhone());  //获取账号信息
         if (account == null) {
@@ -110,10 +110,7 @@ public class AccountController extends AccountBaseController {
         //登录成功，清除旧token，生成新token
         String deviceType = super.getDeviceInfo("device_type");  //1:pc 2:android 3:ios
         String newToken = this.generateToken(account, deviceType);
-
-        LoginResult result = new LoginResult();
-        result.setToken(newToken);
-        return PicaResponse.toResponse(result);
+        return PicaResponse.toResponse(newToken);
     }
 
     //    @ApiOperation("注册")
@@ -150,7 +147,7 @@ public class AccountController extends AccountBaseController {
 
     @ApiOperation("H5端一键登录功能,无需完善信息")
     @PostMapping("/login-register")
-    public PicaResponse<LoginResult> loginRegister(@RequestBody EncryptEntity entity) throws Exception {
+    public PicaResponse loginRegister(@RequestBody EncryptEntity entity) throws Exception {
         BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
         this.checkMobilePhone(request.getMobile());
 
@@ -163,7 +160,13 @@ public class AccountController extends AccountBaseController {
         //判断账号是否已经存在
         Account account = accountService.getByMobilePhone(req.getMobilePhone());
         if (account != null) {
-            return this.login(req);  //登录
+            PicaResponse response = this.login(req);  //登录
+            if (response.getData() != null) {
+                LoginResult result = new LoginResult();
+                result.setToken(response.getData().toString());
+                return PicaResponse.toResponse(result);
+            }
+            return response;
         } else {
             return this.register(req);  //注册
         }