📝

This reverts commit dd11dd2589.

README.md

@@ -7,6 +7,8 @@
 ![https://img.shields.io/badge/license-AGPL-blue.svg?style=flat-square](https://img.shields.io/badge/license-AGPL-blue.svg?longCache=true&style=flat-square)
 ![https://img.shields.io/badge/language-java-orange.svg?style=flat-square](https://img.shields.io/badge/language-java-yellow.svg?longCache=true&style=popout-square)
 
+>:exclamation: 托管的所有开源代码可能存在作者修改/测试/调整等行为，均为实验性代码，故并不保证程序或功能的可用性，如果你想要部署程序，请下载我们提供的编译整合包进行安装部署。
+
 
 ### 引导
 
@@ -21,46 +23,22 @@
 
 **存储源支持：**
 
-开源版：`本地`,`阿里OSS`,`又拍USS`,`七牛KODO`,`腾讯COS`,`网易NOS`,~~`U-File`~~,`FTP`
+开源版：`本地`,`阿里OSS`,`又拍USS`,`七牛KODO`,`腾讯COS`,`网易NOS`,~~`U-File`~~,`FTP`,`AWS S3协议`(`百度云BOS`,`青云Qingstor`,`Ucloud US3`,`Minio`等兼容S3协议)
 
-Core版：`本地`,`阿里OSS`,`又拍USS`,`七牛KODO`,`腾讯COS`,`网易NOS`,~~`U-File`~~,`FTP`,`Backblaze(B2)`,`百度云BOS`,`青云Qingstor`,`Ucloud US3`,`Minio`,`AWS S3`等通用S3协议
+[Core版](https://hellohao.cn)：开源版的基础上增加`Backblaze(B2)` 并且可同个对象存储商家可开多个存储源（可添加至90+存储源）
 
+    
+### 更新日志 `20230320`
 
-### 更新日志 `20230101`
-
-- 优化个人相册，适配右键菜单功能。
-- 修复筛选全部图片时候出现重复的问题。
-- 修复上传图片后不记录图片原始名称
-- 调整了上传图像的代码逻辑
-- 优化 ftp 上传逻辑
-- 优化多线程上传图像的查重逻辑
-- 新增用户协议相关协议内容展示
-- 提高系统安全性
-- 优化多个页面异常问题
-
-
-[^_^]:程序宣传视频：[自制宣传视频](https://www.bilibili.com/video/BV11r4y1y7mH/)
-
-[^_^]:官网(含Core版)：[https://tbed.hellohao.cn](https://tbed.hellohao.cn)
-
-[^_^]:前端源码：[https://github.com/Hello-hao/tbed-web](https://github.com/Hello-hao/tbed-web)
-
-[^_^]:文档地址：[https://doc.hellohao.cn](https://doc.hellohao.cn)
-
-[^_^]:程序展示：[https://tc.hellohao.cn](https://tc.hellohao.cn)
-
-[^_^]:作者博客：[https://www.hellohao.cn](https://www.hellohao.cn)
-
-
-[^_^]:官网(含Core版)(备用)：[http://tbed.wwery.com](http://tbed.wwery.com)
-
-[^_^]:文档地址(备用)：[http://doc.wwery.com](http://doc.wwery.com)
-
-[^_^]:程序展示(备用)：[http://tc.wwery.com](http://tc.wwery.com)
-
-[^_^]:作者博客(备用)：[http://www.wwery.com](http://www.wwery.com)
+- 修复了修改/保存存储源时，状态不能及时更新
+- 优化移动端后台状态栏遮罩关闭异常的情况
+- 修复百度图像鉴别不能使用的情况，鉴别违规图像不自动删除的情况
+- 优化图像鉴别线程池配置
+- 适配移动端页面首页状态栏
+- 新增支持Docker-compose方式部署程序
 
 
+[^_^]: 程序宣传视频：[自制宣传视频](https://www.bilibili.com/video/BV11r4y1y7mH/)
 
 
 ### 主要功能
@@ -105,6 +83,73 @@ Core版：`本地`,`阿里OSS`,`又拍USS`,`七牛KODO`,`腾讯COS`,`网易NOS`,
 
 - [x] 图像直链二维码生成
 
+### 快速开始
+
+**Docker-compose部署:**
+
+1. 创建`docker-compose.yml`文件
+
+   > 在服务器的任意目录创建的文件夹中创建`docker-compose.yml`文件，内容如下：
+   >
+   > (修改下方前`端域名`，`后端域名`，`数据库密码`等注释的信息，特别要注意文件格式缩进不可以乱改)
+
+   ```yml
+   version: "3"
+   services:
+     tbed-free:
+       image: hellohao/tbed-free:20230320
+       networks:
+         hellohao_network:
+       ports:
+         - "10088:10088"
+         - "10089:10089"
+       volumes:
+         - /HellohaoData/:/HellohaoData/
+       environment:
+         MYSQL_URL: jdbc:mysql://hellohaodb/tbed?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+         # 自定设置一个MySQL的密码，请保证与下方 POSTGRES_PASSWORD 的变量值一致
+         MYSQL_PASS: tIaNGg@SHa&hIo56
+         # 前端域名(反代10089端口的域名)
+         HELLOHAO_WEB_HOST: http://pic.example.com
+         # 后端域名(反代10088端口的域名)
+         HELLOHAO_SERVER_HOST: http://server.example.com
+     hellohaodb:
+       image: hellohao/mysql-free:1.0
+       networks:
+         hellohao_network:
+       command:
+         - --default-authentication-plugin=mysql_native_password
+         - --character-set-server=utf8mb4
+         - --collation-server=utf8mb4_general_ci
+         - --explicit_defaults_for_timestamp=true
+       ports:
+         - "3307:3306"
+       volumes:
+         - /HellohaoData/mysql:/var/lib/mysql
+       environment:
+         # MySQL的密码
+         MYSQL_ROOT_PASSWORD: tIaNGg@SHa&hIo56
+   networks:
+     hellohao_network:
+   
+   
+   ```
+
+2. 启动 Hellohao 服务
+
+   ```shell
+   docker-compose up -d
+   ```
+
+更多部署教程参考程序[相关文档](http://doc.hellohao.cn)
+
+
+### 启动项目
+> 访问你的前端域名即可
+
+初始用户名：`admin`
+初始邮箱：`admin`
+初始密码：`admin`
 
 
 ### 系统预览
@@ -125,11 +170,16 @@ Core版：`本地`,`阿里OSS`,`又拍USS`,`七牛KODO`,`腾讯COS`,`网易NOS`,
 [^_^]: ![多存储源](http://img.wwery.com/Hellohao/xXSMlsTg.png)
 [^_^]: ![站点设置](http://img.wwery.com/Hellohao/n5zXistG.png)
 
+### 客户端(win64/mac)
+
+> 目前已经正式上线
+> ![桌面客户端软件](https://upload.cc/i1/2022/07/13/5W8Pxh.png)
+
 
 ### 运行环境
 
 - JDK 1.8
-- MySQL5.5+
+- MySQL5.7+
 - Redis
 
 ### 所用技术
@@ -151,27 +201,8 @@ Core版：`本地`,`阿里OSS`,`又拍USS`,`七牛KODO`,`腾讯COS`,`网易NOS`,
 - Shiro
 
 
-### 部署
-
-> 部署方式分为两种：
-> 1.一键脚本部署：`Tbed-together.zip`（操作简单）
-> 2.自定义部署 前后端分离式部署:`Tbed.zip`（拓展性高适合有一定java前后端分离部署经验的人）
-> 需要注意：一键部署的端口为：服务器：`10088` 前端：`10089`
-
-详细部署教程参考程序[相关文档](http://doc.hellohao.cn)
-
-### 启动项目
-
-初始用户名：`admin`
-初始邮箱：`admin`
-初始密码：`admin`
-
-### 客户端(win64/mac)
-> 目前已经正式上线
-![桌面客户端软件](https://upload.cc/i1/2022/07/13/5W8Pxh.png)
-
-
 ### 微信小程序
+
 > 目前已有测试版，更多功能开发中，开发进度的快慢要根据作者的工作压力、心情状况等自身情况进行评估。
 > 暂时无法给出具体发布小程序的时间。大家期待吧。
 
@@ -188,12 +219,13 @@ Core版：`本地`,`阿里OSS`,`又拍USS`,`七牛KODO`,`腾讯COS`,`网易NOS`,
 ### 反馈交流
 
 **如果你遇到BUG欢迎反馈**
+
 - 前往论坛发帖反馈、求助：[Hellohao开发者交流论坛](http://bbs.hellohao.cn)
-- 也可加QQ群探讨（目前已满）：864800972
+- 也可加QQ群探讨：864800972
 
-### 捐赠开发者
+### 更多
 
-**如果你也支持Hellohao图床，可以请我喝杯咖啡。我会持续更新Hellohao图床**
+**如需程序定制或其他业务，请与我们取得联系**
+[Hellohao图像托管官网](http://hellohao.cn)
 
-**捐赠地址:** [**https://tbed.hellohao.cn/pay**](https://tbed.hellohao.cn/pay)
 

src/main/java/cn/hellohao/TbedApplication.java

@@ -52,7 +52,6 @@ public static void main(String[] args) {
             Stream.of(jpa)
                     .map(bf::getBeanDefinition)
                     .forEach(it -> it.setDependsOn("databaseStartupValidator"));
-
         };
     }
     /**

src/main/java/cn/hellohao/config/GlobalConstant.java

@@ -10,4 +10,7 @@ import java.io.File;
 public class GlobalConstant {
     public static String SYSTYPE = "LINUX";
     public static String LOCPATH = File.separator + "HellohaoData";
+
+    public static final String HELLOHAOTEMPIMG_PATH = File.separator + "HellohaoData"+File.separator+"hellohaotempimg";
+
 }

src/main/java/cn/hellohao/controller/AdminController.java

@@ -16,6 +16,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.subject.Subject;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -313,6 +314,7 @@ public class AdminController {
         String stoptime = jsonObj.getString("stoptime");
         String selectUserType = jsonObj.getString("selectUserType"); // me/all
         String username = jsonObj.getString("username");
+        String searchname = jsonObj.getString("searchname");
         Integer selecttype = jsonObj.getInteger("selecttype");
         boolean violation = jsonObj.getBoolean("violation");
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -354,6 +356,9 @@ public class AdminController {
         } else {
             img.setUserid(user.getId());
         }
+        if(!StringUtils.isBlank(searchname)){
+            img.setSearchname(searchname);
+        }
         List<Images> images = imgService.selectimg(img);
         PageInfo<Images> rolePageInfo = new PageInfo<>(images);
         PageResultBean<Images> pageResultBean =

src/main/java/cn/hellohao/controller/ClientAppController.java

@@ -10,13 +10,16 @@ import cn.hellohao.service.UploadConfigService;
 import cn.hellohao.service.impl.UploadServicel;
 import cn.hellohao.service.impl.UserServiceImpl;
 import cn.hellohao.utils.Base64ToMultipartFile;
+import cn.hellohao.utils.SetFiles;
 import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import java.io.File;
 
 /**
  * @author Hellohao
@@ -86,12 +89,17 @@ public class ClientAppController {
     }
 
     @PostMapping("/imgUpload")
-    public Msg imgUpload(HttpServletRequest request, @RequestParam(required = true, value = "file") MultipartFile file,
+    public Msg imgUpload(HttpServletRequest request, @RequestParam(required = true, value = "file") MultipartFile multipartFile,
                          @RequestParam(required = true, value = "days") String days)  {
         Msg msg = new Msg();
         try{
-            if (null != file) {
-                msg = uploadServicel.uploadForLoc(request,file,Integer.valueOf(days),null);
+            if (null != multipartFile) {
+                String originalFilename = multipartFile.getOriginalFilename();
+                if(StringUtils.isBlank(originalFilename)){
+                    originalFilename = "未命名图像";
+                }
+                File file = SetFiles.changeFile_new(multipartFile);
+                msg = uploadServicel.uploadForLoc(request,file,originalFilename,Integer.valueOf(days),null,null);
             }else{
                 msg.setCode("500");
             }
@@ -109,9 +117,11 @@ public class ClientAppController {
             JSONObject jsonObj = JSONObject.parseObject(data);
             String imgstr = jsonObj.getString("imgstr");
             Integer days = jsonObj.getInteger("days");
+            String md5 = jsonObj.getString("md5");
             if (null != imgstr && !imgstr.isEmpty()) {
                 MultipartFile multipartFile = Base64ToMultipartFile.base64Convert(imgstr);
-                msg = uploadServicel.uploadForLoc(request, multipartFile, days, null);
+                File file = SetFiles.changeFile_new(multipartFile);
+                msg = uploadServicel.uploadForLoc(request, file,"未命名图像", days, null,md5);
             }
         }catch (Exception e){
             e.printStackTrace();

src/main/java/cn/hellohao/controller/IndexController.java

@@ -1,12 +1,14 @@
 package cn.hellohao.controller;
 
 import cn.hellohao.auth.token.JWTUtil;
+import cn.hellohao.config.GlobalConstant;
 import cn.hellohao.pojo.*;
 import cn.hellohao.service.*;
 import cn.hellohao.service.impl.UploadServicel;
 import cn.hellohao.service.impl.deleImages;
 import cn.hellohao.utils.GetIPS;
 import cn.hellohao.utils.MyVersion;
+import cn.hellohao.utils.SetFiles;
 import cn.hutool.captcha.CaptchaUtil;
 import cn.hutool.captcha.ShearCaptcha;
 import cn.hutool.captcha.generator.MathGenerator;
@@ -19,15 +21,17 @@ import org.apache.shiro.subject.Subject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
+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.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.List;
 import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
 
 @Controller
 public class IndexController {
@@ -62,7 +66,7 @@ public class IndexController {
         jsonObject.put("webname", cd.getString("webname"));
         jsonObject.put("websubtitle", cd.getString("websubtitle"));
         jsonObject.put("keywords", cd.getString("keywords"));
-        jsonObject.put("description", cd.getString("description"));
+        jsonObject.put("webms", cd.getString("webms"));
         jsonObject.put("explain", cd.getString("explain"));
         jsonObject.put("baidu", cd.getString("baidu"));
         jsonObject.put("links", cd.getString("links"));
@@ -78,14 +82,61 @@ public class IndexController {
         msg.setData(jsonObject);
         return msg;
     }
+    @PostMapping("/uploadChunkFile")
+    @ResponseBody
+    @CrossOrigin
+    public Msg uploadChunk(HttpServletRequest request,Chunk chunk) {
+        Msg msg = new Msg();
+        MultipartFile file = chunk.getFile();
+        try {
+            byte[] bytes = file.getBytes();
+            Path path = Paths.get(SetFiles.generatePath(GlobalConstant.HELLOHAOTEMPIMG_PATH+ File.separator+chunk.getUuid(), chunk));
+            java.nio.file.Files.write(path, bytes);
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("chunkNumber",chunk.getChunkNumber());
+            jsonObject.put("totalChunks",chunk.getTotalChunks());
+            msg.setData(jsonObject);
+            msg.setCode("200");
+            return msg;
+        } catch (IOException e) {
+            e.printStackTrace();
+            msg.setCode("500");
+            return msg;
+        }
+    }
+
+    @PostMapping("/processFile")
+    @ResponseBody
+    @CrossOrigin
+    public Msg processFile(HttpServletRequest request,@RequestParam(value = "data", defaultValue = "") String data){
+        Msg msg = new Msg();
+        try{
+            Subject subject = SecurityUtils.getSubject();
+            User user = (User) subject.getPrincipal();
+            CompletableFuture<Msg> ret = uploadServicel.mergeFile(request,data,user);
+            msg = ret.get();
+        }catch (Exception e){
+            msg.setCode("500");
+            msg.setInfo("处理文件错误，上传失败");
+        }
+        return msg;
+    }
 
     @PostMapping(value = {"/upload", "/client/upload"})
     @ResponseBody
     public Msg upimg(
             HttpServletRequest request,
             @RequestParam(value = "file", required = false) MultipartFile multipartFile,
-            Integer day) {
-        return uploadServicel.uploadForLoc(request, multipartFile, day, null);
+            Integer day,@RequestParam(value = "md5",required = false) String md5) {
+        JSONArray jsonArray = new JSONArray();
+        Subject subject = SecurityUtils.getSubject();
+        User user = (User) subject.getPrincipal();
+        String originalFilename = multipartFile.getOriginalFilename();
+        if(StringUtils.isBlank(originalFilename)){
+            originalFilename = "未命名图像";
+        }
+        File file = SetFiles.changeFile_new(multipartFile);
+        return uploadServicel.uploadForLoc(request, file,originalFilename, day, null,md5);
     }
 
     @PostMapping(value = {"/uploadForUrl", "/client/uploadForUrl"})
@@ -114,7 +165,7 @@ public class IndexController {
         for (int i = 0; i < URLArr.length; i++) {
             int temp = i + 1;
             if (syscounts >= temp) {
-                Msg msg = uploadServicel.uploadForLoc(request, null, setday, URLArr[i]);
+                Msg msg = uploadServicel.uploadForLoc(request, null,"URL转存图像", setday, URLArr[i],null);
                 if (!msg.getCode().equals("200")) {
                     errcounts++;
                 } else {

src/main/java/cn/hellohao/dao/ImgMapper.java

@@ -37,7 +37,7 @@ public interface ImgMapper {
 
     Integer md5Count(Images images);
 
-    List<Images> selectImgUrlByMD5(@Param("md5key") String md5key);
+    List<Images> selectImgUrlByMD5(Images images);
 
     List<Images> RecentlyUploaded(@Param("userid") Integer userid);
 

src/main/java/cn/hellohao/pojo/Chunk.java

@@ -0,0 +1,70 @@
+package cn.hellohao.pojo;
+
+import lombok.Data;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.annotation.Transient;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.Serializable;
+
+@Data
+public class Chunk implements Serializable {
+    @Id
+    private String uid;
+    /**
+     * 当前文件块，从1开始
+     */
+    private Integer chunkNumber;
+    /**
+     * 分块大小
+     */
+    private Long chunkSize;
+    /**
+     * 当前分块大小
+     */
+    private Long currentChunkSize;
+    /**
+     * 总大小
+     */
+    private Long totalSize;
+    /**
+     * 文件标识
+     */
+    private String identifier;
+    /**
+     * 文件名
+     */
+    private String filename;
+    /**
+     * 相对路径
+     */
+    private String relativePath;
+    /**
+     * 总块数
+     */
+    private Integer totalChunks;
+    /**
+     * 文件类型
+     */
+    private String type;
+
+    /**
+     * 前台创建的随机UID,用作创建合并文件的唯一标识目录名
+     */
+    private String uuid;
+
+    /**
+     * 归类
+     */
+    private String classifications;
+
+    /**
+     * 天数
+     */
+    private Integer day;
+
+
+    @Transient
+    private MultipartFile file;
+
+}

src/main/java/cn/hellohao/pojo/Config.java

@@ -1,30 +0,0 @@
-package cn.hellohao.pojo;
-
-import lombok.Data;
-
-@Data
-public class Config {
-    private Integer id;
-    private Integer sourcekey;
-    private Integer emails;
-    private String webname;
-    private String explain;
-    private String video;
-    private Integer backtype;
-    private String links;
-    private String notice;
-    private String baidu;
-    private String domain;
-    private String background1;
-    private String background2;
-    private String sett;
-    private String webms;
-    private String webkeywords;
-    private String webfavicons;
-    private Integer theme;
-    private String websubtitle;
-    private String logo;
-    private String aboutinfo;
-
-
-}

src/main/java/cn/hellohao/pojo/Images.java

@@ -37,6 +37,7 @@ public class Images {
     private String classificationuid; //类别uid集合
     private String idname;
     private Integer isRepeat;//如果没有开启查重的时候他是0，开启为1
+    private String searchname;
 
     public Images() {
         super();
@@ -57,7 +58,7 @@ public class Images {
                   String explains, String md5key, String notes, String useridlist, String imguid, String albumtitle,
                   String password, Integer selecttype,Long countNum,Integer monthNum,String yyyy,
                   String format,String about,Integer great,String[] classifuidlist,String classificationuid,String violation,
-                  String idname,Integer isRepeat) {
+                  String idname,Integer isRepeat,String searchname) {
         this.id = id;
         this.imgname = imgname;
         this.imgurl = imgurl;
@@ -90,7 +91,7 @@ public class Images {
         this.violation = violation;
         this.idname = idname;
         this.isRepeat = isRepeat;
-
+        this.searchname = searchname;
     }
 
     public Long getId() {
@@ -349,6 +350,14 @@ public class Images {
     public void setIsRepeat(Integer isRepeat) {
         this.isRepeat = isRepeat;
     }
+
+    public String getSearchname() {
+        return searchname;
+    }
+
+    public void setSearchname(String searchname) {
+        this.searchname = searchname;
+    }
 }
 	
 		

src/main/java/cn/hellohao/service/ImgService.java

@@ -37,7 +37,7 @@ public interface ImgService {
 
     Integer md5Count(Images images);
 
-    List<Images> selectImgUrlByMD5(String md5key);
+    List<Images> selectImgUrlByMD5(Images images);
 
     List<Images> RecentlyUploaded(Integer userid);
 

src/main/java/cn/hellohao/service/impl/ClientService.java

@@ -2,10 +2,14 @@ package cn.hellohao.service.impl;
 
 import cn.hellohao.dao.*;
 import cn.hellohao.pojo.*;
+import cn.hellohao.service.ConfdataService;
 import cn.hellohao.service.ImgTempService;
+import cn.hellohao.service.SysConfigService;
 import cn.hellohao.utils.*;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.commons.codec.digest.DigestUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
@@ -23,12 +27,15 @@ import java.util.*;
  */
 @Service
 public class ClientService {
-
+    private static Logger logger = LoggerFactory.getLogger(ClientService.class);
+    @Autowired
+    ConfdataService confdataService;
+    @Autowired
+    SysConfigService sysConfigService;
     @Autowired private UserMapper userMapper;
     @Autowired private KeysMapper keysMapper;
     @Autowired private UploadConfigMapper uploadConfigMapper;
-    @Autowired private ImgMapper imgMapper;
-    @Autowired private ImgreviewMapper imgreviewMapper;
+    @Autowired private ImgServiceImpl imgServiceImpl;
     @Autowired private ImgTempService imgTempService;
     @Autowired private GetSource getSource;
     @Autowired private ImgViolationJudgeServiceImpl imgViolationJudgeService;
@@ -37,10 +44,11 @@ public class ClientService {
             HttpServletRequest request, MultipartFile multipartFile, String email, String pass,Integer setday) {
         Msg msg = new Msg();
         try {
+            Confdata dataJson = confdataService.selectConfdata("config");
+            JSONObject confdata = JSONObject.parseObject(dataJson.getJsondata());
             SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             String imageFileName = "未命名图像";
             Integer sourceKeyId = 0;
-            FileInputStream fis = null;
             String md5key = null;
             JSONObject jsonObject = new JSONObject();
             String userip = GetIPS.getIpAddr(request);
@@ -86,12 +94,20 @@ public class ClientService {
                 msg.setInfo("图像超出系统限制大小");
                 return msg;
             }
+            FileInputStream fis = null;
             try {
                 fis = new FileInputStream(file);
                 md5key = DigestUtils.md5Hex(fis);
             } catch (Exception e) {
                 e.printStackTrace();
                 System.out.println("未获取到图片的MD5,成成UUID");
+            }finally{
+                try {
+                    if (null != fis)
+                        fis.close();
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
             }
             Msg fileMiME = TypeDict.FileMiME(file);
             if (!fileMiME.getCode().equals("200")) {
@@ -152,35 +168,21 @@ public class ClientService {
             imgObj.setImguid(imguid);
             imgObj.setFormat(fileMiME.getData().toString());
             imgObj.setIdname(imageFileName);
-            Integer insertRet = imgMapper.insertImgData(imgObj);
-            if (insertRet == 0) {
-                Images imaOBJ = new Images();
-                imaOBJ.setMd5key(md5key);
-                imaOBJ.setUserid(u == null ? 0 : u.getId());
-                List<Images> images = imgMapper.selectImgUrlByMD5(md5key);
-                if (images.size() > 0) {
-                    jsonObject.put("url", images.get(0).getImgurl());
-                    jsonObject.put("name", file.getName());
-                    jsonObject.put("size", images.get(0).getSizes());
-                    msg.setData(jsonObject);
-                    return msg;
-                } else {
-                    msg.setInfo("未获取到指定图像");
-                    msg.setCode("110501");
-                    return msg;
-                }
+            Msg insertRet = imgServiceImpl.insertImgDataForCheck(imgObj,u,confdata,file.getName());
+            if (insertRet.getCode().equals("000")) {
+                return insertRet;
             }
             long stime = System.currentTimeMillis();
             ReturnImage returnImage = getSource.storageSource(key.getStorageType(), map, updatePath, key.getId());
             if (returnImage.getCode().equals("200")) {
                 long etime = System.currentTimeMillis();
-                Print.Normal("上传图片所用总时长：" + String.valueOf(etime - stime) + "ms");
+                logger.info("上传图片所用总时长：" + String.valueOf(etime - stime) + "ms");
                 jsonObject.put("url", imgObj.getImgurl());
                 jsonObject.put("name", imgObj.getImgname());
                 jsonObject.put("size", imgObj.getSizes());
                 imgViolationJudgeService.LegalImageCheck(imgObj,key);
             } else {
-                imgMapper.deleimgForImgUid(imgObj.getImguid());
+                imgServiceImpl.deleimgForImgUid(imgObj.getImguid());
                 msg.setCode("5001");
                 msg.setInfo("上传服务内部错误");
                 return msg;
@@ -217,9 +219,9 @@ public class ClientService {
                 memory = Long.valueOf(uploadConfig.getVisitormemory()); // 单位 B 游客设置总量
                 TotleMemory = Long.valueOf(uploadConfig.getFilesizetourists()); // 单位 B  游客单文件大小
                 UsedTotleMemory =
-                        imgMapper.getusermemory(0) == null
+                        imgServiceImpl.getusermemory(0) == null
                                 ? 0L
-                                : imgMapper.getusermemory(0); // 单位 B
+                                : imgServiceImpl.getusermemory(0); // 单位 B
             } else {
                 // 判断用户能不能上传
                 if (uploadConfig.getUserclose() != 1) {
@@ -232,9 +234,9 @@ public class ClientService {
                 memory = Long.valueOf(user.getMemory()); // 单位 B
                 TotleMemory = Long.valueOf(uploadConfig.getFilesizeuser()); // 单位 B
                 UsedTotleMemory =
-                        imgMapper.getusermemory(user.getId()) == null
+                        imgServiceImpl.getusermemory(user.getId()) == null
                                 ? 0L
-                                : imgMapper.getusermemory(user.getId()); // 单位 B
+                                : imgServiceImpl.getusermemory(user.getId()); // 单位 B
             }
             // 判断上传的图片目录结构类型
             if (uploadConfig.getUrltype() == 2) {

src/main/java/cn/hellohao/service/impl/ImgServiceImpl.java

@@ -1,11 +1,16 @@
 package cn.hellohao.service.impl;
 
 import cn.hellohao.dao.ImgMapper;
+import cn.hellohao.dao.SysConfigMapper;
 import cn.hellohao.pojo.Images;
+import cn.hellohao.pojo.Msg;
+import cn.hellohao.pojo.SysConfig;
 import cn.hellohao.pojo.User;
 import cn.hellohao.service.ImgService;
+import com.alibaba.fastjson.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -13,7 +18,8 @@ import java.util.List;
 public class ImgServiceImpl implements ImgService {
     @Autowired
     private ImgMapper imgMapper;
-
+    @Autowired
+    SysConfigMapper sysConfigMapper;
     @Override
     public List<Images> selectimg(Images images) {
         // TODO Auto-generated method stub
@@ -88,8 +94,8 @@ public class ImgServiceImpl implements ImgService {
     }
 
     @Override
-    public List<Images> selectImgUrlByMD5(String md5key) {
-        return imgMapper.selectImgUrlByMD5(md5key);
+    public List<Images> selectImgUrlByMD5(Images images) {
+        return imgMapper.selectImgUrlByMD5(images);
     }
 
     @Override
@@ -117,4 +123,38 @@ public class ImgServiceImpl implements ImgService {
         return imgMapper.selectImgUrlByImgUID(imguid);
     }
 
+    @Transactional
+    public Msg insertImgDataForCheck(Images images, User user, JSONObject confdata, String flilename)throws Exception {
+        Msg msg = new Msg();
+        JSONObject jsonObject = new JSONObject();
+        SysConfig sysConfig = sysConfigMapper.getstate();
+        if(sysConfig.getCheckduplicate().equals("1")){
+            //查重
+            Images img = new Images();
+            img.setUserid(user.getId());
+            img.setMd5key(images.getMd5key());
+            List<Images> list = imgMapper.selectImgUrlByMD5(img);
+            jsonObject.put("url", list.get(0).getImgurl());
+            if (list.size() > 0) {
+                jsonObject.put("url", list.get(0).getImgurl());
+                jsonObject.put("name", flilename);
+                jsonObject.put("imguid", list.get(0).getImguid());
+                System.err.println(jsonObject.toJSONString());
+                msg.setData(jsonObject);
+                msg.setCode("000");
+                return msg;
+            }else{
+                imgMapper.insertImgData(images);
+                msg.setCode("200");
+                return msg;
+            }
+        }else{
+            //不查重
+            imgMapper.insertImgData(images);
+            msg.setCode("200");
+        }
+        return msg;
+    }
+
+
 }

src/main/java/cn/hellohao/service/impl/S3Imageupload.java

@@ -116,7 +116,6 @@ public class S3Imageupload {
         return ret;
     }
 
-
     public static Integer Initialize_Tow(Keys k) {
         int ret = -1;
         try {

src/main/java/cn/hellohao/service/impl/UploadServicel.java

@@ -1,24 +1,31 @@
 package cn.hellohao.service.impl;
 
-import cn.hellohao.dao.*;
+import cn.hellohao.config.GlobalConstant;
+import cn.hellohao.dao.KeysMapper;
+import cn.hellohao.dao.UploadConfigMapper;
+import cn.hellohao.dao.UserMapper;
 import cn.hellohao.pojo.*;
+import cn.hellohao.service.ConfdataService;
 import cn.hellohao.service.ImgTempService;
+import cn.hellohao.service.SysConfigService;
 import cn.hellohao.utils.*;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.subject.Subject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.File;
 import java.io.FileInputStream;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * @author Hellohao
@@ -27,11 +34,14 @@ import java.util.*;
  */
 @Service
 public class UploadServicel {
-
     private static Logger logger = LoggerFactory.getLogger(UploadServicel.class);
+    @Autowired
+    ConfdataService confdataService;
+    @Autowired
+    SysConfigService sysConfigService;
     @Autowired private UploadConfigMapper uploadConfigMapper;
     @Autowired private KeysMapper keysMapper;
-    @Autowired private ImgMapper imgMapper;
+    @Autowired private ImgServiceImpl imgServiceImpl;
     @Autowired private UserMapper userMapper;
     @Autowired private ImgTempService imgTempService;
     @Autowired private GetSource getSource;
@@ -40,13 +50,16 @@ public class UploadServicel {
 
     public Msg uploadForLoc(
             HttpServletRequest request,
-            MultipartFile multipartFile,
+            File file,
+            String imgName,
             Integer setday,
-            String imgUrl) {
+            String imgUrl,
+            String md5key) {
         Msg msg = new Msg();
         try {
+            Confdata dataJson = confdataService.selectConfdata("config");
+            JSONObject confdata = JSONObject.parseObject(dataJson.getJsondata());
             SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            String imageFileName = "未命名图像";
             JSONObject jsonObject = new JSONObject();
             UploadConfig uploadConfig = uploadConfigMapper.getUpdateConfig();
             String userip = GetIPS.getIpAddr(request);
@@ -56,14 +69,7 @@ public class UploadServicel {
                 u = userMapper.getUsers(u);
             }
             Integer sourceKeyId = 0;
-            String md5key = null;
-            FileInputStream fis = null;
-            File file = null;
-            if (imgUrl == null) {
-                imageFileName = multipartFile.getOriginalFilename();
-                file = SetFiles.changeFile_new(multipartFile);
-            } else {
-                imageFileName = "URL转存图像";
+            if (imgUrl != null) {
                 Msg imgData = uploadForURL(request, imgUrl);
                 if (imgData.getCode().equals("200")) {
                     file = new File((String) imgData.getData());
@@ -85,19 +91,10 @@ public class UploadServicel {
                 return msg;
             }
             if (file.length() > TotleMemory) {
-                System.err.println("文件大小：" + file.length());
-                System.err.println("最大限制：" + TotleMemory);
                 msg.setCode("4006");
                 msg.setInfo("图像超出系统限制大小");
                 return msg;
             }
-            try {
-                fis = new FileInputStream(file);
-                md5key = DigestUtils.md5Hex(fis);
-            } catch (Exception e) {
-                e.printStackTrace();
-                System.out.println("未获取到图片的MD5,成成UUID");
-            }
             Msg fileMiME = TypeDict.FileMiME(file);
             if (!fileMiME.getCode().equals("200")) {
                 msg.setCode("4000");
@@ -105,10 +102,22 @@ public class UploadServicel {
                 return msg;
             }
             if (md5key == null || md5key.equals("")) {
-                md5key = UUID.randomUUID().toString().replace("-", "");
+                FileInputStream fis = null;
+                try {
+                    fis = new FileInputStream(file);
+                    md5key = DigestUtils.md5Hex(fis);
+                } catch (Exception e) {
+                    logger.error("获取MD5错误",e);
+                }finally{
+                    try {
+                        if (null != fis)
+                            fis.close();
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
             }
             String prefix = file.getName().substring(file.getName().lastIndexOf(".") + 1);
-            // 判断黑名单
             if (uploadConfig.getBlacklist() != null) {
                 String[] iparr = uploadConfig.getBlacklist().split(";");
                 for (String s : iparr) {
@@ -159,35 +168,13 @@ public class UploadServicel {
             imgObj.setMd5key(md5key);
             imgObj.setImguid(imguid);
             imgObj.setFormat(fileMiME.getData().toString());
-            imgObj.setIdname(imageFileName);
-            Integer insertRet = imgMapper.insertImgData(imgObj);
-            if (insertRet == 0) {
-                Images imaOBJ = new Images();
-                imaOBJ.setMd5key(md5key);
-                imaOBJ.setUserid(u == null ? 0 : u.getId());
-                List<Images> images = imgMapper.selectImgUrlByMD5(md5key);
-                if (images.size() > 0) {
-                    jsonObject.put("url", images.get(0).getImgurl());
-//                    Keys imgFromKey = keysService.selectKeys(images.get(0).getSource());
-//                    if (imgFromKey.getStorageType().equals(5)) {
-//                        jsonObject.put(
-//                                "url",
-//                                imgFromKey.getRequestAddress()
-//                                        + "/ota/"
-//                                        + images.get(0).getImgname());
-//                    } else {
-//                        jsonObject.put("url", images.get(0).getImgurl());
-//                    }
-                    jsonObject.put("name", file.getName());
-                    jsonObject.put("imguid", images.get(0).getImguid());
-                    msg.setData(jsonObject);
-                    return msg;
-                } else {
-                    msg.setInfo("未获取到指定图像");
-                    msg.setCode("110501");
-                    return msg;
-                }
+            imgObj.setIdname(imgName);
+//            Integer insertRet = imgMapper.insertImgData(imgObj);
+            Msg insertRet = imgServiceImpl.insertImgDataForCheck(imgObj,u,confdata,file.getName());
+            if (insertRet.getCode().equals("000")) {
+                return insertRet;
             }
+
             long stime = System.currentTimeMillis();
             ReturnImage returnImage = getSource.storageSource(key.getStorageType(), map, updatePath, key.getId());
             if (returnImage.getCode().equals("200")) {
@@ -203,7 +190,7 @@ public class UploadServicel {
 //                                })
 //                        .start();
             } else {
-                imgMapper.deleimgForImgUid(imgObj.getImguid());
+                imgServiceImpl.deleimgForImgUid(imgObj.getImguid());
                 msg.setCode("5001");
                 msg.setInfo("上传服务内部错误");
                 return msg;
@@ -219,6 +206,54 @@ public class UploadServicel {
         }
     }
 
+    public CompletableFuture<Msg> mergeFile(HttpServletRequest request, String data, User user){
+        Msg msg = new Msg();
+        try{
+            JSONObject jsonObj = JSONObject.parseObject(data);
+            String filename = jsonObj.getString("filename");
+            String uuid = jsonObj.getString("uuid");
+            String md5 = jsonObj.getString("md5");
+            String classifications = jsonObj.getString("classifications");
+            Integer day = jsonObj.getInteger("day");
+            String source = jsonObj.getString("source");
+            String imgIdentifier = jsonObj.getString("imgIdentifier");
+            JSONArray jsonArray = new JSONArray();
+            classifications = classifications==null?"":classifications;
+            if(!org.apache.commons.lang3.StringUtils.isBlank(classifications)){
+                String[] calssif = classifications.split(",");
+                for (int i = 0; i < calssif.length; i++) {
+                    jsonArray.add(calssif[i]);
+                }
+            }
+            String path = GlobalConstant.HELLOHAOTEMPIMG_PATH+File.separator+uuid+File.separator+imgIdentifier+File.separator+filename;
+//            if(new File(path).exists()){
+//                path = GlobalConstant.HELLOHAOTEMPIMG_PATH+File.separator+UUID.randomUUID().toString().replace("-", "").toLowerCase()+filename;
+//            }
+            String folder = GlobalConstant.HELLOHAOTEMPIMG_PATH+File.separator+uuid+File.separator+imgIdentifier;
+            String delFolder = GlobalConstant.HELLOHAOTEMPIMG_PATH+File.separator+uuid;
+            String originalFilename = filename;
+            if(StringUtils.isBlank(originalFilename)){
+                originalFilename = "未命名图像";
+            }
+            Msg merge = SetFiles.merge(path, folder, filename);
+            if(merge.getCode().equals("200")){
+                File file = new File(path);
+//                CompletableFuture<Msg> ret =
+                msg = uploadForLoc(request, file,originalFilename, day, null,md5);
+//                msg = ret.get();
+            }else{
+                msg = merge;
+            }
+            SetFiles.delFileFolder(new File(delFolder));
+        }catch (Exception e){
+            e.printStackTrace();
+            msg.setCode("500");
+            msg.setInfo("文件上传时发生错误");
+        }
+        return CompletableFuture.completedFuture(msg);
+    }
+
+
     public static Msg uploadForURL(HttpServletRequest request, String imgurl) {
         Msg msg = new Msg();
         if (true) {
@@ -283,9 +318,9 @@ public class UploadServicel {
                 memory = Long.valueOf(uploadConfig.getVisitormemory()); // 单位 B 游客设置总量
                 TotleMemory = Long.valueOf(uploadConfig.getFilesizetourists()); // 单位 B  游客单文件大小
                 UsedTotleMemory =
-                        imgMapper.getusermemory(0) == null
+                        imgServiceImpl.getusermemory(0) == null
                                 ? 0L
-                                : imgMapper.getusermemory(0); // 单位 B
+                                : imgServiceImpl.getusermemory(0); // 单位 B
             } else {
                 if (uploadConfig.getUserclose() != 1) {
                     msg.setCode("1001");
@@ -297,9 +332,9 @@ public class UploadServicel {
                 memory = Long.valueOf(user.getMemory()); // 单位 B  *1024*1024
                 TotleMemory = Long.valueOf(uploadConfig.getFilesizeuser()); // 单位 B
                 UsedTotleMemory =
-                        imgMapper.getusermemory(user.getId()) == null
+                        imgServiceImpl.getusermemory(user.getId()) == null
                                 ? 0L
-                                : imgMapper.getusermemory(user.getId()); // 单位 B
+                                : imgServiceImpl.getusermemory(user.getId()); // 单位 B
             }
             if (uploadConfig.getUrltype() == 2) {
                 updatePath = dateFormat.format(new Date());

src/main/java/cn/hellohao/utils/FirstRun.java

@@ -1,7 +1,7 @@
 package cn.hellohao.utils;
 
 import cn.hellohao.config.GlobalConstant;
-import org.slf4j.Logger;
+import cn.hutool.core.io.FileUtil;import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Value;
@@ -111,7 +111,7 @@ public class FirstRun implements InitializingBean {
             RunSqlScript.RunInsert(instartConfdata);
             Print.Normal("Add table.confdata");
         }
-//        RunSqlScript.RunInsert(inddx_md5key);
+        RunSqlScript.RunInsert(index_imgdata);
         RunSqlScript.RunInsert("ALTER TABLE tbed.`user` MODIFY id int auto_increment;");
         Print.Normal("Stage success");
 
@@ -143,11 +143,10 @@ public class FirstRun implements InitializingBean {
     private String instartAppclient = "INSERT INTO `appclient` VALUES ('app', 'on', NULL, NULL, 'Hellohao图像托管', 'https://hellohao.nos-eastchina1.126.net/TbedClient/app.png', '1.0.1');";
     //创建confdata表
     private String createConfdata = "CREATE TABLE tbed.confdata ( `key` varchar(100) NULL, jsondata LONGTEXT NULL )";
-  private String instartConfdata =
-      "INSERT INTO `confdata` VALUES ('config', '{\\\"sourcekey\\\":7,\\\"emails\\\":1,\\\"webname\\\":\\\"Hellohao图床\\\",\\\"explain\\\":\\\"Hellohao图像托管，是一家免费开源的图像托管，即时分享你的美好瞬间。\\\",\\\"links\\\":\\\"<p style=\\\\\\\"color:#7c7c88;\\\\\\\">© 2019 <a href=\\\\\\\"http://www.Hellohao.cn/\\\\\\\" target=\\\\\\\"_blank\\\\\\\" title=\\\\\\\"Hellohao\\\\\\\">Hellohao</a><span>  - All Rights Reserved</span> </p>\\\",\\\"notice\\\":\\\"也许...|这将是最好用的图床|为了更好的用户体验，建议您注册本站继续免费使用Hellohao图床。本站不得上传任何形式的非法图片，一旦发现，永久删除并禁封账户。情节严重者将相关资料交于相关部门处理。\\\",\\\"domain\\\":\\\"http://127.0.0.1:10088\\\",\\\"background1\\\":\\\"\\\",\\\"sett\\\":\\\"1\\\",\\\"webms\\\":\\\"Hellohao图像托管，是一家免费开源的图像托管，即时分享你的美好瞬间。\\\",\\\"webkeywords\\\":\\\"hellohao图床,图床,图片上传,开源图床,hellohao,图像托管，图片分享\\\",\\\"theme\\\":2,\\\"websubtitle\\\":\\\"这将是你用过最优秀的图像托管程序\\\",\\\"logo\\\":null,\\\"aboutinfo\\\":\\\"<img width=\\\\\\\"300px\\\\\\\" src=\\\\\\\"http://img.wwery.com/hellohao/rPscRYwz.png\\\\\\\">            <br />            <br />            <p>也许,这将是你用到最优秀的图像托管程序</p>            <p>本程序为Hellohao图象托管程序</p>            <br/>            <p style=\\\\\\\"color: #656565;\\\\\\\">作者：hellohao独立开发</p>            <p style=\\\\\\\"color: #656565;\\\\\\\">www.hellohao.cn</p>\\\"}');";
+    private String instartConfdata =
+      "INSERT INTO tbed.confdata VALUES ('config', '{\\\"sourcekey\\\":7,\\\"emails\\\":1,\\\"webname\\\":\\\"Hellohao图床\\\",\\\"explain\\\":\\\"Hellohao图像托管，是一家免费开源的图像托管，即时分享你的美好瞬间。\\\",\\\"links\\\":\\\"<p style=\\\\\\\"color:#7c7c88;\\\\\\\">© 2019 <a href=\\\\\\\"http://www.Hellohao.cn/\\\\\\\" target=\\\\\\\"_blank\\\\\\\" title=\\\\\\\"Hellohao\\\\\\\">Hellohao</a><span>  - All Rights Reserved</span> </p>\\\",\\\"notice\\\":\\\"也许...|这将是最好用的图床|为了更好的用户体验，建议您注册本站继续免费使用Hellohao图床。本站不得上传任何形式的非法图片，一旦发现，永久删除并禁封账户。情节严重者将相关资料交于相关部门处理。\\\",\\\"domain\\\":\\\"http://127.0.0.1:10088\\\",\\\"background1\\\":\\\"\\\",\\\"sett\\\":\\\"1\\\",\\\"webms\\\":\\\"Hellohao图像托管，是一家免费开源的图像托管，即时分享你的美好瞬间。\\\",\\\"webkeywords\\\":\\\"hellohao图床,图床,图片上传,开源图床,hellohao,图像托管，图片分享\\\",\\\"theme\\\":2,\\\"websubtitle\\\":\\\"这将是你用过最优秀的图像托管程序\\\",\\\"logo\\\":null,\\\"aboutinfo\\\":\\\"<img width=\\\\\\\"300px\\\\\\\" src=\\\\\\\"http://img.wwery.com/hellohao/rPscRYwz.png\\\\\\\">            <br />            <br />            <p>也许,这将是你用到最优秀的图像托管程序</p>            <p>本程序为Hellohao图象托管程序</p>            <br/>            <p style=\\\\\\\"color: #656565;\\\\\\\">作者：hellohao独立开发</p>            <p style=\\\\\\\"color: #656565;\\\\\\\">www.hellohao.cn</p>\\\"}');";
 
-    private String inddx_md5key = "ALTER TABLE imgdata ADD INDEX index_md5key_url ( md5key,imgurl)";
-    //                             create index yarn_app_result_i4 on yarn_app_result (flow_exec_id(100), another_column(50));
+    private String index_imgdata = "ALTER TABLE imgdata ADD INDEX index_md5key_url ( id,md5key,imgname,imgurl,idname,imguid)";
 
     private String dynamic = "alter table imgdata row_format=dynamic";
     private String compressed = "alter table imgdata row_format=compressed";
@@ -159,14 +158,15 @@ public class FirstRun implements InitializingBean {
         //判断目录有没有创建
         File file = new File(GlobalConstant.LOCPATH);
         if(!file.exists()){
-            file.mkdirs();
-            file1.mkdirs();
-            file2.mkdirs();
+            FileUtil.mkdir(file);
+            FileUtil.mkdir(file1);
+            FileUtil.mkdir(file2);
+
         }else{
             if(!file1.exists()){
-                file1.mkdirs();
+                FileUtil.mkdir(file1);
             }else if(!file2.exists()){
-                file2.mkdirs();
+                FileUtil.mkdir(file2);
             }
         }
     }
@@ -191,7 +191,8 @@ public class FirstRun implements InitializingBean {
                 System.out.print("文件存在");
             } else {
                 System.out.print("文件不存在");
-                f.createNewFile();// 不存在则创建
+//                f.createNewFile();// 不存在则创建
+                FileUtil.createTempFile(f);
             }
 //            BufferedReader input = new BufferedReader(new FileReader(f));
 //            while ((str = input.readLine()) != null) {

src/main/java/cn/hellohao/utils/ImgUrlUtil.java

@@ -104,7 +104,7 @@ public class ImgUrlUtil {
             HttpURLConnection conn = (HttpURLConnection)url.openConnection();
             //设置超时间为3秒
             conn.setConnectTimeout(5*1000);
-            //防止屏蔽程序抓取而返回403错误
+            //防止屏蔽程序抓取而返回403错误 Referer
             conn.setRequestProperty("User-Agent", "Mozilla/4.0 (compatible; MSIE 5.0; Windows NT; DigExt)");
 
             //得到输入流

src/main/java/cn/hellohao/utils/SetFiles.java

@@ -1,9 +1,16 @@
 package cn.hellohao.utils;
 
+import cn.hellohao.pojo.Chunk;
+import cn.hellohao.pojo.Msg;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.*;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
 import java.text.DecimalFormat;
+import java.util.stream.Stream;
 
 public class SetFiles {
     // 转换文件方法
@@ -78,7 +85,73 @@ public class SetFiles {
         return fileSizeString;
     }
 
+    public static String generatePath(String uploadFolder, Chunk chunk) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(uploadFolder+File.separator).append("/").append(chunk.getIdentifier());
+        if (!Files.isWritable(Paths.get(sb.toString()))) {
+            System.err.println("path not exist,create path");
+            System.err.println(sb.toString());
+            try {
+                Files.createDirectories(Paths.get(sb.toString()));
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return sb.append("/")
+                .append(chunk.getFilename())
+                .append("-")
+                .append(chunk.getChunkNumber()).toString();
+    }
 
+    public static Msg merge(String targetFile, String folder, String filename) {
+        Msg msg = new Msg();
+        try {
+            final File file = new File(targetFile);
+            if (file.exists()){
+                file.delete();
+            }
+            Files.createFile(Paths.get(targetFile));
+        } catch (IOException e) {
+            System.out.println("这是一个无伤大雅的错:IOException");
+            e.printStackTrace();
+        }
+        try (Stream<Path> stream = Files.list(Paths.get(folder))) {
+            stream.filter(path -> !path.getFileName().toString().equals(filename))
+                    .sorted((o1, o2) -> {
+                        String p1 = o1.getFileName().toString();
+                        String p2 = o2.getFileName().toString();
+                        int i1 = p1.lastIndexOf("-");
+                        int i2 = p2.lastIndexOf("-");
+                        return Integer.valueOf(p2.substring(i2)).compareTo(Integer.valueOf(p1.substring(i1)));
+                    })
+                    .forEach(path -> {
+                        try {
+                            //以追加的形式写入文件
+                            Files.write(Paths.get(targetFile), Files.readAllBytes(path), StandardOpenOption.APPEND);
+                            //合并后删除该块
+                            Files.delete(path);
+                        } catch (IOException e) {
+                            msg.setCode("500");
+                            msg.setInfo("合并文件时发生了错误");
+                            e.printStackTrace();
+                        }
+                    });
+        } catch (IOException e) {
+            msg.setCode("500");
+            msg.setInfo("合并文件时发生了错误");
+            e.printStackTrace();
+        }
+        return msg;
+    }
 
+    public static void delFileFolder(File file){
+        if (file.isDirectory()){
+            File[] files = file.listFiles();
+            for (File in: files) {
+                delFileFolder(in);
+            }
+        }
+        file.delete();
+    }
 
 }

src/main/resources/mapper/ImgMapper.xml

@@ -67,6 +67,12 @@
             and
             a.imguid = #{imguid}
         </if>
+        <if test="searchname != null">
+            and CONCAT(
+            imgurl,
+            idname
+            ) LIKE '%${searchname}%'
+        </if>
         <if test="idname != null and idname !=''">
             and idname LIKE '%${idname}%'
         </if>
@@ -92,27 +98,8 @@
             violation,
             idname
         )
-        select * from (
-                          SELECT  NULL id,
-                                  #{imgname} imgname,
-                                  #{imgurl} imgurl,
-                                  #{userid} userid,
-                                  #{updatetime} updatetime,
-                                  #{sizes} sizes,
-                                  #{abnormal} abnormal,
-                                  #{source} `source`,
-                                  #{imgtype} imgtype,
-                                  #{explains} explains,
-                                  #{md5key} md5key,
-                                  #{imguid} imguid,
-                                  #{format} `format`,
-                                  #{about} about,
-                                  null violation,
-                                  #{idname} idname
-                      ) temp_t
-        where
-            IF((select (select checkduplicate from sysconfig where id =1)=1),
-               not exists (select md5key from imgdata img_t where temp_t.md5key = img_t.md5key),true)
+        VALUES (null, #{imgname}, #{imgurl}, #{userid}, #{updatetime},#{sizes},#{abnormal},#{source},#{imgtype},
+                #{explains},#{md5key},#{imguid},#{format},#{about},null,#{idname})
     </insert>
 
 
@@ -190,6 +177,9 @@
 
     <select id="selectImgUrlByMD5" parameterType="string" resultType="cn.hellohao.pojo.Images">
         select imgname,imgurl from imgdata where md5key = #{md5key}
+        <if test="userid != null">
+            and userid = #{userid}
+        </if>
     </select>
 
     <!--    查询当前用户的近20条数据-->