From 0c38361a3b17f6f23cdd981e6999fe5080e89224 Mon Sep 17 00:00:00 2001 From: zeaslity Date: Tue, 27 Dec 2022 16:03:20 +0800 Subject: [PATCH] [ server ] [ executor ] - optimize code -2 --- agent/src/main/resources/bootstrap.yml | 8 ++++---- source/src/main/java/io/wdd/source/shell/agent-bootup.sh | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/agent/src/main/resources/bootstrap.yml b/agent/src/main/resources/bootstrap.yml index 013d9e3..0c92b06 100644 --- a/agent/src/main/resources/bootstrap.yml +++ b/agent/src/main/resources/bootstrap.yml @@ -2,11 +2,11 @@ spring: application: name: octopus-agent profiles: - active: local + active: k3s cloud: nacos: config: - group: local + group: k3s config-retry-time: 3000 file-extension: yaml max-retry: 3 @@ -16,7 +16,7 @@ spring: timeout: 5000 config-long-poll-timeout: 5000 extension-configs: - - group: local - data-id: common-local.yaml + - group: k3s + data-id: common-k3s.yaml 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 af4053a..193ad3a 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 @@ -200,7 +200,8 @@ DownloadAllFile() { colorEcho $BLUE "start to download octopus agent !" # check for latest version # download the lasted jar - . ./lib/wdd-lib-os.sh + . ./lib/wdd-lib-os.s + h CheckAndDownloadLatestVersion FunctionSuccess