路由部分完成

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

 package com.ibeetl.admin.core.conf;
 
 import cn.hutool.core.convert.Convert;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser.NumberType;
 import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.core.Version;
 import com.fasterxml.jackson.core.type.WritableTypeId;
-import com.fasterxml.jackson.databind.DeserializationConfig;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.SerializationConfig;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
 import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
+import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.ibeetl.admin.core.web.JsonResult;
 import java.io.IOException;
 import java.lang.reflect.Type;
 import java.text.SimpleDateFormat;
-
 import org.beetl.sql.core.engine.PageQuery;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.Version;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.module.SimpleModule;
-import com.ibeetl.admin.core.web.JsonResult;
-
+/**
+ * @author 一日看尽长安花
+ */
 @Configuration
 public class JasonConfig {
   @Bean
@@ -45,80 +41,79 @@ public class JasonConfig {
     objectMapper.configure(SerializationFeature.INDENT_OUTPUT, true);
 
     SimpleModule simpleModule = new SimpleModule("SimpleModule", Version.unknownVersion());
+
     simpleModule.addSerializer(JsonResult.class, new CustomJsonResultSerializer());
-    simpleModule.addSerializer(Long.class, CustomLongSerializer.instance);
-    simpleModule.addSerializer(Long.TYPE, CustomLongSerializer.instance);
-    objectMapper.registerModule(simpleModule);
 
+    CustomLongSerializer longSerializer = new CustomLongSerializer();
+    simpleModule.addSerializer(Long.class, longSerializer);
+    simpleModule.addSerializer(Long.TYPE, longSerializer);
+
+    objectMapper.registerModule(simpleModule);
     return objectMapper;
   }
+}
 
-  /**
-   * 修正jackson转换Long类型的一个bug：
-   * jackson的转换Long类型时，如果数值在Integer范围，会变成Integer类型，然后通过强制转换为Long时就会报错。
-   * 这里采用安全的Long转换避免强制类型转换
-   * */
-  static class CustomLongSerializer extends StdSerializer<Object> {
-
-    public static final CustomLongSerializer instance = new CustomLongSerializer();
+/**
+ * 修正jackson转换Long类型的一个bug： jackson的转换Long类型时，如果数值在Integer范围，会变成Integer类型，然后通过强制转换为Long时就会报错。
+ * 这里采用安全的Long转换避免强制类型转换
+ */
+class CustomLongSerializer extends StdSerializer<Object> {
 
-    private CustomLongSerializer() {
-      super(Object.class);
-    }
+  CustomLongSerializer() {
+    super(Object.class);
+  }
 
-    @Override
-    public void serialize(Object value, JsonGenerator gen, SerializerProvider provider)
-        throws IOException {
-      gen.writeNumber(Convert.toLong(value, 0L));
-    }
+  @Override
+  public void serialize(Object value, JsonGenerator gen, SerializerProvider provider)
+      throws IOException {
+    gen.writeNumber(Convert.toLong(value, null));
+  }
 
-    @Override
-    public void serializeWithType(
-        Object value, JsonGenerator g, SerializerProvider provider, TypeSerializer typeSer)
-        throws IOException {
-      WritableTypeId typeIdDef =
-          typeSer.writeTypePrefix(g, typeSer.typeId(value, JsonToken.VALUE_NUMBER_INT));
-      serialize(value, g, provider);
-      typeSer.writeTypeSuffix(g, typeIdDef);
-    }
+  @Override
+  public void serializeWithType(
+      Object value, JsonGenerator g, SerializerProvider provider, TypeSerializer typeSer)
+      throws IOException {
+    WritableTypeId typeIdDef =
+        typeSer.writeTypePrefix(g, typeSer.typeId(value, JsonToken.VALUE_NUMBER_INT));
+    serialize(value, g, provider);
+    typeSer.writeTypeSuffix(g, typeIdDef);
+  }
 
-    @Override
-    public JsonNode getSchema(SerializerProvider provider, Type typeHint) {
-      return createSchemaNode("long", true);
-    }
+  @Override
+  public JsonNode getSchema(SerializerProvider provider, Type typeHint) {
+    return createSchemaNode("long", true);
+  }
 
-    @Override
-    public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
-        throws JsonMappingException {
-      visitStringFormat(visitor, typeHint);
-      visitIntFormat(visitor, typeHint, NumberType.LONG );
-    }
+  @Override
+  public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
+      throws JsonMappingException {
+    visitIntFormat(visitor, typeHint, NumberType.LONG);
   }
+}
 
-  /**
-   * layui 前端要求后台返回的数据格式
-   *
-   * @author xiandafu
-   */
-  public static class CustomJsonResultSerializer extends JsonSerializer<JsonResult> {
-
-    public CustomJsonResultSerializer() {}
-
-    @Override
-    public void serialize(JsonResult value, JsonGenerator gen, SerializerProvider serializers)
-        throws IOException {
-      gen.writeStartObject();
-      gen.writeObjectField("code", Integer.parseInt(value.getCode()));
-      gen.writeStringField("message", value.getMessage());
-      Object data = value.getData();
-      if (data instanceof PageQuery) {
-        PageQuery query = (PageQuery) (data);
-        gen.writeNumberField("count", query.getTotalRow());
-        gen.writeObjectField("data", query.getList());
-      } else {
-        gen.writeObjectField("data", data);
-      }
-      gen.writeEndObject();
+/**
+ * layui 前端要求后台返回的数据格式
+ *
+ * @author xiandafu
+ */
+class CustomJsonResultSerializer extends JsonSerializer<JsonResult> {
+
+  CustomJsonResultSerializer() {}
+
+  @Override
+  public void serialize(JsonResult value, JsonGenerator gen, SerializerProvider serializers)
+      throws IOException {
+    gen.writeStartObject();
+    gen.writeObjectField("code", Integer.parseInt(value.getCode()));
+    gen.writeStringField("message", value.getMessage());
+    Object data = value.getData();
+    if (data instanceof PageQuery) {
+      PageQuery query = (PageQuery) (data);
+      gen.writeNumberField("count", query.getTotalRow());
+      gen.writeObjectField("data", query.getList());
+    } else {
+      gen.writeObjectField("data", data);
     }
+    gen.writeEndObject();
   }
 }

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/10/10 0:05:37
--- Server version: 8.0.17
+-- Script date 2019/10/10 18:13:50
+-- Server version: 8.0.13
 -- Client version: 4.1
 --
 
@@ -24,8 +24,8 @@ SET NAMES 'utf8';
 DROP DATABASE IF EXISTS starter;
 
 CREATE DATABASE IF NOT EXISTS starter
-	CHARACTER SET utf8
-	COLLATE utf8_general_ci;
+CHARACTER SET utf8
+COLLATE utf8_general_ci;
 
 --
 -- Set default database
@@ -36,11 +36,11 @@ 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,
+  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,
@@ -53,27 +53,27 @@ COMMENT = '用户角色关系表';
 --
 -- Create index `FK_core_user_role_core_role_ID` on table `core_user_role`
 --
-ALTER TABLE core_user_role 
-  ADD INDEX FK_core_user_role_core_role_ID(ROLE_ID);
+ALTER TABLE core_user_role
+ADD INDEX FK_core_user_role_core_role_ID (ROLE_ID);
 
 --
 -- 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,
+  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,
@@ -86,10 +86,10 @@ 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,
+  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,
@@ -101,24 +101,24 @@ COLLATE utf8_general_ci;
 --
 -- Create index `FK_core_role_menu_core_menu_ID` on table `core_role_menu`
 --
-ALTER TABLE core_role_menu 
-  ADD INDEX FK_core_role_menu_core_menu_ID(MENU_ID);
+ALTER TABLE core_role_menu
+ADD INDEX FK_core_role_menu_core_menu_ID (MENU_ID);
 
 --
 -- Create index `FK_core_role_menu_core_role_ID` on table `core_role_menu`
 --
-ALTER TABLE core_role_menu 
-  ADD INDEX FK_core_role_menu_core_role_ID(ROLE_ID);
+ALTER TABLE core_role_menu
+ADD INDEX FK_core_role_menu_core_role_ID (ROLE_ID);
 
 --
 -- 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,
+  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,
@@ -130,24 +130,24 @@ COLLATE utf8_general_ci;
 --
 -- Create index `FK_core_role_function_core_function_ID` on table `core_role_function`
 --
-ALTER TABLE core_role_function 
-  ADD INDEX FK_core_role_function_core_function_ID(FUNCTION_ID);
+ALTER TABLE core_role_function
+ADD INDEX FK_core_role_function_core_function_ID (FUNCTION_ID);
 
 --
 -- Create index `FK_core_role_function_core_role_ID` on table `core_role_function`
 --
-ALTER TABLE core_role_function 
-  ADD INDEX FK_core_role_function_core_role_ID(ROLE_ID);
+ALTER TABLE core_role_function
+ADD INDEX FK_core_role_function_core_role_ID (ROLE_ID);
 
 --
 -- Create table `core_role`
 --
 CREATE TABLE IF NOT EXISTS core_role (
-  ID INT(20) NOT NULL AUTO_INCREMENT,
-  CODE VARCHAR(32) DEFAULT NULL COMMENT '角色编码',
-  NAME VARCHAR(255) DEFAULT NULL COMMENT '角色名称',
-  TYPE VARCHAR(32) DEFAULT NULL COMMENT '1 可以配置 2 固定权限角色',
-  CREATE_TIME BIGINT(11) DEFAULT NULL,
+  ID int(20) NOT NULL AUTO_INCREMENT,
+  CODE varchar(32) DEFAULT NULL COMMENT '角色编码',
+  NAME varchar(255) DEFAULT NULL COMMENT '角色名称',
+  TYPE varchar(32) DEFAULT NULL COMMENT '1 可以配置 2 固定权限角色',
+  CREATE_TIME bigint(11) DEFAULT NULL,
   PRIMARY KEY (ID)
 )
 ENGINE = INNODB,
@@ -159,20 +159,20 @@ COLLATE utf8_general_ci;
 --
 -- Create index `code_idx` on table `core_role`
 --
-ALTER TABLE core_role 
-  ADD INDEX code_idx(CODE);
+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(16) NOT NULL COMMENT '1 公司，2 部门，3 小组',
-  DEL_FLAG TINYINT(6) DEFAULT NULL,
-  CREATE_TIME BIGINT(11) DEFAULT NULL,
+  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(16) NOT NULL COMMENT '1 公司，2 部门，3 小组',
+  DEL_FLAG tinyint(6) DEFAULT NULL,
+  CREATE_TIME bigint(11) DEFAULT NULL,
   PRIMARY KEY (ID)
 )
 ENGINE = INNODB,
@@ -185,15 +185,15 @@ COLLATE utf8_general_ci;
 -- Create table `core_menu`
 --
 CREATE TABLE IF NOT EXISTS core_menu (
-  ID INT(20) NOT NULL AUTO_INCREMENT,
-  CODE VARCHAR(32) DEFAULT NULL,
-  NAME VARCHAR(32) DEFAULT NULL,
-  FUNCTION_ID INT(20) DEFAULT NULL,
-  TYPE VARCHAR(16) DEFAULT NULL COMMENT '1,系统，2 导航 3 菜单项（对应某个功能点）',
-  PARENT_MENU_ID INT(20) DEFAULT NULL,
-  SEQ INT(20) DEFAULT NULL,
-  ICON VARCHAR(128) DEFAULT NULL COMMENT '图标',
-  CREATE_TIME BIGINT(32) DEFAULT NULL,
+  ID int(20) NOT NULL AUTO_INCREMENT,
+  CODE varchar(32) DEFAULT NULL,
+  NAME varchar(32) DEFAULT NULL,
+  FUNCTION_ID int(20) DEFAULT NULL,
+  TYPE varchar(16) DEFAULT NULL COMMENT '1,系统，2 导航 3 菜单项（对应某个功能点）',
+  PARENT_MENU_ID int(20) DEFAULT NULL,
+  SEQ int(20) DEFAULT NULL,
+  ICON varchar(128) DEFAULT NULL COMMENT '图标',
+  CREATE_TIME bigint(32) DEFAULT NULL,
   PRIMARY KEY (ID)
 )
 ENGINE = INNODB,
@@ -205,20 +205,20 @@ COLLATE utf8_general_ci;
 --
 -- Create index `FK_core_menu_core_function_ID` on table `core_menu`
 --
-ALTER TABLE core_menu 
-  ADD INDEX FK_core_menu_core_function_ID(FUNCTION_ID);
+ALTER TABLE core_menu
+ADD INDEX FK_core_menu_core_function_ID (FUNCTION_ID);
 
 --
 -- 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(32) DEFAULT NULL,
-  ACCESS_URL VARCHAR(250) DEFAULT NULL,
-  PARENT_ID INT(65) DEFAULT NULL,
-  TYPE VARCHAR(16) DEFAULT NULL,
-  CREATE_TIME BIGINT(11) DEFAULT NULL,
+  ID int(20) NOT NULL AUTO_INCREMENT,
+  CODE varchar(250) DEFAULT NULL,
+  NAME varchar(32) DEFAULT NULL,
+  ACCESS_URL varchar(250) DEFAULT NULL,
+  PARENT_ID int(65) DEFAULT NULL,
+  TYPE varchar(16) DEFAULT NULL,
+  CREATE_TIME bigint(11) DEFAULT NULL,
   PRIMARY KEY (ID)
 )
 ENGINE = INNODB,
@@ -231,10 +231,10 @@ 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',
+  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,
@@ -248,15 +248,15 @@ 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,
+  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,
@@ -270,16 +270,16 @@ 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(11) DEFAULT NULL COMMENT '排序',
-  PARENT INT(11) DEFAULT NULL COMMENT '父id',
-  DEL_FLAG INT(11) DEFAULT NULL COMMENT '删除标记',
-  REMARK VARCHAR(255) DEFAULT NULL COMMENT '备注',
-  CREATE_TIME BIGINT(11) DEFAULT NULL,
+  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(11) DEFAULT NULL COMMENT '排序',
+  PARENT int(11) DEFAULT NULL COMMENT '父id',
+  DEL_FLAG int(11) DEFAULT NULL COMMENT '删除标记',
+  REMARK varchar(255) DEFAULT NULL COMMENT '备注',
+  CREATE_TIME bigint(11) DEFAULT NULL,
   PRIMARY KEY (ID)
 )
 ENGINE = INNODB,
@@ -292,35 +292,35 @@ COMMENT = '字典表';
 --
 -- Create index `idx_code` on table `core_dict`
 --
-ALTER TABLE core_dict 
-  ADD INDEX idx_code(TYPE);
+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);
+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);
+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,
+  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,
@@ -333,12 +333,12 @@ 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,
+  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,
@@ -460,10 +460,10 @@ INSERT INTO core_org(ID, CODE, NAME, PARENT_ORG_ID, TYPE, DEL_FLAG, CREATE_TIME)
 --
 INSERT INTO core_menu(ID, CODE, NAME, FUNCTION_ID, TYPE, PARENT_MENU_ID, SEQ, ICON, CREATE_TIME) VALUES
 (1, '系统管理', '系统管理', 0, 'MENU_S', 0, 1, NULL, 0),
-(2, '基础管理', '基础管理', 0, 'MENU_N', 1, 1, 'menu', 0),
-(3, '监控管理', '监控管理', 0, 'MENU_N', 1, 2, 'menu', 0),
-(4, '代码生成导航', '代码生成', 0, 'MENU_N', 1, 1, 'menu', 1519868371),
-(5, '用户管理', '用户管理', 1, 'MENU_M', 2, 1, NULL, 0),
+(2, '基础管理', '基础管理', 87, 'MENU_N', 1, 1, 'component', 0),
+(3, '监控管理', '监控管理', 88, 'MENU_N', 1, 2, 'component', 0),
+(4, '代码生成导航', '代码生成', 89, 'MENU_N', 1, 1, 'component', 1519868371),
+(5, '用户管理', '用户管理', 1, 'MENU_M', 2, 1, '', 0),
 (6, '组织机构管理', '组织机构管理', 4, 'MENU_M', 2, 2, NULL, 0),
 (7, '角色管理', '角色管理', 5, 'MENU_M', 2, 3, NULL, 0),
 (8, '菜单项', '菜单项', 6, 'MENU_M', 2, 4, NULL, 0),
@@ -631,7 +631,10 @@ INSERT INTO core_function(ID, CODE, NAME, ACCESS_URL, PARENT_ID, TYPE, CREATE_TI
 (83, 'clipboard', 'Clipboard', '/clipboard', 0, 'FN2', 1519868556),
 (84, 'clipboard.index', 'ClipboardDemo', 'index', 83, 'FN2', 1519868556),
 (85, 'external-link', 'ExternalLink', 'external-link', 0, 'FN2', 1519868556),
-(86, 'external-link.link', 'Link', 'https://github.com/PanJiaChen/vue-element-admin', 86, 'FN2', 1519868556);
+(86, 'external-link.link', 'Link', 'https://github.com/PanJiaChen/vue-element-admin', 86, 'FN2', 1519868556),
+(87, 'admin', '基础管理', '/admin', 0, 'FN2', 1519868556),
+(88, 'monitor', '监控管理', '/monitor', 0, 'FN2', 1519868556),
+(89, 'code', '代码生成', '/code', 0, 'FN2', 1519868556);
 
 -- 
 -- Dumping data for table core_file_tag
@@ -754,4 +757,4 @@ INSERT INTO cms_blog(id, title, content, create_user_id, type, CREATE_TIME) VALU
 -- 
 -- Enable foreign keys
 -- 
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
\ No newline at end of file
+/*!40014 SET FOREIGN_KEY_CHECKS = @OLD_FOREIGN_KEY_CHECKS */;
\ No newline at end of file

ve-admin/admin-web/src/layout/components/Sidebar/Link.vue

-
 <template>
   <!-- eslint-disable vue/require-component-is -->
-  <component v-bind="linkProps(to)">
+  <component :is="linkProps(to)">
     <slot />
   </component>
 </template>
 
 <script>
-import { isExternal } from '@/utils/validate'
+import { isExternal } from '@/utils/validate';
 
 export default {
   props: {
     to: {
       type: String,
-      required: true
-    }
+      required: true,
+    },
   },
   methods: {
     linkProps(url) {
@@ -23,14 +22,14 @@ export default {
           is: 'a',
           href: url,
           target: '_blank',
-          rel: 'noopener'
-        }
+          rel: 'noopener',
+        };
       }
       return {
         is: 'router-link',
-        to: url
-      }
-    }
-  }
-}
+        to: url,
+      };
+    },
+  },
+};
 </script>

ve-admin/admin-web/src/router/maps/core.js

@@ -68,7 +68,7 @@ const coreRouter = [
     ],
   },
   {
-    path: '/core',
+    path: '/code',
     name: '代码生成导航',
     component: Layout,
     meta: {},
@@ -86,7 +86,7 @@ const coreRouter = [
     ],
   },
   {
-    path: '/moniter',
+    path: '/monitor',
     name: '监控管理',
     component: Layout,
     meta: {},