dubbo(最简化处理)(不修改身份认证方式,授权方式)

zen-api/build.gradle

@@ -12,6 +12,7 @@ buildscript {
 
 dependencies {
     compile project(":zen-orm")
+    compile project(":zen-rpc")
     compile project(":zen-core")
 }
 

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/mapper/SysDeptMapper.kt

@@ -1,16 +0,0 @@
-package com.gxzc.zen.api.sys.mapper
-
-import com.gxzc.zen.api.sys.model.SysDept
-import com.gxzc.zen.common.base.BaseMapper
-import org.springframework.stereotype.Repository
-
-/**
- * <p>
- * 部门管理 Mapper 接口
- * </p>
- *
- * @author NorthLan
- * @since 2018-04-28
- */
-@Repository
-interface SysDeptMapper : BaseMapper<SysDept>

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/mapper/SysDeptUserMapper.kt

@@ -1,16 +0,0 @@
-package com.gxzc.zen.api.sys.mapper
-
-import com.gxzc.zen.api.sys.model.SysDeptUser
-import com.gxzc.zen.common.base.BaseMapper
-import org.springframework.stereotype.Repository
-
-/**
- * <p>
- * 部门用户表 Mapper 接口
- * </p>
- *
- * @author NorthLan
- * @since 2018-04-28
- */
-@Repository
-interface SysDeptUserMapper : BaseMapper<SysDeptUser>

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/mapper/SysDictTypeMapper.kt

@@ -1,20 +0,0 @@
-package com.gxzc.zen.api.sys.mapper
-
-import com.gxzc.zen.api.sys.model.SysDictType
-import com.gxzc.zen.common.base.BaseMapper
-import org.apache.ibatis.annotations.Param
-import org.springframework.stereotype.Repository
-
-/**
- * <p>
- * 字典结构树 Mapper 接口
- * </p>
- *
- * @author NorthLan
- * @date 2018/5/5
- * @url https://noahlan.com
- */
-@Repository
-interface SysDictTypeMapper : BaseMapper<SysDictType>{
-    fun updatePath(@Param("parentId") parentId: Long, @Param("id") id: Long): Int
-}

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/mapper/SysDictValueMapper.kt

@@ -1,22 +0,0 @@
-package com.gxzc.zen.api.sys.mapper
-
-import com.gxzc.zen.api.sys.model.SysDictValue
-import com.gxzc.zen.common.base.BaseMapper
-import org.apache.ibatis.annotations.Param
-import org.springframework.stereotype.Repository
-
-/**
- * <p>
- * 字典值 Mapper 接口
- * </p>
- *
- * @author NorthLan
- * @date 2018/5/5
- * @url https://noahlan.com
- */
-@Repository
-interface SysDictValueMapper : BaseMapper<SysDictValue> {
-    fun updateDictValueByTypeId(@Param("typeId") typeId: Long,
-                                @Param("oldPrefix") oldPrefix: String,
-                                @Param("newPrefix") newPrefix: String): Int
-}

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/mapper/SysEventLoginMapper.kt

@@ -1,16 +0,0 @@
-package com.gxzc.zen.api.sys.mapper
-
-import com.gxzc.zen.api.sys.model.SysEventLogin
-import com.gxzc.zen.common.base.BaseMapper
-import org.springframework.stereotype.Repository
-
-/**
- * <p>
- * 登录日志表 Mapper 接口
- * </p>
- *
- * @author NorthLan
- * @since 2018-04-28
- */
-@Repository
-interface SysEventLoginMapper : BaseMapper<SysEventLogin>

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/mapper/SysEventOperMapper.kt

@@ -1,16 +0,0 @@
-package com.gxzc.zen.api.sys.mapper
-
-import com.gxzc.zen.api.sys.model.SysEventOper
-import com.gxzc.zen.common.base.BaseMapper
-import org.springframework.stereotype.Repository
-
-/**
- * <p>
- * 操作日志表 Mapper 接口
- * </p>
- *
- * @author NorthLan
- * @since 2018-04-28
- */
-@Repository
-interface SysEventOperMapper : BaseMapper<SysEventOper>

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/mapper/SysMenuMapper.kt

@@ -1,20 +0,0 @@
-package com.gxzc.zen.api.sys.mapper
-
-import com.gxzc.zen.api.sys.model.SysMenu
-import com.gxzc.zen.common.base.BaseMapper
-import org.apache.ibatis.annotations.Param
-import org.springframework.stereotype.Repository
-
-/**
- * <p>
- * 菜单表 Mapper 接口
- * </p>
- *
- * @author NorthLan
- * @since 2018-04-28
- */
-@Repository
-interface SysMenuMapper : BaseMapper<SysMenu> {
-    fun selectByRoleIds(@Param("roleIds") roleIds: List<Long>): MutableList<SysMenu>
-    fun updatePath(@Param("parentId") parentId: Long, @Param("id") id: Long): Int
-}

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/mapper/SysMenuRoleMapper.kt

@@ -1,16 +0,0 @@
-package com.gxzc.zen.api.sys.mapper
-
-import com.gxzc.zen.api.sys.model.SysMenuRole
-import com.gxzc.zen.common.base.BaseMapper
-import org.springframework.stereotype.Repository
-
-/**
- * <p>
- * 用户菜单表 Mapper 接口
- * </p>
- *
- * @author NorthLan
- * @since 2018-04-28
- */
-@Repository
-interface SysMenuRoleMapper : BaseMapper<SysMenuRole>

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/mapper/SysNoticeMapper.kt

@@ -1,16 +0,0 @@
-package com.gxzc.zen.api.sys.mapper
-
-import com.gxzc.zen.api.sys.model.SysNotice
-import com.gxzc.zen.common.base.BaseMapper
-import org.springframework.stereotype.Repository
-
-/**
- * <p>
- * 通知公告表 Mapper 接口
- * </p>
- *
- * @author NorthLan
- * @since 2018-04-28
- */
-@Repository
-interface SysNoticeMapper : BaseMapper<SysNotice>

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/mapper/SysParamMapper.kt

@@ -1,16 +0,0 @@
-package com.gxzc.zen.api.sys.mapper
-
-import com.gxzc.zen.api.sys.model.SysParam
-import com.gxzc.zen.common.base.BaseMapper
-import org.springframework.stereotype.Repository
-
-/**
- * <p>
- * 系统参数表 Mapper 接口
- * </p>
- *
- * @author NorthLan
- * @since 2018-04-28
- */
-@Repository
-interface SysParamMapper : BaseMapper<SysParam>

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/mapper/SysResourceMapper.kt

@@ -1,20 +0,0 @@
-package com.gxzc.zen.api.sys.mapper
-
-import com.gxzc.zen.api.sys.model.SysResource
-import com.gxzc.zen.common.base.BaseMapper
-import org.apache.ibatis.annotations.Param
-import org.springframework.stereotype.Repository
-
-/**
- * <p>
- * 资源表 Mapper 接口
- * </p>
- *
- * @author NorthLan
- * @since 2018-04-28
- */
-@Repository
-interface SysResourceMapper : BaseMapper<SysResource> {
-    fun selectByRoleIds(@Param("roleIds") roleIds: List<Long>): MutableList<SysResource>
-    fun selectByRoleId(@Param("roleId") roleId: Long): MutableList<SysResource>
-}

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/mapper/SysResourceRoleMapper.kt

@@ -1,19 +0,0 @@
-package com.gxzc.zen.api.sys.mapper
-
-import com.gxzc.zen.api.sys.model.SysResourceRole
-import com.gxzc.zen.common.base.BaseMapper
-import org.apache.ibatis.annotations.Param
-import org.springframework.stereotype.Repository
-
-/**
- * <p>
- * 资源角色表(授权表) Mapper 接口
- * </p>
- *
- * @author NorthLan
- * @since 2018-04-28
- */
-@Repository
-interface SysResourceRoleMapper : BaseMapper<SysResourceRole> {
-    fun zenInsertOrUpdateBatch(@Param("list") list: MutableList<SysResourceRole>): Long
-}

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/mapper/SysRoleMapper.kt

@@ -1,19 +0,0 @@
-package com.gxzc.zen.api.sys.mapper
-
-import com.gxzc.zen.api.sys.model.SysRole
-import com.gxzc.zen.common.base.BaseMapper
-import org.apache.ibatis.annotations.Param
-import org.springframework.stereotype.Repository
-
-/**
- * <p>
- * 角色表 Mapper 接口
- * </p>
- *
- * @author NorthLan
- * @since 2018-04-28
- */
-@Repository
-interface SysRoleMapper : BaseMapper<SysRole> {
-    fun selectByUserId(@Param("userId") userId: Long): MutableList<SysRole>
-}

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/mapper/SysUploadInfoMapper.kt

@@ -1,15 +0,0 @@
-package com.gxzc.zen.api.sys.mapper
-
-import com.gxzc.zen.api.sys.model.SysUploadInfo
-import com.gxzc.zen.common.base.BaseMapper
-import org.springframework.stereotype.Repository
-/**
- * <p>
- * 上传文件信息表 Mapper 接口
- * </p>
- *
- * @author NorthLan
- * @since 2018-06-01
- */
-@Repository
-interface SysUploadInfoMapper : BaseMapper<SysUploadInfo>

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/mapper/SysUserMapper.kt

@@ -1,17 +0,0 @@
-package com.gxzc.zen.api.sys.mapper
-
-import com.gxzc.zen.api.sys.model.SysUser
-import com.gxzc.zen.common.base.BaseMapper
-import org.apache.ibatis.annotations.Param
-import org.springframework.stereotype.Repository
-
-/**
- * <p>
- * 用户管理 Mapper 接口
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-06
- */
-@Repository
-interface SysUserMapper : BaseMapper<SysUser>

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/mapper/SysUserRoleMapper.kt

@@ -1,21 +0,0 @@
-package com.gxzc.zen.api.sys.mapper
-
-import com.gxzc.zen.api.sys.model.SysRole
-import com.gxzc.zen.api.sys.model.SysUserRole
-import com.gxzc.zen.common.base.BaseMapper
-import org.apache.ibatis.annotations.Param
-import org.springframework.stereotype.Repository
-
-/**
- * <p>
- * 用户角色表 Mapper 接口
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-06
- */
-@Repository
-interface SysUserRoleMapper : BaseMapper<SysUserRole> {
-    fun selectUserRoleListByUserId(@Param("userId") id: Long): MutableList<SysRole>
-    fun selectUserRoleListByUserIdList(@Param("userIdList") id: Array<Int>): MutableList<SysRole>
-}

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

@@ -1,13 +0,0 @@
-package com.gxzc.zen.api.sys.service
-
-import com.gxzc.zen.api.sys.model.SysDept
-import com.gxzc.zen.common.base.BaseService
-/**
- * <p>
- * 部门管理 服务类
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-06
- */
-interface ISysDeptService : BaseService<SysDept>

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

@@ -1,13 +0,0 @@
-package com.gxzc.zen.api.sys.service
-
-import com.gxzc.zen.api.sys.model.SysDeptUser
-import com.gxzc.zen.common.base.BaseService
-/**
- * <p>
- * 部门用户表 服务类
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-06
- */
-interface ISysDeptUserService : BaseService<SysDeptUser>

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

@@ -1,35 +0,0 @@
-package com.gxzc.zen.api.sys.service
-
-import com.gxzc.zen.api.sys.common.DictTypeTree
-import com.gxzc.zen.api.sys.model.SysDictType
-import com.gxzc.zen.common.base.BaseService
-
-/**
- * <p>
- * 字典结构树 服务类
- * </p>
- *
- * @author NorthLan
- * @since 2018-04-28
- */
-interface ISysDictTypeService : BaseService<SysDictType> {
-    /**
-     * 获取结构树
-     */
-    fun getDictTypeTree(): MutableList<DictTypeTree>
-
-    /**
-     * 创建
-     */
-    fun createDictType(entity: SysDictType): SysDictType
-
-    /**
-     * 更新条目(移动节点除外)
-     */
-    fun updateDictType(entity: SysDictType): SysDictType
-
-    /**
-     * 删除条目(包括所有子节点)
-     */
-    fun deleteDictType(id: Long?)
-}

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

@@ -1,69 +0,0 @@
-package com.gxzc.zen.api.sys.service
-
-import com.gxzc.zen.api.sys.model.SysDictValue
-import com.gxzc.zen.common.base.BaseService
-
-/**
- * <p>
- * 字典值 服务类
- * </p>
- *
- * @author NorthLan
- * @since 2018-04-28
- */
-interface ISysDictValueService : BaseService<SysDictValue> {
-    /**
-     * 初始化 dict value
-     */
-    fun init()
-
-    /**
-     * 获取缓存中所有的 字典值
-     */
-    fun getListCacheable(): MutableList<SysDictValue>
-
-    /**
-     * 删除所有 typeid 指定的字典值
-     */
-    fun deleteByTypeId(typeId: Long)
-
-    /**
-     * 获取所有typeid下的dict-value
-     */
-    fun getListByTypeId(typeId: Long?): MutableList<SysDictValue>
-
-    /**
-     * 插入一条dict-value
-     */
-    fun insertDictValue(entity: SysDictValue): SysDictValue
-
-    /**
-     * 更新一条数据,不包含移动位置
-     */
-    fun updateDictValue(entity: SysDictValue): SysDictValue
-
-    /**
-     * 更新dictValue的code
-     */
-    fun updateDictValueByTypeId(typeId: Long, oldPrefix:String, newPrefix: String)
-
-    /**
-     * 删除一条记录
-     */
-    fun deleteDictValue(id: Long)
-
-    /**
-     * 根据type_code(code前缀)获取字典值列表
-     */
-    fun getDictValueListByTypeCode(typeCode: String): MutableList<SysDictValue>
-
-    /**
-     * 根据code值与value获取指定字典值
-     */
-    fun getDictValueByCodeAndValue(code: String, value: String): SysDictValue?
-
-    /**
-     * 根据code前缀与value获取指定字典值
-     */
-    fun getDictValueByPrefixAndValue(prefix: String, value: String): SysDictValue?
-}

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

@@ -1,13 +0,0 @@
-package com.gxzc.zen.api.sys.service
-
-import com.gxzc.zen.api.sys.model.SysEventLogin
-import com.gxzc.zen.common.base.BaseService
-/**
- * <p>
- * 登录日志表 服务类
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-06
- */
-interface ISysEventLoginService : BaseService<SysEventLogin>

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

@@ -1,13 +0,0 @@
-package com.gxzc.zen.api.sys.service
-
-import com.gxzc.zen.api.sys.model.SysEventOper
-import com.gxzc.zen.common.base.BaseService
-/**
- * <p>
- * 操作日志表 服务类
- * </p>
- *
-* @author NorthLan123
-* @since 2018-02-06
-*/
-interface ISysEventOperService : BaseService<SysEventOper>

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

@@ -1,23 +0,0 @@
-package com.gxzc.zen.api.sys.service
-
-import com.gxzc.zen.api.sys.model.SysMenuRole
-import com.gxzc.zen.common.base.BaseService
-
-/**
- * <p>
- * 用户菜单表 服务类
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-06
- */
-interface ISysMenuRoleService : BaseService<SysMenuRole> {
-    fun removeByMenuId(menuId: Long)
-
-    /**
-     * 通过roleid来获取
-     */
-    fun getMenuIdListByRoleId(roleId: Long): List<Long>
-
-    fun updateMenuRole(roleId: Long, menuIdList: List<Long>)
-}

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

@@ -1,29 +0,0 @@
-package com.gxzc.zen.api.sys.service
-
-import com.gxzc.zen.api.sys.common.MenuTree
-import com.gxzc.zen.api.sys.model.SysMenu
-import com.gxzc.zen.common.base.BaseService
-
-/**
- * <p>
- * 菜单表 服务类
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-06
- */
-interface ISysMenuService : BaseService<SysMenu> {
-    fun getRootTree(): MenuTree?
-
-    fun getUserMenuTree(platformId: Long): MutableList<MenuTree>
-
-    fun getSysMenuList(): MutableList<SysMenu>
-
-    fun getSysMenuTree(): MutableList<MenuTree>
-
-    fun createSysMenu(entity: SysMenu): SysMenu
-
-    fun updateMenu(entity: SysMenu): SysMenu
-
-    fun deleteMenu(entity: SysMenu)
-}

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

@@ -1,13 +0,0 @@
-package com.gxzc.zen.api.sys.service
-
-import com.gxzc.zen.api.sys.model.SysNotice
-import com.gxzc.zen.common.base.BaseService
-/**
- * <p>
- * 通知公告表 服务类
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-06
- */
-interface ISysNoticeService : BaseService<SysNotice>

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

@@ -1,52 +0,0 @@
-package com.gxzc.zen.api.sys.service
-
-import com.gxzc.zen.api.sys.model.SysParam
-import com.gxzc.zen.common.base.BaseService
-
-/**
- * <p>
- * 系统参数表 服务类
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-06
- */
-interface ISysParamService : BaseService<SysParam> {
-    /**
-     * 查询所有列表并存入缓存中(忽略enable)
-     */
-    fun getListCacheable(): MutableList<SysParam>
-
-    /**
-     * 查询所有列表(忽略enable,不缓存)
-     */
-    fun getList(enable: Boolean?): MutableList<SysParam>
-
-    /**
-     * 根据key获取对应的SysDic列表(缓存获取)
-     */
-    fun getListByKey(key: String): MutableList<SysParam>
-
-    /**
-     * 获取一个SysDic,若查询结果大于1个则取第一个(缓存获取)
-     */
-    fun getOneByKey(key: String, value: String?, sort: Int?): SysParam?
-
-    /**
-     * 修改SysDic项
-     * 更新缓存项
-     */
-    fun modify(data: SysParam): SysParam
-
-    /**
-     * 新增字典
-     * 刷新缓存
-     */
-    fun insertCacheable(data: SysParam)
-
-    /**
-     * 物理删除字典项
-     * 刷新缓存
-     */
-    fun physicalDeleteCacheable(id: Long)
-}

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

@@ -1,18 +0,0 @@
-package com.gxzc.zen.api.sys.service
-
-import com.gxzc.zen.api.sys.model.SysResourceRole
-import com.gxzc.zen.common.base.BaseService
-
-/**
- * <p>
- * 资源角色表(授权表) 服务类
- * </p>
- *
- * @author NorthLan
- * @since 2018-04-28
- */
-interface ISysResourceRoleService : BaseService<SysResourceRole> {
-    fun saveResourceRoleByRoleId(roleId: Long, menuId: Long, resList: List<Long>)
-
-    fun physicalDeleteByResourceId(resId: Long)
-}

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

@@ -1,34 +0,0 @@
-package com.gxzc.zen.api.sys.service
-
-import com.gxzc.zen.api.sys.model.SysResource
-import com.gxzc.zen.common.base.BaseService
-
-/**
- * <p>
- * 资源表 服务类
- * </p>
- *
- * @author NorthLan
- * @since 2018-04-28
- */
-interface ISysResourceService : BaseService<SysResource> {
-    /**
-     * 通过role id 列表获取 resource
-     */
-    fun getResourcesByRoleIds(roleIds: List<Long>): MutableList<SysResource>
-
-    /**
-     * 通过role id 获取 resource
-     */
-    fun getResourcesByRoleId(roleId: Long): MutableList<SysResource>
-
-    fun getResourcesByMenuId(menuId: Long): MutableList<SysResource>
-
-    fun insertResource(menuId: Long, sysResource: SysResource): SysResource
-
-    fun updateResource(sysResource: SysResource): SysResource
-
-    fun deleteResourceById(id: Long)
-
-    fun deleteResourcesByMenuId(menuId: Long)
-}

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

@@ -1,33 +0,0 @@
-package com.gxzc.zen.api.sys.service
-
-import com.baomidou.mybatisplus.plugins.Page
-import com.gxzc.zen.api.sys.model.SysRole
-import com.gxzc.zen.common.base.BaseService
-import java.io.Serializable
-
-/**
- * <p>
- * 角色表 服务类
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-06
- */
-interface ISysRoleService : BaseService<SysRole> {
-
-    fun getRoleListByUserId(userId: Long?): MutableList<SysRole>
-
-    /**
-     * 获取角色列表(分页)
-     */
-    fun getRoleListPage(keyword: String?, searchOption: Int?, page: Page<SysRole>, enable: Boolean?): Page<SysRole>
-
-    /**
-     * 获取角色列表
-     */
-    fun getRoleList(keyword: String?, searchOption: Int?, enable: Boolean?): MutableList<SysRole>
-
-    fun physicalDeleteById(id: Serializable)
-
-    fun updateLogicById(entity: SysRole)
-}

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

@@ -1,36 +0,0 @@
-package com.gxzc.zen.api.sys.service
-
-import com.gxzc.zen.api.sys.model.SysUploadInfo
-import com.gxzc.zen.common.base.BaseService
-import com.gxzc.zen.common.dto.ZenFileMetadata
-import java.io.File
-
-/**
- * <p>
- * 上传文件信息表 服务类
- * </p>
- *
- * @author NorthLan
- * @since 2018-06-01
- */
-interface ISysUploadInfoService : BaseService<SysUploadInfo> {
-    /**
-     * 添加文件数据
-     */
-    fun addUploadFile(fileMetadata: ZenFileMetadata, file: File)
-
-    /**
-     * 获取某上传批次所有文件数据
-     */
-    fun getUploadInfosByBatchId(batchId: String): MutableList<SysUploadInfo>
-
-    /**
-     * 通过id获取单条 文件数据
-     */
-    fun getUploadInfoById(id: Long): SysUploadInfo?
-
-    /**
-     * 通过ids获取 文件数据 列表
-     */
-    fun getUploadInfoListByIdList(ids: Collection<Long>): MutableList<SysUploadInfo>
-}

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

@@ -1,40 +0,0 @@
-package com.gxzc.zen.api.sys.service
-
-import com.gxzc.zen.api.sys.model.SysRole
-import com.gxzc.zen.api.sys.model.SysUserRole
-import com.gxzc.zen.common.base.BaseService
-
-/**
- * <p>
- * 用户角色表 服务类
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-06
- */
-interface ISysUserRoleService : BaseService<SysUserRole> {
-    /**
-     * 获取指定用户的角色列表
-     */
-    fun getUserRoleListByUserId(id: Long): MutableList<SysRole>
-
-    /**
-     * 获取指定用户的角色id列表
-     */
-    fun getUserRoleIdListByUserId(id: Long): List<Long>
-
-    /**
-     * 获取指定角色id的用户id列表
-     */
-    fun getUserIdListByRoleId(id: Long): Set<Long>
-
-    /**
-     * 删除某用户的角色关联信息
-     */
-    fun deleteByUserId(userId: Long)
-
-    /**
-     * 更新用户的角色关系
-     */
-    fun updateByUserId(userId: Long, roleIds: List<Long>)
-}

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

@@ -1,79 +0,0 @@
-package com.gxzc.zen.api.sys.service
-
-import com.baomidou.mybatisplus.plugins.Page
-import com.gxzc.zen.api.sys.model.SysUser
-import com.gxzc.zen.common.base.BaseService
-
-/**
- * <p>
- * 用户管理 服务类
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-06
- */
-interface ISysUserService : BaseService<SysUser> {
-
-    fun getUserByAccount(account: String): SysUser?
-
-    /**
-     * 获取用户列表(分页)
-     */
-    fun getUserListPage(keyword: String?, searchOption: Int?, page: Page<SysUser>, enable: Boolean?): Page<SysUser>
-
-    /**
-     * 获取用户列表
-     */
-    fun getUserList(keyword: String?, searchOption: Int?, enable: Boolean?): MutableList<SysUser>
-
-    /**
-     * 注册
-     */
-    fun register(entity: SysUser): SysUser
-
-    /**
-     * 修改用户信息
-     * 如果 entity 中密码不为空 则表示修改密码
-     */
-    fun modify(entity: SysUser): SysUser
-
-    /**
-     * 删除用户
-     * 物理删除
-     */
-    fun delete(id: Long)
-
-//    /**
-//     * 查询用户列表
-//     * 缓存
-//     */
-//    fun getListCacheable(): MutableList<SysUser>
-//
-//    /**
-//     * 通过 id 查询用户
-//     * 缓存
-//     */
-//    fun getUserByIdCacheable(id: Long): SysUser?
-//
-//    /**
-//     * 通过 account 查询用户
-//     * 缓存
-//     */
-//    fun getUserByAccountCacheable(account: String): SysUser?
-//
-//    /**
-//     * 插入并缓存
-//     */
-//    fun insertCacheable(entity: SysUser)
-//
-//    /**
-//     * 修改 并 更新缓存
-//     */
-//    fun modify(entity: SysUser): SysUser
-//
-//    /**
-//     * 物理删除
-//     * 刷新缓存
-//     */
-//    fun physicalDeleteCacheable(id: Long)
-}

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

@@ -1,20 +0,0 @@
-package com.gxzc.zen.api.sys.service.impl
-
-import com.gxzc.zen.api.sys.model.SysDept
-import com.gxzc.zen.api.sys.mapper.SysDeptMapper
-import com.gxzc.zen.api.sys.service.ISysDeptService
-import com.baomidou.mybatisplus.service.impl.ServiceImpl
-import org.springframework.stereotype.Service
-
-/**
- * <p>
- * 部门管理 服务实现类
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-06
- */
-@Service
-class SysDeptServiceImpl : ServiceImpl<SysDeptMapper, SysDept>(), ISysDeptService {
-
-}

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

@@ -1,20 +0,0 @@
-package com.gxzc.zen.api.sys.service.impl
-
-import com.gxzc.zen.api.sys.model.SysDeptUser
-import com.gxzc.zen.api.sys.mapper.SysDeptUserMapper
-import com.gxzc.zen.api.sys.service.ISysDeptUserService
-import com.baomidou.mybatisplus.service.impl.ServiceImpl
-import org.springframework.stereotype.Service
-
-/**
- * <p>
- * 部门用户表 服务实现类
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-06
- */
-@Service
-class SysDeptUserServiceImpl : ServiceImpl<SysDeptUserMapper, SysDeptUser>(), ISysDeptUserService {
-
-}

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

@@ -1,81 +0,0 @@
-package com.gxzc.zen.api.sys.service.impl
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper
-import com.baomidou.mybatisplus.service.impl.ServiceImpl
-import com.gxzc.zen.api.sys.common.DictTypeTree
-import com.gxzc.zen.api.sys.mapper.SysDictTypeMapper
-import com.gxzc.zen.api.sys.model.SysDictType
-import com.gxzc.zen.api.sys.service.ISysDictTypeService
-import com.gxzc.zen.api.sys.service.ISysDictValueService
-import com.gxzc.zen.common.contants.ZenConstants
-import com.gxzc.zen.common.exception.ZenException
-import com.gxzc.zen.common.exception.ZenExceptionEnum
-import com.gxzc.zen.common.util.TreeUtil
-import org.springframework.beans.BeanUtils
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.stereotype.Service
-import org.springframework.transaction.annotation.Transactional
-
-/**
- * <p>
- * 字典结构树 服务实现类
- * </p>
- *
- * @author NorthLan
- * @since 2018-04-28
- */
-@Service
-class SysDictTypeServiceImpl : ServiceImpl<SysDictTypeMapper, SysDictType>(), ISysDictTypeService {
-    @Autowired
-    private lateinit var dictValueService: ISysDictValueService
-
-    private fun getTree(list: List<SysDictType>): MutableList<DictTypeTree> {
-        val result = mutableListOf<DictTypeTree>()
-        list.forEach {
-            val node = DictTypeTree()
-            BeanUtils.copyProperties(it, node)
-            result.add(node)
-        }
-        return TreeUtil.build(result, ZenConstants.TREE_ROOT_PID)
-    }
-
-    override fun getDictTypeTree(): MutableList<DictTypeTree> {
-        return getTree(baseMapper.selectList(null))
-    }
-
-    @Transactional
-    override fun createDictType(entity: SysDictType): SysDictType {
-        // 先新增一条数据 再根据此数据更新对应的path
-        if (baseMapper.insert(entity) <= 0) {
-            throw ZenException(ZenExceptionEnum.BIZ_INSERT_ERROR)
-        }
-        if (baseMapper.updatePath(entity.parentId!!, entity.id!!) <= 0) {
-            throw ZenException(ZenExceptionEnum.BIZ_INSERT_ERROR)
-        }
-        return entity
-    }
-
-    override fun updateDictType(entity: SysDictType): SysDictType {
-        // 先查询原有信息
-        val temp = baseMapper.selectById(entity.id)
-        if (baseMapper.updateById(entity) <= 0) {
-            throw ZenException(ZenExceptionEnum.BIZ_UPDATE_ERROR)
-        }
-        // 同时修改value对应节点的信息
-        dictValueService.updateDictValueByTypeId(entity.id!!, temp.code!!, entity.code!!)
-        return entity
-    }
-
-    @Transactional
-    override fun deleteDictType(id: Long?) {
-        if (id == null) {
-            throw ZenException(ZenExceptionEnum.BIZ_DELETE_ERROR)
-        }
-        // 先查询现有的数据 (path)
-        val stored = baseMapper.selectById(id) ?: throw ZenException(ZenExceptionEnum.BIZ_DELETE_ERROR)
-        if (baseMapper.physicalDelete(EntityWrapper<SysDictType>().like("path", "${stored.path!!}%")) <= 0) {
-            throw ZenException(ZenExceptionEnum.BIZ_DELETE_ERROR)
-        }
-        dictValueService.deleteByTypeId(id)
-    }
-}

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

@@ -1,113 +0,0 @@
-package com.gxzc.zen.api.sys.service.impl
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper
-import com.baomidou.mybatisplus.service.impl.ServiceImpl
-import com.gxzc.zen.api.sys.constants.CacheKeyConstants
-import com.gxzc.zen.api.sys.mapper.SysDictValueMapper
-import com.gxzc.zen.api.sys.model.SysDictValue
-import com.gxzc.zen.api.sys.service.ISysDictValueService
-import com.gxzc.zen.common.contants.ZenConstants
-import com.gxzc.zen.common.exception.ZenException
-import com.gxzc.zen.common.exception.ZenExceptionEnum
-import com.gxzc.zen.common.util.RedisCacheUtil
-import org.springframework.stereotype.Service
-
-/**
- * <p>
- * 字典值 服务实现类
- * </p>
- *
- * @author NorthLan
- * @since 2018-04-28
- */
-@Suppress("UNCHECKED_CAST")
-@Service
-class SysDictValueServiceImpl : ServiceImpl<SysDictValueMapper, SysDictValue>(), ISysDictValueService {
-
-    override fun init() {
-        getListCacheable()
-    }
-
-    override fun getListCacheable(): MutableList<SysDictValue> {
-        var data = RedisCacheUtil.get(ZenConstants.CACHE_KEY_SYS, CacheKeyConstants.DICT_VALUE_KEY) as? MutableList<SysDictValue>
-        if (data == null || data.isEmpty()) {
-            data = baseMapper.selectWOLogic(EntityWrapper<SysDictValue>().orderBy("sort"))
-            RedisCacheUtil.put(ZenConstants.CACHE_KEY_SYS, CacheKeyConstants.DICT_VALUE_KEY, data)
-        }
-        return data
-    }
-
-    override fun deleteByTypeId(typeId: Long) {
-        val condition = SysDictValue().apply {
-            this.typeId = typeId
-        }
-        baseMapper.physicalDelete(EntityWrapper(condition))
-        // 刷新缓存
-        evictCache()
-    }
-
-    override fun insertDictValue(entity: SysDictValue): SysDictValue {
-        if (baseMapper.insert(entity) <= 0) {
-            throw ZenException(ZenExceptionEnum.BIZ_INSERT_ERROR)
-        }
-        // 刷新缓存
-        evictCache()
-        return entity
-    }
-
-    override fun getListByTypeId(typeId: Long?): MutableList<SysDictValue> {
-        if (typeId == null) {
-            return mutableListOf()
-        }
-        val cachedList = getListCacheable()
-        return cachedList.filter {
-            it.typeId == typeId
-        }.toMutableList()
-    }
-
-    override fun updateDictValue(entity: SysDictValue): SysDictValue {
-        if (entity.id == null) {
-            throw ZenException(ZenExceptionEnum.BIZ_UPDATE_ERROR)
-        }
-        baseMapper.updateWOLogic(entity, EntityWrapper<SysDictValue>().eq("id", entity.id))
-        // 刷新缓存
-        evictCache()
-        return entity
-    }
-
-    override fun updateDictValueByTypeId(typeId: Long, oldPrefix: String, newPrefix: String) {
-        baseMapper.updateDictValueByTypeId(typeId, oldPrefix, newPrefix)
-        evictCache()
-    }
-
-    override fun deleteDictValue(id: Long) {
-        baseMapper.physicalDeleteById(id)
-        // 刷新缓存
-        evictCache()
-    }
-
-    override fun getDictValueListByTypeCode(typeCode: String): MutableList<SysDictValue> {
-        val cachedList = getListCacheable()
-        return cachedList.filter {
-            it.code!!.startsWith("${typeCode}_")
-        }.toMutableList()
-    }
-
-    override fun getDictValueByCodeAndValue(code: String, value: String): SysDictValue? {
-        val cachedList = getListCacheable()
-        return cachedList.find {
-            it.code == code && it.value == value
-        }
-    }
-
-    override fun getDictValueByPrefixAndValue(prefix: String, value: String): SysDictValue? {
-        val cachedList = getListCacheable()
-        return cachedList.find {
-            it.code!!.startsWith("${prefix}_") && it.value == value
-        }
-    }
-
-    private fun evictCache() {
-        RedisCacheUtil.evict(ZenConstants.CACHE_KEY_SYS, CacheKeyConstants.DICT_VALUE_KEY)
-    }
-}

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

@@ -1,20 +0,0 @@
-package com.gxzc.zen.api.sys.service.impl
-
-import com.gxzc.zen.api.sys.model.SysEventLogin
-import com.gxzc.zen.api.sys.mapper.SysEventLoginMapper
-import com.gxzc.zen.api.sys.service.ISysEventLoginService
-import com.baomidou.mybatisplus.service.impl.ServiceImpl
-import org.springframework.stereotype.Service
-
-/**
- * <p>
- * 登录日志表 服务实现类
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-06
- */
-@Service
-class SysEventLoginServiceImpl : ServiceImpl<SysEventLoginMapper, SysEventLogin>(), ISysEventLoginService {
-
-}

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

@@ -1,20 +0,0 @@
-package com.gxzc.zen.api.sys.service.impl
-
-import com.gxzc.zen.api.sys.model.SysEventOper
-import com.gxzc.zen.api.sys.mapper.SysEventOperMapper
-import com.gxzc.zen.api.sys.service.ISysEventOperService
-import com.baomidou.mybatisplus.service.impl.ServiceImpl
-import org.springframework.stereotype.Service
-
-/**
- * <p>
- * 操作日志表 服务实现类
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-06
- */
-@Service
-class SysEventOperServiceImpl : ServiceImpl<SysEventOperMapper, SysEventOper>(), ISysEventOperService {
-
-}

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

@@ -1,70 +0,0 @@
-package com.gxzc.zen.api.sys.service.impl
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper
-import com.baomidou.mybatisplus.service.impl.ServiceImpl
-import com.gxzc.zen.api.sys.mapper.SysMenuRoleMapper
-import com.gxzc.zen.api.sys.model.SysMenuRole
-import com.gxzc.zen.api.sys.service.ISysMenuRoleService
-import com.gxzc.zen.umps.constant.ZenHttpSession
-import com.gxzc.zen.umps.util.ShiroRedisUtil
-import org.springframework.stereotype.Service
-import org.springframework.transaction.annotation.Transactional
-
-/**
- * <p>
- * 用户菜单表 服务实现类
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-06
- */
-@Service
-class SysMenuRoleServiceImpl : ServiceImpl<SysMenuRoleMapper, SysMenuRole>(), ISysMenuRoleService {
-    override fun removeByMenuId(menuId: Long) {
-        val condition = SysMenuRole().apply {
-            this.menuId = menuId
-        }
-        baseMapper.physicalDelete(EntityWrapper(condition))
-    }
-
-    override fun getMenuIdListByRoleId(roleId: Long): List<Long> {
-        val condition = SysMenuRole().apply {
-            this.roleId = roleId
-        }
-        return baseMapper.selectWOLogic(EntityWrapper(condition)).map {
-            it.menuId!!
-        }
-    }
-
-    @Transactional
-    override fun updateMenuRole(roleId: Long, menuIdList: List<Long>) {
-        // 先获取roleid的所有menuid
-        val oldMenuIdList = getMenuIdListByRoleId(roleId)
-        val deleteIds = oldMenuIdList.subtract(menuIdList)
-        val insertIds = menuIdList.subtract(oldMenuIdList)
-
-        var eff = false
-        if (deleteIds.isNotEmpty()) {
-            baseMapper.physicalDelete(EntityWrapper<SysMenuRole>().eq("role_id", roleId).`in`("menu_id", deleteIds))
-            eff = true
-        }
-
-        if (insertIds.isNotEmpty()) {
-            val entityList = mutableListOf<SysMenuRole>()
-            insertIds.forEach {
-                entityList.add(SysMenuRole().apply {
-                    this.roleId = roleId
-                    this.menuId = it
-                })
-            }
-            this.insertBatch(entityList)
-            eff = true
-        }
-
-        if (eff) {
-            // 更新一下缓存SESSION_KEY_USER_MENU
-            ShiroRedisUtil.removeAllSessionsAttributeKey(ZenHttpSession.SESSION_KEY_USER_MENU)
-        }
-    }
-
-}

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

@@ -1,152 +0,0 @@
-package com.gxzc.zen.api.sys.service.impl
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper
-import com.baomidou.mybatisplus.service.impl.ServiceImpl
-import com.gxzc.zen.api.sys.common.MenuTree
-import com.gxzc.zen.api.sys.mapper.SysMenuMapper
-import com.gxzc.zen.api.sys.model.SysMenu
-import com.gxzc.zen.api.sys.service.ISysMenuRoleService
-import com.gxzc.zen.api.sys.service.ISysMenuService
-import com.gxzc.zen.common.contants.ZenConstants
-import com.gxzc.zen.common.exception.ZenException
-import com.gxzc.zen.common.exception.ZenExceptionEnum
-import com.gxzc.zen.common.util.TreeUtil
-import com.gxzc.zen.umps.constant.ZenHttpSession
-import com.gxzc.zen.umps.util.SSOUtil
-import com.gxzc.zen.umps.util.ShiroRedisUtil
-import org.springframework.beans.BeanUtils
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.stereotype.Service
-import org.springframework.transaction.annotation.Transactional
-
-/**
- * <p>
- * 菜单表 服务实现类
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-06
- */
-@Service
-class SysMenuServiceImpl : ServiceImpl<SysMenuMapper, SysMenu>(), ISysMenuService {
-    @Autowired
-    private lateinit var menuRoleService: ISysMenuRoleService
-
-    private fun getTree(data: List<SysMenu>): MutableList<MenuTree> {
-        val nodes = mutableListOf<MenuTree>()
-        data.forEach {
-            val node = MenuTree()
-            BeanUtils.copyProperties(it, node)
-            nodes.add(node)
-        }
-        return TreeUtil.build(nodes, ZenConstants.TREE_ROOT_PID)
-    }
-
-    override fun getRootTree(): MenuTree? {
-        val ret = getTree(baseMapper.selectList(null))
-        return if (ret.isEmpty()) null else ret[0]
-    }
-
-    private fun getUserMenuTree(resourceMenuIds: List<Long>?, roleIds: List<Long>?): MutableList<MenuTree> {
-        // 获取所有权限菜单
-        val distinctMenu = hashSetOf<SysMenu>().apply {
-            if (resourceMenuIds != null && resourceMenuIds.isNotEmpty()) {
-                addAll(baseMapper.selectBatchIds(resourceMenuIds))
-            }
-            if (roleIds != null && roleIds.isNotEmpty()) {
-                addAll(baseMapper.selectByRoleIds(roleIds))
-            }
-        }
-        // 获取权限菜单的所有父节点以便于组合成树
-        val parentsIds = mutableSetOf<String>()
-        distinctMenu.forEach {
-            if (!it.path.isNullOrEmpty()) {
-                val paths = it.path!!.split(ZenConstants.TREE_PATH_SEPARATOR)
-                parentsIds.addAll(paths.subList(0, paths.size - 1)) // 不添加自身
-            }
-        }
-        if (parentsIds.isNotEmpty()) {
-            distinctMenu.addAll(baseMapper.selectBatchIds(parentsIds))
-        }
-        return getTree(distinctMenu.toList())
-    }
-
-    override fun getUserMenuTree(platformId: Long): MutableList<MenuTree> {
-        var menu = SSOUtil.getCurUserMenuTree()
-        if (menu == null || menu.isEmpty()) {
-            val res = SSOUtil.getCurUserPerms()?.map { it.menuId!! }
-            val roleIds = SSOUtil.getCurUserRoles()?.map { it.id!! }
-            menu = getUserMenuTree(res, roleIds)
-            if (menu.isNotEmpty()) {
-                // 所有需要修改
-                SSOUtil.setAttribute(ZenHttpSession.SESSION_KEY_USER_MENU, menu)
-            } else {
-                return mutableListOf()
-            }
-        }
-        // 根据平台id取出对应平台的菜单列表
-        // 此处使用广度优先遍历会快一些 因为主要过滤都在第二层树
-        menu = TreeUtil.findBFS(menu) {
-            it.ext1 != null && it.ext1 == platformId.toString()
-        }
-        if (menu.isNotEmpty()) {
-            val root = menu[0]
-            if (root.children != null && root.children!!.isNotEmpty()) {
-                menu = mutableListOf()
-                root.children?.forEach {
-                    menu.add(it as MenuTree)
-                }
-            }
-        }
-        // 排序
-        menu.forEach {
-            it.sortChildren(null)
-        }
-        return menu
-    }
-
-    override fun getSysMenuList(): MutableList<SysMenu> {
-        return baseMapper.selectList(null)
-    }
-
-    override fun getSysMenuTree(): MutableList<MenuTree> {
-        return getTree(getSysMenuList().toList())
-    }
-
-    @Transactional
-    override fun createSysMenu(entity: SysMenu): SysMenu {
-        // 先新增一条数据 再根据此数据更新对应的path
-        if (baseMapper.insert(entity) <= 0) {
-            throw ZenException(ZenExceptionEnum.BIZ_INSERT_ERROR)
-        }
-        if (baseMapper.updatePath(entity.parentId!!, entity.id!!) <= 0) {
-            throw ZenException(ZenExceptionEnum.BIZ_INSERT_ERROR)
-        }
-        return entity
-    }
-
-    override fun updateMenu(entity: SysMenu): SysMenu {
-        if (baseMapper.updateById(entity) <= 0) {
-            throw ZenException(ZenExceptionEnum.BIZ_UPDATE_ERROR)
-        }
-        ShiroRedisUtil.removeAllSessionsAttributeKey(ZenHttpSession.SESSION_KEY_USER_MENU)
-        return entity
-    }
-
-    @Transactional
-    override fun deleteMenu(entity: SysMenu) {
-        if (entity.id == null) {
-            throw ZenException(ZenExceptionEnum.BIZ_DELETE_ERROR)
-        }
-        // 先查询现有的数据 (path)
-        val stored = baseMapper.selectById(entity.id) ?: throw ZenException(ZenExceptionEnum.BIZ_DELETE_ERROR)
-//        val endPath = stored.path?.substring(0, stored.path!!.length - 1) + (stored.id!! + 1)
-        if (baseMapper.physicalDelete(EntityWrapper<SysMenu>().like("path", "${stored.path!!}%")) <= 0) {
-            throw ZenException(ZenExceptionEnum.BIZ_DELETE_ERROR)
-        }
-        // 删除menu对应的 menu_role 表相关信息
-        menuRoleService.removeByMenuId(stored.id!!)
-        // 
-        ShiroRedisUtil.removeAllSessionsAttributeKey(ZenHttpSession.SESSION_KEY_USER_MENU)
-    }
-}

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

@@ -1,20 +0,0 @@
-package com.gxzc.zen.api.sys.service.impl
-
-import com.gxzc.zen.api.sys.model.SysNotice
-import com.gxzc.zen.api.sys.mapper.SysNoticeMapper
-import com.gxzc.zen.api.sys.service.ISysNoticeService
-import com.baomidou.mybatisplus.service.impl.ServiceImpl
-import org.springframework.stereotype.Service
-
-/**
- * <p>
- * 通知公告表 服务实现类
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-06
- */
-@Service
-class SysNoticeServiceImpl : ServiceImpl<SysNoticeMapper, SysNotice>(), ISysNoticeService {
-
-}

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

@@ -1,139 +0,0 @@
-package com.gxzc.zen.api.sys.service.impl
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper
-import com.baomidou.mybatisplus.service.impl.ServiceImpl
-import com.gxzc.zen.api.sys.mapper.SysParamMapper
-import com.gxzc.zen.api.sys.model.SysParam
-import com.gxzc.zen.api.sys.service.ISysParamService
-import com.gxzc.zen.common.contants.PLATFORM
-import com.gxzc.zen.common.contants.ZenConstants
-import com.gxzc.zen.common.exception.ZenException
-import com.gxzc.zen.common.exception.ZenExceptionEnum
-import com.gxzc.zen.common.properties.PlatformProperties
-import com.gxzc.zen.common.util.PlatformUtil
-import com.gxzc.zen.common.util.RedisCacheUtil
-import org.slf4j.LoggerFactory
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.CommandLineRunner
-import org.springframework.stereotype.Service
-import org.springframework.transaction.annotation.Transactional
-
-/**
- * <p>
- * 系统参数表 服务实现类
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-06
- */
-@Suppress("UNCHECKED_CAST")
-@Service
-class SysParamServiceImpl : ServiceImpl<SysParamMapper, SysParam>(), ISysParamService, CommandLineRunner {
-    companion object {
-        private val logger = LoggerFactory.getLogger(SysParamServiceImpl::class.java)
-        const val CACHE_KEY_ALL = "param_all"
-    }
-
-    @Autowired
-    private lateinit var platformProperties: PlatformProperties
-
-    override fun run(vararg args: String?) {
-        logger.debug("${this::class.simpleName} init.")
-        getListCacheable()
-    }
-
-    override fun getListCacheable(): MutableList<SysParam> {
-        val cached = RedisCacheUtil.get(ZenConstants.CACHE_KEY_SYS, CACHE_KEY_ALL)?.get() as? MutableList<SysParam>
-        if (cached != null) {
-            return cached
-        }
-        val ret = baseMapper.selectWOLogic(null)
-        if (PlatformUtil.getPlatform(platformProperties) == PLATFORM.SYSTEM) {
-            RedisCacheUtil.put(ZenConstants.CACHE_KEY_SYS, CACHE_KEY_ALL, ret)
-        }
-        return ret
-    }
-
-    override fun getList(enable: Boolean?): MutableList<SysParam> {
-        return if (enable != null) {
-            baseMapper.selectWOLogic(EntityWrapper<SysParam>().eq("enable", enable))
-        } else {
-            baseMapper.selectWOLogic(null)
-        }
-    }
-
-    override fun getListByKey(key: String): MutableList<SysParam> {
-        val allData = getListCacheable()
-        return allData.filter {
-            it.enable != null && it.enable!! && it.key == key
-        }.toMutableList()
-    }
-
-    @Transactional
-    override fun modify(data: SysParam): SysParam {
-        if (PlatformUtil.getPlatform() == PLATFORM.SYSTEM) {
-            baseMapper.updateWOLogic(data, EntityWrapper<SysParam>().eq("id", data.id))
-            // 更新缓存
-            val cached = RedisCacheUtil.get(ZenConstants.CACHE_KEY_SYS, CACHE_KEY_ALL)?.get() as? MutableList<SysParam>
-            cached?.let {
-                val idx = it.indexOfFirst { it.id == data.id }
-                if (idx != -1) {
-                    it[idx] = data
-                }
-                RedisCacheUtil.put(ZenConstants.CACHE_KEY_SYS, CACHE_KEY_ALL, it)
-            }
-        }
-        return data
-    }
-
-    override fun getOneByKey(key: String, value: String?, sort: Int?): SysParam? {
-        val result = baseMapper.selectWOLogic(EntityWrapper<SysParam>().apply {
-            eq("key", key)
-            if (value.isNullOrEmpty()) {
-                eq("value", value!!)
-            }
-            if (sort != null) {
-                eq("sort", sort)
-            }
-            eq("enable", true)
-        })
-        return if (result.size > 0) {
-            result.filter {
-                it.sort == sort && it.value == value
-            }[0]
-        } else {
-            null
-        }
-    }
-
-    @Transactional
-    override fun insertCacheable(data: SysParam) {
-        if (PlatformUtil.getPlatform() == PLATFORM.SYSTEM) {
-            if (baseMapper.insert(data) == 0) {
-                throw ZenException(ZenExceptionEnum.BIZ_INSERT_ERROR)
-            }
-            val cached = RedisCacheUtil.get(ZenConstants.CACHE_KEY_SYS, CACHE_KEY_ALL)?.get() as? MutableList<SysParam>
-            cached?.let {
-                it.add(data)
-                RedisCacheUtil.put(ZenConstants.CACHE_KEY_SYS, CACHE_KEY_ALL, it)
-            }
-        }
-    }
-
-    @Transactional
-    override fun physicalDeleteCacheable(id: Long) {
-        if (PlatformUtil.getPlatform() == PLATFORM.SYSTEM) {
-            if (baseMapper.physicalDelete(EntityWrapper<SysParam>().eq("id", id)) <= 0) {
-                throw ZenException(ZenExceptionEnum.BIZ_DELETE_ERROR)
-            }
-            //
-            val cached = RedisCacheUtil.get(ZenConstants.CACHE_KEY_SYS, CACHE_KEY_ALL)?.get() as? MutableList<SysParam>
-            cached?.let {
-                it.removeIf {
-                    it.id == id
-                }
-                RedisCacheUtil.put(ZenConstants.CACHE_KEY_SYS, CACHE_KEY_ALL, it)
-            }
-        }
-    }
-}

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

@@ -1,19 +1,19 @@
 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.api.sys.service.ISysResourceService
-import com.gxzc.zen.api.sys.service.ISysRoleService
 import com.gxzc.zen.common.contants.ZenConstants
 import com.gxzc.zen.common.util.RedisCacheUtil
+import com.gxzc.zen.rpc.api.RResourceService
+import com.gxzc.zen.rpc.api.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.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Service
 
 /**
@@ -27,17 +27,18 @@ import org.springframework.stereotype.Service
 @Service
 @Suppress("UNCHECKED_CAST")
 class SysPermissionServiceImpl : ISysPermissionService {
-    @Autowired
-    private lateinit var sysResourceService: ISysResourceService
 
-    @Autowired
-    private lateinit var roleService: ISysRoleService
+    @Reference(application = "zen-sys", version = "1.0")
+    private val sysResourceService: RResourceService? = null
+
+    @Reference(application = "zen-sys", 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)
+            val res = sysResourceService?.selectList(null)
             res?.forEach {
                 result.add(transResource2ZenPermission(it))
             }
@@ -60,8 +61,8 @@ 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 resources = sysResourceService?.getResourcesByRoleIds(roleIds)
+            resources?.forEach { result.add(transResource2ZenPermission(it)) }
         }
         if (result.isNotEmpty()) {
             session.setAttribute(ZenHttpSession.SESSION_KEY_USER_PERMS, result)
@@ -75,7 +76,7 @@ class SysPermissionServiceImpl : ISysPermissionService {
         // session中没有怎么办?
         if (roles == null || roles.isEmpty()) {
             // DB中取出来
-            roles = roleService.getRoleListByUserId(session.getAttribute(ZenHttpSession.SESSION_KEY_USER_ID) as? Long)
+            roles = roleService!!.getRoleListByUserId(session.getAttribute(ZenHttpSession.SESSION_KEY_USER_ID) as? Long)
             session.setAttribute(ZenHttpSession.SESSION_KEY_USER_ROLES, roles)
         }
         return roles

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

@@ -1,68 +0,0 @@
-package com.gxzc.zen.api.sys.service.impl
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper
-import com.baomidou.mybatisplus.service.impl.ServiceImpl
-import com.gxzc.zen.api.sys.mapper.SysResourceRoleMapper
-import com.gxzc.zen.api.sys.model.SysResourceRole
-import com.gxzc.zen.api.sys.service.ISysResourceRoleService
-import com.gxzc.zen.api.sys.service.ISysResourceService
-import com.gxzc.zen.umps.constant.ZenHttpSession
-import com.gxzc.zen.umps.util.ShiroRedisUtil
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.stereotype.Service
-import org.springframework.transaction.annotation.Transactional
-
-/**
- * <p>
- * 资源角色表(授权表) 服务实现类
- * </p>
- *
- * @author NorthLan
- * @since 2018-04-28
- */
-@Service
-class SysResourceRoleServiceImpl : ServiceImpl<SysResourceRoleMapper, SysResourceRole>(), ISysResourceRoleService {
-    @Autowired
-    private lateinit var sysResourceService: ISysResourceService
-
-    @Transactional
-    override fun saveResourceRoleByRoleId(roleId: Long, menuId: Long, resList: List<Long>) {
-        // 先获取roleid下的所有对应menuId下的所有resid
-        val menuResIdList = sysResourceService.getResourcesByMenuId(menuId).map { it.id!! }
-        val ret = baseMapper.selectList(EntityWrapper<SysResourceRole>()
-                .eq("role_id", roleId)
-                .`in`("resource_id", menuResIdList)).map { it.resourceId!! }
-        //
-        val deleteIds = ret.subtract(resList)
-        val insertIds = resList.subtract(ret)
-
-        var eff = false
-        if (deleteIds.isNotEmpty()) {
-            // 删除啊 批量啊
-            baseMapper.physicalDelete(EntityWrapper<SysResourceRole>().eq("role_id", roleId).`in`("resource_id", deleteIds))
-            eff = true
-        }
-        //
-        if (insertIds.isNotEmpty()) {
-            val entityList = mutableListOf<SysResourceRole>()
-            insertIds.forEach {
-                entityList.add(SysResourceRole().apply {
-                    this.resourceId = it
-                    this.roleId = roleId
-                })
-            }
-            this.insertBatch(entityList)
-            eff = true
-        }
-
-        if (eff) {
-            // 需要更新一下缓存
-            ShiroRedisUtil.removeAllSessionsAttributeKey(ZenHttpSession.SESSION_KEY_USER_PERMS)
-        }
-    }
-
-    override fun physicalDeleteByResourceId(resId: Long) {
-        baseMapper.physicalDelete(EntityWrapper<SysResourceRole>().eq("resource_id", resId))
-    }
-
-}

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

@@ -1,89 +0,0 @@
-package com.gxzc.zen.api.sys.service.impl
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper
-import com.baomidou.mybatisplus.service.impl.ServiceImpl
-import com.gxzc.zen.api.sys.mapper.SysResourceMapper
-import com.gxzc.zen.api.sys.model.SysResource
-import com.gxzc.zen.api.sys.service.ISysPermissionService
-import com.gxzc.zen.api.sys.service.ISysResourceRoleService
-import com.gxzc.zen.api.sys.service.ISysResourceService
-import com.gxzc.zen.common.exception.ZenException
-import com.gxzc.zen.common.exception.ZenExceptionEnum
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.stereotype.Service
-import org.springframework.transaction.annotation.Transactional
-
-/**
- * <p>
- * 资源表 服务实现类
- * </p>
- *
- * @author NorthLan
- * @since 2018-04-28
- */
-@Service
-class SysResourceServiceImpl : ServiceImpl<SysResourceMapper, SysResource>(), ISysResourceService {
-    @Autowired
-    private lateinit var permissionService: ISysPermissionService
-
-    @Autowired
-    private lateinit var resourceRoleService: ISysResourceRoleService
-
-    override fun getResourcesByRoleIds(roleIds: List<Long>): MutableList<SysResource> {
-        return baseMapper.selectByRoleIds(roleIds)
-    }
-
-    override fun getResourcesByRoleId(roleId: Long): MutableList<SysResource> {
-        return baseMapper.selectByRoleId(roleId)
-    }
-
-    override fun getResourcesByMenuId(menuId: Long): MutableList<SysResource> {
-        val condition = SysResource().apply {
-            this.menuId = menuId
-        }
-        return baseMapper.selectList(EntityWrapper(condition))
-    }
-
-    override fun insertResource(menuId: Long, sysResource: SysResource): SysResource {
-        sysResource.menuId = menuId
-        if (baseMapper.insert(sysResource) <= 0) {
-            throw ZenException(ZenExceptionEnum.BIZ_INSERT_ERROR)
-        }
-
-        permissionService.updateAllSysPermission()
-
-        return sysResource
-    }
-
-    override fun updateResource(sysResource: SysResource): SysResource {
-        if (baseMapper.updateById(sysResource) <= 0) {
-            throw ZenException(ZenExceptionEnum.BIZ_INSERT_ERROR)
-        }
-
-        /////
-        permissionService.updateAllSysPermission()
-        permissionService.updateAllSessionPermission()
-
-        return sysResource
-    }
-
-    @Transactional
-    override fun deleteResourceById(id: Long) {
-        baseMapper.physicalDeleteById(id)
-        // 还要同时删掉 sys_resource_role 对应id的记录
-        resourceRoleService.physicalDeleteByResourceId(id)
-        ////
-        permissionService.updateAllSysPermission()
-        permissionService.updateAllSessionPermission()
-    }
-
-    override fun deleteResourcesByMenuId(menuId: Long) {
-        val condition = SysResource().apply {
-            this.menuId = menuId
-        }
-        baseMapper.physicalDelete(EntityWrapper(condition))
-        ////
-        permissionService.updateAllSysPermission()
-        permissionService.updateAllSessionPermission()
-    }
-}

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

@@ -1,93 +0,0 @@
-package com.gxzc.zen.api.sys.service.impl
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper
-import com.baomidou.mybatisplus.plugins.Page
-import com.baomidou.mybatisplus.service.impl.ServiceImpl
-import com.gxzc.zen.api.sys.mapper.SysRoleMapper
-import com.gxzc.zen.api.sys.model.SysRole
-import com.gxzc.zen.api.sys.service.ISysRoleService
-import com.gxzc.zen.common.exception.ZenException
-import com.gxzc.zen.common.exception.ZenExceptionEnum
-import org.springframework.stereotype.Service
-import java.io.Serializable
-
-/**
- * <p>
- * 角色表 服务实现类
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-06
- */
-@Service
-class SysRoleServiceImpl : ServiceImpl<SysRoleMapper, SysRole>(), ISysRoleService {
-    override fun getRoleListByUserId(userId: Long?): MutableList<SysRole> {
-        if (userId == null) {
-            return mutableListOf()
-        }
-        return baseMapper.selectByUserId(userId)
-    }
-
-    override fun getRoleListPage(keyword: String?, searchOption: Int?, page: Page<SysRole>, enable: Boolean?): Page<SysRole> {
-        val condition = EntityWrapper<SysRole>().apply {
-            if (!keyword.isNullOrEmpty() && searchOption != null) {
-                when (searchOption) {
-                    1 -> {
-                        // 角色名称
-                        like("name", "%$keyword%")
-                    }
-                    2 -> {
-                        // 角色代码
-                        like("code", "%$keyword%")
-                    }
-                }
-            }
-            if (enable != null) {
-                if (enable) {
-                    eq("enable", 1)
-                } else {
-                    eq("enable", 0)
-                }
-            }
-        }
-        page.records = baseMapper.selectWOLogicPage(page, condition)
-        return page
-    }
-
-    override fun getRoleList(keyword: String?, searchOption: Int?, enable: Boolean?): MutableList<SysRole> {
-        val condition = EntityWrapper<SysRole>().apply {
-            if (!keyword.isNullOrEmpty() && searchOption != null) {
-                when (searchOption) {
-                    1 -> {
-                        // 角色名称
-                        like("name", "%$keyword%")
-                    }
-                    2 -> {
-                        // 角色代码
-                        like("code", "%$keyword%")
-                    }
-                }
-            }
-            if (enable != null) {
-                if (enable) {
-                    eq("enable", 1)
-                } else {
-                    eq("enable", 0)
-                }
-            }
-        }
-        return baseMapper.selectWOLogic(condition)
-    }
-
-    override fun physicalDeleteById(id: Serializable) {
-        if (baseMapper.physicalDeleteById(id) <= 0) {
-            throw ZenException(ZenExceptionEnum.BIZ_DELETE_ERROR)
-        }
-    }
-
-    override fun updateLogicById(entity: SysRole) {
-        if (baseMapper.updateWOLogic(entity, EntityWrapper<SysRole>().eq("id", entity.id)) <= 0) {
-            throw ZenException(ZenExceptionEnum.BIZ_UPDATE_ERROR)
-        }
-    }
-}

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

@@ -1,79 +0,0 @@
-package com.gxzc.zen.api.sys.service.impl
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper
-import com.baomidou.mybatisplus.service.impl.ServiceImpl
-import com.gxzc.zen.api.sys.mapper.SysUploadInfoMapper
-import com.gxzc.zen.api.sys.model.SysUploadInfo
-import com.gxzc.zen.api.sys.service.ISysUploadInfoService
-import com.gxzc.zen.common.dto.ZenFileMetadata
-import com.gxzc.zen.common.util.PlatformUtil
-import org.apache.commons.io.FilenameUtils
-import org.springframework.stereotype.Service
-import java.io.File
-import java.util.*
-
-/**
- * <p>
- * 上传文件信息表 服务实现类
- * </p>
- *
- * @author NorthLan
- * @since 2018-06-01
- */
-@Service
-class SysUploadInfoServiceImpl : ServiceImpl<SysUploadInfoMapper, SysUploadInfo>(), ISysUploadInfoService {
-    override fun addUploadFile(fileMetadata: ZenFileMetadata, file: File) {
-        val entity = SysUploadInfo().apply {
-            this.platformId = PlatformUtil.getPlatformId()
-            this.batchId = fileMetadata.batchId
-            this.originFilename = fileMetadata.filename
-            this.originRelativePath = fileMetadata.relativePath?.replace(this.originFilename!!, "")
-            this.filename = file.name
-            if (fileMetadata.repath.isNullOrEmpty()) {
-                this.relativePath = FilenameUtils.normalize(this.originRelativePath)
-            } else {
-                this.relativePath = FilenameUtils.normalize(fileMetadata.repath)
-            }
-            this.md5 = fileMetadata.md5
-            this.extension = FilenameUtils.getExtension(file.name)
-            this.filesize = fileMetadata.totalSize
-            this.lastModified = Date(file.lastModified())
-        }
-        baseMapper.insert(entity)
-    }
-
-    override fun getUploadInfosByBatchId(batchId: String): MutableList<SysUploadInfo> {
-        val condition = SysUploadInfo().apply { this.batchId = batchId }
-        val ret = baseMapper.selectWOLogic(EntityWrapper(condition))
-        ret.forEach {
-            generateURL(it)
-        }
-        return ret
-    }
-
-    private fun generateURL(it: SysUploadInfo?) {
-        if (it != null) {
-            if (it.relativePath.isNullOrEmpty()) {
-                it.url = FilenameUtils.normalize("/${it.filename}")
-            } else {
-                it.url = FilenameUtils.normalize("/${it.relativePath}/${it.filename}")
-            }
-        }
-    }
-
-    override fun getUploadInfoById(id: Long): SysUploadInfo? {
-        val condition = SysUploadInfo().apply { this.id = id }
-        return baseMapper.selectOne(condition).apply {
-            generateURL(this)
-        }
-    }
-
-    override fun getUploadInfoListByIdList(ids: Collection<Long>): MutableList<SysUploadInfo> {
-        val ret = baseMapper.selectWOLogic(EntityWrapper<SysUploadInfo>().`in`("id", ids))
-        ret.forEach {
-            generateURL(it)
-        }
-        return ret
-    }
-
-}

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

@@ -1,76 +0,0 @@
-package com.gxzc.zen.api.sys.service.impl
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper
-import com.baomidou.mybatisplus.service.impl.ServiceImpl
-import com.gxzc.zen.api.sys.mapper.SysUserRoleMapper
-import com.gxzc.zen.api.sys.model.SysRole
-import com.gxzc.zen.api.sys.model.SysUserRole
-import com.gxzc.zen.api.sys.service.ISysUserRoleService
-import com.gxzc.zen.umps.constant.ZenHttpSession
-import com.gxzc.zen.umps.util.ShiroRedisUtil
-import org.springframework.stereotype.Service
-import org.springframework.transaction.annotation.Transactional
-
-/**
- * <p>
- * 用户角色表 服务实现类
- * </p>
- *
- * @author NorthLan
- * @since 2018-02-06
- */
-@Service
-class SysUserRoleServiceImpl : ServiceImpl<SysUserRoleMapper, SysUserRole>(), ISysUserRoleService {
-    override fun getUserRoleListByUserId(id: Long): MutableList<SysRole> {
-        return baseMapper.selectUserRoleListByUserId(id)
-    }
-
-    override fun getUserRoleIdListByUserId(id: Long): List<Long> {
-        val condition = SysUserRole().apply { this.userId = id }
-        return baseMapper.selectList(EntityWrapper(condition)).map { it.roleId!! }
-    }
-
-    override fun getUserIdListByRoleId(id: Long): Set<Long> {
-        val ret = baseMapper.selectList(EntityWrapper<SysUserRole>().eq("role_id", id)) ?: return setOf()
-        return ret.map {
-            it.userId!!
-        }.toSet()
-    }
-
-    @Transactional
-    override fun deleteByUserId(userId: Long) {
-        baseMapper.physicalDelete(EntityWrapper<SysUserRole>()
-                .eq("user_id", userId))
-    }
-
-    @Transactional
-    override fun updateByUserId(userId: Long, roleIds: List<Long>) {
-        // 先查询userId 所有的roleIds
-        val tempRoleIds = getUserRoleIdListByUserId(userId)
-        val deleteIds = tempRoleIds.subtract(roleIds)
-        val insertIds = roleIds.subtract(tempRoleIds)
-
-        var eff = false
-        if (deleteIds.isNotEmpty()) {
-            baseMapper.physicalDelete(EntityWrapper<SysUserRole>().eq("user_id", userId).`in`("role_id", deleteIds))
-            eff = true
-        }
-
-        if (insertIds.isNotEmpty()) {
-            val entityList = mutableListOf<SysUserRole>()
-            insertIds.forEach {
-                entityList.add(SysUserRole().apply {
-                    this.roleId = it
-                    this.userId = userId
-                })
-            }
-            this.insertBatch(entityList)
-            eff = true
-        }
-
-        if (eff) {
-            // 更新一下
-            ShiroRedisUtil.removeAllSessionsAttributeKey(ZenHttpSession.SESSION_KEY_USER_ROLES)
-        }
-    }
-}

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

@@ -1,159 +0,0 @@
-package com.gxzc.zen.api.sys.service.impl
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper
-import com.baomidou.mybatisplus.plugins.Page
-import com.baomidou.mybatisplus.service.impl.ServiceImpl
-import com.gxzc.zen.api.sys.mapper.SysUserMapper
-import com.gxzc.zen.api.sys.model.SysUser
-import com.gxzc.zen.api.sys.service.ISysUserRoleService
-import com.gxzc.zen.api.sys.service.ISysUserService
-import com.gxzc.zen.common.contants.PLATFORM
-import com.gxzc.zen.common.exception.ZenException
-import com.gxzc.zen.common.exception.ZenExceptionEnum
-import com.gxzc.zen.common.util.PlatformUtil
-import org.apache.commons.lang3.RandomStringUtils
-import org.apache.shiro.crypto.hash.SimpleHash
-import org.slf4j.LoggerFactory
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.stereotype.Service
-import org.springframework.transaction.annotation.Transactional
-
-/**
- * <p>
- * 用户管理 服务实现类
- * </p>
- *
- * @author NorthLan
- * @since 2018-02-06
- */
-@Suppress("UNCHECKED_CAST")
-@Service
-class SysUserServiceImpl : ServiceImpl<SysUserMapper, SysUser>(), ISysUserService {
-    companion object {
-        private val logger = LoggerFactory.getLogger(SysUserServiceImpl::class.java)
-    }
-
-    @Autowired
-    private lateinit var userRoleService: ISysUserRoleService
-
-    override fun getUserByAccount(account: String): SysUser? {
-        val condition = SysUser().apply {
-            this.account = account
-        }
-        return baseMapper.selectOne(condition)
-    }
-
-    override fun getUserListPage(keyword: String?, searchOption: Int?, page: Page<SysUser>, enable: Boolean?): Page<SysUser> {
-        val condition = EntityWrapper<SysUser>().apply {
-            if (!keyword.isNullOrEmpty() && searchOption != null) {
-                when (searchOption) {
-                    1 -> {
-                        // 角色名称
-                        like("account", "%$keyword%")
-                    }
-                    2 -> {
-                        // 角色代码
-                        like("username", "%$keyword%")
-                    }
-                    3 -> {
-                        // 角色代码
-                        like("staffNo", "%$keyword%")
-                    }
-                }
-            }
-            if (enable != null) {
-                if (enable) {
-                    eq("enable", 1)
-                } else {
-                    eq("enable", 0)
-                }
-            }
-        }
-        page.records = baseMapper.selectWOLogicPage(page, condition)
-        return page
-    }
-
-    override fun getUserList(keyword: String?, searchOption: Int?, enable: Boolean?): MutableList<SysUser> {
-        val condition = EntityWrapper<SysUser>().apply {
-            if (!keyword.isNullOrEmpty() && searchOption != null) {
-                when (searchOption) {
-                    1 -> {
-                        // 角色名称
-                        like("account", "%$keyword%")
-                    }
-                    2 -> {
-                        // 角色代码
-                        like("username", "%$keyword%")
-                    }
-                    3 -> {
-                        // 角色代码
-                        like("staffNo", "%$keyword%")
-                    }
-                }
-            }
-            if (enable != null) {
-                if (enable) {
-                    eq("enable", 1)
-                } else {
-                    eq("enable", 0)
-                }
-            }
-        }
-        return baseMapper.selectWOLogic(condition)
-    }
-
-    override fun register(entity: SysUser): SysUser {
-        if (PlatformUtil.getPlatform() == PLATFORM.SYSTEM) {
-            //
-            val condition = SysUser().apply { this.account = entity.account }
-            if (baseMapper.selectCount(EntityWrapper(condition)) > 0) {
-                throw ZenException(ZenExceptionEnum.REG_ACCOUNT_EXISTS)
-            }
-            // 处理一下密码
-            if (entity.password.isNullOrEmpty()) {
-                throw ZenException(ZenExceptionEnum.REG_PASSWORD_ERROR)
-            } else if (entity.password!!.length < 6) {
-                throw ZenException(ZenExceptionEnum.REG_PASSWORD_ERROR)
-            }
-            //
-            val salt = RandomStringUtils.randomAlphanumeric(9)
-            val hashedPassword = SimpleHash("md5", entity.password, entity.account + salt, 2).toHex()
-            //
-            entity.salt = salt
-            entity.password = hashedPassword
-            //
-            if (baseMapper.insert(entity) <= 0) {
-                throw ZenException(ZenExceptionEnum.BIZ_INSERT_ERROR)
-            }
-        }
-        return entity
-    }
-
-    override fun modify(entity: SysUser): SysUser {
-        if (PlatformUtil.getPlatform() == PLATFORM.SYSTEM) {
-            // 处理一下密码
-            if (entity.password != null && entity.password!!.length < 6) {
-                throw ZenException(ZenExceptionEnum.REG_PASSWORD_ERROR)
-            }
-            if (entity.password != null) {
-                //
-                val salt = RandomStringUtils.randomAlphanumeric(9)
-                val hashedPassword = SimpleHash("MD5", entity.password, entity.account + salt, 2).toHex()
-                //
-                entity.salt = salt
-                entity.password = hashedPassword
-            }
-            // 修改
-            baseMapper.updateWOLogic(entity, EntityWrapper<SysUser>().eq("id", entity.id))
-        }
-        return entity
-    }
-
-    @Transactional
-    override fun delete(id: Long) {
-        if (baseMapper.physicalDeleteById(id) > 0) {
-            // 删除用户相关所有东西
-            userRoleService.deleteByUserId(id)
-        }
-    }
-}

zen-api/src/main/kotlin/com/gxzc/zen/api/util/SysDictUtil.kt

@@ -1,8 +1,8 @@
 package com.gxzc.zen.api.util
 
 import com.gxzc.zen.api.sys.model.SysDictValue
-import com.gxzc.zen.api.sys.service.ISysDictValueService
 import com.gxzc.zen.common.util.SpringContextHolder
+import com.gxzc.zen.rpc.api.RDictService
 
 /**
  * 字典工具类
@@ -11,10 +11,10 @@ import com.gxzc.zen.common.util.SpringContextHolder
  * @url https://noahlan.com
  */
 object SysDictUtil {
-    private var dictValueService = SpringContextHolder.getBean(ISysDictValueService::class.java)
+    private var dictValueService = SpringContextHolder.getBean(RDictService::class.java)
         get() {
             if (field == null) {
-                field = SpringContextHolder.getBean(ISysDictValueService::class.java)
+                field = SpringContextHolder.getBean(RDictService::class.java)
             }
             return field
         }

zen-api/src/main/kotlin/com/gxzc/zen/api/util/SysParamUtil.kt

@@ -1,34 +1,34 @@
-package com.gxzc.zen.api.util
-
-import com.gxzc.zen.api.sys.model.SysParam
-import com.gxzc.zen.api.sys.service.ISysParamService
-import com.gxzc.zen.common.util.SpringContextHolder
-
-/**
- * 系统参数工具类
- * 缓存中获取
- * @author NorthLan
- * @date 2018/3/19
- * @url https://noahlan.com
- */
-object SysParamUtil {
-    private var sysParamService: ISysParamService? = SpringContextHolder.getBean(ISysParamService::class.java)
-        get() {
-            if (field == null) {
-                field = SpringContextHolder.getBean(ISysParamService::class.java)
-            }
-            return field
-        }
-
-    fun getAllList(): MutableList<SysParam> {
-        return sysParamService!!.getListCacheable()
-    }
-
-    fun getListByKey(key: String): MutableList<SysParam> {
-        return sysParamService!!.getListByKey(key)
-    }
-
-    fun getOne(key: String, value: String?, sort: Int?): SysParam? {
-        return sysParamService!!.getOneByKey(key, value, sort)
-    }
-}
+//package com.gxzc.zen.api.util
+//
+//import com.gxzc.zen.api.sys.model.SysParam
+//import com.gxzc.zen.api.sys.service.ISysParamService
+//import com.gxzc.zen.common.util.SpringContextHolder
+//
+///**
+// * 系统参数工具类
+// * 缓存中获取
+// * @author NorthLan
+// * @date 2018/3/19
+// * @url https://noahlan.com
+// */
+//object SysParamUtil {
+//    private var sysParamService: ISysParamService? = SpringContextHolder.getBean(ISysParamService::class.java)
+//        get() {
+//            if (field == null) {
+//                field = SpringContextHolder.getBean(ISysParamService::class.java)
+//            }
+//            return field
+//        }
+//
+//    fun getAllList(): MutableList<SysParam> {
+//        return sysParamService!!.getListCacheable()
+//    }
+//
+//    fun getListByKey(key: String): MutableList<SysParam> {
+//        return sysParamService!!.getListByKey(key)
+//    }
+//
+//    fun getOne(key: String, value: String?, sort: Int?): SysParam? {
+//        return sysParamService!!.getOneByKey(key, value, sort)
+//    }
+//}

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

@@ -1,6 +1,5 @@
 package com.gxzc.zen.umps.config
 
-import com.gxzc.zen.api.sys.service.ISysUserService
 import com.gxzc.zen.umps.common.ZenAuthToken
 import com.gxzc.zen.umps.common.ZenSimpleByteSource
 import org.apache.shiro.authc.*
@@ -9,7 +8,6 @@ import org.apache.shiro.authz.SimpleAuthorizationInfo
 import org.apache.shiro.realm.AuthorizingRealm
 import org.apache.shiro.subject.PrincipalCollection
 import org.slf4j.LoggerFactory
-import org.springframework.beans.factory.annotation.Autowired
 
 /**
  *
@@ -22,9 +20,6 @@ class ZenShiroRealm : AuthorizingRealm() {
         private val logger = LoggerFactory.getLogger(ZenShiroRealm::class.java)
     }
 
-    @Autowired
-    private lateinit var userService: ISysUserService
-
     init {
         this.name = "zen_realm"
     }

zen-api/src/main/resources/mapping/sys/SysDeptMapper.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxzc.zen.api.sys.mapper.SysDeptMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.gxzc.zen.api.sys.model.SysDept">
-    <result column="id" property="id" />
-    <result column="enable" property="enable" />
-    <result column="remark" property="remark" />
-    <result column="create_time" property="createTime" />
-    <result column="create_by" property="createBy" />
-    <result column="update_time" property="updateTime" />
-    <result column="update_by" property="updateBy" />
-        <result column="parent_id" property="parentId" />
-        <result column="path" property="path" />
-        <result column="name" property="name" />
-        <result column="principal" property="principal" />
-        <result column="sort" property="sort" />
-    </resultMap>
-
-</mapper>

zen-api/src/main/resources/mapping/sys/SysDeptUserMapper.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxzc.zen.api.sys.mapper.SysDeptUserMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.gxzc.zen.api.sys.model.SysDeptUser">
-    <result column="id" property="id" />
-    <result column="enable" property="enable" />
-    <result column="remark" property="remark" />
-    <result column="create_time" property="createTime" />
-    <result column="create_by" property="createBy" />
-    <result column="update_time" property="updateTime" />
-    <result column="update_by" property="updateBy" />
-        <result column="dept_id" property="deptId" />
-        <result column="user_id" property="userId" />
-    </resultMap>
-
-</mapper>

zen-api/src/main/resources/mapping/sys/SysDictTypeMapper.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxzc.zen.api.sys.mapper.SysDictTypeMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.gxzc.zen.api.sys.model.SysDictType">
-        <result column="id" property="id"/>
-        <result column="enable" property="enable"/>
-        <result column="remark" property="remark"/>
-        <result column="create_time" property="createTime"/>
-        <result column="create_by" property="createBy"/>
-        <result column="update_time" property="updateTime"/>
-        <result column="update_by" property="updateBy"/>
-        <result column="code" property="code"/>
-        <result column="label" property="label"/>
-        <result column="parent_id" property="parentId"/>
-        <result column="path" property="path"/>
-    </resultMap>
-
-    <update id="updatePath">
-        UPDATE `sys_dict_type`
-        SET path = CONCAT((SELECT path FROM (SELECT * FROM `sys_dict_type` WHERE id = #{parentId}) AS temp), '-', #{id})
-        WHERE id = #{id}
-    </update>
-
-</mapper>

zen-api/src/main/resources/mapping/sys/SysDictValueMapper.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxzc.zen.api.sys.mapper.SysDictValueMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.gxzc.zen.api.sys.model.SysDictValue">
-        <result column="id" property="id"/>
-        <result column="enable" property="enable"/>
-        <result column="remark" property="remark"/>
-        <result column="create_time" property="createTime"/>
-        <result column="create_by" property="createBy"/>
-        <result column="update_time" property="updateTime"/>
-        <result column="update_by" property="updateBy"/>
-        <result column="type_id" property="typeId"/>
-        <result column="code" property="code"/>
-        <result column="value" property="code"/>
-        <result column="label" property="label"/>
-        <result column="sort" property="sort"/>
-    </resultMap>
-
-    <update id="updateDictValueByTypeId">
-        UPDATE `sys_dict_value`
-        SET `code` = REPLACE(`code`,#{oldPrefix},#{newPrefix})
-        WHERE type_id = #{typeId}
-    </update>
-</mapper>

zen-api/src/main/resources/mapping/sys/SysEventLoginMapper.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxzc.zen.api.sys.mapper.SysEventLoginMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.gxzc.zen.api.sys.model.SysEventLogin">
-    <result column="id" property="id" />
-    <result column="enable" property="enable" />
-    <result column="remark" property="remark" />
-    <result column="create_time" property="createTime" />
-    <result column="create_by" property="createBy" />
-    <result column="update_time" property="updateTime" />
-    <result column="update_by" property="updateBy" />
-        <result column="title" property="title" />
-        <result column="request_uri" property="requestUri" />
-        <result column="sort" property="sort" />
-        <result column="account" property="account" />
-        <result column="client_host" property="clientHost" />
-        <result column="user_agent" property="userAgent" />
-        <result column="status" property="status" />
-    </resultMap>
-
-</mapper>

zen-api/src/main/resources/mapping/sys/SysEventOperMapper.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxzc.zen.api.sys.mapper.SysEventOperMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.gxzc.zen.api.sys.model.SysEventOper">
-    <result column="id" property="id" />
-    <result column="enable" property="enable" />
-    <result column="remark" property="remark" />
-    <result column="create_time" property="createTime" />
-    <result column="create_by" property="createBy" />
-    <result column="update_time" property="updateTime" />
-    <result column="update_by" property="updateBy" />
-        <result column="title" property="title" />
-        <result column="request_uri" property="requestUri" />
-        <result column="sort" property="sort" />
-        <result column="account" property="account" />
-        <result column="client_host" property="clientHost" />
-        <result column="parameter" property="parameter" />
-        <result column="method" property="method" />
-    </resultMap>
-
-</mapper>

zen-api/src/main/resources/mapping/sys/SysMenuMapper.xml

@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxzc.zen.api.sys.mapper.SysMenuMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.gxzc.zen.api.sys.model.SysMenu">
-        <result column="id" property="id"/>
-        <result column="enable" property="enable"/>
-        <result column="remark" property="remark"/>
-        <result column="create_time" property="createTime"/>
-        <result column="create_by" property="createBy"/>
-        <result column="update_time" property="updateTime"/>
-        <result column="update_by" property="updateBy"/>
-        <result column="parent_id" property="parentId"/>
-        <result column="path" property="path"/>
-        <result column="code" property="code"/>
-        <result column="type" property="type"/>
-        <result column="title" property="title"/>
-        <result column="uri" property="uri"/>
-        <result column="icon" property="icon"/>
-        <result column="sort" property="sort"/>
-        <result column="ext1" property="ext1"/>
-        <result column="ext2" property="ext2"/>
-        <result column="ext3" property="ext3"/>
-        <result column="ext4" property="ext4"/>
-        <result column="ext5" property="ext5"/>
-    </resultMap>
-
-    <sql id="CommonColumns">
-        ${prefix}.id,
-        ${prefix}.enable,
-        ${prefix}.remark,
-        ${prefix}.create_time AS createTime,
-        ${prefix}.create_by AS createBy,
-        ${prefix}.update_time AS updateTime,
-        ${prefix}.update_by AS updateBy,
-    </sql>
-
-    <sql id="Columns">
-        <include refid="CommonColumns">
-            <property name="prefix" value="${prefix}"/>
-        </include>
-        ${prefix}.parent_id AS parentId,
-        ${prefix}.path,
-        ${prefix}.code,
-        ${prefix}.type,
-        ${prefix}.title,
-        ${prefix}.uri,
-        ${prefix}.icon,
-        ${prefix}.sort,
-        ${prefix}.ext1,
-        ${prefix}.ext2,
-        ${prefix}.ext3,
-        ${prefix}.ext4,
-        ${prefix}.ext5
-    </sql>
-
-    <select id="selectByRoleIds" resultType="com.gxzc.zen.api.sys.model.SysMenu">
-        SELECT
-        <include refid="Columns">
-            <property name="prefix" value="A"/>
-        </include>
-        FROM
-        sys_menu AS A
-        INNER JOIN sys_menu_role AS B ON A.id = B.menu_id
-        WHERE B.role_id IN
-        <foreach collection="roleIds" separator="," item="item" open="(" close=")">
-            #{item}
-        </foreach>
-    </select>
-
-    <update id="updatePath">
-        UPDATE `sys_menu`
-        SET path = CONCAT((SELECT path FROM (SELECT * FROM `sys_menu` WHERE id = #{parentId}) AS temp), '-', #{id})
-        WHERE id = #{id}
-    </update>
-
-</mapper>

zen-api/src/main/resources/mapping/sys/SysMenuRoleMapper.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxzc.zen.api.sys.mapper.SysMenuRoleMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.gxzc.zen.api.sys.model.SysMenuRole">
-    <result column="id" property="id" />
-    <result column="enable" property="enable" />
-    <result column="remark" property="remark" />
-    <result column="create_time" property="createTime" />
-    <result column="create_by" property="createBy" />
-    <result column="update_time" property="updateTime" />
-    <result column="update_by" property="updateBy" />
-        <result column="menu_id" property="menuId" />
-        <result column="role_id" property="roleId" />
-    </resultMap>
-
-</mapper>

zen-api/src/main/resources/mapping/sys/SysNoticeMapper.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxzc.zen.api.sys.mapper.SysNoticeMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.gxzc.zen.api.sys.model.SysNotice">
-    <result column="id" property="id" />
-    <result column="enable" property="enable" />
-    <result column="remark" property="remark" />
-    <result column="create_time" property="createTime" />
-    <result column="create_by" property="createBy" />
-    <result column="update_time" property="updateTime" />
-    <result column="update_by" property="updateBy" />
-        <result column="notice_title" property="noticeTitle" />
-        <result column="notice_type" property="noticeType" />
-        <result column="send_time" property="sendTime" />
-        <result column="sources_url" property="sourcesUrl" />
-        <result column="content" property="content" />
-        <result column="status" property="status" />
-    </resultMap>
-
-</mapper>

zen-api/src/main/resources/mapping/sys/SysParamMapper.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxzc.zen.api.sys.mapper.SysParamMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.gxzc.zen.api.sys.model.SysParam">
-    <result column="id" property="id" />
-    <result column="enable" property="enable" />
-    <result column="remark" property="remark" />
-    <result column="create_time" property="createTime" />
-    <result column="create_by" property="createBy" />
-    <result column="update_time" property="updateTime" />
-    <result column="update_by" property="updateBy" />
-        <result column="key" property="key" />
-        <result column="value" property="value" />
-        <result column="label" property="label" />
-        <result column="extend" property="extend" />
-        <result column="sort" property="sort" />
-    </resultMap>
-
-</mapper>

zen-api/src/main/resources/mapping/sys/SysResourceMapper.xml

@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxzc.zen.api.sys.mapper.SysResourceMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.gxzc.zen.api.sys.model.SysResource">
-        <result column="id" property="id"/>
-        <result column="enable" property="enable"/>
-        <result column="remark" property="remark"/>
-        <result column="create_time" property="createTime"/>
-        <result column="create_by" property="createBy"/>
-        <result column="update_time" property="updateTime"/>
-        <result column="update_by" property="updateBy"/>
-        <result column="parent_id" property="parentId"/>
-        <result column="menu_id" property="menuId"/>
-        <result column="type" property="type"/>
-        <result column="code" property="code"/>
-        <result column="uri" property="uri"/>
-        <result column="name" property="name"/>
-        <result column="path" property="path"/>
-        <result column="method" property="method"/>
-        <result column="description" property="description"/>
-        <result column="ext1" property="ext1"/>
-        <result column="ext2" property="ext2"/>
-        <result column="ext3" property="ext3"/>
-        <result column="ext4" property="ext4"/>
-        <result column="ext5" property="ext5"/>
-    </resultMap>
-
-    <sql id="CommonColumns">
-        ${prefix}.id,
-        ${prefix}.enable,
-        ${prefix}.remark,
-        ${prefix}.create_time AS createTime,
-        ${prefix}.create_by AS createBy,
-        ${prefix}.update_time AS updateTime,
-        ${prefix}.update_by AS updateBy,
-    </sql>
-
-    <sql id="Columns">
-        <include refid="CommonColumns">
-            <property name="prefix" value="${prefix}"/>
-        </include>
-        ${prefix}.parent_id AS parentId,
-        ${prefix}.menu_id AS menuId,
-        ${prefix}.type,
-        ${prefix}.code,
-        ${prefix}.uri,
-        ${prefix}.name,
-        ${prefix}.path,
-        ${prefix}.method,
-        ${prefix}.description,
-        ${prefix}.ext1,
-        ${prefix}.ext2,
-        ${prefix}.ext3,
-        ${prefix}.ext4,
-        ${prefix}.ext5
-    </sql>
-
-    <select id="selectByRoleIds" resultType="com.gxzc.zen.api.sys.model.SysResource">
-        SELECT DISTINCT
-        <include refid="Columns">
-            <property name="prefix" value="A"/>
-        </include>
-        FROM sys_resource AS A
-        INNER JOIN sys_resource_role AS B ON A.id = B.resource_id
-        WHERE B.role_id IN
-        <foreach collection="roleIds" open="(" close=")" item="item" separator=",">
-            #{item}
-        </foreach>
-    </select>
-
-    <select id="selectByRoleId" resultType="com.gxzc.zen.api.sys.model.SysResource">
-        SELECT
-        <include refid="Columns">
-            <property name="prefix" value="A"/>
-        </include>
-        FROM sys_resource AS A
-        INNER JOIN sys_resource_role AS B ON A.id = B.resource_id
-        WHERE B.role_id = #{roleId}
-    </select>
-
-</mapper>

zen-api/src/main/resources/mapping/sys/SysResourceRoleMapper.xml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxzc.zen.api.sys.mapper.SysResourceRoleMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.gxzc.zen.api.sys.model.SysResourceRole">
-        <result column="id" property="id"/>
-        <result column="enable" property="enable"/>
-        <result column="remark" property="remark"/>
-        <result column="create_time" property="createTime"/>
-        <result column="create_by" property="createBy"/>
-        <result column="update_time" property="updateTime"/>
-        <result column="update_by" property="updateBy"/>
-        <result column="role_id" property="roleId"/>
-        <result column="resource_id" property="resourceId"/>
-    </resultMap>
-
-    <insert id="zenInsertOrUpdateBatch">
-        INSERT INTO `sys_resource_role`
-        (`remark`,`create_time`,`create_by`,`update_time`,`update_by`,`role_id`,`resource_id`)
-        VALUES
-        <foreach collection="list" item="item" separator=",">
-            (#{item.remark},#{item.createTime},#{item.createBy},#{item.updateTime},#{item.updateBy},#{item.roleId},#{item.resourceId})
-        </foreach>
-        ON DUPLICATE KEY UPDATE
-        update_time = VALUES(update_time),
-        update_by = VALUES(update_by),
-        remark = VALUES(remark)
-    </insert>
-
-</mapper>

zen-api/src/main/resources/mapping/sys/SysRoleMapper.xml

@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxzc.zen.api.sys.mapper.SysRoleMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.gxzc.zen.api.sys.model.SysRole">
-        <result column="id" property="id"/>
-        <result column="enable" property="enable"/>
-        <result column="remark" property="remark"/>
-        <result column="create_time" property="createTime"/>
-        <result column="create_by" property="createBy"/>
-        <result column="update_time" property="updateTime"/>
-        <result column="update_by" property="updateBy"/>
-        <result column="parent_id" property="parentId"/>
-        <result column="name" property="name"/>
-        <result column="path" property="path"/>
-        <result column="code" property="code"/>
-        <result column="ext1" property="ext1"/>
-        <result column="ext2" property="ext2"/>
-        <result column="ext3" property="ext3"/>
-        <result column="ext4" property="ext4"/>
-        <result column="ext5" property="ext5"/>
-    </resultMap>
-
-    <sql id="CommonColumns">
-        ${prefix}.id,
-        ${prefix}.enable,
-        ${prefix}.remark,
-        ${prefix}.create_time AS createTime,
-        ${prefix}.create_by AS createBy,
-        ${prefix}.update_time AS updateTime,
-        ${prefix}.update_by AS updateBy,
-    </sql>
-
-    <sql id="Columns">
-        <include refid="CommonColumns">
-            <property name="prefix" value="${prefix}"/>
-        </include>
-        ${prefix}.parent_id AS parentId,
-        ${prefix}.name,
-        ${prefix}.path,
-        ${prefix}.code,
-        ${prefix}.ext1,
-        ${prefix}.ext2,
-        ${prefix}.ext3,
-        ${prefix}.ext4,
-        ${prefix}.ext5
-    </sql>
-
-    <select id="selectByUserId" resultType="com.gxzc.zen.api.sys.model.SysRole">
-        SELECT
-        <include refid="Columns">
-            <property name="prefix" value="A"/>
-        </include>
-        FROM sys_role AS A
-        INNER JOIN sys_user_role AS B ON A.id = B.role_id
-        WHERE B.user_id = #{userId}
-        AND A.enable = 1
-    </select>
-
-</mapper>

zen-api/src/main/resources/mapping/sys/SysUploadInfoMapper.xml

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxzc.zen.api.sys.mapper.SysUploadInfoMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.gxzc.zen.api.sys.model.SysUploadInfo">
-    <result column="id" property="id" />
-    <result column="enable" property="enable" />
-    <result column="remark" property="remark" />
-    <result column="create_time" property="createTime" />
-    <result column="create_by" property="createBy" />
-    <result column="update_time" property="updateTime" />
-    <result column="update_by" property="updateBy" />
-    <result column="platform_id" property="platformId" />
-        <result column="filename" property="filename" />
-        <result column="relative_path" property="relativePath" />
-        <result column="batch_id" property="batchId" />
-        <result column="last_modified" property="lastModified" />
-        <result column="md5" property="md5" />
-        <result column="extension" property="extension" />
-        <result column="filesize" property="filesize" />
-        <result column="origin_filename" property="originFilename" />
-        <result column="origin_relative_path" property="originRelativePath" />
-        <result column="ext1" property="ext1" />
-        <result column="ext2" property="ext2" />
-        <result column="ext3" property="ext3" />
-        <result column="ext4" property="ext4" />
-    </resultMap>
-
-</mapper>

zen-api/src/main/resources/mapping/sys/SysUserMapper.xml

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxzc.zen.api.sys.mapper.SysUserMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.gxzc.zen.api.sys.model.SysUser">
-        <result column="id" property="id" />
-        <result column="enable" property="enable" />
-        <result column="remark" property="remark" />
-        <result column="create_time" property="createTime" />
-        <result column="create_by" property="createBy" />
-        <result column="update_time" property="updateTime" />
-        <result column="update_by" property="updateBy" />
-        <result column="account" property="account" />
-        <result column="username" property="username" />
-        <result column="password" property="password" />
-        <result column="salt" property="salt" />
-        <result column="phone" property="phone" />
-        <result column="email" property="email" />
-        <result column="position" property="position" />
-        <result column="address" property="address" />
-        <result column="staff_no" property="staffNo" />
-        <result column="lock" property="lock" />
-        <result column="ext1" property="ext1" />
-        <result column="ext2" property="ext2" />
-        <result column="ext3" property="ext3" />
-        <result column="ext4" property="ext4" />
-        <result column="gender" property="gender" />
-    </resultMap>
-</mapper>

zen-api/src/main/resources/mapping/sys/SysUserRoleMapper.xml

@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxzc.zen.api.sys.mapper.SysUserRoleMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.gxzc.zen.api.sys.model.SysUserRole">
-        <result column="id" property="id"/>
-        <result column="enable" property="enable"/>
-        <result column="remark" property="remark"/>
-        <result column="create_time" property="createTime"/>
-        <result column="create_by" property="createBy"/>
-        <result column="update_time" property="updateTime"/>
-        <result column="update_by" property="updateBy"/>
-        <result column="role_id" property="roleId"/>
-        <result column="user_id" property="userId"/>
-    </resultMap>
-
-    <sql id="CommonColumns">
-        ${prefix}.id,
-        ${prefix}.enable,
-        ${prefix}.remark,
-        ${prefix}.create_time AS createTime,
-        ${prefix}.create_by AS createBy,
-        ${prefix}.update_time AS updateTime,
-        ${prefix}.update_by AS updateBy,
-    </sql>
-
-    <sql id="ColumnsSysRole">
-        <include refid="CommonColumns">
-            <property name="prefix" value="${prefix}"/>
-        </include>
-        ${prefix}.parent_id AS parentId,
-        ${prefix}.name,
-        ${prefix}.path,
-        ${prefix}.code,
-        ${prefix}.ext1,
-        ${prefix}.ext2,
-        ${prefix}.ext3,
-        ${prefix}.ext4,
-        ${prefix}.ext5
-    </sql>
-
-    <select id="selectUserRoleListByUserId" resultType="com.gxzc.zen.api.sys.model.SysRole">
-        SELECT
-        <include refid="ColumnsSysRole">
-            <property name="prefix" value="A"/>
-        </include>
-        FROM
-        sys_role AS A
-        INNER JOIN sys_user_role AS B ON B.role_id = A.id
-        WHERE B.user_id = #{userId}
-    </select>
-
-    <select id="selectUserRoleListByUserIdList" parameterType="java.util.Map"
-            resultType="com.gxzc.zen.api.sys.model.SysRole">
-        SELECT
-        <include refid="ColumnsSysRole">
-            <property name="prefix" value="A"/>
-        </include>
-        FROM
-        sys_role AS A
-        INNER JOIN sys_user_role AS B ON B.role_id = A.id
-        WHERE
-        B.user_id IN
-        <foreach collection="userIdList" item="item" open="(" close=")">
-            #{item}
-        </foreach>
-    </select>
-
-</mapper>

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

@@ -0,0 +1,31 @@
+package com.gxzc.zen.rpc.api
+
+import com.gxzc.zen.api.sys.model.SysDictValue
+
+/**
+ *
+ * @author NorthLan
+ * @date 2018/6/20
+ * @url https://noahlan.com
+ */
+interface RDictService {
+    /**
+     * 获取缓存中所有的 字典值
+     */
+    fun getListCacheable(): MutableList<SysDictValue>
+
+    /**
+     * 根据type_code(code前缀)获取字典值列表
+     */
+    fun getDictValueListByTypeCode(typeCode: String): MutableList<SysDictValue>
+
+    /**
+     * 根据code值与value获取指定字典值
+     */
+    fun getDictValueByCodeAndValue(code: String, value: String): SysDictValue?
+
+    /**
+     * 根据code前缀与value获取指定字典值
+     */
+    fun getDictValueByPrefixAndValue(prefix: String, value: String): SysDictValue?
+}

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

@@ -0,0 +1,23 @@
+package com.gxzc.zen.rpc.api
+
+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-rpc/src/main/kotlin/com/gxzc/zen/rpc/api/RRoleService.kt

@@ -0,0 +1,17 @@
+package com.gxzc.zen.rpc.api
+
+import com.gxzc.zen.api.sys.model.SysRole
+
+/**
+ *
+ * @author NorthLan
+ * @date 2018/6/20
+ * @url https://noahlan.com
+ */
+interface RRoleService {
+
+    /**
+     * 通过用户ID获取RoleList
+     */
+    fun getRoleListByUserId(userId: Long?): MutableList<SysRole>
+}

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

@@ -1,39 +0,0 @@
-package com.gxzc.zen.web.sys.controller
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper
-import com.baomidou.mybatisplus.plugins.Page
-import com.gxzc.zen.api.sys.model.SysDictValue
-import com.gxzc.zen.api.sys.service.ISysDictValueService
-import com.gxzc.zen.common.base.BaseController
-import com.gxzc.zen.common.dto.ResponseDto
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.http.ResponseEntity
-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/6/2
- * @url https://noahlan.com
- */
-@RestController
-@RequestMapping("api")
-class ApiController : BaseController() {
-    @Autowired
-    private lateinit var dictValueService: ISysDictValueService
-
-
-    @GetMapping("test")
-    fun get(): ResponseEntity<*> {
-        return ResponseEntity.ok(ResponseDto().apply {
-            val a = Page<SysDictValue>().apply {
-                this.size = 30
-                this.current = 1
-            }
-            val ret = dictValueService.selectPage(a, EntityWrapper<SysDictValue>())
-            data = ret
-        })
-    }
-}

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

@@ -1,22 +1,11 @@
 package com.gxzc.zen.web.sys.controller
 
-import com.gxzc.zen.api.sys.service.ISysPermissionService
-import com.gxzc.zen.api.sys.service.ISysUserService
 import com.gxzc.zen.common.base.BaseController
 import com.gxzc.zen.common.dto.RequestDto
 import com.gxzc.zen.common.dto.ResponseDto
-import com.gxzc.zen.common.exception.ZenException
-import com.gxzc.zen.common.exception.ZenExceptionEnum
-import com.gxzc.zen.common.util.HttpUtil
-import com.gxzc.zen.umps.common.ZenAuthToken
-import com.gxzc.zen.umps.constant.ZenHttpSession
 import io.swagger.annotations.ApiOperation
 import org.apache.shiro.SecurityUtils
-import org.apache.shiro.authc.IncorrectCredentialsException
-import org.apache.shiro.authc.LockedAccountException
-import org.apache.shiro.authc.UnknownAccountException
 import org.slf4j.LoggerFactory
-import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.*
 import javax.servlet.http.Cookie
@@ -34,47 +23,6 @@ class AuthController : BaseController() {
         private val logger = LoggerFactory.getLogger(AuthController::class.java)
     }
 
-    @Autowired
-    private lateinit var userService: ISysUserService
-
-    @Autowired
-    private lateinit var permissionService: ISysPermissionService
-
-    @ApiOperation(value = "登录")
-    @PostMapping("/login")
-    fun login(@RequestBody data: RequestDto): ResponseEntity<*> {
-//        val a = System.currentTimeMillis()
-        // 验证输入合法性
-        val account = data["account"]?.toString()?.trim() ?: throw ZenException(ZenExceptionEnum.REQUEST_NULL)
-        val password = data["password"]?.toString() ?: throw ZenException(ZenExceptionEnum.REQUEST_NULL)
-        val rememberMe = data["rememberMe"] as? Boolean ?: false
-
-        val user = userService.getUserByAccount(account)
-        try {
-            SecurityUtils.getSubject().login(ZenAuthToken(account, password, rememberMe, getRequest().remoteHost, user))
-        } catch (e: IncorrectCredentialsException) {
-//            logger.warn("login error,", e)
-            throw ZenException(ZenExceptionEnum.AUTH_PASSWORD_ERROR)
-        } catch (e: UnknownAccountException) {
-//            logger.warn("login error,", e)
-            throw ZenException(ZenExceptionEnum.AUTH_ACCOUNT_NOT_EXISTS)
-        } catch (e: LockedAccountException) {
-            throw ZenException(ZenExceptionEnum.AUTH_LOCKED)
-        } finally {
-            // 能进到这里来 user 肯定 !=null
-            val session = SecurityUtils.getSubject().getSession(false)
-            session?.let {
-                // ID
-                it.setAttribute(ZenHttpSession.SESSION_KEY_USER_ID, user!!.id!!)
-                // 用户基本信息
-                it.setAttribute(ZenHttpSession.SESSION_KEY_USER_INFO, user)
-                // 角色列表
-                permissionService.getSubjectRoles(session)
-            }
-        }
-        return ResponseEntity.ok(ResponseDto())
-    }
-
     @ApiOperation("设置cookie")
     @PostMapping("/setcookie")
     fun token(@RequestBody cookies: List<RequestDto>): ResponseEntity<*> {
@@ -88,25 +36,6 @@ class AuthController : BaseController() {
         return ResponseEntity.ok(ResponseDto())
     }
 
-    @ApiOperation("获取cookie")
-    @GetMapping("/hello")
-    fun hello(): ResponseEntity<*> {
-        // 用户是否已经登陆
-        return if (SecurityUtils.getSubject().isAuthenticated) {
-            val cks = HttpUtil.getRequest().cookies
-            val ck = cks?.find {
-                it.name == ZenHttpSession.DEFAULT_SESSION_ID_NAME
-            }
-            if (ck == null) {
-                ResponseEntity.ok(null)
-            } else {
-                ResponseEntity.ok(cks)
-            }
-        } else {
-            ResponseEntity.ok(null)
-        }
-    }
-
     @ApiOperation(value = "登出")
     @DeleteMapping("/logout")
     fun logout(): ResponseEntity<*> {

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

@@ -1,16 +0,0 @@
-package com.gxzc.zen.web.sys.controller
-
-import com.gxzc.zen.common.base.BaseController
-import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.RestController
-
-/**
- * 部门 控制器
- * @author NorthLan
- * @date 2018/3/24
- * @url https://noahlan.com
- */
-@RestController
-@RequestMapping("dept")
-class DeptController : BaseController() {
-}

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

@@ -1,110 +0,0 @@
-package com.gxzc.zen.web.sys.controller
-
-import com.gxzc.zen.api.sys.model.SysDictType
-import com.gxzc.zen.api.sys.model.SysDictValue
-import com.gxzc.zen.api.sys.service.ISysDictTypeService
-import com.gxzc.zen.api.sys.service.ISysDictValueService
-import com.gxzc.zen.common.base.BaseController
-import com.gxzc.zen.common.dto.ResponseDto
-import io.swagger.annotations.ApiOperation
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.http.ResponseEntity
-import org.springframework.web.bind.annotation.*
-
-/**
- * 字典 控制器
- * @author NorthLan
- * @date 2018/5/5
- * @url https://noahlan.com
- */
-@RestController
-@RequestMapping("dict")
-class DictController : BaseController() {
-    @Autowired
-    private lateinit var dictTypeService: ISysDictTypeService
-    @Autowired
-    private lateinit var dictValueService: ISysDictValueService
-
-    @ApiOperation("获取字典树")
-    @GetMapping("type/tree")
-    fun getDictTypeTree(): ResponseEntity<*> {
-        return ResponseEntity.ok(ResponseDto().apply {
-            this.data = dictTypeService.getDictTypeTree()
-        })
-    }
-
-    @ApiOperation("新增字典类别")
-    @PostMapping("type")
-    fun addDictType(@RequestBody entity: SysDictType): ResponseEntity<*> {
-        return ResponseEntity.ok(ResponseDto().apply {
-            this.data = dictTypeService.createDictType(entity)
-        })
-    }
-
-    @ApiOperation("删除字典类别树及其所有子孙")
-    @DeleteMapping("type/{id}")
-    fun deleteDictType(@PathVariable id: Long?): ResponseEntity<*> {
-        dictTypeService.deleteDictType(id)
-        return ResponseEntity.ok(ResponseDto())
-    }
-
-    @ApiOperation("更新字典类别树节点信息,不包含移动树节点")
-    @PutMapping("type/{id}")
-    fun updateDictType(@PathVariable id: Long, @RequestBody entity: SysDictType): ResponseEntity<*> {
-        return ResponseEntity.ok(ResponseDto().apply {
-            this.data = dictTypeService.updateDictType(entity)
-        })
-    }
-
-    @ApiOperation("获取字典值列表,若传参typeId 则取某typeid下的所有字典值")
-    @GetMapping("value/list")
-    fun getDictValueByTypeId(@RequestParam("typeId", required = false) typeId: Long?): ResponseEntity<*> {
-        val result = if (typeId == null) {
-            dictValueService.getListCacheable()
-        } else {
-            dictValueService.getListByTypeId(typeId)
-        }
-        return ResponseEntity.ok(ResponseDto().apply {
-            this.data = result
-        })
-    }
-
-    @ApiOperation("在某节点下插入字典值")
-    @PostMapping("value")
-    fun addDictValue(@RequestBody entity: SysDictValue): ResponseEntity<*> {
-        return ResponseEntity.ok(ResponseDto().apply {
-            this.data = dictValueService.insertDictValue(entity)
-        })
-    }
-
-    @ApiOperation("删除字典值")
-    @DeleteMapping("value/{id}")
-    fun deleteDictValueById(@PathVariable id: Long): ResponseEntity<*> {
-        dictValueService.deleteDictValue(id)
-        return ResponseEntity.ok(ResponseDto())
-    }
-
-    @ApiOperation("更新字典值")
-    @PutMapping("value/{id}")
-    fun updateDictValue(@PathVariable id: Long, @RequestBody entity: SysDictValue): ResponseEntity<*> {
-        return ResponseEntity.ok(ResponseDto().apply {
-            this.data = dictValueService.updateDictValue(entity)
-        })
-    }
-
-    @ApiOperation("根据type_code(code前缀)获取字典值列表")
-    @GetMapping("value/typeCode")
-    fun getDictValueListByTypeCode(@RequestParam("typeCode") typeCode: String): ResponseEntity<*> {
-        return ResponseEntity.ok(ResponseDto().apply {
-            this.data = dictValueService.getDictValueListByTypeCode(typeCode)
-        })
-    }
-
-    @ApiOperation("根据code值与value获取指定字典值")
-    @GetMapping("value/codeValue")
-    fun getDictValueByCodeAndValue(@RequestParam("code") code: String, @RequestParam("value") value: String): ResponseEntity<*> {
-        return ResponseEntity.ok(ResponseDto().apply {
-            this.data = dictValueService.getDictValueByCodeAndValue(code, value)
-        })
-    }
-}

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

@@ -1,68 +0,0 @@
-package com.gxzc.zen.web.sys.controller
-
-import com.gxzc.zen.api.sys.model.SysMenu
-import com.gxzc.zen.api.sys.service.ISysMenuService
-import com.gxzc.zen.common.base.BaseController
-import com.gxzc.zen.common.dto.ResponseDto
-import io.swagger.annotations.ApiOperation
-import org.slf4j.LoggerFactory
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.http.ResponseEntity
-import org.springframework.web.bind.annotation.*
-
-/**
- * 菜单 控制器
- * @author NorthLan
- * @date 2018/5/1
- * @url https://noahlan.com
- */
-@RestController
-@RequestMapping("menu")
-class MenuController : BaseController() {
-    companion object {
-        private val logger = LoggerFactory.getLogger(MenuController::class.java)
-    }
-
-    @Autowired
-    private lateinit var menuService: ISysMenuService
-
-    @ApiOperation("获取系统菜单列表")
-    @GetMapping("list")
-    fun list(): ResponseEntity<*> {
-        return ResponseEntity.ok(ResponseDto().apply {
-            data = menuService.getSysMenuList()
-        })
-    }
-
-    @ApiOperation("获取系统菜单树")
-    @GetMapping("tree")
-    fun tree(): ResponseEntity<*> {
-        return ResponseEntity.ok(ResponseDto().apply {
-            data = menuService.getSysMenuTree()
-        })
-    }
-
-    @ApiOperation("新增菜单")
-    @PostMapping
-    fun create(@RequestBody entity: SysMenu): ResponseEntity<*> {
-        return ResponseEntity.ok(ResponseDto().apply {
-            data = menuService.createSysMenu(entity)
-        })
-    }
-
-    @ApiOperation("更新菜单项,不移动菜单")
-    @PutMapping("{id}")
-    fun udpate(@PathVariable id: Long, @RequestBody entity: SysMenu): ResponseEntity<*> {
-        return ResponseEntity.ok(ResponseDto().apply {
-            data = menuService.updateMenu(entity)
-        })
-    }
-
-    @ApiOperation("删除菜单以及子菜单")
-    @DeleteMapping("{id}")
-    fun delete(@PathVariable id: Long, @RequestBody entity: SysMenu): ResponseEntity<*> {
-        return ResponseEntity.ok(ResponseDto().apply {
-            data = menuService.deleteMenu(entity)
-        })
-    }
-}

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

@@ -1,42 +0,0 @@
-package com.gxzc.zen.web.sys.controller
-
-import com.gxzc.zen.api.sys.service.ISysMenuRoleService
-import com.gxzc.zen.common.config.request.annotation.KVType
-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 com.gxzc.zen.common.dto.ResponseDto
-import io.swagger.annotations.ApiOperation
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.http.ResponseEntity
-import org.springframework.web.bind.annotation.*
-
-/**
- *
- * @author NorthLan
- * @date 2018/5/5
- * @url https://noahlan.com
- */
-@RestController
-class MenuRoleController {
-
-    @Autowired
-    private lateinit var menuRoleSerivce: ISysMenuRoleService
-
-    @ApiOperation("获取对应角色拥有的菜单id列表")
-    @GetMapping("/role/{id}/menu/idlist")
-    fun getMenuIdListByRoleId(@PathVariable id: Long): ResponseEntity<*> {
-        return ResponseEntity.ok(ResponseDto().apply {
-            this.data = menuRoleSerivce.getMenuIdListByRoleId(id)
-        })
-    }
-
-    @Suppress("UNCHECKED_CAST")
-    @ApiOperation("更新列表")
-    @PutMapping("/role/{id}/menu")
-    @ZenRequestTypes(KVType(key = "menuIdList", value = Long::class, type = KVTypeEnum.LIST))
-    fun updateMenuRole(@PathVariable id: Long, @RequestBody requestDto: RequestDto): ResponseEntity<*> {
-        menuRoleSerivce.updateMenuRole(id, requestDto["menuIdList"] as List<Long>)
-        return ResponseEntity.ok(ResponseDto())
-    }
-}

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

@@ -1,71 +0,0 @@
-package com.gxzc.zen.web.sys.controller
-
-import com.gxzc.zen.api.sys.model.SysResource
-import com.gxzc.zen.api.sys.service.ISysResourceService
-import com.gxzc.zen.common.base.BaseController
-import com.gxzc.zen.common.dto.ResponseDto
-import com.gxzc.zen.umps.util.SSOUtil
-import io.swagger.annotations.ApiOperation
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.http.ResponseEntity
-import org.springframework.web.bind.annotation.*
-
-/**
- * 系统资源 管理器
- * @author NorthLan
- * @date 2018/5/2
- * @url https://noahlan.com
- */
-@RestController
-@RequestMapping("resource")
-class ResourceController : BaseController() {
-
-    @Autowired
-    private lateinit var resourceService: ISysResourceService
-
-    @ApiOperation("查询关联某菜单的所有资源")
-    @GetMapping("menu/{menuId}")
-    fun getResourceByMenuId(@PathVariable menuId: Long): ResponseEntity<*> {
-        return ResponseEntity.ok(ResponseDto().apply {
-            data = resourceService.getResourcesByMenuId(menuId)
-        })
-    }
-
-    @ApiOperation("在指定菜单下新增资源")
-    @PostMapping("menu/{menuId}")
-    fun insertResourceByMenuId(@PathVariable menuId: Long, @RequestBody sysResource: SysResource): ResponseEntity<*> {
-        return ResponseEntity.ok(ResponseDto().apply {
-            data = resourceService.insertResource(menuId, sysResource)
-        })
-    }
-
-    @ApiOperation("删除指定菜单下的所有资源")
-    @DeleteMapping("menu/{menuId}")
-    fun deleteResourceByMenuId(@PathVariable menuId: Long): ResponseEntity<*> {
-        resourceService.deleteResourcesByMenuId(menuId)
-        return ResponseEntity.ok(ResponseDto())
-    }
-
-    @ApiOperation("删除指定资源")
-    @DeleteMapping("{id}")
-    fun deleteResourceById(@PathVariable id: Long): ResponseEntity<*> {
-        resourceService.deleteResourceById(id)
-        return ResponseEntity.ok(ResponseDto())
-    }
-
-    @ApiOperation("修改指定资源")
-    @PutMapping("{id}")
-    fun updateResourceById(@PathVariable id: Long, @RequestBody sysResource: SysResource): ResponseEntity<*> {
-        return ResponseEntity.ok(ResponseDto().apply {
-            data = resourceService.updateResource(sysResource)
-        })
-    }
-
-    @ApiOperation("获取当前登陆用户权限列表")
-    @GetMapping("/user/list")
-    fun getUserResourceList(): ResponseEntity<*> {
-        return ResponseEntity.ok(ResponseDto().apply {
-            this.data = SSOUtil.getCurUserPerms()
-        })
-    }
-}

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

@@ -1,49 +0,0 @@
-package com.gxzc.zen.web.sys.controller
-
-import com.gxzc.zen.api.sys.service.ISysResourceRoleService
-import com.gxzc.zen.api.sys.service.ISysResourceService
-import com.gxzc.zen.common.base.BaseController
-import com.gxzc.zen.common.config.request.annotation.KVType
-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 com.gxzc.zen.common.dto.ResponseDto
-import io.swagger.annotations.ApiOperation
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.http.ResponseEntity
-import org.springframework.web.bind.annotation.*
-
-/**
- * 资源-角色 控制器
- * @author NorthLan
- * @date 2018/5/4
- * @url https://noahlan.com
- */
-@RestController
-@RequestMapping
-class ResourceRoleController : BaseController() {
-    @Autowired
-    private lateinit var resourceService: ISysResourceService
-
-    @Autowired
-    private lateinit var resourceRoleService: ISysResourceRoleService
-
-    @ApiOperation("获取某角色拥有的资源列表")
-    @GetMapping("/role/{rid}/resource")
-    fun getResourceByRoleId(@PathVariable rid: Long): ResponseEntity<*> {
-        return ResponseEntity.ok(ResponseDto().apply {
-            this.data = resourceService.getResourcesByRoleId(rid)
-        })
-    }
-
-    @Suppress("UNCHECKED_CAST")
-    @ApiOperation("保存(新增或更新用户资源映射表)")
-    @PostMapping("/role/{rid}/resource")
-    @ZenRequestTypes(KVType(key = "list", value = Long::class, type = KVTypeEnum.LIST), KVType(key = "menuId", value = Long::class))
-    fun postResourceByRoleId(@PathVariable rid: Long, @RequestBody requestDto: RequestDto): ResponseEntity<*> {
-        val menuId = requestDto["menuId"] as Long
-        val list = requestDto["list"] as List<Long>
-        resourceRoleService.saveResourceRoleByRoleId(rid, menuId, list)
-        return ResponseEntity.ok(ResponseDto())
-    }
-}

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

@@ -1,82 +0,0 @@
-package com.gxzc.zen.web.sys.controller
-
-import com.gxzc.zen.api.sys.model.SysRole
-import com.gxzc.zen.api.sys.service.ISysRoleService
-import com.gxzc.zen.common.base.BaseController
-import com.gxzc.zen.common.config.response.annotation.ZenResponseFilter
-import com.gxzc.zen.common.dto.ResponseDto
-import com.gxzc.zen.common.exception.ZenException
-import com.gxzc.zen.common.exception.ZenExceptionEnum
-import com.gxzc.zen.common.util.PaginationUtil
-import io.swagger.annotations.ApiOperation
-import org.slf4j.LoggerFactory
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.http.ResponseEntity
-import org.springframework.web.bind.annotation.*
-
-/**
- * 角色 控制器
- * @author NorthLan
- * @date 2018/3/24
- * @url https://noahlan.com
- */
-@RestController
-@RequestMapping("role")
-class RoleController : BaseController() {
-    companion object {
-        private val logger = LoggerFactory.getLogger(RoleController::class.java)
-    }
-
-    @Autowired
-    private lateinit var roleService: ISysRoleService
-
-    @ApiOperation("查询role列表")
-    @GetMapping("list")
-    @ZenResponseFilter(type = SysRole::class, filter = ["createBy", "createTime", "updateBy", "updateTime"])
-    fun list(@RequestParam(required = false) keyword: String?,
-             @RequestParam(required = false) searchOption: Int?,
-             @RequestParam(required = false) enable: Boolean?): ResponseEntity<*> {
-        val result: Any = if (PaginationUtil.paginable(getRequest())) {
-            roleService.getRoleListPage(keyword, searchOption, PaginationUtil.getRequestPage(getRequest())!!, enable)
-        } else {
-            roleService.getRoleList(keyword, searchOption, enable)
-        }
-        return ResponseEntity.ok(ResponseDto().apply { data = result })
-    }
-
-    @ApiOperation("查询指定id的role")
-    @GetMapping("{id}")
-    @ZenResponseFilter(type = SysRole::class, filter = ["createBy", "updateBy", "createTime", "updateTime"])
-    fun getById(@PathVariable id: Long): ResponseEntity<*> {
-        return ResponseEntity.ok(ResponseDto().apply {
-            data = roleService.selectById(id)
-        })
-    }
-
-    @PostMapping
-    @ZenResponseFilter(type = SysRole::class, filter = ["createBy", "updateBy", "createTime", "updateTime"])
-    fun insertRole(@RequestBody data: SysRole): ResponseEntity<*> {
-        if (!roleService.insert(data)) {
-            throw ZenException(ZenExceptionEnum.BIZ_INSERT_ERROR)
-        }
-        return ResponseEntity.ok(ResponseDto().apply {
-            this.data = data
-        }) // 201
-    }
-
-    @PutMapping
-    @ZenResponseFilter(type = SysRole::class, filter = ["createBy", "updateBy", "createTime", "updateTime"])
-    fun putDic(@RequestBody data: SysRole): ResponseEntity<*> {
-        roleService.updateLogicById(data)
-        return ResponseEntity.ok(ResponseDto().apply {
-            this.data = data
-        })
-    }
-
-    @DeleteMapping("{id}")
-    fun deleteDic(@PathVariable id: Long): ResponseEntity<*> {
-        // 物理删除数据
-        roleService.physicalDeleteById(id)
-        return ResponseEntity.ok(ResponseDto())
-    }
-}

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

@@ -1,109 +0,0 @@
-//package com.gxzc.zen.web.sys.controller
-//
-//import com.gxzc.zen.api.sys.model.SysParam
-//import com.gxzc.zen.api.sys.service.ISysParamService
-//import com.gxzc.zen.common.base.BaseController
-//import com.gxzc.zen.common.config.response.annotation.ZenResponseFilter
-//import com.gxzc.zen.common.dto.ResponseDto
-//import com.gxzc.zen.common.util.PaginationUtil
-//import org.slf4j.LoggerFactory
-//import org.springframework.beans.factory.annotation.Autowired
-//import org.springframework.http.ResponseEntity
-//import org.springframework.web.bind.annotation.*
-//import java.net.URI
-//
-///**
-// * 系统参数控制器
-// * @author NorthLan
-// * @date 2018/3/19
-// * @url https://noahlan.com
-// */
-//@RestController
-//@RequestMapping("sys/param")
-//class SysParamController : BaseController() {
-//    companion object {
-//        private val logger = LoggerFactory.getLogger(SysParamController::class.java)
-//    }
-//
-//    @Autowired
-//    private lateinit var sysParamService: ISysParamService
-//
-//    @GetMapping("/list")
-//    @ZenResponseFilter(type = SysParam::class, filter = ["createBy", "updateBy", "createTime", "updateTime"])
-//    fun getList(@RequestParam(required = false) keyword: String?,
-//                @RequestParam(required = false) searchOption: Int?,
-//                @RequestParam(required = false) current: Int?,
-//                @RequestParam(required = false) pageSize: Int?): ResponseEntity<*> {
-//        var data: MutableList<SysParam> = sysParamService.getListCacheable()
-//        if (!keyword.isNullOrEmpty() && searchOption != null) {
-//            data = data.filter {
-//                when (searchOption) {
-//                    1 -> run {
-//                        if (it.key != null) {
-//                            keyword!! in it.key!!
-//                        } else {
-//                            false
-//                        }
-//                    }
-//                    2 -> run {
-//                        if (it.label != null) {
-//                            keyword!! in it.label!!
-//                        } else {
-//                            false
-//                        }
-//                    }
-//                    else -> false
-//                }
-//            }.toMutableList()
-//        }
-//
-//        return if (PaginationUtil.paginable(getRequest())) {
-//            // 分页
-//            ResponseEntity.ok(ResponseDto().apply {
-//                this.data = PaginationUtil.logicPaging(data, getRequest())
-//            })
-//        } else {
-//            ResponseEntity.ok(ResponseDto().apply {
-//                this.data = data
-//            })
-//        }
-//    }
-//
-//    @GetMapping("{id}")
-//    @ZenResponseFilter(type = SysParam::class, filter = ["createBy", "updateBy", "createTime", "updateTime"])
-//    fun getById(@PathVariable id: Long): ResponseEntity<*> {
-//        return ResponseEntity.ok(ResponseDto().apply {
-//            data = sysParamService.selectById(id)
-//        })
-//    }
-//
-//    @GetMapping("keys/{key}")
-//    @ZenResponseFilter(type = SysParam::class, filter = ["createBy", "updateBy", "createTime", "updateTime"])
-//    fun getByKey(@PathVariable key: String): ResponseEntity<*> {
-//        return ResponseEntity.ok(ResponseDto().apply {
-//            data = sysParamService.getListByKey(key)
-//        })
-//    }
-//
-//    @PutMapping
-//    @ZenResponseFilter(type = SysParam::class, filter = ["createBy", "updateBy", "createTime", "updateTime"])
-//    fun putDic(@RequestBody data: SysParam): ResponseEntity<*> {
-//        return if (data.id == null) {
-//            // insert
-//            sysParamService.insertCacheable(data.apply { id = null })
-//            ResponseEntity.created(URI.create("/sys/dic/${data.id}")).body(ResponseDto()) // 201
-//        } else {
-//            // update
-//            ResponseEntity.ok(ResponseDto().apply {
-//                this.data = sysParamService.modify(data) // 200
-//            })
-//        }
-//    }
-//
-//    @DeleteMapping("{id}")
-//    fun deleteDic(@PathVariable id: Long): ResponseEntity<*> {
-//        // 物理删除数据
-//        sysParamService.physicalDeleteCacheable(id)
-//        return ResponseEntity.ok(ResponseDto())
-//    }
-//}

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

@@ -1,83 +0,0 @@
-package com.gxzc.zen.web.sys.controller
-
-import com.gxzc.zen.api.sys.service.ISysUploadInfoService
-import com.gxzc.zen.common.base.BaseController
-import com.gxzc.zen.common.dto.ZenFileMetadata
-import com.gxzc.zen.common.exception.ZenException
-import com.gxzc.zen.common.util.UploadUtil
-import io.swagger.annotations.ApiOperation
-import org.slf4j.LoggerFactory
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.http.HttpStatus
-import org.springframework.http.ResponseEntity
-import org.springframework.web.bind.annotation.GetMapping
-import org.springframework.web.bind.annotation.PostMapping
-import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.RestController
-import org.springframework.web.multipart.MultipartFile
-
-/**
- * 上传文件 控制器
- * @author NorthLan
- * @date 2018/5/19
- * @url https://noahlan.com
- */
-@RestController
-@RequestMapping("/upload")
-class UploadController : BaseController() {
-    companion object {
-        private val logger = LoggerFactory.getLogger(UploadController::class.java)
-    }
-
-    @Autowired
-    private lateinit var uploadInfoService: ISysUploadInfoService
-
-    @ApiOperation("获取已上传分片列表")
-    @GetMapping
-    fun checkChunk(fileMetadata: ZenFileMetadata): ResponseEntity<*> {
-        // 检查已上传文件分片
-        val ret = UploadUtil.checkUpload(fileMetadata)
-        return if (ret.uploadedChunks != null) {
-            when (ret.status) {
-            // 单文件完成,插入数据库
-                UploadUtil.STATUS.UPLOADED -> uploadInfoService.addUploadFile(fileMetadata, ret.file!!)
-            // 批次完成,将最后个文件插入 而后取出所有本批次文件信息
-                UploadUtil.STATUS.BATCH_UPLOADED -> {
-                    uploadInfoService.addUploadFile(fileMetadata, ret.file!!)
-                    ret.info = uploadInfoService.getUploadInfosByBatchId(fileMetadata.batchId!!)
-                }
-            }
-            ResponseEntity.ok(ret)
-        } else {
-            ResponseEntity.status(204).body(ret)
-        }
-    }
-
-    @ApiOperation("上传", notes = "支持小文件上传,大文件分片上传(统一分片)")
-    @PostMapping
-    fun upload(fileMetadata: ZenFileMetadata, file: MultipartFile?): ResponseEntity<*> {
-        if (file == null) {
-            return ResponseEntity.status(HttpStatus.NOT_ACCEPTABLE.value()).body(null)
-        }
-        val uploadResponse = try {
-            UploadUtil.upload(fileMetadata, file)
-        } catch (e: ZenException) {
-            null
-        }
-
-        return if (uploadResponse != null) {
-            when (uploadResponse.status) {
-            // 单文件完成,插入数据库
-                UploadUtil.STATUS.UPLOADED -> uploadInfoService.addUploadFile(fileMetadata, uploadResponse.file!!)
-            // 批次完成,将最后个文件插入 而后取出所有本批次文件信息
-                UploadUtil.STATUS.BATCH_UPLOADED -> {
-                    uploadInfoService.addUploadFile(fileMetadata, uploadResponse.file!!)
-                    uploadResponse.info = uploadInfoService.getUploadInfosByBatchId(fileMetadata.batchId!!)
-                }
-            }
-            ResponseEntity.ok(uploadResponse)
-        } else {
-            ResponseEntity.status(HttpStatus.NOT_ACCEPTABLE.value()).body(null)
-        }
-    }
-}

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

@@ -1,112 +0,0 @@
-package com.gxzc.zen.web.sys.controller
-
-import com.gxzc.zen.api.sys.model.SysRole
-import com.gxzc.zen.api.sys.model.SysUser
-import com.gxzc.zen.api.sys.service.ISysMenuService
-import com.gxzc.zen.api.sys.service.ISysUserService
-import com.gxzc.zen.common.base.BaseController
-import com.gxzc.zen.common.config.response.annotation.ZenResponseFilter
-import com.gxzc.zen.common.config.response.annotation.ZenResponseFilters
-import com.gxzc.zen.common.dto.ResponseDto
-import com.gxzc.zen.common.util.PaginationUtil
-import com.gxzc.zen.umps.util.SSOUtil
-import io.swagger.annotations.ApiOperation
-import org.slf4j.LoggerFactory
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.http.ResponseEntity
-import org.springframework.web.bind.annotation.*
-
-/**
- * 用户相关控制器
- * @author NorthLan
- * @date 2018/3/2
- * @url https://noahlan.com
- */
-@RestController
-@RequestMapping("user")
-class UserController : BaseController() {
-    companion object {
-        private val logger = LoggerFactory.getLogger(UserController::class.java)
-    }
-
-    @Autowired
-    private lateinit var userService: ISysUserService
-
-    @Autowired
-    private lateinit var menuService: ISysMenuService
-
-    @ApiOperation("获取用户信息")
-    @GetMapping("{id}")
-    @ZenResponseFilter(type = SysUser::class, filter = ["createTime", "createBy", "updateTime", "updateBy", "password", "salt"])
-    fun getById(@PathVariable id: Long): ResponseEntity<*> {
-        return ResponseEntity.ok(ResponseDto().apply {
-            data = userService.selectById(id)
-        })
-    }
-
-    @ApiOperation("修改用户信息")
-    @PutMapping
-    @ZenResponseFilter(type = SysUser::class, filter = ["createTime", "createBy", "updateTime", "updateBy", "password", "salt"])
-    fun putUser(@RequestBody data: SysUser): ResponseEntity<*> {
-        return ResponseEntity.ok(ResponseDto().apply {
-            this.data = userService.modify(data)
-        })
-    }
-
-    @ApiOperation("注册")
-    @PostMapping
-    @ZenResponseFilter(type = SysUser::class, include = ["id", "enable", "account", "username", "position", "address", "staffNo", "remark"])
-    fun register(@RequestBody entity: SysUser): ResponseEntity<*> {
-        return ResponseEntity.ok(ResponseDto().data(userService.register(entity)))
-    }
-
-    @DeleteMapping("{id}")
-    fun delete(@PathVariable id: Long): ResponseEntity<*> {
-        userService.delete(id)
-        return ResponseEntity.ok(ResponseDto())
-    }
-
-    @ApiOperation("查询用户列表")
-    @GetMapping("/list")
-    @ZenResponseFilters(
-            ZenResponseFilter(type = SysUser::class, filter = ["createTime", "createBy", "updateTime", "updateBy", "password", "salt"]),
-            ZenResponseFilter(type = SysRole::class, include = ["id", "name"])
-    )
-    fun list(@RequestParam(required = false) keyword: String?,
-             @RequestParam(required = false) searchOption: Int?,
-             @RequestParam(required = false) enable: Boolean?): ResponseEntity<*> {
-        val result: Any = if (PaginationUtil.paginable(getRequest())) {
-            userService.getUserListPage(keyword, searchOption, PaginationUtil.getRequestPage(getRequest())!!, enable)
-        } else {
-            userService.getUserList(keyword, searchOption, enable)
-        }
-        return ResponseEntity.ok(ResponseDto().apply {
-            this.data = result
-        })
-    }
-
-
-    @GetMapping("/info")
-    @ZenResponseFilters(
-            ZenResponseFilter(type = SysUser::class, include = ["id", "enable", "account", "username", "position", "address", "staffNo", "remark"]),
-            ZenResponseFilter(type = SysRole::class, include = ["id", "enable", "name", "code", "perms", "remark"])
-    )
-    fun userInfo(@RequestParam platformId: Long): ResponseEntity<*> {
-        return ResponseEntity.ok(ResponseDto().apply {
-            data = mutableMapOf(
-                    "info" to SSOUtil.getCurUserInfo(),
-                    "menu" to menuService.getUserMenuTree(platformId),
-                    "roles" to SSOUtil.getCurUserRoles(),
-                    "perms" to SSOUtil.getCurUserPerms()
-            )
-        })
-    }
-
-    @ApiOperation("获取自身拥有的资源列表")
-    @GetMapping("/resource")
-    fun getResourceByUserId(): ResponseEntity<*> {
-        return ResponseEntity.ok(ResponseDto().apply {
-            this.data = SSOUtil.getCurUserPerms()
-        })
-    }
-}

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

@@ -1,45 +0,0 @@
-package com.gxzc.zen.web.sys.controller
-
-import com.gxzc.zen.api.sys.service.ISysUserRoleService
-import com.gxzc.zen.common.base.BaseController
-import com.gxzc.zen.common.dto.ResponseDto
-import io.swagger.annotations.ApiOperation
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.http.ResponseEntity
-import org.springframework.web.bind.annotation.*
-
-/**
- *
- * @author NorthLan
- * @date 2018/5/10
- * @url https://noahlan.com
- */
-@RestController
-class UserRoleController : BaseController() {
-
-    @Autowired
-    private lateinit var userRoleService: ISysUserRoleService
-
-    @ApiOperation("获取用户角色列表")
-    @GetMapping("/user/{userId}/role/list")
-    fun getRoleListByUserId(@PathVariable userId: Long): ResponseEntity<*> {
-        return ResponseEntity.ok(ResponseDto().apply {
-            this.data = userRoleService.getUserRoleListByUserId(userId)
-        })
-    }
-
-    @ApiOperation("获取用户角色id列表")
-    @GetMapping("/user/{userId}/role/idList")
-    fun getRoleIdListByUserId(@PathVariable userId: Long): ResponseEntity<*> {
-        return ResponseEntity.ok(ResponseDto().apply {
-            this.data = userRoleService.getUserRoleIdListByUserId(userId)
-        })
-    }
-
-    @ApiOperation("更新用户角色信息")
-    @PutMapping("/user/{userId}/role")
-    fun updateRoleByUserId(@PathVariable userId: Long, @RequestBody roleIds: List<Long>): ResponseEntity<*> {
-        userRoleService.updateByUserId(userId, roleIds)
-        return ResponseEntity.ok(ResponseDto())
-    }
-}

zen-web/src/main/resources/application-orm-mycat-dev.yml → zen-web/src/main/resources/application-orm-dev.yml

@@ -14,7 +14,7 @@ spring:
     driver-class-name: com.mysql.jdbc.Driver
     username: archives
     password: archives
-    url: jdbc:mysql://192.168.1.10:8066/SYS?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&useSSL=false&zeroDateTimeBehavior=convertToNull
+    url: jdbc:mysql://192.168.1.10:3066/archives_common?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&useSSL=false&zeroDateTimeBehavior=convertToNull
 # &useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC
 
 ###################  mybatis-plus配置  ###################

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

@@ -1,8 +1,8 @@
 dubbo:
-  enabled: false
+  enabled: true
   application:
-    name: zen-dubbo
-    id: zen-dubbo
+    name: zen-xxx # 业务模块名称,必须区分开来
+    id: zen-xxx # 系统:sys 收:rec 存:save 管:mgr 用:util 库:inv
   scan:
     base-packages: com.gxzc.zen.rpc.provider
   protocol:

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

@@ -1,15 +0,0 @@
-spring:
-  http:
-    multipart:
-      enabled: true
-      max-request-size: 50MB #最大请求大小
-      max-file-size: 25MB #最大文件大小
-      location: ${java.io.tmpdir}
-      file-size-threshold: 5MB
-
-# 自定义配置
-upload:
-  tmpPath: D://tmp # 临时文件存放位置 默认 /tmp/zen
-  dataPath: D://data
-  maxFileSize: 4294967296 # 单位 byte 为0表示无限制
-  chunkSize: 10485760 # 10*1024*1024 = 10MB

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

@@ -1,15 +0,0 @@
-spring:
-  http:
-    multipart:
-      enabled: true
-      max-request-size: 50MB #最大请求大小
-      max-file-size: 25MB #最大文件大小
-      location: ${java.io.tmpdir}
-      file-size-threshold: 5MB
-
-# 自定义配置
-upload:
-  tmpPath: /tmp # 临时文件存放位置 默认 /tmp/zen
-  dataPath: /archives/upload
-  maxFileSize: 4294967296 # 单位 byte 为0表示无限制
-  chunkSize: 10485760 # 10*1024*1024 = 10MB

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

@@ -1,8 +1,8 @@
 spring:
   profiles:
     active: dev
-#    include: orm-mycat-dev,rpc-dev,mq-dev,cache-dev,umps-dev,platform-dev,job-dev,upload-dev
-    include: orm-mycat-prod,rpc-prod,mq-prod,cache-prod,umps-prod,platform-prod,job-prod,upload-prod
+    include: orm-dev,rpc-dev,mq-dev,cache-dev,umps-dev,platform-dev,job-dev
+#    include: orm-mycat-prod,rpc-prod,mq-prod,cache-prod,umps-prod,platform-prod,job-prod
 ---
 spring:
   profiles: dev
@@ -19,7 +19,7 @@ spring:
     name: Zen
 
 server:
-  port: 8082
+  port: 10000
 
 zen:
   swagger-open: true # swagger-ui是否开启
@@ -51,7 +51,7 @@ spring:
     name: Zen
 
 server:
-  port: 8082 # 生产环境端口号
+  port: 10000 # 生产环境端口号
 
 zen:
   swagger-open: false # swagger-ui是否开启