移除无用文件,添加上传接口(分片),优化配置便于打包.

build.gradle

@@ -1,11 +1,6 @@
-allprojects {
-    group "com.gxzc.zen"
-    version "1.0-SNAPSHOT"
-}
-
 buildscript {
     ext {
-        kotlin_version = '1.2.30'
+        kotlin_version = '1.2.41'
         spring_boot_version = '1.5.10.RELEASE'
         junit_version = '4.12'
         commons_io_version = '2.5'
@@ -33,34 +28,51 @@ buildscript {
     }
     repositories {
         mavenCentral()
+        maven { url 'http://repo.spring.io/plugins-release' }
     }
     dependencies {
+        classpath 'io.spring.gradle:propdeps-plugin:0.0.9.RELEASE'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlin_version"
         classpath "org.springframework.boot:spring-boot-gradle-plugin:$spring_boot_version"
     }
 }
 
+allprojects {
+    group "com.gxzc.zen"
+    version "1.0-SNAPSHOT"
+}
+
 subprojects {
     apply plugin: 'java'
     apply plugin: 'kotlin'
+    apply plugin: 'kotlin-kapt'
     apply plugin: 'kotlin-spring'
     apply plugin: 'org.springframework.boot'
 
+    apply plugin: 'propdeps'
+    apply plugin: 'propdeps-maven'
+    apply plugin: 'propdeps-idea'
+    apply plugin: 'propdeps-eclipse'
+
     sourceCompatibility = 1.8
     targetCompatibility = 1.8
 
     [compileJava, compileTestJava, javadoc]*.options*.encoding = 'UTF-8'
+    compileJava.dependsOn(processResources)
 
     repositories {
         mavenCentral()
         jcenter()
     }
+
     dependencies {
         // Kotlin
         compile("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version")
         compile("org.jetbrains.kotlin:kotlin-reflect:$kotlin_version")
 
+        kapt "org.springframework.boot:spring-boot-configuration-processor"
+        optional("org.springframework.boot:spring-boot-configuration-processor")
         // SpringBoot Starter
         compile('org.springframework.boot:spring-boot-starter')
         compile('org.springframework.boot:spring-boot-starter-web')
@@ -69,8 +81,8 @@ subprojects {
 //        compile('org.springframework.boot:spring-boot-starter-jta-atomikos')
         compile('org.springframework.boot:spring-boot-starter-cache')
         compile('org.springframework.boot:spring-boot-starter-data-redis')
-        testCompile('org.springframework.boot:spring-boot-starter-test')
 
+        testCompile('org.springframework.boot:spring-boot-starter-test')
         testCompile("junit:junit:$junit_version")
 
         // session
@@ -139,10 +151,6 @@ subprojects {
         compile jarTree
     }
 
-    task listJars(description: 'Display all compile jars.') << {
-        configurations.compile.each { File file -> println file.name }
-    }
-
     tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
         kotlinOptions {
             jvmTarget = "1.8"

zen-api/src/main/kotlin/com/gxzc/zen/umps/config/ShiroConfig.kt

@@ -88,8 +88,9 @@ class ShiroConfig {
                     "/auth/hello" to "canon", // 获取cookie
 //                    "/auth/logout" to "logout", // 登出
                     "/test/**" to "canon", // 测试 免登录
+                    "/upload/**" to "canon", // 上传免登录
                     ////////////////////// 静态资源 /////////////////////
-                    "/v2/api-docs" to "anon",
+                    "/v2/api-docs" to "canon",
                     "/swagger-resources/**" to "anon",
                     "/swagger-ui.html" to "anon",
                     "/webjars*" to "anon",

zen-core/src/main/kotlin/com/gxzc/zen/common/base/BaseModel.kt

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotations.TableId
 import com.baomidou.mybatisplus.annotations.TableLogic
 import com.baomidou.mybatisplus.enums.FieldFill
 import com.baomidou.mybatisplus.enums.IdType
-import com.fasterxml.jackson.annotation.JsonFormat
 import com.fasterxml.jackson.annotation.JsonInclude
 import io.swagger.annotations.ApiModelProperty
 import java.io.Serializable
@@ -15,7 +14,7 @@ import java.util.*
  * 通用实体 包含通用字段
  * @author NorthLan at 2017/12/8
  */
-@JsonInclude(JsonInclude.Include.NON_NULL) // jackson 忽略空值
+@JsonInclude(JsonInclude.Include.ALWAYS) // jackson 所有
 open class BaseModel : Serializable {
     companion object {
         private const val serialVersionUID = 1000000000000000001L

zen-core/src/main/kotlin/com/gxzc/zen/common/config/SwaggerConfig.kt

@@ -1,5 +1,6 @@
 package com.gxzc.zen.common.config
 
+import io.swagger.annotations.Api
 import io.swagger.annotations.ApiOperation
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
 import org.springframework.context.annotation.Bean
@@ -7,10 +8,8 @@ import org.springframework.context.annotation.Configuration
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
 import springfox.documentation.builders.ApiInfoBuilder
-import springfox.documentation.builders.PathSelectors
 import springfox.documentation.builders.RequestHandlerSelectors
 import springfox.documentation.service.ApiInfo
-import springfox.documentation.service.ApiKey
 import springfox.documentation.service.Contact
 import springfox.documentation.spi.DocumentationType
 import springfox.documentation.spring.web.plugins.Docket
@@ -44,7 +43,8 @@ class SwaggerConfig : WebMvcConfigurerAdapter() {
                 .groupName("v2")
                 .apiInfo(apiInfo())
                 .select()
-                .apis(RequestHandlerSelectors.withClassAnnotation(ApiOperation::class.java))
+//                .apis(RequestHandlerSelectors.withClassAnnotation(Api::class.java))
+                .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation::class.java))
                 // .paths(PathSelectors.ant("/api/v2/**"))
                 .build()
 //                .securitySchemes()

zen-core/src/main/kotlin/com/gxzc/zen/common/config/response/ZenJsonConfigurer.kt

@@ -29,7 +29,7 @@ class ZenJsonConfigurer : WebMvcConfigurerAdapter() {
     @Bean(CONVERTER_NAME)
     fun getConverter(): MappingJackson2HttpMessageConverter {
         return MappingJackson2HttpMessageConverter().apply {
-            
+
             this.objectMapper = builder().build()
         }
     }

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

@@ -0,0 +1,29 @@
+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/properties/UploadProperties.kt

@@ -0,0 +1,18 @@
+package com.gxzc.zen.common.properties
+
+import org.springframework.boot.context.properties.ConfigurationProperties
+import org.springframework.stereotype.Component
+
+/**
+ * 上传文件 配置
+ * @author NorthLan
+ * @date 2018/5/19
+ * @url https://noahlan.com
+ */
+@Component
+@ConfigurationProperties(prefix = "upload")
+open class UploadProperties {
+    var tmpPath: String? = "/tmp/zen"
+    var dataPath: String? = "/data/zen"
+    var maxFileSize: Long? = 4294967296L
+}

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

@@ -0,0 +1,194 @@
+package com.gxzc.zen.common.util
+
+import com.gxzc.zen.common.dto.ZenMultipartFileDTO
+import com.gxzc.zen.common.properties.UploadProperties
+import org.slf4j.LoggerFactory
+import java.io.*
+import java.nio.file.Files
+import java.nio.file.Paths
+import java.util.concurrent.ConcurrentHashMap
+
+/**
+ * 上传 工具类
+ * @author NorthLan
+ * @date 2018/5/19
+ * @url https://noahlan.com
+ */
+object UploadUtil {
+    private val logger = LoggerFactory.getLogger(UploadUtil::class.java)
+
+    private var uploadProperties = SpringContextHolder.getBean(UploadProperties::class.java)
+        get() {
+            if (field == null) {
+                field = SpringContextHolder.getBean(UploadProperties::class.java)
+            }
+            return field
+        }
+
+    private val uploadedMap = ConcurrentHashMap<String, Int>() // 分片上传数
+
+    /**
+     * 正常上传<br>
+     * 保留源 文件夹结构/文件名
+     */
+    fun upload(fileDTO: ZenMultipartFileDTO): Boolean {
+        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)
+            }
+            return true
+        } else {
+            return false
+        }
+    }
+
+    fun uploadGet(fileDTO: ZenMultipartFileDTO): Boolean {
+        val tmpPath = uploadProperties!!.tmpPath!!
+        return if (validateRequest(fileDTO)) {
+            val existsFile = File(getChunkFilename(tmpPath, fileDTO.chunkNumber, fileDTO.identifier))
+            existsFile.exists()
+        } else {
+            false
+        }
+    }
+
+    /**
+     * 合并所有分块
+     * 支持 文件夹合并
+     */
+    private fun mergeChunks(sourceRootPath: String, destRootPath: String, fileDTO: ZenMultipartFileDTO) {
+        // 源文件的文件夹信息 然后组合拼接
+        val filename = fileDTO.filename!!
+        val relativePath = fileDTO.relativePath!!
+        val totalChunks = fileDTO.totalChunks!!
+        logger.debug("start merging chunks for [$filename]")
+
+        val folderRelativePath = relativePath.replace(filename, "")
+        // 示例 "sql/xx.sql" -> "sql/"
+        // "xx.sql" -> ""
+
+        val destDir = File("$destRootPath/$folderRelativePath")
+        if (!destDir.exists()) {
+            Files.createDirectories(Paths.get("$destRootPath/$folderRelativePath"))
+        }
+        // 目标文件流 通过文件名来拼接
+        val destOutputStream = BufferedOutputStream(FileOutputStream("$destRootPath/$folderRelativePath$filename"))
+
+        val buffer = ByteArray(1024)
+        var readBytesLength: Int
+        for (i: Int in 1..totalChunks) {
+            val sourceFile = File(getChunkFilename(sourceRootPath, i, fileDTO.identifier))
+            val sourceInputStream = BufferedInputStream(FileInputStream(sourceFile))
+
+            readBytesLength = sourceInputStream.read(buffer)
+            while (readBytesLength != -1) {
+                destOutputStream.write(buffer, 0, readBytesLength)
+                readBytesLength = sourceInputStream.read(buffer)
+            }
+            sourceInputStream.close()
+            // 删除分片
+            sourceFile.delete()
+        }
+        //
+        destOutputStream.flush()
+        destOutputStream.close()
+
+        logger.debug("merging successful.")
+    }
+
+    /**
+     * 检查分块是否上传完毕
+     */
+    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
+        }
+    }
+
+    /**
+     * 移除多余的identifier字符
+     */
+    private fun cleanIdentifier(identifier: String?): String? {
+        return identifier?.replace(Regex("[^0-9A-Za-z_-]"), "")
+    }
+
+    /**
+     * 获取 分片文件名
+     */
+    private fun getChunkFilename(path: String, chunkNumber: Int?, identifier: String?): String {
+        return "$path/upload-${cleanIdentifier(identifier)}.$chunkNumber"
+    }
+
+    /**
+     * 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
+
+        if (chunkNumber == null || chunkNumber <= 0 ||
+                chunkSize == null || chunkSize <= 0 ||
+                totalSize == null || totalSize <= 0 ||
+                identifier == null || identifier.isEmpty() ||
+                filename == null || filename.isEmpty()) {
+            return false
+        }
+
+        val numberOfChunks = Math.max(Math.floor(totalSize / (chunkSize * 1.0)), 1.0).toInt()
+        if (chunkNumber > numberOfChunks) {
+            return false
+        }
+
+        // is the file too large?
+        uploadProperties?.let {
+            val maxFileSize = it.maxFileSize
+            if (maxFileSize != null && maxFileSize > 0) {
+                if (totalSize > maxFileSize) {
+                    logger.error("filesize limit: [${maxFileSize / 1024 / 1024} MB], now [${totalSize / 1024 / 1024} MB]")
+                    return false
+                }
+            }
+        }
+
+
+        val file = fileDTO.file
+        if (file != null) {
+            // The chunk in the POST request isn't the correct size
+            if (chunkNumber < numberOfChunks && file.size != chunkSize) {
+                logger.error("The chunk in the POST request isn't the correct size")
+                return false
+            }
+            // The chunks in the POST is the last one, and the fil is not the correct size
+            if (numberOfChunks > 1 && chunkNumber == numberOfChunks && file.size != (totalSize % chunkSize) + chunkSize) {
+                logger.error("The chunks in the POST is the last one, and the fil is not the correct size")
+                return false
+            }
+            // The file is only a single chunk, and the data size does not fit
+            if (numberOfChunks == 1 && file.size != totalSize) {
+                logger.error("The file is only a single chunk, and the data size does not fit")
+                return false
+            }
+        }
+        return true
+    }
+}

zen-web/build.gradle

@@ -1,4 +1,5 @@
 // apply plugin: 'jar'
+apply plugin: 'war'
 
 buildscript {
     repositories {

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

@@ -1,14 +1,8 @@
 package com.gxzc.zen.web.sys.controller
 
-import com.fasterxml.jackson.databind.ObjectMapper
-import com.gxzc.zen.api.sys.model.SysUser
 import com.gxzc.zen.common.base.BaseController
-import com.gxzc.zen.common.dto.ResponseDto
-import khronos.Dates
-import org.apache.shiro.SecurityUtils
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.http.ResponseEntity
-import org.springframework.web.bind.annotation.*
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
 
 
 /**
@@ -20,43 +14,4 @@ import org.springframework.web.bind.annotation.*
 @RestController
 @RequestMapping("test")
 class TestController : BaseController() {
-
-    @Autowired
-    private lateinit var objectMapper: ObjectMapper
-
-    @GetMapping("/a")
-    fun test() {
-
-    }
-
-    @GetMapping("/b")
-    fun testb() {
-        if (SecurityUtils.getSubject().hasRole("test")) {
-
-        }
-    }
-
-    @GetMapping("/rpc")
-    fun rpc() {
-//        println(testRpcService.sayHello("2333"))
-    }
-
-    @GetMapping("/long")
-    fun longlonglong(): ResponseEntity<*> {
-        // 测试long
-        val sysUser = SysUser().apply {
-            id = 123456789012345L
-            createTime = Dates.today
-            updateTime = Dates.tomorrow
-        }
-
-        return ResponseEntity.ok(ResponseDto().apply { data = sysUser })
-    }
-
-    @PostMapping("/longlong")
-    fun longlong(@RequestBody entity: SysUser): ResponseEntity<*> {
-        return ResponseEntity.ok(null)
-    }
-
-
 }

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

@@ -0,0 +1,56 @@
+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.util.UploadUtil
+import io.swagger.annotations.ApiOperation
+import org.slf4j.LoggerFactory
+import org.springframework.http.HttpStatus
+import org.springframework.http.ResponseEntity
+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
+
+/**
+ * 上传文件 控制器
+ * @author NorthLan
+ * @date 2018/5/19
+ * @url https://noahlan.com
+ */
+@RestController
+@RequestMapping("/upload")
+class UploadController : BaseController() {
+    companion object {
+        private val logger = LoggerFactory.getLogger(UploadController::class.java)
+    }
+
+    @ApiOperation("检查已上传分片")
+    @GetMapping
+    fun checkChunk(fileDTO: ZenMultipartFileDTO): ResponseEntity<*> {
+        // 检查文件是否存在
+        return if (UploadUtil.uploadGet(fileDTO)) {
+            ResponseEntity.ok(null)
+        } else {
+            ResponseEntity.status(204).body(null)
+        }
+    }
+
+    @ApiOperation("分片上传", notes = "保留源文件夹结构/文件名")
+    @PostMapping
+    fun upload(fileDTO: ZenMultipartFileDTO): ResponseEntity<*> {
+        if (fileDTO.file == null) {
+            return ResponseEntity.status(HttpStatus.NOT_ACCEPTABLE.value()).body(null)
+        }
+        return if (UploadUtil.upload(fileDTO)) {
+            ResponseEntity.ok(null)
+        } else {
+            ResponseEntity.status(HttpStatus.NOT_ACCEPTABLE.value()).body(null)
+        }
+    }
+
+    @ApiOperation("分片上传(批量)", notes = "不保留源文件夹结构/文件名")
+    fun PostMapping() {
+
+    }
+}

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

@@ -1,105 +0,0 @@
-orm:
-  multi-datasource-enable: true # 多数据源开关
-
-################## Alibaba Druid 配置 ##################
-spring:
-  datasource:
-#    type: com.alibaba.druid.pool.DruidDataSource
-    druid:
-      stat-view-servlet:
-        enabled: true
-        login-username: root
-        login-password: root
-        reset-enable: false
-  jta:
-    atomikos:
-      properties:
-        serial-jta-transactions: false
-
-################## 数据源 配置 ##################
-######## 单数据源使用sys作为默认数据源 ############
-datasource:
-  sys:
-    name: system
-    url: jdbc:mysql://127.0.0.1:3306/archives_sys?pinGlobalTxToPhysicalConnection=true&useUnicode=true&characterEncoding=utf-8&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&zeroDateTimeBehavior=convertToNull
-    driver-class-name: com.mysql.jdbc.Driver
-    username: root
-    password: root
-    test-on-borrow: false
-    test-on-return: false
-    test-while-idle: true
-    validation-query: SELECT 1
-    async-init: false
-    filters: log4j,wall,mergeStat
-    keep-alive: false
-    initial-size: 5
-    min-idle: 5
-    max-active: 20
-    time-between-eviction-runs-millis: 60000
-    min-evictable-idle-time-millis: 30000
-  bus:
-    name: business
-    url: jdbc:mysql://127.0.0.1:3306/archives_mgr?pinGlobalTxToPhysicalConnection=true&useUnicode=true&characterEncoding=utf-8&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&zeroDateTimeBehavior=convertToNull
-    driver-class-name: com.mysql.jdbc.Driver
-    username: root
-    password: root
-    test-on-borrow: false
-    test-on-return: false
-    test-while-idle: true
-    validation-query: SELECT 1
-    async-init: false
-    filters: log4j,wall,mergeStat
-    keep-alive: false
-    initial-size: 5
-    min-idle: 5
-    max-active: 20
-    time-between-eviction-runs-millis: 60000
-    min-evictable-idle-time-millis: 30000
-
-###################  mybatis-plus配置  ###################
-mybatis-plus:
-  mapper-locations: classpath*:mapping/**/*.xml
-  type-aliases-package: com.gxzc.zen.api.bus.mapper,com.gxzc.zen.api.sys.mapper,com.gxzc.zen.api.bus.mapper,com.gxzc.zen.api.bus.mapper
-  global-config:
-    id-type: 0  #0:数据库ID自增   1:用户输入id  2:全局唯一id(IdWorker)  3:全局唯一ID(uuid)
-    db-column-underline: true
-    refresh-mapper: true
-    logic-delete-value: 0
-    logic-not-delete-value: 1
-    sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
-    meta-object-handler: com.gxzc.zen.orm.CustomMetaObjectHandler
-  configuration:
-    map-underscore-to-camel-case: true
-    cache-enabled: true #配置的缓存的全局开关
-    lazyLoadingEnabled: true #延时加载的开关
-    multipleResultSetsEnabled: true #延时加载一个属性时会加载该对象全部属性，否则按需加载属性
-    interceptors: com.baomidou.mybatisplus.plugins.OptimisticLockerInterceptor, com.baomidou.mybatisplus.plugins.PaginationInterceptor
-    # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用
-
-
-##sharding-jdbc
-#sharding:
-#  jdbc:
-#    datasource:
-#      names: ds_sys,ds_rec
-#      ds_sys:
-#        type: com.alibaba.druid.pool.DruidDataSource
-#        driver-class-name: com.mysql.jdbc.Driver
-#        url: jdbc:mysql://127.0.0.1:3306/archives_sys?useUnicode=true&characterEncoding=utf-8&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&zeroDateTimeBehavior=convertToNull
-#        username: root
-#        password: root
-#        maxActive: 20
-#      ds_rec:
-#        type: com.alibaba.druid.pool.DruidDataSource
-#        driver-class-name: com.mysql.jdbc.Driver
-#        url: jdbc:mysql://127.0.0.1:3306/archives_rec?useUnicode=true&characterEncoding=utf-8&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&zeroDateTimeBehavior=convertToNull
-#        username: root
-#        password: root
-#        maxActive: 20
-#    config:
-#      sharding:
-#        tables:
-#          sys_dept:
-#            actualDataNodes: 'ds_sys
-#          sys_dic:
-#          sys_param:

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

@@ -1,66 +0,0 @@
-orm:
-  multi-datasource-enable: false # 多数据源开关
-
-################## Alibaba Druid 配置 ##################
-spring:
-  datasource:
-    type: com.alibaba.druid.pool.DruidDataSource
-    druid:
-      stat-view-servlet:
-        enabled: true
-        login-username: root
-        login-password: root
-        reset-enable: false
-      test-on-borrow: true
-      test-on-return: false
-      test-while-idle: true
-    driver-class-name: com.mysql.jdbc.Driver
-    username: archives
-    password: archives
-    url: jdbc:mysql://192.168.1.10:3306/archives_sys?pinGlobalTxToPhysicalConnection=true&autoReconnect=true&useUnicode=true&characterEncoding=utf-8&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&zeroDateTimeBehavior=convertToNull
-  jta:
-    atomikos:
-      properties:
-        serial-jta-transactions: false
-
-################## 数据源 配置 ##################
-######## 单数据源使用sys作为默认数据源 ############
-datasource:
-  sys:
-    name: system
-    url: jdbc:mysql://192.168.1.10:3306/archives_sys?pinGlobalTxToPhysicalConnection=true&autoReconnect=true&useUnicode=true&characterEncoding=utf-8&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&zeroDateTimeBehavior=convertToNull
-    driver-class-name: com.mysql.jdbc.Driver
-    username: archives
-    password: archives
-    test-on-borrow: true
-    test-on-return: false
-    test-while-idle: true
-    validation-query: SELECT 1
-    async-init: false
-    filters: log4j,wall,mergeStat
-    keep-alive: false
-    initial-size: 5
-    min-idle: 5
-    max-active: 20
-    time-between-eviction-runs-millis: 60000
-    min-evictable-idle-time-millis: 30000
-
-###################  mybatis-plus配置  ###################
-mybatis-plus:
-  mapper-locations: classpath*:mapping/**/*.xml
-  type-aliases-package: com.gxzc.zen.api.sys.mapper
-  global-config:
-    id-type: 0  #0:数据库ID自增   1:用户输入id  2:全局唯一id(IdWorker)  3:全局唯一ID(uuid)
-    db-column-underline: true
-    refresh-mapper: true
-    logic-delete-value: 0
-    logic-not-delete-value: 1
-    sql-injector: com.gxzc.zen.orm.sql.ZenSqlInjector # 自定义injector
-    meta-object-handler: com.gxzc.zen.orm.CustomMetaObjectHandler
-  configuration:
-    map-underscore-to-camel-case: true
-    cache-enabled: true #配置的缓存的全局开关
-    lazyLoadingEnabled: true #延时加载的开关
-    multipleResultSetsEnabled: true #延时加载一个属性时会加载该对象全部属性，否则按需加载属性
-    interceptors: com.baomidou.mybatisplus.plugins.OptimisticLockerInterceptor, com.baomidou.mybatisplus.plugins.PaginationInterceptor
-    # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用

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

@@ -1,17 +1,3 @@
-#sso:
-#  config:
-#    secretkey: C691d971EJ3H376G81 # 对称加密使用
-#    cookieName: ks # cookie名称
-#    cookieDomain: zen.com
-#    cookiePath: /
-#    # cookieMaxage: 604800 cookie最长保存时间,目前由login模块控制
-#    cookieHttponly: false
-#
-#sso:
-#  secretkey: C691d971EJ3H376G81 # 对称加密使用
-#  cookie:
-#    name: ks
-#    domain: .zen.com
 shiro:
   redis:
     database: 1 # redis数据库索引
@@ -27,4 +13,8 @@ shiro:
       min-idle: 1 # 连接池中的最小空闲连接
       max-idle: 20 # 连接池中的最大空闲连接
       max-active: 20 # 连接池最大连接数（使用负值表示没有限制）
-      max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
+      max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
+
+spring:
+  session:
+    store-type: redis

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

@@ -0,0 +1,14 @@
+spring:
+  http:
+    multipart:
+      enabled: true
+      max-request-size: 40MB #最大请求大小
+      max-file-size: 20MB #最大文件大小
+      location: ${java.io.tmpdir}
+      file-size-threshold: 5MB
+
+# 自定义配置
+upload:
+  tmpPath: D://tmp # 临时文件存放位置 默认 /tmp/zen
+  dataPath: D://data
+  maxFileSize: 4294967296 # 单位 byte 为0表示无限制

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

@@ -10,26 +10,16 @@ zen:
 spring:
   profiles:
     active: dev
-    include: orm-mycat,rpc,mq,cache,umps,platform,job
-#  redis:
-#    host: localhost
-#    port: 6379
-#    password:
+    include: orm-mycat,rpc,mq,cache,umps,platform,job,upload
   http:
     converters:
       preferred-json-mapper: fastjson
-    multipart:
-      max-request-size: 10MB #最大请求大小
-      max-file-size: 10MB #最大文件大小
-      enabled: true
   aop:
     proxy-target-class: true #false为启用jdk默认动态代理,true为cglib动态代理
     auto: true
   jackson:
     deserialization:
       fail-on-unknown-properties: false # 多余字段反序列化过滤
-  session:
-    store-type: redis
   application:
     name: Zen
 

zen-web/src/main/resources/properties/sso.properties

@@ -1,8 +0,0 @@
-sso.encoding=UTF-8
-sso.secretkey=C691d971EJ3H376G81
-sso.cookie.name=ks
-sso.cookie.domain=zen.com
-sso.cookie.httponly=false
-
-#sso.cookie.maxage=7200
-#sso.login.url=http://home.zen.com/#/login