From 558701aa1ca0e43e6d98a7d86688e9aa07313611 Mon Sep 17 00:00:00 2001 From: lsy <18332763730@163.com> Date: Mon, 19 Feb 2018 15:39:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- all/sql/ucenter.sql | 2 +- all/sql/upms.sql | 7 +++++-- .../src/main/resources/mybatisStart.properties | 12 ------------ .../src/main/resources/templates/moudel_vue.ftl | 1 - ms/upms/src/main/resources/mybatisStart.properties | 8 ++++---- 5 files changed, 10 insertions(+), 20 deletions(-) diff --git a/all/sql/ucenter.sql b/all/sql/ucenter.sql index 707b2c4..f3cd0ed 100644 --- a/all/sql/ucenter.sql +++ b/all/sql/ucenter.sql @@ -56,7 +56,7 @@ CREATE TABLE ucenter_user ( `nickname` VARCHAR(32) DEFAULT NULL COMMENT '昵称', `sex` TINYINT(4) DEFAULT NULL - COMMENT '性别 0为止 1男 2女', + COMMENT '性别 0未知 1男 2女', `avatar` VARCHAR(100) DEFAULT NULL COMMENT '头像', `create_time` DATETIME DEFAULT NULL diff --git a/all/sql/upms.sql b/all/sql/upms.sql index b094532..08638ad 100644 --- a/all/sql/upms.sql +++ b/all/sql/upms.sql @@ -143,8 +143,10 @@ CREATE TABLE upms_permission ( COMMENT '所属上级', `name` VARCHAR(20) DEFAULT NULL COMMENT '名称', + `description` VARCHAR(200) DEFAULT NULL + COMMENT '权限描述', `type` TINYINT(4) DEFAULT NULL - COMMENT '类型 1.目录2.菜单3.按钮', + COMMENT '类型 1.视图授权2.角色授权3.个性授权', `permission_value` VARCHAR(50) DEFAULT NULL COMMENT '权限值', `uri` VARCHAR(100) DEFAULT NULL @@ -182,6 +184,8 @@ CREATE TABLE upms_system ( COMMENT '状态 -1 黑名单 1 正常', `name` VARCHAR(20) DEFAULT NULL COMMENT '系统名称', + `route` VARCHAR(20) DEFAULT NULL + COMMENT '系统路由', `title` VARCHAR(20) DEFAULT NULL COMMENT '系统标题', `description` VARCHAR(300) DEFAULT NULL @@ -194,7 +198,6 @@ CREATE TABLE upms_system ( ) ENGINE = InnoDB DEFAULT CHARSET = utf8; - # 关联关系表 -- -------------------------- -- upms_user_organization 用户_组织关联表 diff --git a/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/resources/mybatisStart.properties b/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/resources/mybatisStart.properties index 4ce9f40..dd7c82f 100644 --- a/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/resources/mybatisStart.properties +++ b/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/resources/mybatisStart.properties @@ -18,15 +18,3 @@ mybatisGenerator.serviceImplPackage=daoPackage mybatisGenerator.primaryKeyType=daoPackage mybatisGenerator.isOverWrite=false -# js controller\u5C42 vue-element \u4EE3\u7801\u751F\u6210\u6240\u9700\u8981\u7684\u53C2\u6570.\u4EC5\u4EC5\u4F9D\u8D56\u4E8E\u4E00\u7EA7\u53C2\u6570 -# \u6839\u636E\u54EA\u5F20\u6570\u636E\u8868\u751F\u6210 -vue.tablePrefix=upms_ -# js\u6587\u4EF6\u7684\u751F\u6210\u8DEF\u5F84 -vue.js.createPath= -# vue\u6587\u4EF6\u7684\u751F\u6210\u8DEF\u5F84 -vue.vue.createPath= -# -# -# -# - diff --git a/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/resources/templates/moudel_vue.ftl b/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/resources/templates/moudel_vue.ftl index 80ef81a..5dcba7a 100644 --- a/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/resources/templates/moudel_vue.ftl +++ b/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/resources/templates/moudel_vue.ftl @@ -1,4 +1,3 @@ -<#---->