* 修复用户相关控制器

* 添加platformId = 6 (库房管理)
* 移除UploadController

README.md

@@ -27,6 +27,12 @@
 
 ## 更新日志
 
+### 2018-05-10
+
+* 修复用户相关控制器
+* 添加platformId = 6 (库房管理)
+* 移除UploadController
+
 ### 2018-05-07
 
 * `重要更新` 融合zookeeper和dubbo作为rpc框架 (zen-rpc模块)

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

@@ -19,33 +19,22 @@ interface ISysUserRoleService : BaseService<SysUserRole> {
     fun getUserRoleListByUserId(id: Long): MutableList<SysRole>
 
     /**
-     * 获取指定角色id的用户id列表
-     */
-    fun getUserIdListByRoleId(id: Long): Set<Long>
-
-    /**
-     * 物理删除 roleIds指定的 用户角色列表
+     * 获取指定用户的角色id列表
      */
-    fun physicalDeleteBatch(userId: Long, roleIds: List<Long>)
-
-    fun physicalDeleteById(id: Long)
-
-    fun physicalDeleteByUserId(userId: Long)
+    fun getUserRoleIdListByUserId(id: Long): List<Long>
 
     /**
-     * 批量插入
+     * 获取指定角色id的用户id列表
      */
-    fun insertBatch(userId: Long, roleIds: List<Long>)
+    fun getUserIdListByRoleId(id: Long): Set<Long>
 
     /**
-     * 删除缓存
+     * 删除某用户的角色关联信息
      */
-    fun evictCache(id: Long)
-
-    fun evictCache(ids: Set<Long>)
+    fun deleteByUserId(userId: Long)
 
     /**
-     * 获取所有用户的角色列表
+     * 更新用户的角色关系
      */
-//    fun getUserRoleList(): Map<Long, MutableList<SysRole>>
+    fun updateByUserId(userId: Long, roleIds: List<Long>)
 }

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

@@ -1,5 +1,6 @@
 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
 
@@ -15,6 +16,33 @@ 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)
+
 //    /**
 //     * 查询用户列表
 //     * 缓存

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

@@ -5,14 +5,10 @@ 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.ISysPermissionService
 import com.gxzc.zen.api.sys.service.ISysUserRoleService
-import com.gxzc.zen.common.exception.ZenException
-import com.gxzc.zen.common.exception.ZenExceptionEnum
-import com.gxzc.zen.orm.annotation.DynamicDataSource
 import com.gxzc.zen.orm.annotation.ZenTransactional
-import com.gxzc.zen.orm.contants.DSKey
-import org.springframework.beans.factory.annotation.Autowired
+import com.gxzc.zen.umps.constant.ZenHttpSession
+import com.gxzc.zen.umps.util.ShiroRedisUtil
 import org.springframework.stereotype.Service
 
 /**
@@ -25,15 +21,15 @@ import org.springframework.stereotype.Service
  */
 @Service
 class SysUserRoleServiceImpl : ServiceImpl<SysUserRoleMapper, SysUserRole>(), ISysUserRoleService {
-
-    @Autowired
-    private lateinit var sysPermissionService: ISysPermissionService
-
-//    @Cacheable(CACHEKEYS.USER_ROLE, key = "'${CACHEKEYS.USER_ROLE}:uid_'+ #id")
     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 {
@@ -42,61 +38,39 @@ class SysUserRoleServiceImpl : ServiceImpl<SysUserRoleMapper, SysUserRole>(), IS
     }
 
     @ZenTransactional
-    override fun physicalDeleteBatch(userId: Long, roleIds: List<Long>) {
-        if (roleIds.isEmpty()) {
-            return
-        }
-        baseMapper.physicalDelete(EntityWrapper<SysUserRole>()
-                .eq("user_id", userId)
-                .`in`("role_id", roleIds))
-        evictCache(userId)
-    }
-
-    @ZenTransactional
-    override fun physicalDeleteById(id: Long) {
-        val tmp = baseMapper.selectWOLogic(EntityWrapper<SysUserRole>().eq("id", id))
-        if (tmp.size < 1) {
-            return
-        }
-        baseMapper.physicalDelete(EntityWrapper<SysUserRole>()
-                .eq("id", id))
-        evictCache(tmp[0].userId!!)
-    }
-
-    @ZenTransactional
-    override fun physicalDeleteByUserId(userId: Long) {
+    override fun deleteByUserId(userId: Long) {
         baseMapper.physicalDelete(EntityWrapper<SysUserRole>()
                 .eq("user_id", userId))
-        evictCache(userId)
     }
 
-    @DynamicDataSource(DSKey.DSKEY_SYS)
     @ZenTransactional
-    override fun insertBatch(userId: Long, roleIds: List<Long>) {
-        if (roleIds.isEmpty()) {
-            return
-        }
-        val dataList = mutableListOf<SysUserRole>()
-        roleIds.forEach {
-//            dataList.add(SysUserRole(it, userId))
-        }
-        if (!this.insertBatch(dataList)) {
-            throw ZenException(ZenExceptionEnum.BIZ_INSERT_ERROR)
-        }
-        evictCache(userId)
-    }
-
-    override fun evictCache(id: Long) {
-//        RedisCacheUtil.evict(CACHEKEYS.USER_ROLE, "${CACHEKEYS.USER_ROLE}:uid_$id")
-//        sysPermissionService.evictCache(id)
-    }
+    override fun updateByUserId(userId: Long, roleIds: List<Long>) {
+        // 先查询userId 所有的roleIds
+        val tempRoleIds = getUserRoleIdListByUserId(userId)
+        val deleteIds = tempRoleIds.subtract(roleIds)
+        val insertIds = roleIds.subtract(tempRoleIds)
 
-    override fun evictCache(ids: Set<Long>) {
-        ids.forEach {
-//            RedisCacheUtil.evict(CACHEKEYS.USER_ROLE, "${CACHEKEYS.USER_ROLE}:uid_$it")
-//            sysPermissionService.evictCache(it)
+        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,10 +1,21 @@
 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 com.gxzc.zen.orm.annotation.ZenTransactional
+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
 
 /**
@@ -18,11 +29,13 @@ import org.springframework.stereotype.Service
 @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
@@ -30,128 +43,117 @@ class SysUserServiceImpl : ServiceImpl<SysUserMapper, SysUser>(), ISysUserServic
         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 getListCacheable(): MutableList<SysUser> {
-//        val cached = RedisCacheUtil.get(CACHEKEYS.USER, CACHE_KEY_ALL)?.get() as? MutableList<SysUser>
-//        if (cached != null) {
-//            return cached
-//        }
-////        val ret = baseMapper.selectByParams(null)
-//        val ret = baseMapper.selectWOLogic(null)
-//        if (PlatformUtil.getPlatform(platformProperties) == PLATFORM.SYSTEM) {
-//            RedisCacheUtil.put(CACHEKEYS.USER, CACHE_KEY_ALL, ret)
-//        }
-//        return ret
-//    }
-//
-//    override fun getUserByAccountCacheable(account: String): SysUser? {
-//        return getListCacheable().find {
-//            it.account == account
-//        }
-//    }
-//
-//    override fun getUserByIdCacheable(id: Long): SysUser? {
-//        return getListCacheable().find {
-//            it.id == id
-//        }
-//    }
-//
-//    @ZenTransactional
-//    override fun insertCacheable(entity: SysUser) {
-//        if (PlatformUtil.getPlatform() == PLATFORM.SYSTEM) {
-//            // 处理一下密码
-//            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)!!
-//            entity.salt = salt
-//            entity.password = MD5Salt.md5SaltEncode(salt, entity.password!!)
-//
-//            if (baseMapper.insert(entity) == 0) {
-//                throw ZenException(ZenExceptionEnum.BIZ_INSERT_ERROR)
-//            }
-//
-//            // role
-//            val newRoleIdList = entity.roles?.map { it.id!! }
-//            if (newRoleIdList != null) {
-//                userRoleService.insertBatch(entity.id!!, newRoleIdList)
-//            }
-//
-//            val cached = RedisCacheUtil.get(CACHEKEYS.USER, CACHE_KEY_ALL)?.get() as? MutableList<SysUser>
-//            cached?.let {
-//                it.add(entity)
-//                RedisCacheUtil.put(CACHEKEYS.USER, CACHE_KEY_ALL, it)
-//            }
-//        }
-//    }
-//
-//    @ZenTransactional
-//    override fun modify(entity: SysUser): SysUser {
-//        if (PlatformUtil.getPlatform() == PLATFORM.SYSTEM) {
-//            /* 更新
-//             * 查询原有角色
-//             * 删除 / 新增 角色
-//             */
-//            val userRoleIdList = userRoleService.getUserRoleListByUserId(entity.id!!).map { it.id!! }
-//            val newRoleIdList = entity.roles?.map { it.id!! }
-//            if (newRoleIdList != null) {
-//                // del
-//                val delRoleIdList = userRoleIdList.toMutableList()
-//                delRoleIdList.removeAll(newRoleIdList)
-//                // addChild
-//                val addRoleIdList = newRoleIdList.toMutableList()
-//                addRoleIdList.removeAll(userRoleIdList)
-//
-//                userRoleService.physicalDeleteBatch(entity.id!!, delRoleIdList)
-//                userRoleService.insertBatch(entity.id!!, addRoleIdList)
-//            }
-//
-//            val originEntity = baseMapper.selectById(entity.id!!)
-//
-//            // 密码搞一下
-//            if (!entity.password.isNullOrEmpty() && entity.password!!.length >= 6) {
-//                val salt = RandomStringUtils.randomAlphanumeric(9)!!
-//                entity.salt = salt
-//                entity.password = MD5Salt.md5SaltEncode(salt, entity.password!!)
-//            } else {
-//                entity.password = originEntity.password
-//                entity.salt = originEntity.salt
-//            }
-//
-//            baseMapper.updateWOLogic(entity, EntityWrapper<SysUser>().eq("id", entity.id))
-////            throw ZenException(ZenExceptionEnum.SERVER_ERROR)
-//            // 更新缓存
-//            val cached = RedisCacheUtil.get(CACHEKEYS.USER, CACHE_KEY_ALL)?.get() as? MutableList<SysUser>
-//            cached?.let {
-//                val idx = it.indexOfFirst { it.id == entity.id }
-//                if (idx != -1) {
-//                    it[idx] = entity
-//                }
-//                RedisCacheUtil.put(CACHEKEYS.USER, CACHE_KEY_ALL, it)
-//            }
-//        }
-//        return entity
-//    }
-//
-//    @ZenTransactional
-//    override fun physicalDeleteCacheable(id: Long) {
-//        if (PlatformUtil.getPlatform() == PLATFORM.SYSTEM) {
-//            if (baseMapper.physicalDelete(EntityWrapper<SysUser>().eq("id", id)) <= 0) {
-//                throw ZenException(ZenExceptionEnum.BIZ_DELETE_ERROR)
-//            }
-//            // 删除与之关联的所有系统表数据
-//            userRoleService.physicalDeleteByUserId(id)
-//            //
-//            val cached = RedisCacheUtil.get(CACHEKEYS.USER, CACHE_KEY_ALL)?.get() as? MutableList<SysUser>
-//            cached?.let {
-//                it.removeIf {
-//                    it.id == id
-//                }
-//                RedisCacheUtil.put(CACHEKEYS.USER, CACHE_KEY_ALL, it)
-//            }
-//        }
-//    }
+    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
+    }
+
+    @ZenTransactional
+    override fun delete(id: Long) {
+        if (baseMapper.physicalDeleteById(id) > 0) {
+            // 删除用户相关所有东西
+            userRoleService.deleteByUserId(id)
+        }
+    }
 }

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

@@ -27,6 +27,7 @@
         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/test/kotlin/com/gxzc/zen/api/PasswordGen.kt

@@ -12,6 +12,8 @@ import org.junit.Test
 class PasswordGen {
     @Test
     fun genPassword() {
-        println(SimpleHash("md5", "123456", "admin" + "kidntkdij", 2))
+        println(SimpleHash("md5", "123456", "guest" + "hahahaha", 2))
+        println(SimpleHash("md5", "123456", "guest" + "hahahaha", 2).toHex())
+        println(SimpleHash("md5", "123456", "guest" + "hahahaha", 2).toString())
     }
 }

zen-api/src/test/kotlin/com/gxzc/zen/api/TestDictTypeTreeRedis.kt

@@ -1,110 +1,110 @@
-package com.gxzc.zen.api
-
-import com.fasterxml.jackson.databind.ObjectMapper
-import com.gxzc.zen.api.sys.common.DictTypeTree
-import com.gxzc.zen.common.util.TreeUtil
-import org.junit.Test
-
-/**
- *
- * @author NorthLan
- * @date 2018/4/28
- * @url https://noahlan.com
- */
-class TestDictTypeTreeRedis {
-
-    fun buildData(): MutableList<DictTypeTree> {
-        return mutableListOf<DictTypeTree>().apply {
-            add(DictTypeTree().apply {
-                id = 1
-                parentId = 0
-                type = 1
-            })
-            add(DictTypeTree().apply {
-                id = 2
-                parentId = 1
-                type = 1
-            })
-            add(DictTypeTree().apply {
-                id = 3
-                parentId = 1
-                type = 1
-            })
-            add(DictTypeTree().apply {
-                id = 4
-                parentId = 2
-                type = 1
-                code = "test"
-            })
-            add(DictTypeTree().apply {
-                id = 5
-                parentId = 4
-                type = 2
-                value = "1"
-                code = "test"
-            })
-            add(DictTypeTree().apply {
-                id = 6
-                parentId = 4
-                type = 2
-                value = "2"
-                code = "test"
-            })
-            add(DictTypeTree().apply {
-                id = 7
-                parentId = 4
-                type = 2
-                value = "3"
-                code = "test"
-            })
-            add(DictTypeTree().apply {
-                id = 8
-                parentId = 4
-                type = 2
-                value = "4"
-                code = "test"
-            })
-            add(DictTypeTree().apply {
-                id = 9
-                parentId = 4
-                type = 2
-                value = "5"
-                code = "test"
-            })
-            add(DictTypeTree().apply {
-                id = 10
-                parentId = 4
-                type = 2
-                value = "6"
-                code = "test"
-            })
-        }
-    }
-
-    @Test
-    fun testTreeFind() {
-        val data = buildData()
-        val tree = TreeUtil.buildByRecursive(data, 0)
-
-        println(ObjectMapper().writeValueAsString(tree))
-
-        var now = System.currentTimeMillis()
-        val find = TreeUtil.findBFS(tree) {
-            it.type == 1 && it.code == "test"
-        }
-
-        println("BFS: ${System.currentTimeMillis() - now}")
-
-        println(ObjectMapper().writeValueAsString(find))
-
-        now = System.currentTimeMillis()
-        val find2 = TreeUtil.findDFS(tree) {
-            it.type == 1 && it.code == "test"
-        }
-
-        println("DFS: ${System.currentTimeMillis() - now}")
-
-
-        println(ObjectMapper().writeValueAsString(find2))
-    }
-}
+//package com.gxzc.zen.api
+//
+//import com.fasterxml.jackson.databind.ObjectMapper
+//import com.gxzc.zen.api.sys.common.DictTypeTree
+//import com.gxzc.zen.common.util.TreeUtil
+//import org.junit.Test
+//
+///**
+// *
+// * @author NorthLan
+// * @date 2018/4/28
+// * @url https://noahlan.com
+// */
+//class TestDictTypeTreeRedis {
+//
+//    fun buildData(): MutableList<DictTypeTree> {
+//        return mutableListOf<DictTypeTree>().apply {
+//            add(DictTypeTree().apply {
+//                id = 1
+//                parentId = 0
+//                type = 1
+//            })
+//            add(DictTypeTree().apply {
+//                id = 2
+//                parentId = 1
+//                type = 1
+//            })
+//            add(DictTypeTree().apply {
+//                id = 3
+//                parentId = 1
+//                type = 1
+//            })
+//            add(DictTypeTree().apply {
+//                id = 4
+//                parentId = 2
+//                type = 1
+//                code = "test"
+//            })
+//            add(DictTypeTree().apply {
+//                id = 5
+//                parentId = 4
+//                type = 2
+//                value = "1"
+//                code = "test"
+//            })
+//            add(DictTypeTree().apply {
+//                id = 6
+//                parentId = 4
+//                type = 2
+//                value = "2"
+//                code = "test"
+//            })
+//            add(DictTypeTree().apply {
+//                id = 7
+//                parentId = 4
+//                type = 2
+//                value = "3"
+//                code = "test"
+//            })
+//            add(DictTypeTree().apply {
+//                id = 8
+//                parentId = 4
+//                type = 2
+//                value = "4"
+//                code = "test"
+//            })
+//            add(DictTypeTree().apply {
+//                id = 9
+//                parentId = 4
+//                type = 2
+//                value = "5"
+//                code = "test"
+//            })
+//            add(DictTypeTree().apply {
+//                id = 10
+//                parentId = 4
+//                type = 2
+//                value = "6"
+//                code = "test"
+//            })
+//        }
+//    }
+//
+//    @Test
+//    fun testTreeFind() {
+//        val data = buildData()
+//        val tree = TreeUtil.buildByRecursive(data, 0)
+//
+//        println(ObjectMapper().writeValueAsString(tree))
+//
+//        var now = System.currentTimeMillis()
+//        val find = TreeUtil.findBFS(tree) {
+//            it.type == 1 && it.code == "test"
+//        }
+//
+//        println("BFS: ${System.currentTimeMillis() - now}")
+//
+//        println(ObjectMapper().writeValueAsString(find))
+//
+//        now = System.currentTimeMillis()
+//        val find2 = TreeUtil.findDFS(tree) {
+//            it.type == 1 && it.code == "test"
+//        }
+//
+//        println("DFS: ${System.currentTimeMillis() - now}")
+//
+//
+//        println(ObjectMapper().writeValueAsString(find2))
+//    }
+//}

zen-core/src/main/kotlin/com/gxzc/zen/common/exception/ZenExceptionEnum.kt

@@ -13,11 +13,13 @@ enum class ZenExceptionEnum(val code: Int, val msg: String) {
     AUTH_ACCOUNT_NOT_EXISTS(100, "账号不存在"),
     AUTH_PASSWORD_ERROR(101, "密码错误"),
     AUTH_NO_LOGIN(102, "未登录"),
+    AUTH_LOCKED(103, "账号被锁定"),
 
     /**
      * Register
      */
     REG_PASSWORD_ERROR(200,"密码格式错误"),
+    REG_ACCOUNT_EXISTS(201, "账号已存在"),
 
     /**
      * 文件上传

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

@@ -12,7 +12,8 @@ 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.AuthenticationException
+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
@@ -51,12 +52,14 @@ class AuthController : BaseController() {
         val user = userService.getUserByAccount(account)
         try {
             SecurityUtils.getSubject().login(ZenAuthToken(account, password, rememberMe, getRequest().remoteHost, user))
-        } catch (e: AuthenticationException) {
-            logger.warn("login error,", e)
+        } 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)

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

@@ -30,7 +30,6 @@ class RoleController : BaseController() {
     @Autowired
     private lateinit var roleService: ISysRoleService
 
-
     @ApiOperation("查询role列表")
     @GetMapping("list")
     @ZenResponseFilter(type = SysRole::class, filter = ["createBy", "createTime", "updateBy", "updateTime"])

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

@@ -1,29 +0,0 @@
-package com.gxzc.zen.web.sys.controller
-
-import com.gxzc.zen.common.base.BaseController
-import org.springframework.http.ResponseEntity
-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
-import java.io.File
-
-/**
- * 文件上传 控制器
- * @author NorthLan at 2018/3/14
- */
-@RestController
-@RequestMapping("upload")
-class UploadController : BaseController() {
-
-    @PostMapping("tmp")
-    fun uploadTempFile(file: MultipartFile, haha: MultipartFile): ResponseEntity<*> {
-
-
-        val tmp = File.createTempFile("", "")
-        if (tmp == null) {
-            // 创建文件失败
-        }
-        return ResponseEntity.ok(tmp.absolutePath)
-    }
-}

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

@@ -7,15 +7,14 @@ 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.RequestDto
 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.*
-import java.net.URI
 
 /**
  * 用户相关控制器
@@ -36,7 +35,7 @@ class UserController : BaseController() {
     @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<*> {
@@ -45,82 +44,45 @@ class UserController : BaseController() {
         })
     }
 
+    @ApiOperation("修改用户信息")
     @PutMapping
     @ZenResponseFilter(type = SysUser::class, filter = ["createTime", "createBy", "updateTime", "updateBy", "password", "salt"])
     fun putUser(@RequestBody data: SysUser): ResponseEntity<*> {
-        return if (data.id != null) {
-            ResponseEntity.ok(ResponseDto().apply {
-                //                this.data = userService.modify(data) // 200
-            })
-        } else {
-            // 插入,新增 角色
-//            userService.insertCacheable(data)
-            ResponseEntity.created(URI.create("/user/${data.id}")).body(ResponseDto()) // 201
-        }
+        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.physicalDeleteCacheable(id)
+        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?): ResponseEntity<*> {
-//        // 获取用户列表(忽略enable)
-//        var data: MutableList<SysUser> = userService.getListCacheable()
-//        if (!keyword.isNullOrEmpty() && searchOption != null) {
-//            data = data.filter {
-//                when (searchOption) {
-//                    1 -> run {
-//                        if (it.account != null) {
-//                            keyword!! in it.account!!
-//                        } else {
-//                            false
-//                        }
-//                    }
-//                    2 -> run {
-//                        if (it.username != null) {
-//                            keyword!! in it.username!!
-//                        } else {
-//                            false
-//                        }
-//                    }
-//                    3 -> run {
-//                        if (it.staffNo != null) {
-//                            keyword!! in it.staffNo!!
-//                        } else {
-//                            false
-//                        }
-//                    }
-//                    else -> false
-//                }
-//            }.toMutableList()
-//        }
-//
-//        // 查出用户角色列表
-//        data.forEach {
-//            if (it.id != null) {
-//                it.roles = userRoleService.getUserRoleListByUserId(it.id!!)
-//            }
-//        }
-//
-//        return if (PaginationUtil.paginable(getRequest())) {
-//            // 分页
-//            ResponseEntity.ok(ResponseDto().apply {
-//                this.data = PaginationUtil.logicPaging(data, getRequest())
-//            })
-//        } else {
-//            ResponseEntity.ok(ResponseDto().apply {
-//                this.data = data
-//            })
-//        }
-        return ResponseEntity.ok(null)
+             @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
+        })
     }
 
 
@@ -147,9 +109,4 @@ class UserController : BaseController() {
             this.data = SSOUtil.getCurUserPerms()
         })
     }
-
-    @PutMapping("/info")
-    fun modifyUserInfo(@RequestBody requestDto: RequestDto): ResponseEntity<*> {
-        return ResponseEntity.ok(ResponseDto())
-    }
 }

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

@@ -0,0 +1,45 @@
+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-platform.yml

@@ -1,2 +1,2 @@
 platform:
-  id: 1 # 平台ID (0:通用,1:系统,2:接收,3:保存,4:管理,5:利用)
+  id: 1 # 平台ID (0:通用,1:系统,2:接收,3:保存,4:管理,5:利用,6:库存)