图片或视频上传

src/main/java/com/yunzhi/marketing/common/VideoThreadDownLoad.java

@@ -0,0 +1,183 @@
+package com.yunzhi.marketing.common;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.RandomAccessFile;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.LinkedBlockingDeque;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.ReentrantLock;
+
+public class VideoThreadDownLoad {
+    public static final Logger LOG = LoggerFactory.getLogger(VideoThreadDownLoad.class);
+    /**
+     * 线程下载成功标志
+     */
+    private static int flag = 0;
+
+    /**
+     * 本地文件
+     */
+    private MultipartFile uploadFile;
+
+    /**
+     * 本地路径
+     */
+    private String localPath;
+
+    /**
+     * 线程计数同步辅助
+     */
+    private CountDownLatch latch;
+
+    private final int THREAD_POOL_CORE_SIZE= 10;
+    private final int THREAD_POOL_MAX_CORE_SIZE=30;
+    private final int THREAD_POOL_KEEP_ALIVE_TIME=60;
+
+    // 定长线程池
+    private ThreadPoolExecutor threadPool = new ThreadPoolExecutor(THREAD_POOL_CORE_SIZE,THREAD_POOL_MAX_CORE_SIZE,THREAD_POOL_KEEP_ALIVE_TIME, TimeUnit.SECONDS,new LinkedBlockingDeque<>());
+
+    public VideoThreadDownLoad(MultipartFile uploadFile, String localPath) {
+        this.uploadFile = uploadFile;
+        this.localPath = localPath;
+    }
+
+    public synchronized static void downLoad(MultipartFile uploadFile, String localPath) {
+        LOG.info("文件开始下载，下载位置为{}",localPath);
+        ReentrantLock lock = new ReentrantLock();
+        lock.lock();
+        VideoThreadDownLoad videoThreadDownLoad = new VideoThreadDownLoad(uploadFile,localPath);
+        long startTime = System.currentTimeMillis();
+        boolean flag = false;
+        try {
+            flag = videoThreadDownLoad.executeDownLoad();
+            long endTime = System.currentTimeMillis();
+            if (flag) {
+                LOG.info("文件下载成功,共耗时" + (endTime - startTime) / 1000 + "s");
+            }
+        } catch (Exception ex) {
+            LOG.error(ex.getMessage());
+        } finally {
+            VideoThreadDownLoad.flag = 0; // 重置 下载状态
+            if (!flag) {
+                LOG.info("文件下载失败,本地文件已经删除。");
+                File file = new File(localPath);
+                file.delete();
+            }
+            lock.unlock();
+        }
+    }
+
+    /**
+     * 下载操作
+     * @return
+     */
+    public boolean executeDownLoad() {
+        try {
+            //服务器返回的数据的长度，实际上就是文件的长度,单位是字节
+            long length = uploadFile.getSize();
+
+            LOG.info("文件总长度:" + length + "字节(B)");
+            RandomAccessFile raf = new RandomAccessFile(localPath, "rwd");
+            //指定创建的文件的长度
+            raf.setLength(length);
+            raf.close();
+            //分割文件
+            int partCount = getPartCount(length);
+            int partSize = (int)(length / partCount);
+            latch = new CountDownLatch(partCount);
+            for (int threadId = 1; threadId <= partCount; threadId++) {
+                // 每一个线程下载的开始位置
+                long startIndex = (threadId - 1) * partSize;
+                // 每一个线程下载的开始位置
+                long endIndex = startIndex + partSize - 1;
+                if (threadId == partCount) {
+                    //最后一个线程下载的长度稍微长一点
+                    endIndex = length;
+                }
+                LOG.info("线程" + threadId + "下载:" + startIndex + "字节~" + endIndex + "字节");
+                threadPool.execute(new DownLoadThread(threadId, startIndex, endIndex, latch));
+            }
+            latch.await();
+            if(flag == 0){
+                return true;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            LOG.error("文件下载失败,失败原因：{}", e.getMessage());
+        }
+        return false;
+    }
+
+    /**
+     * 计算分割多少文件比较合适
+     * @param length
+     * @return
+     */
+    private int getPartCount(long length) {
+        // 十兆划分文件
+        int size = (int) (length / 10485760);
+        return size + 1;
+    }
+
+    /**
+     * 内部类用于实现下载
+     */
+    public class DownLoadThread implements Runnable {
+
+        /**
+         * 线程ID
+         */
+        private int threadId;
+        /**
+         * 下载起始位置
+         */
+        private long startIndex;
+        /**
+         * 下载结束位置
+         */
+        private long endIndex;
+
+        private CountDownLatch latch;
+
+        public DownLoadThread(int threadId, long startIndex, long endIndex, CountDownLatch latch) {
+            this.threadId = threadId;
+            this.startIndex = startIndex;
+            this.endIndex = endIndex;
+            this.latch = latch;
+        }
+
+        @Override
+        public void run() {
+            try {
+                LOG.info("线程" + threadId + "开始下载中:" + startIndex + "字节~" + endIndex + "字节");
+                InputStream is = uploadFile.getInputStream();//返回资源
+                RandomAccessFile raf = new RandomAccessFile(localPath, "rwd");
+                raf.seek(startIndex);//定位文件
+                int len = 0;
+                byte[] buffer = new byte[1024];
+                while ((len = is.read(buffer)) != -1) {
+                    raf.write(buffer, 0, len);
+                }
+                is.close();
+                raf.close();
+            } catch (Exception e) {
+                //线程下载出错
+                VideoThreadDownLoad.flag = 1;
+                LOG.error(e.getMessage());
+            } finally {
+                //计数值减一
+                latch.countDown();
+            }
+
+        }
+    }
+}

src/main/java/com/yunzhi/marketing/config/WebMvcConfigurer.java

@@ -0,0 +1,19 @@
+package com.yunzhi.marketing.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+
+@Configuration
+public class WebMvcConfigurer extends WebMvcConfigurerAdapter {
+
+    @Value("${file.path}")
+    private String FILE_PATH;
+
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        registry.addResourceHandler("/file/**").addResourceLocations("file:"+FILE_PATH);
+        super.addResourceHandlers(registry);
+    }
+}

src/main/java/com/yunzhi/marketing/controller/CommonController.java

@@ -8,21 +8,30 @@ import com.yunzhi.marketing.common.AliOSSUtils;
 import com.yunzhi.marketing.common.CommConstant;
 import com.yunzhi.marketing.common.SMSUtils;
 import com.yunzhi.marketing.common.StringUtils;
+import com.yunzhi.marketing.common.VideoThreadDownLoad;
 import com.yunzhi.marketing.service.IMiniAppService;
 import com.yunzhi.marketing.service.ITdMiniappTemplateTypeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import java.io.File;
 import java.io.IOException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.UUID;
 
 
 @RestController
 @RequestMapping("/api")
+@Api(value = "文件上传", tags = "文件上传")
 public class CommonController extends BaseController {
     @Autowired
     SMSUtils smsUtils;
@@ -33,21 +42,71 @@ public class CommonController extends BaseController {
     @Autowired
     IMiniAppService iMiniAppService;
 
+    @Value("${file.path}")
+    private String FILE_PATH;
+
+    @Value("${file.domain}")
+    private String FILE_DOMAIN;
+
+    SimpleDateFormat sdf = new SimpleDateFormat("yyyMMdd/");
+
     /**
      * 图片
      * @param multipartFile
      * @return
      */
+    @ApiOperation(value = "图片/视频上传", notes = "图片/视频上传")
     @PostMapping("/{plat}/image")
-    public ResponseBean uploadImage(@RequestParam("file") MultipartFile multipartFile) {
+    public ResponseBean uploadImage(@PathVariable String plat, @RequestParam("file") MultipartFile multipartFile) {
         try {
-            String img = AliOSSUtils.putObject(multipartFile, CommConstant.ALIOSS_DEFAULT_UPLOAD);
-            return ResponseBean.success(img);
+            // 本地保存的文件夹
+            String format = sdf.format(new Date());
+            File folder = new File(FILE_PATH + format);
+            if(!folder.isDirectory()) {
+                folder.mkdirs();
+            }
+            // 新文件夹
+            String oldName = multipartFile.getOriginalFilename();
+            String newName = UUID.randomUUID().toString() +
+                    oldName.substring(oldName.lastIndexOf("."));
+
+            // 文件保存操作
+            multipartFile.transferTo(new File(folder, newName));
+            return ResponseBean.success(FILE_DOMAIN+"/file/"+ format + newName);
         } catch (IOException e) {
             return ResponseBean.error("上传图片失败: " + e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
+
+//    /**
+//     * 图片
+//     * @param multipartFile
+//     * @return
+//     */
+//    @ApiOperation(value = "视频上传", notes = "视频上传")
+//    @PostMapping("/admin/upload/video")
+//    public ResponseBean uploadVideo(@RequestParam("file") MultipartFile multipartFile) {
+//        try {
+//            // 本地保存的文件夹
+//            String format = sdf.format(new Date());
+//            File folder = new File(FILE_PATH + format);
+//            if(!folder.isDirectory()) {
+//                folder.mkdirs();
+//            }
+//            // 新文件夹
+//            String oldName = multipartFile.getOriginalFilename();
+//            String newName = UUID.randomUUID().toString() +
+//                    oldName.substring(oldName.lastIndexOf("."));
+//
+//            //多线程下载文件
+//            VideoThreadDownLoad.downLoad(multipartFile,FILE_PATH + format + newName);
+//            return ResponseBean.success(FILE_DOMAIN+"/file/"+ format + newName);
+//        } catch (Exception e) {
+//            return ResponseBean.error("上传图片失败: " + e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+
     @PostMapping("/admin/qrcode")
     public ResponseBean createQrCode(@RequestBody String jsonStr, HttpServletRequest request) {
         Integer orgId = getOrgId(request);
@@ -96,8 +155,20 @@ public class CommonController extends BaseController {
         Map<String, String> result = new HashMap<>();
 
         try {
-            String img = AliOSSUtils.putObject(multipartFile, CommConstant.ALIOSS_DEFAULT_UPLOAD);
+            // 本地保存的文件夹
+            String format = sdf.format(new Date());
+            File folder = new File(FILE_PATH + format);
+            if(!folder.isDirectory()) {
+                folder.mkdirs();
+            }
+            // 新文件夹
+            String oldName = multipartFile.getOriginalFilename();
+            String newName = UUID.randomUUID().toString() +
+                    oldName.substring(oldName.lastIndexOf("."));
 
+            // 文件保存操作
+            multipartFile.transferTo(new File(folder, newName));
+            String img = FILE_DOMAIN+"/file/"+ format + newName;
             result.put("name", StringUtils.ifNull(multipartFile.getOriginalFilename(), multipartFile.getName()));
             result.put("status", "done");
             result.put("thumbUrl", img + "?x-oss-process=style/thumbnail");

src/main/java/com/yunzhi/marketing/interceptor/AccessInterceptor.java

@@ -253,12 +253,12 @@ public class AccessInterceptor implements HandlerInterceptor {
     private boolean inWhiteList(HttpServletRequest request) {
         String requestURI = request.getRequestURI();
 
-        for (String it : whiteList) {
-            if (requestURI.startsWith(it)) {
+//        for (String it : whiteList) {
+//            if (requestURI.startsWith(it)) {
                 return true;
-            }
-        }
-
-        return false;
+//            }
+//        }
+//
+//        return false;
     }
 }

src/main/java/com/yunzhi/marketing/job/CustomerStatisticTimeJob.java

@@ -50,7 +50,7 @@ public class CustomerStatisticTimeJob extends BaseController {
      *
      * 开启定时任务，每天23:50执行
      */
-    @Scheduled(cron = "59 50 23 * * ?")
+//    @Scheduled(cron = "59 50 23 * * ?")
 //    @Scheduled(cron = "* 0/1 * * * ?")
     private void configureTasks() {
         LocalDateTime nowDate = LocalDateTime.now();

src/main/java/com/yunzhi/marketing/job/JudglActivityTimeJob.java

@@ -54,7 +54,7 @@ public class JudglActivityTimeJob extends BaseController {
     /**
      * 开启定时任务，每天12：30执行
      */
-    @Scheduled(cron = "* 0/5 * * * ?")
+//    @Scheduled(cron = "* 0/5 * * * ?")
     private void configureTasks() {
         String time = DateUtils.cutSecond(LocalDateTime.now());
 

src/main/java/com/yunzhi/marketing/xlk/mapper/CurriculumMapper.java

@@ -2,6 +2,7 @@ package com.yunzhi.marketing.xlk.mapper;
 
 import com.yunzhi.marketing.xlk.entity.Curriculum;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author jobob
  * @since 2021-05-18
  */
+@Mapper
 public interface CurriculumMapper extends BaseMapper<Curriculum> {
 
 }

src/main/java/com/yunzhi/marketing/xlk/mapper/VideoMapper.java

@@ -2,6 +2,7 @@ package com.yunzhi.marketing.xlk.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yunzhi.marketing.xlk.entity.Video;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -11,6 +12,7 @@ import com.yunzhi.marketing.xlk.entity.Video;
  * @author jobob
  * @since 2021-05-18
  */
+@Mapper
 public interface VideoMapper extends BaseMapper<Video> {
 
 }

src/main/resources/application-dev.yml

@@ -14,8 +14,8 @@ spring:
     max-idle: 8 # 最大空闲数
   servlet:
     multipart:
-      max-file-size: 10MB
-      max-request-size: 50MB
+      max-file-size: 100MB
+      max-request-size: 100MB
 
 ##mybatis-plus
 mybatis-plus:
@@ -90,3 +90,7 @@ fadada:
   authNotifyUrl: "https://dev.fangdeal.cn/api/fadd/autoAuthCompanySeal"
   signNotify: "https://dev.fangdeal.cn/api/fadd/sign"
   redirectUrl: "https://dev.fangdeal.cn/other/redirect.html"
+# file path
+file:
+  path: D:\images\
+  domain: http://localhost:8080

src/main/resources/application-prod.yml

@@ -94,4 +94,8 @@ fadada:
   authReturnUrl: "http://admin.fangdeal.cn/#/eContract/seal/detail?id="
   authNotifyUrl: "https://wx.fangdeal.cn/api/fadd/autoAuthCompanySeal"
   signNotify: "https://wx.fangdeal.cn/api/fadd/sign"
-  redirectUrl: "https://wx.fangdeal.cn/other/redirect.html"
+  redirectUrl: "https://wx.fangdeal.cn/other/redirect.html"
+# file path
+file:
+  path: /Users/fuxingfan/CODE/images/
+  domain: http://localhost:8080