zeaslity/ProjectOctopus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[AGENT][INIT] 修复Agent启动的Bug

Browse Source
This commit is contained in:
zeaslity
2023-03-02 10:26:40 +08:00
parent c28b5e43f5
commit a958b67cfd
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/main/java/io/wdd/func/xray/persisit/XrayDBOperator.java
View File

@@ -64,10 +64,10 @@ public class XrayDBOperator {
.stream() .stream()
.map( .map(
serverInfoVO -> { serverInfoVO -> {
// 这里应该是 "Paripark Seoul KR" // 这里应该是 "Paripark Seoul KR" 此种异常应该手动修正
String serverCity = serverInfoVO String serverCity = serverInfoVO
.getLocation() .getLocation()
.split(" ")[1]; .split(" ")[0];
int cityBitMapBase = ALL_SERVER_CITY_INDEX.get(serverCity) * 10; int cityBitMapBase = ALL_SERVER_CITY_INDEX.get(serverCity) * 10;
int serverGraphNum = cityBitMapBase; int serverGraphNum = cityBitMapBase;
for (int index = cityBitMapBase; index < cityBitMapBase + 10; index++) { for (int index = cityBitMapBase; index < cityBitMapBase + 10; index++) {

2
source/src/main/java/io/wdd/source/shell/lib/wdd-lib-env.sh
View File

@@ -320,7 +320,7 @@ else
machineNumber=99 machineNumber=99
fi fi
cat >/etc/environment.d/octopus-agent.conf <<EOF cat >/etc/environment.d/octopus-agent.conf <<EOF
serverName=${region}-${hostArch}-${machineNumber} serverName=${city}-${hostArch}-${machineNumber}
serverIpPbV4=$public_ipv4 serverIpPbV4=$public_ipv4
serverIpInV4= serverIpInV4=
serverIpPbV6=$public_ipv6 serverIpPbV6=$public_ipv6