From 33cd99e2509c88ce838ec2c68f2d36de80e27a6c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 07 Jun 2022 10:15:17 +0800
Subject: [PATCH] 20220606
---
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CommonServiceImpl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 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 4399b6a..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
@@ -13,6 +13,7 @@
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;
@@ -48,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;
@@ -73,7 +78,8 @@
}
@Override
- public Result memberLogout(Long id) {
+ public Result memberLogout() {
+ Long id = LoginUserUtil.getLoginUser().getId();
//获取用户ID
UserEntity userEntity = userMapper.selectById(id);
if (ObjectUtil.isEmpty(userEntity)) {
--
Gitblit v1.9.1