瀏覽代碼

update:mall oss 改为ks3

liujunchi 3 年之前
父節點
當前提交
ebe4e58a66

+ 5 - 0
cooleshow-mall/mall-admin/pom.xml

@@ -29,6 +29,11 @@
         </dependency>
 
         <dependency>
+            <groupId>com.yonge.toolset</groupId>
+            <artifactId>thirdparty-component</artifactId>
+        </dependency>
+
+        <dependency>
             <groupId>com.yonge.cooleshow</groupId>
             <artifactId>mall-mbg</artifactId>
         </dependency>

+ 1 - 1
cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/MallAdminApplication.java

@@ -16,7 +16,7 @@ import org.springframework.context.annotation.ComponentScan;
 @EnableDiscoveryClient
 @MapperScan({"com.yonge.cooleshow.admin.dao","com.yonge.cooleshow.mbg.mapper"})
 @ComponentScan(basePackages = {"com.yonge.cooleshow.admin", "com.yonge.cooleshow.mbg", "com.yonge.cooleshow.mall.common",
-                               "com.yonge.cooleshow.common","com.yonge.cooleshow"})
+                               "com.yonge.cooleshow.common","com.yonge.cooleshow","com.yonge.toolset.thirdparty"})
 @EnableSwagger2Doc
 @EnableFeignClients("com.yonge.cooleshow")
 public class MallAdminApplication {

+ 29 - 3
cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/controller/OssController.java

@@ -1,17 +1,22 @@
 package com.yonge.cooleshow.admin.controller;
 
 
+import com.ksyun.ks3.dto.PostObjectFormFields;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.mall.common.api.CommonResult;
 import com.yonge.cooleshow.admin.dto.OssCallbackResult;
 import com.yonge.cooleshow.admin.dto.OssPolicyResult;
 import com.yonge.cooleshow.admin.service.OssService;
+import com.yonge.toolset.thirdparty.entity.UploadSign;
+import com.yonge.toolset.thirdparty.storage.StoragePluginContext;
+import com.yonge.toolset.thirdparty.storage.provider.KS3StoragePlugin;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -25,6 +30,8 @@ import javax.servlet.http.HttpServletRequest;
 public class OssController {
     @Autowired
     private OssService ossService;
+    @Autowired
+    private StoragePluginContext storagePluginContext;
 
     @ApiOperation(value = "Oss上传签名生成")
     @RequestMapping(value = "/policy", method = RequestMethod.GET)
@@ -42,4 +49,23 @@ public class OssController {
         return CommonResult.success(ossCallbackResult);
     }
 
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "fileName", dataType = "String", value = "要上传的文件名称,不包含路径信息"),
+            @ApiImplicitParam(name = "postData", dataType = "Map", value = "1.如果使用js sdk上传的时候设置了ACL请设置,例\"acl\":\"public-read\"值要与SDK中一致,没有则删除该项</br>" +
+                    "2.提供js sdk中的key值,例\"key\":\"20150115/中文/${filename}\""),
+            @ApiImplicitParam(name = "unknowValueField", dataType = "List", value = "对于用户无法确定表单值的放在unknownValueField中(比如有的上传控件会添加一些表单项,但表单项的值可能是随机的)"),
+    })
+    @ApiOperation(value = "获取上传文件签名", notes = "{\n" +
+            "    \"fileName\":\"aa\",\n" +
+            "    \"postData\":{\n" +
+            "        \"acl\":\"public-read\",\n" +
+            "        \"key\":\"20150115/中文/${filename}\"\n" +
+            "    },\n" +
+            "    \"unknowValueField\":[\"test\"]\n" +
+            "}")
+    @PostMapping("/getUploadSign")
+    public CommonResult<PostObjectFormFields> getUploadSign(@RequestBody UploadSign uploadSign) {
+        return CommonResult.success(storagePluginContext.getUploadSign(KS3StoragePlugin.PLUGIN_NAME, uploadSign));
+    }
 }