上传签名更新

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

@@ -51,13 +51,15 @@ public class OssController {
 
 
     @ApiImplicitParams({
+            @ApiImplicitParam(name = "bucketName", dataType = "String", value = "为空时默认使用daya"),
             @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" +
+            "    \"bucketName\":\"\",\n" +
+            "    \"filename\":\"test.png\",\n" +
             "    \"postData\":{\n" +
             "        \"acl\":\"public-read\",\n" +
             "        \"key\":\"20150115/中文/${filename}\"\n" +

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/UploadFileController.java

@@ -50,13 +50,15 @@ public class UploadFileController extends BaseController {
     }
 
     @ApiImplicitParams({
+            @ApiImplicitParam(name = "bucketName", dataType = "String", value = "为空时默认使用daya"),
             @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" +
+            "    \"bucketName\":\"\",\n" +
+            "    \"filename\":\"test.png\",\n" +
             "    \"postData\":{\n" +
             "        \"acl\":\"public-read\",\n" +
             "        \"key\":\"20150115/中文/${filename}\"\n" +

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/UploadFileController.java

@@ -50,13 +50,15 @@ public class UploadFileController extends BaseController {
     }
 
     @ApiImplicitParams({
+            @ApiImplicitParam(name = "bucketName", dataType = "String", value = "为空时默认使用daya"),
             @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" +
+            "    \"bucketName\":\"\",\n" +
+            "    \"filename\":\"test.png\",\n" +
             "    \"postData\":{\n" +
             "        \"acl\":\"public-read\",\n" +
             "        \"key\":\"20150115/中文/${filename}\"\n" +

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/UploadFileController.java

@@ -50,13 +50,15 @@ public class UploadFileController extends BaseController {
     }
 
     @ApiImplicitParams({
+            @ApiImplicitParam(name = "bucketName", dataType = "String", value = "为空时默认使用daya"),
             @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" +
+            "    \"bucketName\":\"\",\n" +
+            "    \"filename\":\"test.png\",\n" +
             "    \"postData\":{\n" +
             "        \"acl\":\"public-read\",\n" +
             "        \"key\":\"20150115/中文/${filename}\"\n" +

toolset/thirdparty-component/src/main/java/com/yonge/toolset/thirdparty/entity/UploadSign.java

@@ -9,12 +9,22 @@ import java.util.Map;
  * @Date: 2022/4/27
  */
 public class UploadSign implements Serializable {
+    private String bucketName;
+
     private String filename;
-    
+
     private Map<String, String> postData;
-    
+
     private List<String> unknowValueField;
 
+    public String getBucketName() {
+        return bucketName;
+    }
+
+    public void setBucketName(String bucketName) {
+        this.bucketName = bucketName;
+    }
+
     public String getFilename() {
         return filename;
     }

toolset/thirdparty-component/src/main/java/com/yonge/toolset/thirdparty/storage/provider/KS3StoragePlugin.java

@@ -146,14 +146,18 @@ public class KS3StoragePlugin implements StoragePlugin, InitializingBean, Dispos
 
     @Override
     public PostObjectFormFields getUploadSign(UploadSign uploadSign) {
+        String bucketName = uploadSign.getBucketName();
+        if (bucketName == null) {
+            bucketName = this.bucketName;
+        }
         //要上传的文件名称,不包含路径信息
         String fileName = uploadSign.getFilename();
         //可以确定值得表单项
         Map<String, String> postData = uploadSign.getPostData();
         //无法确定值得表单项
         List<String> unknowValueField = uploadSign.getUnknowValueField();
-        if (unknowValueField==null){
-            unknowValueField=new ArrayList<>();
+        if (unknowValueField == null) {
+            unknowValueField = new ArrayList<>();
         }
 
         Ks3ClientConfig config = new Ks3ClientConfig();