Merge remote-tracking branch 'origin/master'

jiangping

2024-02-04 6e41324f84f0cf70871ca05292c5420bdcaaa98c

 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());