commit

aarch64/plugin-compile/main/main.go

@@ -1,30 +1,36 @@
 package main
 
 import (
-	"cicv-data-closedloop/aarch64/plugin-compile/package/config/c_nacos"
-	"cicv-data-closedloop/aarch64/plugin-compile/package/config/c_oss"
 	"cicv-data-closedloop/aarch64/plugin-compile/package/handler/h_compile_plugin"
 	"cicv-data-closedloop/common/config/c_log"
+	"cicv-data-closedloop/common/config/c_nacos"
+	"cicv-data-closedloop/common/config/c_oss"
 	"cicv-data-closedloop/common/handler/h_validate_request_header"
+	"cicv-data-closedloop/common/util"
 	"net/http"
 	"os"
 )
 
-const servicePort = "12340"
+const servicePort = 12340
+const serviceName = "plugin-compile"
 
 func init() {
 	// 初始化日志配置
-	c_log.InitLog("plugin-compile")
-	c_oss.InitOss()
-	c_nacos.InitNacos()
+	c_log.InitLog(serviceName)
+	c_oss.InitOss(false)
+	c_nacos.InitNacos(serviceName, servicePort, map[string]string{
+		"开发者":  "孟令鑫",
+		"内网IP": "10.14.85.228",
+		"外网IP": "36.110.106.142",
+	})
 }
 
 func main() {
 	mux := http.NewServeMux()
 	mux.Handle("/compile", h_validate_request_header.HeaderValidationMiddleware(&h_compile_plugin.CompileHandler{}))
-	err := http.ListenAndServe(":"+servicePort, mux)
+	err := http.ListenAndServe(":"+util.ToString(servicePort), mux)
 	if err != nil {
-		c_log.GlobalLogger.Error("程序崩溃监听端口 " + servicePort + " 失败。")
+		c_log.GlobalLogger.Error("程序崩溃监听端口 " + util.ToString(servicePort) + " 失败。")
 		os.Exit(-1)
 	}
 }

aarch64/plugin-compile/package/handler/h_compile_plugin/compile_plugin.go

@@ -1,9 +1,9 @@
 package h_compile_plugin
 
 import (
-	"cicv-data-closedloop/aarch64/plugin-compile/package/config/c_oss"
 	util2 "cicv-data-closedloop/aarch64/plugin-compile/package/util"
 	"cicv-data-closedloop/common/config/c_log"
+	"cicv-data-closedloop/common/config/c_oss"
 	"cicv-data-closedloop/common/entity"
 	"encoding/json"
 	"fmt"

amd64/kubernetes-scheduler/main/main.go

@@ -0,0 +1,7 @@
+package main
+
+import "cicv-data-closedloop/common/config/c_log"
+
+func init() {
+	c_log.InitLog("kubernetes-scheduler")
+}

aarch64/plugin-compile/package/config/c_nacos/nacos_config.go → common/config/c_nacos/nacos_config.go

@@ -19,15 +19,9 @@ var (
 	password    = "cicv"
 	serviceIp   = "36.110.106.142"
 	servicePort = 12340
-	serviceName = "plugin-compile"
-	metadata    = map[string]string{
-		"开发者":  "孟令鑫",
-		"内网IP": "10.14.85.228",
-		"外网IP": "36.110.106.142",
-	}
 )
 
-func InitNacos() {
+func InitNacos(serviceName string, servicePort uint64, metadata map[string]string) {
 	//create ServerConfig
 	sc := []constant.ServerConfig{
 		*constant.NewServerConfig(nacosIp, uint64(nacosPort), constant.WithContextPath("/nacos")),
@@ -50,14 +44,14 @@ func InitNacos() {
 	)
 
 	if err != nil {
-		c_log.GlobalLogger.Error("程序崩溃，nacos连接失败：", err)
+		c_log.GlobalLogger.Error("程序崩溃，nacos 连接失败：", err)
 		os.Exit(-1)
 	}
 
 	//Register
 	registerServiceInstance(client, vo.RegisterInstanceParam{
 		Ip:          serviceIp,
-		Port:        uint64(servicePort),
+		Port:        servicePort,
 		ServiceName: serviceName,
 		//GroupName:   "group-a",
 		//ClusterName: "cluster-a",

aarch64/plugin-compile/package/config/c_oss/oss_config.go → common/config/c_oss/oss_config.go

@@ -24,10 +24,13 @@ var (
 	OssBucket       *oss.Bucket
 )
 
-func InitOss() {
+func InitOss(isUseCname bool) {
 	var err error
-	//OssClient, err = oss.New(cname, accessKeyId, accessKeySecret, oss.UseCname(true)) // 公网
-	OssClient, err = oss.New(endpoint, accessKeyId, accessKeySecret, oss.UseCname(false)) // 内网
+	if isUseCname {
+		OssClient, err = oss.New(cname, accessKeyId, accessKeySecret, oss.UseCname(true)) // 公网
+	} else {
+		OssClient, err = oss.New(endpoint, accessKeyId, accessKeySecret, oss.UseCname(false)) // 内网
+	}
 	if err != nil {
 		fmt.Println("无法创建阿里云client:", err)
 		os.Exit(-1)

common/util/u_string.go

@@ -0,0 +1,7 @@
+package util
+
+import "fmt"
+
+func ToString(value interface{}) string {
+	return fmt.Sprintf("%v", value)
+}