Merge remote-tracking branch 'origin/main' into fix/server

以 '#' 开始的行将被忽略，而空的提交说明将终止提交。

nuxt.config.ts

@@ -66,8 +66,8 @@ export default defineNuxtConfig({
 
       // 授权信息
       license: {
-        "name": "Apache-2.0",
-        "expired": 4102329600
+        // "name": "Apache-2.0",
+        // "expired": 4102329600
       }
     }
   },

pages/auth/login.vue

@@ -22,14 +22,17 @@ const sts = ref({
   sessionToken: '',
 })
 
+const localConfig =  configManager.loadConfig()
+const serverConfigObj  = new URL(localConfig?.s3.endpoint || 'http:://localhost:9000') 
 // 服务端配置
 const serverConfig = ref({
-  protocol: 'http',
-  host: 'localhost',
-  port: '9000',
-  region: 'us-east-1'
+  protocol: serverConfigObj.protocol || 'http',
+  host: serverConfigObj.hostname || 'localhost',
+  port: serverConfigObj.port || '9000',
+  region: localConfig?.s3.region || 'us-east-1'
 })
 
+
 const message = useMessage()
 const auth = useAuth()
 
@@ -221,8 +224,8 @@ const onUrlInput = () => {
             </div>
 
             <n-tabs type="segment" animated size="small" v-model:value="method">
-              <n-tab-pane name="accessKeyAndSecretKey" :label="t('Key Login')" />
-              <n-tab-pane name="sts" :label="t('STS Login')" />
+              <n-tab-pane name="accessKeyAndSecretKey" :tab="t('Key Login')" />
+              <n-tab-pane name="sts" :tab="t('STS Login')" />
             </n-tabs>
 
             <!-- Form -->
@@ -248,7 +251,7 @@ const onUrlInput = () => {
                   </div>
                   <div>
                     <label for="sts.secretAccessKey" class="block text-sm mb-2 dark:text-white">{{ t('STS Key') }}</label>
-                    <n-input v-model:value="sts.secretAccessKey" autocomplete="new-password" type="password" :placeholder="t('Please enter STS key')" />
+                    <n-input v-model:value="sts.secretAccessKey" autocomplete="new-password" type="password"  :placeholder="t('Please enter STS key')" />
                   </div>
                   <div>
                     <label for="sessionToken" class="block text-sm mb-2 dark:text-white">{{ t('STS Session Token') }}</label>