haozq
/
jjsp_service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: haozq:a5497f9b2afd22ab0f32d0bde27e1f6ff9e2b6e9
Branches Tags
haozq:main
...
compare: haozq:c8b2c81cd9b5b2ede4e1bf9cb2a1ceb1d147388f
Branches Tags
haozq:main

4 Commits
a5497f9b2a ... c8b2c81cd9

Author SHA1 Message Date
haozq c8b2c81cd9 Merge remote-tracking branch 'origin/main' 2024-12-19 13:35:47 +08:00
haozq e637af8970 图片拦截修改 2024-12-19 13:35:20 +08:00
haozq 71104dd12c Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/AdmittedPersonController.java
#	securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/ResourceMonitorController.java
 2024-12-19 11:29:26 +08:00
haozq b1befdc223 注解修改 2024-12-19 11:28:56 +08:00
7 changed files with 34 additions and 6 deletions
Show Stats Expand all files Collapse all files

10
securityControl-common/securityControl-common-security/src/main/java/com/securityControl/common/security/interceptor/ParamSecureHandler.java
View File

@ -65,7 +65,8 @@ public class ParamSecureHandler implements AsyncHandlerInterceptor {
* 越权 放权的请求 指定的前缀 -公共的请求+数据接口
*/
public static String[] WHITE_URL=new String[]{"/sys/selected/","/dataCenter/inter/","/back/verify/"};
//图片默认放权
public final static String images="JPG,PNG,JPEG,";
/**
* 越权白名单路径->指定的路径
*/
@ -144,6 +145,13 @@ public class ParamSecureHandler implements AsyncHandlerInterceptor {
*/
private boolean checkIsYq(HttpServletRequest request) throws Exception {
String requestUri = request.getRequestURI();
if(requestUri.contains(".")){
String imageType=requestUri.substring(requestUri.lastIndexOf(".")+1).toUpperCase();
if (images.contains(imageType)){
return true;
}
}
if(Arrays.asList(WHITE_URLS).contains(requestUri)){
return true;
}

12
securityControl-gateway/src/main/java/com/securityControl/gateway/filter/ResponseEncryptFilter.java
View File

@ -49,6 +49,8 @@ public class ResponseEncryptFilter implements GlobalFilter, Ordered {
*/
public final static String KEY_HEAD="decrypt";
public final static String images="JPG,PNG,JPEG,";
/**忽略加密的参数的请求*/
public static List<String> ignoreUrls = new ArrayList<>();
@ -61,8 +63,16 @@ public class ResponseEncryptFilter implements GlobalFilter, Ordered {
log.info("============================ResponseEncryptFilter start===================================");
ServerHttpRequest request = exchange.getRequest();
URI uri = request.getURI();
String reqPath = request.getURI().getPath();
if(reqPath.contains(".")){
String imageType=reqPath.substring(reqPath.lastIndexOf(".")+1).toUpperCase();
if (images.contains(imageType)){
return chain.filter(exchange);
}
}
boolean sf = ignoreUrls.contains(reqPath);
if(sf){
return chain.filter(exchange);

2
securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/config/ResourcesConfigAdapter.java
View File

@ -11,7 +11,7 @@ public class ResourcesConfigAdapter extends WebMvcConfigurerAdapter {
// registry.addResourceHandler("/files/**").addResourceLocations("file:/data/ahsbs/file/");
// super.addResourceHandlers(registry);
registry.addResourceHandler("/files/**").addResourceLocations("file:D:\\file\\");
registry.addResourceHandler("/files/**").addResourceLocations("file:F:\\File\\");
super.addResourceHandlers(registry);
}

6
securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/DailyDutyReportController.java
View File

@ -3,7 +3,9 @@ package com.sercurityControl.proteam.dutyTask.controller;
import com.securityControl.common.core.utils.StringUtils;
import com.securityControl.common.core.web.domain.AjaxResult;
import com.securityControl.common.log.annotation.Log;
import com.securityControl.common.log.annotation.SysLog;
import com.securityControl.common.log.enums.BusinessType;
import com.securityControl.common.log.enums.OperaType;
import com.securityControl.common.log.enums.OperationType;
import com.sercurityControl.proteam.dutyTask.service.DailyDutyReportService;
import com.sercurityControl.proteam.util.FileToBase64;
@ -58,7 +60,7 @@ public class DailyDutyReportController {
* @date 2022-12-23 9:56
*/
@PostMapping("getDailyData")
@Log(title = "值班日报", menu = "值班任务->值班日报", businessType = BusinessType.QUERY, details = "值班日报列表")
@SysLog(title = "值班日报", model = "值班任务->值班日报", operaType = OperaType.QUERY, details = "值班日报列表")
public AjaxResult getDailyData(String currentDay) {
Map<String, Object> map = new HashMap<>(16);
try {
@ -90,7 +92,7 @@ public class DailyDutyReportController {
}
@GetMapping("downloadDaily")
@Log(title = "值班日报", menu = "值班任务->值班日报", businessType = BusinessType.EXPORT, details = "值班日报导出", grade = OperationType.EXPORT_BUSINESS)
@SysLog(title = "值班日报", model = "值班任务->值班日报", operaType = OperaType.EXPORT, details = "值班日报导出")
public void downloadDaily(HttpServletRequest request, HttpServletResponse response, String currentDay, String chineseDate) {
Map<String, Object> map = new HashMap<>(16);
Map<String, Object> data = new HashMap<>(16);

3
securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/HistoryController.java
View File

@ -1,6 +1,8 @@
package com.sercurityControl.proteam.dutyTask.controller;
import com.securityControl.common.core.web.domain.AjaxResult;
import com.securityControl.common.log.annotation.SysLog;
import com.securityControl.common.log.enums.OperaType;
import com.sercurityControl.proteam.dutyTask.domain.HistoryDto;
import com.sercurityControl.proteam.dutyTask.service.HistoryService;
import lombok.extern.slf4j.Slf4j;
@ -29,6 +31,7 @@ public class HistoryController {
* @date 2024/1/25 15:28
*/
@PostMapping("getHistoryByDateType")
@SysLog(title = "综合展示", model = "综合展示->综合展示", operaType = OperaType.EXPORT, details = "历史记录查询")
public AjaxResult getHistoryByDateType(HistoryDto dto) {
return service.getHistoryByDateType(dto);
}

3
securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/TicketController.java
View File

@ -1,6 +1,8 @@
package com.sercurityControl.proteam.dutyTask.controller;
import com.securityControl.common.core.web.domain.AjaxResult;
import com.securityControl.common.log.annotation.SysLog;
import com.securityControl.common.log.enums.OperaType;
import com.sercurityControl.proteam.dutyTask.domain.TicketInfoVo;
import com.sercurityControl.proteam.dutyTask.service.TicketService;
import lombok.extern.slf4j.Slf4j;
@ -34,6 +36,7 @@ public class TicketController {
* @date 2024/12/2 14:07
*/
@PostMapping("getTicketInfo")
@SysLog(title = "作业票管理", model = "告警记录->作业票管理", operaType = OperaType.EXPORT, details = "作业票管理记录查询")
public AjaxResult getTicketInfo(TicketInfoVo vo){
return service.getTicketInfo(vo);
}

4
securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/controller/DailyReportController.java
View File

@ -3,7 +3,9 @@ package com.sercurityControl.proteam.supplement.controller;
import com.securityControl.common.core.utils.StringUtils;
import com.securityControl.common.core.web.domain.AjaxResult;
import com.securityControl.common.log.annotation.Log;
import com.securityControl.common.log.annotation.SysLog;
import com.securityControl.common.log.enums.BusinessType;
import com.securityControl.common.log.enums.OperaType;
import com.securityControl.common.log.enums.OperationType;
import com.sercurityControl.proteam.dutyTask.domain.*;
import com.sercurityControl.proteam.dutyTask.service.DayPaperService;
@ -44,7 +46,7 @@ public class DailyReportController {
private DayPaperService dayPaperService;
@GetMapping("downloadDaily")
@Log(title = "值班日报", menu = "值班任务->值班日报", businessType = BusinessType.EXPORT, details = "值班日报导出", grade = OperationType.EXPORT_BUSINESS)
@SysLog(title = "值班任务", model = "值班任务->值班日报", operaType = OperaType.EXPORT, details = "值班日报导出")
public void downloadDaily(HttpServletRequest request, HttpServletResponse response, String currentDay, String chineseDate) {
download(request, response, currentDay, chineseDate);
}