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

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)