From 7b7f51a8602e60ef6e4d53e69ff578a6edbb7b9f Mon Sep 17 00:00:00 2001
From: wangya <757914144@qq.com>
Date: Thu, 25 Jul 2019 21:55:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=85=BE=E8=AE=AF?=
 =?UTF-8?q?=E4=BA=91oss=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/attachment.js           |  4 +++
 src/views/system/OptionForm.vue | 54 +++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+)

diff --git a/src/api/attachment.js b/src/api/attachment.js
index 9a909b3a7..3f4167987 100644
--- a/src/api/attachment.js
+++ b/src/api/attachment.js
@@ -91,6 +91,10 @@ attachmentApi.type = {
   BAIDUYUN: {
     type: 'baiduyun',
     text: '百度云'
+  },
+  TENCENTYUN: {
+    type: 'tencentyun',
+    text: '百度云'
   }
 }
 
diff --git a/src/views/system/OptionForm.vue b/src/views/system/OptionForm.vue
index 28d099dd7..55381bfb7 100644
--- a/src/views/system/OptionForm.vue
+++ b/src/views/system/OptionForm.vue
@@ -423,6 +423,47 @@
                     <a-input v-model="options.oss_baiduyun_style_rule" />
                   </a-form-item>
                 </div>
+                <div
+                        class="tencentyunForm"
+                        v-show="tencentyunFormHidden"
+                >
+                  <a-form-item
+                          label="Bucket："
+                          :wrapper-col="wrapperCol"
+                  >
+                    <a-input v-model="options.oss_tencentyun_bucket_name" />
+                  </a-form-item>
+                  <a-form-item
+                          label="区域："
+                          :wrapper-col="wrapperCol"
+                  >
+                    <a-select v-model="oss_tencentyun_region">
+                      <a-select-option value="ap-beijing-1">北京一区</a-select-option>
+                      <a-select-option value="ap-beijing">北京</a-select-option>
+                      <a-select-option value="ap-shanghai">上海（华东）</a-select-option>
+                      <a-select-option value="ap-guangzhou">广州（华南）</a-select-option>
+                      <a-select-option value="ap-chengdu">成都（西南）</a-select-option>
+                      <a-select-option value="ap-chongqing">重庆</a-select-option>
+                    </a-select>
+                  <a-form-item
+                          label="SecretId："
+                          :wrapper-col="wrapperCol"
+                  >
+                    <a-input v-model="options.oss_tencentyun_access_key" />
+                  </a-form-item>
+                  <a-form-item
+                          label="SecretKey："
+                          :wrapper-col="wrapperCol"
+                  >
+                    <a-input v-model="options.oss_tencentyun_access_secret" />
+                  </a-form-item>
+                  <a-form-item
+                          label="缩略图处理策略："
+                          :wrapper-col="wrapperCol"
+                  >
+                    <a-input v-model="options.oss_tencentyun_style_rule" />
+                  </a-form-item>
+                </div>
                 <a-form-item>
                   <a-button
                     type="primary"
@@ -635,6 +676,7 @@ export default {
       qnyunFormHidden: false,
       aliyunFormHidden: false,
       baiduyunFormHidden: false,
+      tencentyunFormHidden: false,
       logoDrawerVisible: false,
       faviconDrawerVisible: false,
       options: [],
@@ -667,30 +709,42 @@ export default {
           this.qnyunFormHidden = false
           this.aliyunFormHidden = false
           this.baiduyunFormHidden = false
+          this.tencentyunFormHidden = false
           break
         case 'UPYUN':
           this.upyunFormHidden = true
           this.qnyunFormHidden = false
           this.aliyunFormHidden = false
           this.baiduyunFormHidden = false
+          this.tencentyunFormHidden = false
           break
         case 'QNYUN':
           this.qnyunFormHidden = true
           this.upyunFormHidden = false
           this.aliyunFormHidden = false
           this.baiduyunFormHidden = false
+          this.tencentyunFormHidden = false
           break
         case 'ALIYUN':
           this.aliyunFormHidden = true
           this.qnyunFormHidden = false
           this.upyunFormHidden = false
           this.baiduyunFormHidden = false
+          this.tencentyunFormHidden = false
           break
         case 'BAIDUYUN':
           this.aliyunFormHidden = false
           this.qnyunFormHidden = false
           this.upyunFormHidden = false
           this.baiduyunFormHidden = true
+          this.tencentyunFormHidden = false
+          break
+        case 'TENCENTYUN':
+          this.aliyunFormHidden = false
+          this.qnyunFormHidden = false
+          this.upyunFormHidden = false
+          this.baiduyunFormHidden = false
+          this.tencentyunFormHidden = true
           break
       }
     },

From ffb4c25055bbec62fbe27e88538f5ad5ebbc5ae0 Mon Sep 17 00:00:00 2001
From: johnniang <johnniang@riseup.net>
Date: Thu, 25 Jul 2019 22:25:52 +0800
Subject: [PATCH 2/2] Update text of tencent yun

---
 src/api/attachment.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/attachment.js b/src/api/attachment.js
index 3f4167987..b5e02bc01 100644
--- a/src/api/attachment.js
+++ b/src/api/attachment.js
@@ -94,7 +94,7 @@ attachmentApi.type = {
   },
   TENCENTYUN: {
     type: 'tencentyun',
-    text: '百度云'
+    text: '腾讯云'
   }
 }