java开发规范和代码同步更改

bi-service/src/main/java/com/diagbot/aop/SysLoggerAspect.java

@@ -65,7 +65,7 @@ public class SysLoggerAspect {
         if(!StringUtils.isEmpty(username)) {
             sysLog.setUsername(username);
         }
-        sysLog.setCreateDate(new Date());
+        sysLog.setGmtCreate(new Date());
         //保存系统日志
         mySender.outputLogSend(sysLog);
     }

bi-service/src/main/java/com/diagbot/entity/SysLog.java

@@ -1,34 +1,77 @@
 package com.diagbot.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 
 import java.io.Serializable;
 import java.util.Date;
 
 /**
  * <p>
- * 
+ * 系统操作日志表
  * </p>
  *
  * @author gaodm
- * @since 2018-08-02
+ * @since 2018-08-30
  */
-@TableName("sys_log")
 public class SysLog implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 日志ID
+     */
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
-    @TableField("create_date")
-    private Date createDate;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 访问者的IP
+     */
     private String ip;
+
+    /**
+     * 方法
+     */
     private String method;
+
+    /**
+     * 操作名
+     */
     private String operation;
+
+    /**
+     * 参数
+     */
     private String params;
+
+    /**
+     * 用户名
+     */
     private String username;
 
 
@@ -40,12 +83,44 @@ public class SysLog implements Serializable {
         this.id = id;
     }
 
-    public Date getCreateDate() {
-        return createDate;
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+
+    public String getModifier() {
+        return modifier;
     }
 
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
     }
 
     public String getIp() {
@@ -91,8 +166,12 @@ public class SysLog implements Serializable {
     @Override
     public String toString() {
         return "SysLog{" +
-        ", id=" + id +
-        ", createDate=" + createDate +
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
         ", ip=" + ip +
         ", method=" + method +
         ", operation=" + operation +

bi-service/src/main/java/com/diagbot/entity/User.java

@@ -1,16 +1,67 @@
 package com.diagbot.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+
 /**
- * @Description: 用户实体类
- * @author: gaodm
- * @time: 2018/8/6 9:53
+ * <p>
+ * 系统用户表
+ * </p>
+ *
+ * @author gaodm
+ * @since 2018-08-30
  */
-public class User {
+@TableName("sys_user")
+public class User implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
+    /**
+     * 用户ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
-    private String username;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 用户密码
+     */
     private String password;
 
+    /**
+     * 用户名
+     */
+    private String username;
+
+
     public Long getId() {
         return id;
     }
@@ -19,12 +70,44 @@ public class User {
         this.id = id;
     }
 
-    public String getUsername() {
-        return username;
+    public String getIsDeleted() {
+        return isDeleted;
     }
 
-    public void setUsername(String username) {
-        this.username = username;
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
     }
 
     public String getPassword() {
@@ -34,4 +117,26 @@ public class User {
     public void setPassword(String password) {
         this.password = password;
     }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    @Override
+    public String toString() {
+        return "User{" +
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
+        ", password=" + password +
+        ", username=" + username +
+        "}";
+    }
 }

bi-service/src/main/java/com/diagbot/web/SysLogController.java

@@ -23,12 +23,9 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.Date;
 
 /**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author gaodm
- * @since 2018-08-02
+ * @Description: 日志操作控制层
+ * @author: gaodm
+ * @time: 2018/8/30 10:12
  */
 @RestController
 @RequestMapping("/log")
@@ -37,12 +34,19 @@ public class SysLogController {
     @Autowired
     private SysLogFacade sysLogFacade;
 
+    /**
+     * 新增日志信息
+     *
+     * @param sysLogVo 新增日志输入参数
+     * @return 新增日志是否成功
+     */
     @ApiOperation(value = "添加日志", notes = "添加日志")
     @PostMapping("/add")
     @SysLogger("postLog")
     public RespDTO add(@RequestBody SysLogVo sysLogVo){
+        //初始化新增日志信息
         SysLog sysLog = new SysLog();
-        sysLog.setCreateDate(new Date());
+        sysLog.setGmtCreate(new Date());
         sysLog.setIp(sysLogVo.getIp());
         sysLog.setMethod(sysLogVo.getMethod());
         sysLog.setOperation(sysLogVo.getOperation());
@@ -50,6 +54,11 @@ public class SysLogController {
         return RespDTO.onSuc(sysLogFacade.save(sysLog)?"添加成功":"添加失败");
     }
 
+    /**
+     * 删除日志
+     * @param id 日志信息ID
+     * @return 删除是否成功
+     */
     @ApiOperation(value = "删除日志", notes = "删除日志")
     @DeleteMapping("/delete/{id}")
     @SysLogger("deleteLog")
@@ -57,13 +66,22 @@ public class SysLogController {
         return RespDTO.onSuc(sysLogFacade.removeById(id)?"删除成功":"删除失败");
     }
 
+    /**
+     * 修改日志
+     * @param sysLog 修改日志输入参数
+     * @return 修改是否成功
+     */
     @ApiOperation(value = "修改日志", notes = "修改日志")
     @PostMapping("/update")
     @SysLogger("updateLog")
-    public RespDTO update(@RequestBody SysLog student){
-        return RespDTO.onSuc(sysLogFacade.updateById(student)?"修改成功":"修改失败");
+    public RespDTO update(@RequestBody SysLog sysLog){
+        return RespDTO.onSuc(sysLogFacade.updateById(sysLog)?"修改成功":"修改失败");
     }
 
+    /**
+     * 获取日志列表
+     * @return 日志列信息
+     */
     @ApiOperation(value = "获取日志列表", notes = "获取日志列表")
     @GetMapping("/list")
     @SysLogger("listLog")
@@ -72,10 +90,15 @@ public class SysLogController {
         return RespDTO.onSuc(sysLogFacade.list(wrapper));
     }
 
+    /**
+     * 获取日志翻页信息
+     * @return 日志翻页信息
+     */
     @ApiOperation(value = "获取日志翻页信息", notes = "获取日志翻页信息")
     @GetMapping("/page")
     @SysLogger("pageLog")
     public RespDTO page() {
+        //初始化日志翻页参数
         IPage<SysLog> wrapper = new Page<>();
         return RespDTO.onSuc(sysLogFacade.page(wrapper, null));
     }

diagbotman-service/src/main/java/com/diagbot/aop/SysLoggerAspect.java

@@ -65,7 +65,7 @@ public class SysLoggerAspect {
         if(!StringUtils.isEmpty(username)) {
             sysLog.setUsername(username);
         }
-        sysLog.setCreateDate(new Date());
+        sysLog.setGmtCreate(new Date());
         //保存系统日志
         mySender.outputLogSend(sysLog);
     }

diagbotman-service/src/main/java/com/diagbot/entity/SysLog.java

@@ -1,34 +1,77 @@
 package com.diagbot.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 
 import java.io.Serializable;
 import java.util.Date;
 
 /**
  * <p>
- * 
+ * 系统操作日志表
  * </p>
  *
  * @author gaodm
- * @since 2018-08-02
+ * @since 2018-08-30
  */
-@TableName("sys_log")
 public class SysLog implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 日志ID
+     */
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
-    @TableField("create_date")
-    private Date createDate;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 访问者的IP
+     */
     private String ip;
+
+    /**
+     * 方法
+     */
     private String method;
+
+    /**
+     * 操作名
+     */
     private String operation;
+
+    /**
+     * 参数
+     */
     private String params;
+
+    /**
+     * 用户名
+     */
     private String username;
 
 
@@ -40,12 +83,44 @@ public class SysLog implements Serializable {
         this.id = id;
     }
 
-    public Date getCreateDate() {
-        return createDate;
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+
+    public String getModifier() {
+        return modifier;
     }
 
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
     }
 
     public String getIp() {
@@ -91,8 +166,12 @@ public class SysLog implements Serializable {
     @Override
     public String toString() {
         return "SysLog{" +
-        ", id=" + id +
-        ", createDate=" + createDate +
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
         ", ip=" + ip +
         ", method=" + method +
         ", operation=" + operation +

diagbotman-service/src/main/java/com/diagbot/entity/User.java

@@ -1,16 +1,67 @@
 package com.diagbot.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+
 /**
- * @Description: 用户实体类
- * @author: gaodm
- * @time: 2018/8/6 9:53
+ * <p>
+ * 系统用户表
+ * </p>
+ *
+ * @author gaodm
+ * @since 2018-08-30
  */
-public class User {
+@TableName("sys_user")
+public class User implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
+    /**
+     * 用户ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
-    private String username;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 用户密码
+     */
     private String password;
 
+    /**
+     * 用户名
+     */
+    private String username;
+
+
     public Long getId() {
         return id;
     }
@@ -19,12 +70,44 @@ public class User {
         this.id = id;
     }
 
-    public String getUsername() {
-        return username;
+    public String getIsDeleted() {
+        return isDeleted;
     }
 
-    public void setUsername(String username) {
-        this.username = username;
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
     }
 
     public String getPassword() {
@@ -34,4 +117,26 @@ public class User {
     public void setPassword(String password) {
         this.password = password;
     }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    @Override
+    public String toString() {
+        return "User{" +
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
+        ", password=" + password +
+        ", username=" + username +
+        "}";
+    }
 }

diagbotman-service/src/main/java/com/diagbot/web/SysLogController.java

@@ -23,12 +23,9 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.Date;
 
 /**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author gaodm
- * @since 2018-08-02
+ * @Description: 日志操作控制层
+ * @author: gaodm
+ * @time: 2018/8/30 10:12
  */
 @RestController
 @RequestMapping("/log")
@@ -37,12 +34,19 @@ public class SysLogController {
     @Autowired
     private SysLogFacade sysLogFacade;
 
+    /**
+     * 新增日志信息
+     *
+     * @param sysLogVo 新增日志输入参数
+     * @return 新增日志是否成功
+     */
     @ApiOperation(value = "添加日志", notes = "添加日志")
     @PostMapping("/add")
     @SysLogger("postLog")
     public RespDTO add(@RequestBody SysLogVo sysLogVo){
+        //初始化新增日志信息
         SysLog sysLog = new SysLog();
-        sysLog.setCreateDate(new Date());
+        sysLog.setGmtCreate(new Date());
         sysLog.setIp(sysLogVo.getIp());
         sysLog.setMethod(sysLogVo.getMethod());
         sysLog.setOperation(sysLogVo.getOperation());
@@ -50,6 +54,11 @@ public class SysLogController {
         return RespDTO.onSuc(sysLogFacade.save(sysLog)?"添加成功":"添加失败");
     }
 
+    /**
+     * 删除日志
+     * @param id 日志信息ID
+     * @return 删除是否成功
+     */
     @ApiOperation(value = "删除日志", notes = "删除日志")
     @DeleteMapping("/delete/{id}")
     @SysLogger("deleteLog")
@@ -57,13 +66,22 @@ public class SysLogController {
         return RespDTO.onSuc(sysLogFacade.removeById(id)?"删除成功":"删除失败");
     }
 
+    /**
+     * 修改日志
+     * @param sysLog 修改日志输入参数
+     * @return 修改是否成功
+     */
     @ApiOperation(value = "修改日志", notes = "修改日志")
     @PostMapping("/update")
     @SysLogger("updateLog")
-    public RespDTO update(@RequestBody SysLog student){
-        return RespDTO.onSuc(sysLogFacade.updateById(student)?"修改成功":"修改失败");
+    public RespDTO update(@RequestBody SysLog sysLog){
+        return RespDTO.onSuc(sysLogFacade.updateById(sysLog)?"修改成功":"修改失败");
     }
 
+    /**
+     * 获取日志列表
+     * @return 日志列信息
+     */
     @ApiOperation(value = "获取日志列表", notes = "获取日志列表")
     @GetMapping("/list")
     @SysLogger("listLog")
@@ -72,10 +90,15 @@ public class SysLogController {
         return RespDTO.onSuc(sysLogFacade.list(wrapper));
     }
 
+    /**
+     * 获取日志翻页信息
+     * @return 日志翻页信息
+     */
     @ApiOperation(value = "获取日志翻页信息", notes = "获取日志翻页信息")
     @GetMapping("/page")
     @SysLogger("pageLog")
     public RespDTO page() {
+        //初始化日志翻页参数
         IPage<SysLog> wrapper = new Page<>();
         return RespDTO.onSuc(sysLogFacade.page(wrapper, null));
     }

docs/002.数据库设计/sys-log.sql

@@ -0,0 +1,40 @@
+
+CREATE DATABASE  `sys-log` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
+
+use `sys-log`;
+
+/*
+Navicat MySQL Data Transfer
+
+Source Server         : SSSS
+Source Server Version : 50717
+Source Host           : localhost:3306
+Source Database       : sys-log
+
+Target Server Type    : MYSQL
+Target Server Version : 50717
+File Encoding         : 65001
+
+Date: 2017-07-13 09:10:09
+*/
+
+SET FOREIGN_KEY_CHECKS=0;
+
+-- ----------------------------
+-- Table structure for sys_log
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_log`;
+CREATE TABLE `sys_log` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '日志ID',
+  `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
+  `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `ip` varchar(255) NOT NULL DEFAULT '' COMMENT '访问者的IP',
+  `method` varchar(255) NOT NULL DEFAULT '' COMMENT '方法',
+  `operation` varchar(255) NOT NULL DEFAULT '' COMMENT '操作名',
+  `params` varchar(255) NOT NULL DEFAULT '' COMMENT '参数',
+  `username` varchar(255) NOT NULL DEFAULT '' COMMENT '用户名',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=267 DEFAULT CHARSET=utf8 COMMENT='系统操作日志表';

docs/002.数据库设计/sys-user.sql

@@ -0,0 +1,106 @@
+
+CREATE DATABASE  `sys-user` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
+
+use `sys-user`;
+-- ----------------------------
+-- Table structure for sys_user
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_user`;
+CREATE TABLE `sys_user` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '用户ID',
+  `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
+  `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `password` varchar(255) DEFAULT NULL COMMENT '用户密码',
+  `username` varchar(255) NOT NULL DEFAULT '' COMMENT '用户名',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_username` (`username`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT '系统用户表';
+
+-- ----------------------------
+-- Table structure for sys_role
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_role`;
+CREATE TABLE `sys_role` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '角色ID',
+  `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
+  `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `name` varchar(255) NOT NULL DEFAULT '' COMMENT '角色名称',
+  `roleLevel` int(11) NOT NULL DEFAULT '0' COMMENT '角色等级',
+  `descritpion` varchar(255) NOT NULL DEFAULT '' COMMENT '角色描述',
+  `menuItems` varchar(255) NOT NULL DEFAULT '' COMMENT '菜单ID：对应角色ID',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT '系统角色表';
+
+
+-- ----------------------------
+-- Table structure for user_role
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_user_role`;
+CREATE TABLE `sys_user_role` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '用户和角色关联ID',
+  `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
+  `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `user_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '系统用户表.用户ID',
+  `role_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '系统角色表.角色ID',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT '系统用户角色关联表';
+
+-- ----------------------------
+-- Table structure for sys_permission
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_permission`;
+CREATE TABLE `sys_permission` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '资源ID',
+  `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
+  `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `name` varchar(255) NOT NULL DEFAULT '' COMMENT '资源名称',
+  `permissionUrl` varchar(255) NOT NULL DEFAULT '' COMMENT '资源Url',
+  `method` varchar(255) NOT NULL DEFAULT 'ALL' COMMENT '资源允许的请求方式',
+  `descritpion` varchar(255) NOT NULL DEFAULT '' COMMENT '资源描述',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT '系统资源表';
+
+-- ----------------------------
+-- Table structure for sys_role_permission
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_role_permission`;
+CREATE TABLE `sys_role_permission` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '系统角色资源ID',
+  `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
+  `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `role_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '系统角色表.角色ID',
+  `permission_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '系统资源表.资源ID',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8  COMMENT '系统角色资源表';
+
+INSERT INTO `sys_user`  (id, password,username) VALUES ('1', '{bcrypt}$2a$10$rlM./Q4dh5qXYmxFxUqkRetMPf6JewV/Hj/s4qBg/6U1.mzcue2oK', 'guest');
+INSERT INTO `sys_user`  (id, password,username) VALUES ('2', '{bcrypt}$2a$10$rlM./Q4dh5qXYmxFxUqkRetMPf6JewV/Hj/s4qBg/6U1.mzcue2oK', 'admin');
+
+INSERT INTO `sys_role` (id,name) VALUES ('1', '普通用户');
+INSERT INTO `sys_role` (id,name) VALUES ('2', '管理员');
+
+INSERT INTO `sys_user_role` (user_id, role_id) VALUES ('1', '1');
+INSERT INTO `sys_user_role` (user_id, role_id) VALUES ('2', '2');
+
+INSERT INTO `sys_permission` (id, name, permissionUrl, method, descritpion) VALUES ('1', '根据用户名获取用户', '/user/{username}', "ALL", '根据用户名获取用户');
+INSERT INTO `sys_permission`  (id, name, permissionUrl, method, descritpion) VALUES ('2', '根据用户id获取用户信息','/user/getById', "ALL", '根据用户id获取用户信息');
+
+
+INSERT INTO `sys_role_permission` (role_id, permission_id) VALUES ('1', '2');
+INSERT INTO `sys_role_permission` (role_id, permission_id) VALUES ('2', '1');
+INSERT INTO `sys_role_permission` (role_id, permission_id) VALUES ('2', '2');

feedback-service/src/main/java/com/diagbot/aop/SysLoggerAspect.java

@@ -65,7 +65,7 @@ public class SysLoggerAspect {
         if(!StringUtils.isEmpty(username)) {
             sysLog.setUsername(username);
         }
-        sysLog.setCreateDate(new Date());
+        sysLog.setGmtCreate(new Date());
         //保存系统日志
         mySender.outputLogSend(sysLog);
     }

feedback-service/src/main/java/com/diagbot/entity/SysLog.java

@@ -1,34 +1,77 @@
 package com.diagbot.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 
 import java.io.Serializable;
 import java.util.Date;
 
 /**
  * <p>
- * 
+ * 系统操作日志表
  * </p>
  *
  * @author gaodm
- * @since 2018-08-02
+ * @since 2018-08-30
  */
-@TableName("sys_log")
 public class SysLog implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 日志ID
+     */
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
-    @TableField("create_date")
-    private Date createDate;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 访问者的IP
+     */
     private String ip;
+
+    /**
+     * 方法
+     */
     private String method;
+
+    /**
+     * 操作名
+     */
     private String operation;
+
+    /**
+     * 参数
+     */
     private String params;
+
+    /**
+     * 用户名
+     */
     private String username;
 
 
@@ -40,12 +83,44 @@ public class SysLog implements Serializable {
         this.id = id;
     }
 
-    public Date getCreateDate() {
-        return createDate;
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+
+    public String getModifier() {
+        return modifier;
     }
 
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
     }
 
     public String getIp() {
@@ -91,8 +166,12 @@ public class SysLog implements Serializable {
     @Override
     public String toString() {
         return "SysLog{" +
-        ", id=" + id +
-        ", createDate=" + createDate +
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
         ", ip=" + ip +
         ", method=" + method +
         ", operation=" + operation +

feedback-service/src/main/java/com/diagbot/entity/User.java

@@ -1,16 +1,67 @@
 package com.diagbot.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+
 /**
- * @Description: 用户实体类
- * @author: gaodm
- * @time: 2018/8/6 9:53
+ * <p>
+ * 系统用户表
+ * </p>
+ *
+ * @author gaodm
+ * @since 2018-08-30
  */
-public class User {
+@TableName("sys_user")
+public class User implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
+    /**
+     * 用户ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
-    private String username;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 用户密码
+     */
     private String password;
 
+    /**
+     * 用户名
+     */
+    private String username;
+
+
     public Long getId() {
         return id;
     }
@@ -19,12 +70,44 @@ public class User {
         this.id = id;
     }
 
-    public String getUsername() {
-        return username;
+    public String getIsDeleted() {
+        return isDeleted;
     }
 
-    public void setUsername(String username) {
-        this.username = username;
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
     }
 
     public String getPassword() {
@@ -34,4 +117,26 @@ public class User {
     public void setPassword(String password) {
         this.password = password;
     }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    @Override
+    public String toString() {
+        return "User{" +
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
+        ", password=" + password +
+        ", username=" + username +
+        "}";
+    }
 }

feedback-service/src/main/java/com/diagbot/web/SysLogController.java

@@ -23,12 +23,9 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.Date;
 
 /**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author gaodm
- * @since 2018-08-02
+ * @Description: 日志操作控制层
+ * @author: gaodm
+ * @time: 2018/8/30 10:12
  */
 @RestController
 @RequestMapping("/log")
@@ -37,12 +34,19 @@ public class SysLogController {
     @Autowired
     private SysLogFacade sysLogFacade;
 
+    /**
+     * 新增日志信息
+     *
+     * @param sysLogVo 新增日志输入参数
+     * @return 新增日志是否成功
+     */
     @ApiOperation(value = "添加日志", notes = "添加日志")
     @PostMapping("/add")
     @SysLogger("postLog")
     public RespDTO add(@RequestBody SysLogVo sysLogVo){
+        //初始化新增日志信息
         SysLog sysLog = new SysLog();
-        sysLog.setCreateDate(new Date());
+        sysLog.setGmtCreate(new Date());
         sysLog.setIp(sysLogVo.getIp());
         sysLog.setMethod(sysLogVo.getMethod());
         sysLog.setOperation(sysLogVo.getOperation());
@@ -50,6 +54,11 @@ public class SysLogController {
         return RespDTO.onSuc(sysLogFacade.save(sysLog)?"添加成功":"添加失败");
     }
 
+    /**
+     * 删除日志
+     * @param id 日志信息ID
+     * @return 删除是否成功
+     */
     @ApiOperation(value = "删除日志", notes = "删除日志")
     @DeleteMapping("/delete/{id}")
     @SysLogger("deleteLog")
@@ -57,13 +66,22 @@ public class SysLogController {
         return RespDTO.onSuc(sysLogFacade.removeById(id)?"删除成功":"删除失败");
     }
 
+    /**
+     * 修改日志
+     * @param sysLog 修改日志输入参数
+     * @return 修改是否成功
+     */
     @ApiOperation(value = "修改日志", notes = "修改日志")
     @PostMapping("/update")
     @SysLogger("updateLog")
-    public RespDTO update(@RequestBody SysLog student){
-        return RespDTO.onSuc(sysLogFacade.updateById(student)?"修改成功":"修改失败");
+    public RespDTO update(@RequestBody SysLog sysLog){
+        return RespDTO.onSuc(sysLogFacade.updateById(sysLog)?"修改成功":"修改失败");
     }
 
+    /**
+     * 获取日志列表
+     * @return 日志列信息
+     */
     @ApiOperation(value = "获取日志列表", notes = "获取日志列表")
     @GetMapping("/list")
     @SysLogger("listLog")
@@ -72,10 +90,15 @@ public class SysLogController {
         return RespDTO.onSuc(sysLogFacade.list(wrapper));
     }
 
+    /**
+     * 获取日志翻页信息
+     * @return 日志翻页信息
+     */
     @ApiOperation(value = "获取日志翻页信息", notes = "获取日志翻页信息")
     @GetMapping("/page")
     @SysLogger("pageLog")
     public RespDTO page() {
+        //初始化日志翻页参数
         IPage<SysLog> wrapper = new Page<>();
         return RespDTO.onSuc(sysLogFacade.page(wrapper, null));
     }

knowledge-service/src/main/java/com/diagbot/aop/SysLoggerAspect.java

@@ -65,7 +65,7 @@ public class SysLoggerAspect {
         if(!StringUtils.isEmpty(username)) {
             sysLog.setUsername(username);
         }
-        sysLog.setCreateDate(new Date());
+        sysLog.setGmtCreate(new Date());
         //保存系统日志
         mySender.outputLogSend(sysLog);
     }

knowledge-service/src/main/java/com/diagbot/entity/SysLog.java

@@ -1,34 +1,77 @@
 package com.diagbot.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 
 import java.io.Serializable;
 import java.util.Date;
 
 /**
  * <p>
- * 
+ * 系统操作日志表
  * </p>
  *
  * @author gaodm
- * @since 2018-08-02
+ * @since 2018-08-30
  */
-@TableName("sys_log")
 public class SysLog implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 日志ID
+     */
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
-    @TableField("create_date")
-    private Date createDate;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 访问者的IP
+     */
     private String ip;
+
+    /**
+     * 方法
+     */
     private String method;
+
+    /**
+     * 操作名
+     */
     private String operation;
+
+    /**
+     * 参数
+     */
     private String params;
+
+    /**
+     * 用户名
+     */
     private String username;
 
 
@@ -40,12 +83,44 @@ public class SysLog implements Serializable {
         this.id = id;
     }
 
-    public Date getCreateDate() {
-        return createDate;
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+
+    public String getModifier() {
+        return modifier;
     }
 
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
     }
 
     public String getIp() {
@@ -91,8 +166,12 @@ public class SysLog implements Serializable {
     @Override
     public String toString() {
         return "SysLog{" +
-        ", id=" + id +
-        ", createDate=" + createDate +
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
         ", ip=" + ip +
         ", method=" + method +
         ", operation=" + operation +

knowledge-service/src/main/java/com/diagbot/entity/User.java

@@ -1,16 +1,67 @@
 package com.diagbot.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+
 /**
- * @Description: 用户实体类
- * @author: gaodm
- * @time: 2018/8/6 9:53
+ * <p>
+ * 系统用户表
+ * </p>
+ *
+ * @author gaodm
+ * @since 2018-08-30
  */
-public class User {
+@TableName("sys_user")
+public class User implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
+    /**
+     * 用户ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
-    private String username;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 用户密码
+     */
     private String password;
 
+    /**
+     * 用户名
+     */
+    private String username;
+
+
     public Long getId() {
         return id;
     }
@@ -19,12 +70,44 @@ public class User {
         this.id = id;
     }
 
-    public String getUsername() {
-        return username;
+    public String getIsDeleted() {
+        return isDeleted;
     }
 
-    public void setUsername(String username) {
-        this.username = username;
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
     }
 
     public String getPassword() {
@@ -34,4 +117,26 @@ public class User {
     public void setPassword(String password) {
         this.password = password;
     }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    @Override
+    public String toString() {
+        return "User{" +
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
+        ", password=" + password +
+        ", username=" + username +
+        "}";
+    }
 }

knowledge-service/src/main/java/com/diagbot/web/SysLogController.java

@@ -23,12 +23,9 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.Date;
 
 /**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author gaodm
- * @since 2018-08-02
+ * @Description: 日志操作控制层
+ * @author: gaodm
+ * @time: 2018/8/30 10:12
  */
 @RestController
 @RequestMapping("/log")
@@ -37,12 +34,19 @@ public class SysLogController {
     @Autowired
     private SysLogFacade sysLogFacade;
 
+    /**
+     * 新增日志信息
+     *
+     * @param sysLogVo 新增日志输入参数
+     * @return 新增日志是否成功
+     */
     @ApiOperation(value = "添加日志", notes = "添加日志")
     @PostMapping("/add")
     @SysLogger("postLog")
     public RespDTO add(@RequestBody SysLogVo sysLogVo){
+        //初始化新增日志信息
         SysLog sysLog = new SysLog();
-        sysLog.setCreateDate(new Date());
+        sysLog.setGmtCreate(new Date());
         sysLog.setIp(sysLogVo.getIp());
         sysLog.setMethod(sysLogVo.getMethod());
         sysLog.setOperation(sysLogVo.getOperation());
@@ -50,6 +54,11 @@ public class SysLogController {
         return RespDTO.onSuc(sysLogFacade.save(sysLog)?"添加成功":"添加失败");
     }
 
+    /**
+     * 删除日志
+     * @param id 日志信息ID
+     * @return 删除是否成功
+     */
     @ApiOperation(value = "删除日志", notes = "删除日志")
     @DeleteMapping("/delete/{id}")
     @SysLogger("deleteLog")
@@ -57,13 +66,22 @@ public class SysLogController {
         return RespDTO.onSuc(sysLogFacade.removeById(id)?"删除成功":"删除失败");
     }
 
+    /**
+     * 修改日志
+     * @param sysLog 修改日志输入参数
+     * @return 修改是否成功
+     */
     @ApiOperation(value = "修改日志", notes = "修改日志")
     @PostMapping("/update")
     @SysLogger("updateLog")
-    public RespDTO update(@RequestBody SysLog student){
-        return RespDTO.onSuc(sysLogFacade.updateById(student)?"修改成功":"修改失败");
+    public RespDTO update(@RequestBody SysLog sysLog){
+        return RespDTO.onSuc(sysLogFacade.updateById(sysLog)?"修改成功":"修改失败");
     }
 
+    /**
+     * 获取日志列表
+     * @return 日志列信息
+     */
     @ApiOperation(value = "获取日志列表", notes = "获取日志列表")
     @GetMapping("/list")
     @SysLogger("listLog")
@@ -72,10 +90,15 @@ public class SysLogController {
         return RespDTO.onSuc(sysLogFacade.list(wrapper));
     }
 
+    /**
+     * 获取日志翻页信息
+     * @return 日志翻页信息
+     */
     @ApiOperation(value = "获取日志翻页信息", notes = "获取日志翻页信息")
     @GetMapping("/page")
     @SysLogger("pageLog")
     public RespDTO page() {
+        //初始化日志翻页参数
         IPage<SysLog> wrapper = new Page<>();
         return RespDTO.onSuc(sysLogFacade.page(wrapper, null));
     }

log-service/src/main/java/com/diagbot/aop/SysLoggerAspect.java

@@ -66,7 +66,7 @@ public class SysLoggerAspect {
         if(!StringUtils.isEmpty(username)) {
             sysLog.setUsername(username);
         }
-        sysLog.setCreateDate(new Date());
+        sysLog.setGmtCreate(new Date());
         //保存系统日志
         mySender.outputLogSend(sysLog);
     }

log-service/src/main/java/com/diagbot/entity/SysLog.java

@@ -1,34 +1,77 @@
 package com.diagbot.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
+import java.time.LocalDateTime;
 import java.io.Serializable;
 import java.util.Date;
 
 /**
  * <p>
- * 
+ * 系统操作日志表
  * </p>
  *
  * @author gaodm
- * @since 2018-08-02
+ * @since 2018-08-30
  */
-@TableName("sys_log")
 public class SysLog implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 日志ID
+     */
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
-    @TableField("create_date")
-    private Date createDate;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 访问者的IP
+     */
     private String ip;
+
+    /**
+     * 方法
+     */
     private String method;
+
+    /**
+     * 操作名
+     */
     private String operation;
+
+    /**
+     * 参数
+     */
     private String params;
+
+    /**
+     * 用户名
+     */
     private String username;
 
 
@@ -40,12 +83,44 @@ public class SysLog implements Serializable {
         this.id = id;
     }
 
-    public Date getCreateDate() {
-        return createDate;
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+
+    public String getModifier() {
+        return modifier;
     }
 
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
     }
 
     public String getIp() {
@@ -91,8 +166,12 @@ public class SysLog implements Serializable {
     @Override
     public String toString() {
         return "SysLog{" +
-        ", id=" + id +
-        ", createDate=" + createDate +
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
         ", ip=" + ip +
         ", method=" + method +
         ", operation=" + operation +

log-service/src/main/java/com/diagbot/entity/User.java

@@ -1,16 +1,67 @@
 package com.diagbot.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+
 /**
- * @Description: 用户实体类
- * @author: gaodm
- * @time: 2018/8/6 9:53
+ * <p>
+ * 系统用户表
+ * </p>
+ *
+ * @author gaodm
+ * @since 2018-08-30
  */
-public class User {
+@TableName("sys_user")
+public class User implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
+    /**
+     * 用户ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
-    private String username;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 用户密码
+     */
     private String password;
 
+    /**
+     * 用户名
+     */
+    private String username;
+
+
     public Long getId() {
         return id;
     }
@@ -19,12 +70,44 @@ public class User {
         this.id = id;
     }
 
-    public String getUsername() {
-        return username;
+    public String getIsDeleted() {
+        return isDeleted;
     }
 
-    public void setUsername(String username) {
-        this.username = username;
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
     }
 
     public String getPassword() {
@@ -34,4 +117,26 @@ public class User {
     public void setPassword(String password) {
         this.password = password;
     }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    @Override
+    public String toString() {
+        return "User{" +
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
+        ", password=" + password +
+        ", username=" + username +
+        "}";
+    }
 }

log-service/src/main/java/com/diagbot/web/SysLogController.java

@@ -23,12 +23,9 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.Date;
 
 /**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author gaodm
- * @since 2018-08-02
+ * @Description: 日志操作控制层
+ * @author: gaodm
+ * @time: 2018/8/30 10:12
  */
 @RestController
 @RequestMapping("/log")
@@ -37,12 +34,19 @@ public class SysLogController {
     @Autowired
     private SysLogFacade sysLogFacade;
 
+    /**
+     * 新增日志信息
+     *
+     * @param sysLogVo 新增日志输入参数
+     * @return 新增日志是否成功
+     */
     @ApiOperation(value = "添加日志", notes = "添加日志")
     @PostMapping("/add")
     @SysLogger("postLog")
     public RespDTO add(@RequestBody SysLogVo sysLogVo){
+        //初始化新增日志信息
         SysLog sysLog = new SysLog();
-        sysLog.setCreateDate(new Date());
+        sysLog.setGmtCreate(new Date());
         sysLog.setIp(sysLogVo.getIp());
         sysLog.setMethod(sysLogVo.getMethod());
         sysLog.setOperation(sysLogVo.getOperation());
@@ -50,6 +54,11 @@ public class SysLogController {
         return RespDTO.onSuc(sysLogFacade.save(sysLog)?"添加成功":"添加失败");
     }
 
+    /**
+     * 删除日志
+     * @param id 日志信息ID
+     * @return 删除是否成功
+     */
     @ApiOperation(value = "删除日志", notes = "删除日志")
     @DeleteMapping("/delete/{id}")
     @SysLogger("deleteLog")
@@ -57,13 +66,22 @@ public class SysLogController {
         return RespDTO.onSuc(sysLogFacade.removeById(id)?"删除成功":"删除失败");
     }
 
+    /**
+     * 修改日志
+     * @param sysLog 修改日志输入参数
+     * @return 修改是否成功
+     */
     @ApiOperation(value = "修改日志", notes = "修改日志")
     @PostMapping("/update")
     @SysLogger("updateLog")
-    public RespDTO update(@RequestBody SysLog student){
-        return RespDTO.onSuc(sysLogFacade.updateById(student)?"修改成功":"修改失败");
+    public RespDTO update(@RequestBody SysLog sysLog){
+        return RespDTO.onSuc(sysLogFacade.updateById(sysLog)?"修改成功":"修改失败");
     }
 
+    /**
+     * 获取日志列表
+     * @return 日志列信息
+     */
     @ApiOperation(value = "获取日志列表", notes = "获取日志列表")
     @GetMapping("/list")
     @SysLogger("listLog")
@@ -72,10 +90,15 @@ public class SysLogController {
         return RespDTO.onSuc(sysLogFacade.list(wrapper));
     }
 
+    /**
+     * 获取日志翻页信息
+     * @return 日志翻页信息
+     */
     @ApiOperation(value = "获取日志翻页信息", notes = "获取日志翻页信息")
     @GetMapping("/page")
     @SysLogger("pageLog")
     public RespDTO page() {
+        //初始化日志翻页参数
         IPage<SysLog> wrapper = new Page<>();
         return RespDTO.onSuc(sysLogFacade.page(wrapper, null));
     }

log-service/src/main/resources/mapper/SysLogMapper.xml

@@ -5,7 +5,11 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.diagbot.entity.SysLog">
         <id column="id" property="id" />
-        <result column="create_date" property="createDate" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="creator" property="creator" />
+        <result column="modifier" property="modifier" />
         <result column="ip" property="ip" />
         <result column="method" property="method" />
         <result column="operation" property="operation" />

sql/sys-log.sql

@@ -1,36 +0,0 @@
-
-CREATE DATABASE  `sys-log` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
-
-use `sys-log`;
-
-/*
-Navicat MySQL Data Transfer
-
-Source Server         : SSSS
-Source Server Version : 50717
-Source Host           : localhost:3306
-Source Database       : sys-log
-
-Target Server Type    : MYSQL
-Target Server Version : 50717
-File Encoding         : 65001
-
-Date: 2017-07-13 09:10:09
-*/
-
-SET FOREIGN_KEY_CHECKS=0;
-
-DROP TABLE IF EXISTS `sys_log`;
-CREATE TABLE `sys_log` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `create_date` datetime DEFAULT NULL,
-  `ip` varchar(255) DEFAULT NULL,
-  `method` varchar(255) DEFAULT NULL,
-  `operation` varchar(255) DEFAULT NULL,
-  `params` varchar(255) DEFAULT NULL,
-  `username` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=267 DEFAULT CHARSET=utf8;

sql/sys-user.sql

@@ -1,77 +0,0 @@
-
-CREATE DATABASE  `sys-user` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
-
-use `sys-user`;
-DROP TABLE IF EXISTS `sys_user`;
-CREATE TABLE `sys_user` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `password` varchar(255) DEFAULT NULL,
-  `username` varchar(255) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `uk_username` (`username`)
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
-
-DROP TABLE IF EXISTS `sys_role`;
-CREATE TABLE `sys_role` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `name` varchar(255) NOT NULL,
-  `roleLevel` int(11) DEFAULT NULL,
-  `descritpion` varchar(255) DEFAULT NULL,
-  `menuItems` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
-
-
-DROP TABLE IF EXISTS `sys_user_role`;
-CREATE TABLE `sys_user_role` (
-  `user_id` bigint(20) NOT NULL,
-  `role_id` bigint(20) NOT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-DROP TABLE IF EXISTS `sys_permission`;
-CREATE TABLE `sys_permission` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `name` varchar(255) NOT NULL,
-  `permissionUrl` varchar(255) NOT NULL,
-  `method` varchar(255) NOT NULL,
-  `descritpion` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
-
-DROP TABLE IF EXISTS `sys_role_permission`;
-CREATE TABLE `sys_role_permission` (
-  `role_id` bigint(20) NOT NULL,
-  `permission_id` bigint(20) NOT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-INSERT INTO `sys_user` VALUES ('1', '{bcrypt}$2a$10$rlM./Q4dh5qXYmxFxUqkRetMPf6JewV/Hj/s4qBg/6U1.mzcue2oK', 'guest');
-INSERT INTO `sys_user` VALUES ('2', '{bcrypt}$2a$10$rlM./Q4dh5qXYmxFxUqkRetMPf6JewV/Hj/s4qBg/6U1.mzcue2oK', 'admin');
-
-INSERT INTO `sys_role` VALUES ('1', '普通用户', null, null, null);
-INSERT INTO `sys_role` VALUES ('2', '管理员', null, null, null);
-
-INSERT INTO `sys_user_role` VALUES ('1', '1');
-INSERT INTO `sys_user_role` VALUES ('2', '2');
-
-INSERT INTO `sys_permission` VALUES ('1', '根据用户名获取用户', '/user/{username}', "ALL", '根据用户名获取用户');
-INSERT INTO `sys_permission` VALUES ('2', '根据用户id获取用户信息','/user/getById', "ALL", '根据用户id获取用户信息');
-
-
-INSERT INTO `sys_role_permission` VALUES ('1', '2');
-INSERT INTO `sys_role_permission` VALUES ('2', '1');
-INSERT INTO `sys_role_permission` VALUES ('2', '2');

uaa-service/src/main/java/com/diagbot/entity/Permission.java

@@ -1,32 +1,76 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
- * 
+ * 系统资源表
  * </p>
  *
  * @author gaodm
- * @since 2018-08-23
+ * @since 2018-08-30
  */
 @TableName("sys_permission")
 public class Permission implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 资源ID
+     */
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 资源名称
+     */
     private String name;
 
+    /**
+     * 资源Url
+     */
+    @TableField("permissionUrl")
     private String permissionUrl;
 
+    /**
+     * 资源允许的请求方式
+     */
     private String method;
 
+    /**
+     * 资源描述
+     */
     private String descritpion;
 
 
@@ -38,6 +82,46 @@ public class Permission implements Serializable {
         this.id = id;
     }
 
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
     public String getName() {
         return name;
     }
@@ -73,7 +157,12 @@ public class Permission implements Serializable {
     @Override
     public String toString() {
         return "Permission{" +
-        ", id=" + id +
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
         ", name=" + name +
         ", permissionUrl=" + permissionUrl +
         ", method=" + method +

uaa-service/src/main/java/com/diagbot/entity/Role.java

@@ -1,32 +1,77 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
- * 
+ * 系统角色表
  * </p>
  *
  * @author gaodm
- * @since 2018-08-23
+ * @since 2018-08-30
  */
 @TableName("sys_role")
 public class Role implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 角色ID
+     */
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 角色名称
+     */
     private String name;
 
+    /**
+     * 角色等级
+     */
+    @TableField("roleLevel")
     private Integer roleLevel;
 
+    /**
+     * 角色描述
+     */
     private String descritpion;
 
+    /**
+     * 菜单ID：对应角色ID
+     */
+    @TableField("menuItems")
     private String menuItems;
 
 
@@ -38,6 +83,46 @@ public class Role implements Serializable {
         this.id = id;
     }
 
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
     public String getName() {
         return name;
     }
@@ -73,7 +158,12 @@ public class Role implements Serializable {
     @Override
     public String toString() {
         return "Role{" +
-        ", id=" + id +
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
         ", name=" + name +
         ", roleLevel=" + roleLevel +
         ", descritpion=" + descritpion +

uaa-service/src/main/java/com/diagbot/entity/User.java

@@ -1,34 +1,69 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 
 import java.io.Serializable;
 import java.util.Collection;
+import java.util.Date;
 import java.util.List;
 
 /**
  * <p>
- * 
+ * 系统用户表
  * </p>
  *
  * @author gaodm
- * @since 2018-08-22
+ * @since 2018-08-30
  */
 @TableName("sys_user")
 public class User implements UserDetails,Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 用户ID
+     */
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 用户密码
+     */
     private String password;
 
+    /**
+     * 用户名
+     */
     private String username;
 
     private List<? extends GrantedAuthority> authorities;
@@ -75,6 +110,46 @@ public class User implements UserDetails,Serializable {
         this.id = id;
     }
 
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
     public String getPassword() {
         return password;
     }
@@ -94,7 +169,12 @@ public class User implements UserDetails,Serializable {
     @Override
     public String toString() {
         return "User{" +
-        ", id=" + id +
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
         ", password=" + password +
         ", username=" + username +
         "}";

uaa-service/src/main/resources/mapper/PermissionMapper.xml

@@ -5,11 +5,15 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.diagbot.entity.Permission">
         <id column="id" property="id" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="creator" property="creator" />
+        <result column="modifier" property="modifier" />
         <result column="name" property="name" />
-        <result column="descritpion" property="descritpion" />
-        <result column="url" property="url" />
-        <result column="pid" property="pid" />
+        <result column="permissionUrl" property="permissionUrl" />
         <result column="method" property="method" />
+        <result column="descritpion" property="descritpion" />
     </resultMap>
     
     <select id="getByUserId" parameterType="java.lang.Long" resultType="com.diagbot.entity.Permission">

uaa-service/src/main/resources/mapper/UserMapper.xml

@@ -5,6 +5,11 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.diagbot.entity.User">
         <id column="id" property="id" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="creator" property="creator" />
+        <result column="modifier" property="modifier" />
         <result column="password" property="password" />
         <result column="username" property="username" />
     </resultMap>
@@ -12,6 +17,11 @@
 
     <resultMap id="userMap" type="com.diagbot.entity.User">
         <id column="id" property="id" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="creator" property="creator" />
+        <result column="modifier" property="modifier" />
         <result column="password" property="password" />
         <result column="username" property="username" />
     </resultMap>

user-service/src/main/java/com/diagbot/aop/SysLoggerAspect.java

@@ -65,7 +65,7 @@ public class SysLoggerAspect {
         if(!StringUtils.isEmpty(username)) {
             sysLog.setUsername(username);
         }
-        sysLog.setCreateDate(new Date());
+        sysLog.setGmtCreate(new Date());
         //保存系统日志
         mySender.outputLogSend(sysLog);
     }

user-service/src/main/java/com/diagbot/entity/SysLog.java

@@ -1,27 +1,78 @@
 package com.diagbot.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
 import java.util.Date;
 
 /**
- * @Description: 日志实体类
- * @author: gaodm
- * @time: 2018/8/2 13:35
+ * <p>
+ * 系统操作日志表
+ * </p>
+ *
+ * @author gaodm
+ * @since 2018-08-30
  */
-public class SysLog {
+public class SysLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
+    /**
+     * 日志ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
-    //用户名
-    private String username;
-    //用户操作
-    private String operation;
-    //请求方法
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 访问者的IP
+     */
+    private String ip;
+
+    /**
+     * 方法
+     */
     private String method;
-    //请求参数
+
+    /**
+     * 操作名
+     */
+    private String operation;
+
+    /**
+     * 参数
+     */
     private String params;
-    //IP地址
-    private String ip;
-    //创建时间
-    private Date createDate;
+
+    /**
+     * 用户名
+     */
+    private String username;
 
 
     public Long getId() {
@@ -32,20 +83,52 @@ public class SysLog {
         this.id = id;
     }
 
-    public String getUsername() {
-        return username;
+    public String getIsDeleted() {
+        return isDeleted;
     }
 
-    public void setUsername(String username) {
-        this.username = username;
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
     }
 
-    public String getOperation() {
-        return operation;
+    public Date getGmtCreate() {
+        return gmtCreate;
     }
 
-    public void setOperation(String operation) {
-        this.operation = operation;
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    public String getIp() {
+        return ip;
+    }
+
+    public void setIp(String ip) {
+        this.ip = ip;
     }
 
     public String getMethod() {
@@ -56,6 +139,14 @@ public class SysLog {
         this.method = method;
     }
 
+    public String getOperation() {
+        return operation;
+    }
+
+    public void setOperation(String operation) {
+        this.operation = operation;
+    }
+
     public String getParams() {
         return params;
     }
@@ -64,19 +155,28 @@ public class SysLog {
         this.params = params;
     }
 
-    public String getIp() {
-        return ip;
-    }
-
-    public void setIp(String ip) {
-        this.ip = ip;
+    public String getUsername() {
+        return username;
     }
 
-    public Date getCreateDate() {
-        return createDate;
+    public void setUsername(String username) {
+        this.username = username;
     }
 
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
+    @Override
+    public String toString() {
+        return "SysLog{" +
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
+        ", ip=" + ip +
+        ", method=" + method +
+        ", operation=" + operation +
+        ", params=" + params +
+        ", username=" + username +
+        "}";
     }
 }

user-service/src/main/java/com/diagbot/entity/User.java

@@ -5,25 +5,60 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
- * 
+ * 系统用户表
  * </p>
  *
  * @author gaodm
- * @since 2018-08-22
+ * @since 2018-08-30
  */
 @TableName("sys_user")
 public class User implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 用户ID
+     */
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 用户密码
+     */
     private String password;
 
+    /**
+     * 用户名
+     */
     private String username;
 
 
@@ -35,6 +70,46 @@ public class User implements Serializable {
         this.id = id;
     }
 
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
     public String getPassword() {
         return password;
     }
@@ -54,7 +129,12 @@ public class User implements Serializable {
     @Override
     public String toString() {
         return "User{" +
-        ", id=" + id +
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
         ", password=" + password +
         ", username=" + username +
         "}";

user-service/src/main/resources/mapper/UserMapper.xml

@@ -5,6 +5,11 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.diagbot.entity.User">
         <id column="id" property="id" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="creator" property="creator" />
+        <result column="modifier" property="modifier" />
         <result column="password" property="password" />
         <result column="username" property="username" />
     </resultMap>