修复一些jackson问题/添加获取上传文件信息方法

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/service/ISysUploadInfoService.kt

@@ -14,6 +14,23 @@ import java.io.File
  * @since 2018-06-01
  */
 interface ISysUploadInfoService : BaseService<SysUploadInfo> {
+    /**
+     * 添加文件数据
+     */
     fun addUploadFile(fileMetadata: ZenFileMetadata, file: File)
+
+    /**
+     * 获取某上传批次所有文件数据
+     */
     fun getUploadInfosByBatchId(batchId: String): MutableList<SysUploadInfo>
+
+    /**
+     * 通过id获取单条 文件数据
+     */
+    fun getUploadInfoById(id: Long): SysUploadInfo?
+
+    /**
+     * 通过ids获取 文件数据 列表
+     */
+    fun getUploadInfoListByIdList(ids: Collection<Long>): MutableList<SysUploadInfo>
 }

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/service/impl/SysUploadInfoServiceImpl.kt

@@ -46,12 +46,32 @@ class SysUploadInfoServiceImpl : ServiceImpl<SysUploadInfoMapper, SysUploadInfo>
         val condition = SysUploadInfo().apply { this.batchId = batchId }
         val ret = baseMapper.selectWOLogic(EntityWrapper(condition))
         ret.forEach {
+            generateURL(it)
+        }
+        return ret
+    }
+
+    private fun generateURL(it: SysUploadInfo?) {
+        if (it != null) {
             if (it.relativePath.isNullOrEmpty()) {
                 it.url = FilenameUtils.normalize("/${it.filename}")
             } else {
                 it.url = FilenameUtils.normalize("/${it.relativePath}/${it.filename}")
             }
+        }
+    }
 
+    override fun getUploadInfoById(id: Long): SysUploadInfo? {
+        val condition = SysUploadInfo().apply { this.id = id }
+        return baseMapper.selectOne(condition).apply {
+            generateURL(this)
+        }
+    }
+
+    override fun getUploadInfoListByIdList(ids: Collection<Long>): MutableList<SysUploadInfo> {
+        val ret = baseMapper.selectWOLogic(EntityWrapper<SysUploadInfo>().`in`("id", ids))
+        ret.forEach {
+            generateURL(it)
         }
         return ret
     }

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

@@ -89,6 +89,7 @@ class ShiroConfig {
 //                    "/auth/logout" to "logout", // 登出
                     "/test/**" to "canon", // 测试 免登录
                     "/upload/**" to "canon", // 上传免登录
+                    "/api/**" to "canon", // api 免登陆
                     ////////////////////// 静态资源 /////////////////////
                     "/v2/api-docs" to "canon",
                     "/swagger-resources/**" to "anon",

zen-api/src/main/kotlin/com/gxzc/zen/umps/filter/ZenCorsAnonymousFilter.kt

@@ -26,11 +26,11 @@ class ZenCorsAnonymousFilter : PathMatchingFilter() {
         httpResponse.apply {
             setHeader("Access-control-Allow-Origin", httpRequest.getHeader("Origin"))
             setHeader("Access-Control-Allow-Methods", "GET, HEAD, POST, PUT, DELETE, TRACE, OPTIONS, PATCH")
-            addHeader("Access-Control-Allow-Credentials", "true")
+            setHeader("Access-Control-Allow-Credentials", "true")
             setHeader("Access-Control-Allow-Headers", httpRequest.getHeader("Access-Control-Request-Headers"))
             val method = HttpMethod.valueOf(httpRequest.method)
             if (method == HttpMethod.POST || method == HttpMethod.PUT) {
-                addHeader("Access-Control-Expose-Headers", "Location")
+                setHeader("Access-Control-Expose-Headers", "Location")
             } else if (method == HttpMethod.OPTIONS) {
                 status = HttpStatus.OK.value()
             }

zen-api/src/main/kotlin/com/gxzc/zen/umps/filter/ZenCorsPathMatchingFilter.kt

@@ -21,11 +21,11 @@ class ZenCorsPathMatchingFilter : PathMatchingFilter() {
         httpResponse.apply {
             setHeader("Access-control-Allow-Origin", httpRequest.getHeader("Origin"))
             setHeader("Access-Control-Allow-Methods", "GET, HEAD, POST, PUT, DELETE, TRACE, OPTIONS, PATCH")
-            addHeader("Access-Control-Allow-Credentials", "true")
+            setHeader("Access-Control-Allow-Credentials", "true")
             setHeader("Access-Control-Allow-Headers", httpRequest.getHeader("Access-Control-Request-Headers"))
             val method = HttpMethod.valueOf(httpRequest.method)
             if (method == HttpMethod.POST || method == HttpMethod.PUT) {
-                addHeader("Access-Control-Expose-Headers", "Location")
+                setHeader("Access-Control-Expose-Headers", "Location")
             } else if (method == HttpMethod.OPTIONS) {
                 status = HttpStatus.OK.value()
             }

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

@@ -0,0 +1,39 @@
+package com.gxzc.zen.web.sys.controller
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper
+import com.baomidou.mybatisplus.plugins.Page
+import com.gxzc.zen.api.sys.model.SysDictValue
+import com.gxzc.zen.api.sys.service.ISysDictValueService
+import com.gxzc.zen.common.base.BaseController
+import com.gxzc.zen.common.dto.ResponseDto
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.http.ResponseEntity
+import org.springframework.web.bind.annotation.GetMapping
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+/**
+ *
+ * @author NorthLan
+ * @date 2018/6/2
+ * @url https://noahlan.com
+ */
+@RestController
+@RequestMapping("api")
+class ApiController : BaseController() {
+    @Autowired
+    private lateinit var dictValueService: ISysDictValueService
+
+
+    @GetMapping("test")
+    fun get(): ResponseEntity<*> {
+        return ResponseEntity.ok(ResponseDto().apply {
+            val a = Page<SysDictValue>().apply {
+                this.size = 30
+                this.current = 1
+            }
+            val ret = dictValueService.selectPage(a, EntityWrapper<SysDictValue>())
+            data = ret
+        })
+    }
+}

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

@@ -1,6 +1,8 @@
 package com.gxzc.zen.web.sys.controller
 
 import com.gxzc.zen.common.base.BaseController
+import org.springframework.http.ResponseEntity
+import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.RestController
 
@@ -14,4 +16,8 @@ import org.springframework.web.bind.annotation.RestController
 @RestController
 @RequestMapping("test")
 class TestController : BaseController() {
+    @GetMapping("a")
+    fun get(): ResponseEntity<*> {
+        return ResponseEntity.ok("1")
+    }
 }

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

@@ -6,9 +6,9 @@ shiro:
     password:
     timeout: 5000 # 连接超时时间（毫秒）
     sessionPrefix: zen_s #
-    sessionTime: 1800 # 秒
+    sessionTime: 604800 # 秒 7天
     cachePrefix: zen_c
-    cacheTime: 1800 # s
+    cacheTime: 604800 # s
     pool:
       min-idle: 1 # 连接池中的最小空闲连接
       max-idle: 20 # 连接池中的最大空闲连接