Merge branch 'feature/0822_logoff' into develop-new

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/SysUserService.java

@@ -223,7 +223,7 @@ public interface SysUserService extends BaseService<Long, SysUser> {
      */
     SysUser getSysUserByOpenId(String openId, String clientId);
 
-    HttpResponseResult<LogOffWrapper.LogOff> logoffByPhone(String phone);
+    HttpResponseResult<Void> logoffByPhone(String phone);
 
     HttpResponseResult<List<String>> logoffCheckByPhone(String phone);
 

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/impl/SysUserServiceImpl.java

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.auth.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.yonge.cooleshow.api.feign.AdminFeignService;
 import com.yonge.cooleshow.auth.api.dto.QRLoginDto;
 import com.yonge.cooleshow.auth.api.dto.RealnameAuthReq;
@@ -423,8 +424,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<Long, SysUser> implement
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public HttpResponseResult<LogOffWrapper.LogOff> logoffByPhone(String phone) {
-        LogOffWrapper.LogOff logOff = new LogOffWrapper.LogOff();
+    public HttpResponseResult<Void> logoffByPhone(String phone) {
         // todo: 暂时不上
         try {
             HttpResponseResult<List<String>> check = adminFeignService.accountLogoffCheck(phone);
@@ -433,8 +433,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<Long, SysUser> implement
             }
             List<String> errMsg = check.getData();
             if (!CollectionUtils.isEmpty(errMsg)) {
-                logOff.setMessage(errMsg);
-                return HttpResponseResult.succeed(logOff);
+                return HttpResponseResult.failed(5201, null, JSON.toJSONString(errMsg));
             }
         } catch (Exception e) {
             throw new BizException("数据检查失败");
@@ -452,8 +451,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<Long, SysUser> implement
 
         //退出登录
         tokenService.revokeTokenByPhone(phone);
-        logOff.setStatus(true);
-        return HttpResponseResult.succeed(logOff);
+        return HttpResponseResult.succeed();
     }
 
     @Override

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/web/controller/UserController.java

@@ -441,7 +441,7 @@ public class UserController extends BaseController {
             @ApiImplicitParam(name = "smsCode", value = "短信验证码", paramType = "path", dataType = "long", required = true),
     })
     @GetMapping(value = "/logoff/{smsCode}")
-    public HttpResponseResult<LogOffWrapper.LogOff> logoff(@PathVariable("smsCode") String smsCode) {
+    public HttpResponseResult<Void> logoff(@PathVariable("smsCode") String smsCode) {
         AuthUser authUser = SecurityUtils.getUser();
         SysUser sysUser = sysUserService.get(authUser.getUserId());
         if (sysUser == null) {