修改数据库的结构

48d36cc7 · fsn · e3ece4e6 · 48d36cc7 · 48d36cc7 · 48d36cc7
Commit 48d36cc7 authored Apr 08, 2017 by fsn
33 changed files
--- a/sql/guns.sql
+++ b/sql/guns.sql
@@ -10,31 +10,12 @@ Target Server Type    : MYSQL
 Target Server Version : 50621
 File Encoding         : 65001
-Date: 2017-04-07 00:13:44
+Date: 2017-04-08 10:13:46
 */
 SET FOREIGN_KEY_CHECKS=0;
 -- ----------------------------
-- Table structure for _attach
-- ----------------------------
-DROP TABLE IF EXISTS `_attach`;
-CREATE TABLE `_attach` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `code` varchar(255) DEFAULT NULL,
-  `name` varchar(255) DEFAULT NULL,
-  `url` text,
-  `status` int(11) DEFAULT NULL,
-  `creater` int(11) DEFAULT NULL,
-  `createtime` datetime DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- ----------------------------
-- Records of _attach
-- ----------------------------
-- ----------------------------
 -- Table structure for _dept
 -- ----------------------------
 DROP TABLE IF EXISTS `_dept`;
@@ -89,27 +70,6 @@ INSERT INTO `_dict` VALUES ('12', '902', '1', '11', '启用', null, '0');
 INSERT INTO `_dict` VALUES ('13', '902', '2', '11', '禁用', null, '0');
 -- ----------------------------
-- Table structure for _generate
-- ----------------------------
-DROP TABLE IF EXISTS `_generate`;
-CREATE TABLE `_generate` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(255) DEFAULT NULL,
-  `realpath` varchar(255) DEFAULT NULL,
-  `packagename` varchar(255) DEFAULT NULL,
-  `modelname` varchar(255) DEFAULT NULL,
-  `tablename` varchar(255) DEFAULT NULL,
-  `pkname` varchar(255) DEFAULT NULL,
-  `tips` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
-- ----------------------------
-- Records of _generate
-- ----------------------------
-INSERT INTO `_generate` VALUES ('1', '测试', 'E:\\Workspaces\\blade\\SpringBlade', 'com.smallchill.gen', 'Notice', '_notice', 'id', null);
-- ----------------------------
 -- Table structure for _login_log
 -- ----------------------------
 DROP TABLE IF EXISTS `_login_log`;
@@ -153,45 +113,40 @@ DROP TABLE IF EXISTS `_menu`;
 CREATE TABLE `_menu` (
  `id` int(65) NOT NULL AUTO_INCREMENT,
  `code` varchar(255) DEFAULT NULL COMMENT '菜单编号',
-  `pcode` varchar(255) DEFAULT NULL,
+  `pcode` varchar(255) DEFAULT NULL COMMENT '菜单父编号',
-  `alias` varchar(255) DEFAULT NULL,
+  `name` varchar(255) DEFAULT NULL COMMENT '菜单名称',
-  `name` varchar(255) DEFAULT NULL,
+  `icon` varchar(255) DEFAULT NULL COMMENT '菜单图标',
-  `icon` varchar(255) DEFAULT NULL,
+  `url` varchar(255) DEFAULT NULL COMMENT 'url地址',
-  `url` varchar(255) DEFAULT NULL,
+  `num` int(65) DEFAULT NULL COMMENT '菜单排序号',
-  `num` int(65) DEFAULT NULL,
+  `levels` int(65) DEFAULT NULL COMMENT '菜单层级',
-  `levels` int(65) DEFAULT NULL,
+  `tips` varchar(255) DEFAULT NULL COMMENT '备注',
-  `source` text,
+  `status` int(65) DEFAULT NULL COMMENT '菜单状态 :  1:启用   0:不启用',
-  `path` varchar(255) DEFAULT NULL,
+  `isopen` int(11) DEFAULT NULL COMMENT '是否打开:    1:打开   0:不打开',
-  `tips` varchar(255) DEFAULT NULL,
-  `status` int(65) DEFAULT NULL,
-  `isopen` varchar(255) DEFAULT NULL,
-  `istemplate` varchar(255) DEFAULT NULL,
-  `version` int(11) DEFAULT NULL,
  PRIMARY KEY (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=129 DEFAULT CHARSET=utf8;
 -- ----------------------------
 -- Records of _menu
 -- ----------------------------
-INSERT INTO `_menu` VALUES ('105', 'system', '0', null, '系统管理', 'fa-user', '', '2', '2', null, null, null, '1', null, null, null);
+INSERT INTO `_menu` VALUES ('105', 'system', '0', '系统管理', 'fa-user', '', '2', '2', null, '1', '1');
-INSERT INTO `_menu` VALUES ('106', 'mgr', 'system', null, '用户管理', null, '/mgr', '1', '2', null, null, null, '1', null, null, null);
+INSERT INTO `_menu` VALUES ('106', 'mgr', 'system', '用户管理', null, '/mgr', '1', '2', null, '1', '0');
-INSERT INTO `_menu` VALUES ('107', 'mgr_add', 'mgr', null, '添加用户', null, '/mgr/add', '1', '3', null, null, null, '1', null, null, null);
+INSERT INTO `_menu` VALUES ('107', 'mgr_add', 'mgr', '添加用户', null, '/mgr/add', '1', '3', null, '1', '0');
-INSERT INTO `_menu` VALUES ('108', 'mgr_edit', 'mgr', null, '修改用户', null, '/mgr/edit', '1', '3', null, null, null, '1', null, null, null);
+INSERT INTO `_menu` VALUES ('108', 'mgr_edit', 'mgr', '修改用户', null, '/mgr/edit', '1', '3', null, '1', '0');
-INSERT INTO `_menu` VALUES ('109', 'mgr_delete', 'mgr', null, '删除用户', null, '/mgr/delete', '1', '3', null, null, null, '1', null, null, null);
+INSERT INTO `_menu` VALUES ('109', 'mgr_delete', 'mgr', '删除用户', null, '/mgr/delete', '1', '3', null, '1', '0');
-INSERT INTO `_menu` VALUES ('110', 'mgr_reset', 'mgr', null, '重置密码', null, '/mgr/reset', '1', '3', null, null, null, '1', null, null, null);
+INSERT INTO `_menu` VALUES ('110', 'mgr_reset', 'mgr', '重置密码', null, '/mgr/reset', '1', '3', null, '1', '0');
-INSERT INTO `_menu` VALUES ('111', 'mgr_freeze', 'mgr', null, '冻结用户', null, '/mgr/freeze', '1', '3', null, null, null, '1', null, null, null);
+INSERT INTO `_menu` VALUES ('111', 'mgr_freeze', 'mgr', '冻结用户', null, '/mgr/freeze', '1', '3', null, '1', '0');
-INSERT INTO `_menu` VALUES ('112', 'mgr_unfreeze', 'mgr', null, '解除冻结用户', null, '/mgr/unfreeze', '1', '3', null, null, null, '1', null, null, null);
+INSERT INTO `_menu` VALUES ('112', 'mgr_unfreeze', 'mgr', '解除冻结用户', null, '/mgr/unfreeze', '1', '3', null, '1', '0');
-INSERT INTO `_menu` VALUES ('113', 'mgr_setRole', 'mgr', null, '分配角色', null, '/mgr/setRole', '1', '3', null, null, null, '1', null, null, null);
+INSERT INTO `_menu` VALUES ('113', 'mgr_setRole', 'mgr', '分配角色', null, '/mgr/setRole', '1', '3', null, '1', '0');
-INSERT INTO `_menu` VALUES ('114', 'role', 'system', null, '角色管理', null, '/role', '1', '2', null, null, null, '1', null, null, null);
+INSERT INTO `_menu` VALUES ('114', 'role', 'system', '角色管理', null, '/role', '1', '2', null, '1', '0');
-INSERT INTO `_menu` VALUES ('115', 'role_add', 'role', null, '添加角色', null, '/role/add', '1', '3', null, null, null, '1', null, null, null);
+INSERT INTO `_menu` VALUES ('115', 'role_add', 'role', '添加角色', null, '/role/add', '1', '3', null, '1', '0');
-INSERT INTO `_menu` VALUES ('116', 'role_edit', 'role', null, '修改角色', null, '/role/edit', '1', '3', null, null, null, '1', null, null, null);
+INSERT INTO `_menu` VALUES ('116', 'role_edit', 'role', '修改角色', null, '/role/edit', '1', '3', null, '1', '0');
-INSERT INTO `_menu` VALUES ('117', 'role_remove', 'role', null, '删除角色', null, '/role/remove', '1', '3', null, null, null, '1', null, null, null);
+INSERT INTO `_menu` VALUES ('117', 'role_remove', 'role', '删除角色', null, '/role/remove', '1', '3', null, '1', '0');
-INSERT INTO `_menu` VALUES ('118', 'role_setAuthority', 'role', null, '配置权限', null, '/role/setAuthority', '1', '3', null, null, null, '1', null, null, null);
+INSERT INTO `_menu` VALUES ('118', 'role_setAuthority', 'role', '配置权限', null, '/role/setAuthority', '1', '3', null, '1', '0');
-INSERT INTO `_menu` VALUES ('119', 'menu', 'system', null, '菜单管理', null, '/menu', '1', '2', null, null, null, '1', null, null, null);
+INSERT INTO `_menu` VALUES ('119', 'menu', 'system', '菜单管理', null, '/menu', '1', '2', null, '1', '0');
-INSERT INTO `_menu` VALUES ('120', 'menu_add', 'menu', null, '添加菜单', null, '/menu/add', '1', '3', null, null, null, '1', null, null, null);
+INSERT INTO `_menu` VALUES ('120', 'menu_add', 'menu', '添加菜单', null, '/menu/add', '1', '3', null, '1', '0');
-INSERT INTO `_menu` VALUES ('121', 'menu_edit', 'menu', null, '修改菜单', null, '/menu/edit', '1', '3', null, null, null, '1', null, null, null);
+INSERT INTO `_menu` VALUES ('121', 'menu_edit', 'menu', '修改菜单', null, '/menu/edit', '1', '3', null, '1', '0');
-INSERT INTO `_menu` VALUES ('122', 'menu_remove', 'menu', null, '删除菜单', null, '/menu/remove', '1', '3', null, null, null, '1', null, null, null);
+INSERT INTO `_menu` VALUES ('122', 'menu_remove', 'menu', '删除菜单', null, '/menu/remove', '1', '3', null, '1', '0');
-INSERT INTO `_menu` VALUES ('128', 'log', 'system', null, '日志管理', null, '/log', '1', '1', null, null, null, '1', null, null, null);
+INSERT INTO `_menu` VALUES ('128', 'log', 'system', '日志管理', null, '/log', '1', '1', null, '1', '0');
 -- ----------------------------
 -- Table structure for _notice
@@ -214,8 +169,6 @@ CREATE TABLE `_notice` (
 -- Records of _notice
 -- ----------------------------
 INSERT INTO `_notice` VALUES ('6', '通知1', '10', '通知111', '2017-01-16 00:00:00', '2017-01-11 08:53:20', '1', null, '3');
-INSERT INTO `_notice` VALUES ('7', '通知22222', '1', '123123123', '2017-02-02 00:00:00', '2017-01-12 16:22:10', '1', null, '1');
-INSERT INTO `_notice` VALUES ('8', '123123', '10', '123123', '2017-02-07 00:00:00', '2017-02-20 12:38:46', '1', null, null);
 -- ----------------------------
 -- Table structure for _operation_log

--- a/src/main/java/com/stylefeng/guns/common/constant/state/LogSucceed.java
+++ b/src/main/java/com/stylefeng/guns/common/constant/state/LogSucceed.java
 package com.stylefeng.guns.common.constant.state;
 /**
- * 用户的状态
+ * 业务是否成功的日志记录
 *
 * @author fengshuonan
 * @Date 2017年1月22日 下午12:14:59

--- a/src/main/java/com/stylefeng/guns/common/constant/state/LogType.java
+++ b/src/main/java/com/stylefeng/guns/common/constant/state/LogType.java
 package com.stylefeng.guns.common.constant.state;
 /**
- * 用户的状态
+ * 日志类型
 *
 * @author fengshuonan
 * @Date 2017年1月22日 下午12:14:59

--- a/src/main/java/com/stylefeng/guns/common/constant/state/MenuOpenStatus.java
+++ b/src/main/java/com/stylefeng/guns/common/constant/state/MenuOpenStatus.java
+package com.stylefeng.guns.common.constant.state;
+/**
+ * 菜单是否打开的状态
+ *
+ * @author fengshuonan
+ * @Date 2017年4月8日10:12:15
+ */
+public enum MenuOpenStatus {
+    OPEN(1, "打开"),
+    CLOSE(0, "关闭");
+    int code;
+    String message;
+    MenuOpenStatus(int code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+    public int getCode() {
+        return code;
+    }
+    public void setCode(int code) {
+        this.code = code;
+    }
+    public String getMessage() {
+        return message;
+    }
+    public void setMessage(String message) {
+        this.message = message;
+    }
+    public static String valueOf(Integer status) {
+        if (status == null) {
+            return "";
+        } else {
+            for (MenuOpenStatus s : MenuOpenStatus.values()) {
+                if (s.getCode() == status) {
+                    return s.getMessage();
+                }
+            }
+            return "";
+        }
+    }
+}
--- a/src/main/java/com/stylefeng/guns/common/constant/state/MenuStatus.java
+++ b/src/main/java/com/stylefeng/guns/common/constant/state/MenuStatus.java
 package com.stylefeng.guns.common.constant.state;
 /**
- * 用户的状态
+ * 菜单的状态
 *
 * @author fengshuonan
 * @Date 2017年1月22日 下午12:14:59
@@ -9,7 +9,7 @@ package com.stylefeng.guns.common.constant.state;
 public enum MenuStatus {
    ENABLE(1, "启用"),
-    DISABLE(2, "禁用");
+    DISABLE(0, "禁用");
    int code;
    String message;

--- a/src/main/java/com/stylefeng/guns/persistence/dao/AttachMapper.java
+++ b/src/main/java/com/stylefeng/guns/persistence/dao/AttachMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
 * </p>
 *
 * @author stylefeng
- * @since 2017-03-30
+ * @since 2017-04-08
 */
 public interface AttachMapper extends BaseMapper<Attach> {

--- a/src/main/java/com/stylefeng/guns/persistence/dao/DeptMapper.java
+++ b/src/main/java/com/stylefeng/guns/persistence/dao/DeptMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
 * </p>
 *
 * @author stylefeng
- * @since 2017-03-30
+ * @since 2017-04-08
 */
 public interface DeptMapper extends BaseMapper<Dept> {

--- a/src/main/java/com/stylefeng/guns/persistence/dao/DictMapper.java
+++ b/src/main/java/com/stylefeng/guns/persistence/dao/DictMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
 * </p>
 *
 * @author stylefeng
- * @since 2017-03-30
+ * @since 2017-04-08
 */
 public interface DictMapper extends BaseMapper<Dict> {

--- a/src/main/java/com/stylefeng/guns/persistence/dao/GenerateMapper.java
+++ b/src/main/java/com/stylefeng/guns/persistence/dao/GenerateMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
 * </p>
 *
 * @author stylefeng
- * @since 2017-03-30
+ * @since 2017-04-08
 */
 public interface GenerateMapper extends BaseMapper<Generate> {

--- a/src/main/java/com/stylefeng/guns/persistence/dao/LoginLogMapper.java
+++ b/src/main/java/com/stylefeng/guns/persistence/dao/LoginLogMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
 * </p>
 *
 * @author stylefeng
- * @since 2017-03-30
+ * @since 2017-04-08
 */
 public interface LoginLogMapper extends BaseMapper<LoginLog> {

--- a/src/main/java/com/stylefeng/guns/persistence/dao/MenuMapper.java
+++ b/src/main/java/com/stylefeng/guns/persistence/dao/MenuMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
 * </p>
 *
 * @author stylefeng
- * @since 2017-03-30
+ * @since 2017-04-08
 */
 public interface MenuMapper extends BaseMapper<Menu> {

--- a/src/main/java/com/stylefeng/guns/persistence/dao/NoticeMapper.java
+++ b/src/main/java/com/stylefeng/guns/persistence/dao/NoticeMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
 * </p>
 *
 * @author stylefeng
- * @since 2017-03-30
+ * @since 2017-04-08
 */
 public interface NoticeMapper extends BaseMapper<Notice> {

--- a/src/main/java/com/stylefeng/guns/persistence/dao/OperationLogMapper.java
+++ b/src/main/java/com/stylefeng/guns/persistence/dao/OperationLogMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
 * </p>
 *
 * @author stylefeng
- * @since 2017-03-30
+ * @since 2017-04-08
 */
 public interface OperationLogMapper extends BaseMapper<OperationLog> {

--- a/src/main/java/com/stylefeng/guns/persistence/dao/ParameterMapper.java
+++ b/src/main/java/com/stylefeng/guns/persistence/dao/ParameterMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
 * </p>
 *
 * @author stylefeng
- * @since 2017-03-30
+ * @since 2017-04-08
 */
 public interface ParameterMapper extends BaseMapper<Parameter> {

--- a/src/main/java/com/stylefeng/guns/persistence/dao/RelationMapper.java
+++ b/src/main/java/com/stylefeng/guns/persistence/dao/RelationMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
 * </p>
 *
 * @author stylefeng
- * @since 2017-03-30
+ * @since 2017-04-08
 */
 public interface RelationMapper extends BaseMapper<Relation> {

--- a/src/main/java/com/stylefeng/guns/persistence/dao/RoleExtMapper.java
+++ b/src/main/java/com/stylefeng/guns/persistence/dao/RoleExtMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
 * </p>
 *
 * @author stylefeng
- * @since 2017-03-30
+ * @since 2017-04-08
 */
 public interface RoleExtMapper extends BaseMapper<RoleExt> {

--- a/src/main/java/com/stylefeng/guns/persistence/dao/RoleMapper.java
+++ b/src/main/java/com/stylefeng/guns/persistence/dao/RoleMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
 * </p>
 *
 * @author stylefeng
- * @since 2017-03-30
+ * @since 2017-04-08
 */
 public interface RoleMapper extends BaseMapper<Role> {

--- a/src/main/java/com/stylefeng/guns/persistence/dao/UserMapper.java
+++ b/src/main/java/com/stylefeng/guns/persistence/dao/UserMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
 * </p>
 *
 * @author stylefeng
- * @since 2017-03-30
+ * @since 2017-04-08
 */
 public interface UserMapper extends BaseMapper<User> {

--- a/src/main/java/com/stylefeng/guns/persistence/dao/mapping/MenuMapper.xml
+++ b/src/main/java/com/stylefeng/guns/persistence/dao/mapping/MenuMapper.xml
@@ -7,19 +7,14 @@
 		<id column="id" property="id" />
 		<result column="code" property="code" />
 		<result column="pcode" property="pcode" />
-		<result column="alias" property="alias" />
 		<result column="name" property="name" />
 		<result column="icon" property="icon" />
 		<result column="url" property="url" />
 		<result column="num" property="num" />
 		<result column="levels" property="levels" />
-		<result column="source" property="source" />
-		<result column="path" property="path" />
 		<result column="tips" property="tips" />
 		<result column="status" property="status" />
 		<result column="isopen" property="isopen" />
-		<result column="istemplate" property="istemplate" />
-		<result column="version" property="version" />
 	</resultMap>
 </mapper>
--- a/src/main/java/com/stylefeng/guns/persistence/model/Attach.java
+++ b/src/main/java/com/stylefeng/guns/persistence/model/Attach.java
 package com.stylefeng.guns.persistence.model;
-import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.enums.IdType;
 import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableName;
 import java.io.Serializable;
-import com.baomidou.mybatisplus.annotations.TableId;
 /**
 * <p>
@@ -13,14 +13,14 @@ import com.baomidou.mybatisplus.annotations.TableId;
 * </p>
 *
 * @author stylefeng
- * @since 2017-03-30
+ * @since 2017-04-08
 */
 @TableName("_attach")
 public class Attach extends Model<Attach> {
    private static final long serialVersionUID = 1L;
-	@TableId
+	@TableId(value="id", type= IdType.AUTO)
 	private Integer id;
 	private String code;
 	private String name;

--- a/src/main/java/com/stylefeng/guns/persistence/model/Dept.java
+++ b/src/main/java/com/stylefeng/guns/persistence/model/Dept.java
 package com.stylefeng.guns.persistence.model;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableName;
 import java.io.Serializable;
-import com.baomidou.mybatisplus.annotations.TableId;
 /**
 * <p>
@@ -12,14 +12,14 @@ import com.baomidou.mybatisplus.annotations.TableId;
 * </p>
 *
 * @author stylefeng
- * @since 2017-03-30
+ * @since 2017-04-08
 */
 @TableName("_dept")
 public class Dept extends Model<Dept> {
    private static final long serialVersionUID = 1L;
-	@TableId
+	@TableId(value="id", type= IdType.AUTO)
 	private Integer id;
 	private Integer num;
 	private Integer pid;

--- a/src/main/java/com/stylefeng/guns/persistence/model/Dict.java
+++ b/src/main/java/com/stylefeng/guns/persistence/model/Dict.java
 package com.stylefeng.guns.persistence.model;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableName;
 import java.io.Serializable;
-import com.baomidou.mybatisplus.annotations.TableId;
 /**
 * <p>
@@ -12,14 +12,14 @@ import com.baomidou.mybatisplus.annotations.TableId;
 * </p>
 *
 * @author stylefeng
- * @since 2017-03-30
+ * @since 2017-04-08
 */
 @TableName("_dict")
 public class Dict extends Model<Dict> {
    private static final long serialVersionUID = 1L;
-	@TableId
+	@TableId(value="id", type= IdType.AUTO)
 	private Integer id;
 	private String code;
 	private Integer num;

--- a/src/main/java/com/stylefeng/guns/persistence/model/Generate.java
+++ b/src/main/java/com/stylefeng/guns/persistence/model/Generate.java
 package com.stylefeng.guns.persistence.model;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableName;
 import java.io.Serializable;
-import com.baomidou.mybatisplus.annotations.TableId;
 /**
 * <p>
@@ -12,14 +12,14 @@ import com.baomidou.mybatisplus.annotations.TableId;
 * </p>
 *
 * @author stylefeng
- * @since 2017-03-30
+ * @since 2017-04-08
 */
 @TableName("_generate")
 public class Generate extends Model<Generate> {
    private static final long serialVersionUID = 1L;
-	@TableId
+	@TableId(value="id", type= IdType.AUTO)
 	private Integer id;
 	private String name;
 	private String realpath;

--- a/src/main/java/com/stylefeng/guns/persistence/model/LoginLog.java
+++ b/src/main/java/com/stylefeng/guns/persistence/model/LoginLog.java
 package com.stylefeng.guns.persistence.model;
-import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.enums.IdType;
 import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableName;
 import java.io.Serializable;
-import com.baomidou.mybatisplus.annotations.TableId;
 /**
 * <p>
@@ -13,14 +13,14 @@ import com.baomidou.mybatisplus.annotations.TableId;
 * </p>
 *
 * @author stylefeng
- * @since 2017-03-30
+ * @since 2017-04-08
 */
 @TableName("_login_log")
 public class LoginLog extends Model<LoginLog> {
    private static final long serialVersionUID = 1L;
-	@TableId
+	@TableId(value="id", type= IdType.AUTO)
 	private Integer id;
 	private String logname;
 	private Integer userid;

--- a/src/main/java/com/stylefeng/guns/persistence/model/Menu.java
+++ b/src/main/java/com/stylefeng/guns/persistence/model/Menu.java
 package com.stylefeng.guns.persistence.model;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableName;
 import java.io.Serializable;
-import com.baomidou.mybatisplus.annotations.TableId;
 /**
 * <p>
@@ -12,33 +12,55 @@ import com.baomidou.mybatisplus.annotations.TableId;
 * </p>
 *
 * @author stylefeng
- * @since 2017-03-30
+ * @since 2017-04-08
 */
 @TableName("_menu")
 public class Menu extends Model<Menu> {
    private static final long serialVersionUID = 1L;
-	@TableId
+	@TableId(value="id", type= IdType.AUTO)
 	private Integer id;
    /**
     * 菜单编号
     */
 	private String code;
+    /**
+     * 菜单父编号
+     */
 	private String pcode;
-	private String alias;
+    /**
+     * 菜单名称
+     */
 	private String name;
+    /**
+     * 菜单图标
+     */
 	private String icon;
+    /**
+     * url地址
+     */
 	private String url;
+    /**
+     * 菜单排序号
+     */
 	private Integer num;
+    /**
+     * 菜单层级
+     */
 	private Integer levels;
-	private String source;
+    /**
-	private String path;
+     * 备注
+     */
 	private String tips;
+    /**
+     * 菜单状态 :  1:启用   0:不启用
+     */
 	private Integer status;
-	private String isopen;
+    /**
-	private String istemplate;
+     * 是否打开:    1:打开   0:不打开
-	private Integer version;
+     */
+	private Integer isopen;
 	public Integer getId() {
@@ -65,14 +87,6 @@ public class Menu extends Model<Menu> {
 		this.pcode = pcode;
 	}
-	public String getAlias() {
-		return alias;
-	}
-	public void setAlias(String alias) {
-		this.alias = alias;
-	}
 	public String getName() {
 		return name;
 	}
@@ -113,22 +127,6 @@ public class Menu extends Model<Menu> {
 		this.levels = levels;
 	}
-	public String getSource() {
-		return source;
-	}
-	public void setSource(String source) {
-		this.source = source;
-	}
-	public String getPath() {
-		return path;
-	}
-	public void setPath(String path) {
-		this.path = path;
-	}
 	public String getTips() {
 		return tips;
 	}
@@ -145,30 +143,14 @@ public class Menu extends Model<Menu> {
 		this.status = status;
 	}
-	public String getIsopen() {
+	public Integer getIsopen() {
 		return isopen;
 	}
-	public void setIsopen(String isopen) {
+	public void setIsopen(Integer isopen) {
 		this.isopen = isopen;
 	}
-	public String getIstemplate() {
-		return istemplate;
-	}
-	public void setIstemplate(String istemplate) {
-		this.istemplate = istemplate;
-	}
-	public Integer getVersion() {
-		return version;
-	}
-	public void setVersion(Integer version) {
-		this.version = version;
-	}
 	@Override
 	protected Serializable pkVal() {
 		return this.id;

--- a/src/main/java/com/stylefeng/guns/persistence/model/Notice.java
+++ b/src/main/java/com/stylefeng/guns/persistence/model/Notice.java
 package com.stylefeng.guns.persistence.model;
-import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.enums.IdType;
 import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableName;
 import java.io.Serializable;
-import com.baomidou.mybatisplus.annotations.TableId;
 /**
 * <p>
@@ -13,7 +13,7 @@ import com.baomidou.mybatisplus.annotations.TableId;
 * </p>
 *
 * @author stylefeng
- * @since 2017-03-30
+ * @since 2017-04-08
 */
 @TableName("_notice")
 public class Notice extends Model<Notice> {
@@ -23,7 +23,7 @@ public class Notice extends Model<Notice> {
    /**
     * 序列
     */
-	@TableId
+	@TableId(value="id", type= IdType.AUTO)
 	private Integer id;
    /**
     * 标题

--- a/src/main/java/com/stylefeng/guns/persistence/model/OperationLog.java
+++ b/src/main/java/com/stylefeng/guns/persistence/model/OperationLog.java
 package com.stylefeng.guns.persistence.model;
-import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.enums.IdType;
+import java.util.Date;
 import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableName;
 import java.io.Serializable;
-import java.util.Date;
 /**
 * <p>
@@ -14,14 +13,14 @@ import java.util.Date;
 * </p>
 *
 * @author stylefeng
- * @since 2017-03-30
+ * @since 2017-04-08
 */
 @TableName("_operation_log")
 public class OperationLog extends Model<OperationLog> {
    private static final long serialVersionUID = 1L;
-	@TableId
+	@TableId(value="id", type= IdType.AUTO)
 	private Integer id;
 	private String logtype;
 	private String logname;

--- a/src/main/java/com/stylefeng/guns/persistence/model/Parameter.java
+++ b/src/main/java/com/stylefeng/guns/persistence/model/Parameter.java
 package com.stylefeng.guns.persistence.model;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableName;
 import java.io.Serializable;
-import com.baomidou.mybatisplus.annotations.TableId;
 /**
 * <p>
@@ -12,14 +12,14 @@ import com.baomidou.mybatisplus.annotations.TableId;
 * </p>
 *
 * @author stylefeng
- * @since 2017-03-30
+ * @since 2017-04-08
 */
 @TableName("_parameter")
 public class Parameter extends Model<Parameter> {
    private static final long serialVersionUID = 1L;
-	@TableId
+	@TableId(value="id", type= IdType.AUTO)
 	private Integer id;
 	private String code;
 	private Integer num;

--- a/src/main/java/com/stylefeng/guns/persistence/model/Relation.java
+++ b/src/main/java/com/stylefeng/guns/persistence/model/Relation.java
 package com.stylefeng.guns.persistence.model;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableName;
 import java.io.Serializable;
-import com.baomidou.mybatisplus.annotations.TableId;
 /**
 * <p>
@@ -12,14 +12,14 @@ import com.baomidou.mybatisplus.annotations.TableId;
 * </p>
 *
 * @author stylefeng
- * @since 2017-03-30
+ * @since 2017-04-08
 */
 @TableName("_relation")
 public class Relation extends Model<Relation> {
    private static final long serialVersionUID = 1L;
-	@TableId
+	@TableId(value="id", type= IdType.AUTO)
 	private Integer id;
 	private Integer menuid;
 	private Integer roleid;

--- a/src/main/java/com/stylefeng/guns/persistence/model/Role.java
+++ b/src/main/java/com/stylefeng/guns/persistence/model/Role.java
 package com.stylefeng.guns.persistence.model;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableName;
 import java.io.Serializable;
-import com.baomidou.mybatisplus.annotations.TableId;
 /**
 * <p>
@@ -12,14 +12,14 @@ import com.baomidou.mybatisplus.annotations.TableId;
 * </p>
 *
 * @author stylefeng
- * @since 2017-03-30
+ * @since 2017-04-08
 */
 @TableName("_role")
 public class Role extends Model<Role> {
    private static final long serialVersionUID = 1L;
-	@TableId
+	@TableId(value="id", type= IdType.AUTO)
 	private Integer id;
 	private Integer num;
 	private Integer pid;

--- a/src/main/java/com/stylefeng/guns/persistence/model/RoleExt.java
+++ b/src/main/java/com/stylefeng/guns/persistence/model/RoleExt.java
 package com.stylefeng.guns.persistence.model;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableName;
 import java.io.Serializable;
-import com.baomidou.mybatisplus.annotations.TableId;
 /**
 * <p>
@@ -12,14 +12,14 @@ import com.baomidou.mybatisplus.annotations.TableId;
 * </p>
 *
 * @author stylefeng
- * @since 2017-03-30
+ * @since 2017-04-08
 */
 @TableName("_role_ext")
 public class RoleExt extends Model<RoleExt> {
    private static final long serialVersionUID = 1L;
-	@TableId
+	@TableId(value="id", type= IdType.AUTO)
 	private Integer id;
 	private String userid;
 	private String rolein;

--- a/src/main/java/com/stylefeng/guns/persistence/model/User.java
+++ b/src/main/java/com/stylefeng/guns/persistence/model/User.java
 package com.stylefeng.guns.persistence.model;
-import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.enums.IdType;
+import java.util.Date;
 import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableName;
-import org.springframework.format.annotation.DateTimeFormat;
 import java.io.Serializable;
-import java.util.Date;
 /**
 * <p>
@@ -15,21 +13,19 @@ import java.util.Date;
 * </p>
 *
 * @author stylefeng
- * @since 2017-03-30
+ * @since 2017-04-08
 */
 @TableName("_user")
 public class User extends Model<User> {
    private static final long serialVersionUID = 1L;
-	@TableId
+	@TableId(value="id", type= IdType.AUTO)
 	private Integer id;
 	private String account;
 	private String password;
 	private String salt;
 	private String name;
-	@DateTimeFormat(pattern = "yyyy-MM-dd")
 	private Date birthday;
 	private Integer sex;
 	private String email;
@@ -37,8 +33,6 @@ public class User extends Model<User> {
 	private String roleid;
 	private Integer deptid;
 	private Integer status;
-	@DateTimeFormat(pattern = "yyyy-MM-dd")
 	private Date createtime;
 	private Integer version;

--- a/src/main/java/project/generator/MpGenerator.java
+++ b/src/main/java/project/generator/MpGenerator.java
@@ -33,7 +33,7 @@ public class MpGenerator {
        // 全局配置
        GlobalConfig gc = new GlobalConfig();
        gc.setOutputDir("D:\\ideaSpace\\guns\\src\\main\\java");//这里写你自己的java目录
-        gc.setFileOverride(true);
+        gc.setFileOverride(true);//是否覆盖
        gc.setActiveRecord(true);
        gc.setEnableCache(false);// XML 二级缓存
        gc.setBaseResultMap(true);// XML ResultMap