update OSS上传样例

doc/readme.md

+阿里云OSS上传回调时返回的数据
+图片
+{
+    "bucket": ""qkdata-online-edu"",
+    "fileName": ""pjMwzsYBwD.png"",
+    "etag": ""367FA509D3CCB1838ADE75533E779DAC"",
+    "size": "1079945",
+    "mimeType": ""image/png"",
+    "imageHeight": "573",
+    "imageWidth": "1400",
+    "imageFormat": ""png""
+}
+word
+{
+    "bucket": ""qkdata-online-edu"",
+    "fileName": ""红十字会小程序功能清单.doc"",
+    "etag": ""82F9C1FFC48EDBAD8ECF99C05A27C113"",
+    "size": "33280",
+    "mimeType": ""application/msword"",
+    "imageHeight": "",
+    "imageWidth": "",
+    "imageFormat": "null"
+}
+pdf
+{
+    "bucket": ""qkdata-online-edu"",
+    "fileName": ""天地伟业-报价部分7.17.pdf"",
+    "etag": ""8A4CCB36312BBBCD0DF80F2A59EF4A2A"",
+    "size": "184992",
+    "mimeType": ""application/pdf"",
+    "imageHeight": "",
+    "imageWidth": "",
+    "imageFormat": "null"
+}

pom.xml

@@ -91,11 +91,11 @@
             <groupId>org.springframework.retry</groupId>
             <artifactId>spring-retry</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-devtools</artifactId>
-            <optional>true</optional>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-devtools</artifactId>-->
+<!--            <optional>true</optional>-->
+<!--        </dependency>-->
         <!--shiro-->
         <dependency>
             <groupId>org.apache.shiro</groupId>
@@ -293,7 +293,7 @@
                     <layout>ZIP</layout>
                     <classifier>all</classifier>
                     <!-- 引入devtools后fork为false才能断点,但热部署失败，fork为true时热部署正常，debug失败 -->
-                    <fork>false</fork>
+<!--                    <fork>false</fork>-->
                 </configuration>
                 <executions>
                     <execution>

src/main/java/com/qkdata/biz/aliyun/controller/AliyunOSSCallbackController.java

 package com.qkdata.biz.aliyun.controller;
 
+import com.alibaba.fastjson.JSONObject;
+import com.qkdata.biz.aliyun.vo.AliyunCallbackRespModel;
 import com.qkdata.common.annotation.SysLog;
+import com.qkdata.common.base.model.Result;
 import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+@Slf4j
 @Api(tags = "阿里云OSS callback")
 @RestController
 @RequestMapping("/aliyun")
@@ -14,8 +19,8 @@ public class AliyunOSSCallbackController {
 
     @SysLog("oss上传回调")
     @PostMapping("/oss/callback")
-    public String callback(@RequestBody String respData){
-        System.out.println(respData);
-        return "{\"Status\": \"OK\"}";
+    public Result<String> callback(@RequestBody AliyunCallbackRespModel model){
+
+        return Result.succeed("ok");
     }
 }

src/main/java/com/qkdata/biz/aliyun/service/AliyunService.java

@@ -59,16 +59,7 @@ public class AliyunService {
 
         JSONObject jsonCallback = new JSONObject();
         jsonCallback.put("callbackUrl",frontendDomain + serverContextPath + "/aliyun/oss/callback");
-        jsonCallback.put("callbackBody","{\n" +
-                "    \"bucket\": \"${bucket}\",\n" +
-                "    \"fileName\": \"${object}\",\n" +
-                "    \"etag\": \"${etag}\",\n" +
-                "    \"size\": \"${size}\",\n" +
-                "    \"mimeType\": \"${mimeType}\",\n" +
-                "    \"imageHeight\": \"${imageInfo.height}\",\n" +
-                "    \"imageWidth\": \"${imageInfo.width}\",\n" +
-                "    \"imageFormat\": \"${imageInfo.format}\"\n" +
-                "}");
+        jsonCallback.put("callbackBody","{\"bucket\":${bucket},\"imageWidth\":${imageInfo.width},\"imageFormat\":${imageInfo.format},\"fileName\":${object},\"size\":${size},\"etag\":${etag},\"mimeType\":${mimeType},\"imageHeight\":${imageInfo.height}}");
         jsonCallback.put("callbackBodyType","application/json");
         String base64CallbackBody = BinaryUtil.toBase64String(jsonCallback.toString().getBytes());
         model.setCallback(base64CallbackBody);

src/main/java/com/qkdata/biz/aliyun/vo/AliyunCallbackRespModel.java

+package com.qkdata.biz.aliyun.vo;
+
+import lombok.Data;
+
+/**
+ * {
+ *     "bucket": ""qkdata-online-edu"",
+ *     "fileName": ""pjMwzsYBwD.png"",
+ *     "etag": ""367FA509D3CCB1838ADE75533E779DAC"",
+ *     "size": "1079945",
+ *     "mimeType": ""image/png"",
+ *     "imageHeight": "573",
+ *     "imageWidth": "1400",
+ *     "imageFormat": ""png""
+ * }
+ */
+@Data
+public class AliyunCallbackRespModel {
+    private String buket;
+    private String fileName;
+    private String etag;
+    private Long size;
+    private String mimeType;
+    private Integer imageHeight;
+    private Integer imageWidth;
+    private String imageFormat;
+
+}

src/main/resources/static/index.html

@@ -25,8 +25,8 @@
 </ol>
 <br>
 <form name=theform>
-<input type="radio" name="myradio" value="local_name" checked=true/> 上传文件名字保持本地文件名字
-<input type="radio" name="myradio" value="random_name" /> 上传文件名字是随机文件名, 后缀保留
+<input type="radio" name="myradio" value="local_name" /> 上传文件名字保持本地文件名字
+<input type="radio" name="myradio" value="random_name" checked=true/> 上传文件名字是随机文件名, 后缀保留
 </form>
 
 <h4>您所选择的文件列表：</h4>