优化结构

internal/data/config_helpers.go

@@ -1,30 +1,28 @@
 package data
 
 import (
-	"kra/internal/conf"
-
-	"google.golang.org/protobuf/proto"
+	"kra/internal/config"
 )
 
-func cloneAdminConfig(value *conf.AdminBackend) *conf.AdminBackend {
+func cloneAdminConfig(value *config.Admin) *config.Admin {
 	if value == nil {
-		return &conf.AdminBackend{}
+		return &config.Admin{}
 	}
-	return proto.Clone(value).(*conf.AdminBackend)
+	return config.CloneAdmin(value)
 }
 
-func maskStorageSecrets(storage *conf.AdminBackend_Storage) {
+func maskStorageSecrets(storage *config.Storage) {
 	if storage == nil {
 		return
 	}
 	if storage.Qiniu != nil && storage.Qiniu.SecretKey != "" {
 		storage.Qiniu.SecretKey = "******"
 	}
-	for _, item := range []*conf.AdminBackend_ObjectStore{
-		storage.AliyunOss,
-		storage.HuaweiObs,
-		storage.TencentCos,
-		storage.AwsS3,
+	for _, item := range []*config.ObjectStore{
+		storage.AliyunOSS,
+		storage.HuaweiOBS,
+		storage.TencentCOS,
+		storage.AWSS3,
 		storage.CloudflareR2,
 		storage.Minio,
 	} {