删除ui模块并创建mq模块,开始搭建mq

build.gradle

@@ -59,6 +59,7 @@ subprojects {
         compile('org.springframework.boot:spring-boot-starter')
         compile('org.springframework.boot:spring-boot-starter-web')
         compile('org.springframework.boot:spring-boot-starter-aop')
+        compile('org.springframework.boot:spring-boot-starter-amqp')
         testCompile('org.springframework.boot:spring-boot-starter-test')
         testCompile("junit:junit:4.12")
 

settings.gradle

@@ -3,6 +3,6 @@ include 'zen-common'
 include 'zen-umps'
 include 'zen-orm'
 include 'zen-api'
-include 'zen-ui'
 include 'zen-web'
+include 'zen-mq'
 

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

@@ -2,15 +2,12 @@ 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 NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
-@Repository
 interface SysDeptMapper : BaseMapper<SysDept>

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

@@ -8,6 +8,6 @@ import com.gxzc.zen.common.base.BaseMapper
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
 interface SysDeptUserMapper : BaseMapper<SysDeptUser>

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

@@ -8,6 +8,6 @@ import com.gxzc.zen.common.base.BaseMapper
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
 interface SysDicMapper : BaseMapper<SysDic>

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

@@ -8,6 +8,6 @@ import com.gxzc.zen.common.base.BaseMapper
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
 interface SysEventLoginMapper : BaseMapper<SysEventLogin>

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

@@ -8,6 +8,6 @@ import com.gxzc.zen.common.base.BaseMapper
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
 interface SysEventOperMapper : BaseMapper<SysEventOper>

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

@@ -8,6 +8,6 @@ import com.gxzc.zen.common.base.BaseMapper
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
 interface SysMenuMapper : BaseMapper<SysMenu>

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

@@ -8,6 +8,6 @@ import com.gxzc.zen.common.base.BaseMapper
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
 interface SysNoticeMapper : BaseMapper<SysNotice>

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

@@ -8,6 +8,6 @@ import com.gxzc.zen.common.base.BaseMapper
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
 interface SysParamMapper : BaseMapper<SysParam>

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

@@ -8,6 +8,6 @@ import com.gxzc.zen.common.base.BaseMapper
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
 interface SysPermissionMapper : BaseMapper<SysPermission>

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

@@ -8,6 +8,6 @@ import com.gxzc.zen.common.base.BaseMapper
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
 interface SysRoleMapper : BaseMapper<SysRole>

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

@@ -8,6 +8,6 @@ import com.gxzc.zen.common.base.BaseMapper
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
 interface SysRolePermissionMapper : BaseMapper<SysRolePermission>

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

@@ -8,6 +8,6 @@ import com.gxzc.zen.common.base.BaseMapper
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
 interface SysUserMapper : BaseMapper<SysUser>

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

@@ -8,6 +8,6 @@ import com.gxzc.zen.common.base.BaseMapper
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
 interface SysUserRoleMapper : BaseMapper<SysUserRole>

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

@@ -1,5 +1,6 @@
 package com.gxzc.zen.api.sys.model
 
+import com.baomidou.mybatisplus.annotations.TableName
 import com.gxzc.zen.common.base.BaseModel
 
 /**
@@ -8,8 +9,9 @@ import com.gxzc.zen.common.base.BaseModel
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
+@TableName("sys_dept")
 data class SysDept(
         /**
          * 部门名称
@@ -22,6 +24,6 @@ data class SysDept(
         /**
          * 排序号
          */
-        var sort: Integer? = null
+        var sort: Int? = null
 ) : BaseModel() {
 }

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

@@ -1,5 +1,6 @@
 package com.gxzc.zen.api.sys.model
 
+import com.baomidou.mybatisplus.annotations.TableName
 import com.gxzc.zen.common.base.BaseModel
 
 /**
@@ -8,8 +9,9 @@ import com.gxzc.zen.common.base.BaseModel
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
+@TableName("sys_dept_user")
 data class SysDeptUser(
         /**
          * 部门ID

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

@@ -1,5 +1,6 @@
 package com.gxzc.zen.api.sys.model
 
+import com.baomidou.mybatisplus.annotations.TableName
 import com.gxzc.zen.common.base.BaseModel
 
 /**
@@ -8,8 +9,9 @@ import com.gxzc.zen.common.base.BaseModel
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
+@TableName("sys_dic")
 data class SysDic(
         /**
          * 字典代码
@@ -22,6 +24,6 @@ data class SysDic(
         /**
          * 排序号
          */
-        var sort: Integer? = null
+        var sort: Int? = null
 ) : BaseModel() {
 }

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

@@ -1,5 +1,6 @@
 package com.gxzc.zen.api.sys.model
 
+import com.baomidou.mybatisplus.annotations.TableName
 import com.gxzc.zen.common.base.BaseModel
 
 /**
@@ -8,8 +9,9 @@ import com.gxzc.zen.common.base.BaseModel
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
+@TableName("sys_event_login")
 data class SysEventLogin(
         /**
          * 日志标题
@@ -22,7 +24,7 @@ data class SysEventLogin(
         /**
          * 排序号
          */
-        var sort: Integer? = null,
+        var sort: Int? = null,
         /**
          * 账户名
          */
@@ -38,6 +40,6 @@ data class SysEventLogin(
         /**
          * 请求状态
          */
-        var status: Integer? = null
+        var status: Int? = null
 ) : BaseModel() {
 }

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

@@ -1,5 +1,6 @@
 package com.gxzc.zen.api.sys.model
 
+import com.baomidou.mybatisplus.annotations.TableName
 import com.gxzc.zen.common.base.BaseModel
 
 /**
@@ -8,8 +9,9 @@ import com.gxzc.zen.common.base.BaseModel
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
+@TableName("sys_event_oper")
 data class SysEventOper(
         /**
          * 日志标题
@@ -22,7 +24,7 @@ data class SysEventOper(
         /**
          * 排序号
          */
-        var sort: Integer? = null,
+        var sort: Int? = null,
         /**
          * 账户名
          */

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

@@ -1,5 +1,6 @@
 package com.gxzc.zen.api.sys.model
 
+import com.baomidou.mybatisplus.annotations.TableName
 import com.gxzc.zen.common.base.BaseModel
 
 /**
@@ -8,8 +9,9 @@ import com.gxzc.zen.common.base.BaseModel
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
+@TableName("sys_menu")
 data class SysMenu(
         /**
          * 菜单名称
@@ -18,7 +20,7 @@ data class SysMenu(
         /**
          * 菜单类型（0:CURD；1:系统菜单；2:业务菜单）
          */
-        var menuType: Integer? = null,
+        var menuType: Int? = null,
         /**
          * 上级菜单ID
          */
@@ -30,14 +32,14 @@ data class SysMenu(
         /**
          * 展开状态(1:展开;0:收缩)
          */
-        var expand: Integer? = null,
+        var expand: Int? = null,
         /**
          * 排序号
          */
-        var sort: Integer? = null,
+        var sort: Int? = null,
         /**
          * 叶子节点(0:树枝节点;1:叶子节点)
          */
-        var isShow: Integer? = null
+        var isShow: Int? = null
 ) : BaseModel() {
 }

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

@@ -1,5 +1,6 @@
 package com.gxzc.zen.api.sys.model
 
+import com.baomidou.mybatisplus.annotations.TableName
 import java.util.Date
 import com.gxzc.zen.common.base.BaseModel
 
@@ -9,8 +10,9 @@ import com.gxzc.zen.common.base.BaseModel
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
+@TableName("sys_notice")
 data class SysNotice(
         /**
          * 公告标题

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

@@ -1,5 +1,6 @@
 package com.gxzc.zen.api.sys.model
 
+import com.baomidou.mybatisplus.annotations.TableName
 import com.gxzc.zen.common.base.BaseModel
 
 /**
@@ -8,8 +9,9 @@ import com.gxzc.zen.common.base.BaseModel
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
+@TableName("sys_param")
 data class SysParam(
         /**
          * 参数key
@@ -22,6 +24,6 @@ data class SysParam(
         /**
          * 排序号
          */
-        var sort: Integer? = null
+        var sort: Int? = null
 ) : BaseModel() {
 }

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

@@ -1,5 +1,6 @@
 package com.gxzc.zen.api.sys.model
 
+import com.baomidou.mybatisplus.annotations.TableName
 import com.gxzc.zen.common.base.BaseModel
 
 /**
@@ -8,8 +9,9 @@ import com.gxzc.zen.common.base.BaseModel
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
+@TableName("sys_permission")
 data class SysPermission(
         /**
          * 权限名称
@@ -18,7 +20,7 @@ data class SysPermission(
         /**
          * 权限代码
          */
-        var code: Integer? = null,
+        var code: Int? = null,
         /**
          * 上级菜单ID
          */

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

@@ -1,5 +1,6 @@
 package com.gxzc.zen.api.sys.model
 
+import com.baomidou.mybatisplus.annotations.TableName
 import com.gxzc.zen.common.base.BaseModel
 
 /**
@@ -8,8 +9,9 @@ import com.gxzc.zen.common.base.BaseModel
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
+@TableName("sys_role")
 data class SysRole(
         /**
          * 角色名称

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

@@ -1,5 +1,6 @@
 package com.gxzc.zen.api.sys.model
 
+import com.baomidou.mybatisplus.annotations.TableName
 import com.gxzc.zen.common.base.BaseModel
 
 /**
@@ -8,8 +9,9 @@ import com.gxzc.zen.common.base.BaseModel
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
+@TableName("sys_role_permission")
 data class SysRolePermission(
         /**
          * 角色ID

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

@@ -1,5 +1,6 @@
 package com.gxzc.zen.api.sys.model
 
+import com.baomidou.mybatisplus.annotations.TableName
 import com.gxzc.zen.common.base.BaseModel
 
 /**
@@ -8,8 +9,9 @@ import com.gxzc.zen.common.base.BaseModel
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
+@TableName("sys_user")
 data class SysUser(
         /**
          * 登陆帐户

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

@@ -1,5 +1,6 @@
 package com.gxzc.zen.api.sys.model
 
+import com.baomidou.mybatisplus.annotations.TableName
 import com.gxzc.zen.common.base.BaseModel
 
 /**
@@ -8,8 +9,9 @@ import com.gxzc.zen.common.base.BaseModel
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
+@TableName("sys_user_role")
 data class SysUserRole(
         /**
          * 角色ID

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

@@ -8,6 +8,6 @@ import com.gxzc.zen.common.base.BaseService
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
 interface ISysDeptService : BaseService<SysDept>

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

@@ -8,6 +8,6 @@ import com.gxzc.zen.common.base.BaseService
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
 interface ISysDeptUserService : BaseService<SysDeptUser>

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

@@ -8,6 +8,6 @@ import com.gxzc.zen.common.base.BaseService
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
 interface ISysDicService : BaseService<SysDic>

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

@@ -8,6 +8,6 @@ import com.gxzc.zen.common.base.BaseService
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
 interface ISysEventLoginService : BaseService<SysEventLogin>

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

@@ -8,6 +8,6 @@ import com.gxzc.zen.common.base.BaseService
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
 interface ISysEventOperService : BaseService<SysEventOper>

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

@@ -8,6 +8,6 @@ import com.gxzc.zen.common.base.BaseService
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
 interface ISysMenuService : BaseService<SysMenu>

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

@@ -8,6 +8,6 @@ import com.gxzc.zen.common.base.BaseService
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
 interface ISysNoticeService : BaseService<SysNotice>

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

@@ -8,6 +8,6 @@ import com.gxzc.zen.common.base.BaseService
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
 interface ISysParamService : BaseService<SysParam>

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

@@ -8,6 +8,6 @@ import com.gxzc.zen.common.base.BaseService
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
 interface ISysPermissionService : BaseService<SysPermission>

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

@@ -8,6 +8,6 @@ import com.gxzc.zen.common.base.BaseService
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
 interface ISysRolePermissionService : BaseService<SysRolePermission>

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

@@ -8,6 +8,6 @@ import com.gxzc.zen.common.base.BaseService
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
 interface ISysRoleService : BaseService<SysRole>

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

@@ -8,6 +8,6 @@ import com.gxzc.zen.common.base.BaseService
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
 interface ISysUserRoleService : BaseService<SysUserRole>

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

@@ -8,6 +8,6 @@ import com.gxzc.zen.common.base.BaseService
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
 interface ISysUserService : BaseService<SysUser>

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

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
 @Service
 open class SysDeptServiceImpl : ServiceImpl<SysDeptMapper, SysDept>(), ISysDeptService {

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

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
 @Service
 open class SysDeptUserServiceImpl : ServiceImpl<SysDeptUserMapper, SysDeptUser>(), ISysDeptUserService {

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

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
 @Service
 open class SysDicServiceImpl : ServiceImpl<SysDicMapper, SysDic>(), ISysDicService {

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

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
 @Service
 open class SysEventLoginServiceImpl : ServiceImpl<SysEventLoginMapper, SysEventLogin>(), ISysEventLoginService {

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

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
 @Service
 open class SysEventOperServiceImpl : ServiceImpl<SysEventOperMapper, SysEventOper>(), ISysEventOperService {

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

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
 @Service
 open class SysMenuServiceImpl : ServiceImpl<SysMenuMapper, SysMenu>(), ISysMenuService {

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

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
 @Service
 open class SysNoticeServiceImpl : ServiceImpl<SysNoticeMapper, SysNotice>(), ISysNoticeService {

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

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
 @Service
 open class SysParamServiceImpl : ServiceImpl<SysParamMapper, SysParam>(), ISysParamService {

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

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
 @Service
 open class SysPermissionServiceImpl : ServiceImpl<SysPermissionMapper, SysPermission>(), ISysPermissionService {

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

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
 @Service
 open class SysRolePermissionServiceImpl : ServiceImpl<SysRolePermissionMapper, SysRolePermission>(), ISysRolePermissionService {

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

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
 @Service
 open class SysRoleServiceImpl : ServiceImpl<SysRoleMapper, SysRole>(), ISysRoleService {

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

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
 @Service
 open class SysUserRoleServiceImpl : ServiceImpl<SysUserRoleMapper, SysUserRole>(), ISysUserRoleService {

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

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-30
+ * @since 2018-01-31
  */
 @Service
 open class SysUserServiceImpl : ServiceImpl<SysUserMapper, SysUser>(), ISysUserService {

zen-mq/build.gradle

@@ -0,0 +1,2 @@
+dependencies {
+}

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

@@ -0,0 +1,14 @@
+spring:
+  rabbitmq:
+    host: localhost
+    port: 5672
+    username: root
+    password: root
+    publisher-confirms: true
+    publisher-returns: true
+    template:
+      mandatory: true
+    listener:
+      simple:
+        concurrency: 2 # 最小消息监听线程数
+        max-concurrency: 2 # 最大消息监听线程数

zen-orm/src/main/kotlin/com/gxzc/zen/orm/CustomMetaObjectHandler.kt

@@ -0,0 +1,33 @@
+package com.gxzc.zen.orm
+
+import com.baomidou.mybatisplus.mapper.MetaObjectHandler
+import org.apache.ibatis.reflection.MetaObject
+import org.springframework.stereotype.Component
+import java.util.*
+
+/**
+ * 公共字段自动填充
+ * @author NorthLan
+ * @date 2018/1/31
+ * @url https://noahlan.com
+ */
+@Component
+class CustomMetaObjectHandler : MetaObjectHandler() {
+    override fun insertFill(metaObject: MetaObject?) {
+        if (getFieldValByName("createBy", metaObject) == null) {
+            // TODO 公共字段填充 createBy
+            setFieldValByName("createBy", "admin", metaObject)
+        }
+        if (getFieldValByName("createTime", metaObject) == null) {
+            setFieldValByName("createTime", Date(), metaObject)
+        }
+    }
+
+    override fun updateFill(metaObject: MetaObject?) {
+        if (getFieldValByName("updateBy", metaObject) == null) {
+            // TODO 公共字段填充 updateBy
+            setFieldValByName("updateBy", "admin", metaObject)
+        }
+        setFieldValByName("updateTime", Date(), metaObject)
+    }
+}

zen-orm/src/main/resources/templates/entity.kt.vm

@@ -1,5 +1,6 @@
 package ${package.Entity}
 
+import com.baomidou.mybatisplus.annotations.TableName
 #foreach($pkg in ${table.importPackages})
 import ${pkg}
 #end
@@ -54,7 +55,7 @@ data class ${entity}(
 #if(${logicDeleteFieldName}==${field.name})
         @TableLogic
 #end
-        var ${field.propertyName}: ${field.propertyType}? = null#if($foreach.count!=${table.fields.size()}),#end
+        var ${field.propertyName}: #if(${field.propertyType} == "Integer")Int#else${field.propertyType}#end? = null#if($foreach.count!=${table.fields.size()}),#end
 
 #end
 ## ----------  END 字段循环遍历  ----------

zen-ui/build.gradle

@@ -1,4 +0,0 @@
-apply plugin: 'war'
-
-dependencies {
-}

zen-ui/src/main/resources/static/index.html

@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>index</title>
-</head>
-<body>
-hello world!index
-</body>
-</html>

zen-ui/src/main/webapp/index.jsp

@@ -1,16 +0,0 @@
-<%--
-  Created by IntelliJ IDEA.
-  User: mgr
-  Date: 18-1-20
-  Time: 上午11:24
-  To change this template use File | Settings | File Templates.
---%>
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<html>
-  <head>
-    <title>$Title$</title>
-  </head>
-  <body>
-  $END$
-  </body>
-</html>

zen-web/build.gradle

@@ -1,7 +1,6 @@
 apply plugin: 'war'
 
 dependencies {
-    compile project(":zen-ui")
     compile project(":zen-orm")
     compile project(":zen-api")
 }

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

@@ -6,7 +6,7 @@ server:
 spring:
   profiles:
     active: dev
-    include: orm
+    include: orm,mq
 #  redis:
 #    host: localhost
 #    port: 6379