修改权限rpc，删除不必要文件

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/model/SysMenu.kt

@@ -1,117 +0,0 @@
-package com.gxzc.zen.api.sys.model
-
-import com.baomidou.mybatisplus.annotations.TableName
-import com.gxzc.zen.common.base.BaseModel
-import com.gxzc.zen.common.util.common.TreeNode
-import java.io.Serializable
-
-/**
- * <p>
- * 菜单表
- * </p>
- *
- * @author NorthLan
- * @since 2018-04-28
- */
-@TableName("sys_menu")
-open class SysMenu : BaseModel() {
-    /**
-     * 上级菜单ID(root:0)
-     */
-    var parentId: Long? = null
-    /**
-     * 路径枚举
-     */
-    var path: String? = null
-    /**
-     * 菜单编码
-     */
-    var code: String? = null
-    /**
-     * 菜单类型（0:菜单组；1:菜单；）
-     */
-    var type: Int? = null
-    /**
-     * 菜单标题
-     */
-    var title: String? = null
-    /**
-     * 请求地址（前端）
-     */
-    var uri: String? = null
-    /**
-     * 图标名称
-     */
-    var icon: String? = null
-    /**
-     * 排序号
-     */
-    var sort: Int? = null
-    /**
-     * 扩展字段1
-     */
-    var ext1: String? = null
-    /**
-     * 扩展字段2
-     */
-    var ext2: String? = null
-    /**
-     * 扩展字段3
-     */
-    var ext3: String? = null
-    /**
-     * 扩展字段4
-     */
-    var ext4: String? = null
-    /**
-     * 扩展字段5
-     */
-    var ext5: String? = null
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (other !is SysMenu) return false
-        if (!super.equals(other)) return false
-
-        if (parentId != other.parentId) return false
-        if (path != other.path) return false
-        if (code != other.code) return false
-        if (type != other.type) return false
-        if (title != other.title) return false
-        if (uri != other.uri) return false
-        if (icon != other.icon) return false
-        if (sort != other.sort) return false
-        if (ext1 != other.ext1) return false
-        if (ext2 != other.ext2) return false
-        if (ext3 != other.ext3) return false
-        if (ext4 != other.ext4) return false
-        if (ext5 != other.ext5) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = super.hashCode()
-        result = 31 * result + (parentId?.hashCode() ?: 0)
-        result = 31 * result + (path?.hashCode() ?: 0)
-        result = 31 * result + (code?.hashCode() ?: 0)
-        result = 31 * result + (type ?: 0)
-        result = 31 * result + (title?.hashCode() ?: 0)
-        result = 31 * result + (uri?.hashCode() ?: 0)
-        result = 31 * result + (icon?.hashCode() ?: 0)
-        result = 31 * result + (sort ?: 0)
-        result = 31 * result + (ext1?.hashCode() ?: 0)
-        result = 31 * result + (ext2?.hashCode() ?: 0)
-        result = 31 * result + (ext3?.hashCode() ?: 0)
-        result = 31 * result + (ext4?.hashCode() ?: 0)
-        result = 31 * result + (ext5?.hashCode() ?: 0)
-        return result
-    }
-
-    /////////////////////////////////////////////////
-//    @TableField(exist = false)
-//    var sysResource: SysResource? = null
-    /////////////////////////////////////////////////
-
-
-}

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/model/SysMenuRole.kt

@@ -1,24 +0,0 @@
-package com.gxzc.zen.api.sys.model
-
-import com.baomidou.mybatisplus.annotations.TableName
-import com.gxzc.zen.common.base.BaseModel
-
-/**
- * <p>
- * 用户菜单表
- * </p>
- *
- * @author NorthLan
- * @since 2018-04-28
- */
-@TableName("sys_menu_role")
-open class SysMenuRole : BaseModel() {
-    /**
-     * 菜单ID
-     */
-    var menuId: Long? = null
-    /**
-     * 角色ID
-     */
-    var roleId: Long? = null
-}

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/model/SysResource.kt

@@ -1,72 +0,0 @@
-package com.gxzc.zen.api.sys.model
-
-import com.baomidou.mybatisplus.annotations.TableName
-import com.gxzc.zen.common.base.BaseModel
-
-/**
- * <p>
- * 资源表
- * </p>
- *
- * @author NorthLan
- * @since 2018-04-28
- */
-@TableName("sys_resource")
-open class SysResource : BaseModel() {
-    /**
-     * 上级菜单ID(root:0)
-     */
-    var parentId: Long? = null
-    /**
-     * 关联结构树id
-     */
-    var treeId: Long? = null
-    /**
-     * 资源类型 （1.按钮；2.资源；）
-     */
-    var type: Int? = null
-    /**
-     * 资源编码
-     */
-    var code: String? = null
-    /**
-     * 请求地址（后端）
-     */
-    var uri: String? = null
-    /**
-     * 资源名称
-     */
-    var name: String? = null
-    /**
-     * 路径枚举
-     */
-    var path: String? = null
-    /**
-     * 请求类型
-     */
-    var method: String? = null
-    /**
-     * 描述
-     */
-    var description: String? = null
-    /**
-     * 扩展字段1
-     */
-    var ext1: String? = null
-    /**
-     * 扩展字段2
-     */
-    var ext2: String? = null
-    /**
-     * 扩展字段3
-     */
-    var ext3: String? = null
-    /**
-     * 扩展字段4
-     */
-    var ext4: String? = null
-    /**
-     * 扩展字段5
-     */
-    var ext5: String? = null
-}

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/model/SysResourceRole.kt

@@ -1,24 +0,0 @@
-package com.gxzc.zen.api.sys.model
-
-import com.baomidou.mybatisplus.annotations.TableName
-import com.gxzc.zen.common.base.BaseModel
-
-/**
- * <p>
- * 资源角色表(授权表)
- * </p>
- *
- * @author NorthLan
- * @since 2018-04-28
- */
-@TableName("sys_resource_role")
-open class SysResourceRole : BaseModel() {
-    /**
-     * 角色ID
-     */
-    var roleId: Long? = null
-    /**
-     * 资源ID
-     */
-    var resourceId: Long? = null
-}

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/model/SysResourceTree.kt

@@ -1,32 +0,0 @@
-package com.gxzc.zen.api.sys.model
-
-import com.baomidou.mybatisplus.annotations.TableName
-import com.gxzc.zen.common.base.BaseModel
-
-/**
- * <p>
- * 资源结构树
- * </p>
- *
- * @author NorthLan
- * @since 2018-04-28
- */
-@TableName("sys_resource_tree")
-open class SysResourceTree : BaseModel() {
-    /**
-     * 目录码
-     */
-    var code: String? = null
-    /**
-     * 标签
-     */
-    var label: String? = null
-    /**
-     * 父节点id
-     */
-    var parentId: Long? = null
-    /**
-     * 路径枚举
-     */
-    var path: String? = null
-}

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

@@ -1,19 +1,17 @@
 package com.gxzc.zen.api.sys.service.impl
 
 import com.alibaba.dubbo.config.annotation.Reference
-import com.gxzc.zen.api.sys.model.SysResource
 import com.gxzc.zen.api.sys.model.SysRole
 import com.gxzc.zen.api.sys.service.ISysPermissionService
 import com.gxzc.zen.common.contants.ZenConstants
 import com.gxzc.zen.common.util.RedisCacheUtil
-import com.gxzc.zen.rpc.api.sys.RResourceService
+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 org.apache.shiro.session.Session
-import org.springframework.beans.BeanUtils
 import org.springframework.stereotype.Service
 
 /**
@@ -29,28 +27,18 @@ import org.springframework.stereotype.Service
 class SysPermissionServiceImpl : ISysPermissionService {
 
     @Reference(version = "1.0")
-    private val sysResourceService: RResourceService? = null
+    private val rPermissionService: RPermissionService? = null
 
     @Reference(version = "1.0")
     private val roleService: RRoleService? = null
 
     override fun getAllSysPermission(): MutableList<ZenPermission> {
-        var result = RedisCacheUtil.get(ZenConstants.CACHE_KEY_SYS, "allPerms")?.get() as? MutableList<ZenPermission>
-        if (result == null || result.isEmpty()) {
-            result = mutableListOf()
-            val res = sysResourceService?.selectList(null)
-            res?.forEach {
-                result.add(transResource2ZenPermission(it))
-            }
-        }
-
-//        if (PlatformUtil.getPlatform() == PLATFORM.SYSTEM) {
-        if (result.isNotEmpty()) {
-            RedisCacheUtil.put(ZenConstants.CACHE_KEY_SYS, "allPerms", result)
-//            }
+        // 获取权限
+        var ret = rPermissionService?.getAllPermission()
+        if (ret == null) {
+            ret = mutableListOf()
         }
-
-        return result
+        return ret
     }
 
     override fun getSubjectPermission(): MutableList<ZenPermission> {
@@ -61,8 +49,10 @@ class SysPermissionServiceImpl : ISysPermissionService {
             val roles = getSubjectRoles(session)
             val roleIds = roles.map { it.id!! }
 
-            val resources = sysResourceService?.getResourcesByRoleIds(roleIds)
-            resources?.forEach { result.add(transResource2ZenPermission(it)) }
+            val perms = rPermissionService?.getPermissionByRoleIds(roleIds)
+            if (perms != null && perms.isNotEmpty()) {
+                result.addAll(perms)
+            }
         }
         if (result.isNotEmpty()) {
             session.setAttribute(ZenHttpSession.SESSION_KEY_USER_PERMS, result)
@@ -82,15 +72,6 @@ class SysPermissionServiceImpl : ISysPermissionService {
         return roles
     }
 
-    fun transResource2ZenPermission(source: SysResource): ZenPermission {
-        val temp = ZenPermission()
-        BeanUtils.copyProperties(source, temp)
-        if (!(temp.uri != null && temp.uri!!.startsWith("/"))) {
-            temp.uri = "/${temp.uri}"
-        }
-        return temp
-    }
-
     override fun updateAllSysPermission() {
         RedisCacheUtil.evict(ZenConstants.CACHE_KEY_SYS, "allPerms")
     }

zen-api/src/main/kotlin/com/gxzc/zen/rpc/api/sys/RPermissionService.kt

@@ -0,0 +1,21 @@
+package com.gxzc.zen.rpc.api.sys
+
+import com.gxzc.zen.umps.common.ZenPermission
+
+/**
+ * RPC 权限服务
+ * @author NorthLan
+ * @date 2018/8/11
+ * @url https://noahlan.com
+ */
+interface RPermissionService {
+    /**
+     * 获取所有系统定义的权限
+     */
+    fun getAllPermission(): MutableList<ZenPermission>
+
+    /**
+     * 通过角色id获取相应的权限
+     */
+    fun getPermissionByRoleIds(roleIds: List<Long>): MutableList<ZenPermission>
+}

zen-api/src/main/kotlin/com/gxzc/zen/rpc/api/sys/RResourceService.kt

@@ -1,23 +0,0 @@
-package com.gxzc.zen.rpc.api.sys
-
-import com.baomidou.mybatisplus.mapper.Wrapper
-import com.gxzc.zen.api.sys.model.SysResource
-
-/**
- * 远程 ResourceService (kotlin方面不能使用lateinit注入)
- * @author NorthLan
- * @date 2018/6/20
- * @url https://noahlan.com
- */
-interface RResourceService {
-
-    /**
-     * 获取全部资源列表
-     */
-    fun selectList(wrapper: Wrapper<SysResource>?): MutableList<SysResource>
-
-    /**
-     * 根据id获取资源列表
-     */
-    fun getResourcesByRoleIds(roleIds: List<Long>): MutableList<SysResource>
-}

zen-api/src/main/kotlin/com/gxzc/zen/umps/common/ZenPermission.kt

@@ -46,6 +46,7 @@ open class ZenPermission : Serializable {
      * 简短名称
      */
     var name: String? = null
+
     /**
      * 树ID
      */

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

@@ -16,7 +16,7 @@ spring:
         max-concurrency: 2 # 最大消息监听线程数
     virtual-host: /
 ws:
-  enabled: true
+  enabled: false
 
 ---
 spring:

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

@@ -15,7 +15,7 @@ mybatis-plus:
     cache-enabled: true #配置的缓存的全局开关
     lazyLoadingEnabled: true #延时加载的开关
     multipleResultSetsEnabled: true #延时加载一个属性时会加载该对象全部属性，否则按需加载属性
-    interceptors: com.baomidou.mybatisplus.plugins.OptimisticLockerInterceptor, com.baomidou.mybatisplus.plugins.PaginationInterceptor, com.gxzc.zen.orm.data.authority.interceptor.ZenDataAuthorityInterceptor
+    interceptors: com.baomidou.mybatisplus.plugins.OptimisticLockerInterceptor, com.baomidou.mybatisplus.plugins.PaginationInterceptor #, com.gxzc.zen.orm.data.authority.interceptor.ZenDataAuthorityInterceptor
     # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用
 
 ---