'删除shiro配置'

README.md

@@ -9,6 +9,8 @@
 - 根据 ResponseDto 的code字段判断请求操作是否成功。如果失败，返回非200的请求码
 - *最好将系统的代码和自己的区分开来，自己的代码写在cn.gygxzc.envir.biz 目录下*
 
+- *一键生成数据库相关代码配置在cn.gygxzc.envir.config.orm 包下，请自行配置相关参数*
+
 ### 项目说明
 项目中缓存可以分成三类：
 - 系统Spring session缓存，shiro缓存

build.gradle

@@ -110,19 +110,12 @@ subprojects {
 
         testCompile('org.springframework.boot:spring-boot-starter-test')
         // mq
-
-        // shiro
-        compile("org.apache.shiro:shiro-spring:$shiro_version")
         compile('com.fasterxml.jackson.module:jackson-module-kotlin:2.9.6')
         // commons
         compile("commons-io:commons-io:$commons_io_version")
         compile("org.apache.commons:commons-lang3:$commons_lang3_version")
         compile("commons-codec:commons-codec:$commons_codec_version")
         compile("commons-fileupload:commons-fileupload:$commons_fileupload_version")
-
-        // logger
-        compile("org.slf4j:slf4j-api:$slf4j_api_version")
-
         compile("javax.servlet:javax.servlet-api:3.1.0")
         compile("javax.servlet:servlet-api:2.5")
 

settings.gradle

@@ -2,5 +2,4 @@ rootProject.name = 'Zen-Framework'
 include 'zen-core'
 include 'zen-api'
 include 'zen-web'
-include 'zen-job'
 

zen-api/src/main/kotlin/cn/gygxzc/envir/config/filter/CrosWebFilter.kt

@@ -0,0 +1,43 @@
+package cn.gygxzc.envir.config.filter
+
+import org.slf4j.LoggerFactory
+import org.springframework.http.HttpMethod
+import org.springframework.http.HttpStatus
+import org.springframework.stereotype.Component
+import org.springframework.web.server.ServerWebExchange
+import org.springframework.web.server.WebFilter
+import org.springframework.web.server.WebFilterChain
+import reactor.core.publisher.Mono
+
+/**
+ * Created by niantuo on 2018/9/29.
+ * 管理跨域问题的filter，正式项目中是不需要的，
+ * 因为到业务子系统不会出现options请求了
+ */
+@Component
+class CrosWebFilter : WebFilter {
+    private val logger = LoggerFactory.getLogger(CrosWebFilter::class.java)
+
+    override fun filter(exchange: ServerWebExchange, chain: WebFilterChain): Mono<Void> {
+
+        val httpRequest = exchange.request
+        val httpResponse = exchange.response
+        httpResponse.headers
+        httpResponse.headers.apply {
+            set("Access-control-Allow-Origin", httpRequest.headers["Origin"])
+            set("Access-Control-Allow-Methods", "GET, HEAD, POST, PUT, DELETE, TRACE, OPTIONS, PATCH")
+            set("Access-Control-Allow-Credentials", "true")
+            set("Access-Control-Allow-Headers", httpRequest.headers["Access-Control-Request-Headers"])
+            val method = httpRequest.method
+            if (method == HttpMethod.POST || method == HttpMethod.PUT) {
+                set("Access-Control-Expose-Headers", "Location")
+            } else if (method == HttpMethod.OPTIONS) {
+                httpResponse.statusCode = HttpStatus.OK
+                logger.info("options cros allow {}", httpRequest.path)
+                return httpResponse.setComplete()
+            }
+        }
+        logger.info("cros allow {}", httpRequest.path)
+        return chain.filter(exchange)
+    }
+}

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

@@ -1,5 +1,6 @@
-package com.gxzc.zen.orm.config
+package cn.gygxzc.envir.config.orm
 
+import cn.gygxzc.envir.config.orm.interceptor.CustomMetaObjectHandler
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler
 import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor
 import org.mybatis.spring.annotation.MapperScan

zen-api/src/main/kotlin/com/gxzc/zen/orm/config/CustomMetaObjectHandler.kt → zen-api/src/main/kotlin/cn/gygxzc/envir/config/orm/interceptor/CustomMetaObjectHandler.kt

@@ -1,4 +1,4 @@
-package com.gxzc.zen.orm.config
+package cn.gygxzc.envir.config.orm.interceptor
 
 import cn.gygxzc.tina.cloud.jwt.session.utils.SessionUtils
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler

zen-api/src/main/kotlin/cn/gygxzc/envir/config/shiro/ShiroConfig.kt

@@ -1,139 +0,0 @@
-package cn.gygxzc.envir.config.shiro
-
-import cn.gygxzc.envir.config.shiro.cache.RedisConfiguration
-import cn.gygxzc.envir.config.shiro.filter.AjaxAuthorizationFilter
-import cn.gygxzc.envir.config.shiro.filter.ZenCorsAnonymousFilter
-import cn.gygxzc.envir.config.shiro.filter.ZenCorsPathMatchingFilter
-import cn.gygxzc.envir.config.shiro.realm.ZenShiroRealm
-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.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.session.mgt.ServletContainerSessionManager
-import org.springframework.beans.factory.annotation.Qualifier
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass
-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.web.filter.DelegatingFilterProxy
-import javax.servlet.DispatcherType
-import javax.servlet.Filter
-
-
-/**
- * Shiro配置
- * @author NorthLan
- * @date 2018/4/21
- * @url https://noahlan.com
- */
-@Configuration
-@ConditionalOnClass(value = [RedisConfiguration::class])
-class ShiroConfig {
-
-    @Bean("shiroLifecycleBeanPostProcessor")
-    fun lifecycleBeanPostProcessor(): LifecycleBeanPostProcessor {
-        return LifecycleBeanPostProcessor()
-    }
-
-    @Bean
-    @DependsOn(value = ["shiroLifecycleBeanPostProcessor", "shiroRedisCacheManager"])
-    fun userRealm(@Qualifier("shiroRedisCacheManager") cacheManager: CacheManager): ZenShiroRealm {
-        val shiroRealm = ZenShiroRealm()
-                .apply {
-                    isCachingEnabled = true
-                    isAuthenticationCachingEnabled = true
-                    isAuthorizationCachingEnabled = true
-                    //加密验证方法
-                    credentialsMatcher = HashedCredentialsMatcher().also {
-                        it.hashAlgorithmName = "md5"
-                        it.hashIterations = 2 // 两次md5
-                    }
-                }
-        shiroRealm.cacheManager = cacheManager
-        return shiroRealm
-    }
-
-    @Bean(name = ["securityManager"])
-    fun securityManager(userRealm: AuthorizingRealm,
-                        @Qualifier("shiroRedisCacheManager") redisCacheManager: CacheManager): DefaultWebSecurityManager {
-        return DefaultWebSecurityManager().apply {
-            setRealm(userRealm)
-            cacheManager = redisCacheManager
-            sessionManager = ServletContainerSessionManager()
-        }
-    }
-
-    @Bean("shiroFilterRegistrationBean")
-    @DependsOn("shiroFilter")
-    fun filterRegistrationBean(): FilterRegistrationBean<DelegatingFilterProxy> {
-        return FilterRegistrationBean<DelegatingFilterProxy>().apply {
-            filter = DelegatingFilterProxy("shiroFilter")
-            isEnabled = true
-            addUrlPatterns("/*")
-            setDispatcherTypes(DispatcherType.REQUEST)
-        }
-    }
-
-    @Bean(name = ["shiroFilter"])
-    @Order(2)
-    fun shiroFilter(securityManager: SecurityManager): ShiroFilterFactoryBean {
-        return ShiroFilterFactoryBean().apply {
-            setSecurityManager(securityManager)
-
-            filters = hashMapOf<String, Filter>(
-                    "canon" to ZenCorsAnonymousFilter(),
-                    "cors" to ZenCorsPathMatchingFilter(),
-                    "authc" to AjaxAuthorizationFilter(),
-                    "anon" to AnonymousFilter()
-            )
-            /**
-             * anon（匿名）  org.apache.shiro.web.filter.authc.AnonymousFilter
-             * authc（身份验证）       org.apache.shiro.web.filter.authc.FormAuthenticationFilter
-             * authcBasic（http基本验证）    org.apache.shiro.web.filter.authc.BasicHttpAuthenticationFilter
-             * logout（退出）        org.apache.shiro.web.filter.authc.LogoutFilter
-             * noSessionCreation（不创建session） org.apache.shiro.web.filter.session.NoSessionCreationFilter
-             * perms(许可验证)  org.apache.shiro.web.filter.authz.PermissionsAuthorizationFilter
-             * port（端口验证）   org.apache.shiro.web.filter.authz.PortFilter
-             * rest  (rest方面)  org.apache.shiro.web.filter.authz.HttpMethodPermissionFilter
-             * roles（权限验证）  org.apache.shiro.web.filter.authz.RolesAuthorizationFilter
-             * ssl （ssl方面）   org.apache.shiro.web.filter.authz.SslFilter
-             * member （用户方面）  org.apache.shiro.web.filter.authc.UserFilter
-             * user  表示用户不一定已通过认证,只要曾被Shiro记住过登录状态的用户就可以正常发起请求,比如rememberMe
-             */
-            filterChainDefinitionMap = linkedMapOf<String, String>( // BUG 此处一定要使用 linkedHashMap 否则顺序有问题
-                    "/auth/setcookie" to "canon", // 设置cookie
-                    "/auth/check" to "canon", // 检查登录状态
-                    "/auth/logout" to "canon", // 登出
-                    "/test/**" to "canon", // 测试 免登录
-                    "/upload/**" to "canon", // 上传免登录
-                    "/fdfsupload/**" to "canon", // 上传免登录
-                    "/api/**" to "canon", // api 免登陆
-                    "/ws/**" to "canon", // websocket 免登陆
-                    "/" to "canon",
-                    "/v1/login/**" to "canon",
-                    ////////////////////// 静态资源 /////////////////////
-                    "/v2/api-docs" to "canon",
-                    "/swagger-resources/**" to "anon",
-                    "/swagger-ui.html" to "anon",
-                    "/webjars*" to "anon",
-                    "/webjars/**" to "anon",
-                    "/druid/**" to "anon",
-                    "/druid/sql.json" to "anon",
-                    "/**/favicon.*" to "anon",
-                    "/eureka*" to "anon",
-                    "/eureka/**" to "anon",
-                    "/v1/sys" to "anon",
-                    ////////////////////// 静态资源 /////////////////////
-                    "/**" to "cors,authc" // 对于其他未配置的所有url 先设置cors头 再进行登陆判定 最后判定权限
-            )
-        }
-    }
-
-
-}

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

@@ -1,61 +0,0 @@
-package cn.gygxzc.envir.config.shiro.cache
-
-import cn.gygxzc.envir.sys.config.properties.ShiroRedisCacheProperties
-import cn.gygxzc.envir.sys.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(value = [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 = ["shiroRedisCacheManager"])
-    @DependsOn(value = ["shiroRedisTemplate"])
-    fun redisCacheManager(): ShiroRedisCacheManager {
-        return ShiroRedisCacheManager(redisTemplate(), sessionProperties)
-    }
-
-
-}

zen-api/src/main/kotlin/cn/gygxzc/envir/config/shiro/cache/ShiroRedisCache.kt

@@ -1,119 +0,0 @@
-package cn.gygxzc.envir.config.shiro.cache
-
-import cn.gygxzc.tina.cache.redis.RedisKeyGenerator
-import cn.gygxzc.envir.sys.config.properties.ShiroSessionProperties
-import cn.gygxzc.envir.config.shiro.utils.SerializeUtils
-import org.apache.shiro.cache.Cache
-import org.apache.shiro.cache.CacheException
-import org.apache.shiro.subject.PrincipalCollection
-import org.slf4j.LoggerFactory
-import org.springframework.data.redis.core.RedisTemplate
-import java.nio.charset.Charset
-import java.util.*
-import java.util.concurrent.TimeUnit
-
-
-/**
- *
- * @author NorthLan
- * @date 2018/4/23
- * @url https://noahlan.com
- */
-@Suppress("UNCHECKED_CAST")
-class ShiroRedisCache<V> : Cache<Any, V> {
-    companion object {
-        private val logger = LoggerFactory.getLogger(ShiroRedisCache::class.java)
-    }
-
-    private var redisTemplate: RedisTemplate<String, V>
-    private var prefix = "shiro_redis:"
-    private var charset: Charset = Charsets.UTF_8
-    private val properties: ShiroSessionProperties
-
-    constructor(redisTemplate: RedisTemplate<String, V>, properties: ShiroSessionProperties) {
-        this.redisTemplate = redisTemplate
-        this.properties = properties
-    }
-
-    constructor(redisTemplate: RedisTemplate<String, V>, prefix: String, properties: ShiroSessionProperties, charset: Charset = Charsets.UTF_8) {
-        this.redisTemplate = redisTemplate
-        this.prefix = prefix
-        this.properties = properties
-        this.charset = charset
-    }
-
-    override fun values(): MutableCollection<V> {
-        val keys = keys()
-        val values = ArrayList<V>(keys.size)
-        for (k in keys) {
-            get(k)?.let {
-                values.add(it)
-            }
-        }
-        return values
-    }
-
-    override fun clear() {
-        redisTemplate.delete(keys())
-    }
-
-    override fun put(p0: Any?, p1: V?): V? {
-        logger.debug("Put/ Key: $p0, value: $p1")
-        if (p0 == null || p1 == null) {
-            return null
-        }
-        return try {
-            redisTemplate.boundValueOps(getByteKey(p0)).set(p1)
-//            vo.expire(properties.cacheTime, TimeUnit.SECONDS)
-            p1
-        } catch (e: Throwable) {
-            throw CacheException(e)
-        }
-    }
-
-    override fun remove(p0: Any?): V? {
-        logger.debug("Remove/ Key: $p0")
-        if (p0 == null) {
-            return null
-        }
-        return try {
-            val key = getByteKey(p0)
-            val v = redisTemplate.boundValueOps(key).get()
-            redisTemplate.delete(key)
-            v
-        } catch (e: Throwable) {
-            throw CacheException(e)
-        }
-    }
-
-    override fun size(): Int {
-        return keys().size
-    }
-
-    override fun get(p0: Any?): V? {
-        logger.debug("Get/ key: $p0")
-        if (p0 == null) {
-            return null
-        }
-        return try {
-            val vo = redisTemplate.boundValueOps(getByteKey(p0))
-            vo.expire(properties.expired.seconds, TimeUnit.SECONDS)
-            vo.get()
-        } catch (e: Throwable) {
-            throw CacheException(e)
-        }
-    }
-
-    override fun keys(): MutableSet<String> {
-        logger.debug("Keys/ ")
-        return redisTemplate.keys(getByteKey("*"))
-    }
-
-    private fun getByteKey(key: Any): String {
-        return when (key) {
-            is String -> "${this.prefix}${RedisKeyGenerator.SEPARATOR}$key"
-            is PrincipalCollection -> getByteKey(key.primaryPrincipal)
-            else -> SerializeUtils.serialize(key).toString()
-        }
-    }
-}

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

@@ -1,21 +0,0 @@
-package cn.gygxzc.envir.config.shiro.cache
-
-import cn.gygxzc.envir.sys.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/cn/gygxzc/envir/config/shiro/common/ZenAuthToken.kt

@@ -1,61 +0,0 @@
-package cn.gygxzc.envir.config.shiro.common
-
-import cn.gygxzc.envir.sys.model.SysUser
-import org.apache.shiro.authc.UsernamePasswordToken
-
-/**
- * 登陆用token
- * @author NorthLan
- * @date 2018/4/29
- * @url https://noahlan.com
- */
-class ZenAuthToken : UsernamePasswordToken {
-    var user: SysUser? = null
-
-    constructor() : super()
-    constructor(username: String, password: CharArray) : super(username, password)
-    constructor(username: String, password: String) : super(username, password)
-    constructor(username: String, password: CharArray, host: String) : super(username, password, host)
-    constructor(username: String, password: String, host: String) : super(username, password, host)
-    constructor(username: String, password: CharArray, rememberMe: Boolean) : super(username, password, rememberMe)
-    constructor(username: String, password: String, rememberMe: Boolean) : super(username, password, rememberMe)
-    constructor(username: String, password: CharArray, rememberMe: Boolean, host: String) : super(username, password, rememberMe, host)
-    constructor(username: String, password: String, rememberMe: Boolean, host: String) : super(username, password, rememberMe, host)
-
-    constructor(username: String, password: CharArray, user: SysUser?) : super(username, password) {
-        this.user = user
-    }
-
-    constructor(username: String, password: String, user: SysUser?) : super(username, password) {
-        this.user = user
-    }
-
-    constructor(username: String, password: CharArray, host: String, user: SysUser?) : super(username, password, host) {
-        this.user = user
-    }
-
-    constructor(username: String, password: String, host: String, user: SysUser?) : super(username, password, host) {
-        this.user = user
-    }
-
-    constructor(username: String, password: CharArray, rememberMe: Boolean, user: SysUser?) : super(username, password, rememberMe) {
-        this.user = user
-    }
-
-    constructor(username: String, password: String, rememberMe: Boolean, user: SysUser?) : super(username, password, rememberMe) {
-        this.user = user
-    }
-
-    constructor(username: String, password: CharArray, rememberMe: Boolean, host: String, user: SysUser?) : super(username, password, rememberMe, host) {
-        this.user = user
-    }
-
-    constructor(username: String, password: String, rememberMe: Boolean, host: String, user: SysUser?) : super(username, password, rememberMe, host) {
-        this.user = user
-    }
-
-    override fun clear() {
-        super.clear()
-        this.user = null
-    }
-}

zen-api/src/main/kotlin/cn/gygxzc/envir/config/shiro/common/ZenPermission.kt

@@ -1,54 +0,0 @@
-package cn.gygxzc.envir.config.shiro.common
-
-import java.io.Serializable
-
-/**
- * 权限数据结构
- *
- * 从Resource/Menu抽象
- *
- * @author NorthLan
- * @date 2018/4/29
- * @url https://noahlan.com
- */
-open class ZenPermission : Serializable {
-    companion object {
-        private const val serialVersionUID = 5640224091610186666L
-    }
-
-    /**
-     * ResourceId
-     */
-    var id: Long? = null
-
-    /**
-     * 权限代码 (前端使用)
-     */
-    var code: String? = null
-
-    /**
-     * 请求地址
-     */
-    var uri: String? = null
-
-    /**
-     * 请求方法
-     */
-    var method: String? = null
-
-    /**
-     * 权限类型
-     * 1. 按钮 2.url
-     */
-    var type: Int? = null
-
-    /**
-     * 简短名称
-     */
-    var name: String? = null
-
-    /**
-     * 树ID
-     */
-    var treeId: Long? = null
-}

zen-api/src/main/kotlin/cn/gygxzc/envir/config/shiro/common/ZenSimpleByteSource.kt

@@ -1,106 +0,0 @@
-package cn.gygxzc.envir.config.shiro.common
-
-import org.apache.shiro.codec.Base64
-import org.apache.shiro.codec.CodecSupport
-import org.apache.shiro.codec.Hex
-import org.apache.shiro.util.ByteSource
-import java.io.File
-import java.io.InputStream
-import java.io.Serializable
-import java.util.*
-
-/**
- * 实现序列化接口,否则 序列化 反序列化 凉凉
- * @author NorthLan
- * @date 2018/4/24
- * @url https://noahlan.com
- */
-class ZenSimpleByteSource : ByteSource, Serializable {
-    companion object {
-        private const val serialVersionUID = 5640224091610182940L
-    }
-
-    private var bytes: ByteArray? = null
-    private var cachedHex: String? = null
-    private var cachedBase64: String? = null
-
-    constructor()
-    constructor(bytes: ByteArray?) {
-        this.bytes = bytes
-    }
-
-    constructor(chars: CharArray?) {
-        this.bytes = CodecSupport.toBytes(chars)
-    }
-
-    constructor(string: String?) {
-        this.bytes = CodecSupport.toBytes(string)
-    }
-
-    constructor(source: ByteSource?) {
-        this.bytes = source?.bytes
-    }
-
-    constructor(file: File?) {
-        this.bytes = BytesHelper().getBytes(file)
-    }
-
-    constructor(stream: InputStream?) {
-        this.bytes = BytesHelper().getBytes(stream)
-    }
-
-    override fun toHex(): String? {
-        if (this.cachedHex == null) {
-            this.cachedHex = Hex.encodeToString(getBytes())
-        }
-        return this.cachedHex
-    }
-
-    override fun isEmpty(): Boolean {
-        return this.bytes == null || this.bytes!!.isEmpty()
-    }
-
-    override fun getBytes(): ByteArray? {
-        return this.bytes
-    }
-
-    override fun toBase64(): String {
-        if (this.cachedBase64 == null) {
-            this.cachedBase64 = Base64.encodeToString(getBytes())
-        }
-        return this.cachedBase64!!
-    }
-
-    override fun toString(): String {
-        return toBase64()
-    }
-
-    override fun hashCode(): Int {
-        return if (isEmpty) {
-            0
-        } else Arrays.hashCode(this.bytes)
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (other === this) {
-            return true
-        }
-        if (other is ByteSource) {
-            val bs = other as ByteSource?
-            return Arrays.equals(getBytes(), bs!!.bytes)
-        }
-        return false
-    }
-
-    private class BytesHelper : CodecSupport {
-        constructor()
-
-        fun getBytes(file: File?): ByteArray {
-            return toBytes(file)
-        }
-
-        fun getBytes(stream: InputStream?): ByteArray {
-            return toBytes(stream)
-        }
-    }
-}

zen-api/src/main/kotlin/cn/gygxzc/envir/config/shiro/filter/AjaxAuthorizationFilter.kt

@@ -1,40 +0,0 @@
-package cn.gygxzc.envir.config.shiro.filter
-
-import org.apache.shiro.web.filter.authc.FormAuthenticationFilter
-import org.springframework.http.HttpMethod
-import org.springframework.http.HttpStatus
-import javax.servlet.ServletRequest
-import javax.servlet.ServletResponse
-import javax.servlet.http.HttpServletRequest
-import javax.servlet.http.HttpServletResponse
-
-
-/**
- * 对没有登录的请求进行拦截, 全部返回json信息. 覆盖掉shiro原本的跳转login.jsp的拦截方式
- *
- * 拦截状态码修改为401-UNAUTHORIZED
- * @author NorthLan
- * @date 2018/4/23
- * @url https://noahlan.com
- */
-class AjaxAuthorizationFilter : FormAuthenticationFilter() {
-
-    override fun isAccessAllowed(request: ServletRequest, response: ServletResponse, mappedValue: Any?): Boolean {
-        if (request is HttpServletRequest) {
-            if (HttpMethod.valueOf(request.method) == HttpMethod.OPTIONS) {
-                return true
-            }
-        }
-        return super.isAccessAllowed(request, response, mappedValue)
-    }
-
-    override fun onAccessDenied(request: ServletRequest, response: ServletResponse): Boolean {
-        response as HttpServletResponse
-        response.apply {
-            characterEncoding = "UTF-8"
-            contentType = "application/json"
-            sendError(HttpStatus.UNAUTHORIZED.value(), "you need login first...") // 401
-        }
-        return false
-    }
-}

zen-api/src/main/kotlin/cn/gygxzc/envir/config/shiro/filter/ZenCorsAnonymousFilter.kt

@@ -1,41 +0,0 @@
-package cn.gygxzc.envir.config.shiro.filter
-
-import org.apache.shiro.web.filter.PathMatchingFilter
-import org.apache.shiro.web.util.WebUtils
-import org.springframework.http.HttpMethod
-import org.springframework.http.HttpStatus
-import javax.servlet.ServletRequest
-import javax.servlet.ServletResponse
-
-/**
- * Cors 的 canon 过滤器
- * @author NorthLan
- * @date 2018/4/25
- * @url https://noahlan.com
- */
-class ZenCorsAnonymousFilter : PathMatchingFilter() {
-
-    /**
-     * Always returns <code>true</code> allowing unchecked access to the underlying path or resource.
-     *
-     * @return <code>true</code> always, allowing unchecked access to the underlying path or resource.
-     */
-    override fun onPreHandle(request: ServletRequest?, response: ServletResponse?, mappedValue: Any?): Boolean {
-        val httpRequest = WebUtils.toHttp(request)
-        val httpResponse = WebUtils.toHttp(response)
-        httpResponse.apply {
-            setHeader("Access-control-Allow-Origin", httpRequest.getHeader("Origin"))
-            setHeader("Access-Control-Allow-Methods", "GET, HEAD, POST, PUT, DELETE, TRACE, OPTIONS, PATCH")
-            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) {
-                setHeader("Access-Control-Expose-Headers", "Location")
-            } else if (method == HttpMethod.OPTIONS) {
-                status = HttpStatus.OK.value()
-                return false
-            }
-        }
-        return true
-    }
-}

zen-api/src/main/kotlin/cn/gygxzc/envir/config/shiro/filter/ZenCorsPathMatchingFilter.kt

@@ -1,39 +0,0 @@
-package cn.gygxzc.envir.config.shiro.filter
-
-import org.apache.shiro.web.filter.PathMatchingFilter
-import org.apache.shiro.web.util.WebUtils
-import org.springframework.http.HttpMethod
-import org.springframework.http.HttpStatus
-import javax.servlet.ServletRequest
-import javax.servlet.ServletResponse
-
-/**
- * 允许cors头
- * @author NorthLan
- * @date 2018/4/25
- * @url https://noahlan.com
- */
-class ZenCorsPathMatchingFilter : PathMatchingFilter() {
-
-    /**
-     * 实际上如果是options 方式的请求，没有必要继续下去了，直接返回就好了
-     */
-    override fun onPreHandle(request: ServletRequest?, response: ServletResponse?, mappedValue: Any?): Boolean {
-        val httpRequest = WebUtils.toHttp(request)
-        val httpResponse = WebUtils.toHttp(response)
-        httpResponse.apply {
-            setHeader("Access-control-Allow-Origin", httpRequest.getHeader("Origin"))
-            setHeader("Access-Control-Allow-Methods", "GET, HEAD, POST, PUT, DELETE, TRACE, OPTIONS, PATCH")
-            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) {
-                setHeader("Access-Control-Expose-Headers", "Location")
-            } else if (method == HttpMethod.OPTIONS) {
-                status = HttpStatus.OK.value()
-                return false
-            }
-        }
-        return true
-    }
-}

zen-api/src/main/kotlin/cn/gygxzc/envir/config/shiro/realm/ZenShiroRealm.kt

@@ -1,63 +0,0 @@
-package cn.gygxzc.envir.config.shiro.realm
-
-import cn.gygxzc.envir.config.shiro.common.ZenAuthToken
-import cn.gygxzc.envir.config.shiro.common.ZenSimpleByteSource
-import org.apache.shiro.authc.*
-import org.apache.shiro.authz.AuthorizationInfo
-import org.apache.shiro.authz.SimpleAuthorizationInfo
-import org.apache.shiro.realm.AuthorizingRealm
-import org.apache.shiro.subject.PrincipalCollection
-import org.slf4j.LoggerFactory
-
-/**
- *
- * @author NorthLan
- * @date 2018/4/23
- * @url https://noahlan.com
- */
-class ZenShiroRealm : AuthorizingRealm() {
-    companion object {
-        private val logger = LoggerFactory.getLogger(ZenShiroRealm::class.java)
-    }
-
-    init {
-        this.name = "zen_realm"
-    }
-
-
-    /**
-     * 只支持这个
-     */
-    override fun supports(token: AuthenticationToken): Boolean {
-        return token is ZenAuthToken
-    }
-
-    /**
-     * 登陆验证
-     */
-    override fun doGetAuthenticationInfo(token: AuthenticationToken): AuthenticationInfo {
-        logger.debug("ZenShiroRealm doGetAuthenticationInfo [${token.principal}]")
-        if (token !is ZenAuthToken) {
-            throw AccountException("token must be ZenAuthToken")
-        }
-        // 获取用户信息
-        val user = token.user ?: throw UnknownAccountException()
-
-        // 账号锁定判定
-        if (user.lock_ != null && user.lock_!!) {
-            throw LockedAccountException()
-        }
-        return SimpleAuthenticationInfo(user, user.password, ZenSimpleByteSource(user.account + user.salt), user.username)
-    }
-
-    /**
-     * <p>调用subject的权限验证,如 hasRole,hasPermission <br>
-     *     将调用此方法给subject设置定义的权限
-     *     而后交由Realm处理 <br></p>
-     * 现改为集中式基于数据库的动态权限管理,此功能不做任何处理
-     */
-    override fun doGetAuthorizationInfo(principals: PrincipalCollection?): AuthorizationInfo {
-        logger.debug("ZenShiroRealm doGetAuthorizationInfo [${principals?.primaryPrincipal}]")
-        return SimpleAuthorizationInfo()
-    }
-}

zen-api/src/main/kotlin/cn/gygxzc/envir/config/shiro/utils/SerializeUtils.kt

@@ -1,82 +0,0 @@
-package cn.gygxzc.envir.config.shiro.utils
-
-import org.slf4j.LoggerFactory
-import java.io.*
-
-
-/**
- * 序列化工具
- * @author NorthLan
- * @date 2018/4/23
- * @url https://noahlan.com
- */
-object SerializeUtils {
-    private val logger = LoggerFactory.getLogger(SerializeUtils::class.java)
-
-    /**
-     * deserialize
-     * @param bytes
-     * @return
-     */
-    fun deserialize(bytes: ByteArray): Any? {
-        var result: Any? = null
-        if (isEmpty(bytes)) {
-            return null
-        }
-
-        try {
-            val byteStream = ByteArrayInputStream(bytes)
-            try {
-                val objectInputStream = ObjectInputStream(byteStream)
-                try {
-                    result = objectInputStream.readObject()
-                } catch (ex: ClassNotFoundException) {
-                    throw Exception("Failed to deserialize object type", ex)
-                }
-
-            } catch (ex: Throwable) {
-                throw Exception("Failed to deserialize", ex)
-            }
-
-        } catch (e: Exception) {
-            logger.error("Failed to deserialize", e)
-        }
-        return result
-    }
-
-    private fun isEmpty(data: ByteArray?): Boolean {
-        return data == null || data.isEmpty()
-    }
-
-    /**
-     * serialize
-     * @param object
-     * @return
-     */
-    fun serialize(`object`: Any?): ByteArray? {
-        var result: ByteArray? = null
-        if (`object` == null) {
-            return ByteArray(0)
-        }
-        try {
-            val byteStream = ByteArrayOutputStream(128)
-            try {
-                if (`object` !is Serializable) {
-                    throw IllegalArgumentException(
-                            SerializeUtils::class.java.simpleName + " requires a Serializable payload "
-                                    + "but received an object of type [" + `object`.javaClass.name + "]")
-                }
-                val objectOutputStream = ObjectOutputStream(byteStream)
-                objectOutputStream.writeObject(`object`)
-                objectOutputStream.flush()
-                result = byteStream.toByteArray()
-            } catch (ex: Throwable) {
-                throw Exception("Failed to serialize", ex)
-            }
-        } catch (ex: Exception) {
-            logger.error("Failed to serialize", ex)
-        }
-
-        return result
-    }
-}

zen-api/src/main/kotlin/cn/gygxzc/envir/config/shiro/utils/ShiroRedisUtil.kt

@@ -1,42 +0,0 @@
-package cn.gygxzc.envir.config.shiro.utils
-
-import com.gxzc.zen.common.util.SpringContextHolder
-import org.apache.shiro.session.Session
-import org.apache.shiro.session.mgt.eis.SessionDAO
-
-/**
- * Shiro redis 工具类
- * @author NorthLan
- * @date 2018/5/3
- * @url https://noahlan.com
- */
-object ShiroRedisUtil {
-    private var sessionDAO = SpringContextHolder.getBean(SessionDAO::class.java)
-        get() {
-            if (field == null) {
-                field = SpringContextHolder.getBean(SessionDAO::class.java)
-            }
-            return field
-        }
-
-    fun getActiveSessions(): MutableCollection<Session> {
-        return sessionDAO!!.activeSessions
-    }
-
-    private fun updateSession(session: Session) {
-        sessionDAO!!.update(session)
-    }
-
-    fun removeAllSessionsAttributeKey(key: Any?) {
-        val sessions = getActiveSessions()
-        sessions.forEach { s ->
-            s.setAttribute(key, null)
-            updateSession(s)
-        }
-    }
-
-    fun removeSessionAttributeKey(session: Session, key: Any?) {
-        session.setAttribute(key, null)
-        updateSession(session)
-    }
-}

zen-api/src/main/kotlin/cn/gygxzc/envir/config/shiro/utils/ShiroUtils.java

@@ -1,42 +0,0 @@
-package cn.gygxzc.envir.config.shiro.utils;
-
-import cn.gygxzc.envir.sys.model.SysUser;
-
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.subject.Subject;
-
-/**
- * shiro 工具类
- *
- * @author ruoyi
- */
-public class ShiroUtils {
-
-    public static Subject getSubjct() {
-        return SecurityUtils.getSubject();
-    }
-
-    public static void logout() {
-        getSubjct().logout();
-    }
-
-    public static SysUser getUser() {
-        return (SysUser) getSubjct().getPrincipal();
-    }
-
-    public static Long getUserId() {
-        return getUser().getId();
-    }
-
-    public static String getLoginName() {
-        return getUser().getAccount();
-    }
-
-    public static String getIp() {
-        return getSubjct().getSession().getHost();
-    }
-
-    public static String getSessionId() {
-        return String.valueOf(getSubjct().getSession().getId());
-    }
-}

zen-api/src/main/kotlin/cn/gygxzc/envir/sys/service/ILoginService.kt

@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RequestMethod
 
 /**
  * Created by niantuo on 2018/9/21.
- * 登陆远程调用
+ * 登陆远程调用登陆系统的登录方法
  */
 @FeignClient("sys")
 interface ILoginService {
@@ -20,5 +20,4 @@ interface ILoginService {
     @RequestMapping(method = [RequestMethod.POST], value = ["/auth/v2/login"])
     fun login(@RequestBody dto: LoginDto): ResponseDto
 
-
 }

zen-api/src/main/kotlin/cn/gygxzc/envir/config/shiro/utils/Byte2Hex.kt → zen-api/src/main/kotlin/cn/gygxzc/envir/utils/Byte2Hex.kt

@@ -1,4 +1,4 @@
-package cn.gygxzc.envir.config.shiro.utils
+package cn.gygxzc.envir.utils
 
 import java.util.*
 

zen-api/src/main/kotlin/cn/gygxzc/envir/config/shiro/utils/MD5Salt.kt → zen-api/src/main/kotlin/cn/gygxzc/envir/utils/MD5Salt.kt

@@ -1,4 +1,4 @@
-package cn.gygxzc.envir.config.shiro.utils
+package cn.gygxzc.envir.utils
 
 import org.slf4j.LoggerFactory
 import java.security.MessageDigest

zen-api/src/main/kotlin/com/gxzc/zen/msg/ws/config/WebSocketConfig.kt

@@ -1,43 +0,0 @@
-package com.gxzc.zen.msg.ws.config
-
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
-import org.springframework.context.annotation.Configuration
-import org.springframework.messaging.simp.config.MessageBrokerRegistry
-import org.springframework.web.socket.config.annotation.AbstractWebSocketMessageBrokerConfigurer
-import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker
-import org.springframework.web.socket.config.annotation.StompEndpointRegistry
-
-/**
- * WebSocket 配置
- * @author NorthLan
- * @date 2018/7/30
- * @url https://noahlan.com
- */
-@Configuration
-@EnableWebSocketMessageBroker
-@ConditionalOnProperty(prefix = "ws", name = ["enabled"], havingValue = "true", matchIfMissing = true)
-//@EnableConfigurationProperties(WebSocketProperties::class)
-class WebSocketConfig : AbstractWebSocketMessageBrokerConfigurer() {
-
-    //    @Autowired
-    //    private lateinit var webSocketProperties: WebSocketProperties
-
-    override fun configureMessageBroker(registry: MessageBrokerRegistry) {
-        /**
-         * 客户端需订阅如下地址的消息
-         * 服务端通过 @SendTo 或者使用SimpMessageTemplate来发送消息
-         */
-        registry.enableSimpleBroker("/topic", "/user")
-        /**
-         * 客户端需用如下地址作为前缀发送消息,经由Broker转发
-         */
-        registry.setApplicationDestinationPrefixes("/app", "/web")
-    }
-
-    override fun registerStompEndpoints(registry: StompEndpointRegistry) {
-        /**
-         * 以 /ws 作为 Stomp 端点,对外暴露
-         */
-        registry.addEndpoint("/ws").setAllowedOrigins("*")
-    }
-}

zen-api/src/main/kotlin/com/gxzc/zen/msg/ws/config/WebSocketProperties.kt

@@ -1,12 +0,0 @@
-package com.gxzc.zen.msg.ws.config
-
-/**
- * WebSocket 配置类 暂无用
- * @author NorthLan
- * @date 2018/7/31
- * @url https://noahlan.com
- */
-//@ConfigurationProperties(prefix = "ws")
-open class WebSocketProperties {
-
-}

zen-api/src/main/kotlin/com/gxzc/zen/orm/data/authority/DAHelper.kt

@@ -1,30 +0,0 @@
-package com.gxzc.zen.orm.data.authority
-
-import org.slf4j.LoggerFactory
-
-/**
- * 数据权限辅助类（适用于全局）
- * @author NorthLan
- * @date 2018/7/16
- * @url https://noahlan.com
- */
-object DAHelper {
-    private val log = LoggerFactory.getLogger(DAHelper::class.java)
-
-    /**
-     * 数据权限 线程局部变量
-     */
-    private val LOCAL_DA = ThreadLocal<DataAuthority>()
-
-    fun getDA(): DataAuthority? {
-        return LOCAL_DA.get()
-    }
-
-    fun startDA(dataAuthority: DataAuthority) {
-        LOCAL_DA.set(dataAuthority)
-    }
-
-    fun remove() {
-        LOCAL_DA.remove()
-    }
-}

zen-api/src/main/kotlin/com/gxzc/zen/orm/data/authority/DataAuthority.kt

@@ -1,24 +0,0 @@
-package com.gxzc.zen.orm.data.authority
-
-/**
- * 数据权限 包装类
- * @author NorthLan
- * @date 2018/7/16
- * @url https://noahlan.com
- */
-open class DataAuthority {
-    /**
-     * 是否启用系统 数权
-     */
-    var sysDAEnabled: Boolean = false
-
-    /**
-     * 是否启用业务 数权
-     */
-    var bizDAEnabled: Boolean = false
-
-    /**
-     * 业务数权 需要过滤的createBy
-     */
-    var createByList: String? = null
-}

zen-api/src/main/kotlin/com/gxzc/zen/orm/data/authority/DataAuthorityBuilder.kt

@@ -1,43 +0,0 @@
-package com.gxzc.zen.orm.data.authority
-
-/**
- * 数据权限 构建器
- * @author NorthLan
- * @date 2018/7/25
- * @url https://noahlan.com
- */
-open class DataAuthorityBuilder {
-    private val da: DataAuthority = DataAuthority()
-
-    fun createByList(createByList: String): DataAuthorityBuilder {
-        da.createByList = createByList
-        configBizDA()
-        return this
-    }
-
-    fun createByList(createByList: Collection<String>): DataAuthorityBuilder {
-        da.createByList = createByList.joinToString(",")
-        configBizDA()
-        return this
-    }
-
-    fun systemDA(enabled: Boolean): DataAuthorityBuilder {
-        da.sysDAEnabled = enabled
-        return this
-    }
-
-    fun bizDA(enabled: Boolean): DataAuthorityBuilder {
-        da.bizDAEnabled = enabled
-        return this
-    }
-
-    fun build(): DataAuthority {
-        return da
-    }
-
-    private fun configBizDA() {
-        if (!da.createByList.isNullOrEmpty()) {
-            da.bizDAEnabled = true
-        }
-    }
-}

zen-api/src/main/kotlin/com/gxzc/zen/orm/data/authority/visitor/DataAuthoritySelectVisitor.kt

@@ -1,43 +0,0 @@
-package com.gxzc.zen.orm.data.authority.visitor
-
-import net.sf.jsqlparser.expression.StringValue
-import net.sf.jsqlparser.expression.operators.conditional.AndExpression
-import net.sf.jsqlparser.expression.operators.relational.ExpressionList
-import net.sf.jsqlparser.expression.operators.relational.InExpression
-import net.sf.jsqlparser.schema.Column
-import net.sf.jsqlparser.statement.select.PlainSelect
-import net.sf.jsqlparser.statement.select.SelectVisitor
-import net.sf.jsqlparser.statement.select.SetOperationList
-import net.sf.jsqlparser.statement.select.WithItem
-
-/**
- * 数据权限 Select Visitor (处理sql)
- * @author NorthLan
- * @date 2018/7/9
- * @url https://noahlan.com
- */
-class DataAuthoritySelectVisitor : SelectVisitor {
-
-    override fun visit(plainSelect: PlainSelect) {
-        val inExp = InExpression().apply {
-            this.leftExpression = Column("create_by")
-            this.rightItemsList = ExpressionList(StringValue("admin"), StringValue("haha"))
-        }
-
-        if (plainSelect.where == null) {
-            plainSelect.where = inExp
-        } else {
-            plainSelect.where = AndExpression(plainSelect.where, inExp)
-        }
-    }
-
-    override fun visit(setOpList: SetOperationList) {
-        setOpList.selects.forEach {
-            it.accept(DataAuthoritySelectVisitor())
-        }
-    }
-
-    override fun visit(withItem: WithItem) {
-        withItem.selectBody.accept(DataAuthoritySelectVisitor())
-    }
-}

zen-job/src/main/kotlin/com/gxzc/zen/job/config/XxlJobConfig.kt

@@ -1,58 +0,0 @@
-package com.gxzc.zen.job.config
-
-import com.xxl.job.core.executor.XxlJobExecutor
-import org.mybatis.spring.annotation.MapperScan
-import org.slf4j.LoggerFactory
-import org.springframework.beans.factory.annotation.Value
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
-import org.springframework.context.annotation.Bean
-import org.springframework.context.annotation.Configuration
-
-/**
- *
- * @author NorthLan at 2018/2/8
- */
-@Configuration
-@ConditionalOnProperty(prefix = "xxl.job", name = ["enable"], havingValue = "true", matchIfMissing = true)
-@MapperScan(basePackages = ["com.gxzc.zen.job.jobhandler"])
-class XxlJobConfig {
-    companion object {
-        private val logger = LoggerFactory.getLogger(XxlJobConfig::class.java)
-    }
-
-    @Value("\${xxl.job.admin.address}")
-    private val adminAddress: String? = null
-
-    @Value("\${xxl.job.executor.appname}")
-    private val appName: String? = null
-
-    @Value("\${xxl.job.executor.ip}")
-    private val ip: String? = null
-
-    @Value("\${xxl.job.executor.port}")
-    private val port: Int = 0
-
-    @Value("\${xxl.job.accessToken}")
-    private val accessToken: String? = null
-
-    @Value("\${xxl.job.executor.logpath}")
-    private val logPath: String? = null
-
-    @Value("\${xxl.job.executor.logretentiondays}")
-    private val logRetentionDays: Int = 0
-
-    @Bean(initMethod = "start", destroyMethod = "destroy")
-    fun xxlJobExecutor(): XxlJobExecutor {
-        logger.info(">>>>>>>>>>>> xxl-job executor config init...")
-        return XxlJobExecutor().also {
-            it.setAdminAddresses(adminAddress)
-            it.setAppName(appName)
-            it.setIp(ip)
-            it.setPort(port)
-            it.setAccessToken(accessToken)
-            it.setLogPath(logPath)
-            it.setLogRetentionDays(logRetentionDays)
-//            it.start()
-        }
-    }
-}

zen-job/src/main/kotlin/com/gxzc/zen/job/jobhandler/DemoJobHandler.kt

@@ -1,33 +0,0 @@
-package com.gxzc.zen.job.jobhandler
-
-import com.xxl.job.core.biz.model.ReturnT
-import com.xxl.job.core.handler.IJobHandler
-import com.xxl.job.core.handler.annotation.JobHandler
-import com.xxl.job.core.log.XxlJobLogger
-import org.springframework.stereotype.Component
-import java.util.concurrent.TimeUnit
-
-/**
- * 任务Handler示例（Bean模式）
- *
- * 开发步骤：
- * 1、继承"IJobHandler"：“com.xxl.job.core.handler.IJobHandler”；
- * 2、注册到Spring容器：添加“@Component”注解，被Spring容器扫描为Bean实例；
- * 3、注册到执行器工厂：添加“@JobHandler(value="自定义jobhandler名称")”注解，注解value值对应的是调度中心新建任务的JobHandler属性的值。
- * 4、执行日志：需要通过 "XxlJobLogger.log" 打印执行日志；
- *
- * @author NorthLan at 2018/2/8
- */
-@JobHandler("demoJobHandler")
-@Component
-class DemoJobHandler : IJobHandler() {
-    override fun execute(param: String): ReturnT<String>{
-        XxlJobLogger.log("xxl-job, Hello world!")
-        for (i in 1..5) {
-            XxlJobLogger.log("beat at: $i")
-            TimeUnit.SECONDS.sleep(2)
-        }
-        return SUCCESS
-    }
-
-}

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

@@ -1,26 +1,14 @@
 spring:
   profiles: dev
-  rocketmq:
-    enabled: false
-    name-server-address: 192.168.1.10:9876;192.168.1.11:9876
-    producer-group: zen-archives-group
-    send-msg-timeout: 5000
-    trace-enabled: false
-    vip-channel-enabled: true
+  rabbitmq:
+    addresses: 192.168.1.96
+    port: 5672
 
-ws:
-  enabled: false
 
 ---
 spring:
   profiles: prod
-  rocketmq:
-    enabled: true
-    name-server-address: 192.168.1.10:9876;192.168.1.11:9876
-    producer-group: zen-archives-group
-    send-msg-timeout: 5000
-    trace-enabled: false
-    vip-channel-enabled: true
+  rabbitmq:
+    addresses: 192.168.1.96
+    port: 5672
 
-ws:
-  enabled: false

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

@@ -1,39 +0,0 @@
-spring:
-  profiles: dev
-  session:
-    store-type: redis
-    redis:
-      host: 192.168.1.206
-      port: 6379
-      database: 0
-
-shiro:
-  redis:
-    enable: true
-    database: 1 # redis数据库索引
-    hostName: 192.168.1.206
-    port: 6379
-    password:
-  session:
-    prefix: envir
-    expired: 48h
-
----
-spring:
-  profiles: prod
-  session:
-    store-type: redis
-    redis:
-      host: 192.168.1.206
-      database: 0
-
-shiro:
-  redis:
-    database: 1 # redis数据库索引
-    hostName: 192.168.1.10
-    port: 6379
-    password:
-    timeout: 5000 # 连接超时时间（毫秒）
-  session:
-    prefix: envir
-    expired: 12h

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

@@ -5,9 +5,9 @@ server:
 spring:
   profiles:
     active: dev
-    include: orm,cache,msg,shiro
+    include: orm,cache,msg
   application:
-    name: biz   # 服务名称，改成自己的，名称固定不变，不要随便更改
+    name: framework   # 服务名称，改成自己的，名称固定不变，不要随便更改
   http:
     converters:
       preferred-json-mapper: jackson
@@ -45,10 +45,13 @@ spring:
       discovery:
         enabled: true
         service-id: messager
-
-
-swagger:
-  open: true
+      profile: dev
+  session:
+    store-type: redis
+    redis:
+      host: 192.168.1.206
+      port: 6379
+      database: 0
 
 eureka:
   client:
@@ -56,9 +59,19 @@ eureka:
       defaultZone: http://192.168.1.206:11001/eureka/
     register-with-eureka: true
     fetch-registry: true
+
+swagger:
+  open: true
+
+
 ---
 spring:
   profiles: prod
+  session:
+    store-type: redis
+    redis:
+      host: 192.168.1.206
+      database: 0
 
 server:
   port: 10000 # 生产环境端口号