logoff

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/dal/wrapper/LogOffWrapper.java

@@ -0,0 +1,16 @@
+package com.yonge.cooleshow.auth.dal.wrapper;
+
+import lombok.Data;
+
+import java.util.List;
+
+public class LogOffWrapper {
+
+    @Data
+    public static class LogOff {
+
+        private boolean status = false;
+
+        private List<String> message;
+    }
+}

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

@@ -6,6 +6,7 @@ import com.yonge.cooleshow.auth.api.dto.SysUserQueryInfo;
 import com.yonge.cooleshow.auth.api.dto.UserSetReq;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.auth.api.vo.UserSetVo;
+import com.yonge.cooleshow.auth.dal.wrapper.LogOffWrapper;
 import com.yonge.cooleshow.auth.enums.EClientType;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.entity.ImUserModel;
@@ -222,7 +223,7 @@ public interface SysUserService extends BaseService<Long, SysUser> {
      */
     SysUser getSysUserByOpenId(String openId, String clientId);
 
-    HttpResponseResult<Void> logoffByPhone(String phone);
+    HttpResponseResult<LogOffWrapper.LogOff> logoffByPhone(String phone);
 
     HttpResponseResult<List<String>> logoffCheckByPhone(String phone);
 

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

@@ -11,6 +11,7 @@ import com.yonge.cooleshow.auth.api.vo.UserSetVo;
 import com.yonge.cooleshow.auth.config.RongCloudConfig;
 import com.yonge.cooleshow.auth.core.service.CustomTokenServices;
 import com.yonge.cooleshow.auth.dal.dao.SysUserDao;
+import com.yonge.cooleshow.auth.dal.wrapper.LogOffWrapper;
 import com.yonge.cooleshow.auth.enums.EClientType;
 import com.yonge.cooleshow.auth.service.SysConfigService;
 import com.yonge.cooleshow.auth.service.SysRoleMenuService;
@@ -422,18 +423,18 @@ public class SysUserServiceImpl extends BaseServiceImpl<Long, SysUser> implement
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public HttpResponseResult<Void> logoffByPhone(String phone) {
-
+    public HttpResponseResult<LogOffWrapper.LogOff> logoffByPhone(String phone) {
+        LogOffWrapper.LogOff logOff = new LogOffWrapper.LogOff();
         // todo: 暂时不上
-//        try {
-//            HttpResponseResult<List<String>> check = adminFeignService.accountLogoffCheck(phone);
-//            List<String> errMsg = check.getData();
-//            if (!CollectionUtils.isEmpty(errMsg)) {
-//                return HttpResponseResult.failed(5101, null, String.join(",", errMsg));
-//            }
-//        } catch (Exception e) {
-//            throw new BizException("数据检查失败");
-//        }
+        try {
+            HttpResponseResult<List<String>> check = adminFeignService.accountLogoffCheck(phone);
+            List<String> errMsg = check.getData();
+            if (!CollectionUtils.isEmpty(errMsg)) {
+                logOff.setMessage(errMsg);
+            }
+        } catch (Exception e) {
+            throw new BizException("数据检查失败");
+        }
         int num = sysUserDao.countByPhone(phone);
         //冻结相关所有客户端账号
         sysUserDao.updateLockStatusByPhone(phone);
@@ -447,7 +448,8 @@ public class SysUserServiceImpl extends BaseServiceImpl<Long, SysUser> implement
 
         //退出登录
         tokenService.revokeTokenByPhone(phone);
-        return HttpResponseResult.succeed();
+        logOff.setStatus(true);
+        return HttpResponseResult.succeed(logOff);
     }
 
     @Override

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

@@ -10,6 +10,7 @@ import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.auth.api.entity.UserPassword;
 import com.yonge.cooleshow.auth.api.vo.UserSetVo;
 import com.yonge.cooleshow.auth.core.service.CustomTokenServices;
+import com.yonge.cooleshow.auth.dal.wrapper.LogOffWrapper;
 import com.yonge.cooleshow.auth.service.SysConfigService;
 import com.yonge.cooleshow.auth.service.SysRoleService;
 import com.yonge.cooleshow.auth.service.SysUserRoleService;
@@ -440,7 +441,7 @@ public class UserController extends BaseController {
             @ApiImplicitParam(name = "smsCode", value = "短信验证码", paramType = "path", dataType = "long", required = true),
     })
     @GetMapping(value = "/logoff/{smsCode}")
-    public HttpResponseResult<Void> logoff(@PathVariable("smsCode") String smsCode) {
+    public HttpResponseResult<LogOffWrapper.LogOff> logoff(@PathVariable("smsCode") String smsCode) {
         AuthUser authUser = SecurityUtils.getUser();
         SysUser sysUser = sysUserService.get(authUser.getUserId());
         if (sysUser == null) {