From 1f1ce11078f6ed2f1d0990878800adeac94cda60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= <iwind.liu@gmail.com>
Date: Thu, 8 Jun 2023 17:50:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96OSS=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../default/servers/addOriginPopup_ext.go     |  1 +
 .../server/settings/origins/addPopup_ext.go   |  1 +
 .../settings/origins/updatePopup_ext.go       |  1 +
 .../@default/servers/addOriginPopup.html      | 32 +------------------
 .../server/settings/origins/addPopup.html     | 32 +------------------
 .../server/settings/origins/updatePopup.html  | 32 +------------------
 6 files changed, 6 insertions(+), 93 deletions(-)

diff --git a/internal/web/actions/default/servers/addOriginPopup_ext.go b/internal/web/actions/default/servers/addOriginPopup_ext.go
index a871d09d..fa0d03a0 100644
--- a/internal/web/actions/default/servers/addOriginPopup_ext.go
+++ b/internal/web/actions/default/servers/addOriginPopup_ext.go
@@ -10,6 +10,7 @@ import (
 
 func (this *AddOriginPopupAction) getOSSHook() {
 	this.Data["ossTypes"] = []maps.Map{}
+	this.Data["ossForm"] = ""
 }
 
 func (this *AddOriginPopupAction) postOSSHook(protocol string) (config *ossconfigs.OSSConfig, goNext bool, err error) {
diff --git a/internal/web/actions/default/servers/server/settings/origins/addPopup_ext.go b/internal/web/actions/default/servers/server/settings/origins/addPopup_ext.go
index 331587d5..74df40c1 100644
--- a/internal/web/actions/default/servers/server/settings/origins/addPopup_ext.go
+++ b/internal/web/actions/default/servers/server/settings/origins/addPopup_ext.go
@@ -10,6 +10,7 @@ import (
 
 func (this *AddPopupAction) getOSSHook() {
 	this.Data["ossTypes"] = []maps.Map{}
+	this.Data["ossForm"] = ""
 }
 
 func (this *AddPopupAction) postOSSHook(protocol string) (config *ossconfigs.OSSConfig, goNext bool, err error) {
diff --git a/internal/web/actions/default/servers/server/settings/origins/updatePopup_ext.go b/internal/web/actions/default/servers/server/settings/origins/updatePopup_ext.go
index f5089619..190e81ea 100644
--- a/internal/web/actions/default/servers/server/settings/origins/updatePopup_ext.go
+++ b/internal/web/actions/default/servers/server/settings/origins/updatePopup_ext.go
@@ -10,6 +10,7 @@ import (
 
 func (this *UpdatePopupAction) getOSSHook() {
 	this.Data["ossTypes"] = []maps.Map{}
+	this.Data["ossForm"] = ""
 }
 
 func (this *UpdatePopupAction) postOSSHook(protocol string) (config *ossconfigs.OSSConfig, goNext bool, err error) {
diff --git a/web/views/@default/servers/addOriginPopup.html b/web/views/@default/servers/addOriginPopup.html
index 1301394f..11e84b9b 100644
--- a/web/views/@default/servers/addOriginPopup.html
+++ b/web/views/@default/servers/addOriginPopup.html
@@ -47,37 +47,7 @@
         </tr>
 
         <!-- OSS -->
-        <!-- 腾讯云COS -->
-        <tbody v-if="protocol == 'oss:tencentCOS'">
-            <tr>
-                <td>密钥ID *<br/><em>(Secret Id)</em></td>
-                <td>
-                    <input type="text" name="tencentCOSSecretId" maxlength="100"/>
-                    <p class="comment">访问存储桶需要的密钥ID。</p>
-                </td>
-            </tr>
-            <tr>
-                <td>密钥Key *<br/><em>(Secret Key)</em></td>
-                <td>
-                    <input type="text" name="tencentCOSSecretKey" maxlength="100"/>
-                    <p class="comment">访问存储桶需要的密钥Key。</p>
-                </td>
-            </tr>
-            <tr>
-                <td>存储桶名称 *</td>
-                <td>
-                    <input type="text" name="tencentCOSBucketName" maxlength="100"/>
-                    <p class="comment">存储桶名称，类似于<code-label>example-12345678</code-label>。</p>
-                </td>
-            </tr>
-            <tr>
-                <td>所属区域代号 *</td>
-                <td>
-                    <input type="text" name="tencentCOSRegion" maxlength="100"/>
-                    <p class="comment">COS服务所属区域代号，类似于<code-label>ap-beijing</code-label>。</p>
-                </td>
-            </tr>
-        </tbody>
+        {$ .ossForm}
 
         <tr>
             <td colspan="2"><more-options-indicator></more-options-indicator></td>
diff --git a/web/views/@default/servers/server/settings/origins/addPopup.html b/web/views/@default/servers/server/settings/origins/addPopup.html
index b37dc77b..2b8eac84 100644
--- a/web/views/@default/servers/server/settings/origins/addPopup.html
+++ b/web/views/@default/servers/server/settings/origins/addPopup.html
@@ -50,37 +50,7 @@
         </tr>
 
         <!-- OSS -->
-        <!-- 腾讯云COS -->
-        <tbody v-if="protocol == 'oss:tencentCOS'">
-            <tr>
-                <td>密钥ID *<br/><em>(Secret Id)</em></td>
-                <td>
-                    <input type="text" name="tencentCOSSecretId" maxlength="100"/>
-                    <p class="comment">访问存储桶需要的密钥ID。</p>
-                </td>
-            </tr>
-            <tr>
-                <td>密钥Key *<br/><em>(Secret Key)</em></td>
-                <td>
-                    <input type="text" name="tencentCOSSecretKey" maxlength="100"/>
-                    <p class="comment">访问存储桶需要的密钥Key。</p>
-                </td>
-            </tr>
-            <tr>
-                <td>存储桶名称 *</td>
-                <td>
-                    <input type="text" name="tencentCOSBucketName" maxlength="100"/>
-                    <p class="comment">存储桶名称，类似于<code-label>example-12345678</code-label>。</p>
-                </td>
-            </tr>
-            <tr>
-                <td>所属区域代号 *</td>
-                <td>
-                    <input type="text" name="tencentCOSRegion" maxlength="100"/>
-                    <p class="comment">COS服务所属区域代号，类似于<code-label>ap-beijing</code-label>。</p>
-                </td>
-            </tr>
-        </tbody>
+        {$ .ossForm}
 
 		<tr>
 			<td colspan="2"><more-options-indicator></more-options-indicator></td>
diff --git a/web/views/@default/servers/server/settings/origins/updatePopup.html b/web/views/@default/servers/server/settings/origins/updatePopup.html
index 116618f7..b6769bd1 100644
--- a/web/views/@default/servers/server/settings/origins/updatePopup.html
+++ b/web/views/@default/servers/server/settings/origins/updatePopup.html
@@ -51,37 +51,7 @@
         </tr>
 
         <!-- OSS -->
-        <!-- 腾讯云COS -->
-        <tbody v-if="origin.protocol == 'oss:tencentCOS'">
-            <tr>
-                <td>密钥ID *<br/><em>(Secret Id)</em></td>
-                <td>
-                    <input type="text" name="tencentCOSSecretId" maxlength="100" v-model="origin.oss.options.secretId"/>
-                    <p class="comment">访问存储桶需要的密钥ID。</p>
-                </td>
-            </tr>
-            <tr>
-                <td>密钥Key *<br/><em>(Secret Key)</em></td>
-                <td>
-                    <input type="text" name="tencentCOSSecretKey" maxlength="100"  v-model="origin.oss.options.secretKey"/>
-                    <p class="comment">访问存储桶需要的密钥Key。</p>
-                </td>
-            </tr>
-            <tr>
-                <td>存储桶名称 *</td>
-                <td>
-                    <input type="text" name="tencentCOSBucketName" maxlength="100" v-model="origin.oss.options.bucketName"/>
-                    <p class="comment">存储桶名称，类似于<code-label>example-12345678</code-label>。</p>
-                </td>
-            </tr>
-            <tr>
-                <td>所属区域代号 *</td>
-                <td>
-                    <input type="text" name="tencentCOSRegion" maxlength="100"  v-model="origin.oss.options.region"/>
-                    <p class="comment">COS服务所属区域代号，类似于<code-label>ap-beijing</code-label>。</p>
-                </td>
-            </tr>
-        </tbody>
+        {$ .ossForm}
 
 		<tr>
 			<td colspan="2"><more-options-indicator></more-options-indicator></td>