's'

config/digital/services.config.ts

@@ -9,9 +9,8 @@ import { IS_DEVELOPMENT } from "../runtime-env";
 import {
   resolvePaymentApiUrl,
   DEFAULT_POCKETBASE_URL,
-  DEFAULT_MINIO_HOST,
-  DEFAULT_MINIO_PUBLIC_HOST,
 } from "./domain.config";
+import { resolveMinioConnection, resolvePocketBaseUrl } from "../remote-services";
 
 export interface PocketBaseConfig {
   enabled: boolean;
@@ -88,7 +87,7 @@ export function getPocketBaseConfig(themeOverride?: { joinCollection?: string })
     "solan";
   return {
     enabled: true,
-    url: process.env.NEXT_PUBLIC_POCKETBASE_URL || process.env.POCKETBASE_URL || DEFAULT_POCKETBASE_URL,
+    url: resolvePocketBaseUrl() || DEFAULT_POCKETBASE_URL,
     usersCollection: "users",
     joinCollection,
   };
@@ -113,25 +112,20 @@ export function getPaymentConfig(themeOverride?: { amount?: number; type?: strin
 
 /** 获取 MinIO 配置（可传入主题覆盖 bucket/prefix） */
 export function getMinioConfig(themeOverride?: { bucket?: string; uploadPrefix?: string }): MinioConfig {
-  const endPoint = process.env.MINIO_ENDPOINT || DEFAULT_MINIO_HOST;
-  const port = parseInt(process.env.MINIO_PORT || "9100", 10);
-  const useSSL = process.env.MINIO_USE_SSL === "true";
   const bucket = themeOverride?.bucket || process.env.MINIO_BUCKET || "hackrobot";
-  const publicUrl =
-    process.env.MINIO_PUBLIC_URL ||
-    `https://${DEFAULT_MINIO_PUBLIC_HOST}/${bucket}`;
+  const conn = resolveMinioConnection({ bucket });
   const uploadPrefix = themeOverride?.uploadPrefix || process.env.MINIO_UPLOAD_PREFIX || "joins";
 
   return {
     enabled: true,
-    endPoint,
-    port,
-    useSSL,
-    bucket,
+    endPoint: conn.endPoint,
+    port: conn.port,
+    useSSL: conn.useSSL,
+    bucket: conn.bucket,
     accessKey: process.env.MINIO_ACCESS_KEY || "nomadro",
     secretKey: process.env.MINIO_SECRET_KEY || "Xiao4669805@",
     region: process.env.MINIO_REGION || "china",
-    publicUrl: publicUrl.replace(/\/$/, ""),
+    publicUrl: conn.publicUrl,
     uploadPrefix,
   };
 }