h5一键登录

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

@@ -2,6 +2,7 @@ package com.pica.cloud.account.account.server.controller;
 
 import com.pica.cloud.account.account.server.entity.Account;
 import com.pica.cloud.account.account.server.entity.EncryptEntity;
+import com.pica.cloud.account.account.server.entity.LoginResult;
 import com.pica.cloud.account.account.server.mapper.AccountMapper;
 import com.pica.cloud.account.account.server.req.AccountReq;
 import com.pica.cloud.account.account.server.req.BaseRequest;
@@ -79,7 +80,7 @@ public class AccountController extends AccountBaseController {
 
     //    @ApiOperation("密码或验证码登录")
 //    @PostMapping("/login")
-    public PicaResponse<String> login(@RequestBody AccountReq req) {
+    public PicaResponse<LoginResult> login(@RequestBody AccountReq req) {
         this.checkMobilePhone(req.getMobilePhone());
         Account account = accountService.getByMobilePhone(req.getMobilePhone());  //获取账号信息
         if (account == null) {
@@ -109,12 +110,15 @@ 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);
-        return PicaResponse.toResponse(newToken);
+
+        LoginResult result = new LoginResult();
+        result.setToken(newToken);
+        return PicaResponse.toResponse(result);
     }
 
     //    @ApiOperation("注册")
 //    @PostMapping("/register")
-    public PicaResponse<String> register(@RequestBody AccountReq req) {
+    public PicaResponse<LoginResult> register(@RequestBody AccountReq req) {
         this.checkMobilePhone(req.getMobilePhone());
         this.checkAuthCode(req);
         String deviceType = super.getDeviceInfo("device_type");  //1:pc 2:android 3:ios
@@ -138,12 +142,15 @@ public class AccountController extends AccountBaseController {
 
         //生成token并返回
         String newToken = this.generateToken(account, deviceType);
-        return PicaResponse.toResponse(newToken);
+
+        LoginResult result = new LoginResult();
+        result.setToken(newToken);
+        return PicaResponse.toResponse(result);
     }
 
     @ApiOperation("H5端一键登录功能,无需完善信息")
     @PostMapping("/login-register")
-    public PicaResponse<String> loginRegister(@RequestBody EncryptEntity entity) throws Exception {
+    public PicaResponse<LoginResult> loginRegister(@RequestBody EncryptEntity entity) throws Exception {
         BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
         this.checkMobilePhone(request.getMobile());