diff --git a/snowy-admin-web/src/views/auth/findPwd/emailFindForm.vue b/snowy-admin-web/src/views/auth/findPwd/emailFindForm.vue index d7178fd8..bcdd3b6c 100644 --- a/snowy-admin-web/src/views/auth/findPwd/emailFindForm.vue +++ b/snowy-admin-web/src/views/auth/findPwd/emailFindForm.vue @@ -92,6 +92,7 @@ import router from '@/router' import { required, rules } from '@/utils/formRules' import userCenterApi from '@/api/sys/userCenterApi' + import smCrypto from "@/utils/smCrypto" const emailResetFormRef = ref() const emailFormData = ref({}) const islogin = ref(false) @@ -122,8 +123,8 @@ emailResetFormRef.value.validate().then(() => { emailFormData.value.validCode = emailFormData.value.emailValidCode - // delete emailFormData.value.emailValidCode emailFormData.value.validCodeReqNo = emailValidCodeReqNo.value + emailFormData.value.newPassword = smCrypto.doSm2Encrypt(emailFormData.value.newPassword) islogin.value = true userCenterApi .userFindPasswordByEmail(emailFormData.value) diff --git a/snowy-admin-web/src/views/auth/findPwd/phoneFindForm.vue b/snowy-admin-web/src/views/auth/findPwd/phoneFindForm.vue index 406f98f6..ce948866 100644 --- a/snowy-admin-web/src/views/auth/findPwd/phoneFindForm.vue +++ b/snowy-admin-web/src/views/auth/findPwd/phoneFindForm.vue @@ -93,6 +93,7 @@ import router from '@/router' import { required, rules } from '@/utils/formRules' import userCenterApi from '@/api/sys/userCenterApi' + import smCrypto from "@/utils/smCrypto" const phoneLoginFormRef = ref() const phoneFormData = ref({}) const islogin = ref(false) @@ -123,8 +124,8 @@ phoneLoginFormRef.value.validate().then(() => { phoneFormData.value.validCode = phoneFormData.value.phoneValidCode - // delete phoneFormData.value.phoneValidCode phoneFormData.value.validCodeReqNo = phoneValidCodeReqNo.value + phoneFormData.value.newPassword = smCrypto.doSm2Encrypt(phoneFormData.value.newPassword) islogin.value = true userCenterApi .userFindPasswordByPhone(phoneFormData.value) diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java index a438c583..785692c6 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java @@ -33,7 +33,6 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.PhoneUtil; import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; -import cn.hutool.crypto.digest.BCrypt; import cn.hutool.json.JSONArray; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; @@ -457,7 +456,7 @@ public class SysUserServiceImpl extends ServiceImpl impl validValidCode(sysUserFindPwdByPhoneParam.getValidCode(), sysUserFindPwdByPhoneParam.getValidCodeReqNo()); this.update(new LambdaUpdateWrapper().eq(SysUser::getPhone, sysUserFindPwdByPhoneParam.getPhone()).set(SysUser::getPassword, - BCrypt.hashpw(sysUserFindPwdByPhoneParam.getNewPassword()))); + CommonCryptogramUtil.doHashValue(CommonCryptogramUtil.doSm2Decrypt(sysUserFindPwdByPhoneParam.getNewPassword())))); } @Override @@ -466,7 +465,7 @@ public class SysUserServiceImpl extends ServiceImpl impl validValidCode(sysUserFindPwdByEmailParam.getValidCode(), sysUserFindPwdByEmailParam.getValidCodeReqNo()); this.update(new LambdaUpdateWrapper().eq(SysUser::getEmail, sysUserFindPwdByEmailParam.getEmail()).set(SysUser::getPassword, - BCrypt.hashpw(sysUserFindPwdByEmailParam.getNewPassword()))); + CommonCryptogramUtil.doHashValue(CommonCryptogramUtil.doSm2Decrypt(sysUserFindPwdByEmailParam.getNewPassword())))); } @Override