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

Pre Merge pull request !266 from wsxe9988/dev

pull/266/MERGE
wsxe9988 2025-06-18 08:06:40 +00:00 committed by Gitee
parent c964ce0508 56064ce30c
commit f75f95df72
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
6 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/log/service/impl/DevLogServiceImpl.java
View File

@ -59,10 +59,10 @@ public class DevLogServiceImpl extends ServiceImpl<DevLogMapper, DevLog> impleme
QueryWrapper<DevLog> queryWrapper = new QueryWrapper<DevLog>().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());

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

@ -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";

2
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/core/util/SysPasswordUtl.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
* @date 2025/3/21 19:07
**/
public class SysPasswordUtl {
public class SysPasswordUtil {
/** 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 vip.xiaonuo.sys.api.SysApi;
import vip.xiaonuo.sys.core.util.SysPasswordUtl;
import vip.xiaonuo.sys.core.util.SysPasswordUtil;
/**
* 系统模块综合API接口实现类
@ -15,6 +15,6 @@ public class SysApiProvider implements SysApi {
@Override
public String getDefaultPassword() {
return SysPasswordUtl.getDefaultPassword();
return SysPasswordUtil.getDefaultPassword();
}
}

6
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/provider/SysUserApiProvider.java
View File

@ -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<String> getMulSupervisorIdListByEndLevel(String userId, String orgId, String endLevel) {
List<String> resultList = CollectionUtil.newArrayList();
if(endLevel.equals("-1")) {
if("-1".equals(endLevel)) {
List<String> idList = this.getSupervisorIdBySupervisorLevel(CollectionUtil.newArrayList(), userId, orgId, endLevel)
.getBeanList("idList", String.class);
if(ObjectUtil.isNotEmpty(idList)) {

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

@ -80,8 +80,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.SysPasswordUtil;
import vip.xiaonuo.sys.modular.group.entity.SysGroup;
import vip.xiaonuo.sys.modular.group.service.SysGroupService;
import vip.xiaonuo.sys.modular.org.entity.SysOrg;
@ -327,7 +327,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
}
if(ObjectUtil.isEmpty(sysUser.getPassword())) {
// 设置默认密码
sysUser.setPassword(CommonCryptogramUtil.doHashValue(SysPasswordUtl.getDefaultPassword()));
sysUser.setPassword(CommonCryptogramUtil.doHashValue(SysPasswordUtil.getDefaultPassword()));
} else {
// 设置传入的密码
sysUser.setPassword(CommonCryptogramUtil.doHashValue(sysUser.getPassword()));
@ -475,7 +475,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
// 获取用户
SysUser sysUser = this.queryEntity(sysUserIdParam.getId());
// 获取默认密码
String defaultPassword = SysPasswordUtl.getDefaultPassword();
String defaultPassword = SysPasswordUtil.getDefaultPassword();
// 修改密码
this.update(new LambdaUpdateWrapper<SysUser>().eq(SysUser::getId,
sysUserIdParam.getId()).set(SysUser::getPassword,
@ -518,9 +518,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> 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);
@ -675,9 +675,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> 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，用于校验
@ -704,7 +704,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
// 获取新密码
String newPassword = CommonCryptogramUtil.doSm2Decrypt(sysUserFindPwdByPhoneParam.getNewPassword()).trim();
// 校验新密码
SysPasswordUtl.validNewPassword(sysLoginUser, newPassword);
SysPasswordUtil.validNewPassword(sysLoginUser, newPassword);
// 修改密码
this.update(new LambdaUpdateWrapper<SysUser>().eq(SysUser::getPhone,
CommonCryptogramUtil.doSm4CbcEncrypt(phone)).set(SysUser::getPassword,
@ -756,7 +756,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
sysUserExtService.updatePasswordLastTime(sysLoginUser.getId());
// 追加用户历史密码信息
sysUserPasswordService.insertUserPasswordHistory(sysLoginUser.getId(), newPassword);
SysPasswordUtl.validNewPassword(sysLoginUser, newPassword);
SysPasswordUtil.validNewPassword(sysLoginUser, newPassword);
// 修改密码
this.update(new LambdaUpdateWrapper<SysUser>().eq(SysUser::getEmail, email).set(SysUser::getPassword,
CommonCryptogramUtil.doHashValue(newPassword)));
@ -769,9 +769,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> 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);
@ -784,21 +784,21 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
@Override
public String updatePasswordGetPhoneValidCode(SysUserGetPhoneValidCodeParam sysUserGetPhoneValidCodeParam) {
// 判断密码验证方式
SysPasswordUtl.validUpdatePasswordValidType(SysUpdatePasswordValidTypeEnum.PHONE.getValue());
SysPasswordUtil.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());
SysPasswordUtil.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());
SysPasswordUtil.validUpdatePasswordValidType(SysUpdatePasswordValidTypeEnum.OLD.getValue());
SysUser sysUser = this.queryEntity(StpUtil.getLoginIdAsString());
String password = CommonCryptogramUtil.doSm2Decrypt(sysUserUpdatePwdByOldParam.getPassword()).trim();
String newPassword = CommonCryptogramUtil.doSm2Decrypt(sysUserUpdatePwdByOldParam.getNewPassword()).trim();
@ -806,7 +806,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
throw new CommonException("原密码错误");
}
// 校验新密码
SysPasswordUtl.validNewPassword(sysUser, newPassword);
SysPasswordUtil.validNewPassword(sysUser, newPassword);
// 修改密码
this.update(new LambdaUpdateWrapper<SysUser>().eq(SysUser::getId,
sysUser.getId()).set(SysUser::getPassword,
@ -853,9 +853,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> 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);
@ -869,7 +869,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
@Override
public void updatePasswordByPhone(SysUserUpdatePwdByPhoneParam sysUserUpdatePwdByPhoneParam) {
// 判断密码验证方式
SysPasswordUtl.validUpdatePasswordValidType(SysUpdatePasswordValidTypeEnum.PHONE.getValue());
SysPasswordUtil.validUpdatePasswordValidType(SysUpdatePasswordValidTypeEnum.PHONE.getValue());
SysUserFindPwdByPhoneParam sysUserFindPwdByPhoneParam = new SysUserFindPwdByPhoneParam();
BeanUtil.copyProperties(sysUserUpdatePwdByPhoneParam, sysUserFindPwdByPhoneParam);
this.findPasswordByPhone(sysUserFindPwdByPhoneParam);
@ -878,7 +878,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
@Override
public void updatePasswordByEmail(SysUserUpdatePwdByEmailParam sysUserUpdatePwdByEmailParam) {
// 判断密码验证方式
SysPasswordUtl.validUpdatePasswordValidType(SysUpdatePasswordValidTypeEnum.EMAIL.getValue());
SysPasswordUtil.validUpdatePasswordValidType(SysUpdatePasswordValidTypeEnum.EMAIL.getValue());
SysUserFindPwdByEmailParam sysUserFindPwdByEmailParam = new SysUserFindPwdByEmailParam();
BeanUtil.copyProperties(sysUserUpdatePwdByEmailParam, sysUserFindPwdByEmailParam);
this.findPasswordByEmail(sysUserFindPwdByEmailParam);
@ -1014,9 +1014,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> 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，用于校验
@ -1056,9 +1056,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> 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，用于校验
@ -1271,7 +1271,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> 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);
@ -1686,7 +1686,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
// 设置默认头像
sysUser.setAvatar(CommonAvatarUtil.generateImg(sysUser.getName()));
// 设置默认密码
sysUser.setPassword(CommonCryptogramUtil.doHashValue(SysPasswordUtl.getDefaultPassword()));
sysUser.setPassword(CommonCryptogramUtil.doHashValue(SysPasswordUtil.getDefaultPassword()));
// 设置排序码
sysUser.setSortCode(99);
// 设置状态
@ -2218,9 +2218,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> 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);
}
@ -2345,7 +2345,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
@Override
public Boolean isUserPasswordExpired() {
return SysPasswordUtl.isUserPasswordExpired(StpUtil.getLoginIdAsString());
return SysPasswordUtil.isUserPasswordExpired(StpUtil.getLoginIdAsString());
}
@Override
@ -2355,7 +2355,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
// 密码即将到期邮件消息模板
String emailTemplateContent = devConfigApi.getValueByKey(SNOWY_EMAIL_TEMPLATE_NOTICE_PASSWORD_EXPIRED_FOR_B_KEY);
// 获取今日需要提醒密码到期的用户集合
SysPasswordUtl.thisDayPasswordExpiredNeedNoticeUserIdList().forEach(sysUser -> {
SysPasswordUtil.thisDayPasswordExpiredNeedNoticeUserIdList().forEach(sysUser -> {
// 获取手机号
String phone = sysUser.getPhone();
// 不为空才发送
@ -2385,9 +2385,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> 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);
@ -2407,14 +2407,14 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
throw new CommonException("账号已存在");
}
// 校验密码
SysPasswordUtl.validNewPassword(password);
SysPasswordUtil.validNewPassword(password);
// 根据账号密码创建用户
this.createUserWithAccount(account, password);
}
@Override
public JSONObject getUpdatePasswordValidConfig() {
return SysPasswordUtl.getUpdatePasswordValidConfig();
return SysPasswordUtil.getUpdatePasswordValidConfig();
}
/**