From be6b58b0a1c511950733bf1fde63799208fdbe44 Mon Sep 17 00:00:00 2001
From: ssongliu <73214554+ssongliu@users.noreply.github.com>
Date: Mon, 15 Jan 2024 15:07:00 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20WebDav=20=E7=AB=AF=E5=8F=A3=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E5=BF=85=E5=A1=AB=E6=A0=A1=E9=AA=8C=20(#3617)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/utils/cloud_storage/client/webdav.go  |  8 +++++--
 .../setting/backup-account/webdav/index.vue   | 24 ++++++++++++-------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/backend/utils/cloud_storage/client/webdav.go b/backend/utils/cloud_storage/client/webdav.go
index 7da3fe470..966fdc870 100644
--- a/backend/utils/cloud_storage/client/webdav.go
+++ b/backend/utils/cloud_storage/client/webdav.go
@@ -15,12 +15,16 @@ type webDAVClient struct {
 
 func NewWebDAVClient(vars map[string]interface{}) (*webDAVClient, error) {
 	address := loadParamFromVars("address", true, vars)
-	port := loadParamFromVars("port", false, vars)
+	port := loadParamFromVars("port", true, vars)
 	password := loadParamFromVars("password", true, vars)
 	username := loadParamFromVars("username", true, vars)
 	bucket := loadParamFromVars("bucket", true, vars)
 
-	client := gowebdav.NewClient(fmt.Sprintf("%s:%s", address, port), username, password)
+	url := fmt.Sprintf("%s:%s", address, port)
+	if len(port) == 0 {
+		url = address
+	}
+	client := gowebdav.NewClient(url, username, password)
 	if err := client.Connect(); err != nil {
 		return nil, err
 	}
diff --git a/frontend/src/views/setting/backup-account/webdav/index.vue b/frontend/src/views/setting/backup-account/webdav/index.vue
index 01664cfb8..4e1857616 100644
--- a/frontend/src/views/setting/backup-account/webdav/index.vue
+++ b/frontend/src/views/setting/backup-account/webdav/index.vue
@@ -24,12 +24,8 @@
                                 </template>
                             </el-input>
                         </el-form-item>
-                        <el-form-item :label="$t('commons.table.port')" prop="varsJson.port" :rules="[Rules.port]">
-                            <el-input-number
-                                :min="0"
-                                :max="65535"
-                                v-model.number="webdavData.rowData!.varsJson['port']"
-                            />
+                        <el-form-item :label="$t('commons.table.port')" prop="varsJson.port" :rules="[portRule]">
+                            <el-input-number v-model.number="webdavData.rowData!.varsJson['port']" />
                         </el-form-item>
                         <el-form-item
                             :label="$t('commons.login.username')"
@@ -71,7 +67,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref } from 'vue';
+import { reactive, ref } from 'vue';
 import { Rules } from '@/global/form-rules';
 import i18n from '@/lang';
 import { ElForm } from 'element-plus';
@@ -79,7 +75,7 @@ import { Backup } from '@/api/interface/backup';
 import DrawerHeader from '@/components/drawer-header/index.vue';
 import { addBackup, editBackup } from '@/api/modules/setting';
 import { MsgSuccess } from '@/utils/message';
-import { spliceHttp, splitHttp } from '@/utils/util';
+import { checkPort, spliceHttp, splitHttp } from '@/utils/util';
 
 const loading = ref(false);
 type FormInstance = InstanceType<typeof ElForm>;
@@ -97,6 +93,18 @@ const drawerVisible = ref(false);
 const webdavData = ref<DialogProps>({
     title: '',
 });
+
+const portRule = reactive({ validator: checkportRule, trigger: 'blur', type: 'number' });
+
+function checkportRule(rule: any, value: any, callback: any) {
+    if (value !== undefined && value !== null) {
+        if (checkPort(value)) {
+            return callback(new Error(i18n.global.t('commons.rule.port')));
+        }
+    }
+    callback();
+}
+
 const acceptParams = (params: DialogProps): void => {
     webdavData.value = params;
     if (webdavData.value.title === 'edit') {