one-YI
/
cloud-server
5
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

登录模块的修改

dev.car.gateway
冷调 2024-09-15 12:46:44 +08:00
parent 5143ef67de
commit 3ea65346d8
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cloud-gateway/src/main/java/com/muyu/gateway/service/impl/ValidateCodeServiceImpl.java
View File

@ -12,11 +12,7 @@ import com.muyu.common.redis.service.RedisService;
import com.muyu.gateway.config.properties.CaptchaProperties; import com.muyu.gateway.config.properties.CaptchaProperties;
import com.muyu.gateway.model.resp.CaptchaCodeResp; import com.muyu.gateway.model.resp.CaptchaCodeResp;
import com.muyu.gateway.service.ValidateCodeService; import com.muyu.gateway.service.ValidateCodeService;
<<<<<<< HEAD
import javax.annotation.Resource;
=======
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
>>>>>>> 813460c (1..)
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.FastByteArrayOutputStream; import org.springframework.util.FastByteArrayOutputStream;
@ -39,17 +35,10 @@ public class ValidateCodeServiceImpl implements ValidateCodeService {
@Resource(name = "captchaProducerMath") @Resource(name = "captchaProducerMath")
private Producer captchaProducerMath; private Producer captchaProducerMath;
<<<<<<< HEAD
@Resource
private RedisService redisService;
@Resource
=======
@Autowired @Autowired
private RedisService redisService; private RedisService redisService;
@Autowired @Autowired
>>>>>>> 813460c (1..)
private CaptchaProperties captchaProperties; private CaptchaProperties captchaProperties;
/** /**
@ -61,11 +50,7 @@ public class ValidateCodeServiceImpl implements ValidateCodeService {
CaptchaCodeResp.CaptchaCodeRespBuilder respBuilder = CaptchaCodeResp.builder() CaptchaCodeResp.CaptchaCodeRespBuilder respBuilder = CaptchaCodeResp.builder()
.captchaEnabled(captchaEnabled); .captchaEnabled(captchaEnabled);
if (!captchaEnabled) { if (!captchaEnabled) {
<<<<<<< HEAD
return Result.success(respBuilder.build()); return Result.success(respBuilder.build());
=======
return Result.success(respBuilder);
>>>>>>> 813460c (1..)
} }
// 保存验证码信息 // 保存验证码信息