From 940b996e2d663c1599fcfc7073dc52422e255561 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 10 五月 2022 09:40:40 +0800
Subject: [PATCH] !175 [重大改动] 基于S3协议重新实现 OSS模块 支持自定义域名 * [重大改动] 基于S3协议重新实现 OSS模块 支持自定义域名

---
 ruoyi-ui/src/views/system/oss/config.vue |   38 +++++++++++++-------------------------
 1 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/ruoyi-ui/src/views/system/oss/config.vue b/ruoyi-ui/src/views/system/oss/config.vue
index 152727e..54ad98c 100644
--- a/ruoyi-ui/src/views/system/oss/config.vue
+++ b/ruoyi-ui/src/views/system/oss/config.vue
@@ -2,14 +2,13 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="閰嶇疆key" prop="configKey">
-        <el-select v-model="queryParams.configKey" placeholder="璇烽�夋嫨閰嶇疆key" clearable size="small">
-          <el-option
-            v-for="configKey in configKeyOptions"
-            :key="configKey.configKey"
-            :label="configKey.label"
-            :value="configKey.configKey"
-          />
-        </el-select>
+        <el-input
+          v-model="queryParams.configKey"
+          placeholder="閰嶇疆key"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="妗跺悕绉�" prop="bucketName">
         <el-input
@@ -77,6 +76,7 @@
       <el-table-column label="涓诲缓" align="center" prop="ossConfigId" v-if="false"/>
       <el-table-column label="閰嶇疆key" align="center" prop="configKey" />
       <el-table-column label="璁块棶绔欑偣" align="center" prop="endpoint" width="200" />
+      <el-table-column label="鑷畾涔夊煙鍚�" align="center" prop="domain" width="200" />
       <el-table-column label="妗跺悕绉�" align="center" prop="bucketName" />
       <el-table-column label="鍓嶇紑" align="center" prop="prefix" />
       <el-table-column label="鍩�" align="center" prop="region" />
@@ -122,17 +122,13 @@
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="閰嶇疆key" prop="configKey">
-          <el-select v-model="form.configKey" placeholder="璇烽�夋嫨閰嶇疆key">
-            <el-option
-              v-for="configKey in configKeyOptions"
-              :key="configKey.configKey"
-              :label="configKey.label"
-              :value="configKey.configKey"
-            />
-          </el-select>
+          <el-input v-model="form.configKey" placeholder="璇疯緭鍏ラ厤缃甼ey" />
         </el-form-item>
         <el-form-item label="璁块棶绔欑偣" prop="endpoint">
           <el-input v-model="form.endpoint" placeholder="璇疯緭鍏ヨ闂珯鐐�" />
+        </el-form-item>
+        <el-form-item label="鑷畾涔夊煙鍚�" prop="domain">
+          <el-input v-model="form.domain" placeholder="璇疯緭鍏ヨ嚜瀹氫箟鍩熷悕" />
         </el-form-item>
         <el-form-item label="accessKey" prop="accessKey">
           <el-input v-model="form.accessKey" placeholder="璇疯緭鍏ccessKey" />
@@ -204,14 +200,6 @@
       total: 0,
       // 瀵硅薄瀛樺偍閰嶇疆琛ㄦ牸鏁版嵁
       ossConfigList: [],
-      // configKeyOptions
-      configKeyOptions: [],
-      configKeyDatas: [
-        { configKey: "minio", label: "Minio" },
-        { configKey: "qiniu", label: "涓冪墰浜�" },
-        { configKey: "aliyun", label: "闃块噷浜�" },
-        { configKey: "qcloud", label: "鑵捐浜�" },
-      ],
       // 寮瑰嚭灞傛爣棰�
       title: "",
       // 鏄惁鏄剧ず寮瑰嚭灞�
@@ -276,7 +264,6 @@
   },
   created() {
     this.getList();
-    this.configKeyOptions = this.configKeyDatas;
   },
   methods: {
     /** 鏌ヨ瀵硅薄瀛樺偍閰嶇疆鍒楄〃 */
@@ -303,6 +290,7 @@
         bucketName: undefined,
         prefix: undefined,
         endpoint: undefined,
+        domain: undefined,
         isHttps: "N",
         region: undefined,
         status: "1",

--
Gitblit v1.9.3