commit

aarch64/pjisuv/common/config/c_cloud.go

@@ -45,6 +45,7 @@ type trigger struct {
 }
 
 type cloudConfig struct {
+	CompressBag           bool          `yaml:"compress-bag"`
 	CleanBeforeStart      bool          `yaml:"clean-before-start"`
 	FullCollect           bool          `yaml:"full-collect"`
 	ConfigRefreshInterval int           `yaml:"config-refresh-interval"` // 配置刷新时间间隔

aarch64/pjisuv/common/config/yaml/pjisuv-012-cloud-config.yaml

@@ -1,4 +1,5 @@
 ---
+compress-bag: false
 clean-before-start: false
 monitor:
   url: http://36.110.106.142:12341/web_server/monitor/insert

aarch64/pjisuv/common/service/rosbag_upload.go

@@ -87,17 +87,20 @@ outLoop:
 			}
 		}
 
-		// 4 compress包，必须顺序执行，此时每个包会对应生成一个压缩过的包和原始包，原始包后缀为.orig.bag
-		c_log.GlobalLogger.Info("压缩bag数据包，故障时间为：", currentTimeWindow.FaultTime)
-		for i, bag := range bags {
-			oldName := bag
-			compressCommand := []string{"compress", "--bz2", oldName}
-			c_log.GlobalLogger.Info("正在压缩中，【FaultTime】=", currentTimeWindow.FaultTime, "【Label】=", currentTimeWindow.Labels, "，进度", i+1, "/", bagNumber, "。")
-			if _, output, err := commonUtil.ExecuteWithEnvSync(commonConfig.RosbagEnvs, commonConfig.RosbagPath, compressCommand...); err != nil {
-				c_log.GlobalLogger.Errorf("compress 命令执行出错【命令】=%v，【输出】=%v,【err】=%v", compressCommand, output, err)
-				continue
+		if commonConfig.CloudConfig.CompressBag == true {
+			// 4 compress包，必须顺序执行，此时每个包会对应生成一个压缩过的包和原始包，原始包后缀为.orig.bag
+			c_log.GlobalLogger.Info("压缩bag数据包，故障时间为：", currentTimeWindow.FaultTime)
+			for i, bag := range bags {
+				oldName := bag
+				compressCommand := []string{"compress", "--bz2", oldName}
+				c_log.GlobalLogger.Info("正在压缩中，【FaultTime】=", currentTimeWindow.FaultTime, "【Label】=", currentTimeWindow.Labels, "，进度", i+1, "/", bagNumber, "。")
+				if _, output, err := commonUtil.ExecuteWithEnvSync(commonConfig.RosbagEnvs, commonConfig.RosbagPath, compressCommand...); err != nil {
+					c_log.GlobalLogger.Errorf("compress 命令执行出错【命令】=%v，【输出】=%v,【err】=%v", compressCommand, output, err)
+					continue
+				}
 			}
 		}
+
 		// 5 upload，必须顺序执行
 		c_log.GlobalLogger.Info("发送bag数据包，故障时间为：", currentTimeWindow.FaultTime)
 		start := time.Now()

deploy/build-dpi_boot.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
 # 监控接口
-go build -o ./exe/dpi_boot.exe ./amd64/dpi_boot/main.go
+go build -o ./exe/dpi_boot.exe ../tools/dpi_boot/main.go

aarch64/plugin-compile/main/main.go → tools/plugin-compile/main/main.go

@@ -1,12 +1,12 @@
 package main
 
 import (
-	c_oss "cicv-data-closedloop/aarch64/plugin-compile/package/config"
-	"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/handler/h_validate_request_header"
 	"cicv-data-closedloop/common/util"
+	"cicv-data-closedloop/tools/plugin-compile/package/config"
+	"cicv-data-closedloop/tools/plugin-compile/package/handler"
 	"net/http"
 	"os"
 )
@@ -16,8 +16,8 @@ const serviceName = "plugin-compile"
 
 func init() {
 	c_log.InitLog("./log/", serviceName)
-	c_oss.InitOss(false)
-	c_oss.InitOss2(false)
+	config.InitOss(false)
+	config.InitOss2(false)
 	c_nacos.InitService(true, serviceName, servicePort, map[string]string{
 		"开发者":  "孟令鑫",
 		"内网IP": "10.14.85.228",

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

@@ -1,10 +1,11 @@
 package handler
 
 import (
-	c_oss "cicv-data-closedloop/aarch64/plugin-compile/package/config"
 	"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"
+	"cicv-data-closedloop/tools/plugin-compile/package/config"
 	"encoding/json"
 	"fmt"
 	"github.com/google/uuid"
@@ -90,7 +91,7 @@ func (h *CompileHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	}
 	c_log.GlobalLogger.Error("插件 ", soLocalPath, " 校验成功。")
 	// 5 如果插件能用，将插件上传到 oss
-	if err := util2.LimitUpload(c_oss.OssBucket, 41943040, soObjectKey, soLocalPath); err != nil {
+	if err := util2.LimitUpload(config.OssBucket, 41943040, soObjectKey, soLocalPath); err != nil {
 		c_log.GlobalLogger.Error("上传插件 ", soObjectKey, " 出错：", err)
 		result, _ := json.Marshal(entity.HttpResult{Status: false, Code: "1008", Message: "上传插件 " + soObjectKey + " 出错。"})
 		_, _ = fmt.Fprintf(w, string(result))
@@ -138,7 +139,7 @@ func (h *PjiCompileHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	tempMiddlePath := uuid.New().String()[:8]
 	goLocalPath := codeDir + tempMiddlePath + "/main/" + tempMiddlePath + ".go"
 	c_log.GlobalLogger.Infof("下载源代码 %v --> %v", goObjectKey, goLocalPath)
-	if err := util2.LimitDownload(c_oss.OssBucket2, 41943040, goObjectKey, goLocalPath); err != nil {
+	if err := util2.LimitDownload(config.OssBucket2, 41943040, goObjectKey, goLocalPath); err != nil {
 		c_log.GlobalLogger.Error("下载源代码 ", goObjectKey, " 出错：", err)
 		result, _ := json.Marshal(entity.HttpResult{Status: false, Code: "1004", Message: "下载源代码 " + goObjectKey + " 出错。"})
 		_, _ = fmt.Fprintf(w, string(result))
@@ -173,7 +174,7 @@ func (h *PjiCompileHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	}
 	c_log.GlobalLogger.Error("插件 ", soLocalPath, " 校验成功。")
 	// 5 如果插件能用，将插件上传到 oss
-	if err := util2.LimitUpload(c_oss.OssBucket2, 41943040, soObjectKey, soLocalPath); err != nil {
+	if err := util2.LimitUpload(config.OssBucket2, 41943040, soObjectKey, soLocalPath); err != nil {
 		c_log.GlobalLogger.Error("上传插件 ", soObjectKey, " 出错：", err)
 		result, _ := json.Marshal(entity.HttpResult{Status: false, Code: "1008", Message: "上传插件 " + soObjectKey + " 出错。"})
 		_, _ = fmt.Fprintf(w, string(result))