From 3a3ca608dc0d57b117560341c078186b274c8c1c Mon Sep 17 00:00:00 2001
From: ruibaby <i@ryanc.cc>
Date: Tue, 5 Mar 2019 20:08:44 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E4=B8=83=E7=89=9B=E4=BA=91?=
 =?UTF-8?q?=E5=AD=98=E5=82=A8=E5=8F=AF=E9=85=8D=E7=BD=AE=E5=8C=BA=E5=9F=9F?=
 =?UTF-8?q?=20#110?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/api/ApiJournalController.java    |  1 -
 src/main/resources/templates/admin/admin_option.ftl | 13 +++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/main/java/cc/ryanc/halo/web/controller/api/ApiJournalController.java b/src/main/java/cc/ryanc/halo/web/controller/api/ApiJournalController.java
index 67c101dcb..8b8a097ec 100644
--- a/src/main/java/cc/ryanc/halo/web/controller/api/ApiJournalController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/api/ApiJournalController.java
@@ -34,7 +34,6 @@ public class ApiJournalController {
     @PostMapping
     @ResponseStatus(HttpStatus.CREATED)
     public PostDetailOutputDTO save(@RequestBody JournalParam journalParam) {
-        // TODO need to validate token
 
         Post post = journalParam.convertTo();
 
diff --git a/src/main/resources/templates/admin/admin_option.ftl b/src/main/resources/templates/admin/admin_option.ftl
index 9ac6a2fbd..da027c231 100755
--- a/src/main/resources/templates/admin/admin_option.ftl
+++ b/src/main/resources/templates/admin/admin_option.ftl
@@ -446,6 +446,19 @@
 
                                     <!-- 七牛云 -->
                                     <div class="qiniu-options" style="display: none">
+                                        <div class="form-group">
+                                            <label for="qiniuZone" class="col-lg-2 col-sm-4 control-label">区域：</label>
+                                            <div class="col-lg-4 col-sm-8">
+                                                <select class="form-control" id="qiniuZone" name="qiniu_zone">
+                                                    <option ${((options.qiniu_zone!'')=='')?string('selected','')}>自动选择</option>
+                                                    <option value="z0" ${((options.qiniu_zone!)=='z0')?string('selected','')}>华东</option>
+                                                    <option value="z1" ${((options.qiniu_zone!)=='z1')?string('selected','')}>华北</option>
+                                                    <option value="z2" ${((options.qiniu_zone!)=='z2')?string('selected','')}>华南</option>
+                                                    <option value="na0" ${((options.qiniu_zone!)=='na0')?string('selected','')}>北美</option>
+                                                    <option value="as0" ${((options.qiniu_zone!)=='as0')?string('selected','')}>东南亚</option>
+                                                </select>
+                                            </div>
+                                        </div>
                                         <div class="form-group">
                                             <label for="qiniuDomain" class="col-lg-2 col-sm-4 control-label"><@spring.message code='admin.setting.form.qiniu-domain' /></label>
                                             <div class="col-lg-4 col-sm-8">