gitee
/
snowy
mirror of https://gitee.com/xiaonuobase/snowy
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

代码优化

pull/266/head
wangxu 2025-05-30 11:55:01 +08:00
parent af1e919a7d
commit 56064ce30c
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/core/util/SysPasswordUtli.java → snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/core/util/SysPasswordUtil.java
View File

@ -44,7 +44,7 @@ import java.util.stream.Collectors;
* @author xuyuxiang * @author xuyuxiang
* @date 2025/3/21 19:07 * @date 2025/3/21 19:07
**/ **/
public class SysPasswordUtli { public class SysPasswordUtil {
/** B端系统默认密码 */ /** B端系统默认密码 */
private static final String SNOWY_SYS_DEFAULT_PASSWORD_FOR_B_KEY = "SNOWY_SYS_DEFAULT_PASSWORD_FOR_B"; private static final String SNOWY_SYS_DEFAULT_PASSWORD_FOR_B_KEY = "SNOWY_SYS_DEFAULT_PASSWORD_FOR_B";

4
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/sys/SysApiProvider.java
View File

@ -2,7 +2,7 @@ package vip.xiaonuo.sys.modular.sys;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import vip.xiaonuo.sys.api.SysApi; import vip.xiaonuo.sys.api.SysApi;
import vip.xiaonuo.sys.core.util.SysPasswordUtli; import vip.xiaonuo.sys.core.util.SysPasswordUtil;
/** /**
* 系统模块综合API接口实现类 * 系统模块综合API接口实现类
@ -15,6 +15,6 @@ public class SysApiProvider implements SysApi {
@Override @Override
public String getDefaultPassword() { public String getDefaultPassword() {
return SysPasswordUtli.getDefaultPassword(); return SysPasswordUtil.getDefaultPassword();
} }
} }

32
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java
View File

@ -80,7 +80,7 @@ import vip.xiaonuo.mobile.api.MobileMenuApi;
import vip.xiaonuo.sys.core.enums.SysBuildInEnum; import vip.xiaonuo.sys.core.enums.SysBuildInEnum;
import vip.xiaonuo.sys.core.enums.SysDataTypeEnum; import vip.xiaonuo.sys.core.enums.SysDataTypeEnum;
import vip.xiaonuo.sys.core.util.SysEmailFormatUtil; import vip.xiaonuo.sys.core.util.SysEmailFormatUtil;
import vip.xiaonuo.sys.core.util.SysPasswordUtli; import vip.xiaonuo.sys.core.util.SysPasswordUtil;
import vip.xiaonuo.sys.modular.group.entity.SysGroup; import vip.xiaonuo.sys.modular.group.entity.SysGroup;
import vip.xiaonuo.sys.modular.group.service.SysGroupService; import vip.xiaonuo.sys.modular.group.service.SysGroupService;
import vip.xiaonuo.sys.modular.org.entity.SysOrg; import vip.xiaonuo.sys.modular.org.entity.SysOrg;
@ -325,7 +325,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
} }
if(ObjectUtil.isEmpty(sysUser.getPassword())) { if(ObjectUtil.isEmpty(sysUser.getPassword())) {
// 设置默认密码 // 设置默认密码
sysUser.setPassword(CommonCryptogramUtil.doHashValue(SysPasswordUtli.getDefaultPassword())); sysUser.setPassword(CommonCryptogramUtil.doHashValue(SysPasswordUtil.getDefaultPassword()));
} else { } else {
// 设置传入的密码 // 设置传入的密码
sysUser.setPassword(CommonCryptogramUtil.doHashValue(sysUser.getPassword())); sysUser.setPassword(CommonCryptogramUtil.doHashValue(sysUser.getPassword()));
@ -473,7 +473,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
// 获取用户 // 获取用户
SysUser sysUser = this.queryEntity(sysUserIdParam.getId()); SysUser sysUser = this.queryEntity(sysUserIdParam.getId());
// 获取默认密码 // 获取默认密码
String defaultPassword = SysPasswordUtli.getDefaultPassword(); String defaultPassword = SysPasswordUtil.getDefaultPassword();
// 修改密码 // 修改密码
this.update(new LambdaUpdateWrapper<SysUser>().eq(SysUser::getId, this.update(new LambdaUpdateWrapper<SysUser>().eq(SysUser::getId,
sysUserIdParam.getId()).set(SysUser::getPassword, sysUserIdParam.getId()).set(SysUser::getPassword,
@ -702,7 +702,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
// 获取新密码 // 获取新密码
String newPassword = CommonCryptogramUtil.doSm2Decrypt(sysUserFindPwdByPhoneParam.getNewPassword()).trim(); String newPassword = CommonCryptogramUtil.doSm2Decrypt(sysUserFindPwdByPhoneParam.getNewPassword()).trim();
// 校验新密码 // 校验新密码
SysPasswordUtli.validNewPassword(sysLoginUser, newPassword); SysPasswordUtil.validNewPassword(sysLoginUser, newPassword);
// 修改密码 // 修改密码
this.update(new LambdaUpdateWrapper<SysUser>().eq(SysUser::getPhone, this.update(new LambdaUpdateWrapper<SysUser>().eq(SysUser::getPhone,
CommonCryptogramUtil.doSm4CbcEncrypt(phone)).set(SysUser::getPassword, CommonCryptogramUtil.doSm4CbcEncrypt(phone)).set(SysUser::getPassword,
@ -754,7 +754,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
sysUserExtService.updatePasswordLastTime(sysLoginUser.getId()); sysUserExtService.updatePasswordLastTime(sysLoginUser.getId());
// 追加用户历史密码信息 // 追加用户历史密码信息
sysUserPasswordService.insertUserPasswordHistory(sysLoginUser.getId(), newPassword); sysUserPasswordService.insertUserPasswordHistory(sysLoginUser.getId(), newPassword);
SysPasswordUtli.validNewPassword(sysLoginUser, newPassword); SysPasswordUtil.validNewPassword(sysLoginUser, newPassword);
// 修改密码 // 修改密码
this.update(new LambdaUpdateWrapper<SysUser>().eq(SysUser::getEmail, email).set(SysUser::getPassword, this.update(new LambdaUpdateWrapper<SysUser>().eq(SysUser::getEmail, email).set(SysUser::getPassword,
CommonCryptogramUtil.doHashValue(newPassword))); CommonCryptogramUtil.doHashValue(newPassword)));
@ -782,21 +782,21 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
@Override @Override
public String updatePasswordGetPhoneValidCode(SysUserGetPhoneValidCodeParam sysUserGetPhoneValidCodeParam) { public String updatePasswordGetPhoneValidCode(SysUserGetPhoneValidCodeParam sysUserGetPhoneValidCodeParam) {
// 判断密码验证方式 // 判断密码验证方式
SysPasswordUtli.validUpdatePasswordValidType(SysUpdatePasswordValidTypeEnum.PHONE.getValue()); SysPasswordUtil.validUpdatePasswordValidType(SysUpdatePasswordValidTypeEnum.PHONE.getValue());
return this.getPhoneValidCode(sysUserGetPhoneValidCodeParam, "修改密码验证码短信消息模板编码", SNOWY_SMS_TEMPLATE_VALID_CODE_UPDATE_PASSWORD_FOR_B_KEY); return this.getPhoneValidCode(sysUserGetPhoneValidCodeParam, "修改密码验证码短信消息模板编码", SNOWY_SMS_TEMPLATE_VALID_CODE_UPDATE_PASSWORD_FOR_B_KEY);
} }
@Override @Override
public String updatePasswordGetEmailValidCode(SysUserGetEmailValidCodeParam sysUserGetEmailValidCodeParam) { public String updatePasswordGetEmailValidCode(SysUserGetEmailValidCodeParam sysUserGetEmailValidCodeParam) {
// 判断密码验证方式 // 判断密码验证方式
SysPasswordUtli.validUpdatePasswordValidType(SysUpdatePasswordValidTypeEnum.EMAIL.getValue()); SysPasswordUtil.validUpdatePasswordValidType(SysUpdatePasswordValidTypeEnum.EMAIL.getValue());
return this.getEmailValidCode(sysUserGetEmailValidCodeParam, "修改密码验证码邮件消息模板内容", SNOWY_EMAIL_TEMPLATE_VALID_CODE_UPDATE_PASSWORD_FOR_B_KEY); return this.getEmailValidCode(sysUserGetEmailValidCodeParam, "修改密码验证码邮件消息模板内容", SNOWY_EMAIL_TEMPLATE_VALID_CODE_UPDATE_PASSWORD_FOR_B_KEY);
} }
@Override @Override
public void updatePasswordByOld(SysUserUpdatePwdByOldParam sysUserUpdatePwdByOldParam) { public void updatePasswordByOld(SysUserUpdatePwdByOldParam sysUserUpdatePwdByOldParam) {
// 判断密码验证方式 // 判断密码验证方式
SysPasswordUtli.validUpdatePasswordValidType(SysUpdatePasswordValidTypeEnum.OLD.getValue()); SysPasswordUtil.validUpdatePasswordValidType(SysUpdatePasswordValidTypeEnum.OLD.getValue());
SysUser sysUser = this.queryEntity(StpUtil.getLoginIdAsString()); SysUser sysUser = this.queryEntity(StpUtil.getLoginIdAsString());
String password = CommonCryptogramUtil.doSm2Decrypt(sysUserUpdatePwdByOldParam.getPassword()).trim(); String password = CommonCryptogramUtil.doSm2Decrypt(sysUserUpdatePwdByOldParam.getPassword()).trim();
String newPassword = CommonCryptogramUtil.doSm2Decrypt(sysUserUpdatePwdByOldParam.getNewPassword()).trim(); String newPassword = CommonCryptogramUtil.doSm2Decrypt(sysUserUpdatePwdByOldParam.getNewPassword()).trim();
@ -804,7 +804,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
throw new CommonException("原密码错误"); throw new CommonException("原密码错误");
} }
// 校验新密码 // 校验新密码
SysPasswordUtli.validNewPassword(sysUser, newPassword); SysPasswordUtil.validNewPassword(sysUser, newPassword);
// 修改密码 // 修改密码
this.update(new LambdaUpdateWrapper<SysUser>().eq(SysUser::getId, this.update(new LambdaUpdateWrapper<SysUser>().eq(SysUser::getId,
sysUser.getId()).set(SysUser::getPassword, sysUser.getId()).set(SysUser::getPassword,
@ -867,7 +867,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
@Override @Override
public void updatePasswordByPhone(SysUserUpdatePwdByPhoneParam sysUserUpdatePwdByPhoneParam) { public void updatePasswordByPhone(SysUserUpdatePwdByPhoneParam sysUserUpdatePwdByPhoneParam) {
// 判断密码验证方式 // 判断密码验证方式
SysPasswordUtli.validUpdatePasswordValidType(SysUpdatePasswordValidTypeEnum.PHONE.getValue()); SysPasswordUtil.validUpdatePasswordValidType(SysUpdatePasswordValidTypeEnum.PHONE.getValue());
SysUserFindPwdByPhoneParam sysUserFindPwdByPhoneParam = new SysUserFindPwdByPhoneParam(); SysUserFindPwdByPhoneParam sysUserFindPwdByPhoneParam = new SysUserFindPwdByPhoneParam();
BeanUtil.copyProperties(sysUserUpdatePwdByPhoneParam, sysUserFindPwdByPhoneParam); BeanUtil.copyProperties(sysUserUpdatePwdByPhoneParam, sysUserFindPwdByPhoneParam);
this.findPasswordByPhone(sysUserFindPwdByPhoneParam); this.findPasswordByPhone(sysUserFindPwdByPhoneParam);
@ -876,7 +876,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
@Override @Override
public void updatePasswordByEmail(SysUserUpdatePwdByEmailParam sysUserUpdatePwdByEmailParam) { public void updatePasswordByEmail(SysUserUpdatePwdByEmailParam sysUserUpdatePwdByEmailParam) {
// 判断密码验证方式 // 判断密码验证方式
SysPasswordUtli.validUpdatePasswordValidType(SysUpdatePasswordValidTypeEnum.EMAIL.getValue()); SysPasswordUtil.validUpdatePasswordValidType(SysUpdatePasswordValidTypeEnum.EMAIL.getValue());
SysUserFindPwdByEmailParam sysUserFindPwdByEmailParam = new SysUserFindPwdByEmailParam(); SysUserFindPwdByEmailParam sysUserFindPwdByEmailParam = new SysUserFindPwdByEmailParam();
BeanUtil.copyProperties(sysUserUpdatePwdByEmailParam, sysUserFindPwdByEmailParam); BeanUtil.copyProperties(sysUserUpdatePwdByEmailParam, sysUserFindPwdByEmailParam);
this.findPasswordByEmail(sysUserFindPwdByEmailParam); this.findPasswordByEmail(sysUserFindPwdByEmailParam);
@ -1670,7 +1670,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
// 设置默认头像 // 设置默认头像
sysUser.setAvatar(CommonAvatarUtil.generateImg(sysUser.getName())); sysUser.setAvatar(CommonAvatarUtil.generateImg(sysUser.getName()));
// 设置默认密码 // 设置默认密码
sysUser.setPassword(CommonCryptogramUtil.doHashValue(SysPasswordUtli.getDefaultPassword())); sysUser.setPassword(CommonCryptogramUtil.doHashValue(SysPasswordUtil.getDefaultPassword()));
// 设置排序码 // 设置排序码
sysUser.setSortCode(99); sysUser.setSortCode(99);
// 设置状态 // 设置状态
@ -2326,7 +2326,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
@Override @Override
public Boolean isUserPasswordExpired() { public Boolean isUserPasswordExpired() {
return SysPasswordUtli.isUserPasswordExpired(StpUtil.getLoginIdAsString()); return SysPasswordUtil.isUserPasswordExpired(StpUtil.getLoginIdAsString());
} }
@Override @Override
@ -2336,7 +2336,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
// 密码即将到期邮件消息模板 // 密码即将到期邮件消息模板
String emailTemplateContent = devConfigApi.getValueByKey(SNOWY_EMAIL_TEMPLATE_NOTICE_PASSWORD_EXPIRED_FOR_B_KEY); String emailTemplateContent = devConfigApi.getValueByKey(SNOWY_EMAIL_TEMPLATE_NOTICE_PASSWORD_EXPIRED_FOR_B_KEY);
// 获取今日需要提醒密码到期的用户集合 // 获取今日需要提醒密码到期的用户集合
SysPasswordUtli.thisDayPasswordExpiredNeedNoticeUserIdList().forEach(sysUser -> { SysPasswordUtil.thisDayPasswordExpiredNeedNoticeUserIdList().forEach(sysUser -> {
// 获取手机号 // 获取手机号
String phone = sysUser.getPhone(); String phone = sysUser.getPhone();
// 不为空才发送 // 不为空才发送
@ -2388,14 +2388,14 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
throw new CommonException("账号已存在"); throw new CommonException("账号已存在");
} }
// 校验密码 // 校验密码
SysPasswordUtli.validNewPassword(password); SysPasswordUtil.validNewPassword(password);
// 根据账号密码创建用户 // 根据账号密码创建用户
this.createUserWithAccount(account, password); this.createUserWithAccount(account, password);
} }
@Override @Override
public JSONObject getUpdatePasswordValidConfig() { public JSONObject getUpdatePasswordValidConfig() {
return SysPasswordUtli.getUpdatePasswordValidConfig(); return SysPasswordUtil.getUpdatePasswordValidConfig();
} }
/** /**