1、start_springboot.sh后端添加权限系统url的域名解析服务器
2、审批意见接口,审批info字段为空不报错 3、修改防护对象、动态规则分页查询bug 4、告警信息处理新增对IsProtectObjectIPSrc的判断
This commit is contained in:
@@ -114,7 +114,7 @@ public class DynamicRuleController implements DynamicRuleControllerApi {
|
||||
@RequestParam(value = "template_name", required = false) String templateName,
|
||||
|
||||
@RequestParam(value = "page", defaultValue = "1") Integer page,
|
||||
@RequestParam(value = "page_size", defaultValue = "10") Integer pageSize) {
|
||||
@RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
|
||||
log.info("分页查询动态规则: {}:{}:{}:{}", dynamicRuleName, dynamicRuleId, page, pageSize);
|
||||
//调用service查询
|
||||
return ResponseResult.ok()
|
||||
@@ -194,7 +194,7 @@ public class DynamicRuleController implements DynamicRuleControllerApi {
|
||||
public ResponseResult updateAuditInfo(@PathVariable List<Integer> ids,
|
||||
@RequestBody Map<String, String> auditInfo) {
|
||||
if (auditInfo.get("auditInfo") == null || auditInfo.get("auditInfo").isEmpty()) {
|
||||
throw new IllegalArgumentException("auditInfo is empty");
|
||||
return ResponseResult.ok();
|
||||
}
|
||||
return ResponseResult.ok()
|
||||
.setData("success", dynamicRuleService.updateAuditInfo(ids, auditInfo.get("auditInfo")));
|
||||
|
||||
@@ -350,7 +350,7 @@ public interface DynamicRuleControllerApi {
|
||||
@Parameter(name = "protect_level", description = "保护级别", example = "1"),
|
||||
// @Parameter(name = "template_name", description = "模板名称", example = "test"),
|
||||
@Parameter(name = "page", description = "页码", example = "1"),
|
||||
@Parameter(name = "page_size", description = "每页大小", example = "10")
|
||||
@Parameter(name = "pageSize", description = "每页大小", example = "10")
|
||||
}
|
||||
)
|
||||
ResponseResult queryDynamicRuleObject(@RequestParam(value = "name", required = false) String dynamicRuleName,
|
||||
|
||||
@@ -241,7 +241,7 @@ public class StaticRuleController implements StaticRuleControllerApi {
|
||||
public ResponseResult updateAuditInfo(@PathVariable List<Integer> ids,
|
||||
@RequestBody Map<String, String> auditInfo) {
|
||||
if (auditInfo.get("auditInfo") == null || auditInfo.get("auditInfo").isEmpty()) {
|
||||
throw new IllegalArgumentException("auditInfo is empty");
|
||||
return ResponseResult.ok();
|
||||
}
|
||||
return ResponseResult.ok()
|
||||
.setData("success", staticRuleService.updateAuditInfo(ids, auditInfo.get("auditInfo")));
|
||||
|
||||
Reference in New Issue
Block a user