Selaa lähdekoodia

更新数据模型

shuzheng 8 vuotta sitten
vanhempi
commit
500564407e

BIN
project-datamodel/zheng.png


+ 648 - 0
project-datamodel/zheng_20170219.sql

@@ -0,0 +1,648 @@
+/*
+Navicat MySQL Data Transfer
+
+Source Server         : 127.0.0.1
+Source Server Version : 50621
+Source Host           : localhost:3306
+Source Database       : zheng
+
+Target Server Type    : MYSQL
+Target Server Version : 50621
+File Encoding         : 65001
+
+Date: 2017-02-19 10:58:10
+*/
+
+SET FOREIGN_KEY_CHECKS=0;
+
+-- ----------------------------
+-- Table structure for cms_article
+-- ----------------------------
+DROP TABLE IF EXISTS `cms_article`;
+CREATE TABLE `cms_article` (
+  `article_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '文章编号',
+  `title` varchar(200) NOT NULL COMMENT '文章标题',
+  `author` varchar(50) DEFAULT NULL COMMENT '文章原作者',
+  `fromurl` varchar(300) DEFAULT NULL COMMENT '转载来源网址',
+  `image` varchar(300) DEFAULT NULL COMMENT '封面图',
+  `keywords` varchar(100) DEFAULT NULL COMMENT '关键字',
+  `description` varchar(500) DEFAULT NULL COMMENT '简介',
+  `type` tinyint(4) NOT NULL DEFAULT '1' COMMENT '类型(1:普通,2:热门...)',
+  `allowcomments` tinyint(4) NOT NULL DEFAULT '1' COMMENT '是否允许评论(0:不允许,1:允许)',
+  `status` tinyint(4) NOT NULL DEFAULT '1' COMMENT '状态(-1:不通过,0未审核,1:通过)',
+  `content` mediumtext COMMENT '内容',
+  `user_id` int(10) unsigned NOT NULL COMMENT '发布人id',
+  `readnumber` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '阅读数量',
+  `ctime` bigint(20) unsigned NOT NULL COMMENT '创建时间',
+  `orders` bigint(20) unsigned NOT NULL COMMENT '排序',
+  PRIMARY KEY (`article_id`),
+  KEY `cms_article_orders` (`orders`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='文章表';
+
+-- ----------------------------
+-- Records of cms_article
+-- ----------------------------
+
+-- ----------------------------
+-- Table structure for cms_article_category
+-- ----------------------------
+DROP TABLE IF EXISTS `cms_article_category`;
+CREATE TABLE `cms_article_category` (
+  `article_category_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '编号',
+  `article_id` int(10) unsigned NOT NULL COMMENT '文章编号',
+  `category_id` int(10) unsigned NOT NULL COMMENT '类目编号',
+  PRIMARY KEY (`article_category_id`),
+  KEY `cms_article_category_article_id` (`article_id`),
+  KEY `cms_article_category_category_id` (`category_id`),
+  CONSTRAINT `FK_Reference_7` FOREIGN KEY (`category_id`) REFERENCES `cms_category` (`category_id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `FK_Reference_8` FOREIGN KEY (`article_id`) REFERENCES `cms_article` (`article_id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='文章类目关联表';
+
+-- ----------------------------
+-- Records of cms_article_category
+-- ----------------------------
+
+-- ----------------------------
+-- Table structure for cms_article_tag
+-- ----------------------------
+DROP TABLE IF EXISTS `cms_article_tag`;
+CREATE TABLE `cms_article_tag` (
+  `article_tag_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '编号',
+  `article_id` int(10) unsigned NOT NULL COMMENT '文章编号',
+  `tag_id` int(10) unsigned NOT NULL COMMENT '标签编号',
+  PRIMARY KEY (`article_tag_id`),
+  KEY `cms_article_tag_article_id` (`article_id`),
+  KEY `cms_article_tag_tag_id` (`tag_id`),
+  CONSTRAINT `FK_Reference_3` FOREIGN KEY (`article_id`) REFERENCES `cms_article` (`article_id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `FK_Reference_4` FOREIGN KEY (`tag_id`) REFERENCES `cms_tag` (`tag_id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='文章标签关联表';
+
+-- ----------------------------
+-- Records of cms_article_tag
+-- ----------------------------
+
+-- ----------------------------
+-- Table structure for cms_book
+-- ----------------------------
+DROP TABLE IF EXISTS `cms_book`;
+CREATE TABLE `cms_book` (
+  `book_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '编号',
+  `user_id` int(10) unsigned NOT NULL COMMENT '用户编号',
+  `name` varchar(45) NOT NULL COMMENT '书名',
+  PRIMARY KEY (`book_id`),
+  KEY `FK_book_1` (`user_id`),
+  CONSTRAINT `FK_Reference_9` FOREIGN KEY (`user_id`) REFERENCES `cms_user` (`user_id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='书';
+
+-- ----------------------------
+-- Records of cms_book
+-- ----------------------------
+
+-- ----------------------------
+-- Table structure for cms_category
+-- ----------------------------
+DROP TABLE IF EXISTS `cms_category`;
+CREATE TABLE `cms_category` (
+  `category_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '类目编号',
+  `pid` int(10) unsigned DEFAULT NULL COMMENT '上级编号',
+  `level` tinyint(4) NOT NULL COMMENT '层级',
+  `name` varchar(20) NOT NULL COMMENT '名称',
+  `description` varchar(200) DEFAULT NULL COMMENT '描述',
+  `icon` varchar(50) DEFAULT NULL COMMENT '图标',
+  `type` tinyint(3) NOT NULL DEFAULT '1' COMMENT '类型(1:普通,2:热门...)',
+  `alias` varchar(20) DEFAULT NULL COMMENT '别名',
+  `ctime` bigint(20) unsigned NOT NULL COMMENT '创建时间',
+  `orders` bigint(255) unsigned NOT NULL COMMENT '排序',
+  PRIMARY KEY (`category_id`),
+  KEY `cms_category_orders` (`orders`),
+  KEY `cms_category_pid` (`pid`),
+  KEY `cms_category_alias` (`alias`),
+  KEY `cms_category_level` (`level`),
+  CONSTRAINT `FK_Reference_10` FOREIGN KEY (`pid`) REFERENCES `cms_category` (`category_id`) ON DELETE SET NULL
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COMMENT='类目表';
+
+-- ----------------------------
+-- Records of cms_category
+-- ----------------------------
+INSERT INTO `cms_category` VALUES ('1', null, '1', '1', '1', '1', '1', '1', '1486817307355', '1486817307355');
+INSERT INTO `cms_category` VALUES ('2', '1', '2', '2', '2', '2', '1', '2', '1486817333962', '1486817333962');
+
+-- ----------------------------
+-- Table structure for cms_category_tag
+-- ----------------------------
+DROP TABLE IF EXISTS `cms_category_tag`;
+CREATE TABLE `cms_category_tag` (
+  `category_tag_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '编号',
+  `category_id` int(10) unsigned NOT NULL COMMENT '类目编号',
+  `tag_id` int(10) unsigned NOT NULL COMMENT '标签编号',
+  PRIMARY KEY (`category_tag_id`),
+  KEY `cms_category_tag_tag_id` (`tag_id`),
+  KEY `cms_category_tag_category_id` (`category_id`),
+  CONSTRAINT `FK_Reference_5` FOREIGN KEY (`category_id`) REFERENCES `cms_category` (`category_id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `FK_Reference_6` FOREIGN KEY (`tag_id`) REFERENCES `cms_tag` (`tag_id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='类目标签关联表';
+
+-- ----------------------------
+-- Records of cms_category_tag
+-- ----------------------------
+
+-- ----------------------------
+-- Table structure for cms_comment
+-- ----------------------------
+DROP TABLE IF EXISTS `cms_comment`;
+CREATE TABLE `cms_comment` (
+  `comment_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '编号',
+  `pid` int(10) unsigned DEFAULT NULL COMMENT '回复楼中楼编号回复楼中楼编号',
+  `article_id` int(10) unsigned NOT NULL COMMENT '文章编号',
+  `user_id` int(10) unsigned NOT NULL COMMENT '用户编号',
+  `content` text NOT NULL COMMENT '评论内容',
+  `status` tinyint(4) NOT NULL DEFAULT '1' COMMENT '状态(-1:不通过,0:未审核,1:通过)',
+  `ip` varchar(30) DEFAULT NULL COMMENT '评论人ip地址',
+  `agent` varchar(200) DEFAULT NULL COMMENT '评论人终端信息',
+  `ctime` bigint(20) NOT NULL COMMENT '创建时间',
+  PRIMARY KEY (`comment_id`),
+  KEY `cms_comment_article_id` (`article_id`),
+  KEY `FK_Reference_2` (`pid`),
+  CONSTRAINT `FK_Reference_1` FOREIGN KEY (`article_id`) REFERENCES `cms_article` (`article_id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `FK_Reference_2` FOREIGN KEY (`pid`) REFERENCES `cms_comment` (`comment_id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='评论表';
+
+-- ----------------------------
+-- Records of cms_comment
+-- ----------------------------
+
+-- ----------------------------
+-- Table structure for cms_page
+-- ----------------------------
+DROP TABLE IF EXISTS `cms_page`;
+CREATE TABLE `cms_page` (
+  `page_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `pid` int(10) DEFAULT NULL,
+  `alias` varchar(20) DEFAULT NULL,
+  `content` mediumtext,
+  `keywords` varchar(100) DEFAULT NULL,
+  `description` varchar(300) DEFAULT NULL,
+  `ctime` bigint(20) DEFAULT NULL,
+  `orders` bigint(20) DEFAULT NULL,
+  PRIMARY KEY (`page_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='页面';
+
+-- ----------------------------
+-- Records of cms_page
+-- ----------------------------
+
+-- ----------------------------
+-- Table structure for cms_setting
+-- ----------------------------
+DROP TABLE IF EXISTS `cms_setting`;
+CREATE TABLE `cms_setting` (
+  `setting_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `setting_key` varchar(10) DEFAULT NULL,
+  `setting_value` varchar(500) DEFAULT NULL,
+  PRIMARY KEY (`setting_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='网站配置';
+
+-- ----------------------------
+-- Records of cms_setting
+-- ----------------------------
+
+-- ----------------------------
+-- Table structure for cms_tag
+-- ----------------------------
+DROP TABLE IF EXISTS `cms_tag`;
+CREATE TABLE `cms_tag` (
+  `tag_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '标签编号',
+  `name` varchar(20) NOT NULL COMMENT '名称',
+  `description` varchar(200) DEFAULT NULL COMMENT '描述',
+  `icon` varchar(50) DEFAULT NULL COMMENT '图标',
+  `type` tinyint(4) NOT NULL DEFAULT '1' COMMENT '类型(1:普通,2:热门...)',
+  `alias` varchar(20) DEFAULT NULL COMMENT '别名',
+  `ctime` bigint(20) unsigned NOT NULL COMMENT '创建时间',
+  `orders` bigint(20) unsigned NOT NULL COMMENT '排序',
+  PRIMARY KEY (`tag_id`),
+  KEY `cms_tag_orders` (`orders`),
+  KEY `cms_tag_alias` (`alias`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='标签表';
+
+-- ----------------------------
+-- Records of cms_tag
+-- ----------------------------
+
+-- ----------------------------
+-- Table structure for cms_user
+-- ----------------------------
+DROP TABLE IF EXISTS `cms_user`;
+CREATE TABLE `cms_user` (
+  `user_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '编号',
+  `username` varchar(32) DEFAULT NULL COMMENT '账号',
+  `password` varchar(32) DEFAULT NULL COMMENT '密码',
+  `nickname` varchar(32) DEFAULT NULL COMMENT '昵称',
+  `sex` int(11) DEFAULT NULL COMMENT '0未知,1男,2女',
+  `ctime` bigint(20) DEFAULT NULL COMMENT '创建时间',
+  `content` text COMMENT '备注',
+  PRIMARY KEY (`user_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='用户';
+
+-- ----------------------------
+-- Records of cms_user
+-- ----------------------------
+
+-- ----------------------------
+-- Table structure for pay_in_order
+-- ----------------------------
+DROP TABLE IF EXISTS `pay_in_order`;
+CREATE TABLE `pay_in_order` (
+  `pay_in_order_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `pay_vendor_id` int(10) DEFAULT NULL,
+  `pay_mch_id` int(10) DEFAULT NULL,
+  `amount` decimal(10,0) NOT NULL,
+  `status` tinyint(4) NOT NULL,
+  `ctime` bigint(20) unsigned NOT NULL,
+  PRIMARY KEY (`pay_in_order_id`),
+  KEY `FK_Reference_32` (`pay_vendor_id`),
+  KEY `FK_Reference_38` (`pay_mch_id`),
+  CONSTRAINT `FK_Reference_32` FOREIGN KEY (`pay_vendor_id`) REFERENCES `pay_vendor` (`pay_vendor_id`),
+  CONSTRAINT `FK_Reference_38` FOREIGN KEY (`pay_mch_id`) REFERENCES `pay_mch` (`pay_mch_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='收入订单表';
+
+-- ----------------------------
+-- Records of pay_in_order
+-- ----------------------------
+
+-- ----------------------------
+-- Table structure for pay_in_order_detail
+-- ----------------------------
+DROP TABLE IF EXISTS `pay_in_order_detail`;
+CREATE TABLE `pay_in_order_detail` (
+  `pay_in_order_detail_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `pay_in_order_id` int(10) DEFAULT NULL,
+  `product_id` varchar(50) DEFAULT NULL,
+  `product_name` varchar(100) DEFAULT NULL,
+  `product_price` decimal(10,0) DEFAULT NULL,
+  `product_count` int(10) DEFAULT NULL,
+  `remark` varchar(500) DEFAULT NULL,
+  PRIMARY KEY (`pay_in_order_detail_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='收入订单明细表';
+
+-- ----------------------------
+-- Records of pay_in_order_detail
+-- ----------------------------
+
+-- ----------------------------
+-- Table structure for pay_mch
+-- ----------------------------
+DROP TABLE IF EXISTS `pay_mch`;
+CREATE TABLE `pay_mch` (
+  `pay_mch_id` int(10) NOT NULL AUTO_INCREMENT,
+  `mch_id` varchar(20) DEFAULT NULL,
+  `name` varchar(20) DEFAULT NULL,
+  `reqKey` varchar(50) DEFAULT NULL,
+  `resKey` varchar(50) DEFAULT NULL,
+  PRIMARY KEY (`pay_mch_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='支付中心商户管理表';
+
+-- ----------------------------
+-- Records of pay_mch
+-- ----------------------------
+
+-- ----------------------------
+-- Table structure for pay_out_order
+-- ----------------------------
+DROP TABLE IF EXISTS `pay_out_order`;
+CREATE TABLE `pay_out_order` (
+  `pay_out_order_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `pay_mch_id` int(10) DEFAULT NULL,
+  `pay_vendor_id` int(10) DEFAULT NULL,
+  `amount` decimal(10,0) NOT NULL,
+  `status` tinyint(4) NOT NULL,
+  `ctime` bigint(20) unsigned NOT NULL,
+  PRIMARY KEY (`pay_out_order_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='支出订单表';
+
+-- ----------------------------
+-- Records of pay_out_order
+-- ----------------------------
+
+-- ----------------------------
+-- Table structure for pay_out_order_detail
+-- ----------------------------
+DROP TABLE IF EXISTS `pay_out_order_detail`;
+CREATE TABLE `pay_out_order_detail` (
+  `pay_out_order_detail_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `pay_out_order_id` int(10) DEFAULT NULL,
+  `remark` varchar(500) DEFAULT NULL,
+  PRIMARY KEY (`pay_out_order_detail_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='支出订单明细表';
+
+-- ----------------------------
+-- Records of pay_out_order_detail
+-- ----------------------------
+
+-- ----------------------------
+-- Table structure for pay_pay
+-- ----------------------------
+DROP TABLE IF EXISTS `pay_pay`;
+CREATE TABLE `pay_pay` (
+  `pay_pay_id` int(10) NOT NULL AUTO_INCREMENT,
+  `pay_type_id` int(10) DEFAULT NULL,
+  `param` varchar(1000) DEFAULT NULL,
+  PRIMARY KEY (`pay_pay_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='支付参数配置表';
+
+-- ----------------------------
+-- Records of pay_pay
+-- ----------------------------
+
+-- ----------------------------
+-- Table structure for pay_type
+-- ----------------------------
+DROP TABLE IF EXISTS `pay_type`;
+CREATE TABLE `pay_type` (
+  `pay_type_id` int(10) NOT NULL AUTO_INCREMENT,
+  `pay_vendor_id` int(10) DEFAULT NULL,
+  `pay_mch_id` int(10) DEFAULT NULL,
+  PRIMARY KEY (`pay_type_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='商户支持支付类型表';
+
+-- ----------------------------
+-- Records of pay_type
+-- ----------------------------
+
+-- ----------------------------
+-- Table structure for pay_vendor
+-- ----------------------------
+DROP TABLE IF EXISTS `pay_vendor`;
+CREATE TABLE `pay_vendor` (
+  `pay_vendor_id` int(10) NOT NULL AUTO_INCREMENT,
+  `name` varchar(20) DEFAULT NULL,
+  `appid` varchar(50) DEFAULT NULL,
+  `appsecret` varchar(150) DEFAULT NULL,
+  `config` varchar(1000) DEFAULT NULL,
+  PRIMARY KEY (`pay_vendor_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='第三方支付标识表';
+
+-- ----------------------------
+-- Records of pay_vendor
+-- ----------------------------
+
+-- ----------------------------
+-- Table structure for pay_vest
+-- ----------------------------
+DROP TABLE IF EXISTS `pay_vest`;
+CREATE TABLE `pay_vest` (
+  `pay_vest_id` int(10) NOT NULL AUTO_INCREMENT,
+  `pay_type_id` int(10) DEFAULT NULL,
+  `prefix` varchar(20) DEFAULT NULL,
+  `param` varchar(1000) DEFAULT NULL,
+  PRIMARY KEY (`pay_vest_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='马甲支付参数配置表';
+
+-- ----------------------------
+-- Records of pay_vest
+-- ----------------------------
+
+-- ----------------------------
+-- Table structure for upms_organization
+-- ----------------------------
+DROP TABLE IF EXISTS `upms_organization`;
+CREATE TABLE `upms_organization` (
+  `organization_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '编号',
+  `name` varchar(20) DEFAULT NULL COMMENT '组织名称',
+  `description` varchar(1000) DEFAULT NULL COMMENT '组织描述',
+  `ctime` bigint(20) DEFAULT NULL COMMENT '创建时间',
+  PRIMARY KEY (`organization_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COMMENT='组织';
+
+-- ----------------------------
+-- Records of upms_organization
+-- ----------------------------
+INSERT INTO `upms_organization` VALUES ('1', '总部', '北京总部', '1');
+
+-- ----------------------------
+-- Table structure for upms_permission
+-- ----------------------------
+DROP TABLE IF EXISTS `upms_permission`;
+CREATE TABLE `upms_permission` (
+  `permission_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '编号',
+  `system_id` int(10) unsigned NOT NULL COMMENT '所属系统',
+  `pid` int(10) DEFAULT NULL COMMENT '所属上级',
+  `name` varchar(20) DEFAULT NULL COMMENT '名称',
+  `type` tinyint(4) DEFAULT NULL COMMENT '类型(1:菜单,2:按钮)',
+  `permission_value` varchar(50) DEFAULT NULL COMMENT '权限值',
+  `uri` varchar(100) DEFAULT NULL COMMENT '路径',
+  `icon` varchar(50) DEFAULT NULL COMMENT '图标',
+  `status` tinyint(4) DEFAULT NULL COMMENT '状态(0:禁止,1:正常)',
+  `ctime` bigint(20) DEFAULT NULL COMMENT '创建时间',
+  `orders` bigint(20) DEFAULT NULL COMMENT '排序',
+  PRIMARY KEY (`permission_id`),
+  KEY `FK_Reference_29` (`system_id`),
+  CONSTRAINT `FK_Reference_29` FOREIGN KEY (`system_id`) REFERENCES `upms_system` (`system_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=39 DEFAULT CHARSET=utf8mb4 COMMENT='权限';
+
+-- ----------------------------
+-- Records of upms_permission
+-- ----------------------------
+INSERT INTO `upms_permission` VALUES ('1', '1', null, '系统组织管理', '1', '', '', 'zmdi zmdi-accounts-list', '1', '1', '1');
+INSERT INTO `upms_permission` VALUES ('2', '1', '1', '系统管理', '1', 'upms:system:read', '/manage/system/index', '', '1', '2', '2');
+INSERT INTO `upms_permission` VALUES ('3', '1', '1', '组织管理', '1', 'upms:organization:read', '/manage/organization/index', '', '1', '3', '3');
+INSERT INTO `upms_permission` VALUES ('4', '1', null, '用户角色管理', '1', '', '', 'zmdi zmdi-accounts', '1', '4', '4');
+INSERT INTO `upms_permission` VALUES ('5', '1', '4', '用户管理', '1', 'upms:user:read', '/manage/user/index', '', '1', '5', '5');
+INSERT INTO `upms_permission` VALUES ('6', '1', '4', '角色管理', '1', 'upms:role:read', '/manage/role/index', '', '1', '6', '6');
+INSERT INTO `upms_permission` VALUES ('7', '1', null, '权限资源管理', '1', '', '', 'zmdi zmdi-lock-outline', '1', '7', '7');
+INSERT INTO `upms_permission` VALUES ('8', '1', '7', '菜单管理', '1', 'upms:permission:read', '/manage/permission/menu', '', '1', '8', '8');
+INSERT INTO `upms_permission` VALUES ('9', '1', null, '权限分配管理', '1', '', '', 'zmdi zmdi-key', '1', '9', '9');
+INSERT INTO `upms_permission` VALUES ('10', '1', '9', '角色授权', '1', 'upms:role_permission:read', '/manage/role_permission/index', '', '1', '10', '10');
+INSERT INTO `upms_permission` VALUES ('11', '1', '9', '用户授权', '1', 'upms:user_permission:read', '/manage/user_permission/index', '', '1', '11', '11');
+INSERT INTO `upms_permission` VALUES ('12', '1', null, '其他数据管理', '1', '', '', 'zmdi zmdi-more', '1', '12', '12');
+INSERT INTO `upms_permission` VALUES ('13', '1', '12', '公共码表', '1', 'upms:coder:read', '/manage/coder/index', '', '1', '13', '13');
+INSERT INTO `upms_permission` VALUES ('14', '1', '12', '会话管理', '1', 'upms:session:read', '/manage/session/index', '', '1', '14', '14');
+INSERT INTO `upms_permission` VALUES ('15', '1', '12', '日志记录', '1', 'upms:log:read', '/manage/log/index', '', '1', '15', '15');
+INSERT INTO `upms_permission` VALUES ('16', '1', '12', '键值设置', '1', 'upms:map:read', '/manage/map/index', '', '1', '16', '16');
+INSERT INTO `upms_permission` VALUES ('17', '2', null, '标签类目管理', '1', null, null, 'zmdi zmdi-menu', '1', '17', '17');
+INSERT INTO `upms_permission` VALUES ('18', '2', '17', '标签管理', '1', 'cms:tag:read', '/manage/tag/index', null, '1', '18', '18');
+INSERT INTO `upms_permission` VALUES ('19', '2', '17', '类目管理', '1', 'cms:category:read', '/manage/category/index', null, '1', '19', '19');
+INSERT INTO `upms_permission` VALUES ('20', '2', null, '文章内容管理', '1', null, null, 'zmdi zmdi-collection-text', '1', '20', '20');
+INSERT INTO `upms_permission` VALUES ('21', '2', '20', '文章管理', '1', 'cms:article:read', '/manage/article/index', null, '1', '21', '21');
+INSERT INTO `upms_permission` VALUES ('22', '2', '20', '回收管理', '1', 'cms:article:read', '/manage/article/recycle', null, '1', '22', '22');
+INSERT INTO `upms_permission` VALUES ('23', '1', '7', '按钮管理', '1', 'upms:permission:read', '/manage/permission/button', null, '1', '23', '23');
+INSERT INTO `upms_permission` VALUES ('24', '1', '2', '新增系统', '2', 'upms:system:create', '/manage/system/create', 'zmdi zmdi-plus', '1', '24', '24');
+INSERT INTO `upms_permission` VALUES ('25', '1', '2', '编辑系统', '2', 'upms:system:update', '/manage/system/update', 'zmdi zmdi-edit', '1', '25', '25');
+INSERT INTO `upms_permission` VALUES ('26', '1', '2', '删除系统', '2', 'upms:system:delete', '/manage/system/delete', 'zmdi zmdi-close', '1', '26', '26');
+INSERT INTO `upms_permission` VALUES ('27', '1', '3', '新增组织', '2', 'upms:organization:create', '/manage/organization/create', 'zmdi zmdi-plus', '1', '27', '27');
+INSERT INTO `upms_permission` VALUES ('28', '1', '3', '编辑组织', '2', 'upms:organization:update', '/manage/organization/update', 'zmdi zmdi-edit', '1', '28', '28');
+INSERT INTO `upms_permission` VALUES ('29', '1', '3', '删除组织', '2', 'upms:organization:delete', '/manage/organization/delete', 'zmdi zmdi-close', '1', '29', '29');
+INSERT INTO `upms_permission` VALUES ('30', '1', '5', '新增用户', '2', 'upms:user:create', '/manage/user/create', 'zmdi zmdi-plus', '1', '30', '30');
+INSERT INTO `upms_permission` VALUES ('31', '1', '5', '编辑用户', '2', 'upms:user:update', '/manage/user/update', 'zmdi zmdi-edit', '1', '31', '31');
+INSERT INTO `upms_permission` VALUES ('32', '1', '5', '删除用户', '2', 'upms:user:delete', '/manage/user/delete', 'zmdi zmdi-close', '1', '32', '32');
+INSERT INTO `upms_permission` VALUES ('33', '1', '5', '新增角色', '2', 'upms:role:create', '/manage/role/create', 'zmdi zmdi-plus', '1', '33', '33');
+INSERT INTO `upms_permission` VALUES ('34', '1', '5', '编辑角色', '2', 'upms:role:update', '/manage/role/update', 'zmdi zmdi-edit', '1', '34', '34');
+INSERT INTO `upms_permission` VALUES ('35', '1', '5', '删除角色', '2', 'upms:role:delete', '/manage/role/delete', 'zmdi zmdi-close', '1', '35', '35');
+INSERT INTO `upms_permission` VALUES ('36', '1', '8', '新增权限', '2', 'upms:permission:create', '/manage/permission/create', 'zmdi zmdi-plus', '1', '36', '36');
+INSERT INTO `upms_permission` VALUES ('37', '1', '8', '编辑权限', '2', 'upms:permission:update', '/manage/permission/update', 'zmdi zmdi-edit', '1', '37', '37');
+INSERT INTO `upms_permission` VALUES ('38', '1', '8', '删除权限', '2', 'upms:permission:delete', '/manage/permission/delete', 'zmdi zmdi-close', '1', '38', '38');
+
+-- ----------------------------
+-- Table structure for upms_role
+-- ----------------------------
+DROP TABLE IF EXISTS `upms_role`;
+CREATE TABLE `upms_role` (
+  `role_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '编号',
+  `name` varchar(20) DEFAULT NULL COMMENT '角色名称',
+  `description` varchar(1000) DEFAULT NULL COMMENT '角色描述',
+  `ctime` bigint(20) NOT NULL COMMENT '创建时间',
+  `orders` bigint(20) NOT NULL COMMENT '排序',
+  PRIMARY KEY (`role_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COMMENT='角色';
+
+-- ----------------------------
+-- Records of upms_role
+-- ----------------------------
+INSERT INTO `upms_role` VALUES ('1', '超级管理员', '拥有所有权限', '1', '1');
+INSERT INTO `upms_role` VALUES ('2', '管理员', '拥有除权限管理系统外的所有权限', '1487471013117', '1487471013117');
+
+-- ----------------------------
+-- Table structure for upms_role_permission
+-- ----------------------------
+DROP TABLE IF EXISTS `upms_role_permission`;
+CREATE TABLE `upms_role_permission` (
+  `role_permission_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '编号',
+  `role_id` int(10) unsigned NOT NULL COMMENT '角色编号',
+  `permission_id` int(10) unsigned NOT NULL COMMENT '权限编号',
+  PRIMARY KEY (`role_permission_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=39 DEFAULT CHARSET=utf8mb4 COMMENT='角色权限关联表';
+
+-- ----------------------------
+-- Records of upms_role_permission
+-- ----------------------------
+INSERT INTO `upms_role_permission` VALUES ('1', '1', '1');
+INSERT INTO `upms_role_permission` VALUES ('2', '1', '2');
+INSERT INTO `upms_role_permission` VALUES ('3', '1', '3');
+INSERT INTO `upms_role_permission` VALUES ('4', '1', '4');
+INSERT INTO `upms_role_permission` VALUES ('5', '1', '5');
+INSERT INTO `upms_role_permission` VALUES ('6', '1', '6');
+INSERT INTO `upms_role_permission` VALUES ('7', '1', '7');
+INSERT INTO `upms_role_permission` VALUES ('8', '1', '8');
+INSERT INTO `upms_role_permission` VALUES ('9', '1', '9');
+INSERT INTO `upms_role_permission` VALUES ('10', '1', '10');
+INSERT INTO `upms_role_permission` VALUES ('11', '1', '11');
+INSERT INTO `upms_role_permission` VALUES ('12', '1', '12');
+INSERT INTO `upms_role_permission` VALUES ('13', '1', '13');
+INSERT INTO `upms_role_permission` VALUES ('14', '1', '14');
+INSERT INTO `upms_role_permission` VALUES ('15', '1', '15');
+INSERT INTO `upms_role_permission` VALUES ('16', '1', '16');
+INSERT INTO `upms_role_permission` VALUES ('17', '1', '17');
+INSERT INTO `upms_role_permission` VALUES ('18', '1', '18');
+INSERT INTO `upms_role_permission` VALUES ('19', '1', '19');
+INSERT INTO `upms_role_permission` VALUES ('20', '1', '20');
+INSERT INTO `upms_role_permission` VALUES ('21', '1', '21');
+INSERT INTO `upms_role_permission` VALUES ('22', '1', '22');
+INSERT INTO `upms_role_permission` VALUES ('23', '1', '23');
+INSERT INTO `upms_role_permission` VALUES ('24', '1', '24');
+INSERT INTO `upms_role_permission` VALUES ('25', '1', '25');
+INSERT INTO `upms_role_permission` VALUES ('26', '1', '26');
+INSERT INTO `upms_role_permission` VALUES ('27', '1', '27');
+INSERT INTO `upms_role_permission` VALUES ('28', '1', '28');
+INSERT INTO `upms_role_permission` VALUES ('29', '1', '29');
+INSERT INTO `upms_role_permission` VALUES ('30', '1', '30');
+INSERT INTO `upms_role_permission` VALUES ('31', '1', '31');
+INSERT INTO `upms_role_permission` VALUES ('32', '1', '32');
+INSERT INTO `upms_role_permission` VALUES ('33', '1', '33');
+INSERT INTO `upms_role_permission` VALUES ('34', '1', '34');
+INSERT INTO `upms_role_permission` VALUES ('35', '1', '35');
+INSERT INTO `upms_role_permission` VALUES ('36', '1', '36');
+INSERT INTO `upms_role_permission` VALUES ('37', '1', '37');
+INSERT INTO `upms_role_permission` VALUES ('38', '1', '38');
+
+-- ----------------------------
+-- Table structure for upms_system
+-- ----------------------------
+DROP TABLE IF EXISTS `upms_system`;
+CREATE TABLE `upms_system` (
+  `system_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '编号',
+  `icon` varchar(50) DEFAULT NULL COMMENT '图标',
+  `basepath` varchar(100) DEFAULT NULL COMMENT '根目录',
+  `status` tinyint(4) DEFAULT NULL COMMENT '状态(-1:黑名单,1:正常)',
+  `name` varchar(20) DEFAULT NULL COMMENT '系统名称',
+  `title` varchar(20) DEFAULT NULL COMMENT '系统标题',
+  `description` varchar(300) DEFAULT NULL COMMENT '系统描述',
+  `ctime` bigint(20) DEFAULT NULL COMMENT '创建时间',
+  `orders` bigint(20) DEFAULT NULL COMMENT '排序',
+  PRIMARY KEY (`system_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=15 DEFAULT CHARSET=utf8mb4 COMMENT='系统';
+
+-- ----------------------------
+-- Records of upms_system
+-- ----------------------------
+INSERT INTO `upms_system` VALUES ('1', 'zmdi zmdi-shield-security', 'http://upms.zhangshuzheng.cn:1111', '1', 'zheng-upms-server', '权限管理系统', '用户权限管理系统(RBAC细粒度用户权限、统一后台、单点登录、会话管理)', '1', '1');
+INSERT INTO `upms_system` VALUES ('2', 'zmdi zmdi-wikipedia', 'http://cms.zhangshuzheng.cn:2222', '1', 'zheng-cms-admin', '内容管理系统', '内容管理系统(门户、博客、论坛、问答等)', '2', '2');
+
+-- ----------------------------
+-- Table structure for upms_user
+-- ----------------------------
+DROP TABLE IF EXISTS `upms_user`;
+CREATE TABLE `upms_user` (
+  `user_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '编号',
+  `username` varchar(20) NOT NULL COMMENT '帐号',
+  `password` varchar(32) NOT NULL COMMENT '密码MD5(密码+盐)',
+  `salt` varchar(32) DEFAULT NULL COMMENT '盐',
+  `realname` varchar(20) DEFAULT NULL COMMENT '姓名',
+  `avatar` varchar(50) DEFAULT NULL COMMENT '头像',
+  `phone` varchar(20) DEFAULT NULL COMMENT '电话',
+  `email` varchar(50) DEFAULT NULL COMMENT '邮箱',
+  `sex` tinyint(4) DEFAULT NULL COMMENT '性别',
+  `locked` tinyint(4) DEFAULT NULL COMMENT '状态(0:正常,1:锁定)',
+  `ctime` bigint(20) DEFAULT NULL COMMENT '创建时间',
+  PRIMARY KEY (`user_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COMMENT='用户';
+
+-- ----------------------------
+-- Records of upms_user
+-- ----------------------------
+INSERT INTO `upms_user` VALUES ('1', 'admin', '3038D9CB63B3152A79B8153FB06C02F7', '66f1b370c660445a8657bf8bf1794486', '张恕征', '/resources/zheng-ui/images/avatar.jpg', null, '469741414@qq.com', '1', '0', '1');
+
+-- ----------------------------
+-- Table structure for upms_user_organization
+-- ----------------------------
+DROP TABLE IF EXISTS `upms_user_organization`;
+CREATE TABLE `upms_user_organization` (
+  `user_organization_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '编号',
+  `user_id` int(10) unsigned NOT NULL COMMENT '用户编号',
+  `organization_id` int(10) unsigned NOT NULL COMMENT '组织编号',
+  PRIMARY KEY (`user_organization_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COMMENT='用户组织关联表';
+
+-- ----------------------------
+-- Records of upms_user_organization
+-- ----------------------------
+INSERT INTO `upms_user_organization` VALUES ('1', '1', '1');
+
+-- ----------------------------
+-- Table structure for upms_user_permission
+-- ----------------------------
+DROP TABLE IF EXISTS `upms_user_permission`;
+CREATE TABLE `upms_user_permission` (
+  `user_permission_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '编号',
+  `user_id` int(10) unsigned NOT NULL COMMENT '用户编号',
+  `permission_id` int(10) unsigned NOT NULL COMMENT '权限编号',
+  PRIMARY KEY (`user_permission_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户权限关联表';
+
+-- ----------------------------
+-- Records of upms_user_permission
+-- ----------------------------
+
+-- ----------------------------
+-- Table structure for upms_user_role
+-- ----------------------------
+DROP TABLE IF EXISTS `upms_user_role`;
+CREATE TABLE `upms_user_role` (
+  `user_role_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '编号',
+  `user_id` int(10) unsigned NOT NULL COMMENT '用户编号',
+  `role_id` int(10) DEFAULT NULL COMMENT '角色编号',
+  PRIMARY KEY (`user_role_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COMMENT='用户角色关联表';
+
+-- ----------------------------
+-- Records of upms_user_role
+-- ----------------------------
+INSERT INTO `upms_user_role` VALUES ('1', '1', '1');

+ 57 - 40
project-datamodel/zheng.apm → project-datamodel/zheng_20170219_1.apm

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{22E867D0-73E2-4C77-BB68-28135519D681}" Label="" LastModificationDate="1486833944" Name="zheng" Objects="409" Symbols="67" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="APM_DATA_MODEL_XML" version="16.5.0.3982"?>
+<?PowerDesigner AppLocale="UTF16" ID="{22E867D0-73E2-4C77-BB68-28135519D681}" Label="" LastModificationDate="1487472311" Name="zheng" Objects="420" Symbols="67" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="APM_DATA_MODEL_XML" version="16.5.0.3982"?>
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -12,8 +12,8 @@
 <a:Code>zheng</a:Code>
 <a:CreationDate>1478091682</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1486705491</a:ModificationDate>
-<a:Modifier>admin</a:Modifier>
+<a:ModificationDate>1487472311</a:ModificationDate>
+<a:Modifier>shuzheng</a:Modifier>
 <a:PackageOptionsText>[FolderOptions]
 
 [FolderOptions\Physical Objects]
@@ -87,7 +87,7 @@ GenScriptName6=
 GenScriptName7=
 GenScriptName8=
 GenScriptName9=
-GenPathName=C:\Users\admin\Desktop\
+GenPathName=D:\
 GenSingleFile=Yes
 GenODBC=No
 GenCheckModel=Yes
@@ -95,7 +95,7 @@ GenScriptPrev=Yes
 GenArchiveModel=No
 GenUseSync=No
 GenSyncChoice=0
-GenSyncArch=E:\GitHub\zheng\project-datamodel\zheng.apm
+GenSyncArch=F:\GitHub\zheng\project-datamodel\zheng.apm
 GenSyncRmg=0
 
 [FolderOptions\Physical Objects\Database Generation\Format]
@@ -7858,7 +7858,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>upms_role</a:Code>
 <a:CreationDate>1483619110</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1486384665</a:ModificationDate>
+<a:ModificationDate>1487472148</a:ModificationDate>
 <a:Modifier>shuzheng</a:Modifier>
 <a:Comment>角色</a:Comment>
 <a:CheckConstraintName>TK_upms_role</a:CheckConstraintName>
@@ -7870,8 +7870,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>role_id</a:Code>
 <a:CreationDate>1483619113</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1484127165</a:ModificationDate>
-<a:Modifier>admin</a:Modifier>
+<a:ModificationDate>1487472148</a:ModificationDate>
+<a:Modifier>shuzheng</a:Modifier>
+<a:Comment>编号</a:Comment>
 <a:DataType>int(10)</a:DataType>
 <a:Length>10</a:Length>
 <a:Identity>1</a:Identity>
@@ -7887,8 +7888,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>name</a:Code>
 <a:CreationDate>1483619328</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1483619519</a:ModificationDate>
+<a:ModificationDate>1487472148</a:ModificationDate>
 <a:Modifier>shuzheng</a:Modifier>
+<a:Comment>角色名称</a:Comment>
 <a:DataType>varchar(20)</a:DataType>
 <a:Length>20</a:Length>
 <a:CheckConstraintName>CK_name</a:CheckConstraintName>
@@ -7899,8 +7901,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>description</a:Code>
 <a:CreationDate>1483619328</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1483619519</a:ModificationDate>
+<a:ModificationDate>1487472148</a:ModificationDate>
 <a:Modifier>shuzheng</a:Modifier>
+<a:Comment>角色描述</a:Comment>
 <a:DataType>varchar(1000)</a:DataType>
 <a:Length>1000</a:Length>
 <a:CheckConstraintName>CK_description</a:CheckConstraintName>
@@ -7911,8 +7914,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>ctime</a:Code>
 <a:CreationDate>1483619328</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1484127165</a:ModificationDate>
-<a:Modifier>admin</a:Modifier>
+<a:ModificationDate>1487472148</a:ModificationDate>
+<a:Modifier>shuzheng</a:Modifier>
+<a:Comment>创建时间</a:Comment>
 <a:DataType>bigint(20)</a:DataType>
 <a:Length>20</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
@@ -7924,8 +7928,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>orders</a:Code>
 <a:CreationDate>1483619328</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1484127165</a:ModificationDate>
-<a:Modifier>admin</a:Modifier>
+<a:ModificationDate>1487472148</a:ModificationDate>
+<a:Modifier>shuzheng</a:Modifier>
+<a:Comment>排序</a:Comment>
 <a:DataType>bigint(20)</a:DataType>
 <a:Length>20</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
@@ -7969,8 +7974,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>user_organization_id</a:Code>
 <a:CreationDate>1483619649</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1484126336</a:ModificationDate>
-<a:Modifier>admin</a:Modifier>
+<a:ModificationDate>1487472110</a:ModificationDate>
+<a:Modifier>shuzheng</a:Modifier>
+<a:Comment>编号</a:Comment>
 <a:DataType>int(10)</a:DataType>
 <a:Length>10</a:Length>
 <a:Identity>1</a:Identity>
@@ -7986,8 +7992,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>user_id</a:Code>
 <a:CreationDate>1483619649</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1484126336</a:ModificationDate>
-<a:Modifier>admin</a:Modifier>
+<a:ModificationDate>1487472110</a:ModificationDate>
+<a:Modifier>shuzheng</a:Modifier>
+<a:Comment>用户编号</a:Comment>
 <a:DataType>int(10)</a:DataType>
 <a:Length>10</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
@@ -8002,8 +8009,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>organization_id</a:Code>
 <a:CreationDate>1483619649</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1484126336</a:ModificationDate>
-<a:Modifier>admin</a:Modifier>
+<a:ModificationDate>1487472110</a:ModificationDate>
+<a:Modifier>shuzheng</a:Modifier>
+<a:Comment>组织编号</a:Comment>
 <a:DataType>int(10)</a:DataType>
 <a:Length>10</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
@@ -8050,8 +8058,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>user_role_id</a:Code>
 <a:CreationDate>1483619905</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1484127146</a:ModificationDate>
-<a:Modifier>admin</a:Modifier>
+<a:ModificationDate>1487472127</a:ModificationDate>
+<a:Modifier>shuzheng</a:Modifier>
+<a:Comment>编号</a:Comment>
 <a:DataType>int(10)</a:DataType>
 <a:Length>10</a:Length>
 <a:Identity>1</a:Identity>
@@ -8067,8 +8076,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>user_id</a:Code>
 <a:CreationDate>1483619905</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1484127146</a:ModificationDate>
-<a:Modifier>admin</a:Modifier>
+<a:ModificationDate>1487472127</a:ModificationDate>
+<a:Modifier>shuzheng</a:Modifier>
+<a:Comment>用户编号</a:Comment>
 <a:DataType>int(10)</a:DataType>
 <a:Length>10</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
@@ -8083,8 +8093,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>role_id</a:Code>
 <a:CreationDate>1483620007</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1486384646</a:ModificationDate>
+<a:ModificationDate>1487472127</a:ModificationDate>
 <a:Modifier>shuzheng</a:Modifier>
+<a:Comment>角色编号</a:Comment>
 <a:DataType>int(10)</a:DataType>
 <a:Length>10</a:Length>
 <a:CheckConstraintName>CK_role_id</a:CheckConstraintName>
@@ -8111,12 +8122,12 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Table>
 <o:Table Id="o116">
 <a:ObjectID>DB08E027-9573-4802-A2DA-46BBC2E0DB7B</a:ObjectID>
-<a:Name>upms_permission 权限 *</a:Name>
+<a:Name>upms_permission 权限</a:Name>
 <a:Code>upms_permission</a:Code>
 <a:CreationDate>1483620745</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1486705311</a:ModificationDate>
-<a:Modifier>admin</a:Modifier>
+<a:ModificationDate>1487472092</a:ModificationDate>
+<a:Modifier>shuzheng</a:Modifier>
 <a:Comment>权限</a:Comment>
 <a:CheckConstraintName>TK_upms_permission</a:CheckConstraintName>
 <a:TotalSavingCurrency/>
@@ -8311,8 +8322,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>role_permission_id</a:Code>
 <a:CreationDate>1483624201</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1484127201</a:ModificationDate>
-<a:Modifier>admin</a:Modifier>
+<a:ModificationDate>1487472176</a:ModificationDate>
+<a:Modifier>shuzheng</a:Modifier>
+<a:Comment>编号</a:Comment>
 <a:DataType>int(10)</a:DataType>
 <a:Length>10</a:Length>
 <a:Identity>1</a:Identity>
@@ -8328,8 +8340,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>role_id</a:Code>
 <a:CreationDate>1483624201</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1484127201</a:ModificationDate>
-<a:Modifier>admin</a:Modifier>
+<a:ModificationDate>1487472176</a:ModificationDate>
+<a:Modifier>shuzheng</a:Modifier>
+<a:Comment>角色编号</a:Comment>
 <a:DataType>int(10)</a:DataType>
 <a:Length>10</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
@@ -8344,8 +8357,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>permission_id</a:Code>
 <a:CreationDate>1483624201</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1484127201</a:ModificationDate>
-<a:Modifier>admin</a:Modifier>
+<a:ModificationDate>1487472176</a:ModificationDate>
+<a:Modifier>shuzheng</a:Modifier>
+<a:Comment>权限编号</a:Comment>
 <a:DataType>int(10)</a:DataType>
 <a:Length>10</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
@@ -8392,8 +8406,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>user_permission_id</a:Code>
 <a:CreationDate>1483624383</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1484127211</a:ModificationDate>
-<a:Modifier>admin</a:Modifier>
+<a:ModificationDate>1487472161</a:ModificationDate>
+<a:Modifier>shuzheng</a:Modifier>
+<a:Comment>编号</a:Comment>
 <a:DataType>int(10)</a:DataType>
 <a:Length>10</a:Length>
 <a:Identity>1</a:Identity>
@@ -8409,8 +8424,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>user_id</a:Code>
 <a:CreationDate>1483624383</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1484127211</a:ModificationDate>
-<a:Modifier>admin</a:Modifier>
+<a:ModificationDate>1487472161</a:ModificationDate>
+<a:Modifier>shuzheng</a:Modifier>
+<a:Comment>用户编号</a:Comment>
 <a:DataType>int(10)</a:DataType>
 <a:Length>10</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
@@ -8425,8 +8441,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>permission_id</a:Code>
 <a:CreationDate>1483624383</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1484127211</a:ModificationDate>
-<a:Modifier>admin</a:Modifier>
+<a:ModificationDate>1487472161</a:ModificationDate>
+<a:Modifier>shuzheng</a:Modifier>
+<a:Comment>权限编号</a:Comment>
 <a:DataType>int(10)</a:DataType>
 <a:Length>10</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>

+ 57 - 40
project-datamodel/zheng.pdb → project-datamodel/zheng_20170219_1.pdb

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{22E867D0-73E2-4C77-BB68-28135519D681}" Label="" LastModificationDate="1486833944" Name="zheng" Objects="409" Symbols="67" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
+<?PowerDesigner AppLocale="UTF16" ID="{22E867D0-73E2-4C77-BB68-28135519D681}" Label="" LastModificationDate="1487472311" Name="zheng" Objects="420" Symbols="67" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -12,8 +12,8 @@
 <a:Code>zheng</a:Code>
 <a:CreationDate>1478091682</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1486705491</a:ModificationDate>
-<a:Modifier>admin</a:Modifier>
+<a:ModificationDate>1487472311</a:ModificationDate>
+<a:Modifier>shuzheng</a:Modifier>
 <a:PackageOptionsText>[FolderOptions]
 
 [FolderOptions\Physical Objects]
@@ -87,7 +87,7 @@ GenScriptName6=
 GenScriptName7=
 GenScriptName8=
 GenScriptName9=
-GenPathName=C:\Users\admin\Desktop\
+GenPathName=D:\
 GenSingleFile=Yes
 GenODBC=No
 GenCheckModel=Yes
@@ -95,7 +95,7 @@ GenScriptPrev=Yes
 GenArchiveModel=No
 GenUseSync=No
 GenSyncChoice=0
-GenSyncArch=E:\GitHub\zheng\project-datamodel\zheng.apm
+GenSyncArch=F:\GitHub\zheng\project-datamodel\zheng.apm
 GenSyncRmg=0
 
 [FolderOptions\Physical Objects\Database Generation\Format]
@@ -7719,7 +7719,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>upms_role</a:Code>
 <a:CreationDate>1483619110</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1486384665</a:ModificationDate>
+<a:ModificationDate>1487472148</a:ModificationDate>
 <a:Modifier>shuzheng</a:Modifier>
 <a:Comment>角色</a:Comment>
 <a:TotalSavingCurrency/>
@@ -7730,8 +7730,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>role_id</a:Code>
 <a:CreationDate>1483619113</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1484127165</a:ModificationDate>
-<a:Modifier>admin</a:Modifier>
+<a:ModificationDate>1487472148</a:ModificationDate>
+<a:Modifier>shuzheng</a:Modifier>
+<a:Comment>编号</a:Comment>
 <a:DataType>int(10)</a:DataType>
 <a:Length>10</a:Length>
 <a:Identity>1</a:Identity>
@@ -7746,8 +7747,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>name</a:Code>
 <a:CreationDate>1483619328</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1483619519</a:ModificationDate>
+<a:ModificationDate>1487472148</a:ModificationDate>
 <a:Modifier>shuzheng</a:Modifier>
+<a:Comment>角色名称</a:Comment>
 <a:DataType>varchar(20)</a:DataType>
 <a:Length>20</a:Length>
 </o:Column>
@@ -7757,8 +7759,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>description</a:Code>
 <a:CreationDate>1483619328</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1483619519</a:ModificationDate>
+<a:ModificationDate>1487472148</a:ModificationDate>
 <a:Modifier>shuzheng</a:Modifier>
+<a:Comment>角色描述</a:Comment>
 <a:DataType>varchar(1000)</a:DataType>
 <a:Length>1000</a:Length>
 </o:Column>
@@ -7768,8 +7771,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>ctime</a:Code>
 <a:CreationDate>1483619328</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1484127165</a:ModificationDate>
-<a:Modifier>admin</a:Modifier>
+<a:ModificationDate>1487472148</a:ModificationDate>
+<a:Modifier>shuzheng</a:Modifier>
+<a:Comment>创建时间</a:Comment>
 <a:DataType>bigint(20)</a:DataType>
 <a:Length>20</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
@@ -7780,8 +7784,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>orders</a:Code>
 <a:CreationDate>1483619328</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1484127165</a:ModificationDate>
-<a:Modifier>admin</a:Modifier>
+<a:ModificationDate>1487472148</a:ModificationDate>
+<a:Modifier>shuzheng</a:Modifier>
+<a:Comment>排序</a:Comment>
 <a:DataType>bigint(20)</a:DataType>
 <a:Length>20</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
@@ -7822,8 +7827,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>user_organization_id</a:Code>
 <a:CreationDate>1483619649</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1484126336</a:ModificationDate>
-<a:Modifier>admin</a:Modifier>
+<a:ModificationDate>1487472110</a:ModificationDate>
+<a:Modifier>shuzheng</a:Modifier>
+<a:Comment>编号</a:Comment>
 <a:DataType>int(10)</a:DataType>
 <a:Length>10</a:Length>
 <a:Identity>1</a:Identity>
@@ -7838,8 +7844,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>user_id</a:Code>
 <a:CreationDate>1483619649</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1484126336</a:ModificationDate>
-<a:Modifier>admin</a:Modifier>
+<a:ModificationDate>1487472110</a:ModificationDate>
+<a:Modifier>shuzheng</a:Modifier>
+<a:Comment>用户编号</a:Comment>
 <a:DataType>int(10)</a:DataType>
 <a:Length>10</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
@@ -7853,8 +7860,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>organization_id</a:Code>
 <a:CreationDate>1483619649</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1484126336</a:ModificationDate>
-<a:Modifier>admin</a:Modifier>
+<a:ModificationDate>1487472110</a:ModificationDate>
+<a:Modifier>shuzheng</a:Modifier>
+<a:Comment>组织编号</a:Comment>
 <a:DataType>int(10)</a:DataType>
 <a:Length>10</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
@@ -7898,8 +7906,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>user_role_id</a:Code>
 <a:CreationDate>1483619905</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1484127146</a:ModificationDate>
-<a:Modifier>admin</a:Modifier>
+<a:ModificationDate>1487472127</a:ModificationDate>
+<a:Modifier>shuzheng</a:Modifier>
+<a:Comment>编号</a:Comment>
 <a:DataType>int(10)</a:DataType>
 <a:Length>10</a:Length>
 <a:Identity>1</a:Identity>
@@ -7914,8 +7923,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>user_id</a:Code>
 <a:CreationDate>1483619905</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1484127146</a:ModificationDate>
-<a:Modifier>admin</a:Modifier>
+<a:ModificationDate>1487472127</a:ModificationDate>
+<a:Modifier>shuzheng</a:Modifier>
+<a:Comment>用户编号</a:Comment>
 <a:DataType>int(10)</a:DataType>
 <a:Length>10</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
@@ -7929,8 +7939,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>role_id</a:Code>
 <a:CreationDate>1483620007</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1486384646</a:ModificationDate>
+<a:ModificationDate>1487472127</a:ModificationDate>
 <a:Modifier>shuzheng</a:Modifier>
+<a:Comment>角色编号</a:Comment>
 <a:DataType>int(10)</a:DataType>
 <a:Length>10</a:Length>
 </o:Column>
@@ -7955,12 +7966,12 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Table>
 <o:Table Id="o116">
 <a:ObjectID>DB08E027-9573-4802-A2DA-46BBC2E0DB7B</a:ObjectID>
-<a:Name>upms_permission 权限 *</a:Name>
+<a:Name>upms_permission 权限</a:Name>
 <a:Code>upms_permission</a:Code>
 <a:CreationDate>1483620745</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1486705311</a:ModificationDate>
-<a:Modifier>admin</a:Modifier>
+<a:ModificationDate>1487472092</a:ModificationDate>
+<a:Modifier>shuzheng</a:Modifier>
 <a:Comment>权限</a:Comment>
 <a:TotalSavingCurrency/>
 <c:Columns>
@@ -8141,8 +8152,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>role_permission_id</a:Code>
 <a:CreationDate>1483624201</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1484127201</a:ModificationDate>
-<a:Modifier>admin</a:Modifier>
+<a:ModificationDate>1487472176</a:ModificationDate>
+<a:Modifier>shuzheng</a:Modifier>
+<a:Comment>编号</a:Comment>
 <a:DataType>int(10)</a:DataType>
 <a:Length>10</a:Length>
 <a:Identity>1</a:Identity>
@@ -8157,8 +8169,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>role_id</a:Code>
 <a:CreationDate>1483624201</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1484127201</a:ModificationDate>
-<a:Modifier>admin</a:Modifier>
+<a:ModificationDate>1487472176</a:ModificationDate>
+<a:Modifier>shuzheng</a:Modifier>
+<a:Comment>角色编号</a:Comment>
 <a:DataType>int(10)</a:DataType>
 <a:Length>10</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
@@ -8172,8 +8185,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>permission_id</a:Code>
 <a:CreationDate>1483624201</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1484127201</a:ModificationDate>
-<a:Modifier>admin</a:Modifier>
+<a:ModificationDate>1487472176</a:ModificationDate>
+<a:Modifier>shuzheng</a:Modifier>
+<a:Comment>权限编号</a:Comment>
 <a:DataType>int(10)</a:DataType>
 <a:Length>10</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
@@ -8217,8 +8231,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>user_permission_id</a:Code>
 <a:CreationDate>1483624383</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1484127211</a:ModificationDate>
-<a:Modifier>admin</a:Modifier>
+<a:ModificationDate>1487472161</a:ModificationDate>
+<a:Modifier>shuzheng</a:Modifier>
+<a:Comment>编号</a:Comment>
 <a:DataType>int(10)</a:DataType>
 <a:Length>10</a:Length>
 <a:Identity>1</a:Identity>
@@ -8233,8 +8248,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>user_id</a:Code>
 <a:CreationDate>1483624383</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1484127211</a:ModificationDate>
-<a:Modifier>admin</a:Modifier>
+<a:ModificationDate>1487472161</a:ModificationDate>
+<a:Modifier>shuzheng</a:Modifier>
+<a:Comment>用户编号</a:Comment>
 <a:DataType>int(10)</a:DataType>
 <a:Length>10</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
@@ -8248,8 +8264,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>permission_id</a:Code>
 <a:CreationDate>1483624383</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1484127211</a:ModificationDate>
-<a:Modifier>admin</a:Modifier>
+<a:ModificationDate>1487472161</a:ModificationDate>
+<a:Modifier>shuzheng</a:Modifier>
+<a:Comment>权限编号</a:Comment>
 <a:DataType>int(10)</a:DataType>
 <a:Length>10</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>

+ 57 - 40
project-datamodel/zheng.pdm → project-datamodel/zheng_20170219_1.pdm

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{22E867D0-73E2-4C77-BB68-28135519D681}" Label="" LastModificationDate="1486833944" Name="zheng" Objects="409" Symbols="67" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
+<?PowerDesigner AppLocale="UTF16" ID="{22E867D0-73E2-4C77-BB68-28135519D681}" Label="" LastModificationDate="1487472311" Name="zheng" Objects="420" Symbols="67" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -12,8 +12,8 @@
 <a:Code>zheng</a:Code>
 <a:CreationDate>1478091682</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1486705491</a:ModificationDate>
-<a:Modifier>admin</a:Modifier>
+<a:ModificationDate>1487472311</a:ModificationDate>
+<a:Modifier>shuzheng</a:Modifier>
 <a:PackageOptionsText>[FolderOptions]
 
 [FolderOptions\Physical Objects]
@@ -87,7 +87,7 @@ GenScriptName6=
 GenScriptName7=
 GenScriptName8=
 GenScriptName9=
-GenPathName=C:\Users\admin\Desktop\
+GenPathName=D:\
 GenSingleFile=Yes
 GenODBC=No
 GenCheckModel=Yes
@@ -95,7 +95,7 @@ GenScriptPrev=Yes
 GenArchiveModel=No
 GenUseSync=No
 GenSyncChoice=0
-GenSyncArch=E:\GitHub\zheng\project-datamodel\zheng.apm
+GenSyncArch=F:\GitHub\zheng\project-datamodel\zheng.apm
 GenSyncRmg=0
 
 [FolderOptions\Physical Objects\Database Generation\Format]
@@ -7719,7 +7719,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>upms_role</a:Code>
 <a:CreationDate>1483619110</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1486384665</a:ModificationDate>
+<a:ModificationDate>1487472148</a:ModificationDate>
 <a:Modifier>shuzheng</a:Modifier>
 <a:Comment>角色</a:Comment>
 <a:TotalSavingCurrency/>
@@ -7730,8 +7730,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>role_id</a:Code>
 <a:CreationDate>1483619113</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1484127165</a:ModificationDate>
-<a:Modifier>admin</a:Modifier>
+<a:ModificationDate>1487472148</a:ModificationDate>
+<a:Modifier>shuzheng</a:Modifier>
+<a:Comment>编号</a:Comment>
 <a:DataType>int(10)</a:DataType>
 <a:Length>10</a:Length>
 <a:Identity>1</a:Identity>
@@ -7746,8 +7747,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>name</a:Code>
 <a:CreationDate>1483619328</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1483619519</a:ModificationDate>
+<a:ModificationDate>1487472148</a:ModificationDate>
 <a:Modifier>shuzheng</a:Modifier>
+<a:Comment>角色名称</a:Comment>
 <a:DataType>varchar(20)</a:DataType>
 <a:Length>20</a:Length>
 </o:Column>
@@ -7757,8 +7759,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>description</a:Code>
 <a:CreationDate>1483619328</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1483619519</a:ModificationDate>
+<a:ModificationDate>1487472148</a:ModificationDate>
 <a:Modifier>shuzheng</a:Modifier>
+<a:Comment>角色描述</a:Comment>
 <a:DataType>varchar(1000)</a:DataType>
 <a:Length>1000</a:Length>
 </o:Column>
@@ -7768,8 +7771,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>ctime</a:Code>
 <a:CreationDate>1483619328</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1484127165</a:ModificationDate>
-<a:Modifier>admin</a:Modifier>
+<a:ModificationDate>1487472148</a:ModificationDate>
+<a:Modifier>shuzheng</a:Modifier>
+<a:Comment>创建时间</a:Comment>
 <a:DataType>bigint(20)</a:DataType>
 <a:Length>20</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
@@ -7780,8 +7784,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>orders</a:Code>
 <a:CreationDate>1483619328</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1484127165</a:ModificationDate>
-<a:Modifier>admin</a:Modifier>
+<a:ModificationDate>1487472148</a:ModificationDate>
+<a:Modifier>shuzheng</a:Modifier>
+<a:Comment>排序</a:Comment>
 <a:DataType>bigint(20)</a:DataType>
 <a:Length>20</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
@@ -7822,8 +7827,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>user_organization_id</a:Code>
 <a:CreationDate>1483619649</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1484126336</a:ModificationDate>
-<a:Modifier>admin</a:Modifier>
+<a:ModificationDate>1487472110</a:ModificationDate>
+<a:Modifier>shuzheng</a:Modifier>
+<a:Comment>编号</a:Comment>
 <a:DataType>int(10)</a:DataType>
 <a:Length>10</a:Length>
 <a:Identity>1</a:Identity>
@@ -7838,8 +7844,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>user_id</a:Code>
 <a:CreationDate>1483619649</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1484126336</a:ModificationDate>
-<a:Modifier>admin</a:Modifier>
+<a:ModificationDate>1487472110</a:ModificationDate>
+<a:Modifier>shuzheng</a:Modifier>
+<a:Comment>用户编号</a:Comment>
 <a:DataType>int(10)</a:DataType>
 <a:Length>10</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
@@ -7853,8 +7860,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>organization_id</a:Code>
 <a:CreationDate>1483619649</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1484126336</a:ModificationDate>
-<a:Modifier>admin</a:Modifier>
+<a:ModificationDate>1487472110</a:ModificationDate>
+<a:Modifier>shuzheng</a:Modifier>
+<a:Comment>组织编号</a:Comment>
 <a:DataType>int(10)</a:DataType>
 <a:Length>10</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
@@ -7898,8 +7906,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>user_role_id</a:Code>
 <a:CreationDate>1483619905</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1484127146</a:ModificationDate>
-<a:Modifier>admin</a:Modifier>
+<a:ModificationDate>1487472127</a:ModificationDate>
+<a:Modifier>shuzheng</a:Modifier>
+<a:Comment>编号</a:Comment>
 <a:DataType>int(10)</a:DataType>
 <a:Length>10</a:Length>
 <a:Identity>1</a:Identity>
@@ -7914,8 +7923,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>user_id</a:Code>
 <a:CreationDate>1483619905</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1484127146</a:ModificationDate>
-<a:Modifier>admin</a:Modifier>
+<a:ModificationDate>1487472127</a:ModificationDate>
+<a:Modifier>shuzheng</a:Modifier>
+<a:Comment>用户编号</a:Comment>
 <a:DataType>int(10)</a:DataType>
 <a:Length>10</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
@@ -7929,8 +7939,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>role_id</a:Code>
 <a:CreationDate>1483620007</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1486384646</a:ModificationDate>
+<a:ModificationDate>1487472127</a:ModificationDate>
 <a:Modifier>shuzheng</a:Modifier>
+<a:Comment>角色编号</a:Comment>
 <a:DataType>int(10)</a:DataType>
 <a:Length>10</a:Length>
 </o:Column>
@@ -7955,12 +7966,12 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Table>
 <o:Table Id="o116">
 <a:ObjectID>DB08E027-9573-4802-A2DA-46BBC2E0DB7B</a:ObjectID>
-<a:Name>upms_permission 权限 *</a:Name>
+<a:Name>upms_permission 权限</a:Name>
 <a:Code>upms_permission</a:Code>
 <a:CreationDate>1483620745</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1486705311</a:ModificationDate>
-<a:Modifier>admin</a:Modifier>
+<a:ModificationDate>1487472092</a:ModificationDate>
+<a:Modifier>shuzheng</a:Modifier>
 <a:Comment>权限</a:Comment>
 <a:TotalSavingCurrency/>
 <c:Columns>
@@ -8141,8 +8152,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>role_permission_id</a:Code>
 <a:CreationDate>1483624201</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1484127201</a:ModificationDate>
-<a:Modifier>admin</a:Modifier>
+<a:ModificationDate>1487472176</a:ModificationDate>
+<a:Modifier>shuzheng</a:Modifier>
+<a:Comment>编号</a:Comment>
 <a:DataType>int(10)</a:DataType>
 <a:Length>10</a:Length>
 <a:Identity>1</a:Identity>
@@ -8157,8 +8169,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>role_id</a:Code>
 <a:CreationDate>1483624201</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1484127201</a:ModificationDate>
-<a:Modifier>admin</a:Modifier>
+<a:ModificationDate>1487472176</a:ModificationDate>
+<a:Modifier>shuzheng</a:Modifier>
+<a:Comment>角色编号</a:Comment>
 <a:DataType>int(10)</a:DataType>
 <a:Length>10</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
@@ -8172,8 +8185,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>permission_id</a:Code>
 <a:CreationDate>1483624201</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1484127201</a:ModificationDate>
-<a:Modifier>admin</a:Modifier>
+<a:ModificationDate>1487472176</a:ModificationDate>
+<a:Modifier>shuzheng</a:Modifier>
+<a:Comment>权限编号</a:Comment>
 <a:DataType>int(10)</a:DataType>
 <a:Length>10</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
@@ -8217,8 +8231,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>user_permission_id</a:Code>
 <a:CreationDate>1483624383</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1484127211</a:ModificationDate>
-<a:Modifier>admin</a:Modifier>
+<a:ModificationDate>1487472161</a:ModificationDate>
+<a:Modifier>shuzheng</a:Modifier>
+<a:Comment>编号</a:Comment>
 <a:DataType>int(10)</a:DataType>
 <a:Length>10</a:Length>
 <a:Identity>1</a:Identity>
@@ -8233,8 +8248,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>user_id</a:Code>
 <a:CreationDate>1483624383</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1484127211</a:ModificationDate>
-<a:Modifier>admin</a:Modifier>
+<a:ModificationDate>1487472161</a:ModificationDate>
+<a:Modifier>shuzheng</a:Modifier>
+<a:Comment>用户编号</a:Comment>
 <a:DataType>int(10)</a:DataType>
 <a:Length>10</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
@@ -8248,8 +8264,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>permission_id</a:Code>
 <a:CreationDate>1483624383</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1484127211</a:ModificationDate>
-<a:Modifier>admin</a:Modifier>
+<a:ModificationDate>1487472161</a:ModificationDate>
+<a:Modifier>shuzheng</a:Modifier>
+<a:Comment>权限编号</a:Comment>
 <a:DataType>int(10)</a:DataType>
 <a:Length>10</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>

+ 25 - 0
zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/model/UpmsRole.java

@@ -3,14 +3,39 @@ package com.zheng.upms.dao.model;
 import java.io.Serializable;
 
 public class UpmsRole implements Serializable {
+    /**
+     * 编号
+     *
+     * @mbg.generated
+     */
     private Integer roleId;
 
+    /**
+     * 角色名称
+     *
+     * @mbg.generated
+     */
     private String name;
 
+    /**
+     * 角色描述
+     *
+     * @mbg.generated
+     */
     private String description;
 
+    /**
+     * 创建时间
+     *
+     * @mbg.generated
+     */
     private Long ctime;
 
+    /**
+     * 排序
+     *
+     * @mbg.generated
+     */
     private Long orders;
 
     private static final long serialVersionUID = 1L;

+ 15 - 0
zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/model/UpmsRolePermission.java

@@ -3,10 +3,25 @@ package com.zheng.upms.dao.model;
 import java.io.Serializable;
 
 public class UpmsRolePermission implements Serializable {
+    /**
+     * 编号
+     *
+     * @mbg.generated
+     */
     private Integer rolePermissionId;
 
+    /**
+     * 角色编号
+     *
+     * @mbg.generated
+     */
     private Integer roleId;
 
+    /**
+     * 权限编号
+     *
+     * @mbg.generated
+     */
     private Integer permissionId;
 
     private static final long serialVersionUID = 1L;

+ 15 - 0
zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/model/UpmsUserOrganization.java

@@ -3,10 +3,25 @@ package com.zheng.upms.dao.model;
 import java.io.Serializable;
 
 public class UpmsUserOrganization implements Serializable {
+    /**
+     * 编号
+     *
+     * @mbg.generated
+     */
     private Integer userOrganizationId;
 
+    /**
+     * 用户编号
+     *
+     * @mbg.generated
+     */
     private Integer userId;
 
+    /**
+     * 组织编号
+     *
+     * @mbg.generated
+     */
     private Integer organizationId;
 
     private static final long serialVersionUID = 1L;

+ 15 - 0
zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/model/UpmsUserPermission.java

@@ -3,10 +3,25 @@ package com.zheng.upms.dao.model;
 import java.io.Serializable;
 
 public class UpmsUserPermission implements Serializable {
+    /**
+     * 编号
+     *
+     * @mbg.generated
+     */
     private Integer userPermissionId;
 
+    /**
+     * 用户编号
+     *
+     * @mbg.generated
+     */
     private Integer userId;
 
+    /**
+     * 权限编号
+     *
+     * @mbg.generated
+     */
     private Integer permissionId;
 
     private static final long serialVersionUID = 1L;

+ 15 - 0
zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/model/UpmsUserRole.java

@@ -3,10 +3,25 @@ package com.zheng.upms.dao.model;
 import java.io.Serializable;
 
 public class UpmsUserRole implements Serializable {
+    /**
+     * 编号
+     *
+     * @mbg.generated
+     */
     private Integer userRoleId;
 
+    /**
+     * 用户编号
+     *
+     * @mbg.generated
+     */
     private Integer userId;
 
+    /**
+     * 角色编号
+     *
+     * @mbg.generated
+     */
     private Integer roleId;
 
     private static final long serialVersionUID = 1L;