上传功能ok - 未完成 写入sql

小文件速传
大文件分片上传
批量上传（批量判定完成）
文件秒传
分片秒传

zen-core/src/main/kotlin/com/gxzc/zen/common/dto/ZenFileMetadata.kt

@@ -0,0 +1,28 @@
+package com.gxzc.zen.common.dto
+
+/**
+ * 文件DTO
+ * @author NorthLan
+ * @date 2018/5/18
+ * @url https://noahlan.com
+ */
+open class ZenFileMetadata {
+    var chunkNumber: Int? = null
+    var chunkSize: Long? = null
+//    var currentChunkSize: Long? = null
+    var totalSize: Long? = null
+//    var identifier: String? = null
+    var filename: String? = null
+    var relativePath: String? = null
+    var totalChunks: Int? = null
+    var lastModified: Long? = null
+    var md5: String? = null
+
+    // 重构文件夹结构或重命名特性
+    var repath: String? = null
+    var rename: String? = null
+
+    // 批次
+    var batchId: String? = null
+    var totalNumber: Int? = null
+}

zen-core/src/main/kotlin/com/gxzc/zen/common/dto/ZenFileResponse.kt

@@ -0,0 +1,20 @@
+package com.gxzc.zen.common.dto
+
+import com.fasterxml.jackson.annotation.JsonIgnore
+import com.fasterxml.jackson.annotation.JsonInclude
+import java.io.File
+
+/**
+ * 文件
+ * @author NorthLan
+ * @date 2018/5/25
+ * @url https://noahlan.com
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+open class ZenFileResponse {
+    var uploadedChunks: MutableList<Int>? = null // 已上传分片数
+    var status: String? = null // 状态码
+
+    @JsonIgnore
+    var file: File? = null // 服务端文件实例
+}

zen-core/src/main/kotlin/com/gxzc/zen/common/dto/ZenMultipartFileDTO.kt

@@ -1,29 +0,0 @@
-package com.gxzc.zen.common.dto
-
-import org.springframework.web.multipart.MultipartFile
-
-/**
- * 文件DTO
- * @author NorthLan
- * @date 2018/5/18
- * @url https://noahlan.com
- */
-open class ZenMultipartFileDTO {
-    var chunkNumber: Int? = null
-    var chunkSize: Long? = null
-    var currentChunkSize: Long? = null
-    var totalSize: Long? = null
-    var identifier: String? = null
-    var filename: String? = null
-    var relativePath: String? = null
-    var totalChunks: Int? = null
-    var file: MultipartFile? = null
-    // 是否保留源文件夹结构
-    var rename: Boolean? = false
-
-    override fun toString(): String {
-        return "ZenMultipartFileDTO(chunkNumber=$chunkNumber, chunkSize=$chunkSize, currentChunkSize=$currentChunkSize, totalSize=$totalSize, identifier=$identifier, filename=$filename, relativePath=$relativePath, totalChunks=$totalChunks, file=$file)"
-    }
-
-
-}

zen-core/src/main/kotlin/com/gxzc/zen/common/exception/ZenExceptionEnum.kt

@@ -18,7 +18,7 @@ enum class ZenExceptionEnum(val code: Int, val msg: String) {
     /**
      * Register
      */
-    REG_PASSWORD_ERROR(200,"密码格式错误"),
+    REG_PASSWORD_ERROR(200, "密码格式错误"),
     REG_ACCOUNT_EXISTS(201, "账号已存在"),
 
     /**
@@ -26,6 +26,7 @@ enum class ZenExceptionEnum(val code: Int, val msg: String) {
      */
     FILE_READING_ERROR(400, "FILE_READING_ERROR!"),
     FILE_NOT_FOUND(400, "FILE_NOT_FOUND!"),
+    FILE_METADATA_VALIDATE_ERROR(401, "文件metadata验证失败"),
 
     /**
      * 错误的请求

zen-core/src/main/kotlin/com/gxzc/zen/common/properties/UploadProperties.kt

@@ -14,5 +14,6 @@ import org.springframework.stereotype.Component
 open class UploadProperties {
     var tmpPath: String? = "/tmp/zen"
     var dataPath: String? = "/data/zen"
-    var maxFileSize: Long? = 4294967296L
+    var maxFileSize: Long? = 4294967296L // 4 * 1024 * 1024 * 1024
+    var chunkSize: Long? = 1048576L // 1 * 1024 * 1024
 }

zen-core/src/main/kotlin/com/gxzc/zen/common/util/FileUtil.kt

@@ -0,0 +1,72 @@
+package com.gxzc.zen.common.util
+
+import org.apache.commons.io.FilenameUtils
+import java.io.File
+import java.io.FileInputStream
+import java.nio.ByteBuffer
+
+/**
+ * 文件工具类
+ * @author NorthLan
+ * @date 2018/5/24
+ * @url https://noahlan.com
+ */
+object FileUtil {
+
+    /**
+     * 获取 文件首尾chunk+lastModifiedTime 拼接起来的md5
+     */
+    fun md5HeadTail(path: String, chunkSize: Int): String {
+        val file = File(path)
+        val fc = FileInputStream(file).channel
+        val buffer = ByteBuffer.allocate(chunkSize)
+        val fileSize = fc.size()
+        val chunks = Math.ceil(1.0 * fileSize / chunkSize).toInt() // 分块总数
+
+        var currentPos = 0 * chunkSize * 1L
+
+        var readLength: Int
+        readLength = fc.read(buffer, currentPos)
+        if (readLength != -1) {
+            val byte = ByteArray(readLength)
+            buffer.flip()
+            buffer.get(byte)
+            buffer.clear()
+            // 第一块读完
+            currentPos = (chunks - 1) * chunkSize * 1L
+            if (currentPos > 0) {
+                readLength = fc.read(buffer, currentPos)
+                return if (readLength != -1) {
+                    val byte2 = ByteArray(readLength)
+                    buffer.flip()
+                    buffer.get(byte2)
+                    buffer.clear()
+                    val retBuffer = ByteBuffer.allocate(byte.size + byte2.size + 8) // 8 为long占用字节数
+                    retBuffer.put(byte)
+                    retBuffer.put(byte2)
+
+                    val timeByteArray = ByteBuffer.allocate(8).putLong(file.lastModified()).array()
+                    timeByteArray.reverse()
+
+                    retBuffer.put(timeByteArray)
+                    //
+                    MD5Util.encodeMd5(retBuffer.array())
+                } else {
+                    ""
+                }
+            } else {
+                val retBuffer = ByteBuffer.allocate(byte.size + 8) // 8 为long占用字节数
+                retBuffer.put(byte)
+
+                val timeByteArray = ByteBuffer.allocate(8).putLong(file.lastModified()).array()
+                timeByteArray.reverse()
+
+                retBuffer.put(timeByteArray)
+                //
+                return MD5Util.encodeMd5(retBuffer.array())
+            }
+        } else {
+            return ""
+        }
+    }
+}

zen-core/src/main/kotlin/com/gxzc/zen/common/util/MD5Util.kt

@@ -0,0 +1,35 @@
+package com.gxzc.zen.common.util
+
+import java.security.MessageDigest
+import java.security.NoSuchAlgorithmException
+
+
+/**
+ *
+ * @author NorthLan
+ * @date 2018/5/24
+ * @url https://noahlan.com
+ */
+object MD5Util {
+    fun encrypt(source: String): String {
+        return encodeMd5(source.toByteArray())
+    }
+
+    fun encodeMd5(source: ByteArray): String {
+        try {
+            return encodeHex(MessageDigest.getInstance("MD5").digest(source))
+        } catch (e: NoSuchAlgorithmException) {
+            throw IllegalStateException(e.message, e)
+        }
+    }
+
+    fun encodeHex(bytes: ByteArray): String {
+        val buffer = StringBuffer(bytes.size * 2)
+        for (i in bytes.indices) {
+            if (bytes[i].toInt() and 0xff < 0x10)
+                buffer.append("0")
+            buffer.append(java.lang.Long.toString((bytes[i].toInt() and 0xff).toLong(), 16))
+        }
+        return buffer.toString()
+    }
+}

zen-core/src/main/kotlin/com/gxzc/zen/common/util/UploadUtil.kt

@@ -1,12 +1,20 @@
 package com.gxzc.zen.common.util
 
-import com.gxzc.zen.common.dto.ZenMultipartFileDTO
+import com.github.benmanes.caffeine.cache.Caffeine
+import com.gxzc.zen.common.dto.ZenFileMetadata
+import com.gxzc.zen.common.dto.ZenFileResponse
+import com.gxzc.zen.common.exception.ZenException
+import com.gxzc.zen.common.exception.ZenExceptionEnum
 import com.gxzc.zen.common.properties.UploadProperties
+import org.apache.commons.io.FilenameUtils
 import org.slf4j.LoggerFactory
+import org.springframework.cache.caffeine.CaffeineCache
+import org.springframework.web.multipart.MultipartFile
 import java.io.*
 import java.nio.file.Files
 import java.nio.file.Paths
 import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.TimeUnit
 
 /**
  * 上传 工具类
@@ -25,70 +33,190 @@ object UploadUtil {
             return field
         }
 
-    private val uploadedMap = ConcurrentHashMap<String, Int>() // 分片上传数
+    private val uploadedStatusMap = ConcurrentHashMap<String, String>() // 文件上传状态缓存
+    private val batchCountMap = CaffeineCache("batchCountMap", Caffeine.newBuilder().expireAfterWrite(1L, TimeUnit.HOURS).build(), true) // 文件批量上传批次文件数量记录
+
+    private val FILE_SEPARATOR = System.getProperty("file.separator") // 适配操作系统的文件路径
+
+    object STATUS {
+        const val CHECKING = "checking" // 检查中
+        const val MERGING = "merging" // 合并中
+        const val UPLOADED = "uploaded" // 单文件上传完毕
+        const val BATCH_UPLOADED = "batchUploaded" // 单文件上传完毕
+        const val UPLOADING = "uploading" // 上传中
+    }
 
     /**
      * 正常上传<br>
-     * 保留源 文件夹结构/文件名
+     * 文件夹结构/文件名
      */
-    fun upload(fileDTO: ZenMultipartFileDTO): Boolean {
+    fun upload(fileMetadata: ZenFileMetadata, file: MultipartFile): ZenFileResponse {
         val tmpPath = uploadProperties!!.tmpPath!!
         val dataPath = uploadProperties!!.dataPath!!
-        if (validateRequest(fileDTO)) {
-            val chunkFilename = getChunkFilename(tmpPath, fileDTO.chunkNumber, fileDTO.identifier)
-            val directory = File(tmpPath)
-            if (!directory.exists()) {
-                Files.createDirectories(Paths.get(tmpPath))
-            }
-            // 文件较小 直接transfer
-            fileDTO.file!!.transferTo(File(chunkFilename))
-            // 检查分块完整性
-            if (checkChunks(fileDTO.identifier!!, fileDTO.totalChunks!!)) {
-                // 合并
-                mergeChunks(tmpPath, dataPath, fileDTO)
+        val chunkSize = uploadProperties!!.chunkSize!!
+        var retFile: File? = null
+        if (validateRequest(fileMetadata, file)) {
+            // 文件分片 如果分片小于chunkSize && totalChunk = 1,直接转存
+            if (fileMetadata.totalChunks == 1 && fileMetadata.chunkSize!! <= chunkSize) {
+                val filename = fileMetadata.filename!!
+                val relativePath = fileMetadata.relativePath!!
+
+                val destPath = FilenameUtils.normalize("$dataPath$FILE_SEPARATOR${getDestFilePath(filename, relativePath, fileMetadata.repath)}")
+                val destDir = Paths.get(destPath)
+                if (Files.notExists(destDir)) {
+                    Files.createDirectories(destDir)
+                }
+                val outputPath = FilenameUtils.normalize("$destPath$FILE_SEPARATOR${getDestFileName(filename, fileMetadata.rename)}")
+                retFile = File(outputPath)
+                file.transferTo(retFile)
+                retFile.setLastModified(fileMetadata.lastModified!!)
+            } else {
+                val chunkFilename = getChunkFilename(tmpPath, fileMetadata.chunkNumber, fileMetadata.md5)
+                val directory = Paths.get(tmpPath)
+                if (Files.notExists(directory)) {
+                    Files.createDirectories(directory)
+                }
+                file.transferTo(File(chunkFilename))
+                // 检查分块完整性
+                if (checkChunks(tmpPath, fileMetadata)) {
+                    // 合并
+                    retFile = try {
+                        mergeChunks(tmpPath, dataPath, fileMetadata)
+                    } catch (e: Throwable) {
+                        logger.error("merge file chunks exception, cause ", e)
+                        uploadedStatusMap.remove(fileMetadata.md5!!)
+                        null
+                    }
+                }
             }
-            return true
         } else {
-            return false
+            throw ZenException(ZenExceptionEnum.FILE_METADATA_VALIDATE_ERROR)
+        }
+        var status: String = STATUS.UPLOADING
+        if (retFile != null) {
+            status = setBatch(fileMetadata)
+        }
+        return ZenFileResponse().apply {
+            this.status = status
+            this.file = retFile
+        }
+    }
+
+    private fun setBatch(fileMetadata: ZenFileMetadata): String {
+        val batchId = fileMetadata.batchId!!
+        val totalNumber = fileMetadata.totalNumber!!
+        synchronized(batchCountMap) {
+            var count = batchCountMap[batchId]?.get() as? Int ?: 0
+            return if (++count >= totalNumber) {
+                batchCountMap.evict(batchId)
+                STATUS.BATCH_UPLOADED
+            } else {
+                batchCountMap.put(batchId, count)
+                STATUS.UPLOADED
+            }
         }
     }
 
-    fun uploadGet(fileDTO: ZenMultipartFileDTO): Boolean {
+    /**
+     * 检测文件是否存在 实现文件秒传
+     */
+    fun checkUpload(fileMetadata: ZenFileMetadata): ZenFileResponse {
+        val ret = ZenFileResponse()
+        if (validateRequest(fileMetadata, null)) {
+            if (fileExists(fileMetadata)) {
+                ret.uploadedChunks = mutableListOf()
+                for (i in 1..fileMetadata.totalChunks!!) {
+                    ret.uploadedChunks?.add(i)
+                }
+                ret.status = setBatch(fileMetadata)
+            } else {
+                // 检查分片存在情况
+                for (i in 1..fileMetadata.totalChunks!!) {
+                    if (chunkExists(i, fileMetadata.md5!!)) {
+                        if (ret.uploadedChunks == null) {
+                            ret.uploadedChunks = mutableListOf()
+                        }
+                        ret.uploadedChunks?.add(i)
+                    }
+                }
+                if (ret.uploadedChunks != null && ret.uploadedChunks!!.size == fileMetadata.totalChunks) {
+                    ret.status = STATUS.CHECKING // 秒传
+                    // 所有分块传完 移除其中一个分块,再传一次而后 merge
+                    ret.uploadedChunks!!.removeAt(0)
+                }
+            }
+        }
+        return ret
+    }
+
+    /**
+     * 检查文件是否存在 (真实文件)
+     */
+    private fun fileExists(fileMetadata: ZenFileMetadata): Boolean {
+        val dataPath = uploadProperties!!.dataPath!!
+        // 获取filename 真实文件
+        val filename = fileMetadata.filename!!
+        val relativePath = fileMetadata.relativePath!!
+        val md5 = fileMetadata.md5!!
+        val path = FilenameUtils.normalize("$dataPath$FILE_SEPARATOR${getDestFilePath(filename, relativePath, fileMetadata.repath)}$FILE_SEPARATOR${getDestFileName(filename, fileMetadata.rename)}")
+        return Files.exists(Paths.get(path)) && FileUtil.md5HeadTail(path, uploadProperties!!.chunkSize!!.toInt()) == md5 // # 防篡改
+    }
+
+    /**
+     * 检查分片是否存在 (tmp目录)
+     */
+    private fun chunkExists(chunkNumber: Int?, md5: String): Boolean {
         val tmpPath = uploadProperties!!.tmpPath!!
-        return if (validateRequest(fileDTO)) {
-            val existsFile = File(getChunkFilename(tmpPath, fileDTO.chunkNumber, fileDTO.identifier))
-            existsFile.exists()
-        } else {
-            false
+        return Files.exists(Paths.get(getChunkFilename(tmpPath, chunkNumber, md5)))
+    }
+
+    /**
+     * 检查分块是否上传完毕
+     */
+    private fun checkChunks(tmpPath: String, fileMetadata: ZenFileMetadata): Boolean {
+        val totalChunks = fileMetadata.totalChunks!!
+        val md5 = fileMetadata.md5!!
+        for (i in 1..totalChunks) {
+            if (Files.notExists(Paths.get(getChunkFilename(tmpPath, i, md5)))) {
+                return false
+            }
         }
+        return true
     }
 
     /**
      * 合并所有分块
      * 支持 文件夹合并
      */
-    private fun mergeChunks(sourceRootPath: String, destRootPath: String, fileDTO: ZenMultipartFileDTO) {
+    private fun mergeChunks(sourceRootPath: String, destRootPath: String, fileMetadata: ZenFileMetadata): File? {
         // 源文件的文件夹信息 然后组合拼接
-        val filename = fileDTO.filename!!
-        val relativePath = fileDTO.relativePath!!
-        val totalChunks = fileDTO.totalChunks!!
-        logger.debug("start merging chunks for [$filename]")
+        val filename = fileMetadata.filename!!
+        val relativePath = fileMetadata.relativePath!!
+        val totalChunks = fileMetadata.totalChunks!!
+        val md5 = fileMetadata.md5!!
 
-        val folderRelativePath = relativePath.replace(filename, "")
-        // 示例 "sql/xx.sql" -> "sql/"
-        // "xx.sql" -> ""
+        if (uploadedStatusMap[md5] == STATUS.MERGING) {
+            return null
+        }
+
+        uploadedStatusMap[md5] = STATUS.MERGING
+
+        logger.debug("start merging chunks for [$filename]")
 
-        val destDir = File("$destRootPath/$folderRelativePath")
-        if (!destDir.exists()) {
-            Files.createDirectories(Paths.get("$destRootPath/$folderRelativePath"))
+        val destPath = FilenameUtils.normalize("$destRootPath$FILE_SEPARATOR${getDestFilePath(filename, relativePath, fileMetadata.repath)}")
+        val destDir = Paths.get(destPath)
+        if (Files.notExists(destDir)) {
+            Files.createDirectories(destDir)
         }
         // 目标文件流 通过文件名来拼接
-        val destOutputStream = BufferedOutputStream(FileOutputStream("$destRootPath/$folderRelativePath$filename"))
+        val outputPath = FilenameUtils.normalize("$destPath$FILE_SEPARATOR${getDestFileName(filename, fileMetadata.rename)}")
+        val outputFile = File(outputPath)
+        val destOutputStream = BufferedOutputStream(FileOutputStream(outputFile))
 
-        val buffer = ByteArray(1024)
+        val buffer = ByteArray(4096)
         var readBytesLength: Int
         for (i: Int in 1..totalChunks) {
-            val sourceFile = File(getChunkFilename(sourceRootPath, i, fileDTO.identifier))
+            val sourceFile = File(getChunkFilename(sourceRootPath, i, md5))
             val sourceInputStream = BufferedInputStream(FileInputStream(sourceFile))
 
             readBytesLength = sourceInputStream.read(buffer)
@@ -105,51 +233,58 @@ object UploadUtil {
         destOutputStream.close()
 
         logger.debug("merging successful.")
+
+        // 修改文件 修改时间
+        outputFile.setLastModified(fileMetadata.lastModified!!)
+
+        uploadedStatusMap.remove(md5)
+
+        return outputFile
     }
 
     /**
-     * 检查分块是否上传完毕
+     * 获取 分片文件名
      */
-    private fun checkChunks(identifier: String, totalChunks: Int): Boolean {
-        val cleanIdentifier = cleanIdentifier(identifier)!!
-        var chunksNow = uploadedMap.getOrDefault(cleanIdentifier, 0)
-        return if (totalChunks == ++chunksNow) {
-            uploadedMap.remove(cleanIdentifier)
-            true
-        } else {
-            uploadedMap[cleanIdentifier] = chunksNow
-            false
-        }
+    private fun getChunkFilename(path: String, chunkNumber: Int?, identifier: String?): String {
+        return "$path/upload-$identifier.$chunkNumber"
     }
 
     /**
-     * 移除多余的identifier字符
+     * 生成 输出的文件名
      */
-    private fun cleanIdentifier(identifier: String?): String? {
-        return identifier?.replace(Regex("[^0-9A-Za-z_-]"), "")
+    private fun getDestFileName(filename: String, rename: String?): String {
+        return if (rename == null || rename.isEmpty()) {
+            filename
+        } else {
+            rename
+        }
     }
 
     /**
-     * 获取 分片文件名
+     * 生成 输出的文件夹结构
      */
-    private fun getChunkFilename(path: String, chunkNumber: Int?, identifier: String?): String {
-        return "$path/upload-${cleanIdentifier(identifier)}.$chunkNumber"
+    private fun getDestFilePath(filename: String, relativePath: String, repath: String?): String {
+        return if (repath.isNullOrEmpty()) {
+            relativePath.replace(filename, "")
+        } else {
+            repath!!
+        }
     }
 
     /**
      * validate request multipart chunks
      */
-    private fun validateRequest(fileDTO: ZenMultipartFileDTO): Boolean {
-        val identifier = cleanIdentifier(fileDTO.identifier)
-        val chunkNumber = fileDTO.chunkNumber
-        val chunkSize = fileDTO.chunkSize
-        val totalSize = fileDTO.totalSize
-        val filename = fileDTO.filename
+    private fun validateRequest(fileMetadata: ZenFileMetadata, file: MultipartFile?): Boolean {
+        val md5 = fileMetadata.md5
+        val chunkNumber = fileMetadata.chunkNumber
+        val chunkSize = fileMetadata.chunkSize
+        val totalSize = fileMetadata.totalSize
+        val filename = fileMetadata.filename
 
         if (chunkNumber == null || chunkNumber <= 0 ||
                 chunkSize == null || chunkSize <= 0 ||
                 totalSize == null || totalSize <= 0 ||
-                identifier == null || identifier.isEmpty() ||
+                md5 == null || md5.isEmpty() ||
                 filename == null || filename.isEmpty()) {
             return false
         }
@@ -170,8 +305,6 @@ object UploadUtil {
             }
         }
 
-
-        val file = fileDTO.file
         if (file != null) {
             // The chunk in the POST request isn't the correct size
             if (chunkNumber < numberOfChunks && file.size != chunkSize) {

zen-core/src/test/kotlin/com/gxzc/zen/TestFileChunks.kt

@@ -0,0 +1,80 @@
+package com.gxzc.zen
+
+import com.gxzc.zen.common.util.FileUtil
+import org.apache.commons.io.FilenameUtils
+import org.junit.Test
+import java.nio.ByteBuffer
+
+
+/**
+ *
+ * @author NorthLan
+ * @date 2018/5/24
+ * @url https://noahlan.com
+ */
+class TestFileChunks {
+
+    /**
+     * 测试文件md5生成
+     * 选取文件 头尾chunk 和 最后修改日期 结合生成md5
+     * chunkSize = 10 * 1024 * 1024 = 10MB
+     */
+    @Test
+    fun testFileChunkMd5() {
+        val chunkSize = 10 * 1024 * 1024
+        val path = "D:\\data\\HBuilder.8.9.1.windows.zip"
+        println(FileUtil.md5HeadTail(path, chunkSize))
+    }
+
+    @Test
+    fun longLength() {
+        println(java.lang.Long.SIZE / 8)
+    }
+
+    @Test
+    fun longToBytes() {
+        val buffer = ByteBuffer.allocate(8)
+        buffer.putLong(1501841794418L)
+//        buffer.flip()
+        val byteArray = buffer.array()
+        byteArray.reverse()
+        buffer.clear()
+    }
+
+    @Test
+    fun testRegex() {
+        val a = "C:\\Users\\Test\\a"
+        val b = "\\Users\\Test\\b"
+        val c = "/Users/Test/c"
+        val d = "//Users/Test/d"
+
+        val regex = "^[\\\\/]+"
+
+        println(a.replace(Regex(regex), ""))
+        println(b.replace(Regex(regex), ""))
+        println(c.replace(Regex(regex), ""))
+        println(d.replace(Regex(regex), ""))
+
+        println(getDestFilePath("niubi.pdf", "niubi.pdf", null))
+
+        val e = "D:\\data\\\\a.exe"
+        println(FilenameUtils.normalize(e))
+    }
+
+    /**
+     * 生成 文件夹结构
+     */
+    fun getDestFilePath(filename: String, relativePath: String, repath: String?): String {
+        return repath?.replace(Regex("^[\\\\/]+"), "")?.replace("/", FILE_SEPARATOR)?.replace("\\", FILE_SEPARATOR)
+                ?: relativePath.replace(filename, "").replace("/", FILE_SEPARATOR).replace("\\", FILE_SEPARATOR)
+    }
+
+    private val FILE_SEPARATOR = System.getProperty("file.separator") // 适配操作系统的文件路径
+
+    @Test
+    fun testFor(){
+        for(i in 1..10){
+            println(i)
+        }
+    }
+}

zen-web/src/main/kotlin/com/gxzc/zen/web/sys/controller/UploadController.kt

@@ -1,7 +1,8 @@
 package com.gxzc.zen.web.sys.controller
 
 import com.gxzc.zen.common.base.BaseController
-import com.gxzc.zen.common.dto.ZenMultipartFileDTO
+import com.gxzc.zen.common.dto.ZenFileMetadata
+import com.gxzc.zen.common.exception.ZenException
 import com.gxzc.zen.common.util.UploadUtil
 import io.swagger.annotations.ApiOperation
 import org.slf4j.LoggerFactory
@@ -11,6 +12,7 @@ import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.RestController
+import org.springframework.web.multipart.MultipartFile
 
 /**
  * 上传文件 控制器
@@ -25,32 +27,34 @@ class UploadController : BaseController() {
         private val logger = LoggerFactory.getLogger(UploadController::class.java)
     }
 
-    @ApiOperation("检查已上传分片")
+    @ApiOperation("获取已上传分片列表")
     @GetMapping
-    fun checkChunk(fileDTO: ZenMultipartFileDTO): ResponseEntity<*> {
-        // 检查文件是否存在
-        return if (UploadUtil.uploadGet(fileDTO)) {
-            ResponseEntity.ok(null)
+    fun checkChunk(fileMetadata: ZenFileMetadata): ResponseEntity<*> {
+        // 检查已上传文件分片
+        val ret = UploadUtil.checkUpload(fileMetadata)
+        return if (ret.uploadedChunks != null) {
+            ResponseEntity.ok(ret)
         } else {
-            ResponseEntity.status(204).body(null)
+            ResponseEntity.status(204).body(ret)
         }
     }
 
-    @ApiOperation("分片上传", notes = "保留源文件夹结构/文件名")
+    @ApiOperation("上传", notes = "支持小文件上传,大文件分片上传(统一分片)")
     @PostMapping
-    fun upload(fileDTO: ZenMultipartFileDTO): ResponseEntity<*> {
-        if (fileDTO.file == null) {
+    fun upload(fileMetadata: ZenFileMetadata, file: MultipartFile?): ResponseEntity<*> {
+        if (file == null) {
             return ResponseEntity.status(HttpStatus.NOT_ACCEPTABLE.value()).body(null)
         }
-        return if (UploadUtil.upload(fileDTO)) {
-            ResponseEntity.ok(null)
+        val uploadResponse = try {
+            UploadUtil.upload(fileMetadata, file)
+        } catch (e: ZenException) {
+            null
+        }
+
+        return if (uploadResponse != null) {
+            ResponseEntity.ok(uploadResponse)
         } else {
             ResponseEntity.status(HttpStatus.NOT_ACCEPTABLE.value()).body(null)
         }
     }
-
-    @ApiOperation("分片上传(批量)", notes = "不保留源文件夹结构/文件名")
-    fun PostMapping() {
-
-    }
 }

zen-web/src/main/resources/application-orm-mycat.yml

@@ -14,8 +14,8 @@ spring:
     driver-class-name: com.mysql.jdbc.Driver
     username: archives
     password: archives
-    url: jdbc:mysql://192.168.1.10:8066/SYS?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&zeroDateTimeBehavior=convertToNull
-
+    url: jdbc:mysql://192.168.1.10:8066/SYS?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&useSSL=false&zeroDateTimeBehavior=convertToNull
+# &useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC
 
 ###################  mybatis-plus配置  ###################
 mybatis-plus:

zen-web/src/main/resources/application-upload.yml

@@ -2,8 +2,8 @@ spring:
   http:
     multipart:
       enabled: true
-      max-request-size: 40MB #最大请求大小
-      max-file-size: 20MB #最大文件大小
+      max-request-size: 50MB #最大请求大小
+      max-file-size: 25MB #最大文件大小
       location: ${java.io.tmpdir}
       file-size-threshold: 5MB
 
@@ -11,4 +11,5 @@ spring:
 upload:
   tmpPath: D://tmp # 临时文件存放位置 默认 /tmp/zen
   dataPath: D://data
-  maxFileSize: 4294967296 # 单位 byte 为0表示无限制
+  maxFileSize: 4294967296 # 单位 byte 为0表示无限制
+  chunkSize: 10485760 # 10*1024*1024 = 10MB