From be54587d2835d2601617ff05c4e983ea5133449c Mon Sep 17 00:00:00 2001 From: zeaslity Date: Sat, 4 Mar 2023 11:09:57 +0800 Subject: [PATCH] [ server ][ init ] - fix octopus cluster bugs --- .../io/wdd/func/xray/persisit/RealXrayPathConfig.txt | 5 +++++ server/src/main/resources/bootstrap.yml | 12 ++++++------ .../src/main/java/io/wdd/source/shell/env/hosts.conf | 6 +++++- 3 files changed, 16 insertions(+), 7 deletions(-) create mode 100644 server/src/main/java/io/wdd/func/xray/persisit/RealXrayPathConfig.txt diff --git a/server/src/main/java/io/wdd/func/xray/persisit/RealXrayPathConfig.txt b/server/src/main/java/io/wdd/func/xray/persisit/RealXrayPathConfig.txt new file mode 100644 index 0000000..3027fc4 --- /dev/null +++ b/server/src/main/java/io/wdd/func/xray/persisit/RealXrayPathConfig.txt @@ -0,0 +1,5 @@ + + +Shanghai-amd64-01-259df5->Seoul-amd64-04-f301ac +Shanghai-amd64-01-259df5->Seoul-amd64-04-f301ac->Tokyo-amd64-03-99907c + diff --git a/server/src/main/resources/bootstrap.yml b/server/src/main/resources/bootstrap.yml index b67c82d..4b8191b 100644 --- a/server/src/main/resources/bootstrap.yml +++ b/server/src/main/resources/bootstrap.yml @@ -2,22 +2,22 @@ spring: application: name: octopus-server profiles: - active: local + active: dev cloud: nacos: config: - group: local + group: dev config-retry-time: 3000 file-extension: yaml max-retry: 3 # server-addr: 43.154.83.213:21060 - # server-addr: 140.238.52.228:21060 - server-addr: https://nacos.107421.xyz:443 + server-addr: 140.238.52.228:21060 + # server-addr: https://nacos.107421.xyz:443 timeout: 5000 config-long-poll-timeout: 5000 extension-configs: - - group: local - data-id: common-local.yaml + - group: dev + data-id: common-dev.yaml server: port: 9999 \ No newline at end of file diff --git a/source/src/main/java/io/wdd/source/shell/env/hosts.conf b/source/src/main/java/io/wdd/source/shell/env/hosts.conf index 57cbbd1..38f0a13 100644 --- a/source/src/main/java/io/wdd/source/shell/env/hosts.conf +++ b/source/src/main/java/io/wdd/source/shell/env/hosts.conf @@ -28,6 +28,9 @@ ff02::3 ip6-allhosts 140.238.52.228 Tokyo-amd64-02 tokyo-2 t2 +18.181.77.246 Tokyo-amd64-03 tokyo-3 t3 + + 42.192.52.227 Shanghai-amd64-01 tc-sh ts 43.154.83.213 Hongkong-amd64-01 tc-hk th @@ -46,4 +49,5 @@ ff02::3 ip6-allhosts 132.145.12.135 London-arm64-01 london-3 l3 -132.145.28.48 London-arm64-02 london-4 l4 \ No newline at end of file +132.145.28.48 London-arm64-02 london-4 l4 +