From 0e3fac709e70619b4096c735b8c8ffb2bf91ed5d Mon Sep 17 00:00:00 2001
From: Sydonian <794346190@qq.com>
Date: Fri, 26 Apr 2024 10:08:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E9=87=8D=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 agent/internal/task/storage_load_package.go |  4 ++--
 client/internal/cmdline/scanner.go          | 18 +++++++++---------
 common/pkgs/mq/scanner/event/event.go       |  4 ++--
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/agent/internal/task/storage_load_package.go b/agent/internal/task/storage_load_package.go
index 5b68aa2..fd12241 100644
--- a/agent/internal/task/storage_load_package.go
+++ b/agent/internal/task/storage_load_package.go
@@ -14,7 +14,7 @@ import (
 	"gitlink.org.cn/cloudream/common/pkgs/task"
 	cdssdk "gitlink.org.cn/cloudream/common/sdks/storage"
 	"gitlink.org.cn/cloudream/common/utils/io2"
-	myref "gitlink.org.cn/cloudream/common/utils/reflect"
+	"gitlink.org.cn/cloudream/common/utils/reflect2"
 	"gitlink.org.cn/cloudream/common/utils/sort2"
 	"gitlink.org.cn/cloudream/storage/common/consts"
 	stgglb "gitlink.org.cn/cloudream/storage/common/globals"
@@ -134,7 +134,7 @@ func (t *StorageLoadPackage) downloadOne(coorCli *coormq.Client, ipfsCli *ipfs.P
 		t.pinnedBlocks = append(t.pinnedBlocks, pinnedBlocks...)
 
 	default:
-		return fmt.Errorf("unknow redundancy type: %v", myref.TypeOfValue(obj.Object.Redundancy))
+		return fmt.Errorf("unknow redundancy type: %v", reflect2.TypeOfValue(obj.Object.Redundancy))
 	}
 	defer file.Close()
 
diff --git a/client/internal/cmdline/scanner.go b/client/internal/cmdline/scanner.go
index e5aa0a8..0758003 100644
--- a/client/internal/cmdline/scanner.go
+++ b/client/internal/cmdline/scanner.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"gitlink.org.cn/cloudream/common/pkgs/cmdtrie"
-	myreflect "gitlink.org.cn/cloudream/common/utils/reflect"
+	"gitlink.org.cn/cloudream/common/utils/reflect2"
 	scevt "gitlink.org.cn/cloudream/storage/common/pkgs/mq/scanner/event"
 )
 
@@ -25,21 +25,21 @@ func ScannerPostEvent(ctx CommandContext, args []string) error {
 }
 
 func init() {
-	parseScannerEventCmdTrie.MustAdd(scevt.NewAgentCacheGC, myreflect.TypeNameOf[scevt.AgentCacheGC]())
+	parseScannerEventCmdTrie.MustAdd(scevt.NewAgentCacheGC, reflect2.TypeNameOf[scevt.AgentCacheGC]())
 
-	parseScannerEventCmdTrie.MustAdd(scevt.NewAgentCheckCache, myreflect.TypeNameOf[scevt.AgentCheckCache]())
+	parseScannerEventCmdTrie.MustAdd(scevt.NewAgentCheckCache, reflect2.TypeNameOf[scevt.AgentCheckCache]())
 
-	parseScannerEventCmdTrie.MustAdd(scevt.NewAgentCheckState, myreflect.TypeNameOf[scevt.AgentCheckState]())
+	parseScannerEventCmdTrie.MustAdd(scevt.NewAgentCheckState, reflect2.TypeNameOf[scevt.AgentCheckState]())
 
-	parseScannerEventCmdTrie.MustAdd(scevt.NewAgentStorageGC, myreflect.TypeNameOf[scevt.AgentStorageGC]())
+	parseScannerEventCmdTrie.MustAdd(scevt.NewAgentStorageGC, reflect2.TypeNameOf[scevt.AgentStorageGC]())
 
-	parseScannerEventCmdTrie.MustAdd(scevt.NewAgentCheckStorage, myreflect.TypeNameOf[scevt.AgentCheckStorage]())
+	parseScannerEventCmdTrie.MustAdd(scevt.NewAgentCheckStorage, reflect2.TypeNameOf[scevt.AgentCheckStorage]())
 
-	parseScannerEventCmdTrie.MustAdd(scevt.NewCheckPackage, myreflect.TypeNameOf[scevt.CheckPackage]())
+	parseScannerEventCmdTrie.MustAdd(scevt.NewCheckPackage, reflect2.TypeNameOf[scevt.CheckPackage]())
 
-	parseScannerEventCmdTrie.MustAdd(scevt.NewCheckPackageRedundancy, myreflect.TypeNameOf[scevt.CheckPackageRedundancy]())
+	parseScannerEventCmdTrie.MustAdd(scevt.NewCheckPackageRedundancy, reflect2.TypeNameOf[scevt.CheckPackageRedundancy]())
 
-	parseScannerEventCmdTrie.MustAdd(scevt.NewCleanPinned, myreflect.TypeNameOf[scevt.CleanPinned]())
+	parseScannerEventCmdTrie.MustAdd(scevt.NewCleanPinned, reflect2.TypeNameOf[scevt.CleanPinned]())
 
 	commands.MustAdd(ScannerPostEvent, "scanner", "event")
 }
diff --git a/common/pkgs/mq/scanner/event/event.go b/common/pkgs/mq/scanner/event/event.go
index e1f1488..7885c72 100644
--- a/common/pkgs/mq/scanner/event/event.go
+++ b/common/pkgs/mq/scanner/event/event.go
@@ -2,7 +2,7 @@ package event
 
 import (
 	"gitlink.org.cn/cloudream/common/pkgs/types"
-	myreflect "gitlink.org.cn/cloudream/common/utils/reflect"
+	"gitlink.org.cn/cloudream/common/utils/reflect2"
 	"gitlink.org.cn/cloudream/common/utils/serder"
 )
 
@@ -18,6 +18,6 @@ func (e *EventBase) Noop() {}
 
 // 只能在init函数中调用，因为包级变量初始化比init函数调用先进行
 func Register[T Event]() any {
-	EventTypeUnino.Add(myreflect.TypeOf[T]())
+	EventTypeUnino.Add(reflect2.TypeOf[T]())
 	return nil
 }