From d94cf46cb53ccca28d26397e2796e461f9937a61 Mon Sep 17 00:00:00 2001 From: zeaslity Date: Sat, 4 Mar 2023 11:20:59 +0800 Subject: [PATCH] [ server ][ init ] - fix octopus cluster bugs --- .github/workflows/build-push-docker.yml | 2 +- source/src/main/java/io/wdd/source/shell/agent-bootup.sh | 2 +- source/src/main/java/io/wdd/source/shell/server-bootup.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-push-docker.yml b/.github/workflows/build-push-docker.yml index 0868873..134c2ad 100644 --- a/.github/workflows/build-push-docker.yml +++ b/.github/workflows/build-push-docker.yml @@ -179,7 +179,7 @@ jobs: # Rabbit Password RABBIT_PASSWORD: ${{ secrets.RABBIT_PASS }} # Rabbit Hostname - RABBIT_HOST: 43.154.83.213 + RABBIT_HOST: 150.230.198.103 # RabbitMQ Port RABBIT_PORT: 20672 # Use SSL diff --git a/source/src/main/java/io/wdd/source/shell/agent-bootup.sh b/source/src/main/java/io/wdd/source/shell/agent-bootup.sh index 5dd9b7a..36b6cd7 100644 --- a/source/src/main/java/io/wdd/source/shell/agent-bootup.sh +++ b/source/src/main/java/io/wdd/source/shell/agent-bootup.sh @@ -2,7 +2,7 @@ ##### environment variables ###### -JAVA_OPTS="-Xms128m -Xmx512m -Ddebug=false -Dfile.encoding=utf-8 --spring.profiles.active=k3s --spring.cloud.nacos.config.group=k3s --spring.cloud.nacos.config.extension-configs[0].dataId=common-k3s.yaml --spring.cloud.nacos.config.extension-configs[0].group=k3s" +JAVA_OPTS="-Xms128m -Xmx512m -Ddebug=false -Dfile.encoding=utf-8 --spring.profiles.active=k3s --spring.cloud.nacos.config.group=k3s --spring.cloud.nacos.config.server-addr=140.238.52.228:21060 --spring.cloud.nacos.config.extension-configs[0].dataId=common-k3s.yaml --spring.cloud.nacos.config.extension-configs[0].group=k3s" DependLibFiles=( wdd-lib-file.sh diff --git a/source/src/main/java/io/wdd/source/shell/server-bootup.sh b/source/src/main/java/io/wdd/source/shell/server-bootup.sh index 929f70f..edacec0 100644 --- a/source/src/main/java/io/wdd/source/shell/server-bootup.sh +++ b/source/src/main/java/io/wdd/source/shell/server-bootup.sh @@ -2,7 +2,7 @@ ##### environment variables ###### -JAVA_OPTS="-Xms4096m -Xmx4096m -Dfile.encoding=utf-8 -Dspring.profiles.active=k3s -Dspring.cloud.nacos.config.group=k3s -Dspring.cloud.nacos.config.extension-configs[0].dataId=common-k3s.yaml -Dspring.cloud.nacos.config.extension-configs[0].group=k3s -Ddebug=false -Dlogging.level.io.wdd.server=info" +JAVA_OPTS="-Xms4096m -Xmx4096m -Dfile.encoding=utf-8 -Dspring.profiles.active=k3s -Dspring.cloud.nacos.config.group=k3s -Dspring.cloud.nacos.config.server-addr=140.238.52.228:21060 -Dspring.cloud.nacos.config.extension-configs[0].dataId=common-k3s.yaml -Dspring.cloud.nacos.config.extension-configs[0].group=k3s -Ddebug=false -Dlogging.level.io.wdd.server=info" DOCKER_VERSION="20.10.10"