From 93e281b3cc60c8d24a0ed5547d3d399c03f9bab6 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 10 Jun 2022 18:03:52 +0800
Subject: [PATCH] 20220606

---
 src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CommonServiceImpl.java |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CommonServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CommonServiceImpl.java
index 6b165e1..dffba4e 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CommonServiceImpl.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CommonServiceImpl.java
@@ -8,12 +8,16 @@
 import com.xcong.farmer.cms.common.response.Result;
 import com.xcong.farmer.cms.configurations.properties.ApplicationProperties;
 import com.xcong.farmer.cms.configurations.properties.SecurityProperties;
+import com.xcong.farmer.cms.modules.member.entity.MemberEntity;
 import com.xcong.farmer.cms.modules.system.dto.AdminLoginDto;
 import com.xcong.farmer.cms.modules.system.entity.UserEntity;
 import com.xcong.farmer.cms.modules.system.mapper.UserMapper;
 import com.xcong.farmer.cms.modules.system.service.ICommonService;
+import com.xcong.farmer.cms.modules.system.util.LoginUserUtil;
+import com.xcong.farmer.cms.utils.MessageSourceUtils;
 import com.xcong.farmer.cms.utils.RedisUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
 import java.util.HashMap;
 import java.util.Map;
@@ -45,6 +49,10 @@
         if(ObjectUtil.isEmpty(userEntity)){
             return Result.fail("请输入正确的账号和密码");
         }
+        Integer status = userEntity.getStatus();
+        if(UserEntity.STATUS_DISABLED.equals(status)){
+            return Result.fail("账号禁止登陆,请联系管理员");
+        }
         //生成UUID作为token
         String token = IdUtil.simpleUUID();
         String redisToken = AppContants.APP_LOGIN_PREFIX + token;
@@ -69,6 +77,22 @@
         return Result.ok("登录成功", authInfo);
     }
 
+    @Override
+    public Result memberLogout() {
+        Long id = LoginUserUtil.getLoginUser().getId();
+        //获取用户ID
+        UserEntity userEntity = userMapper.selectById(id);
+        if (ObjectUtil.isEmpty(userEntity)) {
+            return Result.fail("用户不存在");
+        }
+
+        String redisMember = AppContants.APP_LOGIN_PREFIX + userEntity.getId();
+        String token = redisUtils.getString(redisMember);
+        redisUtils.del(AppContants.APP_LOGIN_PREFIX + token);
+        SecurityContextHolder.clearContext();
+        return Result.ok("退出成功");
+    }
+
     public String generateAsaToken(String token) {
         RSA rsa = new RSA(null, securityProperties.getPublicKey());
         return rsa.encryptBase64(token + "_" + System.currentTimeMillis(), KeyType.PublicKey);

--
Gitblit v1.9.1