diff --git a/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/OssBuilder.java b/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/OssBuilder.java index 4b476f4e..cb23bac2 100644 --- a/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/OssBuilder.java +++ b/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/OssBuilder.java @@ -26,7 +26,7 @@ import org.springblade.core.oss.enums.OssStatusEnum; import org.springblade.core.oss.props.OssProperties; import org.springblade.core.oss.rule.BladeOssRule; import org.springblade.core.oss.rule.OssRule; -import org.springblade.core.secure.utils.SecureUtil; +import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.StringPool; import org.springblade.core.tool.utils.StringUtil; @@ -83,7 +83,7 @@ public class OssBuilder { * @return OssTemplate */ public OssTemplate template(String code) { - String tenantId = SecureUtil.getTenantId(); + String tenantId = AuthUtil.getTenantId(); Oss oss = getOss(tenantId, code); Oss ossCached = ossPool.get(tenantId); OssTemplate template = templatePool.get(tenantId); diff --git a/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/sms/SmsBuilder.java b/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/sms/SmsBuilder.java index d1904378..5bf665e8 100644 --- a/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/sms/SmsBuilder.java +++ b/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/sms/SmsBuilder.java @@ -21,7 +21,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import org.springblade.core.cache.utils.CacheUtil; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.redis.cache.BladeRedis; -import org.springblade.core.secure.utils.SecureUtil; +import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.sms.SmsTemplate; import org.springblade.core.sms.enums.SmsEnum; import org.springblade.core.sms.enums.SmsStatusEnum; @@ -86,7 +86,7 @@ public class SmsBuilder { * @return SmsTemplate */ public SmsTemplate template(String code) { - String tenantId = SecureUtil.getTenantId(); + String tenantId = AuthUtil.getTenantId(); Sms sms = getSms(tenantId, code); Sms smsCached = smsPool.get(tenantId); SmsTemplate template = templatePool.get(tenantId); diff --git a/blade-service-api/blade-scope-api/src/main/java/org/springblade/system/handler/ApiScopePermissionHandler.java b/blade-service-api/blade-scope-api/src/main/java/org/springblade/system/handler/ApiScopePermissionHandler.java index 7a3bcfc1..8af507de 100644 --- a/blade-service-api/blade-scope-api/src/main/java/org/springblade/system/handler/ApiScopePermissionHandler.java +++ b/blade-service-api/blade-scope-api/src/main/java/org/springblade/system/handler/ApiScopePermissionHandler.java @@ -18,7 +18,7 @@ package org.springblade.system.handler; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.handler.IPermissionHandler; -import org.springblade.core.secure.utils.SecureUtil; +import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.utils.WebUtil; import javax.servlet.http.HttpServletRequest; @@ -37,7 +37,7 @@ public class ApiScopePermissionHandler implements IPermissionHandler { @Override public boolean permissionAll() { HttpServletRequest request = WebUtil.getRequest(); - BladeUser user = SecureUtil.getUser(); + BladeUser user = AuthUtil.getUser(); if (request == null || user == null) { return false; } @@ -52,7 +52,7 @@ public class ApiScopePermissionHandler implements IPermissionHandler { @Override public boolean hasPermission(String permission) { HttpServletRequest request = WebUtil.getRequest(); - BladeUser user = SecureUtil.getUser(); + BladeUser user = AuthUtil.getUser(); if (request == null || user == null) { return false; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/service/impl/LeaveServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/service/impl/LeaveServiceImpl.java index 73e7ec19..25b36a31 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/service/impl/LeaveServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/service/impl/LeaveServiceImpl.java @@ -20,7 +20,7 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; -import org.springblade.core.secure.utils.SecureUtil; +import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.support.Kv; import org.springblade.core.tool.utils.DateUtil; @@ -59,7 +59,7 @@ public class LeaveServiceImpl extends BaseServiceImpl save(leave); // 启动流程 Kv variables = Kv.create() - .set(ProcessConstant.TASK_VARIABLE_CREATE_USER, SecureUtil.getUserName()) + .set(ProcessConstant.TASK_VARIABLE_CREATE_USER, AuthUtil.getUserName()) .set("taskUser", TaskUtil.getTaskUser(leave.getTaskUser())) .set("days", DateUtil.between(leave.getStartTime(), leave.getEndTime()).toDays()); R result = flowClient.startProcessInstanceById(leave.getProcessDefinitionId(), FlowUtil.getBusinessKey(businessTable, String.valueOf(leave.getId())), variables); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/service/impl/NoticeServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/service/impl/NoticeServiceImpl.java index da1cfa41..685c597d 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/service/impl/NoticeServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/service/impl/NoticeServiceImpl.java @@ -18,7 +18,7 @@ package org.springblade.desk.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseServiceImpl; -import org.springblade.core.secure.utils.SecureUtil; +import org.springblade.core.secure.utils.AuthUtil; import org.springblade.desk.entity.Notice; import org.springblade.desk.mapper.NoticeMapper; import org.springblade.desk.service.INoticeService; @@ -36,7 +36,7 @@ public class NoticeServiceImpl extends BaseServiceImpl imp @Override public IPage selectNoticePage(IPage page, NoticeVO notice) { // 若不使用mybatis-plus自带的分页方法，则不会自动带入tenantId，所以我们需要自行注入 - notice.setTenantId(SecureUtil.getTenantId()); + notice.setTenantId(AuthUtil.getTenantId()); return page.setRecords(baseMapper.selectNoticePage(page, notice)); } diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java index 46faf07a..912ceeb2 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java @@ -21,7 +21,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.AllArgsConstructor; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.secure.BladeUser; -import org.springblade.core.secure.utils.SecureUtil; +import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.constant.BladeConstant; import org.springblade.core.tool.node.ForestNodeMerger; import org.springblade.core.tool.support.Kv; @@ -85,7 +85,7 @@ public class MenuServiceImpl extends ServiceImpl implements IM return null; } List allMenus = baseMapper.allMenu(); - List roleMenus = (SecureUtil.isAdministrator() && Func.isEmpty(topMenuId)) ? allMenus : baseMapper.roleMenu(Func.toLongList(roleId), topMenuId); + List roleMenus = (AuthUtil.isAdministrator() && Func.isEmpty(topMenuId)) ? allMenus : baseMapper.roleMenu(Func.toLongList(roleId), topMenuId); return buildRoutes(allMenus, roleMenus); } @@ -108,7 +108,7 @@ public class MenuServiceImpl extends ServiceImpl implements IM @Override public List buttons(String roleId) { - List buttons = (SecureUtil.isAdministrator()) ? baseMapper.allButtons() : baseMapper.buttons(Func.toLongList(roleId)); + List buttons = (AuthUtil.isAdministrator()) ? baseMapper.allButtons() : baseMapper.buttons(Func.toLongList(roleId)); MenuWrapper menuWrapper = new MenuWrapper(); return menuWrapper.listNodeVO(buttons); } diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RoleServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RoleServiceImpl.java index 6b1d7f6c..9f7296b6 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RoleServiceImpl.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RoleServiceImpl.java @@ -22,7 +22,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.AllArgsConstructor; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.secure.utils.AuthUtil; -import org.springblade.core.secure.utils.SecureUtil; +import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.constant.BladeConstant; import org.springblade.core.tool.constant.RoleConstant; import org.springblade.core.tool.node.ForestNodeMerger; @@ -68,7 +68,7 @@ public class RoleServiceImpl extends ServiceImpl implements IR @Override public List tree(String tenantId) { - String userRole = SecureUtil.getUserRole(); + String userRole = AuthUtil.getUserRole(); String excludeRole = null; if (!CollectionUtil.contains(Func.toStrArray(userRole), RoleConstant.ADMIN) && !CollectionUtil.contains(Func.toStrArray(userRole), RoleConstant.ADMINISTRATOR)) { excludeRole = RoleConstant.ADMINISTRATOR; diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java index 9c971465..641c2897 100644 --- a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java +++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java @@ -25,7 +25,6 @@ import org.springblade.common.constant.CommonConstant; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.secure.utils.AuthUtil; -import org.springblade.core.secure.utils.SecureUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.constant.BladeConstant; import org.springblade.core.tool.utils.*; @@ -177,7 +176,7 @@ public class UserServiceImpl extends BaseServiceImpl implement @Override public boolean removeUser(String userIds) { - if (Func.contains(Func.toLongArray(userIds), SecureUtil.getUserId())) { + if (Func.contains(Func.toLongArray(userIds), AuthUtil.getUserId())) { throw new ServiceException("不能删除本账号!"); } return deleteLogic(Func.toLongList(userIds));