From c6bea9b7eca3f1953346710f49d077b1bf18b516 Mon Sep 17 00:00:00 2001
From: wangkang <wangkangit@163.com>
Date: Mon, 27 Nov 2017 20:14:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=98=BF=E9=87=8C=E4=BA=91os?=
 =?UTF-8?q?s=E7=9A=84=E9=9B=86=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../itkk/udf/file/aliyun/oss/PostObjectPolicy.java    | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/udf-starter-file-aliyun-oss/src/main/java/org/itkk/udf/file/aliyun/oss/PostObjectPolicy.java b/udf-starter-file-aliyun-oss/src/main/java/org/itkk/udf/file/aliyun/oss/PostObjectPolicy.java
index 6f39645..97c84fb 100644
--- a/udf-starter-file-aliyun-oss/src/main/java/org/itkk/udf/file/aliyun/oss/PostObjectPolicy.java
+++ b/udf-starter-file-aliyun-oss/src/main/java/org/itkk/udf/file/aliyun/oss/PostObjectPolicy.java
@@ -3,6 +3,7 @@ package org.itkk.udf.file.aliyun.oss;
 import com.aliyun.oss.OSSClient;
 import com.aliyun.oss.common.utils.BinaryUtil;
 import com.aliyun.oss.model.PolicyConditions;
+import org.apache.commons.lang3.StringUtils;
 import org.itkk.udf.core.ApplicationConfig;
 import org.itkk.udf.core.exception.ParameterValidException;
 import org.itkk.udf.file.aliyun.oss.domain.PolicyResult;
@@ -102,8 +103,14 @@ public class PostObjectPolicy {
         OSSClient client = new OSSClient(auth.getEndPoint(), auth.getAccessId(), auth.getAccessKey());
         // 生成URL
         URL url = client.generatePresignedUrl(path.getBucketName(), objectKey, expiration);
-        //返回
-        return url.getFile();
+        //返回地址判断
+        if (StringUtils.isNotBlank(path.getCdnHost())) {
+            //返回CDN地址
+            return path.getCdnHost() + url.getFile();
+        } else {
+            //返回OSS公网地址
+            return url.getFile();
+        }
     }
 
 }