添加缓存工具类,重做了加载钩子. 使得更加科学

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

@@ -1,11 +1,34 @@
 package com.gxzc.zen.common.util
 
+import org.springframework.cache.Cache
 import org.springframework.cache.CacheManager
+import kotlin.reflect.KClass
 
 /**
  * 缓存工具类
  * @author NorthLan at 2018/2/8
  */
 object CacheUtil {
-    val cacheManager = SpringContextHolder.getBean(CacheManager::class.java)
+    private val cacheManager = SpringContextHolder.getBean(CacheManager::class.java)
+
+    fun getCahce(key: String): Cache? {
+        return cacheManager.getCache(key)
+    }
+
+    fun <T : Any> get(cacheKey: String, key: Any, type: KClass<T>): T? {
+        return getCahce(cacheKey)?.get(key, type.java)
+    }
+
+    fun get(cacheKey: String, key: Any): Cache.ValueWrapper? {
+        return getCahce(cacheKey)?.get(key)
+    }
+
+    fun put(cacheKey: String, key: Any, value: Any) {
+        getCahce(cacheKey)?.put(key, value)
+
+    }
+
+    fun putIfAbsent(cacheKey: String, key: Any, value: Any) {
+        getCahce(cacheKey)?.putIfAbsent(key, value)
+    }
 }

zen-web/src/main/kotlin/com/gxzc/zen/ApplicationInitializer.kt

@@ -0,0 +1,29 @@
+package com.gxzc.zen
+
+import com.gxzc.zen.api.sys.service.ISysUserService
+import org.slf4j.LoggerFactory
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.CommandLineRunner
+import org.springframework.stereotype.Component
+
+/**
+ * 启动完成 加载
+ * @author NorthLan
+ * @date 2018/3/26
+ * @url https://noahlan.com
+ */
+@Component
+class ApplicationInitializer : CommandLineRunner {
+    companion object {
+        private val logger = LoggerFactory.getLogger(ApplicationInitializer::class.java)
+    }
+
+    @Autowired
+    private lateinit var sysUserService: ISysUserService
+
+    override fun run(vararg args: String?) {
+        logger.info("Started successful... initializing data...")
+
+//        sysUserService
+    }
+}

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

@@ -49,17 +49,19 @@ class UserController : BaseController() {
 
     @PutMapping
     @ZenResponseFilter(type = SysUser::class, filter = ["createTime", "createBy", "updateTime", "updateBy", "password", "salt"])
+    // @ZenRequestTypes(KVType("user", SysUser::class), KVType("roles", List::class))
     fun putUser(@RequestBody data: SysUser): ResponseEntity<*> {
-        return if (data.id == null) {
-            // insert
-            userService.insertCacheable(data)
-            ResponseEntity.created(URI.create("/user/${data.id}")).body(ResponseDto()) // 201
-        } else {
-            // update
-            ResponseEntity.ok(ResponseDto().apply {
-                this.data = userService.modify(data) // 200
-            })
-        }
+        return ResponseEntity.ok(null)
+//        return if (data.id == null) {
+//            // insert
+//            userService.insertCacheable(data)
+//            ResponseEntity.created(URI.create("/user/${data.id}")).body(ResponseDto()) // 201
+//        } else {
+//            // update
+//            ResponseEntity.ok(ResponseDto().apply {
+//                this.data = userService.modify(data) // 200
+//            })
+//        }
     }
 
     @DeleteMapping("{id}")
@@ -77,7 +79,7 @@ class UserController : BaseController() {
              @RequestParam(required = false) searchOption: Int?): ResponseEntity<*> {
         // 获取用户列表(忽略enable)
         var data: MutableList<SysUser> = userService.getListCacheable()
-        if (!keyword.isNullOrEmpty()) {
+        if (!keyword.isNullOrEmpty() && searchOption != null) {
             data = data.filter {
                 when (searchOption) {
                     1 -> run {