From 62e6d7ed6b0f4130e56b9a6d2d79fdd97aed4be0 Mon Sep 17 00:00:00 2001
From: zeaslity <zeaslity@qq.com>
Date: Tue, 27 Dec 2022 16:48:04 +0800
Subject: [PATCH] [ server ] [ executor ] - optimize code -3

---
 agent/src/main/resources/bootstrap.yml                    | 8 ++++----
 source/src/main/java/io/wdd/source/shell/agent-bootup.sh  | 6 +++---
 source/src/main/java/io/wdd/source/shell/agent-update.sh  | 2 +-
 .../src/main/java/io/wdd/source/shell/lib/wdd-lib-env.sh  | 8 ++++----
 .../src/main/java/io/wdd/source/shell/lib/wdd-lib-file.sh | 2 +-
 .../src/main/java/io/wdd/source/shell/lib/wdd-lib-os.sh   | 2 +-
 .../src/main/java/io/wdd/source/shell/lib/wdd-lib-sys.sh  | 1 -
 7 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/agent/src/main/resources/bootstrap.yml b/agent/src/main/resources/bootstrap.yml
index 0c92b06..013d9e3 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: k3s
+    active: local
   cloud:
     nacos:
       config:
-        group: k3s
+        group: local
         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: k3s
-            data-id: common-k3s.yaml
+          - group: local
+            data-id: common-local.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 193ad3a..e987702 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,8 +200,8 @@ DownloadAllFile() {
   colorEcho $BLUE "start to download octopus agent !"
   # check for latest version
   # download the lasted jar
-  . ./lib/wdd-lib-os.s
-  h
+  . ./lib/wdd-lib-os.sh
+
   CheckAndDownloadLatestVersion
 
   FunctionSuccess
@@ -268,7 +268,7 @@ InstallJDKPackage() {
 }
 
 systemdAgent(){
-  local JAVA_OPTS="-Xms128m -Xmx512m"
+  local JAVA_OPTS="-Xms128m -Xmx512m -Dspring.spring.active=k3s -Dspring.cloud.nacos.config.extension-configs=[group=k3s,data-id=common-k3s.yaml]"
 
   #  https://www.baeldung.com/linux/run-java-application-as-service
 
diff --git a/source/src/main/java/io/wdd/source/shell/agent-update.sh b/source/src/main/java/io/wdd/source/shell/agent-update.sh
index d66b235..ba92f8b 100644
--- a/source/src/main/java/io/wdd/source/shell/agent-update.sh
+++ b/source/src/main/java/io/wdd/source/shell/agent-update.sh
@@ -14,7 +14,7 @@ CheckAndDownloadLatestVersion
 
 
 if [[ ! -f /octopus-agent/agent-reboot.sh ]]; then\
-    warn "agent-bootup.sh not exist! start to download !"
+  warn "agent-bootup.sh not exist! start to download !"
    cd /octopus-agent
    wget $RepoSourcePath/agent-reboot.sh
 fi
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 586514e..86e9c23 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
@@ -1,11 +1,11 @@
 #!/bin/bash
 
 
-#. /octopus-agent/shell/lib/wdd-lib-log.sh
-#. /octopus-agent/shell/lib/wdd-lib-sys.sh
+. /octopus-agent/shell/lib/wdd-lib-log.sh
+. /octopus-agent/shell/lib/wdd-lib-sys.sh
 
-. ./wdd-lib-log.sh
-. ./wdd-lib-sys.sh
+#. .wdd-lib-log.sh
+#. .wdd-lib-sys.sh
 
 
 hostArchVersion=""
diff --git a/source/src/main/java/io/wdd/source/shell/lib/wdd-lib-file.sh b/source/src/main/java/io/wdd/source/shell/lib/wdd-lib-file.sh
index 8d2ce2a..1e49f77 100644
--- a/source/src/main/java/io/wdd/source/shell/lib/wdd-lib-file.sh
+++ b/source/src/main/java/io/wdd/source/shell/lib/wdd-lib-file.sh
@@ -5,7 +5,7 @@
 # shellcheck disable=SC1091
 
 # Load Generic Libraries
-. /octopus-agent/shell/lib/wdd-lib-log.sh
+. /octopus-agent/shell/lib/wdd-lib-log.shwdd-lib-log.sh
 
 # Functions
 
diff --git a/source/src/main/java/io/wdd/source/shell/lib/wdd-lib-os.sh b/source/src/main/java/io/wdd/source/shell/lib/wdd-lib-os.sh
index 54ebbd4..29b594e 100644
--- a/source/src/main/java/io/wdd/source/shell/lib/wdd-lib-os.sh
+++ b/source/src/main/java/io/wdd/source/shell/lib/wdd-lib-os.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 
-. ./wdd-lib-log.sh
+. /octopus-agent/shell/lib/wdd-lib-log.sh
 
 OctopusAgentUrl=https://happybirthday.107421.xyz/octopus-agent/
 
diff --git a/source/src/main/java/io/wdd/source/shell/lib/wdd-lib-sys.sh b/source/src/main/java/io/wdd/source/shell/lib/wdd-lib-sys.sh
index 5767617..c7949fc 100644
--- a/source/src/main/java/io/wdd/source/shell/lib/wdd-lib-sys.sh
+++ b/source/src/main/java/io/wdd/source/shell/lib/wdd-lib-sys.sh
@@ -5,7 +5,6 @@
 . /octopus-agent/shell/lib/wdd-lib-log.sh
 
 
-
 # 判断命令是否存在
 command_exists() {
   command -v "$@" >/dev/null 2>&1