commit

aarch64/pjibot_guide/common/service/rosbag_upload.go

@@ -163,13 +163,13 @@ outLoop:
 				c_log.GlobalLogger.Error("压缩data目录失败：", err)
 			} else {
 				c_log.GlobalLogger.Infof("压缩data目录【%v】->【%v】成功", commonConfig.CloudConfig.DataDir.Src, commonConfig.CloudConfig.DataDir.Dest)
-			}
-			dataZipKey := objectKey3 + "data.zip"
-			err = commonConfig.OssBucket.PutObjectFromFile(dataZipKey, commonConfig.CloudConfig.DataDir.Dest)
-			if err != nil {
-				c_log.GlobalLogger.Error("上传 data 目录压缩文件失败：", err)
-			} else {
-				c_log.GlobalLogger.Infof("上传data目录压缩包【%v】->【%v】成功", commonConfig.CloudConfig.DataDir.Dest, dataZipKey)
+				dataZipKey := objectKey3 + "data.zip"
+				err = commonConfig.OssBucket.PutObjectFromFile(dataZipKey, commonConfig.CloudConfig.DataDir.Dest)
+				if err != nil {
+					c_log.GlobalLogger.Error("上传 data 目录压缩文件失败：", err)
+				} else {
+					c_log.GlobalLogger.Infof("上传data目录压缩包【%v】->【%v】成功", commonConfig.CloudConfig.DataDir.Dest, dataZipKey)
+				}
 			}
 			commonConfig.OssMutex.Unlock()
 		}

common/util/u_io.go

@@ -28,7 +28,7 @@ func ZipDir(src string, dest string, dirs []string) error {
 	// 执行 zip 命令并获取输出
 	output, err := cmd.CombinedOutput()
 	if err != nil {
-		return fmt.Errorf("error while executing zip command: %v\nOutput: %s", err, output)
+		return fmt.Errorf("执行压缩命令【%v】报错【%v】输出【%v】", args, err, output)
 	}
 
 	fmt.Printf("ZIP file created successfully: %s\n", dest)