gfwleak/enderbyendera-realtime-protection
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、task分页查询bugfix

Browse Source 
2、新增审批人属性
3、loginservice修改权限系统url

(cherry picked from commit e943a787d4)
This commit is contained in:
PushM
2024-05-09 21:58:05 +08:00
parent 8cc0af06a1
commit 8c79cf3e25
11 changed files with 85 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/realtime/protection/configuration/entity/defense/object/ProtectObject.java
View File

@@ -78,4 +78,14 @@ public class ProtectObject {
@ExcelIgnore
@Schema(description = "防护对象创建人ID", example = "0")
private Integer protectObjectCreateUserId;
@JsonProperty("audit_user_name")
@Schema(description = "审核用户名称", example = "user11")
private String auditUserName;
@JsonProperty("audit_user_id")
@Schema(description = "审核用户id", example = "11111")
private String auditUserId;
@JsonProperty("audit_user_depart")
@Schema(description = "审核用户部门", example = "部门1")
private String auditUserDepart;
}

10
src/main/java/com/realtime/protection/configuration/entity/defense/template/Template.java
View File

@@ -81,6 +81,16 @@ public class Template {
@Schema(description = "策略模板展示id", accessMode = Schema.AccessMode.READ_ONLY)
private String templateDisplayId;
@JsonProperty("audit_user_name")
@Schema(description = "审核用户名称", example = "user11")
private String auditUserName;
@JsonProperty("audit_user_id")
@Schema(description = "审核用户id", example = "11111")
private String auditUserId;
@JsonProperty("audit_user_depart")
@Schema(description = "审核用户部门", example = "部门1")
private String auditUserDepart;
/**
* 设置是否含有日常/应急/紧急防护等级态字段的字段

10
src/main/java/com/realtime/protection/configuration/entity/rule/dynamicrule/DynamicRuleObject.java
View File

@@ -106,6 +106,16 @@ public class DynamicRuleObject {
@Schema(description = "动态规则审核状态（0为未审核，1为已退回，2为审核通过）", example = "2", accessMode = Schema.AccessMode.READ_ONLY)
private Integer auditStatus;
@JsonProperty("audit_user_name")
@Schema(description = "审核用户名称", example = "user11")
private String auditUserName;
@JsonProperty("audit_user_id")
@Schema(description = "审核用户id", example = "11111")
private String auditUserId;
@JsonProperty("audit_user_depart")
@Schema(description = "审核用户部门", example = "部门1")
private String auditUserDepart;
public void checkAuditStatusValidate(AuditStatusEnum newAuditStatus) {
if (!List.of(AuditStatusEnum.AUDITED.getNum(), AuditStatusEnum.USING.getNum()).contains(this.getAuditStatus())) {
throw new IllegalArgumentException("规则《" + this.getDynamicRuleName() + "》原审批状态非法");

11
src/main/java/com/realtime/protection/configuration/entity/rule/staticrule/StaticRuleObject.java
View File

@@ -150,6 +150,17 @@ public class StaticRuleObject {
@Schema(description = "频率，最低为1", example = "1", requiredMode = Schema.RequiredMode.REQUIRED)
private Integer staticRuleFrequency;
@JsonProperty("audit_user_name")
@Schema(description = "审核用户名称", example = "user11")
private String auditUserName;
@JsonProperty("audit_user_id")
@Schema(description = "审核用户id", example = "11111")
private String auditUserId;
@JsonProperty("audit_user_depart")
@Schema(description = "审核用户部门", example = "部门1")
private String auditUserDepart;
public void checkAuditStatusValidate(AuditStatusEnum newAuditStatus) {
if (!List.of(AuditStatusEnum.AUDITED.getNum(), AuditStatusEnum.USING.getNum()).contains(this.getAuditStatus())) {
throw new IllegalArgumentException("规则《" + this.getStaticRuleName() + "》原审批状态非法");

10
src/main/java/com/realtime/protection/configuration/entity/task/Task.java
View File

@@ -91,4 +91,14 @@ public class Task {
@NotNull(message = "task_range字段不能为空。")
@Schema(description = "局点范围，由规则移动到任务", example = "1009")
private String taskRange;
@JsonProperty("audit_user_name")
@Schema(description = "审核用户名称", example = "user11")
private String auditUserName;
@JsonProperty("audit_user_id")
@Schema(description = "审核用户id", example = "11111")
private String auditUserId;
@JsonProperty("audit_user_depart")
@Schema(description = "审核用户部门", example = "部门1")
private String auditUserDepart;
}

10
src/main/java/com/realtime/protection/configuration/entity/whitelist/WhiteListObject.java
View File

@@ -78,4 +78,14 @@ public class WhiteListObject {
@Schema(description = "白名单对象创建人部门")
private String createUserDepartment;
@JsonProperty("audit_user_name")
@Schema(description = "审核用户名称", example = "user11")
private String auditUserName;
@JsonProperty("audit_user_id")
@Schema(description = "审核用户id", example = "11111")
private String auditUserId;
@JsonProperty("audit_user_depart")
@Schema(description = "审核用户部门", example = "部门1")
private String auditUserDepart;
}

1
src/main/java/com/realtime/protection/server/task/TaskService.java
View File

@@ -229,6 +229,7 @@ public class TaskService {
if (task == null) {
continue;
}
task.setStaticRuleIds(taskMapper.queryStaticRuleIdsFromTaskId(task.getTaskId(),
List.of(AuditStatusEnum.AUDITED.getNum(), AuditStatusEnum.USING.getNum())));
task.setDynamicRuleIds(taskMapper.queryDynamicRuleIdsFromTaskId(task.getTaskId(),

4
src/main/java/com/realtime/protection/server/user/login/LoginService.java
View File

@@ -51,7 +51,7 @@ public class LoginService {
ObjectMapper objectMapper = new ObjectMapper();
OkHttpClient client = new OkHttpClient();
Request request = new Request.Builder()
.url("http://114.243.134.122:9217/passport/accessToken?grant_type=client_credentials")
.url("https://114.243.134.122:10217/passport/accessToken?grant_type=client_credentials")
// .url("https://passport.iam.pub/passport/accessToken?grant_type=client_credentials")
.header("Authorization", "Basic TlNBRERAWlguT1JHOk14a1hHZ1ltOUNROUE3TCRSOCNLRW02R1pSeEhwd1c2")
.post(okhttp3.internal.Util.EMPTY_REQUEST)
@@ -76,7 +76,7 @@ public class LoginService {
RequestBody body = new MultipartBody.Builder().setType(MultipartBody.FORM)
.addFormDataPart("sessionData", sessionData).build();
request = new Request.Builder()
.url("http://114.243.134.122:9217/passport/accessApplication")
.url("https://114.243.134.122:10217/passport/accessApplication")
// .url("https://passport.iam.pub/passport/accessToken?grant_type=client_credentials")
.header("Authorization", "Bearer " + accessToken)