上传修改

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/admin/upush/create.html

@@ -115,7 +115,7 @@
         <div class="form-group">
             <label class="font-noraml">推送图片</label>
             <div class="file-loading">
-                <input id="fileinput-demo-1" type="file" name="files" data-browse-on-zone-click="true"
+                <input id="fileinput-demo-1" type="file" name="file" data-browse-on-zone-click="true"
                        data-msg-placeholder="Select {files} for upload...">
             </div>
         </div>

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/banners/create.html

@@ -118,7 +118,7 @@
         <div class="form-group">
             <label class="font-noraml">请上传封面图</label>
             <div class="file-loading">
-                <input id="fileinput-demo-1" type="file" name="files" data-browse-on-zone-click="true"
+                <input id="fileinput-demo-1" type="file" name="file" data-browse-on-zone-click="true"
                        data-msg-placeholder="Select {files} for upload...">
             </div>
         </div>

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/banners/update.html

@@ -142,7 +142,7 @@
         <div class="form-group">
             <label class="font-noraml">请上传封面图</label>
             <div class="file-loading">
-                <input id="fileinput-demo-1" type="file" name="files" th:value="${KylinBannersVo.coverImg}" data-browse-on-zone-click="true"
+                <input id="fileinput-demo-1" type="file" name="file" th:value="${KylinBannersVo.coverImg}" data-browse-on-zone-click="true"
                        data-msg-placeholder="Select {files} for upload...">
             </div>
         </div>

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/zhengzaiAppVersion/create.html

@@ -96,7 +96,7 @@
         <div class="form-group">
             <label class="font-noraml">Android请上传apk文件</label>
             <div class="file-loading">
-                <input id="fileinput-demo-1" type="file" name="files" data-browse-on-zone-click="true"
+                <input id="fileinput-demo-1" type="file" name="file" data-browse-on-zone-click="true"
                        data-msg-placeholder="Select {files} for upload...">
             </div>
         </div>

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/zhengzaiAppVersion/update.html

@@ -96,7 +96,7 @@
         <div class="form-group">
             <label class="font-noraml">Android请上传apk文件</label>
             <div class="file-loading">
-                <input id="fileinput-demo-1" type="file" name="files" th:value="${ZhengzaiAppVersionsVo.filePath}" data-browse-on-zone-click="true"
+                <input id="fileinput-demo-1" type="file" name="file" th:value="${ZhengzaiAppVersionsVo.filePath}" data-browse-on-zone-click="true"
                        data-msg-placeholder="Select {files} for upload...">
             </div>
         </div>

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/PlatformOssFiles.java

@@ -30,6 +30,7 @@ public class PlatformOssFiles implements Serializable {
     private String contentType;
     private Integer size;
     private String md5str;
+    private Integer buckType;
     private String uploaderUid;
     private String uploaderName;
 

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/docu/db_kylin_structure.sql

@@ -973,6 +973,7 @@ create table platform_oss_files
     `size`          int              NOT NULL DEFAULT 0 COMMENT '文件大小',
     `md5str`        varchar(255)     NOT NULL DEFAULT '' COMMENT 'md5值判断文件是否相同',
     `oss_path`      varchar(255)     NOT NULL DEFAULT '' COMMENT '文件地址（阿里oss）',
+    `buck_type`     tinyint          NOT NULL DEFAULT '0' COMMENT 'buck_type',
     `uploader_uid`  varchar(255)     NOT NULL DEFAULT '' COMMENT '上传人id',
     `uploader_name` varchar(255)     NOT NULL DEFAULT '' COMMENT '上传人姓名',
     `created_at`    timestamp        NULL     DEFAULT NULL,

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/basicServices/AlOssController.java

@@ -4,9 +4,12 @@ import com.aliyun.oss.OSS;
 import com.aliyun.oss.OSSClientBuilder;
 import com.aliyun.oss.model.PutObjectRequest;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.PageInfo;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.FilesUtils;
 import com.liquidnet.commons.lang.util.IDGenerator;
+import com.liquidnet.service.adam.dto.vo.AdamCollectVo;
+import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dto.vo.basicServices.UploadVo;
 import com.liquidnet.service.kylin.entity.PlatformOssFiles;
 import com.liquidnet.service.kylin.mapper.PlatformOssFilesMapper;
@@ -19,6 +22,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.constraints.Pattern;
 import java.io.File;
 import java.time.LocalDateTime;
 import java.util.UUID;
@@ -49,22 +53,28 @@ public class AlOssController {
     @PostMapping("/upload")
     @ApiOperation("阿里云上传")
     @ApiImplicitParams({
-            @ApiImplicitParam(type = "form", dataType = "MultipartFile", name = "files", value = "文件", required = true),
-            @ApiImplicitParam(type = "query", dataType = "String", name = "pathName", value = "归类的文件夹名称 比如banner上传就传 banner 返回的地址就会是bnanner/XXX", required = true),
-            @ApiImplicitParam(type = "query", dataType = "Integer", name = "buckType", value = "buckType 1正常的任何文件上传 2apk上传", required = true),
+            @ApiImplicitParam(type = "form", dataType = "File", name = "file", value = "文件", required = true),
+            @ApiImplicitParam(type = "form", dataType = "String", name = "pathName", value = "归类的文件夹名称 比如banner上传就传 banner 返回的地址就会是bnanner/XXX", defaultValue = "other"),
+            @ApiImplicitParam(type = "form", dataType = "Integer", name = "buckType", value = "buckType 1正常的任何文件上传 2apk上传", defaultValue = "1"),
+            @ApiImplicitParam(type = "form", dataType = "Integer", name = "resize", value = "resize", defaultValue = "0"),
     })
-    public UploadVo upload(@RequestParam MultipartFile files, @RequestParam String pathName, @RequestParam Integer buckType) {
+    public UploadVo upload(
+            @RequestParam MultipartFile file,
+            @RequestParam(defaultValue = "other") String pathName,
+            @RequestParam(defaultValue = "1", required = false) int buckType,
+            @RequestParam(defaultValue = "0", required = false) int resize
+    ) {
         OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret);
 
-        File file = null;
+        File fileNew = null;
         try {
-            file = FilesUtils.multipartFileToFile(files);
+            fileNew = FilesUtils.multipartFileToFile(file);
         } catch (Exception e) {
             return null;
         }
 
         // file md5
-        String fileMD5 = FilesUtils.getFileMD5(file);
+        String fileMD5 = FilesUtils.getFileMD5(fileNew);
         PlatformOssFiles platformOssFiles = platformOssFilesMapper.selectOne(Wrappers.lambdaQuery(PlatformOssFiles.class).eq(PlatformOssFiles::getMd5str, fileMD5));
         if (null != platformOssFiles) {
             UploadVo uploadVo = new UploadVo();
@@ -74,7 +84,7 @@ public class AlOssController {
             return uploadVo;
         }
 
-        String filename = files.getResource().getFilename();// time.jpeg
+        String filename = file.getResource().getFilename();// time.jpeg
         //这里文件名用了uuid 防止重复，可以根据自己的需要来写
         String uploadName = UUID.randomUUID() + filename.substring(filename.lastIndexOf("."));// 078a77e0-cf80-481b-824c-5935247cff15.jpeg
         uploadName = uploadName.replace("-", "");// 078a77e0cf80481b824c5935247cff15.jpeg
@@ -83,11 +93,11 @@ public class AlOssController {
         if (2 == buckType) {
             buckName = "app-zhengzai-tv";
         }
-        PutObjectRequest putObjectRequest = new PutObjectRequest(buckName, uploadpath, file);
+        PutObjectRequest putObjectRequest = new PutObjectRequest(buckName, uploadpath, fileNew);
         ossClient.putObject(putObjectRequest);
 
         ossClient.shutdown();
-        FilesUtils.delteTempFile(file); // 删除临时文件
+        FilesUtils.delteTempFile(fileNew); // 删除临时文件
 
         // 入库
         PlatformOssFiles platformOssFilesDate = new PlatformOssFiles();
@@ -95,9 +105,10 @@ public class AlOssController {
         platformOssFilesDate.setOssFilesId(ossFilesId);
         platformOssFilesDate.setOssPath(uploadpath);
         platformOssFilesDate.setFileName(filename);
-        platformOssFilesDate.setContentType(files.getContentType());
-        platformOssFilesDate.setSize((int) files.getSize());
+        platformOssFilesDate.setContentType(file.getContentType());
+        platformOssFilesDate.setSize((int) file.getSize());
         platformOssFilesDate.setMd5str(fileMD5);
+        platformOssFilesDate.setBuckType(buckType);
         platformOssFilesDate.setCreatedAt(DateUtil.getNowTime());
         platformOssFilesMapper.insert(platformOssFilesDate);