From 110c3552681a59204cc0223fa85ab80e4471c00f Mon Sep 17 00:00:00 2001
From: ChenLingBaby <290295886@qq.com>
Date: Sat, 3 Jun 2017 12:25:44 +0800
Subject: [PATCH] =?UTF-8?q?OSS=E7=BB=9F=E4=B8=80=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/zheng-oss-client.properties     | 10 +---------
 .../com/zheng/oss/web/controller/DemoController.java   |  1 -
 .../src/main/resources/zheng-oss-client.properties     | 10 +---------
 .../src/main/resources/zheng-oss-client.properties     | 10 +---------
 4 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/zheng-cms/zheng-cms-admin/src/main/resources/zheng-oss-client.properties b/zheng-cms/zheng-cms-admin/src/main/resources/zheng-oss-client.properties
index edc86f1f..572713f1 100644
--- a/zheng-cms/zheng-cms-admin/src/main/resources/zheng-oss-client.properties
+++ b/zheng-cms/zheng-cms-admin/src/main/resources/zheng-oss-client.properties
@@ -1,10 +1,2 @@
-### aliyun oss ###
-aliyun.oss.endpoint=oss-cn-shanghai.aliyuncs.com
-aliyun.oss.endpoint.internal=oss-cn-shanghai-internal.aliyuncs.com
-aliyun.oss.accessKeyId=
-aliyun.oss.accessKeySecret=
-aliyun.oss.bucketName=shuzheng
-aliyun.oss.policy.expire=300
-aliyun.oss.maxSize=10
-aliyun.oss.callback=http://shuzheng.tunnel.qydev.com/aliyun/oss/callback
+### aliyun ###
 aliyun.oss.policy=http://oss.zhangshuzheng.cn:7771/aliyun/oss/policy
\ No newline at end of file
diff --git a/zheng-oss/zheng-oss-web/src/main/java/com/zheng/oss/web/controller/DemoController.java b/zheng-oss/zheng-oss-web/src/main/java/com/zheng/oss/web/controller/DemoController.java
index a828e773..910807f2 100644
--- a/zheng-oss/zheng-oss-web/src/main/java/com/zheng/oss/web/controller/DemoController.java
+++ b/zheng-oss/zheng-oss-web/src/main/java/com/zheng/oss/web/controller/DemoController.java
@@ -74,7 +74,6 @@ public class DemoController extends BaseController {
         JSONObject policy = aliyunOssService.policy();
         _log.info("policy={}", policy);
         model.addAttribute("policy", policy);
-        model.addAttribute("policy", policy);
         return thymeleaf("/aliyun/upload");
     }
 
diff --git a/zheng-pay/zheng-pay-web/src/main/resources/zheng-oss-client.properties b/zheng-pay/zheng-pay-web/src/main/resources/zheng-oss-client.properties
index edc86f1f..572713f1 100644
--- a/zheng-pay/zheng-pay-web/src/main/resources/zheng-oss-client.properties
+++ b/zheng-pay/zheng-pay-web/src/main/resources/zheng-oss-client.properties
@@ -1,10 +1,2 @@
-### aliyun oss ###
-aliyun.oss.endpoint=oss-cn-shanghai.aliyuncs.com
-aliyun.oss.endpoint.internal=oss-cn-shanghai-internal.aliyuncs.com
-aliyun.oss.accessKeyId=
-aliyun.oss.accessKeySecret=
-aliyun.oss.bucketName=shuzheng
-aliyun.oss.policy.expire=300
-aliyun.oss.maxSize=10
-aliyun.oss.callback=http://shuzheng.tunnel.qydev.com/aliyun/oss/callback
+### aliyun ###
 aliyun.oss.policy=http://oss.zhangshuzheng.cn:7771/aliyun/oss/policy
\ No newline at end of file
diff --git a/zheng-upms/zheng-upms-server/src/main/resources/zheng-oss-client.properties b/zheng-upms/zheng-upms-server/src/main/resources/zheng-oss-client.properties
index edc86f1f..572713f1 100644
--- a/zheng-upms/zheng-upms-server/src/main/resources/zheng-oss-client.properties
+++ b/zheng-upms/zheng-upms-server/src/main/resources/zheng-oss-client.properties
@@ -1,10 +1,2 @@
-### aliyun oss ###
-aliyun.oss.endpoint=oss-cn-shanghai.aliyuncs.com
-aliyun.oss.endpoint.internal=oss-cn-shanghai-internal.aliyuncs.com
-aliyun.oss.accessKeyId=
-aliyun.oss.accessKeySecret=
-aliyun.oss.bucketName=shuzheng
-aliyun.oss.policy.expire=300
-aliyun.oss.maxSize=10
-aliyun.oss.callback=http://shuzheng.tunnel.qydev.com/aliyun/oss/callback
+### aliyun ###
 aliyun.oss.policy=http://oss.zhangshuzheng.cn:7771/aliyun/oss/policy
\ No newline at end of file