-重写路由

plus-admin/admin-console/src/main/resources/application.properties

@@ -36,7 +36,7 @@ logging.level.org.springframework.web.servlet.mvc.method.annotation=warn
 #logging.file = my.log
 logging.pattern.console=%-4relative [%thread] %-5level %logger{256} %M %L - %msg%n
 #\u65E5\u5FD7\u6392\u9664 autoconfiguration \u8F93\u51FA
-logging.level.org.springframework.boot.autoconfigure: ERROR
+logging.level.org.springframework.boot.autoconfigure=ERROR
 
 #\u6587\u6863\u9884\u89C8\u670D\u52A1\u7684\u8C03\u7528\u5730\u5740\uFF0C\u53C2\u8003https://gitee.com/kekingcn/file-online-preview \u5B89\u88C5\uFF0C\u6CA1\u6709\u5982\u4E0B\u914D\u7F6E\u65E0\u6CD5\u4F7F\u7528\u9884\u89C8\u529F\u80FD
 file.previewURL=http://localhost:8012/onlinePreview

plus-admin/admin-console/src/main/resources/btsql-ext.properties

 DELIMITER_PLACEHOLDER_START=#
 DELIMITER_PLACEHOLDER_END=#
-DELIMITER_STATEMENT_START=>-
+DELIMITER_STATEMENT_START=@
 DELIMITER_STATEMENT_END=
 #\u51FD\u6570\u6CE8\u518C
 FN.isEmpty=org.beetl.ext.fn.EmptyExpressionFunction

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/conf/BeetlConf.java

 package com.ibeetl.admin.core.conf;
 
 import cn.hutool.core.util.CharsetUtil;
+import cn.hutool.setting.SettingUtil;
+import cn.hutool.setting.dialect.Props;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.ibeetl.admin.core.conf.handler.DateTypeHandler;
 import com.ibeetl.admin.core.conf.handler.ZonedDateTimeTypeHandler;
@@ -23,6 +25,7 @@ import com.ibeetl.admin.core.web.query.QueryParser;
 import com.ibeetl.starter.BeetlSqlMutipleSourceCustomize;
 import com.ibeetl.starter.BeetlTemplateCustomize;
 import com.ibeetl.starter.ObjectMapperJsonUtil;
+import java.io.File;
 import java.io.UnsupportedEncodingException;
 import java.time.ZonedDateTime;
 import java.util.Date;
@@ -85,7 +88,7 @@ public class BeetlConf {
   }
 
   /**
-   * BeetlSql 多数据源
+   * 对BeetlSql 的多数据源中每个数据源单独自定义配置
    *
    * @return
    */
@@ -194,7 +197,7 @@ public class BeetlConf {
 
     @Override
     protected void println(String str) {
-      logger.info(str);
+      logger.info(System.lineSeparator()+str);
     }
   }
 }

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/conf/JasonConfig.java

 package com.ibeetl.admin.core.conf;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationConfig;
+import com.fasterxml.jackson.databind.SerializationConfig;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 
@@ -23,11 +28,17 @@ public class JasonConfig {
   @ConditionalOnMissingBean(ObjectMapper.class)
   public ObjectMapper getObjectMapper() {
     ObjectMapper objectMapper = new ObjectMapper();
+
     objectMapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
+
     objectMapper.configure(SerializationFeature.INDENT_OUTPUT, true);
+
     SimpleModule simpleModule = new SimpleModule("SimpleModule", Version.unknownVersion());
     simpleModule.addSerializer(JsonResult.class, new CustomJsonResultSerializer());
+    simpleModule.addSerializer(Long.class, ToStringSerializer.instance);
+    simpleModule.addSerializer(Long.TYPE, ToStringSerializer.instance);
     objectMapper.registerModule(simpleModule);
+
     return objectMapper;
   }
   /**
@@ -48,7 +59,7 @@ public class JasonConfig {
       Object data = value.getData();
       if (data instanceof PageQuery) {
         PageQuery query = (PageQuery) (data);
-        gen.writeObjectField("count", query.getTotalRow());
+        gen.writeNumberField("count", query.getTotalRow());
         gen.writeObjectField("data", query.getList());
       } else {
         gen.writeObjectField("data", data);

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/conf/processor/JsonBeanProcessor.java

@@ -95,6 +95,7 @@ public class JsonBeanProcessor extends BeanProcessor {
     } else {
       /*复杂结果集映射，取消TailBean的便利性*/
       rs.absolute(0);
+      mapping.setNestedRows(null);
       fillMappingRow(rs, mapping);
       results = convertMapping(mapping, type);
     }
@@ -131,6 +132,7 @@ public class JsonBeanProcessor extends BeanProcessor {
     } else {
       /*复杂结果集映射，取消TailBean的便利性*/
       rs.absolute(0);
+      mapping.getNestedRows().clear();
       fillMappingRow(rs, mapping);
       results = convertMapping(mapping, type);
     }

plus-admin/admin-core/src/main/resources/sql/core/coreFunction.md

@@ -3,20 +3,22 @@ getAllRoutes
 ===
 
 ```sql
-select router.id,
-       router.PARENT_ID,
-       ifnull(router.ACCESS_URL, '/error/404') path,
-       router.NAME,
-       menu.NAME                               title,
+
+select menu.id,
+       menu.PARENT_MENU_ID      PARENT_ID,
+       menu.NAME                title,
        menu.ICON,
-       ifnull(menu.SEQ, 999999)                seq,
-       crm.ROLE_ID
-from core_function router
-       left join core_menu menu on menu.FUNCTION_ID = router.ID
-       left join core_role_menu crm on crm.MENU_ID = menu.id
-order by router.ID
+       ifnull(menu.SEQ, 999999) seq,
+       route.ACCESS_URL          path,
+       route.NAME,
+       role_menu.ROLE_ID
+from core_menu menu
+       left join core_function route on route.ID = menu.FUNCTION_ID
+       left join core_role_menu role_menu on role_menu.MENU_ID = menu.id
+where menu.TYPE!='MENU_S'
+
 ```
->- mapping("RouteMapping");
+@ mapping("RouteMapping");
 
 RouteMapping
 ===

plus-admin/admin-core/src/main/resources/usually.sql

@@ -36,15 +36,30 @@ SELECT router.id,
        menu.NAME                               title,
        menu.ICON,
        IFNULL(menu.SEQ, -9999)                 seq,
-       crm.ROLE_ID
+       (select from core_role_menu crm where crm.
 FROM core_function router
          LEFT JOIN core_menu menu
-                   ON menu.FUNCTION_ID = router.ID
-         LEFT JOIN core_role_menu crm
-                   ON crm.MENU_ID = menu.id;
+                   ON menu.FUNCTION_ID = router.ID;
 
-select *
-from core_function;
+select router.id,
+       router.PARENT_ID,
+       IFNULL(router.ACCESS_URL, '/error/404') path,
+       router.NAME,
+       menu.NAME                               title,
+       menu.ICON,
+       IFNULL(menu.SEQ, -9999)                 seq,
+       from core_menu cm left join core_function cf on cf.id=cm.function_id
+
+union
+
+select router.id,
+       router.PARENT_ID,
+       IFNULL(router.ACCESS_URL, '/error/404') path,
+       router.NAME,
+       menu.NAME                               title,
+       menu.ICON,
+       IFNULL(menu.SEQ, -9999)                 seq,
+       from core_menu cm right join core_function cf on cf.id=cm.function_id;
 
 -- 分为系统，导航，菜单。系统是顶部菜单，导航就是父菜单，菜单是导航的子菜单
 select cm.*,

plus-admin/doc/starter-mysql.sql

 --
--- Script was generated by Devart dbForge Studio 2019 for MySQL, Version 8.2.23.0
+-- Script was generated by Devart dbForge Studio for MySQL, Version 8.0.40.0
 -- Product home page: http://www.devart.com/dbforge/mysql/studio
--- Script date 2019/9/15 21:15:32
--- Server version: 8.0.17
+-- Script date 2019/10/8 18:12:34
+-- Server version: 8.0.13
 -- Client version: 4.1
 --
 
--- 
--- Disable foreign keys
--- 
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
 
--- 
--- Set SQL mode
--- 
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-
--- 
--- Set character set the client will use to send SQL statements to the server
---
 SET NAMES 'utf8';
 
-DROP DATABASE IF EXISTS starter;
-
-CREATE DATABASE IF NOT EXISTS starter
-	CHARACTER SET utf8
-	COLLATE utf8_general_ci;
-
---
--- Set default database
---
-USE starter;
-
---
--- Create table `core_user_role`
---
-CREATE TABLE IF NOT EXISTS core_user_role (
-  ID INT(20) NOT NULL AUTO_INCREMENT,
-  USER_ID INT(20) DEFAULT NULL,
-  ROLE_ID INT(20) DEFAULT NULL,
-  ORG_ID INT(20) DEFAULT NULL,
-  CREATE_TIME BIGINT(11) DEFAULT NULL,
-  PRIMARY KEY (ID)
-)
-ENGINE = INNODB,
-AUTO_INCREMENT = 173,
-AVG_ROW_LENGTH = 712,
-CHARACTER SET utf8,
-COLLATE utf8_general_ci,
-COMMENT = '用户角色关系表';
-
---
--- Create table `core_user`
---
-CREATE TABLE IF NOT EXISTS core_user (
-  ID INT(20) NOT NULL AUTO_INCREMENT,
-  CODE VARCHAR(16) DEFAULT NULL,
-  NAME VARCHAR(16) DEFAULT NULL,
-  PASSWORD VARCHAR(64) DEFAULT NULL,
-  ORG_ID INT(65) DEFAULT NULL,
-  STATE VARCHAR(16) DEFAULT NULL COMMENT '用户状态 1:启用 0:停用',
-  JOB_TYPE1 VARCHAR(16) DEFAULT NULL,
-  DEL_FLAG TINYINT(6) DEFAULT NULL COMMENT '用户删除标记 0:未删除 1:已删除',
-  JOB_TYPE0 VARCHAR(16) DEFAULT NULL,
-  ATTACHMENT_ID VARCHAR(128) DEFAULT NULL,
-  INTRODUCTION VARCHAR(256) DEFAULT NULL COMMENT '简介',
-  AVATAR VARCHAR(128) DEFAULT NULL COMMENT '头像',
-  UPDATE_TIME BIGINT(11) DEFAULT NULL,
-  CREATE_TIME BIGINT(11) DEFAULT NULL,
-  PRIMARY KEY (ID)
-)
-ENGINE = INNODB,
-AUTO_INCREMENT = 176,
-AVG_ROW_LENGTH = 2730,
-CHARACTER SET utf8,
-COLLATE utf8_general_ci;
-
---
--- Create table `core_role_menu`
---
-CREATE TABLE IF NOT EXISTS core_role_menu (
-  ID INT(20) NOT NULL AUTO_INCREMENT,
-  ROLE_ID INT(65) DEFAULT NULL,
-  MENU_ID INT(65) DEFAULT NULL,
-  CREATE_TIME BIGINT(11) DEFAULT NULL,
-  PRIMARY KEY (ID)
-)
-ENGINE = INNODB,
-AUTO_INCREMENT = 201,
-AVG_ROW_LENGTH = 1820,
-CHARACTER SET utf8,
-COLLATE utf8_general_ci;
-
---
--- Create table `core_role_function`
---
-CREATE TABLE IF NOT EXISTS core_role_function (
-  ID INT(20) NOT NULL AUTO_INCREMENT,
-  ROLE_ID INT(65) DEFAULT NULL,
-  FUNCTION_ID INT(65) DEFAULT NULL,
-  DATA_ACCESS_TYPE TINYINT(65) DEFAULT NULL,
-  DATA_ACCESS_POLICY VARCHAR(128) DEFAULT NULL,
-  PRIMARY KEY (ID)
-)
-ENGINE = INNODB,
-AUTO_INCREMENT = 206,
-AVG_ROW_LENGTH = 712,
-CHARACTER SET utf8,
-COLLATE utf8_general_ci;
-
---
--- Create table `core_role`
---
-CREATE TABLE IF NOT EXISTS core_role (
-  ID INT(20) NOT NULL AUTO_INCREMENT,
-  CODE VARCHAR(16) DEFAULT NULL COMMENT '角色编码',
-  NAME VARCHAR(255) DEFAULT NULL COMMENT '角色名称',
-  TYPE VARCHAR(6) DEFAULT NULL COMMENT '1 可以配置 2 固定权限角色',
-  CREATE_TIME BIGINT(11) DEFAULT NULL,
-  PRIMARY KEY (ID)
-)
-ENGINE = INNODB,
-AUTO_INCREMENT = 174,
-AVG_ROW_LENGTH = 1638,
-CHARACTER SET utf8,
-COLLATE utf8_general_ci;
-
---
--- Create index `code_idx` on table `core_role`
---
-ALTER TABLE core_role 
-  ADD INDEX code_idx(CODE);
-
---
--- Create table `core_org`
---
-CREATE TABLE IF NOT EXISTS core_org (
-  ID INT(20) NOT NULL AUTO_INCREMENT,
-  CODE VARCHAR(16) NOT NULL,
-  NAME VARCHAR(16) NOT NULL,
-  PARENT_ORG_ID INT(20) DEFAULT NULL,
-  TYPE VARCHAR(6) NOT NULL COMMENT '1 公司，2 部门，3 小组',
-  DEL_FLAG TINYINT(6) DEFAULT NULL,
-  CREATE_TIME BIGINT(11) DEFAULT NULL,
-  PRIMARY KEY (ID)
-)
-ENGINE = INNODB,
-AUTO_INCREMENT = 9,
-AVG_ROW_LENGTH = 2340,
-CHARACTER SET utf8,
-COLLATE utf8_general_ci;
-
---
--- Create table `core_menu`
---
-CREATE TABLE IF NOT EXISTS core_menu (
-  ID INT(20) NOT NULL AUTO_INCREMENT,
-  CODE VARCHAR(16) DEFAULT NULL,
-  NAME VARCHAR(16) DEFAULT NULL,
-  FUNCTION_ID INT(6) DEFAULT NULL,
-  TYPE VARCHAR(6) DEFAULT NULL COMMENT '1,系统，2 导航 3 菜单项（对应某个功能点）',
-  PARENT_MENU_ID INT(65) DEFAULT NULL,
-  SEQ INT(65) DEFAULT NULL,
-  ICON VARCHAR(255) DEFAULT NULL COMMENT '图标',
-  CREATE_TIME BIGINT(11) DEFAULT NULL,
-  PRIMARY KEY (ID)
-)
-ENGINE = INNODB,
-AUTO_INCREMENT = 26,
-AVG_ROW_LENGTH = 963,
-CHARACTER SET utf8,
-COLLATE utf8_general_ci;
-
---
--- Create table `core_function`
---
-CREATE TABLE IF NOT EXISTS core_function (
-  ID INT(20) NOT NULL AUTO_INCREMENT,
-  CODE VARCHAR(250) DEFAULT NULL,
-  NAME VARCHAR(16) DEFAULT NULL,
-  ACCESS_URL VARCHAR(250) DEFAULT NULL,
-  PARENT_ID INT(65) DEFAULT NULL,
-  TYPE VARCHAR(4) DEFAULT NULL,
-  CREATE_TIME BIGINT(11) DEFAULT NULL,
-  PRIMARY KEY (ID)
-)
-ENGINE = INNODB,
-AUTO_INCREMENT = 184,
-AVG_ROW_LENGTH = 819,
-CHARACTER SET utf8,
-COLLATE utf8_general_ci;
-
---
--- Create table `core_file_tag`
---
-CREATE TABLE IF NOT EXISTS core_file_tag (
-  ID INT(20) NOT NULL AUTO_INCREMENT,
-  `KEY` VARCHAR(64) NOT NULL COMMENT 'key，关键字',
-  VALUE VARCHAR(255) NOT NULL COMMENT '关键字对应的值',
-  FILE_ID INT(20) NOT NULL COMMENT 'sys_file的id，文件id',
-  PRIMARY KEY (ID)
-)
-ENGINE = INNODB,
-AUTO_INCREMENT = 2,
-AVG_ROW_LENGTH = 8192,
-CHARACTER SET utf8,
-COLLATE utf8_general_ci,
-COMMENT = '文件标签';
-
---
--- Create table `core_file`
---
-CREATE TABLE IF NOT EXISTS core_file (
-  ID INT(20) NOT NULL AUTO_INCREMENT,
-  NAME VARCHAR(64) DEFAULT NULL COMMENT '文件名称',
-  PATH VARCHAR(255) DEFAULT NULL COMMENT '路径',
-  BIZ_ID VARCHAR(128) DEFAULT NULL COMMENT '业务ID',
-  USER_ID INT(20) DEFAULT NULL COMMENT '上传人id',
-  ORG_ID INT(20) DEFAULT NULL,
-  BIZ_TYPE VARCHAR(128) DEFAULT NULL,
-  FILE_BATCH_ID VARCHAR(128) DEFAULT NULL,
-  CREATE_TIME BIGINT(11) DEFAULT NULL,
-  PRIMARY KEY (ID)
-)
-ENGINE = INNODB,
-AVG_ROW_LENGTH = 1489,
-CHARACTER SET utf8,
-COLLATE utf8_general_ci,
-COMMENT = '文件表';
-
---
--- Create table `core_dict`
---
-CREATE TABLE IF NOT EXISTS core_dict (
-  ID INT(11) NOT NULL AUTO_INCREMENT,
-  VALUE VARCHAR(16) NOT NULL,
-  NAME VARCHAR(128) NOT NULL COMMENT '名称',
-  TYPE VARCHAR(64) NOT NULL COMMENT '字典编码',
-  TYPE_NAME VARCHAR(64) NOT NULL COMMENT '类型描述',
-  SORT INT(6) DEFAULT NULL COMMENT '排序',
-  PARENT INT(64) DEFAULT NULL COMMENT '父id',
-  DEL_FLAG INT(6) DEFAULT NULL COMMENT '删除标记',
-  REMARK VARCHAR(255) DEFAULT NULL COMMENT '备注',
-  CREATE_TIME BIGINT(11) DEFAULT NULL,
-  PRIMARY KEY (ID)
-)
-ENGINE = INNODB,
-AUTO_INCREMENT = 33,
-AVG_ROW_LENGTH = 512,
-CHARACTER SET utf8,
-COLLATE utf8_general_ci,
-COMMENT = '字典表';
-
---
--- Create index `idx_code` on table `core_dict`
---
-ALTER TABLE core_dict 
-  ADD INDEX idx_code(TYPE);
-
---
--- Create index `idx_pid` on table `core_dict`
---
-ALTER TABLE core_dict 
-  ADD INDEX idx_pid(PARENT);
-
---
--- Create index `idx_value` on table `core_dict`
---
-ALTER TABLE core_dict 
-  ADD INDEX idx_value(VALUE);
-
---
--- Create table `core_audit`
---
-CREATE TABLE IF NOT EXISTS core_audit (
-  ID INT(11) NOT NULL AUTO_INCREMENT,
-  FUNCTION_CODE VARCHAR(45) DEFAULT NULL,
-  FUNCTION_NAME VARCHAR(45) DEFAULT NULL,
-  USER_ID INT(11) DEFAULT NULL,
-  USER_NAME VARCHAR(45) DEFAULT NULL,
-  IP VARCHAR(45) DEFAULT NULL,
-  SUCCESS TINYINT(4) DEFAULT NULL,
-  MESSAGE VARCHAR(250) DEFAULT NULL,
-  ORG_ID VARCHAR(45) DEFAULT NULL,
-  CREATE_TIME BIGINT(11) DEFAULT NULL,
-  PRIMARY KEY (ID)
-)
-ENGINE = INNODB,
-AVG_ROW_LENGTH = 364,
-CHARACTER SET utf8,
-COLLATE utf8_general_ci;
-
---
--- Create table `cms_blog`
---
-CREATE TABLE IF NOT EXISTS cms_blog (
-  id INT(11) NOT NULL AUTO_INCREMENT,
-  title VARCHAR(255) DEFAULT NULL,
-  content VARCHAR(512) DEFAULT NULL,
-  create_user_id INT(11) DEFAULT NULL,
-  type VARCHAR(255) DEFAULT NULL,
-  CREATE_TIME BIGINT(11) DEFAULT NULL,
-  PRIMARY KEY (id)
-)
-ENGINE = INNODB,
-AVG_ROW_LENGTH = 8192,
-CHARACTER SET utf8,
-COLLATE utf8_general_ci;
-
--- 
--- Dumping data for table core_user_role
---
-INSERT INTO core_user_role VALUES
-(1, 3, 1, 4, NULL),
-(2, 4, 2, 5, NULL),
-(3, 75, 3, 6, 1505988185),
-(35, 1, 1, 1, 1504631522),
-(36, 1, 3, 6, 1504639985),
-(38, 1, 1, 3, 1504640102),
-(41, 1, 1, 5, 1504641482),
-(42, 3, 3, 1, 1504641660),
-(47, 47, 3, 1, 1504706401),
-(49, 5, 3, 4, 1504706460),
-(52, 47, 2, 1, 1504717922),
-(53, 48, 3, 4, 1504718044),
-(55, 68, 2, 3, 1504791723),
-(125, 74, 1, 4, 1508204222),
-(144, 74, 3, NULL, 1508230500),
-(145, 67, 3, NULL, 1508230501),
-(146, 73, 3, NULL, 1508230502),
-(147, 22, 3, NULL, 1508230504),
-(148, 68, 3, NULL, 1508230560),
-(168, 72, 1, 3, 1508827204),
-(169, 41, 1, NULL, 1508893081),
-(171, 170, 1, 5, 1508893685),
-(172, 171, 1, 4, 1517535401);
-
--- 
--- Dumping data for table core_user
---
-INSERT INTO core_user VALUES
-(1, 'admin', '超级管理员1', '123456', 1, 'S1', 'JT_S_01', 0, 'JT_01', NULL, NULL, NULL, 1505265663, 1505265663),
-(171, 'lixx', '李小小', NULL, 3, 'S1', 'JT_S_04', 0, 'JT_02', NULL, NULL, NULL, NULL, 1517109681),
-(172, 'lixx2', '李xx2', '123456', 4, 'S1', 'JT_S_02', 0, 'JT_01', NULL, NULL, NULL, NULL, 1517109759),
-(173, 'test1', 'test1', '123', 5, 'S1', 'JT_S_04', 0, 'JT_02', NULL, NULL, NULL, NULL, 1517121895),
-(174, 'hank250', '李小熊', NULL, 4, 'S1', 'JT_S_04', 0, 'JT_02', NULL, NULL, NULL, NULL, 1518752201),
-(175, 'test123', 'test12344', NULL, 3, 'S1', 'JT_S_04', 0, 'JT_02', '79b294da-8792-4bfd-9d84-e3f989b88cdf', NULL, NULL, NULL, 1520756362);
-
--- 
--- Dumping data for table core_role_menu
---
-INSERT INTO core_role_menu VALUES
-(1, 1, 10, NULL),
-(163, 1, 11, NULL),
-(175, 173, 10, NULL),
-(193, 3, 10, NULL),
-(195, 3, 17, NULL),
-(196, NULL, 10, NULL),
-(197, NULL, 11, NULL),
-(198, NULL, 13, NULL),
-(200, 1, 23, NULL);
-
--- 
--- Dumping data for table core_role_function
---
-INSERT INTO core_role_function VALUES
-(1, 1, 1, 5, NULL),
-(2, 1, 2, 4, NULL),
-(3, 1, 3, 5, NULL),
-(4, 2, 2, 2, NULL),
-(5, 3, 2, 5, NULL),
-(6, 3, 3, 5, NULL),
-(162, 1, 6, NULL, NULL),
-(164, 1, 91, NULL, NULL),
-(174, 173, 1, NULL, NULL),
-(176, 173, 2, 5, NULL),
-(177, 173, 3, NULL, NULL),
-(178, 173, 167, NULL, NULL),
-(192, 3, 1, NULL, NULL),
-(194, 3, 12, NULL, NULL),
-(196, 3, 180, 3, NULL),
-(197, NULL, 1, NULL, NULL),
-(198, NULL, 2, NULL, NULL),
-(199, NULL, 3, NULL, NULL),
-(200, NULL, 6, NULL, NULL),
-(201, NULL, 91, NULL, NULL),
-(202, NULL, 8, NULL, NULL),
-(205, 1, 182, NULL, NULL),
-(206, 1, 181, NULL, NULL);
-
--- 
--- Dumping data for table core_role
---
-INSERT INTO core_role VALUES
-(1, 'DEPT_MANAGER', '部门管理员', 'R0', NULL),
-(2, 'CEO', '公司CEO', 'R0', NULL),
-(3, 'ASSIST', '助理', 'R0', NULL),
-(12, '111', '2324324', 'R0', 1504642080),
-(13, '1111', '哈哈', 'R0', 1504642145),
-(15, 'admin', 'ivy', 'R0', 1504647304),
-(17, '123', '我', 'R0', 1504704183),
-(18, '23', '234', 'R0', 1504705263),
-(19, '132484', '1', 'R0', 1504705322),
-(173, 'dept.admin', '部门辅助管理员', 'R0', NULL);
-
--- 
--- Dumping data for table core_org
---
-INSERT INTO core_org VALUES
-(1, '集团公司', '集团', NULL, 'ORGT0', 0, 1517563130),
-(3, '信息科技部门', '信息科技部门', 1, 'ORGT2', 0, NULL),
-(4, '贵州银行', '贵州银行', 1, 'ORGT1', 0, 1517563136),
-(5, '贵州银行金科', '贵州银行金融科技开发公司', 4, 'ORGT1', 0, NULL),
-(6, '金科研发', '金科研发', 5, 'ORGT2', 0, NULL),
-(7, '金科研发部门', '金科研发部门', 6, 'ORGT2', 0, 1517809793),
-(8, '金科研发2部', '金科研发2部', 6, 'ORGT2', 0, 1517809844);
-
--- 
--- Dumping data for table core_menu
---
-INSERT INTO core_menu VALUES
-(8, '系统管理', '系统管理', NULL, 'MENU_S', 0, 1, NULL, NULL),
-(10, '用户管理', '用户管理', 1, 'MENU_M', 18, 1, NULL, NULL),
-(11, '组织机构管理', '组织机构管理', 6, 'MENU_M', 18, 2, NULL, NULL),
-(12, '角色管理', '角色管理', 7, 'MENU_M', 18, 3, NULL, NULL),
-(13, '菜单项', '菜单项', 8, 'MENU_M', 18, 4, NULL, NULL),
-(14, '功能点管理', '功能点管理', 9, 'MENU_M', 18, 5, NULL, NULL),
-(15, '字典数据管理', '字典数据管理', 13, 'MENU_M', 18, 6, NULL, NULL),
-(16, '审计查询', '审计查询', 18, 'MENU_M', 19, 7, NULL, NULL),
-(17, '代码生成', '代码生成', 12, 'MENU_M', 24, 8, '', NULL),
-(18, '基础管理', '基础管理', NULL, 'MENU_N', 8, 1, NULL, NULL),
-(19, '监控管理', '监控管理', NULL, 'MENU_N', 8, 2, NULL, NULL),
-(20, '流程监控', '流程监控', 167, 'MENU_M', 19, 3, NULL, NULL),
-(21, '角色功能授权', '角色功能授权', 10, 'MENU_M', 18, 8, NULL, NULL),
-(22, '角色数据授权', '角色数据授权', 11, 'MENU_M', 18, 9, NULL, NULL),
-(23, '博客测试', '博客测试1', 182, 'MENU_M', 19, 9, '', NULL),
-(24, '代码生成导航', '代码生成', NULL, 'MENU_N', 8, 1, '', 1519868371),
-(25, '子系统生成', '子系统生成', 183, 'MENU_M', 24, 1, '', 1519868556);
-
--- 
--- Dumping data for table core_function
---
-INSERT INTO core_function VALUES
-(1, 'user', '用户功能', '/admin/user/index.do', 0, 'FN0', NULL),
-(2, 'user.query', '用户列表', NULL, 1, 'FN1', NULL),
-(3, 'user.edit', '用户编辑', NULL, 1, 'FN0', NULL),
-(6, 'org', '组织机构', '/admin/org/index.do', 0, 'FN0', NULL),
-(7, 'role', '角色管理', '/admin/role/index.do', 0, 'FN0', NULL),
-(8, 'menu', '菜单管理', '/admin/menu/index.do', 0, 'FN0', NULL),
-(9, 'function', '功能点管理', '/admin/function/index.do', 0, 'FN0', NULL),
-(10, 'roleFunction', '角色功能授权', '/admin/role/function.do', 0, 'FN0', NULL),
-(11, 'roleDataAccess', '角色数据授权', '/admin/role/data.do', 0, 'FN0', NULL),
-(12, 'code', '代码生成', '/core/codeGen/index.do', 0, 'FN0', NULL),
-(13, 'dict', '字典管理', '/admin/dict/index.do', 0, 'FN0', NULL),
-(18, 'trace', '审计查询', '/admin/audit/index.do', 0, 'FN0', NULL),
-(19, 'file', '相关文档', '/trade/interAndRelate/file.do', 0, 'FN0', NULL),
-(91, 'test', '测试', '/test/test.do', 6, 'FN0', 1507712341),
-(161, 'role.add', '角色添加', NULL, 7, 'FN0', 1508723105),
-(167, 'workflow.admin', '工作流监控', '/admin/workflow/index.do', 0, 'FN0', NULL),
-(180, 'code.query', '代码生成测试', NULL, 12, 'FN0', NULL),
-(181, 'blog.query', '博客查询功能', '', 182, 'FN0', NULL),
-(182, 'blog', '博客测试', '/admin/blog/index.do', 0, 'FN0', NULL),
-(183, 'code.project', '项目生成', '/core/codeGen/project.do', 12, 'FN0', 1519868297);
-
--- 
--- Dumping data for table core_file_tag
---
-INSERT INTO core_file_tag VALUES
-(1, 'customer', '12332', 1),
-(2, 'type', 'crdit', 2);
+INSERT INTO starter.cms_blog(id, title, content, create_user_id, type, CREATE_TIME) VALUES
+(1, 'hello', '我的博客，内容是。。。', 1, 'F0', 1519264385),
+(2, 'cccc', '过年回家', 1, 'F0', 1518489001);
 
--- 
--- Dumping data for table core_file
---
-INSERT INTO core_file VALUES
-(19, 'dict_upload_template.xls', '20180311/dict_upload_template.xls.8caa38fb-52ef-4c73-85ea-abfb1f5c5dc4', NULL, 1, 1, NULL, '18c0dd67-e334-47ba-8969-915bcf77c544', 1520753819),
-(20, 'dict_upload_template.xls', '20180311/dict_upload_template.xls.f50b7f0f-d376-4a95-be6a-14f5aa4a81e6', NULL, 1, 1, NULL, '335a583a-9c74-462d-be0a-5a82d427b1aa', 1520753836),
-(21, 'dict_upload_template.xls', '20180311/dict_upload_template.xls.b0b9434d-e367-43ef-b8ac-366cf7b018b6', NULL, 1, 1, NULL, 'a5b887c6-101c-46e8-b9e2-b3b448edff34', 1520753933),
-(22, 'dict_upload_template.xls', '20180311/dict_upload_template.xls.15f02d15-2dd0-4cb7-b2e5-4f7d72fb497d', NULL, 1, 1, NULL, '833d96bc-797c-403f-aa2e-00e2b5a3cd71', 1520753942),
-(23, 'dict_upload_template.xls', '20180311/dict_upload_template.xls.f12350bc-31da-4875-a78e-0135f512fb4c', NULL, 1, 1, NULL, '0b2a66a3-8aa8-46b7-8bf0-ce9f68041cd8', 1520754112),
-(24, 'dict_upload_template.xls', '20180311/dict_upload_template.xls.5bf626e5-2152-45a5-a432-fc2e9fcb7903', NULL, 1, 1, NULL, '813725ab-2c07-4e48-a766-7ebbe3083212', 1520754198),
-(25, 'dict_upload_template.xls', '20180311/dict_upload_template.xls.3cd3eb95-aab9-4105-8d28-76a723274709', NULL, 1, 1, NULL, '4216455c-20d7-4912-bfc8-c8cca7e70e9f', 1520754238),
-(26, 'dict_upload_template.xls', '20180311/dict_upload_template.xls.d3dc557b-1e77-4955-a3be-7a8b4f86407c', NULL, 1, 1, NULL, 'e42dc975-edd5-4d16-8529-fa69b56a5eb5', 1520754303),
-(34, 'dict_upload_template.xls', '20180311/dict_upload_template.xls.d50f8245-ec3e-4de1-9742-0c5c12105f27', '175', 1, 1, NULL, '79b294da-8792-4bfd-9d84-e3f989b88cdf', 1520757036),
-(37, '副本 功能列表.xlsx', '20180311/副本 功能列表.xlsx.bc7554e3-2a30-4667-aa61-0e280340b2be', '175', 1, 1, 'User', '79b294da-8792-4bfd-9d84-e3f989b88cdf', 1520765622),
-(38, '副本 功能列表.xlsx', '20180311/副本 功能列表.xlsx.d991eb1f-24a9-4db1-87c1-7ef9d2b8a40a', '175', 1, 1, 'User', '79b294da-8792-4bfd-9d84-e3f989b88cdf', 1520777458);
 
--- 
--- Dumping data for table core_dict
---
-INSERT INTO core_dict VALUES
-(1, 'DA0', '查看自己', 'data_access_type', '数据权限', 1, NULL, 0, '11111111111111111123', NULL),
-(2, 'DA1', '查看本公司', 'data_access_type', '数据权限', 3, NULL, 0, 'hello,go', NULL),
-(3, 'DA2', '查看同机构', 'data_access_type', '数据权限', 3, NULL, 0, NULL, NULL),
-(4, 'DA3', '查看本部门', 'data_access_type', '数据权限', 4, NULL, 0, NULL, NULL),
-(5, 'DA4', '查看集团', 'data_access_type', '数据权限', 5, NULL, 0, NULL, NULL),
-(6, 'DA5', '查看母公司', 'data_access_type', '数据权限', 6, NULL, 0, NULL, 1507952702),
-(7, 'FN0', '普通功能', 'function_type', '功能点类型', 2, NULL, 0, NULL, 1508725083),
-(8, 'FN1', '含数据权限', 'function_type', '功能点类型', 1, NULL, 0, NULL, 1508725205),
-(9, 'JT_01', '管理岗位', 'job_type', '岗位类型', 1, NULL, 0, NULL, NULL),
-(10, 'JT_02', '技术岗位', 'job_type', '岗位类型', 2, NULL, 0, NULL, NULL),
-(11, 'JT_S_01', '董事会', 'job_sub_managment_type', '管理岗位子类型', 1, 9, 0, NULL, NULL),
-(12, 'JT_S_02', '秘书', 'job_sub_managment_type', '管理岗位子类型', 2, 9, 0, NULL, NULL),
-(13, 'JT_S_03', '技术经理', 'job_dev_sub_type', '技术岗位子类型', 1, 10, 0, NULL, NULL),
-(14, 'JT_S_04', '程序员', 'job_dev_sub_type', '技术岗位子类型', 2, 10, 0, NULL, NULL),
-(15, 'MENU_M', '菜单', 'menu_type', '菜单类型', 3, NULL, 0, NULL, NULL),
-(16, 'MENU_N', '导航', 'menu_type', '菜单类型', 2, NULL, 0, NULL, NULL),
-(17, 'MENU_S', '系统', 'menu_type', '菜单类型', 1, NULL, 0, NULL, NULL),
-(18, 'ORGT0', '集团总部', 'org_type', '机构类型', 1, NULL, 0, NULL, NULL),
-(19, 'ORGT1', '分公司', 'org_type', '机构类型', 2, NULL, 0, NULL, NULL),
-(20, 'ORGT2', '部门', 'org_type', '机构类型', 3, NULL, 0, NULL, NULL),
-(21, 'ORGT3', '小组', 'org_type', '机构类型', 4, NULL, 0, NULL, NULL),
-(22, 'R0', '操作角色', 'role_type', '数据权限', 1, NULL, 0, NULL, NULL),
-(23, 'R1', '工作流角色', 'role_type', '用户角色', 2, NULL, 0, NULL, NULL),
-(24, 'S0', '禁用', 'user_state', '用户状态', 2, NULL, 0, NULL, NULL),
-(25, 'S1', '启用', 'user_state', '用户状态', 1, NULL, 0, NULL, NULL),
-(26, '昂按', '随碟附送分', 'kkkk', '水电费水电费', NULL, NULL, 0, '', 1519803814),
-(27, '昂按', '随碟附送分', 'kkkk', '水电费水电费', NULL, NULL, 0, '', 1519803968),
-(28, 'sdf', 'sdfsdf', 'sfsdf', 'sdfsdf', 1, NULL, 1, '', 1519804076),
-(29, 'asas', 'sdfsd', 'sd', 'sd', NULL, NULL, 1, '', 1519804232),
-(30, 'asas', 'sdfsd', 'sd', 'sd', NULL, NULL, 1, '', 1519804250),
-(31, '1', '男', 'gender', '性别', NULL, NULL, 0, '', 1520652980),
-(32, '2', '女', 'gender', '性别', NULL, NULL, 0, NULL, 1520652980);
-
--- 
--- Dumping data for table core_audit
---
-INSERT INTO core_audit VALUES
+INSERT INTO starter.core_audit(ID, FUNCTION_CODE, FUNCTION_NAME, USER_ID, USER_NAME, IP, SUCCESS, MESSAGE, ORG_ID, CREATE_TIME) VALUES
 (1, 'org.query', '未定义', 1, '超级管理员', '172.16.49.65', 1, '', NULL, 1517918331),
 (2, 'org.query', '未定义', 1, '超级管理员', '172.16.49.65', 1, '', NULL, 1517918331),
 (3, 'role.edit', '未定义', 1, '超级管理员', '172.16.49.65', 1, '', NULL, 1517918411),
@@ -573,19 +61,196 @@ INSERT INTO core_audit VALUES
 (44, 'role.edit', '未定义', 1, '超级管理员', '172.16.49.65', 1, '', NULL, 1517969297),
 (45, 'role.query', '未定义', 1, '超级管理员', '172.16.49.65', 1, '', NULL, 1517969297);
 
--- 
--- Dumping data for table cms_blog
---
-INSERT INTO cms_blog VALUES
-(1, 'hello', '我的博客，内容是。。。', 1, 'F0', 1519264385),
-(2, 'cccc', '过年回家', 1, 'F0', 1518489001);
 
--- 
--- Restore previous SQL mode
--- 
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+INSERT INTO starter.core_dict(ID, VALUE, NAME, TYPE, TYPE_NAME, SORT, PARENT, DEL_FLAG, REMARK, CREATE_TIME) VALUES
+(1, 'DA0', '查看自己', 'data_access_type', '数据权限', 1, NULL, 0, '11111111111111111123', NULL),
+(2, 'DA1', '查看本公司', 'data_access_type', '数据权限', 3, NULL, 0, 'hello,go', NULL),
+(3, 'DA2', '查看同机构', 'data_access_type', '数据权限', 3, NULL, 0, NULL, NULL),
+(4, 'DA3', '查看本部门', 'data_access_type', '数据权限', 4, NULL, 0, NULL, NULL),
+(5, 'DA4', '查看集团', 'data_access_type', '数据权限', 5, NULL, 0, NULL, NULL),
+(6, 'DA5', '查看母公司', 'data_access_type', '数据权限', 6, NULL, 0, NULL, 1507952702),
+(7, 'FN0', '普通功能', 'function_type', '功能点类型', 2, NULL, 0, NULL, 1508725083),
+(8, 'FN1', '含数据权限', 'function_type', '功能点类型', 1, NULL, 0, NULL, 1508725205),
+(9, 'JT_01', '管理岗位', 'job_type', '岗位类型', 1, NULL, 0, NULL, NULL),
+(10, 'JT_02', '技术岗位', 'job_type', '岗位类型', 2, NULL, 0, NULL, NULL),
+(11, 'JT_S_01', '董事会', 'job_sub_managment_type', '管理岗位子类型', 1, 9, 0, NULL, NULL),
+(12, 'JT_S_02', '秘书', 'job_sub_managment_type', '管理岗位子类型', 2, 9, 0, NULL, NULL),
+(13, 'JT_S_03', '技术经理', 'job_dev_sub_type', '技术岗位子类型', 1, 10, 0, NULL, NULL),
+(14, 'JT_S_04', '程序员', 'job_dev_sub_type', '技术岗位子类型', 2, 10, 0, NULL, NULL),
+(15, 'MENU_M', '菜单', 'menu_type', '菜单类型', 3, NULL, 0, NULL, NULL),
+(16, 'MENU_N', '导航', 'menu_type', '菜单类型', 2, NULL, 0, NULL, NULL),
+(17, 'MENU_S', '系统', 'menu_type', '菜单类型', 1, NULL, 0, NULL, NULL),
+(18, 'ORGT0', '集团总部', 'org_type', '机构类型', 1, NULL, 0, NULL, NULL),
+(19, 'ORGT1', '分公司', 'org_type', '机构类型', 2, NULL, 0, NULL, NULL),
+(20, 'ORGT2', '部门', 'org_type', '机构类型', 3, NULL, 0, NULL, NULL),
+(21, 'ORGT3', '小组', 'org_type', '机构类型', 4, NULL, 0, NULL, NULL),
+(22, 'R0', '操作角色', 'role_type', '数据权限', 1, NULL, 0, NULL, NULL),
+(23, 'R1', '工作流角色', 'role_type', '用户角色', 2, NULL, 0, NULL, NULL),
+(24, 'S0', '禁用', 'user_state', '用户状态', 2, NULL, 0, NULL, NULL),
+(25, 'S1', '启用', 'user_state', '用户状态', 1, NULL, 0, NULL, NULL),
+(26, '昂按', '随碟附送分', 'kkkk', '水电费水电费', NULL, NULL, 0, '', 1519803814),
+(27, '昂按', '随碟附送分', 'kkkk', '水电费水电费', NULL, NULL, 0, '', 1519803968),
+(28, 'sdf', 'sdfsdf', 'sfsdf', 'sdfsdf', 1, NULL, 1, '', 1519804076),
+(29, 'asas', 'sdfsd', 'sd', 'sd', NULL, NULL, 1, '', 1519804232),
+(30, 'asas', 'sdfsd', 'sd', 'sd', NULL, NULL, 1, '', 1519804250),
+(31, '1', '男', 'gender', '性别', NULL, NULL, 0, '', 1520652980),
+(32, '2', '女', 'gender', '性别', NULL, NULL, 0, NULL, 1520652980);
+
+
+INSERT INTO starter.core_file(ID, NAME, PATH, BIZ_ID, USER_ID, ORG_ID, BIZ_TYPE, FILE_BATCH_ID, CREATE_TIME) VALUES
+(19, 'dict_upload_template.xls', '20180311/dict_upload_template.xls.8caa38fb-52ef-4c73-85ea-abfb1f5c5dc4', NULL, 1, 1, NULL, '18c0dd67-e334-47ba-8969-915bcf77c544', 1520753819),
+(20, 'dict_upload_template.xls', '20180311/dict_upload_template.xls.f50b7f0f-d376-4a95-be6a-14f5aa4a81e6', NULL, 1, 1, NULL, '335a583a-9c74-462d-be0a-5a82d427b1aa', 1520753836),
+(21, 'dict_upload_template.xls', '20180311/dict_upload_template.xls.b0b9434d-e367-43ef-b8ac-366cf7b018b6', NULL, 1, 1, NULL, 'a5b887c6-101c-46e8-b9e2-b3b448edff34', 1520753933),
+(22, 'dict_upload_template.xls', '20180311/dict_upload_template.xls.15f02d15-2dd0-4cb7-b2e5-4f7d72fb497d', NULL, 1, 1, NULL, '833d96bc-797c-403f-aa2e-00e2b5a3cd71', 1520753942),
+(23, 'dict_upload_template.xls', '20180311/dict_upload_template.xls.f12350bc-31da-4875-a78e-0135f512fb4c', NULL, 1, 1, NULL, '0b2a66a3-8aa8-46b7-8bf0-ce9f68041cd8', 1520754112),
+(24, 'dict_upload_template.xls', '20180311/dict_upload_template.xls.5bf626e5-2152-45a5-a432-fc2e9fcb7903', NULL, 1, 1, NULL, '813725ab-2c07-4e48-a766-7ebbe3083212', 1520754198),
+(25, 'dict_upload_template.xls', '20180311/dict_upload_template.xls.3cd3eb95-aab9-4105-8d28-76a723274709', NULL, 1, 1, NULL, '4216455c-20d7-4912-bfc8-c8cca7e70e9f', 1520754238),
+(26, 'dict_upload_template.xls', '20180311/dict_upload_template.xls.d3dc557b-1e77-4955-a3be-7a8b4f86407c', NULL, 1, 1, NULL, 'e42dc975-edd5-4d16-8529-fa69b56a5eb5', 1520754303),
+(34, 'dict_upload_template.xls', '20180311/dict_upload_template.xls.d50f8245-ec3e-4de1-9742-0c5c12105f27', '175', 1, 1, NULL, '79b294da-8792-4bfd-9d84-e3f989b88cdf', 1520757036),
+(37, '副本 功能列表.xlsx', '20180311/副本 功能列表.xlsx.bc7554e3-2a30-4667-aa61-0e280340b2be', '175', 1, 1, 'User', '79b294da-8792-4bfd-9d84-e3f989b88cdf', 1520765622),
+(38, '副本 功能列表.xlsx', '20180311/副本 功能列表.xlsx.d991eb1f-24a9-4db1-87c1-7ef9d2b8a40a', '175', 1, 1, 'User', '79b294da-8792-4bfd-9d84-e3f989b88cdf', 1520777458);
+
+
+INSERT INTO starter.core_file_tag(ID, `KEY`, VALUE, FILE_ID) VALUES
+(1, 'customer', '12332', 1),
+(2, 'type', 'crdit', 2);
+
+
+INSERT INTO starter.core_function(ID, CODE, NAME, ACCESS_URL, PARENT_ID, TYPE, CREATE_TIME) VALUES
+(-999, 'virtual', '虚拟功能点', '/', 0, 'FN0', 0),
+(1, 'user', '用户功能', '/admin/user/index.do', 0, 'FN0', 0),
+(2, 'user.query', '用户列表', NULL, 1, 'FN1', 0),
+(3, 'user.edit', '用户编辑', NULL, 1, 'FN0', 0),
+(6, 'org', '组织机构', '/admin/org/index.do', 0, 'FN0', 0),
+(7, 'role', '角色管理', '/admin/role/index.do', 0, 'FN0', 0),
+(8, 'menu', '菜单管理', '/admin/menu/index.do', 0, 'FN0', 0),
+(9, 'function', '功能点管理', '/admin/function/index.do', 0, 'FN0', 0),
+(10, 'roleFunction', '角色功能授权', '/admin/role/function.do', 0, 'FN0', 0),
+(11, 'roleDataAccess', '角色数据授权', '/admin/role/data.do', 0, 'FN0', 0),
+(12, 'code', '代码生成', '/core/codeGen/index.do', 0, 'FN0', 0),
+(13, 'dict', '字典管理', '/admin/dict/index.do', 0, 'FN0', 0),
+(18, 'trace', '审计查询', '/admin/audit/index.do', 0, 'FN0', 0),
+(19, 'file', '相关文档', '/trade/interAndRelate/file.do', 0, 'FN0', 0),
+(91, 'test', '测试', '/test/test.do', 6, 'FN0', 1507712341),
+(161, 'role.add', '角色添加', NULL, 7, 'FN0', 1508723105),
+(167, 'workflow.admin', '工作流监控', '/admin/workflow/index.do', 0, 'FN0', 0),
+(180, 'code.query', '代码生成测试', NULL, 12, 'FN0', 0),
+(181, 'blog.query', '博客查询功能', NULL, 182, 'FN0', 0),
+(182, 'blog', '博客测试', '/admin/blog/index.do', 0, 'FN0', 0),
+(183, 'code.project', '项目生成', '/core/codeGen/project.do', 12, 'FN0', 1519868297);
+
+
+INSERT INTO starter.core_menu(ID, CODE, NAME, FUNCTION_ID, TYPE, PARENT_MENU_ID, SEQ, ICON, CREATE_TIME) VALUES
+(8, '系统管理', '系统管理', -999, 'MENU_S', 0, 1, NULL, NULL),
+(10, '用户管理', '用户管理', 1, 'MENU_M', 18, 1, NULL, NULL),
+(11, '组织机构管理', '组织机构管理', 6, 'MENU_M', 18, 2, NULL, NULL),
+(12, '角色管理', '角色管理', 7, 'MENU_M', 18, 3, NULL, NULL),
+(13, '菜单项', '菜单项', 8, 'MENU_M', 18, 4, NULL, NULL),
+(14, '功能点管理', '功能点管理', 9, 'MENU_M', 18, 5, NULL, NULL),
+(15, '字典数据管理', '字典数据管理', 13, 'MENU_M', 18, 6, NULL, NULL),
+(16, '审计查询', '审计查询', 18, 'MENU_M', 19, 7, NULL, NULL),
+(17, '代码生成', '代码生成', 12, 'MENU_M', 24, 8, NULL, NULL),
+(18, '基础管理', '基础管理', -999, 'MENU_N', 8, 1, NULL, NULL),
+(19, '监控管理', '监控管理', -999, 'MENU_N', 8, 2, NULL, NULL),
+(20, '流程监控', '流程监控', 167, 'MENU_M', 19, 3, NULL, NULL),
+(21, '角色功能授权', '角色功能授权', 10, 'MENU_M', 18, 8, NULL, NULL),
+(22, '角色数据授权', '角色数据授权', 11, 'MENU_M', 18, 9, NULL, NULL),
+(23, '博客测试', '博客测试1', 182, 'MENU_M', 19, 9, NULL, NULL),
+(24, '代码生成导航', '代码生成', -999, 'MENU_N', 8, 1, NULL, 1519868371),
+(25, '子系统生成', '子系统生成', 183, 'MENU_M', 24, 1, NULL, 1519868556);
+
+
+INSERT INTO starter.core_org(ID, CODE, NAME, PARENT_ORG_ID, TYPE, DEL_FLAG, CREATE_TIME) VALUES
+(1, '集团公司', '集团', NULL, 'ORGT0', 0, 1517563130),
+(3, '信息科技部门', '信息科技部门', 1, 'ORGT2', 0, NULL),
+(4, '贵州银行', '贵州银行', 1, 'ORGT1', 0, 1517563136),
+(5, '贵州银行金科', '贵州银行金融科技开发公司', 4, 'ORGT1', 0, NULL),
+(6, '金科研发', '金科研发', 5, 'ORGT2', 0, NULL),
+(7, '金科研发部门', '金科研发部门', 6, 'ORGT2', 0, 1517809793),
+(8, '金科研发2部', '金科研发2部', 6, 'ORGT2', 0, 1517809844);
+
 
--- 
--- Enable foreign keys
--- 
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+INSERT INTO starter.core_role(ID, CODE, NAME, TYPE, CREATE_TIME) VALUES
+(1, 'DEPT_MANAGER', '部门管理员', 'R0', NULL),
+(2, 'CEO', '公司CEO', 'R0', NULL),
+(3, 'ASSIST', '助理', 'R0', NULL),
\ No newline at end of file
+(12, '111', '2324324', 'R0', 1504642080),
+(13, '1111', '哈哈', 'R0', 1504642145),
+(15, 'admin', 'ivy', 'R0', 1504647304),
+(17, '123', '我', 'R0', 1504704183),
+(18, '23', '234', 'R0', 1504705263),
+(19, '132484', '1', 'R0', 1504705322),
+(173, 'dept.admin', '部门辅助管理员', 'R0', NULL);
+
+
+INSERT INTO starter.core_role_function(ID, ROLE_ID, FUNCTION_ID, DATA_ACCESS_TYPE, DATA_ACCESS_POLICY) VALUES
+(1, 1, 1, 5, NULL),
+(2, 1, 2, 4, NULL),
+(3, 1, 3, 5, NULL),
+(4, 2, 2, 2, NULL),
+(5, 3, 2, 5, NULL),
+(6, 3, 3, 5, NULL),
+(162, 1, 6, NULL, NULL),
+(164, 1, 91, NULL, NULL),
+(174, 173, 1, NULL, NULL),
+(176, 173, 2, 5, NULL),
+(177, 173, 3, NULL, NULL),
+(178, 173, 167, NULL, NULL),
+(192, 3, 1, NULL, NULL),
+(194, 3, 12, NULL, NULL),
+(196, 3, 180, 3, NULL),
+(197, NULL, 1, NULL, NULL),
+(198, NULL, 2, NULL, NULL),
+(199, NULL, 3, NULL, NULL),
+(200, NULL, 6, NULL, NULL),
+(201, NULL, 91, NULL, NULL),
+(202, NULL, 8, NULL, NULL),
+(205, 1, 182, NULL, NULL),
+(206, 1, 181, NULL, NULL);
+
+
+INSERT INTO starter.core_role_menu(ID, ROLE_ID, MENU_ID, CREATE_TIME) VALUES
+(1, 1, 10, NULL),
+(163, 1, 11, NULL),
+(175, 173, 10, NULL),
+(193, 3, 10, NULL),
+(195, 3, 17, NULL),
+(196, NULL, 10, NULL),
+(197, NULL, 11, NULL),
+(198, NULL, 13, NULL),
+(200, 1, 23, NULL);
+
+
+INSERT INTO starter.core_user(ID, CODE, NAME, PASSWORD, ORG_ID, STATE, JOB_TYPE1, DEL_FLAG, JOB_TYPE0, ATTACHMENT_ID, INTRODUCTION, AVATAR, UPDATE_TIME, CREATE_TIME) VALUES
+(1, 'admin', '超级管理员1', '123456', 1, 'S1', 'JT_S_01', 0, 'JT_01', NULL, NULL, NULL, 1505265663, 1505265663),
+(171, 'lixx', '李小小', NULL, 3, 'S1', 'JT_S_04', 0, 'JT_02', NULL, NULL, NULL, NULL, 1517109681),
+(172, 'lixx2', '李xx2', '123456', 4, 'S1', 'JT_S_02', 0, 'JT_01', NULL, NULL, NULL, NULL, 1517109759),
+(173, 'test1', 'test1', '123', 5, 'S1', 'JT_S_04', 0, 'JT_02', NULL, NULL, NULL, NULL, 1517121895),
+(174, 'hank250', '李小熊', NULL, 4, 'S1', 'JT_S_04', 0, 'JT_02', NULL, NULL, NULL, NULL, 1518752201),
+(175, 'test123', 'test12344', NULL, 3, 'S1', 'JT_S_04', 0, 'JT_02', '79b294da-8792-4bfd-9d84-e3f989b88cdf', NULL, NULL, NULL, 1520756362);
+
+
+INSERT INTO starter.core_user_role(ID, USER_ID, ROLE_ID, ORG_ID, CREATE_TIME) VALUES
+(1, 3, 1, 4, NULL),
+(2, 4, 2, 5, NULL),
+(3, 75, 3, 6, 1505988185),
+(35, 1, 1, 1, 1504631522),
+(36, 1, 3, 6, 1504639985),
+(38, 1, 1, 3, 1504640102),
+(41, 1, 1, 5, 1504641482),
+(42, 3, 3, 1, 1504641660),
+(47, 47, 3, 1, 1504706401),
+(49, 5, 3, 4, 1504706460),
+(52, 47, 2, 1, 1504717922),
+(53, 48, 3, 4, 1504718044),
+(55, 68, 2, 3, 1504791723),
+(125, 74, 1, 4, 1508204222),
+(144, 74, 3, NULL, 1508230500),
+(145, 67, 3, NULL, 1508230501),
+(146, 73, 3, NULL, 1508230502),
+(147, 22, 3, NULL, 1508230504),
+(148, 68, 3, NULL, 1508230560),
+(168, 72, 1, 3, 1508827204),
+(169, 41, 1, NULL, 1508893081),
+(171, 170, 1, 5, 1508893685),
+(172, 171, 1, 4, 1517535401);
\ No newline at end of file

plus-admin/pom.xml

@@ -42,11 +42,11 @@
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-undertow</artifactId>
     </dependency>
-    <dependency>
+<!--    <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-devtools</artifactId>
       <optional>true</optional>
-    </dependency>
+    </dependency>-->
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-test</artifactId>