From c41f8c8a75c4475831e3c7e9cde7467d2fb39950 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期五, 28 六月 2024 10:38:17 +0800 Subject: [PATCH] 提交一把 --- server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java b/server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java index 107521a..d0213e8 100644 --- a/server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java +++ b/server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java @@ -2,6 +2,7 @@ import cn.emay.sdk.core.dto.sms.response.SmsResponse; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.doumee.biz.system.SystemDictDataBiz; import com.doumee.biz.system.SystemUserBiz; import com.doumee.core.constants.ResponseStatus; import com.doumee.core.exception.BusinessException; @@ -41,6 +42,8 @@ @Autowired private SmsEmailMapper smsEmailMapper; + @Autowired + private SystemDictDataBiz systemDictDataBiz; @Autowired private CompanyService companyService; @Value("${debug_model}") @@ -120,7 +123,8 @@ if(StringUtils.isBlank(systemUser.getMobile()) || StringUtils.isBlank(systemUser.getCaptcha())){ throw new BusinessException(ResponseStatus.BAD_REQUEST); } - if(!debugModel){ + String phoneAtuh = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.COMPANY_PHONE_AUTH).getCode(); + if(!debugModel && !StringUtils.equals(phoneAtuh,Constants.ONE+"")){ SmsEmailServiceImpl.isCaptcheValide(smsEmailMapper,systemUser.getMobile(),systemUser.getCaptcha()); } SystemUser queryUserDto = new SystemUser(); @@ -144,7 +148,8 @@ // 鐢熸垚瀵嗙爜鐩� String salt = RandomStringUtils.randomAlphabetic(6); // 鐢熸垚瀵嗙爜 - systemUser.setPassword(Utils.Secure.encryptPassword(systemUser.getPassword(), salt)); +// systemUser.setPassword(Utils.Secure.encryptPassword(systemUser.getPassword(), salt)); + systemUser.setPassword(Utils.Secure.encryptPassword(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.DEFAULT_PASSWORD).getCode(), salt)); systemUser.setSalt(salt); LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); systemUser.setType(loginUserInfo.getType()); @@ -206,7 +211,8 @@ if(StringUtils.isBlank(systemUser.getMobile()) || StringUtils.isBlank(systemUser.getCaptcha())){ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鐭俊楠岃瘉鐮佷笉鑳戒负绌猴紒"); } - if(!debugModel){ + String phoneAtuh = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.COMPANY_PHONE_AUTH).getCode(); + if(!debugModel && !StringUtils.equals(phoneAtuh,Constants.ONE+"")){ SmsEmailServiceImpl.isCaptcheValide(smsEmailMapper,systemUser.getMobile(),systemUser.getCaptcha()); } } -- Gitblit v1.9.3