调整数据结构

sql/guns.sql

 /*
 /*
 Navicat MySQL Data Transfer
 Navicat MySQL Data Transfer
 
 
-Source Server         : 本地的
+Source Server         : 数据库
 Source Server Version : 50621
 Source Server Version : 50621
-Source Host           : localhost:3306
+Source Host           : 127.0.0.1:3306
 Source Database       : guns
 Source Database       : guns
 
 
 Target Server Type    : MYSQL
 Target Server Type    : MYSQL
 Target Server Version : 50621
 Target Server Version : 50621
 File Encoding         : 65001
 File Encoding         : 65001
 
 
-Date: 2017-05-04 13:59:57
+Date: 2017-05-05 22:50:32
 */
 */
 
 
 SET FOREIGN_KEY_CHECKS=0;
 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
 -- Table structure for _dept
 -- ----------------------------
 -- ----------------------------
 DROP TABLE IF EXISTS `_dept`;
 DROP TABLE IF EXISTS `_dept`;
@@ -119,7 +100,7 @@ CREATE TABLE `_login_log` (
   `message` text,
   `message` text,
   `ip` varchar(255) DEFAULT NULL,
   `ip` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`id`)
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=101 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=102 DEFAULT CHARSET=utf8;
 
 
 -- ----------------------------
 -- ----------------------------
 -- Records of _login_log
 -- Records of _login_log
@@ -146,6 +127,7 @@ INSERT INTO `_login_log` VALUES ('97', '退出日志', '42', '2017-05-04 13:57:3
 INSERT INTO `_login_log` VALUES ('98', '登录日志', '1', '2017-05-04 13:57:39', '成功', null, '127.0.0.1');
 INSERT INTO `_login_log` VALUES ('98', '登录日志', '1', '2017-05-04 13:57:39', '成功', null, '127.0.0.1');
 INSERT INTO `_login_log` VALUES ('99', '退出日志', '1', '2017-05-04 13:58:27', '成功', null, '127.0.0.1');
 INSERT INTO `_login_log` VALUES ('99', '退出日志', '1', '2017-05-04 13:58:27', '成功', null, '127.0.0.1');
 INSERT INTO `_login_log` VALUES ('100', '登录日志', '1', '2017-05-04 13:59:30', '成功', null, '127.0.0.1');
 INSERT INTO `_login_log` VALUES ('100', '登录日志', '1', '2017-05-04 13:59:30', '成功', null, '127.0.0.1');
+INSERT INTO `_login_log` VALUES ('101', '退出日志', '1', '2017-05-05 22:49:20', '成功', null, '127.0.0.1');
 
 
 -- ----------------------------
 -- ----------------------------
 -- Table structure for _menu
 -- Table structure for _menu
@@ -237,7 +219,7 @@ CREATE TABLE `_operation_log` (
   `succeed` varchar(255) DEFAULT NULL,
   `succeed` varchar(255) DEFAULT NULL,
   `message` text,
   `message` text,
   PRIMARY KEY (`id`)
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=340 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=344 DEFAULT CHARSET=utf8;
 
 
 -- ----------------------------
 -- ----------------------------
 -- Records of _operation_log
 -- Records of _operation_log
@@ -305,6 +287,10 @@ INSERT INTO `_operation_log` VALUES ('336', '业务日志', '删除角色', '1',
 INSERT INTO `_operation_log` VALUES ('337', '业务日志', '删除部门', '1', 'com.stylefeng.guns.modular.system.controller.DeptController', 'delete', '2017-05-04 13:59:41', '成功', '[时间]:2017-05-04 13:59:41  [类名]:com.stylefeng.guns.modular.system.controller.DeptController  [方法]:delete  [参数]:29 ');
 INSERT INTO `_operation_log` VALUES ('337', '业务日志', '删除部门', '1', 'com.stylefeng.guns.modular.system.controller.DeptController', 'delete', '2017-05-04 13:59:41', '成功', '[时间]:2017-05-04 13:59:41  [类名]:com.stylefeng.guns.modular.system.controller.DeptController  [方法]:delete  [参数]:29 ');
 INSERT INTO `_operation_log` VALUES ('338', '业务日志', '删除部门', '1', 'com.stylefeng.guns.modular.system.controller.DeptController', 'delete', '2017-05-04 13:59:42', '成功', '[时间]:2017-05-04 13:59:42  [类名]:com.stylefeng.guns.modular.system.controller.DeptController  [方法]:delete  [参数]:28 ');
 INSERT INTO `_operation_log` VALUES ('338', '业务日志', '删除部门', '1', 'com.stylefeng.guns.modular.system.controller.DeptController', 'delete', '2017-05-04 13:59:42', '成功', '[时间]:2017-05-04 13:59:42  [类名]:com.stylefeng.guns.modular.system.controller.DeptController  [方法]:delete  [参数]:28 ');
 INSERT INTO `_operation_log` VALUES ('339', '业务日志', '删除部门', '1', 'com.stylefeng.guns.modular.system.controller.DeptController', 'delete', '2017-05-04 13:59:44', '成功', '[时间]:2017-05-04 13:59:43  [类名]:com.stylefeng.guns.modular.system.controller.DeptController  [方法]:delete  [参数]:30 ');
 INSERT INTO `_operation_log` VALUES ('339', '业务日志', '删除部门', '1', 'com.stylefeng.guns.modular.system.controller.DeptController', 'delete', '2017-05-04 13:59:44', '成功', '[时间]:2017-05-04 13:59:43  [类名]:com.stylefeng.guns.modular.system.controller.DeptController  [方法]:delete  [参数]:30 ');
+INSERT INTO `_operation_log` VALUES ('340', '业务日志', '添加管理员', '1', 'com.stylefeng.guns.modular.system.controller.UserMgrController', 'add', '2017-05-05 22:48:44', '成功', '[时间]:2017-05-05 22:48:43  [类名]:com.stylefeng.guns.modular.system.controller.UserMgrController  [方法]:add  [参数]:com.stylefeng.guns.modular.system.transfer.UserDto@3157f814 & org.springframework.validation.BeanPropertyBindingResult: 0 errors ');
+INSERT INTO `_operation_log` VALUES ('341', '业务日志', '修改管理员', '1', 'com.stylefeng.guns.modular.system.controller.UserMgrController', 'edit', '2017-05-05 22:48:52', '成功', 'id=43;;;字段名称birthday,旧值:Wed May 10 00:00:00 CST 2017,新值:2017-05-09');
+INSERT INTO `_operation_log` VALUES ('342', '业务日志', '修改管理员', '1', 'com.stylefeng.guns.modular.system.controller.UserMgrController', 'edit', '2017-05-05 22:49:03', '成功', 'id=43;;;字段名称birthday,旧值:Tue May 09 00:00:00 CST 2017,新值:2017-05-13');
+INSERT INTO `_operation_log` VALUES ('343', '业务日志', '修改管理员', '1', 'com.stylefeng.guns.modular.system.controller.UserMgrController', 'edit', '2017-05-05 22:49:10', '成功', 'id=1;;;字段名称id,旧值:43,新值:1;;;字段名称account,旧值:test,新值:admin;;;字段名称name,旧值:feng,新值:张三;;;字段名称birthday,旧值:Tue May 09 00:00:00 CST 2017,新值:2017-05-05;;;字段名称email,旧值:abc@123.com,新值:sn93@qq.com;;;字段名称phone,旧值:12312312312,新值:18200000000;;;字段名称deptid,旧值:25,新值:24');
 
 
 -- ----------------------------
 -- ----------------------------
 -- Table structure for _parameter
 -- Table structure for _parameter
@@ -429,12 +415,13 @@ CREATE TABLE `_user` (
   `createtime` datetime DEFAULT NULL,
   `createtime` datetime DEFAULT NULL,
   `version` int(11) DEFAULT NULL,
   `version` int(11) DEFAULT NULL,
   PRIMARY KEY (`id`)
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=43 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=44 DEFAULT CHARSET=utf8;
 
 
 -- ----------------------------
 -- ----------------------------
 -- Records of _user
 -- Records of _user
 -- ----------------------------
 -- ----------------------------
-INSERT INTO `_user` VALUES ('1', 'admin', 'bfb6b46de0ad31442adbed56bb2adc4e', 'elv4a', '张三', '2017-02-13 00:00:00', '1', 'sn93@qq.com', '18200000000', '1', '24', '1', '2016-01-29 08:49:53', '25');
+INSERT INTO `_user` VALUES ('1', 'admin', 'bfb6b46de0ad31442adbed56bb2adc4e', 'elv4a', '张三', '2017-05-05 00:00:00', '1', 'sn93@qq.com', '18200000000', '1', '24', '1', '2016-01-29 08:49:53', '25');
 INSERT INTO `_user` VALUES ('40', 'test1', 'ec813b86e5e47ecbb61d2902dbb956b5', '74jpt', 'test1', '2017-04-21 00:00:00', '2', 'sn93@qq.com', '11122233344', null, '14', '5', '2017-04-18 12:30:08', null);
 INSERT INTO `_user` VALUES ('40', 'test1', 'ec813b86e5e47ecbb61d2902dbb956b5', '74jpt', 'test1', '2017-04-21 00:00:00', '2', 'sn93@qq.com', '11122233344', null, '14', '5', '2017-04-18 12:30:08', null);
 INSERT INTO `_user` VALUES ('41', 'test', 'd716ce8bc61e286598f110441c6486f3', 'hb04u', 'testtest', '2017-04-29 00:00:00', '1', 'sn93@qq.com', '18201309300', null, '2', '5', '2017-04-18 12:36:57', null);
 INSERT INTO `_user` VALUES ('41', 'test', 'd716ce8bc61e286598f110441c6486f3', 'hb04u', 'testtest', '2017-04-29 00:00:00', '1', 'sn93@qq.com', '18201309300', null, '2', '5', '2017-04-18 12:36:57', null);
 INSERT INTO `_user` VALUES ('42', 'test', '769021b0bfc90c120d96aa45159d4f45', 'syw87', 'test', '2017-05-02 00:00:00', '1', '', '', '3', '26', '5', '2017-05-04 12:47:21', null);
 INSERT INTO `_user` VALUES ('42', 'test', '769021b0bfc90c120d96aa45159d4f45', 'syw87', 'test', '2017-05-02 00:00:00', '1', '', '', '3', '26', '5', '2017-05-04 12:47:21', null);
+INSERT INTO `_user` VALUES ('43', 'test', 'bb352046708a83df21ee45d2ccfd0edb', '92azk', 'feng', '2017-05-13 00:00:00', '1', 'abc@123.com', '12312312312', null, '25', '1', '2017-05-05 22:48:44', null);

src/main/java/com/stylefeng/guns/persistence/dao/DeptMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  * </p>
  * </p>
  *
  *
  * @author stylefeng
  * @author stylefeng
- * @since 2017-04-26
+ * @since 2017-05-05
  */
  */
 public interface DeptMapper extends BaseMapper<Dept> {
 public interface DeptMapper extends BaseMapper<Dept> {
 
 

src/main/java/com/stylefeng/guns/persistence/dao/DictMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  * </p>
  * </p>
  *
  *
  * @author stylefeng
  * @author stylefeng
- * @since 2017-04-26
+ * @since 2017-05-05
  */
  */
 public interface DictMapper extends BaseMapper<Dict> {
 public interface DictMapper extends BaseMapper<Dict> {
 
 

src/main/java/com/stylefeng/guns/persistence/dao/GenerateMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  * </p>
  * </p>
  *
  *
  * @author stylefeng
  * @author stylefeng
- * @since 2017-04-26
+ * @since 2017-05-05
  */
  */
 public interface GenerateMapper extends BaseMapper<Generate> {
 public interface GenerateMapper extends BaseMapper<Generate> {
 
 

src/main/java/com/stylefeng/guns/persistence/dao/LoginLogMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  * </p>
  * </p>
  *
  *
  * @author stylefeng
  * @author stylefeng
- * @since 2017-04-26
+ * @since 2017-05-05
  */
  */
 public interface LoginLogMapper extends BaseMapper<LoginLog> {
 public interface LoginLogMapper extends BaseMapper<LoginLog> {
 
 

src/main/java/com/stylefeng/guns/persistence/dao/MenuMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  * </p>
  * </p>
  *
  *
  * @author stylefeng
  * @author stylefeng
- * @since 2017-04-26
+ * @since 2017-05-05
  */
  */
 public interface MenuMapper extends BaseMapper<Menu> {
 public interface MenuMapper extends BaseMapper<Menu> {
 
 

src/main/java/com/stylefeng/guns/persistence/dao/NoticeMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  * </p>
  * </p>
  *
  *
  * @author stylefeng
  * @author stylefeng
- * @since 2017-04-26
+ * @since 2017-05-05
  */
  */
 public interface NoticeMapper extends BaseMapper<Notice> {
 public interface NoticeMapper extends BaseMapper<Notice> {
 
 

src/main/java/com/stylefeng/guns/persistence/dao/OperationLogMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  * </p>
  * </p>
  *
  *
  * @author stylefeng
  * @author stylefeng
- * @since 2017-04-26
+ * @since 2017-05-05
  */
  */
 public interface OperationLogMapper extends BaseMapper<OperationLog> {
 public interface OperationLogMapper extends BaseMapper<OperationLog> {
 
 

src/main/java/com/stylefeng/guns/persistence/dao/ParameterMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  * </p>
  * </p>
  *
  *
  * @author stylefeng
  * @author stylefeng
- * @since 2017-04-26
+ * @since 2017-05-05
  */
  */
 public interface ParameterMapper extends BaseMapper<Parameter> {
 public interface ParameterMapper extends BaseMapper<Parameter> {
 
 

src/main/java/com/stylefeng/guns/persistence/dao/RelationMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  * </p>
  * </p>
  *
  *
  * @author stylefeng
  * @author stylefeng
- * @since 2017-04-26
+ * @since 2017-05-05
  */
  */
 public interface RelationMapper extends BaseMapper<Relation> {
 public interface RelationMapper extends BaseMapper<Relation> {
 
 

src/main/java/com/stylefeng/guns/persistence/dao/RoleExtMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  * </p>
  * </p>
  *
  *
  * @author stylefeng
  * @author stylefeng
- * @since 2017-04-26
+ * @since 2017-05-05
  */
  */
 public interface RoleExtMapper extends BaseMapper<RoleExt> {
 public interface RoleExtMapper extends BaseMapper<RoleExt> {
 
 

src/main/java/com/stylefeng/guns/persistence/dao/RoleMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  * </p>
  * </p>
  *
  *
  * @author stylefeng
  * @author stylefeng
- * @since 2017-04-26
+ * @since 2017-05-05
  */
  */
 public interface RoleMapper extends BaseMapper<Role> {
 public interface RoleMapper extends BaseMapper<Role> {
 
 

src/main/java/com/stylefeng/guns/persistence/dao/UserMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  * </p>
  * </p>
  *
  *
  * @author stylefeng
  * @author stylefeng
- * @since 2017-04-26
+ * @since 2017-05-05
  */
  */
 public interface UserMapper extends BaseMapper<User> {
 public interface UserMapper extends BaseMapper<User> {
 
 

src/main/java/com/stylefeng/guns/persistence/model/Dept.java

@@ -12,7 +12,7 @@ import java.io.Serializable;
  * </p>
  * </p>
  *
  *
  * @author stylefeng
  * @author stylefeng
- * @since 2017-04-26
+ * @since 2017-05-05
  */
  */
 @TableName("_dept")
 @TableName("_dept")
 public class Dept extends Model<Dept> {
 public class Dept extends Model<Dept> {

src/main/java/com/stylefeng/guns/persistence/model/Dict.java

@@ -12,7 +12,7 @@ import java.io.Serializable;
  * </p>
  * </p>
  *
  *
  * @author stylefeng
  * @author stylefeng
- * @since 2017-04-26
+ * @since 2017-05-05
  */
  */
 @TableName("_dict")
 @TableName("_dict")
 public class Dict extends Model<Dict> {
 public class Dict extends Model<Dict> {

src/main/java/com/stylefeng/guns/persistence/model/Generate.java

@@ -12,7 +12,7 @@ import java.io.Serializable;
  * </p>
  * </p>
  *
  *
  * @author stylefeng
  * @author stylefeng
- * @since 2017-04-26
+ * @since 2017-05-05
  */
  */
 @TableName("_generate")
 @TableName("_generate")
 public class Generate extends Model<Generate> {
 public class Generate extends Model<Generate> {

src/main/java/com/stylefeng/guns/persistence/model/LoginLog.java

@@ -13,7 +13,7 @@ import java.io.Serializable;
  * </p>
  * </p>
  *
  *
  * @author stylefeng
  * @author stylefeng
- * @since 2017-04-26
+ * @since 2017-05-05
  */
  */
 @TableName("_login_log")
 @TableName("_login_log")
 public class LoginLog extends Model<LoginLog> {
 public class LoginLog extends Model<LoginLog> {

src/main/java/com/stylefeng/guns/persistence/model/Menu.java

@@ -12,7 +12,7 @@ import java.io.Serializable;
  * </p>
  * </p>
  *
  *
  * @author stylefeng
  * @author stylefeng
- * @since 2017-04-26
+ * @since 2017-05-05
  */
  */
 @TableName("_menu")
 @TableName("_menu")
 public class Menu extends Model<Menu> {
 public class Menu extends Model<Menu> {

src/main/java/com/stylefeng/guns/persistence/model/Notice.java

@@ -13,7 +13,7 @@ import java.io.Serializable;
  * </p>
  * </p>
  *
  *
  * @author stylefeng
  * @author stylefeng
- * @since 2017-04-26
+ * @since 2017-05-05
  */
  */
 @TableName("_notice")
 @TableName("_notice")
 public class Notice extends Model<Notice> {
 public class Notice extends Model<Notice> {

src/main/java/com/stylefeng/guns/persistence/model/OperationLog.java

@@ -13,7 +13,7 @@ import java.io.Serializable;
  * </p>
  * </p>
  *
  *
  * @author stylefeng
  * @author stylefeng
- * @since 2017-04-26
+ * @since 2017-05-05
  */
  */
 @TableName("_operation_log")
 @TableName("_operation_log")
 public class OperationLog extends Model<OperationLog> {
 public class OperationLog extends Model<OperationLog> {

src/main/java/com/stylefeng/guns/persistence/model/Parameter.java

@@ -12,7 +12,7 @@ import java.io.Serializable;
  * </p>
  * </p>
  *
  *
  * @author stylefeng
  * @author stylefeng
- * @since 2017-04-26
+ * @since 2017-05-05
  */
  */
 @TableName("_parameter")
 @TableName("_parameter")
 public class Parameter extends Model<Parameter> {
 public class Parameter extends Model<Parameter> {

src/main/java/com/stylefeng/guns/persistence/model/Relation.java

@@ -12,7 +12,7 @@ import java.io.Serializable;
  * </p>
  * </p>
  *
  *
  * @author stylefeng
  * @author stylefeng
- * @since 2017-04-26
+ * @since 2017-05-05
  */
  */
 @TableName("_relation")
 @TableName("_relation")
 public class Relation extends Model<Relation> {
 public class Relation extends Model<Relation> {

src/main/java/com/stylefeng/guns/persistence/model/Role.java

@@ -12,7 +12,7 @@ import java.io.Serializable;
  * </p>
  * </p>
  *
  *
  * @author stylefeng
  * @author stylefeng
- * @since 2017-04-26
+ * @since 2017-05-05
  */
  */
 @TableName("_role")
 @TableName("_role")
 public class Role extends Model<Role> {
 public class Role extends Model<Role> {

src/main/java/com/stylefeng/guns/persistence/model/RoleExt.java

@@ -12,7 +12,7 @@ import java.io.Serializable;
  * </p>
  * </p>
  *
  *
  * @author stylefeng
  * @author stylefeng
- * @since 2017-04-26
+ * @since 2017-05-05
  */
  */
 @TableName("_role_ext")
 @TableName("_role_ext")
 public class RoleExt extends Model<RoleExt> {
 public class RoleExt extends Model<RoleExt> {

src/main/java/com/stylefeng/guns/persistence/model/User.java

 package com.stylefeng.guns.persistence.model;
 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.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
-import org.springframework.format.annotation.DateTimeFormat;
-
 import java.io.Serializable;
 import java.io.Serializable;
-import java.util.Date;
 
 
 /**
 /**
  * <p>
  * <p>
@@ -15,7 +13,7 @@ import java.util.Date;
  * </p>
  * </p>
  *
  *
  * @author stylefeng
  * @author stylefeng
- * @since 2017-04-26
+ * @since 2017-05-05
  */
  */
 @TableName("_user")
 @TableName("_user")
 public class User extends Model<User> {
 public class User extends Model<User> {
@@ -28,8 +26,6 @@ public class User extends Model<User> {
 	private String password;
 	private String password;
 	private String salt;
 	private String salt;
 	private String name;
 	private String name;
-
-	@DateTimeFormat(pattern = "yyyy-MM-dd")
 	private Date birthday;
 	private Date birthday;
 	private Integer sex;
 	private Integer sex;
 	private String email;
 	private String email;