修复符号文件对比一致性时md5计算失败问题

- 新增计算字符串md5值方法，修复字符串计算md5错用文件md5值方法问题

Author: jorben

helper/file.go

@@ -102,8 +102,8 @@ func Copy(src, dst string) (written int64, err error) {
 	return written, nil
 }
 
-// Md5 计算文件的MD5
-func Md5(path string) (string, error) {
+// FileMd5 计算文件的MD5
+func FileMd5(path string) (string, error) {
 	// 打开文件
 	file, err := os.Open(path)
 	if err != nil {
@@ -126,8 +126,8 @@ func Md5(path string) (string, error) {
 	return md5Checksum, nil
 }
 
-// Sha256 计算文件的SHA256
-func Sha256(path string) (string, error) {
+// FileSha256 计算文件的SHA256
+func FileSha256(path string) (string, error) {
 	// 打开文件
 	file, err := os.Open(path)
 	if err != nil {

helper/string.go

@@ -1,7 +1,9 @@
 package helper
 
 import (
+	"crypto/md5"
 	"crypto/rand"
+	"encoding/hex"
 	"math"
 	"math/big"
 	"strings"
@@ -37,3 +39,11 @@ func RandomString(length int) (string, error) {
 	}
 	return string(b), nil
 }
+
+// StringMd5 计算字符串的MD5值
+func StringMd5(str string) string {
+	hash := md5.New()
+	hash.Write([]byte(str))
+	// 计算 MD5 校验和
+	return hex.EncodeToString(hash.Sum(nil))
+}

storage.go

@@ -221,7 +221,7 @@ func (s *Storage) IsSameV2(ctx context.Context, localPath, remotePath string) bo
 		case enum.SymlinkFile:
 			if isDir, _ := helper.IsDir(localPath); !isDir {
 				log.Debugf("SymlinkFile %s", localPath)
-				localMd5, err = helper.Md5(localPath)
+				localMd5, err = helper.FileMd5(localPath)
 				if err != nil {
 					log.Errorf("MD5 error: %s", err.Error())
 					return false
@@ -237,11 +237,7 @@ func (s *Storage) IsSameV2(ctx context.Context, localPath, remotePath string) bo
 			// 获取目标地址
 			target, _ := helper.GetSymlinkTarget(localPath)
 			// 计算md5值
-			localMd5, err = helper.Md5(target)
-			if err != nil {
-				log.Errorf("MD5 error: %s", err.Error())
-				return false
-			}
+			localMd5 = helper.StringMd5(target)
 		default:
 			return true
 		}
@@ -285,7 +281,7 @@ func (s *Storage) IsSameV2(ctx context.Context, localPath, remotePath string) bo
 
 	// 计算本地文件的md5
 	if localMd5 == "" {
-		localMd5, _ = helper.Md5(localPath)
+		localMd5, _ = helper.FileMd5(localPath)
 	}
 	log.Debugf("Compare %s, Local Md5: %s, Remote ETag: %s", localPath, localMd5, objectInfo.ETag)
 	if strings.ToLower(localMd5) == strings.ToLower(objectInfo.ETag) {
@@ -327,7 +323,7 @@ func (s *Storage) IsSame(ctx context.Context, localPath, localMd5, remotePath st
 
 	// 计算本地文件的md5
 	if localMd5 == "" {
-		localMd5, _ = helper.Md5(localPath)
+		localMd5, _ = helper.FileMd5(localPath)
 	}
 	log.Debugf("Compare %s, Local Md5: %s, Remote ETag: %s", remotePath, localMd5, objectInfo.ETag)
 	if strings.ToLower(localMd5) == strings.ToLower(objectInfo.ETag) {