From a958b67cfd49229e9c399ba139e0b9d14ebd151f Mon Sep 17 00:00:00 2001
From: zeaslity <zeaslity@qq.com>
Date: Thu, 2 Mar 2023 10:26:40 +0800
Subject: [PATCH] =?UTF-8?q?[AGENT][INIT]=20=E4=BF=AE=E5=A4=8DAgent?=
 =?UTF-8?q?=E5=90=AF=E5=8A=A8=E7=9A=84Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/wdd/func/xray/persisit/XrayDBOperator.java   | 4 ++--
 source/src/main/java/io/wdd/source/shell/lib/wdd-lib-env.sh   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/src/main/java/io/wdd/func/xray/persisit/XrayDBOperator.java b/server/src/main/java/io/wdd/func/xray/persisit/XrayDBOperator.java
index d2ce850..9fa21f1 100644
--- a/server/src/main/java/io/wdd/func/xray/persisit/XrayDBOperator.java
+++ b/server/src/main/java/io/wdd/func/xray/persisit/XrayDBOperator.java
@@ -64,10 +64,10 @@ public class XrayDBOperator {
                 .stream()
                 .map(
                         serverInfoVO -> {
-                            // 这里应该是 "Paripark Seoul KR"
+                            // 这里应该是 "Paripark Seoul KR" 此种异常应该手动修正
                             String serverCity = serverInfoVO
                                     .getLocation()
-                                    .split(" ")[1];
+                                    .split(" ")[0];
                             int cityBitMapBase = ALL_SERVER_CITY_INDEX.get(serverCity) * 10;
                             int serverGraphNum = cityBitMapBase;
                             for (int index = cityBitMapBase; index < cityBitMapBase + 10; index++) {
diff --git a/source/src/main/java/io/wdd/source/shell/lib/wdd-lib-env.sh b/source/src/main/java/io/wdd/source/shell/lib/wdd-lib-env.sh
index 34e43dc..1f4f3eb 100644
--- a/source/src/main/java/io/wdd/source/shell/lib/wdd-lib-env.sh
+++ b/source/src/main/java/io/wdd/source/shell/lib/wdd-lib-env.sh
@@ -320,7 +320,7 @@ else
     machineNumber=99
 fi
 cat >/etc/environment.d/octopus-agent.conf <<EOF
-serverName=${region}-${hostArch}-${machineNumber}
+serverName=${city}-${hostArch}-${machineNumber}
 serverIpPbV4=$public_ipv4
 serverIpInV4=
 serverIpPbV6=$public_ipv6