From f79114167e9b1ff98de0009cf84541fc9db6e84b Mon Sep 17 00:00:00 2001 From: xuyuxiang Date: Thu, 15 May 2025 22:24:06 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E4=BC=81=E4=B8=9A=E7=89=88?= =?UTF-8?q?=E3=80=91=E4=BF=AE=E5=A4=8D=E8=8B=A5=E5=B9=B2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...trategyWhenNoUserWithPhoneOrEmailEnum.java | 5 +- .../login/service/impl/AuthServiceImpl.java | 212 ++++++++++-------- .../org/service/impl/BizOrgServiceImpl.java | 13 +- .../push/util/DevPushWorkWechatUtil.java | 2 +- .../service/impl/MobileMenuServiceImpl.java | 7 +- .../service/impl/SysUserExtServiceImpl.java | 2 + 6 files changed, 141 insertions(+), 100 deletions(-) diff --git a/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/enums/AuthStrategyWhenNoUserWithPhoneOrEmailEnum.java b/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/enums/AuthStrategyWhenNoUserWithPhoneOrEmailEnum.java index d42e70a6..8dccc16c 100644 --- a/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/enums/AuthStrategyWhenNoUserWithPhoneOrEmailEnum.java +++ b/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/enums/AuthStrategyWhenNoUserWithPhoneOrEmailEnum.java @@ -24,6 +24,9 @@ import vip.xiaonuo.common.exception.CommonException; @Getter public enum AuthStrategyWhenNoUserWithPhoneOrEmailEnum { + /** 允许登录（手机或者邮箱存在时） */ + ALLOW_LOGIN("ALLOW_LOGIN"), + /** 不允许登录 */ NOT_ALLOW_LOGIN("NOT_ALLOW_LOGIN"), @@ -39,7 +42,7 @@ public enum AuthStrategyWhenNoUserWithPhoneOrEmailEnum { public static void validate(String value) { boolean flag = NOT_ALLOW_LOGIN.getValue().equals(value) || AUTO_CREATE_USER.getValue().equals(value); if(!flag) { - throw new CommonException("不支持的手机号或邮箱无对应用户时策略型：{}", value); + throw new CommonException("不支持的手机号或邮箱无对应用户时策略类型：{}", value); } } } diff --git a/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/service/impl/AuthServiceImpl.java b/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/service/impl/AuthServiceImpl.java index 877d1982..9ab1f3d8 100644 --- a/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/service/impl/AuthServiceImpl.java +++ b/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/service/impl/AuthServiceImpl.java @@ -194,7 +194,7 @@ public class AuthServiceImpl implements AuthService { // 验证码请求号 String validCodeReqNo = authGetPhoneValidCodeParam.getValidCodeReqNo(); // 校验参数 - validPhoneOrEmailValidCodeParam(null, AuthPhoneOrEmailTypeEnum.PHONE.getValue(), validCode, validCodeReqNo, type); + validValidCode(null, validCode, validCodeReqNo); // 生成手机验证码的值，随机6为数字 String phoneValidCode = RandomUtil.randomNumbers(6); // 生成手机验证码的请求号 @@ -257,7 +257,7 @@ public class AuthServiceImpl implements AuthService { // 验证码请求号 String validCodeReqNo = authGetEmailValidCodeParam.getValidCodeReqNo(); // 校验参数 - validPhoneOrEmailValidCodeParam(null, AuthPhoneOrEmailTypeEnum.EMAIL.getValue(), validCode, validCodeReqNo, type); + validValidCode(null, validCode, validCodeReqNo); // 生成邮箱验证码的值，随机6为数字 String emailValidCode = RandomUtil.randomNumbers(6); // 生成邮箱验证码的请求号 @@ -351,59 +351,63 @@ public class AuthServiceImpl implements AuthService { * @author xuyuxiang * @date 2022/8/25 14:29 **/ - private String validPhoneOrEmailValidCodeParam(String phoneOrEmail, String phoneOrEmailType, String validCode, - String validCodeReqNo, String type) { - // 验证码正确则校验手机号格式 - if(ObjectUtil.isEmpty(phoneOrEmail)) { - // 根据手机号或者邮箱获取用户信息，判断用户是否存在，根据B端或C端判断 - if(SaClientTypeEnum.B.getValue().equals(type)) { - if(phoneOrEmailType.equals(AuthPhoneOrEmailTypeEnum.PHONE.getValue())) { - SaBaseLoginUser saBaseLoginUser = loginUserApi.getUserByPhone(phoneOrEmail); - if(ObjectUtil.isEmpty(saBaseLoginUser)) { - // B端手机号无对应用户时策略 - return devConfigApi.getValueByKey(SNOWY_SYS_DEFAULT_STRATEGY_WHEN_NO_USER_WITH_PHONE_FOR_B_KEY); - } - } else { - SaBaseLoginUser saBaseLoginUser = loginUserApi.getUserByEmail(phoneOrEmail); - if(ObjectUtil.isEmpty(saBaseLoginUser)) { - // B端邮箱无对应用户时策略 - return devConfigApi.getValueByKey(SNOWY_SYS_DEFAULT_STRATEGY_WHEN_NO_USER_WITH_EMAIL_FOR_B_KEY); - } - } - } else { - if(phoneOrEmailType.equals(AuthPhoneOrEmailTypeEnum.PHONE.getValue())) { - SaBaseClientLoginUser saBaseClientLoginUser = clientLoginUserApi.getClientUserByPhone(phoneOrEmail); - if(ObjectUtil.isEmpty(saBaseClientLoginUser)) { - // C端手机号无对应用户时策略 - return devConfigApi.getValueByKey(SNOWY_SYS_DEFAULT_STRATEGY_WHEN_NO_USER_WITH_PHONE_FOR_C_KEY); - } - } else { - SaBaseClientLoginUser saBaseClientLoginUser = clientLoginUserApi.getClientUserByEmail(phoneOrEmail); - if(ObjectUtil.isEmpty(saBaseClientLoginUser)) { - // BC端邮箱无对应用户时策略 - return devConfigApi.getValueByKey(SNOWY_SYS_DEFAULT_STRATEGY_WHEN_NO_USER_WITH_EMAIL_FOR_C_KEY); - } - } + private String validPhoneOrEmailValidCodeParam(String phoneOrEmail, String phoneOrEmailType, + String validCode, String validCodeReqNo, String type) { + // 校验手机号或邮箱类型 + AuthPhoneOrEmailTypeEnum.validate(phoneOrEmailType); + // 校验手机号或邮箱格式 + if(phoneOrEmailType.equals(AuthPhoneOrEmailTypeEnum.PHONE.getValue())) { + if(!PhoneUtil.isMobile(phoneOrEmail)) { + throw new CommonException(AuthExceptionEnum.PHONE_FORMAT_ERROR.getValue()); } - // 执行校验图形验证码 - validValidCode(null, validCode, validCodeReqNo); - // 返回空值 - return null; } else { - AuthPhoneOrEmailTypeEnum.validate(phoneOrEmailType); + if(CommonEmailUtil.isNotEmail(phoneOrEmail)) { + throw new CommonException(AuthExceptionEnum.PHONE_FORMAT_ERROR.getValue()); + } + } + // 先校验验证码 + validValidCode(phoneOrEmail, validCode, validCodeReqNo); + // 根据手机号或者邮箱获取用户信息，判断用户是否存在，根据B端或C端判断 + if(SaClientTypeEnum.B.getValue().equals(type)) { if(phoneOrEmailType.equals(AuthPhoneOrEmailTypeEnum.PHONE.getValue())) { - if(!PhoneUtil.isMobile(phoneOrEmail)) { - throw new CommonException(AuthExceptionEnum.PHONE_FORMAT_ERROR.getValue()); + SaBaseLoginUser saBaseLoginUser = loginUserApi.getUserByPhone(phoneOrEmail); + if(ObjectUtil.isEmpty(saBaseLoginUser)) { + // B端手机号无对应用户时策略 + return devConfigApi.getValueByKey(SNOWY_SYS_DEFAULT_STRATEGY_WHEN_NO_USER_WITH_PHONE_FOR_B_KEY); + } else { + // 存在则允许登录 + return AuthStrategyWhenNoUserWithPhoneOrEmailEnum.ALLOW_LOGIN.getValue(); } } else { - if(CommonEmailUtil.isNotEmail(phoneOrEmail)) { - throw new CommonException(AuthExceptionEnum.PHONE_FORMAT_ERROR.getValue()); + SaBaseLoginUser saBaseLoginUser = loginUserApi.getUserByEmail(phoneOrEmail); + if(ObjectUtil.isEmpty(saBaseLoginUser)) { + // B端邮箱无对应用户时策略 + return devConfigApi.getValueByKey(SNOWY_SYS_DEFAULT_STRATEGY_WHEN_NO_USER_WITH_EMAIL_FOR_B_KEY); + } else { + // 存在则允许登录 + return AuthStrategyWhenNoUserWithPhoneOrEmailEnum.ALLOW_LOGIN.getValue(); + } + } + } else { + if(phoneOrEmailType.equals(AuthPhoneOrEmailTypeEnum.PHONE.getValue())) { + SaBaseClientLoginUser saBaseClientLoginUser = clientLoginUserApi.getClientUserByPhone(phoneOrEmail); + if(ObjectUtil.isEmpty(saBaseClientLoginUser)) { + // C端手机号无对应用户时策略 + return devConfigApi.getValueByKey(SNOWY_SYS_DEFAULT_STRATEGY_WHEN_NO_USER_WITH_PHONE_FOR_C_KEY); + } else { + // 存在则允许登录 + return AuthStrategyWhenNoUserWithPhoneOrEmailEnum.ALLOW_LOGIN.getValue(); + } + } else { + SaBaseClientLoginUser saBaseClientLoginUser = clientLoginUserApi.getClientUserByEmail(phoneOrEmail); + if(ObjectUtil.isEmpty(saBaseClientLoginUser)) { + // C端邮箱无对应用户时策略 + return devConfigApi.getValueByKey(SNOWY_SYS_DEFAULT_STRATEGY_WHEN_NO_USER_WITH_EMAIL_FOR_C_KEY); + } else { + // 存在则允许登录 + return AuthStrategyWhenNoUserWithPhoneOrEmailEnum.ALLOW_LOGIN.getValue(); } } - // 执行校验手机或者邮箱验证码 - validValidCode(phoneOrEmail, validCode, validCodeReqNo); - // 返回空值 - return null; } } @@ -504,41 +508,53 @@ public class AuthServiceImpl implements AuthService { } // 根据手机号获取用户信息，根据B端或C端判断 if(SaClientTypeEnum.B.getValue().equals(type)) { - SaBaseLoginUser saBaseLoginUser = loginUserApi.getUserByPhone(phone); - if(ObjectUtil.isEmpty(saBaseLoginUser)) { - // 判断手机号无对应用户时的策略，如果为空则直接抛出异常 - if(ObjectUtil.isEmpty(strategyWhenNoUserWithPhoneOrEmail)) { + // 判断手机号无对应用户时的策略，如果为空则直接抛出异常 + if(ObjectUtil.isEmpty(strategyWhenNoUserWithPhoneOrEmail)) { + throw new CommonException("手机号码：{}不存在对应用户", phone); + } else { + // 如果不允许登录，则抛出异常 + if(AuthStrategyWhenNoUserWithPhoneOrEmailEnum.NOT_ALLOW_LOGIN.getValue().equals(strategyWhenNoUserWithPhoneOrEmail)) { throw new CommonException("手机号码：{}不存在对应用户", phone); } else { - // 如果不允许登录，则抛出异常 - if(AuthStrategyWhenNoUserWithPhoneOrEmailEnum.NOT_ALLOW_LOGIN.getValue().equals(strategyWhenNoUserWithPhoneOrEmail)) { - throw new CommonException("手机号码：{}不存在对应用户", phone); - } else { + // 定义B端用户 + SaBaseLoginUser saBaseLoginUser; + if(AuthStrategyWhenNoUserWithPhoneOrEmailEnum.ALLOW_LOGIN.getValue().equals(strategyWhenNoUserWithPhoneOrEmail)) { + // 允许登录，即用户存在 + saBaseLoginUser = loginUserApi.getUserByPhone(phone); + }else if(AuthStrategyWhenNoUserWithPhoneOrEmailEnum.AUTO_CREATE_USER.getValue().equals(strategyWhenNoUserWithPhoneOrEmail)) { // 根据手机号自动创建B端用户 saBaseLoginUser = loginUserApi.createUserWithPhone(phone); + } else { + throw new CommonException("不支持的手机号或邮箱无对应用户时策略类型：{}", strategyWhenNoUserWithPhoneOrEmail); } + // 执行B端登录 + return execLoginB(saBaseLoginUser, device); } } - // 执行B端登录 - return execLoginB(saBaseLoginUser, device); } else { - SaBaseClientLoginUser saBaseClientLoginUser = clientLoginUserApi.getClientUserByPhone(phone); - if(ObjectUtil.isEmpty(saBaseClientLoginUser)) { - // 判断手机号无对应用户时的策略，如果为空则直接抛出异常 - if(ObjectUtil.isEmpty(strategyWhenNoUserWithPhoneOrEmail)) { + // 判断手机号无对应用户时的策略，如果为空则直接抛出异常 + if(ObjectUtil.isEmpty(strategyWhenNoUserWithPhoneOrEmail)) { + throw new CommonException("手机号码：{}不存在对应用户", phone); + } else { + // 如果不允许登录，则抛出异常 + if(AuthStrategyWhenNoUserWithPhoneOrEmailEnum.NOT_ALLOW_LOGIN.getValue().equals(strategyWhenNoUserWithPhoneOrEmail)) { throw new CommonException("手机号码：{}不存在对应用户", phone); } else { - // 如果不允许登录，则抛出异常 - if(AuthStrategyWhenNoUserWithPhoneOrEmailEnum.NOT_ALLOW_LOGIN.getValue().equals(strategyWhenNoUserWithPhoneOrEmail)) { - throw new CommonException("手机号码：{}不存在对应用户", phone); - } else { - // 根据手机号自动创建C端用户 + // 定义C端用户 + SaBaseClientLoginUser saBaseClientLoginUser; + if(AuthStrategyWhenNoUserWithPhoneOrEmailEnum.ALLOW_LOGIN.getValue().equals(strategyWhenNoUserWithPhoneOrEmail)) { + // 允许登录，即用户存在 + saBaseClientLoginUser = clientLoginUserApi.getClientUserByPhone(phone); + }else if(AuthStrategyWhenNoUserWithPhoneOrEmailEnum.AUTO_CREATE_USER.getValue().equals(strategyWhenNoUserWithPhoneOrEmail)) { + // 根据手机号自动创建B端用户 saBaseClientLoginUser = clientLoginUserApi.createClientUserWithPhone(phone); + } else { + throw new CommonException("不支持的手机号或邮箱无对应用户时策略类型：{}", strategyWhenNoUserWithPhoneOrEmail); } + // 执行C端登录 + return execLoginC(saBaseClientLoginUser, device); } } - // 执行C端登录 - return execLoginC(saBaseClientLoginUser, device); } } @@ -562,41 +578,53 @@ public class AuthServiceImpl implements AuthService { } // 根据邮箱获取用户信息，根据B端或C端判断 if(SaClientTypeEnum.B.getValue().equals(type)) { - SaBaseLoginUser saBaseLoginUser = loginUserApi.getUserByEmail(email); - if(ObjectUtil.isEmpty(saBaseLoginUser)) { - // 判断邮箱无对应用户时的策略，如果为空则直接抛出异常 - if(ObjectUtil.isEmpty(strategyWhenNoUserWithPhoneOrEmail)) { + // 判断邮箱无对应用户时的策略，如果为空则直接抛出异常 + if(ObjectUtil.isEmpty(strategyWhenNoUserWithPhoneOrEmail)) { + throw new CommonException("邮箱：{}不存在对应用户", email); + } else { + // 如果不允许登录，则抛出异常 + if(AuthStrategyWhenNoUserWithPhoneOrEmailEnum.NOT_ALLOW_LOGIN.getValue().equals(strategyWhenNoUserWithPhoneOrEmail)) { throw new CommonException("邮箱：{}不存在对应用户", email); } else { - // 如果不允许登录，则抛出异常 - if(AuthStrategyWhenNoUserWithPhoneOrEmailEnum.NOT_ALLOW_LOGIN.getValue().equals(strategyWhenNoUserWithPhoneOrEmail)) { - throw new CommonException("邮箱：{}不存在对应用户", email); - } else { + // 定义B端用户 + SaBaseLoginUser saBaseLoginUser; + if(AuthStrategyWhenNoUserWithPhoneOrEmailEnum.ALLOW_LOGIN.getValue().equals(strategyWhenNoUserWithPhoneOrEmail)) { + // 允许登录，即用户存在 + saBaseLoginUser = loginUserApi.getUserByEmail(email); + }else if(AuthStrategyWhenNoUserWithPhoneOrEmailEnum.AUTO_CREATE_USER.getValue().equals(strategyWhenNoUserWithPhoneOrEmail)) { // 根据邮箱自动创建B端用户 saBaseLoginUser = loginUserApi.createUserWithEmail(email); + } else { + throw new CommonException("不支持的手机号或邮箱无对应用户时策略类型：{}", strategyWhenNoUserWithPhoneOrEmail); } + // 执行B端登录 + return execLoginB(saBaseLoginUser, device); } } - // 执行B端登录 - return execLoginB(saBaseLoginUser, device); } else { - SaBaseClientLoginUser saBaseClientLoginUser = clientLoginUserApi.getClientUserByEmail(email); - if(ObjectUtil.isEmpty(saBaseClientLoginUser)) { - // 判断邮箱无对应用户时的策略，如果为空则直接抛出异常 - if(ObjectUtil.isEmpty(strategyWhenNoUserWithPhoneOrEmail)) { + // 判断邮箱无对应用户时的策略，如果为空则直接抛出异常 + if(ObjectUtil.isEmpty(strategyWhenNoUserWithPhoneOrEmail)) { + throw new CommonException("邮箱：{}不存在对应用户", email); + } else { + // 如果不允许登录，则抛出异常 + if(AuthStrategyWhenNoUserWithPhoneOrEmailEnum.NOT_ALLOW_LOGIN.getValue().equals(strategyWhenNoUserWithPhoneOrEmail)) { throw new CommonException("邮箱：{}不存在对应用户", email); } else { - // 如果不允许登录，则抛出异常 - if(AuthStrategyWhenNoUserWithPhoneOrEmailEnum.NOT_ALLOW_LOGIN.getValue().equals(strategyWhenNoUserWithPhoneOrEmail)) { - throw new CommonException("邮箱：{}不存在对应用户", email); + // 定义C端用户 + SaBaseClientLoginUser saBaseClientLoginUser; + if(AuthStrategyWhenNoUserWithPhoneOrEmailEnum.ALLOW_LOGIN.getValue().equals(strategyWhenNoUserWithPhoneOrEmail)) { + // 允许登录，即用户存在 + saBaseClientLoginUser = clientLoginUserApi.getClientUserByEmail(email); + }else if(AuthStrategyWhenNoUserWithPhoneOrEmailEnum.AUTO_CREATE_USER.getValue().equals(strategyWhenNoUserWithPhoneOrEmail)) { + // 根据邮箱自动创建B端用户 + saBaseClientLoginUser = loginUserApi.createClientUserWithEmail(email); } else { - // 根据邮箱自动创建C端用户 - saBaseClientLoginUser = clientLoginUserApi.createClientUserWithEmail(email); + throw new CommonException("不支持的手机号或邮箱无对应用户时策略类型：{}", strategyWhenNoUserWithPhoneOrEmail); } + // 执行C端登录 + return execLoginC(saBaseClientLoginUser, device); } } - // 执行C端登录 - return execLoginC(saBaseClientLoginUser, device); } } @@ -924,9 +952,9 @@ public class AuthServiceImpl implements AuthService { String passwordDecrypt = CommonCryptogramUtil.doSm2Decrypt(password); // 根据账号获取用户信息，根据B端或C端判断 if(SaClientTypeEnum.B.getValue().equals(type)) { - clientLoginUserApi.doRegister(account, passwordDecrypt); - } else { loginUserApi.doRegister(account, passwordDecrypt); + } else { + clientLoginUserApi.doRegister(account, passwordDecrypt); } } diff --git a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/service/impl/BizOrgServiceImpl.java b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/service/impl/BizOrgServiceImpl.java index b31c8826..1449431a 100644 --- a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/service/impl/BizOrgServiceImpl.java +++ b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/service/impl/BizOrgServiceImpl.java @@ -48,10 +48,7 @@ import vip.xiaonuo.common.listener.CommonDataChangeEventCenter; import vip.xiaonuo.common.page.CommonPageRequest; import vip.xiaonuo.sys.api.SysRoleApi; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; /** @@ -117,7 +114,13 @@ public class BizOrgServiceImpl extends ServiceImpl impleme } else { return CollectionUtil.newArrayList(); } - List> treeNodeList = bizOrgSet.stream().map(bizOrg -> + // 先根据排序码排序 + List bizOrgArrayList = CollectionUtil.sort(bizOrgSet, Comparator.comparingInt(BizOrg::getSortCode)); + // 再重置排序码，解决每次相同排序码顺序不一致的问题 + for (int i = 0; i < bizOrgArrayList.size(); i++) { + bizOrgArrayList.get(i).setSortCode(i); + } + List> treeNodeList = bizOrgArrayList.stream().map(bizOrg -> new TreeNode<>(bizOrg.getId(), bizOrg.getParentId(), bizOrg.getName(), bizOrg.getSortCode()).setExtra(JSONUtil.parseObj(bizOrg))) .collect(Collectors.toList()); diff --git a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/push/util/DevPushWorkWechatUtil.java b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/push/util/DevPushWorkWechatUtil.java index 837c058d..723f2222 100644 --- a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/push/util/DevPushWorkWechatUtil.java +++ b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/push/util/DevPushWorkWechatUtil.java @@ -148,7 +148,7 @@ public class DevPushWorkWechatUtil { weTalkRequestArticle.setDescription(content); weTalkRequestArticle.setPicUrl(picUrl); weTalkRequestArticle.setUrl(messageUrl); - request.setArticleList(CollectionUtil.newArrayList()); + request.setArticleList(CollectionUtil.newArrayList(weTalkRequestArticle)); Response response = oaSender.sender(request, MessageType.WE_TALK_NEWS); if(!response.isSuccess()) { throw new CommonException("消息推送错误，返回内容：{}", JSONUtil.toJsonStr(response.getData())); diff --git a/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/impl/MobileMenuServiceImpl.java b/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/impl/MobileMenuServiceImpl.java index 131f18f8..0bcaf561 100644 --- a/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/impl/MobileMenuServiceImpl.java +++ b/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/impl/MobileMenuServiceImpl.java @@ -243,6 +243,11 @@ public class MobileMenuServiceImpl extends ServiceImpl leafMenuList = CollectionUtil.newArrayList(); + MobileMenu rootMobileMenu = new MobileMenu(); + rootMobileMenu.setId("0"); + rootMobileMenu.setParentId("-1"); + rootMobileMenu.setSortCode(-1); + mobileMenuList.add(rootMobileMenu); List> treeNodeList = mobileMenuList.stream().map(mobileMenu -> new TreeNode<>(mobileMenu.getId(), mobileMenu.getParentId(), mobileMenu.getTitle(), mobileMenu.getSortCode())).collect(Collectors.toList()); @@ -267,7 +272,7 @@ public class MobileMenuServiceImpl extends ServiceImpl JSONUtil.createObj().set("id", sysMenuItem.getId()).set("title", sysMenuItem.getTitle())) + .stream().map(tempMobileMenu -> JSONUtil.createObj().set("id", tempMobileMenu.getId()).set("title", tempMobileMenu.getTitle())) .collect(Collectors.toList())); leafMenuList.add(mobileRoleGrantResourceMenuResult); } diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserExtServiceImpl.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserExtServiceImpl.java index 1722c8e2..4f223d6e 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserExtServiceImpl.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserExtServiceImpl.java @@ -18,6 +18,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import vip.xiaonuo.sys.modular.user.entity.SysUserExt; +import vip.xiaonuo.sys.modular.user.enums.SysUserSourceFromTypeEnum; import vip.xiaonuo.sys.modular.user.mapper.SysUserExtMapper; import vip.xiaonuo.sys.modular.user.service.SysUserExtService; @@ -36,6 +37,7 @@ public class SysUserExtServiceImpl extends ServiceImpl Date: Thu, 15 May 2025 22:51:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=B0=E5=A2=9E=E8=B5=84=E6=BA=90=E6=97=B6?= =?UTF-8?q?code=E4=B8=BA=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resource/service/impl/MobileButtonServiceImpl.java | 5 ++++- .../modular/resource/service/impl/MobileMenuServiceImpl.java | 4 +++- .../resource/service/impl/MobileModuleServiceImpl.java | 4 +++- .../modular/resource/service/impl/SysButtonServiceImpl.java | 4 +++- .../modular/resource/service/impl/SysMenuServiceImpl.java | 4 +++- .../modular/resource/service/impl/SysModuleServiceImpl.java | 4 +++- 6 files changed, 19 insertions(+), 6 deletions(-) diff --git a/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/impl/MobileButtonServiceImpl.java b/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/impl/MobileButtonServiceImpl.java index df04dce3..6fe0f560 100644 --- a/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/impl/MobileButtonServiceImpl.java +++ b/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/impl/MobileButtonServiceImpl.java @@ -15,6 +15,7 @@ package vip.xiaonuo.mobile.modular.resource.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollStreamUtil; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -85,7 +86,9 @@ public class MobileButtonServiceImpl extends ServiceImpl impl throw new CommonException("module与上级菜单不一致"); } } - sysMenu.setCode(RandomUtil.randomString(10)); + if(ObjectUtil.isEmpty(sysMenu.getCode())) { + sysMenu.setCode(RandomUtil.randomString(10)); + } sysMenu.setCategory(SysResourceCategoryEnum.MENU.getValue()); this.save(sysMenu); diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/resource/service/impl/SysModuleServiceImpl.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/resource/service/impl/SysModuleServiceImpl.java index ad6b367c..afc4540a 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/resource/service/impl/SysModuleServiceImpl.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/resource/service/impl/SysModuleServiceImpl.java @@ -92,7 +92,9 @@ public class SysModuleServiceImpl extends ServiceImpl