LingxinMeng 1 年之前
父节点
当前提交
38b99e1488
共有 3 个文件被更改,包括 35 次插入4 次删除
  1. 2 1
      aarch64/pjisuv/common/config/c_resource.go
  2. 3 3
      aarch64/pjisuv/master/service/for_competition.go
  3. 30 0
      common/util/u_http.go

+ 2 - 1
aarch64/pjisuv/common/config/c_resource.go

@@ -10,8 +10,9 @@ import (
 func SendResourceUsage() {
 	for {
 		time.Sleep(time.Duration(2) * time.Second)
-		responseString, err := util.HttpPostJsonResponseString(
+		responseString, err := util.HttpPostWithHeaders(
 			CloudConfig.Monitor.Url,
+			map[string]string{"Authorization": "U9yKpD6kZZDDe4LFKK6myAxBUT1XRrDM"},
 			map[string]string{
 				"totalCpuUsage":    util.ToString(util.GetCpuPercent()),
 				"totalMemoryUsage": util.ToString(util.GetMemoryPercent()),

+ 3 - 3
aarch64/pjisuv/master/service/for_competition.go

@@ -14,7 +14,7 @@ var (
 	commandArgs = []string{"record", "--split", "--duration=1", "/pji_gps", "/data_read"}
 )
 
-// ForCompetition todo 实车比赛临时使用
+// todo 实车比赛临时使用
 // history record命令无法录制()
 func ForCompetition() {
 	c_log.GlobalLogger.Info("开始采集实车算法比赛全量数据。")
@@ -36,8 +36,8 @@ func ForCompetition() {
 				if i == len(files)-1 { // 最后一个包在录制中,不上传
 					break
 				}
-				c_log.GlobalLogger.Info("上传实车算法比赛全量数据包", files[i])
-				bagSlice := strings.Split(files[0], "/")
+				c_log.GlobalLogger.Debug("上传实车算法比赛全量数据包", files[i])
+				bagSlice := strings.Split(files[i], "/")
 				commonConfig.OssMutex.Lock()
 				_ = commonConfig.OssBucket.PutObjectFromFile("competition/"+bagSlice[len(bagSlice)-1], files[0])
 				commonConfig.OssMutex.Unlock()

+ 30 - 0
common/util/u_http.go

@@ -58,6 +58,36 @@ func HttpPostJsonResponseString(url string, params map[string]string) (string, e
 	return string(body), nil
 }
 
+func HttpPostWithHeaders(baseUrl string, headers map[string]string, params map[string]string) (string, error) {
+	// 构建请求体
+	data := url.Values{}
+	for key, value := range params {
+		data.Set(key, value)
+	}
+	requestBody := bytes.NewBufferString(data.Encode())
+
+	// 创建请求
+	req, err := http.NewRequest("POST", baseUrl, requestBody)
+	if err != nil {
+		return "", err
+	}
+
+	// 设置请求头
+	for key, value := range headers {
+		req.Header.Set(key, value)
+	}
+
+	// 发送请求
+	client := &http.Client{}
+	resp, err := client.Do(req)
+	if err != nil {
+		return "", err
+	}
+	body, err := io.ReadAll(resp.Body)
+
+	return string(body), nil
+}
+
 func HttpGetStringAddHeadersResponseString(baseUrl string, headers map[string]string, params map[string]string) (string, error) {
 
 	// 将参数编码到URL中