worker和agent支持java17和java8同步运行 TencentBlueKing#10586

src/agent/agent/src/cmd/upgrader/main.go

@@ -59,6 +59,8 @@ func main() {
 		}
 	}()
 
+	logs.Infof("version: %s", config.AgentVersion)
+
 	if ok := systemutil.CheckProcess(upgraderProcess); !ok {
 		logs.Warn("get process lock failed, exit")
 		return

src/agent/agent/src/third_components/jdk.go

@@ -235,8 +235,9 @@ func trimJdk17VersionList(versionOutputString string) []string {
 }
 
 const (
-	macosJdkBinPath   = "/Contents/Home/bin/java"
-	noMacosJdkBinPath = "/bin/java"
+	macosJdkBinPath = "/Contents/Home/bin/java"
+	linuxJdkBinPath = "/bin/java"
+	winJdkBinPath   = "/bin/java.exe"
 )
 
 // GetJava 获取本地java路径，区分版本
@@ -245,14 +246,18 @@ func (j *JdkVersionType) GetJava() string {
 	case jdk8:
 		if systemutil.IsMacos() {
 			return config.GAgentConfig.JdkDirPath + macosJdkBinPath
+		} else if systemutil.IsWindows() {
+			return config.GAgentConfig.JdkDirPath + winJdkBinPath
 		} else {
-			return config.GAgentConfig.JdkDirPath + noMacosJdkBinPath
+			return config.GAgentConfig.JdkDirPath + linuxJdkBinPath
 		}
 	default:
 		if systemutil.IsMacos() {
 			return config.GAgentConfig.Jdk17DirPath + macosJdkBinPath
+		} else if systemutil.IsWindows() {
+			return config.GAgentConfig.Jdk17DirPath + winJdkBinPath
 		} else {
-			return config.GAgentConfig.Jdk17DirPath + noMacosJdkBinPath
+			return config.GAgentConfig.Jdk17DirPath + linuxJdkBinPath
 		}
 	}
 }