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

---
 .../src/main/java/io/wdd/source/shell/agent-bootup.sh  |  9 +++++++--
 .../main/java/io/wdd/source/shell/lib/wdd-lib-env.sh   | 10 +++++-----
 .../main/java/io/wdd/source/shell/lib/wdd-lib-sys.sh   |  2 ++
 3 files changed, 14 insertions(+), 7 deletions(-)

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 e987702..0caa3ec 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
@@ -187,6 +187,10 @@ DownloadAllFile() {
 
   FunctionStart
 
+  colorEcho $RED "[CLEAN_UP] clean the old octopus agent staff !"
+  rm -rf $OctopusAgentPath/lib
+  rm -rf $OctopusAgentPath/
+
   mkdir -p $OctopusAgentPath
   mkdir -p $OctopusAgentPath/lib
 
@@ -200,7 +204,8 @@ DownloadAllFile() {
   colorEcho $BLUE "start to download octopus agent !"
   # check for latest version
   # download the lasted jar
-  . ./lib/wdd-lib-os.sh
+  cd /optopus-agent
+  . ./shell/lib/wdd-lib-os.sh
 
   CheckAndDownloadLatestVersion
 
@@ -268,7 +273,7 @@ InstallJDKPackage() {
 }
 
 systemdAgent(){
-  local JAVA_OPTS="-Xms128m -Xmx512m -Dspring.spring.active=k3s -Dspring.cloud.nacos.config.extension-configs=[group=k3s,data-id=common-k3s.yaml]"
+  local JAVA_OPTS="-Xms128m -Xmx512m  -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"
 
   #  https://www.baeldung.com/linux/run-java-application-as-service
 
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 86e9c23..b0d75b0 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
@@ -268,20 +268,20 @@ export serverIpPbV4=$public_ipv4
 export serverIpInV4=
 export serverIpPbV6=
 export serverIpInV6=
-export location=$city $region $country
+export location="$city $region $country"
 export provider=$org
 export managePort=$(netstat -ntulp | grep sshd | grep -w tcp | awk '{print$4}' | cut -d":" -f2)
-export cpuCore=$cores @ $freq MHz
+export cpuCore="$cores @ $freq MHz"
 export cpuBrand=$cpuName
 export memoryTotal=$tram
 export diskTotal=$disk_total_size
 export diskUsage=$disk_used_size
-export archInfo=$arch ($lbit Bit)
-export osInfo=$opsy
+export archInfo="$arch ($lbit Bit)"
+export osInfo="$opsy"
 export osKernelInfo=$kern
 export tcpControl=$tcpctrl
 export virtualization=$virt
-export ioSpeed=$ioavg MB/s
+export ioSpeed="$ioavg MB/s"
 export machineId=$(cat /etc/machine-id)
 EOF
 
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 c7949fc..6c3db52 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
@@ -152,5 +152,7 @@ wget https://raw.githubusercontent.com/zeaslity/ProjectOctopus/main/source/src/m
 
 apt-cache madison openjdk-11-jdk | head -n 1 | awk '{print$3}'
 
+java -jar /octopus-agent/agent.jar -Xms128m -Xmx512m  -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
+
 }