Merge remote-tracking branch 'origin/master'

aarch64/pjibot_delivery/common/service/rosbag_clean.go

@@ -29,7 +29,7 @@ func BagCacheClean() {
 		if len(bags) > config.CloudConfig.BagNumber {
 			diff := len(bags) - config.CloudConfig.BagNumber
 			for i := 0; i < diff; i++ {
-				_ = util.DeleteFile(bags[i])
+				util.DeleteFile(bags[i])
 			}
 		}
 	}

aarch64/pjibot_delivery/common/service/rosbag_upload.go

@@ -77,7 +77,7 @@ outLoop:
 					continue
 				}
 				// 删除旧文件
-				_ = util.DeleteFile(oldName)
+				util.DeleteFile(oldName)
 				// 将新文件改回旧文件名
 				if err = os.Rename(newName, oldName); err != nil {
 					c_log.GlobalLogger.Info("修改文件名", oldName, "失败，放弃当前时间窗口", currentTimeWindow.FaultTime, "，错误为：", err)

aarch64/pjibot_guide/common/service/rosbag_clean.go

@@ -29,7 +29,7 @@ func BagCacheClean() {
 		if len(bags) > config.CloudConfig.BagNumber {
 			diff := len(bags) - config.CloudConfig.BagNumber
 			for i := 0; i < diff; i++ {
-				_ = util.DeleteFile(bags[i])
+				util.DeleteFile(bags[i])
 			}
 		}
 	}

aarch64/pjibot_patrol/common/service/rosbag_clean.go

@@ -29,7 +29,7 @@ func BagCacheClean() {
 		if len(bags) > config.CloudConfig.BagNumber {
 			diff := len(bags) - config.CloudConfig.BagNumber
 			for i := 0; i < diff; i++ {
-				_ = util.DeleteFile(bags[i])
+				util.DeleteFile(bags[i])
 			}
 		}
 	}

common/util/u_io.go

@@ -305,16 +305,12 @@ func ListAbsolutePathWithSuffixAndSort(dir string, suffix string) ([]string, err
 	return result, nil
 }
 
-func DeleteFile(path string) error {
+func DeleteFile(path string) {
 	// 检查文件是否存在
 	if _, err := os.Stat(path); err == nil {
 		// 文件存在，执行删除操作
-		err = os.Remove(path)
-		if err != nil {
-			return err
-		}
+		_ = os.Remove(path)
 	}
-	return nil
 }
 
 // WriteStringToFile 将字符串写入指定的文件路径