From 38d8abee8db1034b4cc3fae8613e8328653a1080 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期三, 18 九月 2024 16:07:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'remote-v2/master-v2' into master-v2
---
src/main/java/com/mzl/flower/web/login/PartnerLoginController.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/mzl/flower/web/login/PartnerLoginController.java b/src/main/java/com/mzl/flower/web/login/PartnerLoginController.java
index b7ffa9e..332f052 100644
--- a/src/main/java/com/mzl/flower/web/login/PartnerLoginController.java
+++ b/src/main/java/com/mzl/flower/web/login/PartnerLoginController.java
@@ -96,7 +96,7 @@
String tokenCache = stringCacheClient.get(TOKEN_KEY + SEPARATOR + user.getId());
if (StringUtils.isNotBlank(tokenCache)) {
//强制删除token，下线
- removeToken(tokenCache,user.getId());
+// removeToken(tokenCache,user.getId());
}
try {
PartnerAuthenticationToken authRequest = new PartnerAuthenticationToken(username, password);
@@ -136,10 +136,17 @@
if(user == null){
throw new ValidationException("用户不存在");
}
+ PartnerDTO partnerDTO = partnerMapper.getCurrentPartner(user.getId());
+ if (ObjectUtils.isEmpty(partnerDTO)) {
+ throw new ValidationException("用户不存在");
+ }
+ if (partnerDTO.getIsEnabled() == false) {
+ throw new ValidationException("用户已禁用，请联系管理员");
+ }
String tokenCache = stringCacheClient.get(TOKEN_KEY + SEPARATOR + user.getId());
if (StringUtils.isNotBlank(tokenCache)) {
//强制删除token，下线
- removeToken(tokenCache,user.getId());
+// removeToken(tokenCache,user.getId());
}
try {
PhoneAuthenticationToken authRequest = new PhoneAuthenticationToken(tel, smsCode, Constants.USER_TYPE.partner.name());
--
Gitblit v1.9.3