chenxudong
/
electromagnetic-data-new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

暂时去掉权限校验

This commit is contained in:
chenxudong 2025-01-07 14:38:43 +08:00
parent 4f826b7f84
commit 16f8f98b64
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/LoginInterceptor.java
View File

@ -28,20 +28,21 @@ public class LoginInterceptor implements HandlerInterceptor {
@Override @Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
// 首先校验token // 首先校验token
boolean isTokenValid = checkToken(request, response); boolean isTokenValid = checkToken(request, response);
if (!isTokenValid) { if (!isTokenValid) {
return false; return false;
} }
return checkSysAdminOperation(request); return checkSysAdminOperation(request, response);
} }
private boolean checkSysAdminOperation(HttpServletRequest request) { private boolean checkSysAdminOperation(HttpServletRequest request, HttpServletResponse response) {
String requestURI = request.getRequestURI(); // String requestURI = request.getRequestURI();
if (requestURI.startsWith("/data/ed/prj")) { // if (requestURI.startsWith("/data/ed/prj") && !UserThreadLocal.getAdminType().equals(AdminTypeEnum.SYSTEM.getValue())) {
return UserThreadLocal.getAdminType().equals(AdminTypeEnum.SYSTEM.getValue()); // log.warn("{}没有层级操作权限，当前用户类型是{}", UserThreadLocal.getUsername(), UserThreadLocal.getAdminType());
} // response.setStatus(HttpServletResponse.SC_FORBIDDEN);
// return false;
// }
return true; return true;
} }
@ -49,7 +50,7 @@ public class LoginInterceptor implements HandlerInterceptor {
String token = request.getHeader("Authorization"); String token = request.getHeader("Authorization");
if (token == null) { if (token == null) {
log.error("Authorization header is null"); log.error("Authorization header is null");
response.setStatus(401); response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
return false; return false;
} else { } else {
token = token.substring(7); token = token.substring(7);
@ -57,13 +58,13 @@ public class LoginInterceptor implements HandlerInterceptor {
boolean result = isTokenValid(token); boolean result = isTokenValid(token);
if (!result) { if (!result) {
log.error("Invalid token"); log.error("Invalid token");
response.setStatus(401); response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
return false; return false;
} else { } else {
Claims claims = TokenUtil.getLoginInfo(token); Claims claims = TokenUtil.getLoginInfo(token);
if (claims == null) { if (claims == null) {
log.error("User info is missing"); log.error("User info is missing");
response.setStatus(401); response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
return false; return false;
} else { } else {
UserLoginInfo userLoginInfo = new UserLoginInfo(); UserLoginInfo userLoginInfo = new UserLoginInfo();

2
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java
View File

@ -436,7 +436,7 @@ public class EdPrjServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileInfo>
List<EdFileInfo> edFileInfos = this.baseMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class).select(EdFileInfo::getFilePath) List<EdFileInfo> edFileInfos = this.baseMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class).select(EdFileInfo::getFilePath)
.eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code) .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code)
.eq(EdFileInfo::getPrjDir, true) .eq(EdFileInfo::getPrjDir, true)
.eq(EdFileInfo::getDataStatus, EleDataStatusEnum.NOT_PUBLISHED.code)); .eq(EdFileInfo::getDataStatus, EleDataStatusEnum.NOT_PUBLISHED.code).or().eq(EdFileInfo::getDataStatus, EleDataStatusEnum.DELETED.code));
Set<String> unpublishFiles = new HashSet<>(); Set<String> unpublishFiles = new HashSet<>();
for (EdFileInfo edFileInfo : edFileInfos) { for (EdFileInfo edFileInfo : edFileInfos) {
String filePath = edFileInfo.getFilePath(); String filePath = edFileInfo.getFilePath();