From af1e919a7d9e040dc84002801edd487201befe74 Mon Sep 17 00:00:00 2001 From: wangxu <495914790@qq.com> Date: Fri, 30 May 2025 11:48:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../log/service/impl/DevLogServiceImpl.java | 8 +-- ...FormatUtl.java => SysEmailFormatUtil.java} | 2 +- ...sPasswordUtl.java => SysPasswordUtli.java} | 2 +- .../sys/modular/sys/SysApiProvider.java | 4 +- .../user/provider/SysUserApiProvider.java | 6 +- .../user/service/impl/SysUserServiceImpl.java | 68 +++++++++---------- 6 files changed, 45 insertions(+), 45 deletions(-) rename snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/core/util/{SysEmailFormatUtl.java => SysEmailFormatUtil.java} (98%) rename snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/core/util/{SysPasswordUtl.java => SysPasswordUtli.java} (99%) diff --git a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/log/service/impl/DevLogServiceImpl.java b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/log/service/impl/DevLogServiceImpl.java index 15f2d431..33f8bfb1 100644 --- a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/log/service/impl/DevLogServiceImpl.java +++ b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/log/service/impl/DevLogServiceImpl.java @@ -59,10 +59,10 @@ public class DevLogServiceImpl extends ServiceImpl impleme QueryWrapper queryWrapper = new QueryWrapper().checkSqlInjection(); // page查询中排除较大的字段（提升查询速度） queryWrapper.select(DevLog.class, info -> - !info.getColumn().equalsIgnoreCase("param_json") - && !info.getColumn().equalsIgnoreCase("result_json") - && !info.getColumn().equalsIgnoreCase("exe_message") - && !info.getColumn().equalsIgnoreCase("sign_data") + !"param_json".equalsIgnoreCase(info.getColumn()) + && !"result_json".equalsIgnoreCase(info.getColumn()) + && !"exe_message".equalsIgnoreCase(info.getColumn()) + && !"sign_data".equalsIgnoreCase(info.getColumn()) ); if(ObjectUtil.isNotEmpty(devLogPageParam.getCategory())) { queryWrapper.lambda().eq(DevLog::getCategory, devLogPageParam.getCategory()); diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/core/util/SysEmailFormatUtl.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/core/util/SysEmailFormatUtil.java similarity index 98% rename from snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/core/util/SysEmailFormatUtl.java rename to snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/core/util/SysEmailFormatUtil.java index f063ad93..7d62bbd5 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/core/util/SysEmailFormatUtl.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/core/util/SysEmailFormatUtil.java @@ -24,7 +24,7 @@ import vip.xiaonuo.dev.api.DevConfigApi; * @author xuyuxiang * @date 2025/3/21 19:07 **/ -public class SysEmailFormatUtl { +public class SysEmailFormatUtil { /** 系统名称 */ private static final String SNOWY_SYS_NAME_KEY = "SNOWY_SYS_NAME"; diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/core/util/SysPasswordUtl.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/core/util/SysPasswordUtli.java similarity index 99% rename from snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/core/util/SysPasswordUtl.java rename to snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/core/util/SysPasswordUtli.java index e52632ad..8ff74eb5 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/core/util/SysPasswordUtl.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/core/util/SysPasswordUtli.java @@ -44,7 +44,7 @@ import java.util.stream.Collectors; * @author xuyuxiang * @date 2025/3/21 19:07 **/ -public class SysPasswordUtl { +public class SysPasswordUtli { /** B端系统默认密码 */ private static final String SNOWY_SYS_DEFAULT_PASSWORD_FOR_B_KEY = "SNOWY_SYS_DEFAULT_PASSWORD_FOR_B"; diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/sys/SysApiProvider.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/sys/SysApiProvider.java index c1cf11a1..89502f0a 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/sys/SysApiProvider.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/sys/SysApiProvider.java @@ -2,7 +2,7 @@ package vip.xiaonuo.sys.modular.sys; import org.springframework.stereotype.Service; import vip.xiaonuo.sys.api.SysApi; -import vip.xiaonuo.sys.core.util.SysPasswordUtl; +import vip.xiaonuo.sys.core.util.SysPasswordUtli; /** * 系统模块综合API接口实现类 @@ -15,6 +15,6 @@ public class SysApiProvider implements SysApi { @Override public String getDefaultPassword() { - return SysPasswordUtl.getDefaultPassword(); + return SysPasswordUtli.getDefaultPassword(); } } diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/provider/SysUserApiProvider.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/provider/SysUserApiProvider.java index 83f5b57f..55644963 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/provider/SysUserApiProvider.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/provider/SysUserApiProvider.java @@ -149,7 +149,7 @@ public class SysUserApiProvider implements SysUserApi { // 查询结果 String resultUserId = result.get(); // 如果要求查最高层级主管 - if(supervisorLevel.equals("-1")) { + if("-1".equals(supervisorLevel)) { if(ObjectUtil.isEmpty(resultUserId)) { // 查不到，则当前用户就是最高层级主管 if(ObjectUtil.isEmpty(userIdList)) { @@ -178,7 +178,7 @@ public class SysUserApiProvider implements SysUserApi { // 由最低级向高级查，首先主管级别减1 String nextLevel = Convert.toStr(Convert.toInt(supervisorLevel) - 1); // 如果减1后级别为0，表示查一级直属主管 - if(nextLevel.equals("0")) { + if("0".equals(nextLevel)) { // 则当前结果就是一级直属主管 return JSONUtil.createObj().set("id", resultUserId).set("idList", CollectionUtil.newArrayList(resultUserId)); } else { @@ -200,7 +200,7 @@ public class SysUserApiProvider implements SysUserApi { @Override public List getMulSupervisorIdListByEndLevel(String userId, String orgId, String endLevel) { List resultList = CollectionUtil.newArrayList(); - if(endLevel.equals("-1")) { + if("-1".equals(endLevel)) { List idList = this.getSupervisorIdBySupervisorLevel(CollectionUtil.newArrayList(), userId, orgId, endLevel) .getBeanList("idList", String.class); if(ObjectUtil.isNotEmpty(idList)) { 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 1c030601..750dba24 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 @@ -79,8 +79,8 @@ import vip.xiaonuo.mobile.api.MobileButtonApi; import vip.xiaonuo.mobile.api.MobileMenuApi; import vip.xiaonuo.sys.core.enums.SysBuildInEnum; import vip.xiaonuo.sys.core.enums.SysDataTypeEnum; -import vip.xiaonuo.sys.core.util.SysEmailFormatUtl; -import vip.xiaonuo.sys.core.util.SysPasswordUtl; +import vip.xiaonuo.sys.core.util.SysEmailFormatUtil; +import vip.xiaonuo.sys.core.util.SysPasswordUtli; import vip.xiaonuo.sys.modular.group.entity.SysGroup; import vip.xiaonuo.sys.modular.group.service.SysGroupService; import vip.xiaonuo.sys.modular.org.entity.SysOrg; @@ -325,7 +325,7 @@ public class SysUserServiceImpl extends ServiceImpl impl } if(ObjectUtil.isEmpty(sysUser.getPassword())) { // 设置默认密码 - sysUser.setPassword(CommonCryptogramUtil.doHashValue(SysPasswordUtl.getDefaultPassword())); + sysUser.setPassword(CommonCryptogramUtil.doHashValue(SysPasswordUtli.getDefaultPassword())); } else { // 设置传入的密码 sysUser.setPassword(CommonCryptogramUtil.doHashValue(sysUser.getPassword())); @@ -473,7 +473,7 @@ public class SysUserServiceImpl extends ServiceImpl impl // 获取用户 SysUser sysUser = this.queryEntity(sysUserIdParam.getId()); // 获取默认密码 - String defaultPassword = SysPasswordUtl.getDefaultPassword(); + String defaultPassword = SysPasswordUtli.getDefaultPassword(); // 修改密码 this.update(new LambdaUpdateWrapper().eq(SysUser::getId, sysUserIdParam.getId()).set(SysUser::getPassword, @@ -516,9 +516,9 @@ public class SysUserServiceImpl extends ServiceImpl impl // 定义变量参数 JSONObject paramMap = JSONUtil.createObj().set("userEmail", email).set("userNewPassword", defaultPassword); // 获取格式化后的主题 - String subject = SysEmailFormatUtl.format(contentJSONObject.getStr("subject"), paramMap);; + String subject = SysEmailFormatUtil.format(contentJSONObject.getStr("subject"), paramMap);; // 获取格式化后的内容 - String content = SysEmailFormatUtl.format(contentJSONObject.getStr("content"), paramMap); + String content = SysEmailFormatUtil.format(contentJSONObject.getStr("content"), paramMap); try { // 发送邮件 devEmailApi.sendDynamicHtmlEmail(email, subject, content); @@ -673,9 +673,9 @@ public class SysUserServiceImpl extends ServiceImpl impl JSONObject paramMap = JSONUtil.createObj().set("userEmail", email).set("validCode", emailValidCode) .set("validTime", validCodeExpiredDuration/60); // 获取格式化后的主题 - String subject = SysEmailFormatUtl.format(contentJSONObject.getStr("subject"), paramMap);; + String subject = SysEmailFormatUtil.format(contentJSONObject.getStr("subject"), paramMap);; // 获取格式化后的内容 - String content = SysEmailFormatUtl.format(contentJSONObject.getStr("content"), paramMap);; + String content = SysEmailFormatUtil.format(contentJSONObject.getStr("content"), paramMap);; // 发送邮件 devEmailApi.sendDynamicHtmlEmail(email, subject, content); // 将请求号作为key，验证码的值作为value放到redis，用于校验 @@ -702,7 +702,7 @@ public class SysUserServiceImpl extends ServiceImpl impl // 获取新密码 String newPassword = CommonCryptogramUtil.doSm2Decrypt(sysUserFindPwdByPhoneParam.getNewPassword()).trim(); // 校验新密码 - SysPasswordUtl.validNewPassword(sysLoginUser, newPassword); + SysPasswordUtli.validNewPassword(sysLoginUser, newPassword); // 修改密码 this.update(new LambdaUpdateWrapper().eq(SysUser::getPhone, CommonCryptogramUtil.doSm4CbcEncrypt(phone)).set(SysUser::getPassword, @@ -754,7 +754,7 @@ public class SysUserServiceImpl extends ServiceImpl impl sysUserExtService.updatePasswordLastTime(sysLoginUser.getId()); // 追加用户历史密码信息 sysUserPasswordService.insertUserPasswordHistory(sysLoginUser.getId(), newPassword); - SysPasswordUtl.validNewPassword(sysLoginUser, newPassword); + SysPasswordUtli.validNewPassword(sysLoginUser, newPassword); // 修改密码 this.update(new LambdaUpdateWrapper().eq(SysUser::getEmail, email).set(SysUser::getPassword, CommonCryptogramUtil.doHashValue(newPassword))); @@ -767,9 +767,9 @@ public class SysUserServiceImpl extends ServiceImpl impl // 定义变量参数 JSONObject paramMap = JSONUtil.createObj().set("userEmail", email).set("userNewPassword", newPassword); // 获取格式化后的主题 - String subject = SysEmailFormatUtl.format(contentJSONObject.getStr("subject"), paramMap);; + String subject = SysEmailFormatUtil.format(contentJSONObject.getStr("subject"), paramMap);; // 获取格式化后的内容 - String content = SysEmailFormatUtl.format(contentJSONObject.getStr("content"), paramMap);; + String content = SysEmailFormatUtil.format(contentJSONObject.getStr("content"), paramMap);; try { // 发送邮件 devEmailApi.sendDynamicHtmlEmail(email, subject, content); @@ -782,21 +782,21 @@ public class SysUserServiceImpl extends ServiceImpl impl @Override public String updatePasswordGetPhoneValidCode(SysUserGetPhoneValidCodeParam sysUserGetPhoneValidCodeParam) { // 判断密码验证方式 - SysPasswordUtl.validUpdatePasswordValidType(SysUpdatePasswordValidTypeEnum.PHONE.getValue()); + SysPasswordUtli.validUpdatePasswordValidType(SysUpdatePasswordValidTypeEnum.PHONE.getValue()); return this.getPhoneValidCode(sysUserGetPhoneValidCodeParam, "修改密码验证码短信消息模板编码", SNOWY_SMS_TEMPLATE_VALID_CODE_UPDATE_PASSWORD_FOR_B_KEY); } @Override public String updatePasswordGetEmailValidCode(SysUserGetEmailValidCodeParam sysUserGetEmailValidCodeParam) { // 判断密码验证方式 - SysPasswordUtl.validUpdatePasswordValidType(SysUpdatePasswordValidTypeEnum.EMAIL.getValue()); + SysPasswordUtli.validUpdatePasswordValidType(SysUpdatePasswordValidTypeEnum.EMAIL.getValue()); return this.getEmailValidCode(sysUserGetEmailValidCodeParam, "修改密码验证码邮件消息模板内容", SNOWY_EMAIL_TEMPLATE_VALID_CODE_UPDATE_PASSWORD_FOR_B_KEY); } @Override public void updatePasswordByOld(SysUserUpdatePwdByOldParam sysUserUpdatePwdByOldParam) { // 判断密码验证方式 - SysPasswordUtl.validUpdatePasswordValidType(SysUpdatePasswordValidTypeEnum.OLD.getValue()); + SysPasswordUtli.validUpdatePasswordValidType(SysUpdatePasswordValidTypeEnum.OLD.getValue()); SysUser sysUser = this.queryEntity(StpUtil.getLoginIdAsString()); String password = CommonCryptogramUtil.doSm2Decrypt(sysUserUpdatePwdByOldParam.getPassword()).trim(); String newPassword = CommonCryptogramUtil.doSm2Decrypt(sysUserUpdatePwdByOldParam.getNewPassword()).trim(); @@ -804,7 +804,7 @@ public class SysUserServiceImpl extends ServiceImpl impl throw new CommonException("原密码错误"); } // 校验新密码 - SysPasswordUtl.validNewPassword(sysUser, newPassword); + SysPasswordUtli.validNewPassword(sysUser, newPassword); // 修改密码 this.update(new LambdaUpdateWrapper().eq(SysUser::getId, sysUser.getId()).set(SysUser::getPassword, @@ -851,9 +851,9 @@ public class SysUserServiceImpl extends ServiceImpl impl // 定义变量参数 JSONObject paramMap = JSONUtil.createObj().set("userEmail", email).set("userNewPassword", newPassword); // 获取格式化后的主题 - String subject = SysEmailFormatUtl.format(contentJSONObject.getStr("subject"), paramMap);; + String subject = SysEmailFormatUtil.format(contentJSONObject.getStr("subject"), paramMap);; // 获取格式化后的内容 - String content = SysEmailFormatUtl.format(contentJSONObject.getStr("content"), paramMap);; + String content = SysEmailFormatUtil.format(contentJSONObject.getStr("content"), paramMap);; try { // 发送邮件 devEmailApi.sendDynamicHtmlEmail(email, subject, content); @@ -867,7 +867,7 @@ public class SysUserServiceImpl extends ServiceImpl impl @Override public void updatePasswordByPhone(SysUserUpdatePwdByPhoneParam sysUserUpdatePwdByPhoneParam) { // 判断密码验证方式 - SysPasswordUtl.validUpdatePasswordValidType(SysUpdatePasswordValidTypeEnum.PHONE.getValue()); + SysPasswordUtli.validUpdatePasswordValidType(SysUpdatePasswordValidTypeEnum.PHONE.getValue()); SysUserFindPwdByPhoneParam sysUserFindPwdByPhoneParam = new SysUserFindPwdByPhoneParam(); BeanUtil.copyProperties(sysUserUpdatePwdByPhoneParam, sysUserFindPwdByPhoneParam); this.findPasswordByPhone(sysUserFindPwdByPhoneParam); @@ -876,7 +876,7 @@ public class SysUserServiceImpl extends ServiceImpl impl @Override public void updatePasswordByEmail(SysUserUpdatePwdByEmailParam sysUserUpdatePwdByEmailParam) { // 判断密码验证方式 - SysPasswordUtl.validUpdatePasswordValidType(SysUpdatePasswordValidTypeEnum.EMAIL.getValue()); + SysPasswordUtli.validUpdatePasswordValidType(SysUpdatePasswordValidTypeEnum.EMAIL.getValue()); SysUserFindPwdByEmailParam sysUserFindPwdByEmailParam = new SysUserFindPwdByEmailParam(); BeanUtil.copyProperties(sysUserUpdatePwdByEmailParam, sysUserFindPwdByEmailParam); this.findPasswordByEmail(sysUserFindPwdByEmailParam); @@ -1012,9 +1012,9 @@ public class SysUserServiceImpl extends ServiceImpl impl JSONObject paramMap = JSONUtil.createObj().set("userEmail", email).set("validCode", emailValidCode) .set("validTime", validCodeExpiredDuration/60); // 获取格式化后的主题 - String subject = SysEmailFormatUtl.format(contentJSONObject.getStr("subject"), paramMap);; + String subject = SysEmailFormatUtil.format(contentJSONObject.getStr("subject"), paramMap);; // 获取格式化后的内容 - String content = SysEmailFormatUtl.format(contentJSONObject.getStr("content"), paramMap);; + String content = SysEmailFormatUtil.format(contentJSONObject.getStr("content"), paramMap);; // 发送邮件 devEmailApi.sendDynamicHtmlEmail(email, subject, content); // 将请求号作为key，验证码的值作为value放到redis，用于校验 @@ -1054,9 +1054,9 @@ public class SysUserServiceImpl extends ServiceImpl impl JSONObject paramMap = JSONUtil.createObj().set("userEmail", email).set("validCode", emailValidCode) .set("validTime", validCodeExpiredDuration/60); // 获取格式化后的主题 - String subject = SysEmailFormatUtl.format(contentJSONObject.getStr("subject"), paramMap);; + String subject = SysEmailFormatUtil.format(contentJSONObject.getStr("subject"), paramMap);; // 获取格式化后的内容 - String content = SysEmailFormatUtl.format(contentJSONObject.getStr("content"), paramMap);; + String content = SysEmailFormatUtil.format(contentJSONObject.getStr("content"), paramMap);; // 发送邮件 devEmailApi.sendDynamicHtmlEmail(email, subject, content); // 将请求号作为key，验证码的值作为value放到redis，用于校验 @@ -1255,7 +1255,7 @@ public class SysUserServiceImpl extends ServiceImpl impl } } // 如果设置了不可见，那么设置为false，为了兼容已有，所以只是false的为不显示 - if (ObjectUtil.isNotEmpty(sysMenu.getVisible()) && sysMenu.getVisible().equals("FALSE")) { + if (ObjectUtil.isNotEmpty(sysMenu.getVisible()) && "FALSE".equals(sysMenu.getVisible())) { metaJsonObject.set("hidden", true); } menuJsonObject.set("meta", metaJsonObject); @@ -1670,7 +1670,7 @@ public class SysUserServiceImpl extends ServiceImpl impl // 设置默认头像 sysUser.setAvatar(CommonAvatarUtil.generateImg(sysUser.getName())); // 设置默认密码 - sysUser.setPassword(CommonCryptogramUtil.doHashValue(SysPasswordUtl.getDefaultPassword())); + sysUser.setPassword(CommonCryptogramUtil.doHashValue(SysPasswordUtli.getDefaultPassword())); // 设置排序码 sysUser.setSortCode(99); // 设置状态 @@ -2200,9 +2200,9 @@ public class SysUserServiceImpl extends ServiceImpl impl // 定义变量参数 JSONObject paramMap = JSONUtil.createObj().set("userEmail", email); // 获取格式化后的主题 - String subject = SysEmailFormatUtl.format(contentJSONObject.getStr("subject"), paramMap);; + String subject = SysEmailFormatUtil.format(contentJSONObject.getStr("subject"), paramMap);; // 获取格式化后的内容 - String content = SysEmailFormatUtl.format(contentJSONObject.getStr("content"), paramMap);; + String content = SysEmailFormatUtil.format(contentJSONObject.getStr("content"), paramMap);; // 发送邮件 devEmailApi.sendDynamicHtmlEmail(email, subject, content); } @@ -2326,7 +2326,7 @@ public class SysUserServiceImpl extends ServiceImpl impl @Override public Boolean isUserPasswordExpired() { - return SysPasswordUtl.isUserPasswordExpired(StpUtil.getLoginIdAsString()); + return SysPasswordUtli.isUserPasswordExpired(StpUtil.getLoginIdAsString()); } @Override @@ -2336,7 +2336,7 @@ public class SysUserServiceImpl extends ServiceImpl impl // 密码即将到期邮件消息模板 String emailTemplateContent = devConfigApi.getValueByKey(SNOWY_EMAIL_TEMPLATE_NOTICE_PASSWORD_EXPIRED_FOR_B_KEY); // 获取今日需要提醒密码到期的用户集合 - SysPasswordUtl.thisDayPasswordExpiredNeedNoticeUserIdList().forEach(sysUser -> { + SysPasswordUtli.thisDayPasswordExpiredNeedNoticeUserIdList().forEach(sysUser -> { // 获取手机号 String phone = sysUser.getPhone(); // 不为空才发送 @@ -2366,9 +2366,9 @@ public class SysUserServiceImpl extends ServiceImpl impl // 定义变量参数 JSONObject paramMap = JSONUtil.createObj().set("userEmail", email); // 获取格式化后的主题 - String subject = SysEmailFormatUtl.format(contentJSONObject.getStr("subject"), paramMap);; + String subject = SysEmailFormatUtil.format(contentJSONObject.getStr("subject"), paramMap);; // 获取格式化后的内容 - String content = SysEmailFormatUtl.format(contentJSONObject.getStr("content"), paramMap);; + String content = SysEmailFormatUtil.format(contentJSONObject.getStr("content"), paramMap);; try { // 发送邮件 devEmailApi.sendDynamicHtmlEmail(email, subject, content); @@ -2388,14 +2388,14 @@ public class SysUserServiceImpl extends ServiceImpl impl throw new CommonException("账号已存在"); } // 校验密码 - SysPasswordUtl.validNewPassword(password); + SysPasswordUtli.validNewPassword(password); // 根据账号密码创建用户 this.createUserWithAccount(account, password); } @Override public JSONObject getUpdatePasswordValidConfig() { - return SysPasswordUtl.getUpdatePasswordValidConfig(); + return SysPasswordUtli.getUpdatePasswordValidConfig(); } /**