java_project
/
logisticsplatform
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

⚡ SecureUtil部分API替换为AuthUtil

test
smallchill 5 years ago
parent
fa382bfdbd
commit
f744d33bb4
8 changed files with 17 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/OssBuilder.java
  2. 4
      blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/sms/SmsBuilder.java
  3. 6
      blade-service-api/blade-scope-api/src/main/java/org/springblade/system/handler/ApiScopePermissionHandler.java
  4. 4
      blade-service/blade-desk/src/main/java/org/springblade/desk/service/impl/LeaveServiceImpl.java
  5. 4
      blade-service/blade-desk/src/main/java/org/springblade/desk/service/impl/NoticeServiceImpl.java
  6. 6
      blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java
  7. 4
      blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RoleServiceImpl.java
  8. 3
      blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

4
blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/OssBuilder.java
Unescape View File

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

4
blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/sms/SmsBuilder.java
Unescape View File

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

6
blade-service-api/blade-scope-api/src/main/java/org/springblade/system/handler/ApiScopePermissionHandler.java
Unescape View File

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

4
blade-service/blade-desk/src/main/java/org/springblade/desk/service/impl/LeaveServiceImpl.java
Unescape View File

@ -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<LeaveMapper, ProcessLeave>
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<BladeFlow> result = flowClient.startProcessInstanceById(leave.getProcessDefinitionId(), FlowUtil.getBusinessKey(businessTable, String.valueOf(leave.getId())), variables);

4
blade-service/blade-desk/src/main/java/org/springblade/desk/service/impl/NoticeServiceImpl.java
Unescape View File

@ -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<NoticeMapper, Notice> imp
@Override
public IPage<NoticeVO> selectNoticePage(IPage<NoticeVO> page, NoticeVO notice) {
// 若不使用mybatis-plus自带的分页方法，则不会自动带入tenantId，所以我们需要自行注入
notice.setTenantId(SecureUtil.getTenantId());
notice.setTenantId(AuthUtil.getTenantId());
return page.setRecords(baseMapper.selectNoticePage(page, notice));
}

6
blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java
Unescape View File

@ -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<MenuMapper, Menu> implements IM
return null;
}
List<Menu> allMenus = baseMapper.allMenu();
List<Menu> roleMenus = (SecureUtil.isAdministrator() && Func.isEmpty(topMenuId)) ? allMenus : baseMapper.roleMenu(Func.toLongList(roleId), topMenuId);
List<Menu> 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<MenuMapper, Menu> implements IM
@Override
public List<MenuVO> buttons(String roleId) {
List<Menu> buttons = (SecureUtil.isAdministrator()) ? baseMapper.allButtons() : baseMapper.buttons(Func.toLongList(roleId));
List<Menu> buttons = (AuthUtil.isAdministrator()) ? baseMapper.allButtons() : baseMapper.buttons(Func.toLongList(roleId));
MenuWrapper menuWrapper = new MenuWrapper();
return menuWrapper.listNodeVO(buttons);
}

4
blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RoleServiceImpl.java
Unescape View File

@ -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<RoleMapper, Role> implements IR
@Override
public List<RoleVO> 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;

3
blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
Unescape View File

@ -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<UserMapper, User> 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));

Write Preview
Loading…
Cancel
Save