'精简了框架一些用处不大的功能；转为springcloud项目'

zen-api/src/main/java/cn/gygxzc/tina/config/properties/ShiroRedisCacheProperties.java

@@ -0,0 +1,27 @@
+package cn.gygxzc.tina.config.properties;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
+
+/**
+ * @program: Zen-Framework
+ * @description: ${description}
+ * @author: tuonina
+ * @create: 2018-09-20 21:23
+ **/
+@ConfigurationProperties(prefix = "shiro.redis")
+public class ShiroRedisCacheProperties extends RedisStandaloneConfiguration {
+
+    /**
+     * 是否启动该redis缓存
+     */
+    private boolean enable = true;
+
+    public void setEnable(boolean enable) {
+        this.enable = enable;
+    }
+
+    public boolean isEnable() {
+        return enable;
+    }
+}

zen-api/src/main/java/cn/gygxzc/tina/config/properties/ShiroSessionProperties.java

@@ -0,0 +1,34 @@
+package cn.gygxzc.tina.config.properties;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+import java.time.Duration;
+
+/**
+ * @program: Zen-Framework
+ * @description: ${description}
+ * @author: tuonina
+ * @create: 2018-09-20 21:52
+ **/
+@ConfigurationProperties(prefix = "shiro.session")
+public class ShiroSessionProperties {
+
+    private String prefix;
+    private Duration expired = Duration.ofDays(1);
+
+    public String getPrefix() {
+        return prefix;
+    }
+
+    public void setPrefix(String prefix) {
+        this.prefix = prefix;
+    }
+
+    public Duration getExpired() {
+        return expired;
+    }
+
+    public void setExpired(Duration expired) {
+        this.expired = expired;
+    }
+}

zen-api/src/main/kotlin/com/gxzc/zen/orm/Generator.kt → zen-api/src/main/kotlin/cn/gygxzc/tina/config/orm/Generator.kt

@@ -1,4 +1,4 @@
-package com.gxzc.zen.orm
+package cn.gygxzc.tina.config.orm
 
 import com.baomidou.mybatisplus.annotation.DbType
 import com.baomidou.mybatisplus.generator.AutoGenerator
@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.generator.InjectionConfig
 import com.baomidou.mybatisplus.generator.config.*
 import com.baomidou.mybatisplus.generator.config.converts.MySqlTypeConvert
 import com.baomidou.mybatisplus.generator.config.po.TableInfo
-import com.baomidou.mybatisplus.generator.config.rules.DbColumnType
-import com.baomidou.mybatisplus.generator.config.rules.IColumnType
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy
 import java.io.File
 

zen-api/src/main/kotlin/com/gxzc/zen/umps/config/ShiroConfig.kt → zen-api/src/main/kotlin/cn/gygxzc/tina/config/shiro/ShiroConfig.kt

@@ -1,27 +1,30 @@
-package com.gxzc.zen.umps.config
-
-import com.gxzc.zen.umps.constant.ZenHttpSession
-import com.gxzc.zen.umps.filter.AjaxAuthorizationFilter
-import com.gxzc.zen.umps.filter.UrlPermissionsFilter
-import com.gxzc.zen.umps.filter.ZenCorsAnonymousFilter
-import com.gxzc.zen.umps.filter.ZenCorsPathMatchingFilter
+package cn.gygxzc.tina.config.shiro
+
+import cn.gygxzc.tina.config.properties.ShiroRedisCacheProperties
+import cn.gygxzc.tina.config.shiro.cache.ShiroRedisSessionDAO
+import cn.gygxzc.tina.config.shiro.realm.ZenShiroRealm
+import cn.gygxzc.tina.config.shiro.session.ZenWebSessionManager
+import cn.gygxzc.tina.config.shiro.filter.AjaxAuthorizationFilter
+import cn.gygxzc.tina.config.shiro.filter.UrlPermissionsFilter
+import cn.gygxzc.tina.config.shiro.filter.ZenCorsAnonymousFilter
+import cn.gygxzc.tina.config.shiro.filter.ZenCorsPathMatchingFilter
 import org.apache.shiro.authc.credential.HashedCredentialsMatcher
+import org.apache.shiro.cache.CacheManager
+import org.apache.shiro.mgt.SecurityManager
+import org.apache.shiro.realm.AuthorizingRealm
+import org.apache.shiro.session.mgt.SessionManager
 import org.apache.shiro.spring.LifecycleBeanPostProcessor
 import org.apache.shiro.spring.web.ShiroFilterFactoryBean
 import org.apache.shiro.web.filter.authc.AnonymousFilter
 import org.apache.shiro.web.mgt.DefaultWebSecurityManager
 import org.apache.shiro.web.servlet.SimpleCookie
-import org.springframework.boot.context.properties.ConfigurationProperties
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.boot.web.servlet.FilterRegistrationBean
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.DependsOn
 import org.springframework.core.annotation.Order
-import org.springframework.data.redis.connection.jedis.JedisConnectionFactory
-import org.springframework.data.redis.core.RedisTemplate
-import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer
-import org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
-import org.springframework.data.redis.serializer.StringRedisSerializer
 import org.springframework.web.filter.DelegatingFilterProxy
 import javax.servlet.DispatcherType
 import javax.servlet.Filter
@@ -34,12 +37,62 @@ import javax.servlet.Filter
  * @url https://noahlan.com
  */
 @Configuration
+@EnableConfigurationProperties(ShiroRedisCacheProperties::class)
 class ShiroConfig {
 
+    @Autowired
+    private lateinit var redisProperties: ShiroRedisCacheProperties
+
+
+    @Bean("shiroLifecycleBeanPostProcessor")
+    fun lifecycleBeanPostProcessor(): LifecycleBeanPostProcessor {
+        return LifecycleBeanPostProcessor()
+    }
+
     @Bean
-    @ConfigurationProperties(prefix = "shiro.redis")
-    fun shiroRedisProperties(): ShiroRedisProperties {
-        return ShiroRedisProperties()
+    @DependsOn(value = ["shiroLifecycleBeanPostProcessor", "shrioRedisCacheManager"])
+    fun userRealm(cacheManager: CacheManager): ZenShiroRealm {
+        val shiroRealm = ZenShiroRealm()
+                .apply {
+                    isCachingEnabled = redisProperties.isEnable
+                    isAuthenticationCachingEnabled = true
+                    isAuthorizationCachingEnabled = true
+                    //加密验证方法
+                    credentialsMatcher = HashedCredentialsMatcher().also {
+                        it.hashAlgorithmName = "md5"
+                        it.hashIterations = 2 // 两次md5
+                    }
+                }
+        shiroRealm.cacheManager = cacheManager
+        return shiroRealm
+    }
+
+    @Bean(name = ["sessionManager"])
+    fun defaultWebSessionManager(redisCacheManager: CacheManager,
+                                 redisSessionDAO: ShiroRedisSessionDAO): ZenWebSessionManager {
+        return ZenWebSessionManager().apply {
+            setCacheManager(redisCacheManager)
+            globalSessionTimeout = 604800 * 1000
+            isDeleteInvalidSessions = true
+            isSessionValidationSchedulerEnabled = true
+            isDeleteInvalidSessions = true
+            sessionDAO = redisSessionDAO
+            sessionIdCookie = SimpleCookie(ZenHttpSession.DEFAULT_SESSION_ID_NAME).apply {
+                isHttpOnly = true
+                maxAge = 604800
+            }
+        }
+    }
+
+    @Bean(name = ["securityManager"])
+    fun securityManager(userRealm: AuthorizingRealm,
+                        redisCacheManager: CacheManager,
+                        sessionManager: SessionManager): DefaultWebSecurityManager {
+        return DefaultWebSecurityManager().apply {
+            setRealm(userRealm)
+            cacheManager = redisCacheManager
+            setSessionManager(sessionManager)
+        }
     }
 
     @Bean("shiroFilterRegistrationBean")
@@ -55,11 +108,9 @@ class ShiroConfig {
 
     @Bean(name = ["shiroFilter"])
     @Order(2)
-    fun shiroFilter(): ShiroFilterFactoryBean {
+    fun shiroFilter(securityManager: SecurityManager): ShiroFilterFactoryBean {
         return ShiroFilterFactoryBean().apply {
-            securityManager = securityManager()
-            //            loginUrl = "/login"
-            //            unauthorizedUrl = "/unauthor"
+            setSecurityManager(securityManager)
 
             filters = hashMapOf<String, Filter>(
                     "canon" to ZenCorsAnonymousFilter(),
@@ -108,86 +159,5 @@ class ShiroConfig {
         }
     }
 
-    @Bean(name = ["securityManager"])
-    fun securityManager(): DefaultWebSecurityManager {
-        return DefaultWebSecurityManager().apply {
-            setRealm(userRealm())
-            cacheManager = redisCacheManager()
-            sessionManager = defaultWebSessionManager()
-        }
-    }
 
-    @Bean(name = ["sessionManager"])
-    fun defaultWebSessionManager(): ZenWebSessionManager {
-        return ZenWebSessionManager().apply {
-            setCacheManager(redisCacheManager())
-            globalSessionTimeout = 604800 * 1000
-            isDeleteInvalidSessions = true
-            isSessionValidationSchedulerEnabled = true
-            isDeleteInvalidSessions = true
-            sessionDAO = redisSessionDAO()
-            sessionIdCookie = SimpleCookie(ZenHttpSession.DEFAULT_SESSION_ID_NAME).apply {
-                isHttpOnly = true
-                maxAge = 604800
-            }
-        }
-    }
-
-    @Bean
-    fun redisSessionDAO(): ShiroRedisSessionDAO {
-        return ShiroRedisSessionDAO(redisTemplate(), shiroRedisProperties())
-    }
-
-    @Bean
-    @DependsOn(value = ["shiroLifecycleBeanPostProcessor", "shrioRedisCacheManager"])
-    fun userRealm(): ZenShiroRealm {
-        return ZenShiroRealm().apply {
-            cacheManager = redisCacheManager()
-            isCachingEnabled = true
-            isAuthenticationCachingEnabled = true
-            isAuthorizationCachingEnabled = true
-
-            //TODO 以下 hash 验证,后期的重试 ban 可重写此类实现
-            credentialsMatcher = HashedCredentialsMatcher().also {
-                it.hashAlgorithmName = "md5"
-                it.hashIterations = 2 // 两次md5
-            }
-        }
-    }
-
-    @Bean(name = ["shrioRedisCacheManager"])
-    @DependsOn(value = ["shiroRedisTemplate"])
-    fun redisCacheManager(): ShiroRedisCacheManager {
-        return ShiroRedisCacheManager(redisTemplate(), shiroRedisProperties())
-    }
-
-    @Bean(name = ["shiroRedisTemplate"])
-    fun redisTemplate(): RedisTemplate<String, Any> {
-        return RedisTemplate<String, Any>().apply {
-            connectionFactory = connectionFactory()
-
-            val stringSerializer = StringRedisSerializer()
-            keySerializer = stringSerializer
-            valueSerializer = JdkSerializationRedisSerializer()
-            hashKeySerializer = stringSerializer
-            hashValueSerializer = Jackson2JsonRedisSerializer(Any::class.java)
-        }
-    }
-
-    @Bean("shiroRedisConnectionFactory")
-    fun connectionFactory(): JedisConnectionFactory {
-        val properties = shiroRedisProperties()
-        return JedisConnectionFactory().apply {
-            database = properties.database
-            hostName = properties.host
-            password = properties.password
-            port = properties.port
-            timeout = properties.timeout
-        }
-    }
-
-    @Bean("shiroLifecycleBeanPostProcessor")
-    fun lifecycleBeanPostProcessor(): LifecycleBeanPostProcessor {
-        return LifecycleBeanPostProcessor()
-    }
 }

zen-api/src/main/kotlin/com/gxzc/zen/umps/constant/ZenHttpSession.kt → zen-api/src/main/kotlin/cn/gygxzc/tina/config/shiro/ZenHttpSession.kt

@@ -1,4 +1,4 @@
-package com.gxzc.zen.umps.constant
+package cn.gygxzc.tina.config.shiro
 
 /**
  * 静态枚举

zen-api/src/main/kotlin/cn/gygxzc/tina/config/shiro/cache/RedisConfiguration.kt

@@ -0,0 +1,68 @@
+package cn.gygxzc.tina.config.shiro.cache
+
+import cn.gygxzc.tina.config.properties.ShiroRedisCacheProperties
+import cn.gygxzc.tina.config.properties.ShiroSessionProperties
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.context.properties.EnableConfigurationProperties
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+import org.springframework.context.annotation.DependsOn
+import org.springframework.data.redis.connection.jedis.JedisConnectionFactory
+import org.springframework.data.redis.core.RedisTemplate
+import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer
+import org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
+import org.springframework.data.redis.serializer.StringRedisSerializer
+
+/**
+ * @program: Zen-Framework
+ *
+ * @description: ${description}
+ *
+ * @author: tuonina
+ *
+ * @create: 2018-09-20 21:41
+ **/
+@Configuration
+@EnableConfigurationProperties(ShiroRedisCacheProperties::class, ShiroSessionProperties::class)
+class RedisConfiguration {
+
+    @Autowired
+    private lateinit var redisProperties: ShiroRedisCacheProperties
+    @Autowired
+    private lateinit var sessionProperties: ShiroSessionProperties
+
+    @Bean("shiroRedisConnectionFactory")
+    fun connectionFactory(): JedisConnectionFactory {
+        return JedisConnectionFactory(redisProperties)
+    }
+
+
+    @Bean(name = ["shiroRedisTemplate"])
+    fun redisTemplate(): RedisTemplate<String, Any> {
+        return RedisTemplate<String, Any>().apply {
+            connectionFactory = connectionFactory()
+            val stringSerializer = StringRedisSerializer()
+            keySerializer = stringSerializer
+            valueSerializer = JdkSerializationRedisSerializer()
+            hashKeySerializer = stringSerializer
+            hashValueSerializer = Jackson2JsonRedisSerializer(Any::class.java)
+        }
+    }
+
+
+    @Bean(name = ["shrioRedisCacheManager"])
+    @DependsOn(value = ["shiroRedisTemplate"])
+    fun redisCacheManager(): ShiroRedisCacheManager {
+        return ShiroRedisCacheManager(redisTemplate(), sessionProperties)
+    }
+
+
+    @Bean
+    fun redisSessionDAO(): ShiroRedisSessionDAO {
+        return ShiroRedisSessionDAO(redisTemplate(), sessionProperties)
+    }
+
+
+
+
+}

zen-api/src/main/kotlin/com/gxzc/zen/umps/config/ShiroRedisCache.kt → zen-api/src/main/kotlin/cn/gygxzc/tina/config/shiro/cache/ShiroRedisCache.kt

@@ -1,7 +1,8 @@
-package com.gxzc.zen.umps.config
+package cn.gygxzc.tina.config.shiro.cache
 
 import cn.gygxzc.tina.cache.redis.RedisKeyGenerator
-import com.gxzc.zen.umps.util.SerializeUtils
+import cn.gygxzc.tina.config.properties.ShiroSessionProperties
+import cn.gygxzc.tina.config.shiro.utils.SerializeUtils
 import org.apache.shiro.cache.Cache
 import org.apache.shiro.cache.CacheException
 import org.apache.shiro.subject.PrincipalCollection
@@ -25,16 +26,16 @@ class ShiroRedisCache<V> : Cache<Any, V> {
     }
 
     private var redisTemplate: RedisTemplate<String, V>
-    private var prefix = "zen_shiro_redis:"
+    private var prefix = "shiro_redis:"
     private var charset: Charset = Charsets.UTF_8
-    private val properties: ShiroRedisProperties
+    private val properties: ShiroSessionProperties
 
-    constructor(redisTemplate: RedisTemplate<String, V>, properties: ShiroRedisProperties) {
+    constructor(redisTemplate: RedisTemplate<String, V>, properties: ShiroSessionProperties) {
         this.redisTemplate = redisTemplate
         this.properties = properties
     }
 
-    constructor(redisTemplate: RedisTemplate<String, V>, prefix: String, properties: ShiroRedisProperties, charset: Charset = Charsets.UTF_8) {
+    constructor(redisTemplate: RedisTemplate<String, V>, prefix: String, properties: ShiroSessionProperties, charset: Charset = Charsets.UTF_8) {
         this.redisTemplate = redisTemplate
         this.prefix = prefix
         this.properties = properties
@@ -96,7 +97,7 @@ class ShiroRedisCache<V> : Cache<Any, V> {
         }
         return try {
             val vo = redisTemplate.boundValueOps(getByteKey(p0))
-            vo.expire(properties.cacheTime, TimeUnit.SECONDS)
+            vo.expire(properties.expired.seconds, TimeUnit.SECONDS)
             vo.get()
         } catch (e: Throwable) {
             throw CacheException(e)
@@ -108,7 +109,7 @@ class ShiroRedisCache<V> : Cache<Any, V> {
         return redisTemplate.keys(getByteKey("*"))
     }
 
-    private fun getByteKey(key: Any): String? {
+    private fun getByteKey(key: Any): String {
         return when (key) {
             is String -> "${this.prefix}${RedisKeyGenerator.SEPARATOR}$key"
             is PrincipalCollection -> getByteKey(key.primaryPrincipal)

zen-api/src/main/kotlin/cn/gygxzc/tina/config/shiro/cache/ShiroRedisCacheManager.kt

@@ -0,0 +1,21 @@
+package cn.gygxzc.tina.config.shiro.cache
+
+import cn.gygxzc.tina.config.properties.ShiroSessionProperties
+import org.apache.shiro.cache.AbstractCacheManager
+import org.apache.shiro.cache.Cache
+import org.springframework.data.redis.core.RedisTemplate
+
+
+/**
+ *
+ * @author NorthLan
+ * @date 2018/4/23
+ * @url https://noahlan.com
+ */
+class ShiroRedisCacheManager(private val redisTemplate: RedisTemplate<String, Any>,
+                             private val properties: ShiroSessionProperties) : AbstractCacheManager() {
+
+    override fun createCache(p0: String): Cache<*, *> {
+        return ShiroRedisCache(redisTemplate, p0, properties)
+    }
+}

zen-api/src/main/kotlin/com/gxzc/zen/umps/config/ShiroRedisSessionDAO.kt → zen-api/src/main/kotlin/cn/gygxzc/tina/config/shiro/cache/ShiroRedisSessionDAO.kt

@@ -1,6 +1,7 @@
-package com.gxzc.zen.umps.config
+package cn.gygxzc.tina.config.shiro.cache
 
 import cn.gygxzc.tina.cache.redis.RedisKeyGenerator
+import cn.gygxzc.tina.config.properties.ShiroSessionProperties
 import org.apache.shiro.session.Session
 import org.apache.shiro.session.mgt.eis.AbstractSessionDAO
 import org.slf4j.LoggerFactory
@@ -19,28 +20,20 @@ import java.util.concurrent.TimeUnit
  * @date 2018/4/24
  * @url https://noahlan.com
  */
-class ShiroRedisSessionDAO : AbstractSessionDAO {
+class ShiroRedisSessionDAO(private val redisTemplate: RedisTemplate<String, Any>,
+                           private val properties: ShiroSessionProperties,
+                           private var charset: Charset = Charsets.UTF_8) : AbstractSessionDAO() {
     companion object {
         private val logger = LoggerFactory.getLogger(ShiroRedisSessionDAO::class.java)
     }
 
-    private val properties: ShiroRedisProperties
-    private val redisTemplate: RedisTemplate<String, Any>
-    private var charset: Charset = Charsets.UTF_8
-
-    constructor(redisTemplate: RedisTemplate<String, Any>, properties: ShiroRedisProperties, charset: Charset = Charsets.UTF_8) : super() {
-        this.redisTemplate = redisTemplate
-        this.properties = properties
-        this.charset = charset
-    }
-
     private fun getKey(originalKey: String): String {
-        return "${properties.sessionPrefix}${RedisKeyGenerator.SEPARATOR}$originalKey"
+        return "${properties.prefix}${RedisKeyGenerator.SEPARATOR}$originalKey"
     }
 
     override fun update(session: Session) {
         logger.debug("Update Session: ${session.id}")
-        redisTemplate.opsForValue().set(getKey(session.id.toString()), session, properties.sessionTime, TimeUnit.SECONDS)
+        redisTemplate.opsForValue().set(getKey(session.id.toString()), session, properties.expired.seconds, TimeUnit.SECONDS)
     }
 
     override fun getActiveSessions(): MutableCollection<Session> {
@@ -70,7 +63,7 @@ class ShiroRedisSessionDAO : AbstractSessionDAO {
         val sid = this.generateSessionId(session)
         this.assignSessionId(session, sid)
         logger.debug("Create Session: $sid")
-        redisTemplate.opsForValue().set(getKey(sid.toString()), session, properties.sessionTime, TimeUnit.SECONDS)
+        redisTemplate.opsForValue().set(getKey(sid.toString()), session, properties.expired.seconds, TimeUnit.SECONDS)
         return sid
     }
 

zen-api/src/main/kotlin/com/gxzc/zen/umps/common/ZenAuthToken.kt → zen-api/src/main/kotlin/cn/gygxzc/tina/config/shiro/common/ZenAuthToken.kt

@@ -1,4 +1,4 @@
-package com.gxzc.zen.umps.common
+package cn.gygxzc.tina.config.shiro.common
 
 import com.gxzc.zen.api.sys.model.SysUser
 import org.apache.shiro.authc.UsernamePasswordToken

zen-api/src/main/kotlin/com/gxzc/zen/umps/common/ZenPermission.kt → zen-api/src/main/kotlin/cn/gygxzc/tina/config/shiro/common/ZenPermission.kt

@@ -1,4 +1,4 @@
-package com.gxzc.zen.umps.common
+package cn.gygxzc.tina.config.shiro.common
 
 import java.io.Serializable
 

zen-api/src/main/kotlin/com/gxzc/zen/umps/common/ZenSimpleByteSource.kt → zen-api/src/main/kotlin/cn/gygxzc/tina/config/shiro/common/ZenSimpleByteSource.kt

@@ -1,4 +1,4 @@
-package com.gxzc.zen.umps.common
+package cn.gygxzc.tina.config.shiro.common
 
 import org.apache.shiro.codec.Base64
 import org.apache.shiro.codec.CodecSupport

zen-api/src/main/kotlin/com/gxzc/zen/umps/filter/AjaxAuthorizationFilter.kt → zen-api/src/main/kotlin/cn/gygxzc/tina/config/shiro/filter/AjaxAuthorizationFilter.kt

@@ -1,4 +1,4 @@
-package com.gxzc.zen.umps.filter
+package cn.gygxzc.tina.config.shiro.filter
 
 import org.apache.shiro.web.filter.authc.FormAuthenticationFilter
 import org.springframework.http.HttpMethod

zen-api/src/main/kotlin/cn/gygxzc/tina/config/shiro/filter/JwtPathMatchingFilter.kt

@@ -0,0 +1,25 @@
+package cn.gygxzc.tina.config.shiro.filter
+
+import org.apache.shiro.web.filter.PathMatchingFilter
+import javax.servlet.ServletRequest
+import javax.servlet.ServletResponse
+
+/**
+ * @program: Zen-Framework
+ *
+ * @description: ${description}
+ *
+ * @author: tuonina
+ *
+ * @create: 2018-09-20 22:20
+ * 任然没有想好，这个到底应该这么搞
+ **/
+class JwtPathMatchingFilter:PathMatchingFilter() {
+
+    /**
+     * 解析header中包含的Authorization ,jwt 格式的，如果有，绑定对应的授权信息
+     */
+    override fun onPreHandle(request: ServletRequest?, response: ServletResponse?, mappedValue: Any?): Boolean {
+        return true
+    }
+}

zen-api/src/main/kotlin/com/gxzc/zen/umps/filter/UrlPermissionsFilter.kt → zen-api/src/main/kotlin/cn/gygxzc/tina/config/shiro/filter/UrlPermissionsFilter.kt

@@ -1,8 +1,8 @@
-package com.gxzc.zen.umps.filter
+package cn.gygxzc.tina.config.shiro.filter
 
 import com.gxzc.zen.api.sys.service.IPermissionService
 import com.gxzc.zen.common.util.SpringContextHolder
-import com.gxzc.zen.umps.common.ZenPermission
+import cn.gygxzc.tina.config.shiro.common.ZenPermission
 import org.apache.shiro.web.filter.PathMatchingFilter
 import org.springframework.http.HttpMethod
 import org.springframework.http.HttpStatus
@@ -33,8 +33,9 @@ class UrlPermissionsFilter : PathMatchingFilter() {
             return field
         }
 
-
-    // mappedValue 不需要
+    /**
+     * 所有的权限从redis缓存中获取，不需要RPC或者其他方式获取
+     */
     override fun onPreHandle(request: ServletRequest?, response: ServletResponse?, mappedValue: Any?): Boolean {
         request as HttpServletRequest
         if (request.method.equals(HttpMethod.OPTIONS.name, true)) {

zen-api/src/main/kotlin/com/gxzc/zen/umps/filter/ZenCorsAnonymousFilter.kt → zen-api/src/main/kotlin/cn/gygxzc/tina/config/shiro/filter/ZenCorsAnonymousFilter.kt

@@ -1,4 +1,4 @@
-package com.gxzc.zen.umps.filter
+package cn.gygxzc.tina.config.shiro.filter
 
 import org.apache.shiro.web.filter.PathMatchingFilter
 import org.apache.shiro.web.util.WebUtils
@@ -33,6 +33,7 @@ class ZenCorsAnonymousFilter : PathMatchingFilter() {
                 setHeader("Access-Control-Expose-Headers", "Location")
             } else if (method == HttpMethod.OPTIONS) {
                 status = HttpStatus.OK.value()
+                return false
             }
         }
         return true

zen-api/src/main/kotlin/com/gxzc/zen/umps/filter/ZenCorsPathMatchingFilter.kt → zen-api/src/main/kotlin/cn/gygxzc/tina/config/shiro/filter/ZenCorsPathMatchingFilter.kt

@@ -1,4 +1,4 @@
-package com.gxzc.zen.umps.filter
+package cn.gygxzc.tina.config.shiro.filter
 
 import org.apache.shiro.web.filter.PathMatchingFilter
 import org.apache.shiro.web.util.WebUtils
@@ -15,6 +15,9 @@ import javax.servlet.ServletResponse
  */
 class ZenCorsPathMatchingFilter : PathMatchingFilter() {
 
+    /**
+     * 实际上如果是options 方式的请求，没有必要继续下去了，直接返回就好了
+     */
     override fun onPreHandle(request: ServletRequest?, response: ServletResponse?, mappedValue: Any?): Boolean {
         val httpRequest = WebUtils.toHttp(request)
         val httpResponse = WebUtils.toHttp(response)
@@ -28,8 +31,9 @@ class ZenCorsPathMatchingFilter : PathMatchingFilter() {
                 setHeader("Access-Control-Expose-Headers", "Location")
             } else if (method == HttpMethod.OPTIONS) {
                 status = HttpStatus.OK.value()
+                return false
             }
         }
-        return super.onPreHandle(request, response, mappedValue)
+        return true
     }
 }

zen-api/src/main/kotlin/com/gxzc/zen/umps/config/ZenShiroRealm.kt → zen-api/src/main/kotlin/cn/gygxzc/tina/config/shiro/realm/ZenShiroRealm.kt

@@ -1,7 +1,7 @@
-package com.gxzc.zen.umps.config
+package cn.gygxzc.tina.config.shiro.realm
 
-import com.gxzc.zen.umps.common.ZenAuthToken
-import com.gxzc.zen.umps.common.ZenSimpleByteSource
+import cn.gygxzc.tina.config.shiro.common.ZenAuthToken
+import cn.gygxzc.tina.config.shiro.common.ZenSimpleByteSource
 import org.apache.shiro.authc.*
 import org.apache.shiro.authz.AuthorizationInfo
 import org.apache.shiro.authz.SimpleAuthorizationInfo

zen-api/src/main/kotlin/com/gxzc/zen/umps/config/ZenWebSessionManager.kt → zen-api/src/main/kotlin/cn/gygxzc/tina/config/shiro/session/ZenWebSessionManager.kt

@@ -1,4 +1,4 @@
-package com.gxzc.zen.umps.config
+package cn.gygxzc.tina.config.shiro.session
 
 import org.apache.shiro.session.ExpiredSessionException
 import org.apache.shiro.session.InvalidSessionException
@@ -31,7 +31,8 @@ import javax.servlet.http.HttpServletResponse
  * @url https://noahlan.com
  */
 @Suppress("unused")
-class ZenWebSessionManager : DefaultSessionManager {
+class ZenWebSessionManager//more secure, protects against XSS attacks
+() : DefaultSessionManager() {
     companion object {
         private val log = LoggerFactory.getLogger(ZenWebSessionManager::class.java)
     }
@@ -40,9 +41,9 @@ class ZenWebSessionManager : DefaultSessionManager {
     var sessionIdCookieEnabled: Boolean = false
     var sessionIdUrlRewritingEnabled: Boolean = false
 
-    constructor() {
+    init {
         val cookie = SimpleCookie(ShiroHttpSession.DEFAULT_SESSION_ID_NAME)
-        cookie.isHttpOnly = true //more secure, protects against XSS attacks
+        cookie.isHttpOnly = true
         this.sessionIdCookie = cookie
         this.sessionIdCookieEnabled = true
         this.sessionIdUrlRewritingEnabled = true

zen-api/src/main/kotlin/com/gxzc/zen/umps/util/Byte2Hex.kt → zen-api/src/main/kotlin/cn/gygxzc/tina/config/shiro/utils/Byte2Hex.kt

@@ -1,4 +1,4 @@
-package com.gxzc.zen.umps.util
+package cn.gygxzc.tina.config.shiro.utils
 
 import java.util.*
 

zen-api/src/main/kotlin/com/gxzc/zen/umps/util/MD5Salt.kt → zen-api/src/main/kotlin/cn/gygxzc/tina/config/shiro/utils/MD5Salt.kt

@@ -1,4 +1,4 @@
-package com.gxzc.zen.umps.util
+package cn.gygxzc.tina.config.shiro.utils
 
 import org.slf4j.LoggerFactory
 import java.security.MessageDigest

zen-api/src/main/kotlin/com/gxzc/zen/umps/util/SSOUtil.kt → zen-api/src/main/kotlin/cn/gygxzc/tina/config/shiro/utils/SSOUtil.kt

@@ -1,12 +1,12 @@
-package com.gxzc.zen.umps.util
+package cn.gygxzc.tina.config.shiro.utils
 
 import com.gxzc.zen.api.sys.common.MenuTree
 import com.gxzc.zen.api.sys.model.SysRole
 import com.gxzc.zen.api.sys.model.SysUser
 import com.gxzc.zen.api.sys.service.IPermissionService
 import com.gxzc.zen.common.util.SpringContextHolder
-import com.gxzc.zen.umps.common.ZenPermission
-import com.gxzc.zen.umps.constant.ZenHttpSession
+import cn.gygxzc.tina.config.shiro.common.ZenPermission
+import cn.gygxzc.tina.config.shiro.ZenHttpSession
 import org.apache.shiro.SecurityUtils
 import org.apache.shiro.session.Session
 import org.slf4j.LoggerFactory

zen-api/src/main/kotlin/com/gxzc/zen/umps/util/SerializeUtils.kt → zen-api/src/main/kotlin/cn/gygxzc/tina/config/shiro/utils/SerializeUtils.kt

@@ -1,4 +1,4 @@
-package com.gxzc.zen.umps.util
+package cn.gygxzc.tina.config.shiro.utils
 
 import org.slf4j.LoggerFactory
 import java.io.*
@@ -11,7 +11,7 @@ import java.io.*
  * @url https://noahlan.com
  */
 object SerializeUtils {
-    val logger = LoggerFactory.getLogger(SerializeUtils::class.java)
+    private val logger = LoggerFactory.getLogger(SerializeUtils::class.java)
 
     /**
      * deserialize

zen-api/src/main/kotlin/com/gxzc/zen/umps/util/ShiroRedisUtil.kt → zen-api/src/main/kotlin/cn/gygxzc/tina/config/shiro/utils/ShiroRedisUtil.kt

@@ -1,4 +1,4 @@
-package com.gxzc.zen.umps.util
+package cn.gygxzc.tina.config.shiro.utils
 
 import com.gxzc.zen.common.util.SpringContextHolder
 import org.apache.shiro.session.Session

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

@@ -1,7 +1,7 @@
 package com.gxzc.zen.api.sys.service
 
 import com.gxzc.zen.api.sys.model.SysRole
-import com.gxzc.zen.umps.common.ZenPermission
+import cn.gygxzc.tina.config.shiro.common.ZenPermission
 import org.apache.shiro.session.Session
 
 /**

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

@@ -7,10 +7,10 @@
 //import com.gxzc.zen.common.util.RedisCacheUtil
 //import com.gxzc.zen.rpc.api.sys.RPermissionService
 //import com.gxzc.zen.rpc.api.sys.RRoleService
-//import com.gxzc.zen.umps.common.ZenPermission
-//import com.gxzc.zen.umps.constant.ZenHttpSession
-//import com.gxzc.zen.umps.util.SSOUtil
-//import com.gxzc.zen.umps.util.ShiroRedisUtil
+//import cn.gygxzc.tina.config.shiro.common.ZenPermission
+//import cn.gygxzc.tina.config.shiro.ZenHttpSession
+//import cn.gygxzc.tina.config.shiro.utils.SSOUtil
+//import cn.gygxzc.tina.config.shiro.utils.ShiroRedisUtil
 //import org.apache.shiro.session.Session
 //import org.springframework.data.annotation.Reference
 //import org.springframework.stereotype.Service

zen-api/src/main/kotlin/com/gxzc/zen/orm/config/CustomMetaObjectHandler.kt

@@ -1,10 +1,9 @@
 package com.gxzc.zen.orm.config
 
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler
-import com.gxzc.zen.umps.util.SSOUtil
+import cn.gygxzc.tina.config.shiro.utils.SSOUtil
 import org.apache.ibatis.reflection.MetaObject
 import org.slf4j.LoggerFactory
-import org.springframework.stereotype.Component
 import java.util.*
 
 /**

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

@@ -1,27 +0,0 @@
-package com.gxzc.zen.umps.config
-
-import org.apache.shiro.cache.AbstractCacheManager
-import org.apache.shiro.cache.Cache
-import org.springframework.data.redis.core.RedisTemplate
-
-
-/**
- *
- * @author NorthLan
- * @date 2018/4/23
- * @url https://noahlan.com
- */
-class ShiroRedisCacheManager : AbstractCacheManager {
-    private val redisTemplate: RedisTemplate<String, Any>
-
-    private val properties: ShiroRedisProperties
-
-    constructor(redisTemplate: RedisTemplate<String, Any>, properties: ShiroRedisProperties) {
-        this.redisTemplate = redisTemplate
-        this.properties = properties
-    }
-
-    override fun createCache(p0: String): Cache<*, *> {
-        return ShiroRedisCache(redisTemplate, p0, properties)
-    }
-}

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

@@ -1,88 +0,0 @@
-package com.gxzc.zen.umps.config
-
-/**
- *
- * @author NorthLan
- * @date 2018/4/24
- * @url https://noahlan.com
- */
-class ShiroRedisProperties {
-    /**
-     * Database index used by the connection factory.
-     */
-    var database = 1
-
-    /**
-     * Redis url, which will overrule host, port and password if set.
-     */
-    var url: String? = null
-
-    /**
-     * Redis server host.
-     */
-    var host = "localhost"
-
-    /**
-     * Login password of the redis server.
-     */
-    var password: String? = null
-
-    /**
-     * Redis server port.
-     */
-    var port = 6379
-
-    /**
-     * Connection timeout in milliseconds.
-     */
-    var timeout: Int = 0
-
-    /**
-     * Session Prefix
-     */
-    var sessionPrefix: String? = null
-
-    /**
-     * Seconds
-     */
-    var sessionTime: Long = 0
-
-    /**
-     * Redis cache key prefix
-     */
-    var cachePrefix: String? = null
-
-    /**
-     * Redis cache expires (Seconds)
-     */
-    var cacheTime: Long = 0
-
-    var pool: Pool = Pool()
-
-    class Pool {
-        /**
-         * Max number of "idle" connections in the pool. Use a negative value to indicate
-         * an unlimited number of idle connections.
-         */
-        var maxIdle = 8
-
-        /**
-         * Target for the minimum number of idle connections to maintain in the pool. This
-         * setting only has an effect if it is positive.
-         */
-        var minIdle = 0
-
-        /**
-         * Max number of connections that can be allocated by the pool at a given time.
-         * Use a negative value for no limit.
-         */
-        var maxActive = 8
-
-        /**
-         * Maximum amount of time (in milliseconds) a connection allocation should block
-         * before throwing an exception when the pool is exhausted. Use a negative value
-         * to block indefinitely.
-         */
-        var maxWait = -1
-    }
-}

zen-api/src/main/resources/application-shiro.yml

@@ -0,0 +1,42 @@
+spring:
+  profiles: dev
+  session:
+    store-type: redis
+shiro:
+  redis:
+    database: 1 # redis数据库索引
+    host: 192.168.1.206
+    port: 6379
+    password:
+    timeout: 5000 # 连接超时时间（毫秒）
+    sessionPrefix: zen_s #
+    sessionTime: 604800 # 秒 7天
+    cachePrefix: zen_c
+    cacheTime: 604800 # s
+    pool:
+      min-idle: 1 # 连接池中的最小空闲连接
+      max-idle: 20 # 连接池中的最大空闲连接
+      max-active: 20 # 连接池最大连接数（使用负值表示没有限制）
+      max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
+
+---
+spring:
+  profiles: prod
+  session:
+    store-type: redis
+shiro:
+  redis:
+    database: 1 # redis数据库索引
+    host: 192.168.1.10
+    port: 6379
+    password:
+    timeout: 5000 # 连接超时时间（毫秒）
+    sessionPrefix: zen_s #
+    sessionTime: 604800 # 秒 7天
+    cachePrefix: zen_c
+    cacheTime: 604800 # s
+    pool:
+      min-idle: 1 # 连接池中的最小空闲连接
+      max-idle: 20 # 连接池中的最大空闲连接
+      max-active: 20 # 连接池最大连接数（使用负值表示没有限制）
+      max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）

zen-core/src/main/java/com/gxzc/zen/common/config/response/annotation/ZenResponseFilter.java

@@ -1,21 +0,0 @@
-package com.gxzc.zen.common.config.response.annotation;
-
-import java.lang.annotation.*;
-
-/**
- * Json注解,用于返回值的动态过滤
- * 由于kotlin不支持repeatable 故暂使用java方式进行
- * @author NorthLan
- * @date 2018/3/13
- * @url https://noahlan.com
- */
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-@Repeatable(ZenResponseFilters.class)
-public @interface ZenResponseFilter {
-    Class<?> type();
-
-    String[] include() default {};
-
-    String[] filter() default {};
-}

zen-core/src/main/java/com/gxzc/zen/common/config/response/annotation/ZenResponseFilters.java

@@ -1,16 +0,0 @@
-package com.gxzc.zen.common.config.response.annotation;
-
-import java.lang.annotation.*;
-
-/**
- * ZenResponseFilter 注解容器
- * 由于kotlin不支持repeatable 故暂使用java方式进行
- * @author NorthLan
- * @date 2018/3/13
- * @url https://noahlan.com
- */
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface ZenResponseFilters {
-    ZenResponseFilter[] value();
-}

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

@@ -1,64 +0,0 @@
-package com.gxzc.zen.common.config
-
-import io.swagger.annotations.ApiOperation
-import org.springframework.context.annotation.Bean
-import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport
-import springfox.documentation.builders.ApiInfoBuilder
-import springfox.documentation.builders.RequestHandlerSelectors
-import springfox.documentation.service.ApiInfo
-import springfox.documentation.service.Contact
-import springfox.documentation.spi.DocumentationType
-import springfox.documentation.spring.web.plugins.Docket
-
-
-/**
- * swagger-ui 配置
- * @author NorthLan
- * @date 2018/2/10
- * @url https://noahlan.com
- */
-//@Configuration
-//@EnableSwagger2
-//@ConditionalOnProperty(prefix = "zen", name = ["swagger-open"], havingValue = "true")
-class SwaggerConfig : WebMvcConfigurationSupport() {
-
-    override fun addResourceHandlers(registry: ResourceHandlerRegistry) {
-        registry.let {
-            it.addResourceHandler("swagger-ui.html")
-                    .addResourceLocations("classpath:/META-INF/resources/")
-            it.addResourceHandler("/webjars*")
-                    .addResourceLocations("classpath:/META-INF/resources/webjars/")
-        }
-    }
-
-
-    @Bean
-    fun createApi(): Docket {
-        return Docket(DocumentationType.SWAGGER_2)
-                .groupName("v2")
-                .apiInfo(apiInfo())
-                .select()
-//                .apis(RequestHandlerSelectors.withClassAnnotation(Api::class.java))
-                .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation::class.java))
-                // .paths(PathSelectors.ant("/api/v2/**"))
-                .build()
-//                .securitySchemes()
-    }
-
-//    @Suppress("UNUSED")
-//    private fun apiKey(): ApiKey {
-//        return ApiKey("Bearer ", "Authorization", "header")
-//    }
-
-    private fun apiInfo(): ApiInfo {
-        return ApiInfoBuilder()
-                .title("Zen Doc")
-                .description("Zen Api Document")
-                .termsOfServiceUrl("")
-                .contact(Contact("NorthLan", "https://noahlan.com", "lan6995@gmail.com"))
-                .version("2.0")
-                .license("!!!private!!!")
-                .build()
-    }
-}

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

@@ -1,58 +0,0 @@
-package com.gxzc.zen.common.config.request
-
-import com.fasterxml.jackson.databind.DeserializationFeature
-import com.fasterxml.jackson.databind.ObjectMapper
-import com.gxzc.zen.common.config.request.annotation.KVTypeEnum
-import com.gxzc.zen.common.config.request.annotation.ZenRequestTypes
-import com.gxzc.zen.common.dto.RequestDto
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.core.MethodParameter
-import org.springframework.http.HttpInputMessage
-import org.springframework.http.converter.HttpMessageConverter
-import org.springframework.web.bind.annotation.ControllerAdvice
-import org.springframework.web.servlet.mvc.method.annotation.RequestBodyAdviceAdapter
-import java.lang.reflect.Type
-import java.util.*
-
-/**
- *
- * @author NorthLan
- * @date 2018/3/16
- * @url https://noahlan.com
- */
-@ControllerAdvice
-class ZenRequestBodyAdvice : RequestBodyAdviceAdapter() {
-
-    @Autowired
-    private lateinit var objectMapper: ObjectMapper
-
-    override fun supports(methodParameter: MethodParameter, targetType: Type, converterType: Class<out HttpMessageConverter<*>>): Boolean {
-        return methodParameter.hasMethodAnnotation(ZenRequestTypes::class.java) && methodParameter.parameterType == RequestDto::class.java
-    }
-
-    override fun afterBodyRead(body: Any, inputMessage: HttpInputMessage, parameter: MethodParameter, targetType: Type, converterType: Class<out HttpMessageConverter<*>>): Any {
-        val annotation = parameter.getMethodAnnotation(ZenRequestTypes::class.java)
-        if (annotation.value.isEmpty()) {
-            return super.afterBodyRead(body, inputMessage, parameter, targetType, converterType)
-        }
-        val typedBody = body as RequestDto
-        annotation.value.forEach {
-            if (typedBody.containsKey(it.key)) {
-                val data = typedBody[it.key]
-                when (it.type) {
-                    KVTypeEnum.OBJECT -> {
-                        typedBody[it.key] = objectMapper.convertValue(data, it.value.java)
-                    }
-                    KVTypeEnum.ARRAY -> {
-                        typedBody[it.key] = objectMapper.convertValue(data, objectMapper.typeFactory.constructArrayType(it.value.java))
-                    }
-                    KVTypeEnum.LIST -> {
-                        typedBody[it.key] = objectMapper.convertValue(data, objectMapper.typeFactory.constructCollectionType(LinkedList::class.java, it.value.java))
-                    }
-                }
-            }
-        }
-        return super.afterBodyRead(body, inputMessage, parameter, targetType, converterType)
-    }
-
-}

zen-core/src/main/kotlin/com/gxzc/zen/common/config/request/annotation/KVType.kt

@@ -1,25 +0,0 @@
-package com.gxzc.zen.common.config.request.annotation
-
-import kotlin.reflect.KClass
-
-/**
- * key value 对应类型
- * @author NorthLan
- * @date 2018/3/16
- * @url https://noahlan.com
- */
-@Target(AnnotationTarget.ANNOTATION_CLASS)
-annotation class KVType(
-        public val key: String = "",
-        public val value: KClass<out Any>,
-        public val type: KVTypeEnum = KVTypeEnum.OBJECT) {
-}
-
-/**
- * 转换类型
- */
-enum class KVTypeEnum {
-    OBJECT, // 对象
-    ARRAY, // 数组 (需要value作为转换泛型)
-    LIST, // List (需要value作为转换泛型)
-}

zen-core/src/main/kotlin/com/gxzc/zen/common/config/request/annotation/ZenRequestTypes.kt

@@ -1,13 +0,0 @@
-package com.gxzc.zen.common.config.request.annotation
-
-/**
- *
- * @author NorthLan
- * @date 2018/3/16
- * @url https://noahlan.com
- */
-@Target(AnnotationTarget.FUNCTION)
-@Retention(AnnotationRetention.RUNTIME)
-@MustBeDocumented
-annotation class ZenRequestTypes(vararg val value: KVType) {
-}

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

@@ -1,55 +0,0 @@
-package com.gxzc.zen.common.config.response
-
-import com.gxzc.zen.common.config.response.annotation.ZenResponseFilter
-import com.gxzc.zen.common.config.response.annotation.ZenResponseFilters
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.core.MethodParameter
-import org.springframework.http.MediaType
-import org.springframework.http.converter.HttpMessageConverter
-import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter
-import org.springframework.http.converter.json.MappingJacksonValue
-import org.springframework.http.server.ServerHttpRequest
-import org.springframework.http.server.ServerHttpResponse
-import org.springframework.web.bind.annotation.ControllerAdvice
-import org.springframework.web.servlet.mvc.method.annotation.AbstractMappingJacksonResponseBodyAdvice
-
-/**
- * Controller aop 切面拦截写入body时动态设置filter
- * @author NorthLan
- * @date 2018/3/13
- * @url https://noahlan.com
- */
-@ControllerAdvice
-class DynamicFilterResponseBodyAdvice : AbstractMappingJacksonResponseBodyAdvice() {
-
-    @Autowired
-//    @Qualifier(ZenJsonConfigurer.CONVERTER_NAME)
-    private lateinit var converter: MappingJackson2HttpMessageConverter
-
-//    @Autowired
-//    private lateinit var objectMapper: ObjectMapper
-
-    override fun supports(returnType: MethodParameter, converterType: Class<out HttpMessageConverter<*>>): Boolean {
-//        converter.objectMapper = ObjectMapper().apply { configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false) }
-        converter.objectMapper.setMixIns(null)
-//        objectMapper.setMixIns(null)
-        return super.supports(returnType, converterType) &&
-                (returnType.getMethodAnnotation(ZenResponseFilter::class.java) != null
-                        || returnType.getMethodAnnotation(ZenResponseFilters::class.java) != null)
-    }
-
-    override fun beforeBodyWriteInternal(bodyContainer: MappingJacksonValue, contentType: MediaType, returnType: MethodParameter, request: ServerHttpRequest, response: ServerHttpResponse) {
-        val jsonSerializer = ZenJsonSerializer()
-        returnType.methodAnnotations.forEach {
-            if (it is ZenResponseFilter) {
-                jsonSerializer.filter(converter.objectMapper, it)
-            } else if (it is ZenResponseFilters) {
-                it.value.forEach {
-                    jsonSerializer.filter(converter.objectMapper, it)
-                }
-            }
-        }
-        bodyContainer.filters = jsonSerializer.jacksonFilter
-//        converter.objectMapper = jsonSerializer.mapper
-    }
-}

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

@@ -1,12 +0,0 @@
-package com.gxzc.zen.common.config.response
-
-import com.fasterxml.jackson.annotation.JsonFilter
-
-/**
- * Mixin
- * @author NorthLan
- * @date 2018/3/13
- * @url https://noahlan.com
- */
-@JsonFilter(ZenJacksonJsonFilter.FILTER_ID)
-class ZenDynamicFilterMixin

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

@@ -1,67 +0,0 @@
-@file:Suppress("DEPRECATION")
-
-package com.gxzc.zen.common.config.response
-
-import com.fasterxml.jackson.core.JsonGenerator
-import com.fasterxml.jackson.databind.SerializerProvider
-import com.fasterxml.jackson.databind.ser.BeanPropertyFilter
-import com.fasterxml.jackson.databind.ser.FilterProvider
-import com.fasterxml.jackson.databind.ser.PropertyFilter
-import com.fasterxml.jackson.databind.ser.PropertyWriter
-import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter
-import kotlin.reflect.KClass
-
-
-/**
- *
- * @author NorthLan
- * @date 2018/3/12
- * @url https://noahlan.com
- */
-class ZenJacksonJsonFilter : FilterProvider() {
-    companion object {
-        const val FILTER_ID = "ZenDynamicFilterProvider\$FILTER"
-    }
-
-    private val includeMap = hashMapOf<KClass<out Any>, Set<String>>()
-    private val filterMap = hashMapOf<KClass<out Any>, Set<String>>()
-
-    //    @Suppress("deprecation")
-    override fun findFilter(filterId: Any?): BeanPropertyFilter {
-        throw UnsupportedOperationException("Access to deprecated filters not supported")
-    }
-
-    fun include(clazz: KClass<out Any>, fields: Array<String>) {
-        this.includeMap[clazz] = fields.toSet()
-    }
-
-    fun filter(clazz: KClass<out Any>, fields: Array<String>) {
-        this.filterMap[clazz] = fields.toSet()
-    }
-
-    override fun findPropertyFilter(filterId: Any?, valueToFilter: Any?): PropertyFilter {
-        return object : SimpleBeanPropertyFilter() {
-            @Throws(Exception::class)
-            override fun serializeAsField(pojo: Any, jgen: JsonGenerator, prov: SerializerProvider, writer: PropertyWriter) {
-                if (apply(pojo::class, writer.name)) {
-                    writer.serializeAsField(pojo, jgen, prov)
-                } else if (!jgen.canOmitFields()) {
-                    writer.serializeAsOmittedField(pojo, jgen, prov)
-                }
-            }
-        }
-    }
-
-    fun apply(clazz: KClass<out Any>, name: String): Boolean {
-        val includeFields = includeMap[clazz]
-        val filterFields = filterMap[clazz]
-        if (includeFields != null && includeFields.contains(name)) {
-            return true
-        } else if (filterFields != null && !filterFields.contains(name)) {
-            return true
-        } else if (includeFields == null && filterFields == null) {
-            return true
-        }
-        return false
-    }
-}

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

@@ -1,47 +0,0 @@
-package com.gxzc.zen.common.config.response
-
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer
-import org.springframework.context.annotation.Bean
-import org.springframework.context.annotation.Configuration
-import org.springframework.context.annotation.Primary
-import org.springframework.http.converter.HttpMessageConverter
-import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder
-import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
-import java.text.SimpleDateFormat
-
-/**
- * 使Spring boot处理自定义jsonhandler
- * @author NorthLan
- * @date 2018/3/12
- * @url https://noahlan.com
- */
-@Configuration
-class ZenJsonConfigurer : WebMvcConfigurerAdapter() {
-    companion object {
-        const val CONVERTER_NAME = "hookMappingJackson2HttpMessageConverter"
-    }
-
-    override fun configureMessageConverters(converters: MutableList<HttpMessageConverter<*>>) {
-        converters.add(getConverter())
-    }
-
-    @Bean(CONVERTER_NAME)
-    fun getConverter(): MappingJackson2HttpMessageConverter {
-        return MappingJackson2HttpMessageConverter().apply {
-
-            this.objectMapper = builder().build()
-        }
-    }
-
-    @Bean
-    @Primary
-    fun builder(): Jackson2ObjectMapperBuilder {
-        return Jackson2ObjectMapperBuilder().apply {
-            serializerByType(java.lang.Long::class.java, ToStringSerializer.instance)
-            serializerByType(java.lang.Long.TYPE, ToStringSerializer.instance)
-            // date
-            dateFormat(SimpleDateFormat("yyyy-MM-dd HH:mm:ss"))
-        }
-    }
-}

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

@@ -1,38 +0,0 @@
-package com.gxzc.zen.common.config.response
-
-import com.fasterxml.jackson.databind.ObjectMapper
-import com.gxzc.zen.common.config.response.annotation.ZenResponseFilter
-import kotlin.reflect.KClass
-
-/**
- * 自定义的Json序列化工具类
- * @author NorthLan
- * @date 2018/3/12
- * @url https://noahlan.com
- */
-class ZenJsonSerializer {
-    //    val mapper = ObjectMapper().apply { configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false) }
-    val jacksonFilter = ZenJacksonJsonFilter()
-
-    fun filter(objectMapper: ObjectMapper, clazz: KClass<*>?, include: Array<String>?, filter: Array<String>?) {
-        if (clazz == null) {
-            return
-        }
-        if (include != null && include.isNotEmpty()) {
-            jacksonFilter.include(clazz, include)
-        }
-        if (filter != null && filter.isNotEmpty()) {
-            jacksonFilter.filter(clazz, filter)
-        }
-        objectMapper.addMixIn(clazz.java, ZenDynamicFilterMixin::class.java)
-    }
-
-    fun filter(objectMapper: ObjectMapper, zenResponseFilter: ZenResponseFilter) {
-        this.filter(objectMapper, zenResponseFilter.type, zenResponseFilter.include, zenResponseFilter.filter)
-    }
-
-//    fun toJson(any: Any): String {
-//        mapper.setFilterProvider(jacksonFilter)
-//        return mapper.writeValueAsString(any)
-//    }
-}

zen-web/src/main/java/cn/gygxzc/config/properties/SwaggerProperties.java

@@ -0,0 +1,23 @@
+package cn.gygxzc.config.properties;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * @program: Zen-Framework
+ * @description: ${description}
+ * @author: tuonina
+ * @create: 2018-09-20 22:42
+ **/
+@ConfigurationProperties(prefix = "swagger")
+public class SwaggerProperties {
+
+    private boolean open;
+
+    public void setOpen(boolean open) {
+        this.open = open;
+    }
+
+    public boolean isOpen() {
+        return open;
+    }
+}

zen-web/src/main/kotlin/cn/gygxzc/envir/api/sys/controller/LoginController.kt

@@ -0,0 +1,31 @@
+package cn.gygxzc.envir.api.sys.controller
+
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+/**
+ * @program: Zen-Framework
+ *
+ * @description: ${description}
+ *
+ * @author: tuonina
+ *
+ * @create: 2018-09-20 22:45
+ **/
+@RestController
+@RequestMapping("/v1/login")
+class LoginController {
+
+
+    @PostMapping
+    fun login(){
+
+    }
+
+    @PostMapping("/app")
+    fun loginForJwt():Any{
+        return ""
+    }
+
+}

zen-web/src/main/kotlin/com/gxzc/zen/MainApplication.kt → zen-web/src/main/kotlin/cn/gygxzc/envir/web/MainApplication.kt

@@ -1,10 +1,9 @@
-package com.gxzc.zen
+package cn.gygxzc.envir.web
 
 import org.springframework.boot.SpringApplication
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.builder.SpringApplicationBuilder
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient
 import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer
 
 /**

zen-web/src/main/kotlin/cn/gygxzc/envir/web/config/EnvirWebMvcConfiguration.kt

@@ -1,7 +1,22 @@
 package cn.gygxzc.envir.web.config
 
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer
+import io.swagger.annotations.ApiOperation
+import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
+import org.springframework.context.annotation.Primary
+import org.springframework.http.converter.HttpMessageConverter
+import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport
+import springfox.documentation.builders.ApiInfoBuilder
+import springfox.documentation.builders.RequestHandlerSelectors
+import springfox.documentation.service.ApiInfo
+import springfox.documentation.service.Contact
+import springfox.documentation.spi.DocumentationType
+import springfox.documentation.spring.web.plugins.Docket
+import java.text.SimpleDateFormat
 
 /**
  * Created by niantuo on 2018/9/20.
@@ -9,4 +24,42 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupp
  */
 @Configuration
 class EnvirWebMvcConfiguration:WebMvcConfigurationSupport() {
+
+    companion object {
+        const val CONVERTER_NAME = "hookMappingJackson2HttpMessageConverter"
+    }
+
+    override fun addResourceHandlers(registry: ResourceHandlerRegistry) {
+        registry.let {
+            it.addResourceHandler("swagger-ui.html")
+                    .addResourceLocations("classpath:/META-INF/resources/")
+            it.addResourceHandler("/webjars*")
+                    .addResourceLocations("classpath:/META-INF/resources/webjars/")
+        }
+    }
+
+
+
+    override fun configureMessageConverters(converters: MutableList<HttpMessageConverter<*>>) {
+        converters.add(getConverter())
+    }
+
+    @Bean(CONVERTER_NAME)
+    fun getConverter(): MappingJackson2HttpMessageConverter {
+        return MappingJackson2HttpMessageConverter().apply {
+
+            this.objectMapper = builder().build()
+        }
+    }
+
+    @Bean
+    @Primary
+    fun builder(): Jackson2ObjectMapperBuilder {
+        return Jackson2ObjectMapperBuilder().apply {
+            serializerByType(java.lang.Long::class.java, ToStringSerializer.instance)
+            serializerByType(java.lang.Long.TYPE, ToStringSerializer.instance)
+            // date
+            dateFormat(SimpleDateFormat("yyyy-MM-dd HH:mm:ss"))
+        }
+    }
 }

zen-web/src/main/kotlin/cn/gygxzc/envir/web/config/SwaggerConfiguration.kt

@@ -0,0 +1,50 @@
+package cn.gygxzc.envir.web.config
+
+import io.swagger.annotations.ApiOperation
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+import springfox.documentation.builders.ApiInfoBuilder
+import springfox.documentation.builders.RequestHandlerSelectors
+import springfox.documentation.service.ApiInfo
+import springfox.documentation.service.Contact
+import springfox.documentation.spi.DocumentationType
+import springfox.documentation.spring.web.plugins.Docket
+import springfox.documentation.swagger2.annotations.EnableSwagger2
+
+/**
+ * @program: Zen-Framework
+ *
+ * @description: ${description}
+ *
+ * @author: tuonina
+ *
+ * @create: 2018-09-20 22:39
+ **/
+@Configuration
+@EnableSwagger2
+@ConditionalOnProperty(prefix = "swagger", name = ["open"], havingValue = "true")
+class SwaggerConfiguration {
+
+    @Bean
+    fun createApi(): Docket {
+        return Docket(DocumentationType.SWAGGER_2)
+                .groupName("v2")
+                .apiInfo(apiInfo())
+                .select()
+                .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation::class.java))
+                .build()
+//                .securitySchemes()
+    }
+
+    private fun apiInfo(): ApiInfo {
+        return ApiInfoBuilder()
+                .title("Envir Doc")
+                .description("Zen Api Document")
+                .termsOfServiceUrl("")
+                .contact(Contact("NorthLan", "https://noahlan.com", "lan6995@gmail.com"))
+                .version("2.0")
+                .license("!!!private!!!")
+                .build()
+    }
+}

zen-web/src/main/kotlin/cn/gygxzc/envir/web/stomp/Stomp.kt

@@ -0,0 +1,14 @@
+package cn.gygxzc.envir.web.stomp
+
+/**
+ * @program: Zen-Framework
+ *
+ * @description: ${description}
+ *
+ * @author: tuonina
+ *
+ * @create: 2018-09-20 22:32
+ *
+ * 一般与前端给基于stomp协议，这样的话更方便些
+ *
+ **/

zen-web/src/main/kotlin/cn/gygxzc/envir/web/websocket/Websocket.kt

@@ -0,0 +1,12 @@
+package cn.gygxzc.envir.web.websocket
+
+/**
+ * @program: Zen-Framework
+ *
+ * @description: ${description}
+ *
+ * @author: tuonina
+ *
+ * @create: 2018-09-20 22:33
+ * 同时也支持websocket协议吧，都配置起来
+ **/

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

@@ -1,21 +0,0 @@
-package com.gxzc.zen.web.sys.controller
-
-import org.slf4j.LoggerFactory
-import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.RestController
-
-/**
- * 身份验证相关控制器
- * @author NorthLan
- * @date 2018/2/10
- * @url https://noahlan.com
- */
-@RestController
-@RequestMapping("auth")
-class AuthController {
-    companion object {
-        private val logger = LoggerFactory.getLogger(AuthController::class.java)
-    }
-
-
-}

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

@@ -1,22 +0,0 @@
-package com.gxzc.zen.web.sys.controller
-
-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/3/15
- * @url https://noahlan.com
- */
-@RestController
-@RequestMapping("test")
-class TestController {
-
-    @GetMapping("a")
-    fun a(): Any {
-        return "hello !!"
-    }
-}

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

@@ -1,21 +0,0 @@
-package com.gxzc.zen.web.sys.controller
-
-import org.slf4j.LoggerFactory
-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 {
-    companion object {
-        private val logger = LoggerFactory.getLogger(UploadController::class.java)
-    }
-
-
-}

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

@@ -1,26 +0,0 @@
-package com.gxzc.zen.ws.sys.controller
-
-import org.springframework.messaging.handler.annotation.DestinationVariable
-import org.springframework.messaging.handler.annotation.MessageMapping
-import org.springframework.messaging.handler.annotation.SendTo
-import org.springframework.stereotype.Controller
-import org.springframework.web.bind.annotation.ResponseBody
-
-/**
- * 测试用 Controller
- * @author NorthLan
- * @date 2018/7/31
- * @url https://noahlan.com
- */
-@Controller
-class WebSocketTestController {
-    //    @Autowired
-    //    private lateinit var template: SimpMessagingTemplate
-
-    @MessageMapping("/test1/{id}")
-    @SendTo("/topic/test")
-    @ResponseBody
-    fun test(@DestinationVariable id: Int): Any {
-        return "test"
-    }
-}