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

1、删除上次的提交更改

Browse Source
This commit is contained in:
PushM
2024-04-29 23:54:04 +08:00
parent 0b6174da96
commit 4d34098c5c
4 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docker-springboot/Dockerfile
View File

@@ -11,8 +11,7 @@ COPY realtime_protection realtime_protection
# DORIS_URL="10.58.72.135:9030"\ # DORIS_URL="10.58.72.135:9030"\
# KAFKA_SERVERS="10.58.72.125:9092,10.58.72.126:9092,10.58.72.127:9092,10.58.72.128:9092,10.58.72.129:9092,\ # KAFKA_SERVERS="10.58.72.125:9092,10.58.72.126:9092,10.58.72.127:9092,10.58.72.128:9092,10.58.72.129:9092,\
# 10.58.72.130:9092,10.58.72.131:9092,10.58.72.132:9092,10.58.72.133:9092,10.58.72.134:9092" # 10.58.72.130:9092,10.58.72.131:9092,10.58.72.132:9092,10.58.72.133:9092,10.58.72.134:9092"
# C3_PZFF_HOST="10.58.72.151:8088"\
# SSO_HOST='https://passport.iam.pub'
ENV MYSQL_USERNAME="root" \ ENV MYSQL_USERNAME="root" \
MYSQL_PASSWD="aiihhbfcsy123!@#" \ MYSQL_PASSWD="aiihhbfcsy123!@#" \
@@ -21,8 +20,7 @@ ENV MYSQL_USERNAME="root" \
DORIS_PASSWD="" \ DORIS_PASSWD="" \
DORIS_URL="10.26.22.133:9030"\ DORIS_URL="10.26.22.133:9030"\
KAFKA_SERVERS="172.29.128.1:9092"\ KAFKA_SERVERS="172.29.128.1:9092"\
C3_PZFF_HOST="192.168.107.49:8088"\
SSO_HOST='114.243.134.122:9217'
EXPOSE 8081 EXPOSE 8081

7
src/main/java/com/realtime/protection/server/task/status/StateHandler.java
View File

@@ -20,11 +20,10 @@ import java.util.concurrent.atomic.AtomicReference;
public class StateHandler { public class StateHandler {
@Value("${c3.pzff.host}")
private String c3_pzff;
private final WebClient client = WebClient.builder() private final WebClient client = WebClient.builder()
// .baseUrl("http://192.168.107.49:8088") .baseUrl("http://192.168.107.49:8088")
.baseUrl("http://"+c3_pzff) // .baseUrl("http://10.58.72.151:8088")
.build(); .build();
protected Boolean handleStart(TaskService taskService, CommandService commandService, Long taskId) { protected Boolean handleStart(TaskService taskService, CommandService commandService, Long taskId) {

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

@@ -28,9 +28,6 @@ public class LoginService {
private final LoginMapper loginMapper; private final LoginMapper loginMapper;
@Value("${sso.host}")
private String HostSSO;
public LoginService(LoginMapper loginMapper) { public LoginService(LoginMapper loginMapper) {
this.loginMapper = loginMapper; this.loginMapper = loginMapper;
} }
@@ -54,7 +51,8 @@ public class LoginService {
ObjectMapper objectMapper = new ObjectMapper(); ObjectMapper objectMapper = new ObjectMapper();
OkHttpClient client = new OkHttpClient(); OkHttpClient client = new OkHttpClient();
Request request = new Request.Builder() Request request = new Request.Builder()
.url("http://" + HostSSO + "/passport/accessToken?grant_type=client_credentials") .url("http://114.243.134.122:9217/passport/accessToken?grant_type=client_credentials")
// .url("https://passport.iam.pub/passport/accessToken?grant_type=client_credentials")
.header("Authorization", "Basic TlNBRERAWlguT1JHOk14a1hHZ1ltOUNROUE3TCRSOCNLRW02R1pSeEhwd1c2") .header("Authorization", "Basic TlNBRERAWlguT1JHOk14a1hHZ1ltOUNROUE3TCRSOCNLRW02R1pSeEhwd1c2")
.post(okhttp3.internal.Util.EMPTY_REQUEST) .post(okhttp3.internal.Util.EMPTY_REQUEST)
.build(); .build();
@@ -78,7 +76,9 @@ public class LoginService {
RequestBody body = new MultipartBody.Builder().setType(MultipartBody.FORM) RequestBody body = new MultipartBody.Builder().setType(MultipartBody.FORM)
.addFormDataPart("sessionData", sessionData).build(); .addFormDataPart("sessionData", sessionData).build();
request = new Request.Builder() request = new Request.Builder()
.url("http://" + HostSSO + "/passport/accessApplication") .url("http://114.243.134.122:9217/passport/accessApplication")
// .url("https://passport.iam.pub/passport/accessToken?grant_type=client_credentials")
.header("Authorization", "Bearer " + accessToken) .header("Authorization", "Bearer " + accessToken)
.header("Content-Type", "application/x-www-form-urlencoded") .header("Content-Type", "application/x-www-form-urlencoded")
.post(body) .post(body)

7
src/main/resources/config/application-test.yml
View File

@@ -131,10 +131,3 @@ management:
endpoint: endpoint:
shutdown: shutdown:
enabled: true enabled: true
c3:
pzff:
host: ${C3_PZFF_HOST}
sso:
host: ${SSO_HOST}