From 14237cb56b92730896007fcfe4a494cb710501d5 Mon Sep 17 00:00:00 2001
From: shuzheng <469741414@qq.com>
Date: Tue, 16 May 2017 10:37:46 +0800
Subject: [PATCH] =?UTF-8?q?oss=E5=8F=AA=E4=BC=A0=E6=8F=90=E4=BA=A4?=
=?UTF-8?q?=E8=8A=82=E7=82=B9=E4=BB=8E=E6=9C=8D=E5=8A=A1=E5=99=A8=E8=8E=B7?=
=?UTF-8?q?=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../main/java/com/zheng/oss/web/service/AliyunOssService.java | 3 +++
.../zheng-oss-web/src/main/resources/profiles/dev.properties | 4 ++--
zheng-ui/zheng-oss-web/aliyun/upload.html | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/zheng-oss/zheng-oss-web/src/main/java/com/zheng/oss/web/service/AliyunOssService.java b/zheng-oss/zheng-oss-web/src/main/java/com/zheng/oss/web/service/AliyunOssService.java
index 843f7609..75f487ce 100644
--- a/zheng-oss/zheng-oss-web/src/main/java/com/zheng/oss/web/service/AliyunOssService.java
+++ b/zheng-oss/zheng-oss-web/src/main/java/com/zheng/oss/web/service/AliyunOssService.java
@@ -45,6 +45,8 @@ public class AliyunOssService {
callback.put("callbackUrl", PropertiesFileUtil.getInstance("config").get("aliyun.oss.callback"));
callback.put("callbackBody", "filename=${object}&size=${size}&mimeType=${mimeType}&height=${imageInfo.height}&width=${imageInfo.width}");
callback.put("callbackBodyType", "application/x-www-form-urlencoded");
+ // 提交节点
+ String action = "http://" + OssConstant.ALIYUN_OSS_BUCKET_NAME + "." + OssConstant.ALIYUN_OSS_ENDPOINT;
try {
PolicyConditions policyConds = new PolicyConditions();
policyConds.addConditionItem(PolicyConditions.COND_CONTENT_LENGTH_RANGE, 0, maxSize);
@@ -60,6 +62,7 @@ public class AliyunOssService {
result.put("signature", signature);
result.put("dir", dir);
result.put("callback", callbackData);
+ result.put("action", action);
} catch (Exception e) {
_log.error("签名生成失败", e);
}
diff --git a/zheng-oss/zheng-oss-web/src/main/resources/profiles/dev.properties b/zheng-oss/zheng-oss-web/src/main/resources/profiles/dev.properties
index 1a868263..6ce4703b 100644
--- a/zheng-oss/zheng-oss-web/src/main/resources/profiles/dev.properties
+++ b/zheng-oss/zheng-oss-web/src/main/resources/profiles/dev.properties
@@ -5,8 +5,8 @@ zheng-ui.path=http://ui.zhangshuzheng.cn:1000/
### aliyun oss ###
aliyun.oss.endpoint=oss-cn-shanghai.aliyuncs.com
aliyun.oss.endpoint.internal=oss-cn-shanghai-internal.aliyuncs.com
-aliyun.oss.accessKeyId=LTAIujvuTExezdKk
-aliyun.oss.accessKeySecret=T7UnQA5mEbTZXJpdrZjOZzoPoqHuYb
+aliyun.oss.accessKeyId=
+aliyun.oss.accessKeySecret=
aliyun.oss.bucketName=shuzheng
aliyun.oss.policy.expire=300
aliyun.oss.maxSize=10
diff --git a/zheng-ui/zheng-oss-web/aliyun/upload.html b/zheng-ui/zheng-oss-web/aliyun/upload.html
index 3df38afb..4a5d0f32 100644
--- a/zheng-ui/zheng-oss-web/aliyun/upload.html
+++ b/zheng-ui/zheng-oss-web/aliyun/upload.html
@@ -5,7 +5,7 @@
zheng-oss-web AliyunOSS demo
-