commit

aarch64/plugin-compile/main/main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"cicv-data-closedloop/aarch64/plugin-compile/package/handler/h_compile_plugin"
+	"cicv-data-closedloop/aarch64/plugin-compile/package/handler"
 	"cicv-data-closedloop/common/config/c_log"
 	"cicv-data-closedloop/common/config/c_nacos"
 	"cicv-data-closedloop/common/config/c_oss"
@@ -15,7 +15,6 @@ const servicePort = 12340
 const serviceName = "plugin-compile"
 
 func init() {
-	// 初始化日志配置
 	c_log.InitLog(serviceName)
 	c_oss.InitOss(false)
 	c_nacos.InitNacos(serviceName, servicePort, map[string]string{
@@ -27,7 +26,7 @@ func init() {
 
 func main() {
 	mux := http.NewServeMux()
-	mux.Handle("/compile", h_validate_request_header.HeaderValidationMiddleware(&h_compile_plugin.CompileHandler{}))
+	mux.Handle("/compile", h_validate_request_header.HeaderValidationMiddleware(&handler.CompileHandler{}))
 	err := http.ListenAndServe(":"+util.ToString(servicePort), mux)
 	if err != nil {
 		c_log.GlobalLogger.Error("程序崩溃监听端口 " + util.ToString(servicePort) + " 失败。")

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

@@ -1,10 +1,10 @@
-package h_compile_plugin
+package handler
 
 import (
-	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"
+	util2 "cicv-data-closedloop/common/util"
 	"encoding/json"
 	"fmt"
 	"github.com/google/uuid"

aarch64/plugin-compile/package/util/util_exec.go

@@ -1,27 +0,0 @@
-package util
-
-import (
-	"os/exec"
-)
-
-func Execute(name string, arg ...string) (*exec.Cmd, string, error) {
-	cmd := exec.Command(name, arg...)
-	combinedOutput, err := cmd.CombinedOutput()
-	if err != nil {
-		return nil, string(combinedOutput), err
-	}
-	return cmd, string(combinedOutput), nil
-}
-
-func ExecuteWithEnvAndDir(envs []string, dir string, name string, arg ...string) (*exec.Cmd, string, error) {
-	cmd := exec.Command(name, arg...)
-	cmd.Dir = dir
-	for _, env := range envs {
-		cmd.Env = append(cmd.Env, env)
-	}
-	combinedOutput, err := cmd.CombinedOutput()
-	if err != nil {
-		return nil, string(combinedOutput), err
-	}
-	return cmd, string(combinedOutput), nil
-}

aarch64/plugin-compile/package/util/util_io.go

@@ -1,42 +0,0 @@
-package util
-
-import (
-	"os"
-	"path/filepath"
-)
-
-// RemoveDir 递归删除目录及其下的所有文件和子目录
-func RemoveDir(dirPath string) error {
-	// 打开目录
-	dir, err := os.Open(dirPath)
-	if err != nil {
-		return err
-	}
-	defer dir.Close()
-	// 读取目录下的文件和子目录
-	fileInfos, err := dir.Readdir(-1)
-	if err != nil {
-		return err
-	}
-	// 遍历文件和子目录
-	for _, fileInfo := range fileInfos {
-		path := filepath.Join(dirPath, fileInfo.Name())
-
-		if fileInfo.IsDir() {
-			// 如果是子目录，递归调用removeDir删除子目录及其下的文件和子目录
-			if err = RemoveDir(path); err != nil {
-				return err
-			}
-		} else {
-			// 如果是文件，直接删除文件
-			if err = os.Remove(path); err != nil {
-				return err
-			}
-		}
-	}
-	// 删除目录本身
-	if err = os.Remove(dirPath); err != nil {
-		return err
-	}
-	return nil
-}

amd64/kubernetes-scheduler/main/main.go

@@ -1,7 +1,36 @@
 package main
 
-import "cicv-data-closedloop/common/config/c_log"
+import (
+	"cicv-data-closedloop/aarch64/plugin-compile/package/handler"
+	"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 = 12341
+const serviceName = "kubernetes-scheduler"
 
 func init() {
 	c_log.InitLog("kubernetes-scheduler")
+	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.156",
+	})
+}
+
+func main() {
+	mux := http.NewServeMux()
+	mux.Handle("/compile", h_validate_request_header.HeaderValidationMiddleware(&handler.CompileHandler{}))
+	err := http.ListenAndServe(":"+util.ToString(servicePort), mux)
+	if err != nil {
+		c_log.GlobalLogger.Error("程序崩溃监听端口 " + util.ToString(servicePort) + " 失败。")
+		os.Exit(-1)
+	}
 }

amd64/kubernetes-scheduler/package/kafka/consumer.go

@@ -0,0 +1 @@
+package kafka

amd64/kubernetes-scheduler/package/kafka/producer.go

@@ -0,0 +1 @@
+package kafka

amd64/topic-filter/main/main.go

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

amd64/topic-filter/package/handler/h_rosbag_filter/rosbag_filter.go

@@ -1,67 +0,0 @@
-package h_rosbag_filter
-
-import (
-	"cicv-data-closedloop/common/config/c_log"
-	"cicv-data-closedloop/common/entity"
-	"encoding/json"
-	"fmt"
-	"net/http"
-)
-
-var (
-	deviceMap = map[string]Device{
-		"1": {Name: "金龙车", CodePath: "/root/rosbag-handle-kinglong/", CompileCmd: "CGO_ENABLED=1 CC=aarch64-linux-gnu-gcc GOARCH=arm64 go build --buildmode=plugin -o /root/rosbag-handle-kinglong/plugin/memoveroccupied.so /root/rosbag-handle-kinglong//plugin/sys_info/memoveroccupied/main/memoveroccupied.go"},
-		"2": {Name: "朴津机器人", CodePath: "/root/rosbag-handle-pji/", CompileCmd: "CGO_ENABLED=1 CC=aarch64-linux-gnu-gcc GOARCH=arm64 go build --buildmode=plugin -o /root/rosbag-handle-kinglong/plugin/memoveroccupied.so /root/rosbag-handle-kinglong//plugin/sys_info/memoveroccupied/main/memoveroccupied.go"},
-	}
-	vaildateCmd = "/root/vaildatePlugin.exe"
-)
-
-// Device 设备
-type Device struct {
-	Name       string
-	CodePath   string
-	CompileCmd string
-}
-
-// FilterHandler implements http.Handler
-type FilterHandler struct{}
-
-func (h *FilterHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	//
-	// 1 校验参数
-	queryParams := r.URL.Query()
-	deviceType := queryParams.Get("deviceType")
-	if deviceType == "" {
-		result, _ := json.Marshal(entity.HttpResult{Status: false, Code: "1003", Message: "参数 deviceType 不能为空。"})
-		_, _ = fmt.Fprintf(w, string(result))
-		return
-	}
-	goObjectKey := queryParams.Get("goObjectKey")
-	if goObjectKey == "" {
-		result, _ := json.Marshal(entity.HttpResult{Status: false, Code: "1003", Message: "参数 goObjectKey 不能为空。"})
-		_, _ = fmt.Fprintf(w, string(result))
-		return
-	}
-	soObjectKey := queryParams.Get("soObjectKey")
-	if soObjectKey == "" {
-		result, _ := json.Marshal(entity.HttpResult{Status: false, Code: "1003", Message: "参数 soObjectKey 不能为空。"})
-		_, _ = fmt.Fprintf(w, string(result))
-		return
-	}
-	c_log.GlobalLogger.Infof("接收到参数【deviceType】=%v,【goObjectKey】=%v,【soObjectKey】=%v", deviceType, goObjectKey, soObjectKey)
-
-	// 2 从 oss 上下载 go 文件
-	//device := deviceMap[deviceType]
-	//codePath := device.CodePath
-	//
-	//// 3 编译 go 文件
-	//compileCmd := device.CompileCmd
-
-	// 4 校验插件是否能用
-
-	// 5 如果插件能用，直接上传，并删除本地插件文件
-
-	// 通过fmt.Fprintf返回数据
-	result, _ := json.Marshal(entity.HttpResult{Status: true, Code: "2000", Message: "编译成功。"})
-	_, _ = fmt.Fprintf(w, string(result))
-}

common/util/u_exec.go

@@ -58,3 +58,16 @@ func Execute(name string, arg ...string) (*exec.Cmd, string, error) {
 	}
 	return cmd, string(combinedOutput), nil
 }
+
+func ExecuteWithEnvAndDir(envs []string, dir string, name string, arg ...string) (*exec.Cmd, string, error) {
+	cmd := exec.Command(name, arg...)
+	cmd.Dir = dir
+	for _, env := range envs {
+		cmd.Env = append(cmd.Env, env)
+	}
+	combinedOutput, err := cmd.CombinedOutput()
+	if err != nil {
+		return nil, string(combinedOutput), err
+	}
+	return cmd, string(combinedOutput), nil
+}

common/util/u_io.go

@@ -12,3 +12,39 @@ func CreateParentDir(filePath string) error {
 	}
 	return nil
 }
+
+// RemoveDir 递归删除目录及其下的所有文件和子目录
+func RemoveDir(dirPath string) error {
+	// 打开目录
+	dir, err := os.Open(dirPath)
+	if err != nil {
+		return err
+	}
+	defer dir.Close()
+	// 读取目录下的文件和子目录
+	fileInfos, err := dir.Readdir(-1)
+	if err != nil {
+		return err
+	}
+	// 遍历文件和子目录
+	for _, fileInfo := range fileInfos {
+		path := filepath.Join(dirPath, fileInfo.Name())
+
+		if fileInfo.IsDir() {
+			// 如果是子目录，递归调用removeDir删除子目录及其下的文件和子目录
+			if err = RemoveDir(path); err != nil {
+				return err
+			}
+		} else {
+			// 如果是文件，直接删除文件
+			if err = os.Remove(path); err != nil {
+				return err
+			}
+		}
+	}
+	// 删除目录本身
+	if err = os.Remove(dirPath); err != nil {
+		return err
+	}
+	return nil
+}

aarch64/plugin-compile/package/util/util_oss.go → common/util/util_oss.go

@@ -3,7 +3,6 @@ package util
 import (
 	"github.com/aliyun/aliyun-oss-go-sdk/oss"
 	"os"
-	"path/filepath"
 )
 
 // LimitUpload 限速上传
@@ -31,11 +30,3 @@ func LimitDownload(bucket *oss.Bucket, limitBit int64, ossObjectKey string, loca
 	}
 	return nil
 }
-
-// CreateParentDir 存在不创建，不存在则创建父目录
-func CreateParentDir(filePath string) error {
-	if err := os.MkdirAll(filepath.Dir(filePath), os.ModePerm); err != nil {
-		return err
-	}
-	return nil
-}