shuzheng 9 лет назад
Родитель
Сommit
31dcc3811a

+ 4 - 1
zheng-oss/zheng-oss-web/src/main/java/com/zheng/oss/web/controller/AliyunOssController.java

@@ -1,6 +1,7 @@
 package com.zheng.oss.web.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.zheng.oss.common.constant.OssConstant;
 import com.zheng.oss.common.constant.OssResult;
 import com.zheng.oss.common.constant.OssResultConstant;
 import com.zheng.oss.web.service.AliyunOssService;
@@ -53,7 +54,9 @@ public class AliyunOssController {
 	@ResponseBody
 	public Object callback(HttpServletRequest request) {
 		JSONObject data = new JSONObject();
-		data.put("filename", request.getParameter("filename"));
+		String filename = request.getParameter("filename");
+		filename = "http://".concat(OssConstant.ALIYUN_OSS_BUCKET_NAME).concat(".").concat(OssConstant.ALIYUN_OSS_ENDPOINT).concat("/").concat(filename);
+		data.put("filename", filename);
 		data.put("size", request.getParameter("size"));
 		data.put("mimeType", request.getParameter("mimeType"));
 		data.put("width", request.getParameter("width"));

+ 3 - 3
zheng-oss/zheng-oss-web/src/main/resources/profiles/dev.properties

@@ -5,9 +5,9 @@ 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=
-aliyun.oss.accessKeySecret=
+aliyun.oss.accessKeyId=LTAIujvuTExezdKk
+aliyun.oss.accessKeySecret=T7UnQA5mEbTZXJpdrZjOZzoPoqHuYb
 aliyun.oss.bucketName=shuzheng
-aliyun.oss.policy.expire=30
+aliyun.oss.policy.expire=300
 aliyun.oss.maxSize=10
 aliyun.oss.callback=http://shuzheng.tunnel.qydev.com/aliyun/oss/callback

+ 1 - 1
zheng-oss/zheng-oss-web/src/main/resources/profiles/prod.properties

@@ -8,6 +8,6 @@ aliyun.oss.endpoint.internal=oss-cn-shanghai-internal.aliyuncs.com
 aliyun.oss.accessKeyId=
 aliyun.oss.accessKeySecret=
 aliyun.oss.bucketName=shuzheng_prod
-aliyun.oss.policy.expire=30
+aliyun.oss.policy.expire=300
 aliyun.oss.maxSize=10
 aliyun.oss.callback=http://shuzheng.tunnel.qydev.com/aliyun/oss/callback

+ 1 - 1
zheng-oss/zheng-oss-web/src/main/resources/profiles/test.properties

@@ -8,6 +8,6 @@ aliyun.oss.endpoint.internal=oss-cn-shanghai-internal.aliyuncs.com
 aliyun.oss.accessKeyId=
 aliyun.oss.accessKeySecret=
 aliyun.oss.bucketName=shuzheng_test
-aliyun.oss.policy.expire=30
+aliyun.oss.policy.expire=300
 aliyun.oss.maxSize=10
 aliyun.oss.callback=http://shuzheng.tunnel.qydev.com/aliyun/oss/callback