123

无关风月

2024-12-27 c0d6d27f6b93b60b83b046900289c831c8092126

 optometrist/src/main/java/com/jilongda/optometrist/authority/controller/LoginController.java

@@ -12,7 +12,9 @@
import com.jilongda.optometrist.authority.dto.VerificationCodeDTO;
import com.jilongda.optometrist.authority.model.SecUser;
import com.jilongda.optometrist.authority.service.SecUserService;
import com.jilongda.optometrist.model.TOptometrist;
import com.jilongda.optometrist.security.SecurityUserDetails;
import com.jilongda.optometrist.service.TOptometristService;
import com.jilongda.optometrist.utils.MsgUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -48,6 +50,8 @@
    private final RedisAutoTemplate redisAutoTemplate;
    private final MsgUtils msgUtils;
    private final SecUserService secUserService;
    @Autowired
    private TOptometristService optometristService;

    @Autowired
    public LoginController(AuthenticationManager authenticationManager, SecurityUtils securityUtils, PasswordEncoder passwordEncoder, RedisAutoTemplate redisAutoTemplate, MsgUtils msgUtils, SecUserService secUserService) {
@@ -64,16 +68,14 @@
    @ApiOperation("验光师短信登录")
    @PostMapping(value = "code/login")
    public ApiResult<Map<String, Object>> loginByCode(@Validated @RequestBody LoginCodeDTO dto) {
        SecUser one = secUserService.lambdaQuery().eq(SecUser::getPhone, dto.getPhone())
                .eq(SecUser::getUserType, 2).one();
        TOptometrist one = optometristService.lambdaQuery().eq(TOptometrist::getPhone, dto.getPhone()).one();
        if (one==null){
            return ApiResult.failed(500, "手机号未注册");
        }
        SecUser two = secUserService.lambdaQuery().eq(SecUser::getPhone, dto.getPhone())
                .eq(SecUser::getUserType, 2)
                .eq(SecUser::getState,0)
        TOptometrist two = optometristService.lambdaQuery().eq(TOptometrist::getPhone, dto.getPhone())
                .eq(TOptometrist::getStatus, 2)
                .one();
        if (two==null){
        if (two!=null){
            return ApiResult.failed(500, "账号已被禁用");
        }
        // 先检验是否登录
@@ -97,6 +99,7 @@
        }
    }


    @ApiOperation(value = "发送验证码", notes = "发送验证码")
    @PostMapping(value = "sendMsg")
    public ApiResult<String> sendMsg(@Validated @RequestBody VerificationCodeDTO dto) throws Exception {
@@ -119,7 +122,7 @@
            redisAutoTemplate.setStr(dto.getPhone(), code);
            redisAutoTemplate.expire(dto.getPhone(), Constant.REDIS_EXPIRE);
            msgUtils.sendMsg(dto.getPhone(), code);
            return ApiResult.success("发送短信验证码成功！15分钟内有效");
            return ApiResult.success("发送短信验证码成功！10分钟内有效");
        }
        return ApiResult.failed(500, "发送短信验证码失败，请确认手机号码!");