From f04b8922283120e2bc4a476ddc302ebd3b0894e4 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 07 Jul 2022 20:42:05 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms
---
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CommonServiceImpl.java | 11 +++--------
1 files changed, 3 insertions(+), 8 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 51f3f21..b4f5f17 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
@@ -69,10 +69,10 @@
if (valueOperations.get(codeToken).equals(codeValue)) {
redisTemplate.delete(codeToken);
} else {
- return Result.fail("请输入正确验证码");
+ return Result.fail("验证码不正确");
}
} else {
- return Result.fail("验证码已过期，请刷新当前页面");
+ return Result.fail("验证码已过期");
}
String username = adminLoginDto.getUsername();
String password = adminLoginDto.getPassword();
@@ -111,13 +111,8 @@
@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 redisMember = AppContants.APP_LOGIN_PREFIX + id;
String token = redisUtils.getString(redisMember);
redisUtils.del(AppContants.APP_LOGIN_PREFIX + token);
SecurityContextHolder.clearContext();
--
Gitblit v1.9.1