From 1e72942aa4848ae4835e7f30bb4adc01f9ce5bdc Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 23 二月 2024 11:45:58 +0800
Subject: [PATCH] mrshi
---
server/service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java b/server/service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
index 1c5593b..2f0c381 100644
--- a/server/service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
@@ -18,7 +18,6 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authc.AuthenticationException;
-import org.apache.shiro.authc.UsernamePasswordToken;
import org.apache.shiro.subject.Subject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -58,7 +57,7 @@
loginLog.setServerIp(Utils.Server.getIP());
// 鏍￠獙楠岃瘉鐮�
try {
- if(debugModel){
+ if(!debugModel){
captchaService.check(dto.getUuid(), dto.getCode());
}
} catch (Exception e) {
@@ -70,7 +69,7 @@
}
// 鏍￠獙鐢ㄦ埛鍚嶅拰瀵嗙爜
Subject subject = SecurityUtils.getSubject();
- ShiroToken token = new ShiroToken(dto.getUsername(), dto.getPassword(),true,Constants.ZERO);
+ ShiroToken token = new ShiroToken(dto.getUsername(), dto.getPassword(),true,type);
try {
subject.login(token);
loginLog.setUserId(((LoginUserInfo)subject.getPrincipal()).getId());
@@ -100,7 +99,7 @@
// 鏍￠獙楠岃瘉鐮�
if(type!= Constants.TWO){
try {
- if(debugModel){
+ if(!debugModel){
SmsEmailServiceImpl.isCaptcheValide(smsEmailMapper,dto.getPhone(), dto.getCode());
}
} catch (Exception e) {
@@ -113,7 +112,7 @@
}
// 鏍￠獙鐢ㄦ埛鍚嶅拰瀵嗙爜
Subject subject = SecurityUtils.getSubject();
- ShiroToken token = new ShiroToken(dto.getPhone(), null,false,Constants.ZERO);
+ ShiroToken token = new ShiroToken(dto.getPhone(), null,false,type);
try {
subject.login(token);
loginLog.setUserId(((LoginUserInfo)subject.getPrincipal()).getId());
--
Gitblit v1.9.3