优化

internal/data/config_management.go

@@ -62,7 +62,11 @@ func (r *initializationRepo) ConfigurationJSON() (json.RawMessage, error) {
 			admin["media"] = map[string]any{"sessionTtl": adminConfig.Media.SessionTtl, "maxFileSize": adminConfig.Media.MaxFileSize, "chunkDir": chunkDir}
 		}
 		if adminConfig.Email != nil {
-			email = map[string]any{"to": adminConfig.Email.To, "from": adminConfig.Email.From, "host": adminConfig.Email.Host, "secret": "******", "nickname": adminConfig.Email.Nickname, "port": adminConfig.Email.Port, "is-ssl": adminConfig.Email.IsSsl, "is-loginauth": adminConfig.Email.IsLoginAuth}
+			secret := ""
+			if adminConfig.Email.Secret != "" {
+				secret = "******"
+			}
+			email = map[string]any{"to": adminConfig.Email.To, "from": adminConfig.Email.From, "host": adminConfig.Email.Host, "secret": secret, "nickname": adminConfig.Email.Nickname, "port": adminConfig.Email.Port, "is-ssl": adminConfig.Email.IsSsl, "is-loginauth": adminConfig.Email.IsLoginAuth}
 		}
 		if adminConfig.Storage != nil {
 			storage := proto.Clone(adminConfig.Storage).(*conf.AdminBackend_Storage)
@@ -97,7 +101,7 @@ func (r *initializationRepo) ConfigurationJSON() (json.RawMessage, error) {
 		if safeAdmin.Jwt != nil {
 			safeAdmin.Jwt.SigningKey = "******"
 		}
-		if safeAdmin.Email != nil {
+		if safeAdmin.Email != nil && safeAdmin.Email.Secret != "" {
 			safeAdmin.Email.Secret = "******"
 		}
 		maskStorageSecrets(safeAdmin.Storage)
@@ -432,11 +436,11 @@ func maskStorageSecrets(storage *conf.AdminBackend_Storage) {
 	if storage == nil {
 		return
 	}
-	if storage.Qiniu != nil {
+	if storage.Qiniu != nil && storage.Qiniu.SecretKey != "" {
 		storage.Qiniu.SecretKey = "******"
 	}
 	for _, item := range objectStores(storage) {
-		if item != nil {
+		if item != nil && item.SecretKey != "" {
 			item.SecretKey = "******"
 		}
 	}