修改一些东西

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

@@ -1,12 +1,13 @@
 package com.gxzc.zen.api.sys.service.impl
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper
-import com.gxzc.zen.api.sys.model.SysPermission
-import com.gxzc.zen.api.sys.mapper.SysPermissionMapper
 import com.baomidou.mybatisplus.service.impl.ServiceImpl
+import com.gxzc.zen.api.sys.mapper.SysPermissionMapper
+import com.gxzc.zen.api.sys.model.SysPermission
 import com.gxzc.zen.api.sys.model.SysRolePermission
-import com.gxzc.zen.api.sys.model.SysUser
-import com.gxzc.zen.api.sys.service.*
+import com.gxzc.zen.api.sys.service.ISysPermissionService
+import com.gxzc.zen.api.sys.service.ISysRolePermissionService
+import com.gxzc.zen.api.sys.service.ISysUserRoleService
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.cache.annotation.Cacheable
 import org.springframework.stereotype.Service
@@ -29,20 +30,20 @@ class SysPermissionServiceImpl : ServiceImpl<SysPermissionMapper, SysPermission>
     @Autowired
     private val rolePermissionService: ISysRolePermissionService? = null
 
-    private fun findRolePermissions(roleId:Long?):MutableList<SysRolePermission>?{
-        val entity=SysRolePermission(roleId,null)
+    private fun findRolePermissions(roleId: Long?): MutableList<SysRolePermission>? {
+        val entity = SysRolePermission(roleId, null)
         return rolePermissionService?.selectList(EntityWrapper(entity))
     }
 
     //任何修改用户角色、角色、权限表都清此缓存
-    @Cacheable(value="setPermissions",key = "#userId")
-    override fun findUserPermissions(userId: Long):HashSet<String> {
+    @Cacheable(value = ["setPermissions"], key = "#userId")
+    override fun findUserPermissions(userId: Long): HashSet<String> {
 //        val user=userService?.selectById(userId)
-        val uroles=userRoleService?.findUserRoles(userId)
-        val perms=LinkedList<SysPermission>()
-        val permissions=HashSet<String>()
-        for(ro in uroles!!)
-            for(per in findRolePermissions(ro.roleId)!!)
+        val uroles = userRoleService?.findUserRoles(userId)
+        val perms = LinkedList<SysPermission>()
+        val permissions = HashSet<String>()
+        for (ro in uroles!!)
+            for (per in findRolePermissions(ro.roleId)!!)
                 perms.add(selectById(per.permissionId))
         for (per in perms)
             permissions.add(per.name!!)

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

@@ -1,5 +1,6 @@
 package com.gxzc.zen.common.util
 
+import org.slf4j.LoggerFactory
 import org.springframework.context.ApplicationContext
 import org.springframework.context.ApplicationContextAware
 import org.springframework.stereotype.Component
@@ -13,6 +14,7 @@ import org.springframework.stereotype.Component
 @Component
 class SpringContextHolder : ApplicationContextAware {
     companion object {
+        private val logger = LoggerFactory.getLogger(SpringContextHolder::class.java)
         private var applicationContext: ApplicationContext? = null
             get() {
                 if (field == null) {
@@ -31,6 +33,10 @@ class SpringContextHolder : ApplicationContextAware {
         }
     }
 
+    init {
+        logger.info("${this::class.java.simpleName} initializing...")
+    }
+
     override fun setApplicationContext(applicationContext: ApplicationContext?) {
         SpringContextHolder.applicationContext = applicationContext
     }

zen-umps/src/main/kotlin/com/gxzc/zen/ump/KissoAuthorization.kt

@@ -6,15 +6,15 @@ import com.gxzc.zen.api.sys.service.ISysPermissionService
 import com.gxzc.zen.common.util.SpringContextHolder
 import org.apache.commons.lang3.StringUtils
 
-class KissoAuthorization:SSOAuthorization {
+class KissoAuthorization : SSOAuthorization {
 
-    private val permissionService=SpringContextHolder.getBean(ISysPermissionService::class.java)
+    private val permissionService = SpringContextHolder.getBean(ISysPermissionService::class.java)
 
     override fun isPermitted(token: SSOToken?, permission: String?): Boolean {
-        if(token==null)return false
-        if(!StringUtils.isNumeric(token.id))return false
-        val pers=permissionService?.findUserPermissions(token?.id?.toLong()!!)
-        if(pers?.contains(permission)!!)return true
+        if (token == null) return false
+        if (!StringUtils.isNumeric(token.id)) return false
+        val pers = permissionService?.findUserPermissions(token.id?.toLong()!!)
+        if (pers?.contains(permission)!!) return true
         return false
     }
 }

zen-umps/src/main/kotlin/com/gxzc/zen/ump/KissoWebAppConfigurer.kt

@@ -8,7 +8,7 @@ import org.springframework.web.servlet.config.annotation.InterceptorRegistry
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
 
 @Configuration
-class KissoWebAppConfigurer: WebMvcConfigurerAdapter() {
+class KissoWebAppConfigurer : WebMvcConfigurerAdapter() {
 
     /*@Bean("KissoInit")
     fun initKisso(){
@@ -20,7 +20,7 @@ class KissoWebAppConfigurer: WebMvcConfigurerAdapter() {
         registry.addInterceptor(SSOSpringInterceptor())
                 .addPathPatterns("/**")
         //权限拦截
-        registry.addInterceptor(SSOPermissionInterceptor().also { it.authorization=KissoAuthorization() })
+        registry.addInterceptor(SSOPermissionInterceptor().also { it.authorization = KissoAuthorization() })
                 .addPathPatterns("/**")
         super.addInterceptors(registry)
     }