jeecg-boot 1.1 稳定版本发布

d8e70b7f · JEECG低代码平台 · 1511c46f · d8e70b7f · d8e70b7f · d8e70b7f
374 changed file
--- a/README.md
+++ b/README.md
 Jeecg-Boot 快速开发平台(前后端分离版本)
 ===============

-当前最新版本： 1.0（发布日期：20190304）
+当前最新版本： 1.1（发布日期：20190415）

 项目介绍：
 -----------------------------------
@@ -79,28 +79,85 @@ JeecgBoot的宗旨是降低前后端分离的开发成本，提高UI能力的同
 ├─系统管理
 │  ├─用户管理
 │  ├─角色管理
-│  ├─菜单管理（权限设置）
+│  ├─菜单管理
+│  ├─权限设置（支持按钮权限、数据权限）
 │  ├─部门管理
 │  └─字典管理
 ├─智能化功能
-│  ├─代码生成器功能（一键生成，包括前端页面也可以生成，绝对是后端开发福音）
+│  ├─代码生成器功能（一键生成前后端代码，生成后无需修改直接用，绝对是后端开发福音）
+│  ├─代码生成器模板（提供4套模板，分别支持单表和一对多模型，不同风格选择）
+│  ├─代码生成器模板（生成代码，自带excel导入导出）
+│  ├─查询过滤器（查询逻辑无需编码，系统根据页面配置自动生成）
+│  ├─高级查询器（弹窗自动组合查询条件）
+│  ├─Excel导入导出工具集成（支持单表，一对多 导入导出）
+│  ├─平台移动自适应支持
+├─Online在线开发
+│  ├─Online在线表单
+│  ├─Online在线图表
+│  ├─Online在线报表
+│  ├─消息中心（支持短信、邮件、微信推送等等）
 ├─系统监控
+│  ├─性能扫描监控
+│  │  ├─监控 Redis
+│  │  ├─Tomcat
+│  │  ├─jvm
+│  │  ├─服务器信息
+│  │  ├─请求追踪
 │  ├─定时任务
 │  ├─系统日志
+│  ├─数据日志（记录数据变更情况，可进行版本对比查看数据变更记录）
 │  ├─系统通知
 │  ├─SQL监控
 │  ├─swagger-ui(在线接口文档)
+│─报表示例
+│  ├─曲线图
+│  └─饼状图
+│  └─柱状图
+│  └─折线图
+│  └─面积图
+│  └─雷达图
+│  └─仪表图
+│  └─进度条
+│  └─排名列表
+│  └─等等
 │─常用示例
 │  ├─单表模型例子
 │  └─一对多模型例子
 │  └─打印例子
 │  └─一对多TAB例子
+│  └─内嵌table例子
+│  └─常用选择组件
+│  └─一对多JEditable
+│  └─接口模拟测试
+│  └─一对多JEditable
+│─封装通用组件	
+│  ├─行编辑表格JEditableTable
+│  └─省略显示组件
+│  └─时间控件
+│  └─高级查询
+│  └─通用选择用户组件
+│  └─通过组织机构选择用户组件
+│  └─报表组件封装
+│  └─等等组件
 │─更多页面模板
 │  ├─各种高级表单
 │  ├─各种列表效果
 │  └─结果页面
 │  └─异常页面
 │  └─个人页面
+│─流程模块功能
+│  ├─在线流程设计
+│  ├─在线表单设计
+│  └─我的任务
+│  └─历史流程
+│  └─历史流程
+│  └─流程实例管理
+│  └─流程监听管理
+│  └─流程表达式
+│  └─我发起的流程
+│  └─我的抄送
+│  └─流程委派、抄送、跳转
+│  └─。。。
 └─其他模块
   └─其他
   
@@ -110,19 +167,31 @@ JeecgBoot的宗旨是降低前后端分离的开发成本，提高UI能力的同

 系统效果
 ----
-![输入图片说明](https://static.oschina.net/uploads/img/201902/25154007_icdX.png "在这里输入图片标题")
-![输入图片说明](https://static.oschina.net/uploads/img/201902/25153956_Q752.png "在这里输入图片标题")
-![输入图片说明](https://static.oschina.net/uploads/img/201901/07154149_555Q.png "在这里输入图片标题")
-![输入图片说明](https://static.oschina.net/uploads/img/201902/25154209_qlCg.png "在这里输入图片标题")
-![输入图片说明](https://static.oschina.net/uploads/img/201902/25154251_XoW9.png "在这里输入图片标题")
-![输入图片说明](https://static.oschina.net/uploads/img/201902/25154331_0ndT.png "在这里输入图片标题")
-![输入图片说明](https://static.oschina.net/uploads/img/201902/25154414_ckFS.png "在这里输入图片标题")
-![输入图片说明](https://static.oschina.net/uploads/img/201902/25155155_Hm6H.png "在这里输入图片标题")
-![输入图片说明](https://static.oschina.net/uploads/img/201902/25155213_T04n.png "在这里输入图片标题")
-![输入图片说明](https://static.oschina.net/uploads/img/201902/25155224_MRLU.png "在这里输入图片标题")
-![输入图片说明](https://static.oschina.net/uploads/img/201902/25155234_7zCP.png "在这里输入图片标题")
-![输入图片说明](https://static.oschina.net/uploads/img/201902/25155242_K7Sw.png "在这里输入图片标题")

+![输入图片说明](https://static.oschina.net/uploads/img/201902/25154007_icdX.png "在这里输入图片标题")
+![输入图片说明](https://static.oschina.net/uploads/img/201904/14155402_AmlV.png "在这里输入图片标题")
+![输入图片说明](https://static.oschina.net/uploads/img/201904/14160623_8fwk.png "在这里输入图片标题")
+![输入图片说明](https://static.oschina.net/uploads/img/201904/14160633_u59G.png "在这里输入图片标题")
+![输入图片说明](https://static.oschina.net/uploads/img/201904/14160643_kCJ7.png "在这里输入图片标题")
+![输入图片说明](https://static.oschina.net/uploads/img/201904/14160650_fcgw.png "在这里输入图片标题")
+![输入图片说明](https://static.oschina.net/uploads/img/201904/14160657_cHwb.png "在这里输入图片标题")
+![输入图片说明](https://static.oschina.net/uploads/img/201904/14160705_NAJn.png "在这里输入图片标题")
+![输入图片说明](https://static.oschina.net/uploads/img/201904/14160751_bsO9.png "在这里输入图片标题")
+![输入图片说明](https://static.oschina.net/uploads/img/201904/14160801_2AhS.png "在这里输入图片标题")
+![输入图片说明](https://static.oschina.net/uploads/img/201904/14160813_KmXS.png "在这里输入图片标题")
+![输入图片说明](https://static.oschina.net/uploads/img/201904/14160828_pkFr.png "在这里输入图片标题")
+![输入图片说明](https://static.oschina.net/uploads/img/201904/14160834_Lo23.png "在这里输入图片标题")
+![输入图片说明](https://static.oschina.net/uploads/img/201904/14160842_QK7B.png "在这里输入图片标题")
+![输入图片说明](https://static.oschina.net/uploads/img/201904/14160849_GBm5.png "在这里输入图片标题")
+![输入图片说明](https://static.oschina.net/uploads/img/201904/14160858_6RAM.png "在这里输入图片标题")
+![输入图片说明](https://static.oschina.net/uploads/img/201904/14160905_RGJ5.png "在这里输入图片标题")
+![输入图片说明](https://static.oschina.net/uploads/img/201904/14160917_9Ftz.png "在这里输入图片标题")
+![输入图片说明](https://static.oschina.net/uploads/img/201904/14160926_PUDV.png "在这里输入图片标题")
+![输入图片说明](https://static.oschina.net/uploads/img/201904/14160935_Nibs.png "在这里输入图片标题")
+![输入图片说明](https://static.oschina.net/uploads/img/201904/14160947_gfoN.png "在这里输入图片标题")
+![输入图片说明](https://static.oschina.net/uploads/img/201904/14160957_hN3X.png "在这里输入图片标题")
+![输入图片说明](https://static.oschina.net/uploads/img/201904/14161004_bxQ4.png "在这里输入图片标题")
+![输入图片说明](https://static.oschina.net/uploads/img/201904/14161013_zW5n.png "在这里输入图片标题")



@@ -134,7 +203,7 @@ JeecgBoot的宗旨是降低前后端分离的开发成本，提高UI能力的同
 - jdk8
 - mysql
 - redis
- 数据库脚步：jeecg-boot\docs\dbsys-init-20190225.sql
+- 数据库脚步：jeecg-boot\docs\jeecg-boot_1.1.0-20190415.sql
 - 默认登录账号： admin/123456



--- a/ant-design-jeecg-vue/README.md
+++ b/ant-design-jeecg-vue/README.md
-Jeecg-Boot 快速开发平台(前后端分离版本)
-===============
+Ant Design Jeecg Vue
+====

-当前最新版本： 1.0（发布日期：20190225）
+当前最新版本： 1.1（发布日期：20190415）

-项目介绍：
-----------------------------------
-Jeecg-boot 一个全新的版本，采用前后端分离方案，提供强大代码生成器的快速开发平台。
+Overview
+----
+
+基于 [Ant Design of Vue](https://vuecomponent.github.io/ant-design-vue/docs/vue/introduce-cn/) 实现的 Ant Design Pro  Vue 版
+Jeecg-boot 的前段UI框架，采用前后端分离方案，提供强大代码生成器的快速开发平台。
 前端页面代码和后端功能代码一键生成，不需要写任何代码，保持jeecg一贯的强大！！



--- a/ant-design-jeecg-vue/package.json
+++ b/ant-design-jeecg-vue/package.json
 {
-  "name": "vue-antd-pro",
-  "version": "1.1.0",
+  "name": "vue-antd-jeecg",
+  "version": "1.0.2",
  "private": true,
  "scripts": {
    "serve": "vue-cli-service serve --open",
@@ -11,7 +11,9 @@
  },
  "dependencies": {
    "@antv/data-set": "^0.10.1",
+    "@tinymce/tinymce-vue": "^2.0.0",
    "ant-design-vue": "^1.3.1",
+    "apexcharts": "^3.6.5",
    "axios": "^0.18.0",
    "dayjs": "^1.8.0",
    "enquire.js": "^2.1.6",
@@ -20,13 +22,15 @@
    "lodash.pick": "^4.4.0",
    "md5": "^2.2.1",
    "nprogress": "^0.2.0",
+    "tinymce": "^5.0.2",
    "viser-vue": "^2.4.4",
    "vue": "^2.5.22",
+    "vue-apexcharts": "^1.3.2",
    "vue-class-component": "^6.0.0",
    "vue-cropper": "^0.4.8",
    "vue-i18n": "^8.7.0",
    "vue-ls": "^3.2.0",
-    "vue-print-nb": "^1.0.3",
+    "vue-print-nb-jeecg": "^1.0.5",
    "vue-property-decorator": "^7.3.0",
    "vue-router": "^3.0.1",
    "vuex": "^3.0.1",

--- a/ant-design-jeecg-vue/public/color.less
+++ b/ant-design-jeecg-vue/public/color.less
@@ -2175,9 +2175,8 @@ this.tinycolor = tinycolor;
 .globalFooter .copyright {
  color: rgba(0, 0, 0, 0.45);
 }
-.header {
-  background: #fff;
-  box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
+.layout .header {
+  background-color: @primary-color !important;
 }
 i.trigger:hover {
  background: rgba(0, 0, 0, 0.025);
@@ -2342,24 +2341,22 @@ i.trigger:hover {
  border-radius: 2px;
  color: #fff;
 }
-.logo {
-}
 .logo h1 {
  color: white;
 }
 .sider {
-  box-shadow: 2px 0 6px rgba(0, 21, 41, 0.35);
+  box-shadow: 2px 116px 6px rgba(0, 21, 41, 0.35);
 }
 .sider.light {
-  box-shadow: 2px 0 8px 0 rgba(29, 35, 41, 0.05);
+  box-shadow: 2px 116px 8px 0 rgba(29, 35, 41, 0.05);
  background-color: white;
 }
 .sider.light .logo {
-  background: white;
+  background-color: @primary-color !important;
  box-shadow: 1px 1px 0 0 #e8e8e8;
 }
 .sider.light .logo h1 {
-  color: @primary-color;
+  color: white;
 }
 .sider.light :global(.ant-menu-light) {
  border-right-color: transparent;
@@ -6808,7 +6805,7 @@ tr.ant-table-expanded-row:hover {
 }
 .ant-tabs.ant-tabs-card > .ant-tabs-bar .ant-tabs-tab-active {
  background: #fff;
-  border-color: #e8e8e8;
+  border-color: @primary-color !important;
  color: @primary-color;
 }
 .ant-tabs.ant-tabs-card > .ant-tabs-bar .ant-tabs-tab .ant-tabs-close-x {

--- a/ant-design-jeecg-vue/public/goright.png
+++ b/ant-design-jeecg-vue/public/goright.png
--- a/ant-design-jeecg-vue/public/index.html
+++ b/ant-design-jeecg-vue/public/index.html
@@ -5,7 +5,7 @@
  <meta charset="utf-8">
  <meta http-equiv="X-UA-Compatible" content="IE=edge">
  <meta name="viewport" content="width=device-width,initial-scale=1.0">
-  <title>Jeecg-Boot 快速开发平台（Ant Design Vue）</title>
+  <title>Jeecg-Boot 快速开发平台</title>
  <link rel="icon" href="<%= BASE_URL %>logo.png">
  <script src="https://cdnjs.cloudflare.com/ajax/libs/babel-polyfill/7.2.5/polyfill.js"></script>
  <style>
@@ -219,6 +219,12 @@
      opacity: 0.5;
    }
  </style>
+  <!-- 全局配置 -->
+  <script>
+    window._CONFIG = {};
+    window._CONFIG['domianURL'] = 'http://localhost:8080/jeecg-boot';
+    window._CONFIG['imgDomainURL'] = 'http://localhost:8080/jeecg-boot/sys/common/view';
+  </script>
 </head>

 <body>
@@ -228,7 +234,7 @@
    <div id="loader"></div>
    <div class="loader-section section-left"></div>
    <div class="loader-section section-right"></div>
-    <div class="load_title">正在加载 Jeecg-Boot 快速开发平台（Ant Design Vue）,请耐心等待
+    <div class="load_title">正在加载 Jeecg-Boot 快速开发平台,请耐心等待

    </div>
  </div>

--- a/ant-design-jeecg-vue/public/logo.png
+++ b/ant-design-jeecg-vue/public/logo.png
--- a/ant-design-jeecg-vue/public/tinymce/langs/zh_CN.js
+++ b/ant-design-jeecg-vue/public/tinymce/langs/zh_CN.js
+tinymce.addI18n('zh_CN',{
+"Redo": "\u91cd\u590d",
+"Undo": "\u64a4\u6d88",
+"Cut": "\u526a\u5207",
+"Copy": "\u590d\u5236",
+"Paste": "\u7c98\u8d34",
+"Select all": "\u5168\u9009",
+"New document": "\u65b0\u6587\u6863",
+"Ok": "\u786e\u5b9a",
+"Cancel": "\u53d6\u6d88",
+"Visual aids": "\u7f51\u683c\u7ebf",
+"Bold": "\u7c97\u4f53",
+"Italic": "\u659c\u4f53",
+"Underline": "\u4e0b\u5212\u7ebf",
+"Strikethrough": "\u5220\u9664\u7ebf",
+"Superscript": "\u4e0a\u6807",
+"Subscript": "\u4e0b\u6807",
+"Clear formatting": "\u6e05\u9664\u683c\u5f0f",
+"Align left": "\u5de6\u5bf9\u9f50",
+"Align center": "\u5c45\u4e2d",
+"Align right": "\u53f3\u5bf9\u9f50",
+"Justify": "\u4e24\u7aef\u5bf9\u9f50",
+"Bullet list": "\u9879\u76ee\u7b26\u53f7",
+"Numbered list": "\u7f16\u53f7\u5217\u8868",
+"Decrease indent": "\u51cf\u5c11\u7f29\u8fdb",
+"Increase indent": "\u589e\u52a0\u7f29\u8fdb",
+"Close": "\u5173\u95ed",
+"Formats": "\u683c\u5f0f",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u4f60\u7684\u6d4f\u89c8\u5668\u4e0d\u652f\u6301\u5bf9\u526a\u8d34\u677f\u7684\u8bbf\u95ee\uff0c\u8bf7\u4f7f\u7528Ctrl+X\/C\/V\u952e\u8fdb\u884c\u590d\u5236\u7c98\u8d34\u3002",
+"Headers": "\u6807\u9898",
+"Header 1": "\u6807\u98981",
+"Header 2": "\u6807\u98982",
+"Header 3": "\u6807\u98983",
+"Header 4": "\u6807\u98984",
+"Header 5": "\u6807\u98985",
+"Header 6": "\u6807\u98986",
+"Headings": "\u6807\u9898",
+"Heading 1": "\u6807\u98981",
+"Heading 2": "\u6807\u98982",
+"Heading 3": "\u6807\u98983",
+"Heading 4": "\u6807\u98984",
+"Heading 5": "\u6807\u98985",
+"Heading 6": "\u6807\u98986",
+"Preformatted": "\u9884\u683c\u5f0f\u5316",
+"Div": "Div\u533a\u5757",
+"Pre": "\u9884\u683c\u5f0f\u6587\u672c",
+"Code": "\u4ee3\u7801",
+"Paragraph": "\u6bb5\u843d",
+"Blockquote": "\u5f15\u7528",
+"Inline": "\u6587\u672c",
+"Blocks": "\u533a\u5757",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u5f53\u524d\u4e3a\u7eaf\u6587\u672c\u7c98\u8d34\u6a21\u5f0f\uff0c\u518d\u6b21\u70b9\u51fb\u53ef\u4ee5\u56de\u5230\u666e\u901a\u7c98\u8d34\u6a21\u5f0f\u3002",
+"Font Family": "\u5b57\u4f53",
+"Font Sizes": "\u5b57\u53f7",
+"Class": "Class",
+"Browse for an image": "\u6d4f\u89c8\u56fe\u50cf",
+"OR": "\u6216",
+"Drop an image here": "\u62d6\u653e\u4e00\u5f20\u56fe\u50cf\u81f3\u6b64",
+"Upload": "\u4e0a\u4f20",
+"Block": "\u5757",
+"Align": "\u5bf9\u9f50",
+"Default": "\u9ed8\u8ba4",
+"Circle": "\u7a7a\u5fc3\u5706",
+"Disc": "\u5b9e\u5fc3\u5706",
+"Square": "\u65b9\u5757",
+"Lower Alpha": "\u5c0f\u5199\u82f1\u6587\u5b57\u6bcd",
+"Lower Greek": "\u5c0f\u5199\u5e0c\u814a\u5b57\u6bcd",
+"Lower Roman": "\u5c0f\u5199\u7f57\u9a6c\u5b57\u6bcd",
+"Upper Alpha": "\u5927\u5199\u82f1\u6587\u5b57\u6bcd",
+"Upper Roman": "\u5927\u5199\u7f57\u9a6c\u5b57\u6bcd",
+"Anchor": "\u951a\u70b9",
+"Name": "\u540d\u79f0",
+"Id": "\u6807\u8bc6\u7b26",
+"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "\u6807\u8bc6\u7b26\u5e94\u8be5\u4ee5\u5b57\u6bcd\u5f00\u5934\uff0c\u540e\u8ddf\u5b57\u6bcd\u3001\u6570\u5b57\u3001\u7834\u6298\u53f7\u3001\u70b9\u3001\u5192\u53f7\u6216\u4e0b\u5212\u7ebf\u3002",
+"You have unsaved changes are you sure you want to navigate away?": "\u4f60\u8fd8\u6709\u6587\u6863\u5c1a\u672a\u4fdd\u5b58\uff0c\u786e\u5b9a\u8981\u79bb\u5f00\uff1f",
+"Restore last draft": "\u6062\u590d\u4e0a\u6b21\u7684\u8349\u7a3f",
+"Special character": "\u7279\u6b8a\u7b26\u53f7",
+"Source code": "\u6e90\u4ee3\u7801",
+"Insert\/Edit code sample": "\u63d2\u5165\/\u7f16\u8f91\u4ee3\u7801\u793a\u4f8b",
+"Language": "\u8bed\u8a00",
+"Code sample": "\u4ee3\u7801\u793a\u4f8b",
+"Color": "\u989c\u8272",
+"R": "R",
+"G": "G",
+"B": "B",
+"Left to right": "\u4ece\u5de6\u5230\u53f3",
+"Right to left": "\u4ece\u53f3\u5230\u5de6",
+"Emoticons": "\u8868\u60c5",
+"Document properties": "\u6587\u6863\u5c5e\u6027",
+"Title": "\u6807\u9898",
+"Keywords": "\u5173\u952e\u8bcd",
+"Description": "\u63cf\u8ff0",
+"Robots": "\u673a\u5668\u4eba",
+"Author": "\u4f5c\u8005",
+"Encoding": "\u7f16\u7801",
+"Fullscreen": "\u5168\u5c4f",
+"Action": "\u64cd\u4f5c",
+"Shortcut": "\u5feb\u6377\u952e",
+"Help": "\u5e2e\u52a9",
+"Address": "\u5730\u5740",
+"Focus to menubar": "\u79fb\u52a8\u7126\u70b9\u5230\u83dc\u5355\u680f",
+"Focus to toolbar": "\u79fb\u52a8\u7126\u70b9\u5230\u5de5\u5177\u680f",
+"Focus to element path": "\u79fb\u52a8\u7126\u70b9\u5230\u5143\u7d20\u8def\u5f84",
+"Focus to contextual toolbar": "\u79fb\u52a8\u7126\u70b9\u5230\u4e0a\u4e0b\u6587\u83dc\u5355",
+"Insert link (if link plugin activated)": "\u63d2\u5165\u94fe\u63a5 (\u5982\u679c\u94fe\u63a5\u63d2\u4ef6\u5df2\u6fc0\u6d3b)",
+"Save (if save plugin activated)": "\u4fdd\u5b58(\u5982\u679c\u4fdd\u5b58\u63d2\u4ef6\u5df2\u6fc0\u6d3b)",
+"Find (if searchreplace plugin activated)": "\u67e5\u627e(\u5982\u679c\u67e5\u627e\u66ff\u6362\u63d2\u4ef6\u5df2\u6fc0\u6d3b)",
+"Plugins installed ({0}):": "\u5df2\u5b89\u88c5\u63d2\u4ef6 ({0}):",
+"Premium plugins:": "\u4f18\u79c0\u63d2\u4ef6\uff1a",
+"Learn more...": "\u4e86\u89e3\u66f4\u591a...",
+"You are using {0}": "\u4f60\u6b63\u5728\u4f7f\u7528 {0}",
+"Plugins": "\u63d2\u4ef6",
+"Handy Shortcuts": "\u5feb\u6377\u952e",
+"Horizontal line": "\u6c34\u5e73\u5206\u5272\u7ebf",
+"Insert\/edit image": "\u63d2\u5165\/\u7f16\u8f91\u56fe\u7247",
+"Image description": "\u56fe\u7247\u63cf\u8ff0",
+"Source": "\u5730\u5740",
+"Dimensions": "\u5927\u5c0f",
+"Constrain proportions": "\u4fdd\u6301\u7eb5\u6a2a\u6bd4",
+"General": "\u666e\u901a",
+"Advanced": "\u9ad8\u7ea7",
+"Style": "\u6837\u5f0f",
+"Vertical space": "\u5782\u76f4\u8fb9\u8ddd",
+"Horizontal space": "\u6c34\u5e73\u8fb9\u8ddd",
+"Border": "\u8fb9\u6846",
+"Insert image": "\u63d2\u5165\u56fe\u7247",
+"Image": "\u56fe\u7247",
+"Image list": "\u56fe\u7247\u5217\u8868",
+"Rotate counterclockwise": "\u9006\u65f6\u9488\u65cb\u8f6c",
+"Rotate clockwise": "\u987a\u65f6\u9488\u65cb\u8f6c",
+"Flip vertically": "\u5782\u76f4\u7ffb\u8f6c",
+"Flip horizontally": "\u6c34\u5e73\u7ffb\u8f6c",
+"Edit image": "\u7f16\u8f91\u56fe\u7247",
+"Image options": "\u56fe\u7247\u9009\u9879",
+"Zoom in": "\u653e\u5927",
+"Zoom out": "\u7f29\u5c0f",
+"Crop": "\u88c1\u526a",
+"Resize": "\u8c03\u6574\u5927\u5c0f",
+"Orientation": "\u65b9\u5411",
+"Brightness": "\u4eae\u5ea6",
+"Sharpen": "\u9510\u5316",
+"Contrast": "\u5bf9\u6bd4\u5ea6",
+"Color levels": "\u989c\u8272\u5c42\u6b21",
+"Gamma": "\u4f3d\u9a6c\u503c",
+"Invert": "\u53cd\u8f6c",
+"Apply": "\u5e94\u7528",
+"Back": "\u540e\u9000",
+"Insert date\/time": "\u63d2\u5165\u65e5\u671f\/\u65f6\u95f4",
+"Date\/time": "\u65e5\u671f\/\u65f6\u95f4",
+"Insert link": "\u63d2\u5165\u94fe\u63a5",
+"Insert\/edit link": "\u63d2\u5165\/\u7f16\u8f91\u94fe\u63a5",
+"Text to display": "\u663e\u793a\u6587\u5b57",
+"Url": "\u5730\u5740",
+"Target": "\u6253\u5f00\u65b9\u5f0f",
+"None": "\u65e0",
+"New window": "\u5728\u65b0\u7a97\u53e3\u6253\u5f00",
+"Remove link": "\u5220\u9664\u94fe\u63a5",
+"Anchors": "\u951a\u70b9",
+"Link": "\u94fe\u63a5",
+"Paste or type a link": "\u7c98\u8d34\u6216\u8f93\u5165\u94fe\u63a5",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u4f60\u6240\u586b\u5199\u7684URL\u5730\u5740\u4e3a\u90ae\u4ef6\u5730\u5740\uff0c\u9700\u8981\u52a0\u4e0amailto:\u524d\u7f00\u5417\uff1f",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u4f60\u6240\u586b\u5199\u7684URL\u5730\u5740\u5c5e\u4e8e\u5916\u90e8\u94fe\u63a5\uff0c\u9700\u8981\u52a0\u4e0ahttp:\/\/:\u524d\u7f00\u5417\uff1f",
+"Link list": "\u94fe\u63a5\u5217\u8868",
+"Insert video": "\u63d2\u5165\u89c6\u9891",
+"Insert\/edit video": "\u63d2\u5165\/\u7f16\u8f91\u89c6\u9891",
+"Insert\/edit media": "\u63d2\u5165\/\u7f16\u8f91\u5a92\u4f53",
+"Alternative source": "\u955c\u50cf",
+"Poster": "\u5c01\u9762",
+"Paste your embed code below:": "\u5c06\u5185\u5d4c\u4ee3\u7801\u7c98\u8d34\u5728\u4e0b\u9762:",
+"Embed": "\u5185\u5d4c",
+"Media": "\u5a92\u4f53",
+"Nonbreaking space": "\u4e0d\u95f4\u65ad\u7a7a\u683c",
+"Page break": "\u5206\u9875\u7b26",
+"Paste as text": "\u7c98\u8d34\u4e3a\u6587\u672c",
+"Preview": "\u9884\u89c8",
+"Print": "\u6253\u5370",
+"Save": "\u4fdd\u5b58",
+"Find": "\u67e5\u627e",
+"Replace with": "\u66ff\u6362\u4e3a",
+"Replace": "\u66ff\u6362",
+"Replace all": "\u5168\u90e8\u66ff\u6362",
+"Prev": "\u4e0a\u4e00\u4e2a",
+"Next": "\u4e0b\u4e00\u4e2a",
+"Find and replace": "\u67e5\u627e\u548c\u66ff\u6362",
+"Could not find the specified string.": "\u672a\u627e\u5230\u641c\u7d22\u5185\u5bb9.",
+"Match case": "\u533a\u5206\u5927\u5c0f\u5199",
+"Whole words": "\u5168\u5b57\u5339\u914d",
+"Spellcheck": "\u62fc\u5199\u68c0\u67e5",
+"Ignore": "\u5ffd\u7565",
+"Ignore all": "\u5168\u90e8\u5ffd\u7565",
+"Finish": "\u5b8c\u6210",
+"Add to Dictionary": "\u6dfb\u52a0\u5230\u5b57\u5178",
+"Insert table": "\u63d2\u5165\u8868\u683c",
+"Table properties": "\u8868\u683c\u5c5e\u6027",
+"Delete table": "\u5220\u9664\u8868\u683c",
+"Cell": "\u5355\u5143\u683c",
+"Row": "\u884c",
+"Column": "\u5217",
+"Cell properties": "\u5355\u5143\u683c\u5c5e\u6027",
+"Merge cells": "\u5408\u5e76\u5355\u5143\u683c",
+"Split cell": "\u62c6\u5206\u5355\u5143\u683c",
+"Insert row before": "\u5728\u4e0a\u65b9\u63d2\u5165",
+"Insert row after": "\u5728\u4e0b\u65b9\u63d2\u5165",
+"Delete row": "\u5220\u9664\u884c",
+"Row properties": "\u884c\u5c5e\u6027",
+"Cut row": "\u526a\u5207\u884c",
+"Copy row": "\u590d\u5236\u884c",
+"Paste row before": "\u7c98\u8d34\u5230\u4e0a\u65b9",
+"Paste row after": "\u7c98\u8d34\u5230\u4e0b\u65b9",
+"Insert column before": "\u5728\u5de6\u4fa7\u63d2\u5165",
+"Insert column after": "\u5728\u53f3\u4fa7\u63d2\u5165",
+"Delete column": "\u5220\u9664\u5217",
+"Cols": "\u5217",
+"Rows": "\u884c",
+"Width": "\u5bbd",
+"Height": "\u9ad8",
+"Cell spacing": "\u5355\u5143\u683c\u5916\u95f4\u8ddd",
+"Cell padding": "\u5355\u5143\u683c\u5185\u8fb9\u8ddd",
+"Caption": "\u6807\u9898",
+"Left": "\u5de6\u5bf9\u9f50",
+"Center": "\u5c45\u4e2d",
+"Right": "\u53f3\u5bf9\u9f50",
+"Cell type": "\u5355\u5143\u683c\u7c7b\u578b",
+"Scope": "\u8303\u56f4",
+"Alignment": "\u5bf9\u9f50\u65b9\u5f0f",
+"H Align": "\u6c34\u5e73\u5bf9\u9f50",
+"V Align": "\u5782\u76f4\u5bf9\u9f50",
+"Top": "\u9876\u90e8\u5bf9\u9f50",
+"Middle": "\u5782\u76f4\u5c45\u4e2d",
+"Bottom": "\u5e95\u90e8\u5bf9\u9f50",
+"Header cell": "\u8868\u5934\u5355\u5143\u683c",
+"Row group": "\u884c\u7ec4",
+"Column group": "\u5217\u7ec4",
+"Row type": "\u884c\u7c7b\u578b",
+"Header": "\u8868\u5934",
+"Body": "\u8868\u4f53",
+"Footer": "\u8868\u5c3e",
+"Border color": "\u8fb9\u6846\u989c\u8272",
+"Insert template": "\u63d2\u5165\u6a21\u677f",
+"Templates": "\u6a21\u677f",
+"Template": "\u6a21\u677f",
+"Text color": "\u6587\u5b57\u989c\u8272",
+"Background color": "\u80cc\u666f\u8272",
+"Custom...": "\u81ea\u5b9a\u4e49...",
+"Custom color": "\u81ea\u5b9a\u4e49\u989c\u8272",
+"No color": "\u65e0",
+"Table of Contents": "\u5185\u5bb9\u5217\u8868",
+"Show blocks": "\u663e\u793a\u533a\u5757\u8fb9\u6846",
+"Show invisible characters": "\u663e\u793a\u4e0d\u53ef\u89c1\u5b57\u7b26",
+"Words: {0}": "\u5b57\u6570\uff1a{0}",
+"{0} words": "{0} \u5b57",
+"File": "\u6587\u4ef6",
+"Edit": "\u7f16\u8f91",
+"Insert": "\u63d2\u5165",
+"View": "\u89c6\u56fe",
+"Format": "\u683c\u5f0f",
+"Table": "\u8868\u683c",
+"Tools": "\u5de5\u5177",
+"Powered by {0}": "\u7531{0}\u9a71\u52a8",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u5728\u7f16\u8f91\u533a\u6309ALT-F9\u6253\u5f00\u83dc\u5355\uff0c\u6309ALT-F10\u6253\u5f00\u5de5\u5177\u680f\uff0c\u6309ALT-0\u67e5\u770b\u5e2e\u52a9"
+});
\ No newline at end of file
--- a/ant-design-jeecg-vue/public/tinymce/skins/lightgray/content.min.css
+++ b/ant-design-jeecg-vue/public/tinymce/skins/lightgray/content.min.css
+/**
+ * Copyright (c) Tiny Technologies, Inc. All rights reserved.
+ * Licensed under the LGPL or a commercial license.
+ * For LGPL see License.txt in the project root for license information.
+ * For commercial licenses see https://www.tiny.cloud/
+ */
+.mce-content-body .mce-item-anchor {
+  background: transparent url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'8'%20height%3D'12'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20d%3D'M0%200L8%200%208%2012%204.09117821%209%200%2012z'%2F%3E%3C%2Fsvg%3E%0A") no-repeat center;
+  cursor: default;
+  display: inline-block;
+  height: 12px !important;
+  padding: 0 2px;
+  -webkit-user-modify: read-only;
+  -moz-user-modify: read-only;
+  -webkit-user-select: all;
+  -moz-user-select: all;
+  -ms-user-select: all;
+      user-select: all;
+  width: 8px !important;
+}
+.mce-content-body .mce-item-anchor[data-mce-selected] {
+  outline-offset: 1px;
+}
+.tox-comments-visible .tox-comment {
+  background-color: #fff0b7;
+}
+.tox-comments-visible .tox-comment--active {
+  background-color: #ffe168;
+}
+.tox-checklist > li:not(.tox-checklist--hidden) {
+  list-style: none;
+  margin: .25em 0;
+  position: relative;
+}
+.tox-checklist > li:not(.tox-checklist--hidden)::before {
+  background-image: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cg%20id%3D%22checklist-unchecked%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Crect%20id%3D%22Rectangle%22%20width%3D%2215%22%20height%3D%2215%22%20x%3D%22.5%22%20y%3D%22.5%22%20fill-rule%3D%22nonzero%22%20stroke%3D%22%234C4C4C%22%20rx%3D%222%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A");
+  background-size: 100%;
+  content: '';
+  cursor: pointer;
+  height: 1em;
+  left: -1.5em;
+  position: absolute;
+  top: .125em;
+  width: 1em;
+}
+.tox-checklist li:not(.tox-checklist--hidden).tox-checklist--checked::before {
+  background-image: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cg%20id%3D%22checklist-checked%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Crect%20id%3D%22Rectangle%22%20width%3D%2216%22%20height%3D%2216%22%20fill%3D%22%234099FF%22%20fill-rule%3D%22nonzero%22%20rx%3D%222%22%2F%3E%3Cpath%20id%3D%22Path%22%20fill%3D%22%23FFF%22%20fill-rule%3D%22nonzero%22%20d%3D%22M11.5703186%2C3.14417309%20C11.8516238%2C2.73724603%2012.4164781%2C2.62829933%2012.83558%2C2.89774797%20C13.260121%2C3.17069355%2013.3759736%2C3.72932262%2013.0909105%2C4.14168582%20L7.7580587%2C11.8560195%20C7.43776896%2C12.3193404%206.76483983%2C12.3852142%206.35607322%2C11.9948725%20L3.02491697%2C8.8138662%20C2.66090143%2C8.46625845%202.65798871%2C7.89594698%203.01850234%2C7.54483354%20C3.373942%2C7.19866177%203.94940006%2C7.19592841%204.30829608%2C7.5386474%20L6.85276923%2C9.9684299%20L11.5703186%2C3.14417309%20Z%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A");
+}
+/* stylelint-disable */
+/* http://prismjs.com/ */
+/**
+ * prism.js default theme for JavaScript, CSS and HTML
+ * Based on dabblet (http://dabblet.com)
+ * @author Lea Verou
+ */
+code[class*="language-"],
+pre[class*="language-"] {
+  color: black;
+  text-shadow: 0 1px white;
+  font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
+  font-size: .875rem;
+  direction: ltr;
+  text-align: left;
+  white-space: pre;
+  word-spacing: normal;
+  word-break: normal;
+  word-wrap: normal;
+  line-height: 1.5;
+  -moz-tab-size: 4;
+  tab-size: 4;
+  -webkit-hyphens: none;
+  -ms-hyphens: none;
+  hyphens: none;
+}
+pre[class*="language-"]::-moz-selection,
+pre[class*="language-"] ::-moz-selection,
+code[class*="language-"]::-moz-selection,
+code[class*="language-"] ::-moz-selection {
+  text-shadow: none;
+  background: #b3d4fc;
+}
+pre[class*="language-"]::selection,
+pre[class*="language-"] ::selection,
+code[class*="language-"]::selection,
+code[class*="language-"] ::selection {
+  text-shadow: none;
+  background: #b3d4fc;
+}
+@media print {
+  code[class*="language-"],
+  pre[class*="language-"] {
+    text-shadow: none;
+  }
+}
+/* Code blocks */
+pre[class*="language-"] {
+  padding: 1em;
+  margin: .5em 0;
+  overflow: auto;
+}
+:not(pre) > code[class*="language-"],
+pre[class*="language-"] {
+  background: transparent !important;
+  border: 1px solid #ccc;
+}
+/* Inline code */
+:not(pre) > code[class*="language-"] {
+  padding: .1em;
+  border-radius: .3em;
+}
+.token.comment,
+.token.prolog,
+.token.doctype,
+.token.cdata {
+  color: slategray;
+}
+.token.punctuation {
+  color: #999;
+}
+.namespace {
+  opacity: .7;
+}
+.token.property,
+.token.tag,
+.token.boolean,
+.token.number,
+.token.constant,
+.token.symbol,
+.token.deleted {
+  color: #905;
+}
+.token.selector,
+.token.attr-name,
+.token.string,
+.token.char,
+.token.builtin,
+.token.inserted {
+  color: #690;
+}
+.token.operator,
+.token.entity,
+.token.url,
+.language-css .token.string,
+.style .token.string {
+  color: #a67f59;
+  background: rgba(255, 255, 255, 0.5);
+}
+.token.atrule,
+.token.attr-value,
+.token.keyword {
+  color: #07a;
+}
+.token.function {
+  color: #DD4A68;
+}
+.token.regex,
+.token.important,
+.token.variable {
+  color: #e90;
+}
+.token.important,
+.token.bold {
+  font-weight: bold;
+}
+.token.italic {
+  font-style: italic;
+}
+.token.entity {
+  cursor: help;
+}
+/* stylelint-enable */
+.mce-content-body .mce-visual-caret {
+  background-color: black;
+  background-color: currentcolor;
+  position: absolute;
+}
+.mce-content-body .mce-visual-caret-hidden {
+  display: none;
+}
+.mce-content-body *[data-mce-caret] {
+  left: -1000px;
+  margin: 0;
+  padding: 0;
+  position: absolute;
+  right: auto;
+  top: 0;
+}
+.mce-content-body .mce-offscreen-selection {
+  left: -9999999999px;
+  max-width: 1000000px;
+  position: absolute;
+}
+.mce-content-body *[contentEditable=false] {
+  cursor: default;
+}
+.mce-content-body *[contentEditable=true] {
+  cursor: text;
+}
+.tox-cursor-format-painter {
+  cursor: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%3E%0A%20%20%3Cg%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M15%2C6%20C15%2C5.45%2014.55%2C5%2014%2C5%20L6%2C5%20C5.45%2C5%205%2C5.45%205%2C6%20L5%2C10%20C5%2C10.55%205.45%2C11%206%2C11%20L14%2C11%20C14.55%2C11%2015%2C10.55%2015%2C10%20L15%2C9%20L16%2C9%20L16%2C12%20L9%2C12%20L9%2C19%20C9%2C19.55%209.45%2C20%2010%2C20%20L11%2C20%20C11.55%2C20%2012%2C19.55%2012%2C19%20L12%2C14%20L18%2C14%20L18%2C7%20L15%2C7%20L15%2C6%20Z%22%2F%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M1%2C1%20L8.25%2C1%20C8.66421356%2C1%209%2C1.33578644%209%2C1.75%20L9%2C1.75%20C9%2C2.16421356%208.66421356%2C2.5%208.25%2C2.5%20L2.5%2C2.5%20L2.5%2C8.25%20C2.5%2C8.66421356%202.16421356%2C9%201.75%2C9%20L1.75%2C9%20C1.33578644%2C9%201%2C8.66421356%201%2C8.25%20L1%2C1%20Z%22%2F%3E%0A%20%20%3C%2Fg%3E%0A%3C%2Fsvg%3E%0A"), default;
+}
+.mce-content-body figure.align-left {
+  float: left;
+}
+.mce-content-body figure.align-right {
+  float: right;
+}
+.mce-content-body figure.image.align-center {
+  display: table;
+  margin-left: auto;
+  margin-right: auto;
+}
+.mce-preview-object {
+  border: 1px solid gray;
+  display: inline-block;
+  line-height: 0;
+  margin: 0 2px 0 2px;
+  position: relative;
+}
+.mce-preview-object .mce-shim {
+  background: url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);
+  height: 100%;
+  left: 0;
+  position: absolute;
+  top: 0;
+  width: 100%;
+}
+.mce-preview-object[data-mce-selected="2"] .mce-shim {
+  display: none;
+}
+.mce-object {
+  background: transparent url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%3E%3Cpath%20d%3D%22M4%203h16a1%201%200%200%201%201%201v16a1%201%200%200%201-1%201H4a1%201%200%200%201-1-1V4a1%201%200%200%201%201-1zm1%202v14h14V5H5zm4.79%202.565l5.64%204.028a.5.5%200%200%201%200%20.814l-5.64%204.028a.5.5%200%200%201-.79-.407V7.972a.5.5%200%200%201%20.79-.407z%22%2F%3E%3C%2Fsvg%3E%0A") no-repeat center;
+  border: 1px dashed #aaa;
+}
+.mce-pagebreak {
+  border: 1px dashed #aaa;
+  cursor: default;
+  display: block;
+  height: 5px;
+  margin-top: 15px;
+  page-break-before: always;
+  width: 100%;
+}
+@media print {
+  .mce-pagebreak {
+    border: 0;
+  }
+}
+.tiny-pageembed .mce-shim {
+  background: url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);
+  height: 100%;
+  left: 0;
+  position: absolute;
+  top: 0;
+  width: 100%;
+}
+.tiny-pageembed[data-mce-selected="2"] .mce-shim {
+  display: none;
+}
+.tiny-pageembed {
+  display: inline-block;
+  position: relative;
+}
+.tiny-pageembed--21by9,
+.tiny-pageembed--16by9,
+.tiny-pageembed--4by3,
+.tiny-pageembed--1by1 {
+  display: block;
+  overflow: hidden;
+  padding: 0;
+  position: relative;
+  width: 100%;
+}
+.tiny-pageembed--21by9::before,
+.tiny-pageembed--16by9::before,
+.tiny-pageembed--4by3::before,
+.tiny-pageembed--1by1::before {
+  content: "";
+  display: block;
+}
+.tiny-pageembed--21by9::before {
+  padding-top: 42.857143%;
+}
+.tiny-pageembed--16by9::before {
+  padding-top: 56.25%;
+}
+.tiny-pageembed--4by3::before {
+  padding-top: 75%;
+}
+.tiny-pageembed--1by1::before {
+  padding-top: 100%;
+}
+.tiny-pageembed--21by9 iframe,
+.tiny-pageembed--16by9 iframe,
+.tiny-pageembed--4by3 iframe,
+.tiny-pageembed--1by1 iframe {
+  border: 0;
+  height: 100%;
+  left: 0;
+  position: absolute;
+  top: 0;
+  width: 100%;
+}
+.mce-content-body div.mce-resizehandle {
+  background-color: #4099ff;
+  border-color: #4099ff;
+  border-style: solid;
+  border-width: 1px;
+  box-sizing: border-box;
+  height: 10px;
+  position: absolute;
+  width: 10px;
+  z-index: 10000;
+}
+.mce-content-body div.mce-resizehandle:hover {
+  background-color: #4099ff;
+}
+.mce-content-body div.mce-resizehandle:nth-of-type(1) {
+  cursor: nwse-resize;
+}
+.mce-content-body div.mce-resizehandle:nth-of-type(2) {
+  cursor: nesw-resize;
+}
+.mce-content-body div.mce-resizehandle:nth-of-type(3) {
+  cursor: nwse-resize;
+}
+.mce-content-body div.mce-resizehandle:nth-of-type(4) {
+  cursor: nesw-resize;
+}
+.mce-content-body .mce-clonedresizable {
+  opacity: .5;
+  outline: 1px dashed black;
+  position: absolute;
+  z-index: 10000;
+}
+.mce-content-body .mce-resize-helper {
+  background: #555;
+  background: rgba(0, 0, 0, 0.75);
+  border: 1px;
+  border-radius: 3px;
+  color: white;
+  display: none;
+  font-family: sans-serif;
+  font-size: 12px;
+  line-height: 14px;
+  margin: 5px 10px;
+  padding: 5px;
+  position: absolute;
+  white-space: nowrap;
+  z-index: 10001;
+}
+.mce-match-marker {
+  background: #aaa;
+  color: #fff;
+}
+.mce-match-marker-selected {
+  background: #39f;
+  color: #fff;
+}
+.mce-content-body img[data-mce-selected],
+.mce-content-body table[data-mce-selected] {
+  outline: 3px solid #b4d7ff;
+}
+.mce-content-body hr[data-mce-selected] {
+  outline: 3px solid #b4d7ff;
+  outline-offset: 1px;
+}
+.mce-content-body *[contentEditable=false] *[contentEditable=true]:focus {
+  outline: 3px solid #b4d7ff;
+}
+.mce-content-body *[contentEditable=false] *[contentEditable=true]:hover {
+  outline: 3px solid #b4d7ff;
+}
+.mce-content-body *[contentEditable=false][data-mce-selected] {
+  cursor: not-allowed;
+  outline: 3px solid #b4d7ff;
+}
+.mce-content-body.mce-content-readonly *[contentEditable=true]:focus,
+.mce-content-body.mce-content-readonly *[contentEditable=true]:hover {
+  outline: none;
+}
+.mce-content-body *[data-mce-selected="inline-boundary"] {
+  background-color: #b4d7ff;
+}
+.mce-content-body .mce-edit-focus {
+  outline: 3px solid #b4d7ff;
+}
+.mce-content-body td[data-mce-selected],
+.mce-content-body th[data-mce-selected] {
+  background-color: #b4d7ff !important;
+}
+.mce-content-body td[data-mce-selected]::-moz-selection,
+.mce-content-body th[data-mce-selected]::-moz-selection {
+  background: none;
+}
+.mce-content-body td[data-mce-selected]::selection,
+.mce-content-body th[data-mce-selected]::selection {
+  background: none;
+}
+.mce-content-body td[data-mce-selected] *,
+.mce-content-body th[data-mce-selected] * {
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+     -moz-user-select: none;
+      -ms-user-select: none;
+          user-select: none;
+}
+.mce-content-body img::-moz-selection {
+  background: none;
+}
+.mce-content-body img::selection {
+  background: none;
+}
+.ephox-snooker-resizer-bar {
+  background-color: #b4d7ff;
+  opacity: 0;
+}
+.ephox-snooker-resizer-cols {
+  cursor: col-resize;
+}
+.ephox-snooker-resizer-rows {
+  cursor: row-resize;
+}
+.ephox-snooker-resizer-bar.ephox-snooker-resizer-bar-dragging {
+  opacity: 1;
+}
+.mce-spellchecker-word {
+  background-image: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'4'%20height%3D'4'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20stroke%3D'%23ff0000'%20fill%3D'none'%20stroke-linecap%3D'round'%20stroke-opacity%3D'.5'%20d%3D'M0%203L2%201%204%203'%2F%3E%3C%2Fsvg%3E%0A");
+  background-position: 0 calc(100% + 1px);
+  background-repeat: repeat-x;
+  background-size: auto 6px;
+  cursor: default;
+  height: 2rem;
+}
+.mce-spellchecker-grammar {
+  background-image: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'4'%20height%3D'4'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20stroke%3D'%23008800'%20fill%3D'none'%20stroke-linecap%3D'round'%20d%3D'M0%203L2%201%204%203'%2F%3E%3C%2Fsvg%3E%0A");
+  background-position: 0 calc(100% + 1px);
+  background-repeat: repeat-x;
+  background-size: auto 6px;
+  cursor: default;
+}
+.mce-toc {
+  border: 1px solid gray;
+}
+.mce-toc h2 {
+  margin: 4px;
+}
+.mce-toc li {
+  list-style-type: none;
+}
+.mce-item-table,
+.mce-item-table td,
+.mce-item-table th,
+.mce-item-table caption {
+  border: 1px dashed #bbb;
+}
+.mce-visualblocks p,
+.mce-visualblocks h1,
+.mce-visualblocks h2,
+.mce-visualblocks h3,
+.mce-visualblocks h4,
+.mce-visualblocks h5,
+.mce-visualblocks h6,
+.mce-visualblocks div:not([data-mce-bogus]),
+.mce-visualblocks section,
+.mce-visualblocks article,
+.mce-visualblocks blockquote,
+.mce-visualblocks address,
+.mce-visualblocks pre,
+.mce-visualblocks figure,
+.mce-visualblocks figcaption,
+.mce-visualblocks hgroup,
+.mce-visualblocks aside,
+.mce-visualblocks ul,
+.mce-visualblocks ol,
+.mce-visualblocks dl {
+  background-repeat: no-repeat;
+  border: 1px dashed #bbb;
+  margin-left: 3px;
+  padding-top: 10px;
+}
+.mce-visualblocks p {
+  background-image: url(data:image/gif;base64,R0lGODlhCQAJAJEAAAAAAP///7u7u////yH5BAEAAAMALAAAAAAJAAkAAAIQnG+CqCN/mlyvsRUpThG6AgA7);
+}
+.mce-visualblocks h1 {
+  background-image: url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGu1JuxHoAfRNRW3TWXyF2YiRUAOw==);
+}
+.mce-visualblocks h2 {
+  background-image: url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8Hybbx4oOuqgTynJd6bGlWg3DkJzoaUAAAOw==);
+}
+.mce-visualblocks h3 {
+  background-image: url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIZjI8Hybbx4oOuqgTynJf2Ln2NOHpQpmhAAQA7);
+}
+.mce-visualblocks h4 {
+  background-image: url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxInR0zqeAdhtJlXwV1oCll2HaWgAAOw==);
+}
+.mce-visualblocks h5 {
+  background-image: url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjane4iq5GlW05GgIkIZUAAAOw==);
+}
+.mce-visualblocks h6 {
+  background-image: url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjan04jep1iZ1XRlAo5bVgAAOw==);
+}
+.mce-visualblocks div:not([data-mce-bogus]) {
+  background-image: url(data:image/gif;base64,R0lGODlhEgAKAIABALu7u////yH5BAEAAAEALAAAAAASAAoAAAIfjI9poI0cgDywrhuxfbrzDEbQM2Ei5aRjmoySW4pAAQA7);
+}
+.mce-visualblocks section {
+  background-image: url(data:image/gif;base64,R0lGODlhKAAKAIABALu7u////yH5BAEAAAEALAAAAAAoAAoAAAI5jI+pywcNY3sBWHdNrplytD2ellDeSVbp+GmWqaDqDMepc8t17Y4vBsK5hDyJMcI6KkuYU+jpjLoKADs=);
+}
+.mce-visualblocks article {
+  background-image: url(data:image/gif;base64,R0lGODlhKgAKAIABALu7u////yH5BAEAAAEALAAAAAAqAAoAAAI6jI+pywkNY3wG0GBvrsd2tXGYSGnfiF7ikpXemTpOiJScasYoDJJrjsG9gkCJ0ag6KhmaIe3pjDYBBQA7);
+}
+.mce-visualblocks blockquote {
+  background-image: url(data:image/gif;base64,R0lGODlhPgAKAIABALu7u////yH5BAEAAAEALAAAAAA+AAoAAAJPjI+py+0Knpz0xQDyuUhvfoGgIX5iSKZYgq5uNL5q69asZ8s5rrf0yZmpNkJZzFesBTu8TOlDVAabUyatguVhWduud3EyiUk45xhTTgMBBQA7);
+}
+.mce-visualblocks address {
+  background-image: url(data:image/gif;base64,R0lGODlhLQAKAIABALu7u////yH5BAEAAAEALAAAAAAtAAoAAAI/jI+pywwNozSP1gDyyZcjb3UaRpXkWaXmZW4OqKLhBmLs+K263DkJK7OJeifh7FicKD9A1/IpGdKkyFpNmCkAADs=);
+}
+.mce-visualblocks pre {
+  background-image: url(data:image/gif;base64,R0lGODlhFQAKAIABALu7uwAAACH5BAEAAAEALAAAAAAVAAoAAAIjjI+ZoN0cgDwSmnpz1NCueYERhnibZVKLNnbOq8IvKpJtVQAAOw==);
+}
+.mce-visualblocks figure {
+  background-image: url(data:image/gif;base64,R0lGODlhJAAKAIAAALu7u////yH5BAEAAAEALAAAAAAkAAoAAAI0jI+py+2fwAHUSFvD3RlvG4HIp4nX5JFSpnZUJ6LlrM52OE7uSWosBHScgkSZj7dDKnWAAgA7);
+}
+.mce-visualblocks figcaption {
+  border: 1px dashed #bbb;
+}
+.mce-visualblocks hgroup {
+  background-image: url(data:image/gif;base64,R0lGODlhJwAKAIABALu7uwAAACH5BAEAAAEALAAAAAAnAAoAAAI3jI+pywYNI3uB0gpsRtt5fFnfNZaVSYJil4Wo03Hv6Z62uOCgiXH1kZIIJ8NiIxRrAZNMZAtQAAA7);
+}
+.mce-visualblocks aside {
+  background-image: url(data:image/gif;base64,R0lGODlhHgAKAIABAKqqqv///yH5BAEAAAEALAAAAAAeAAoAAAItjI+pG8APjZOTzgtqy7I3f1yehmQcFY4WKZbqByutmW4aHUd6vfcVbgudgpYCADs=);
+}
+.mce-visualblocks ul {
+  background-image: url(data:image/gif;base64,R0lGODlhDQAKAIAAALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGuYnqUVSjvw26DzzXiqIDlVwAAOw==);
+}
+.mce-visualblocks ol {
+  background-image: url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybH6HHt0qourxC6CvzXieHyeWQAAOw==);
+}
+.mce-visualblocks dl {
+  background-image: url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybEOnmOvUoWznTqeuEjNSCqeGRUAOw==);
+}
+.mce-nbsp,
+.mce-shy {
+  background: #aaa;
+}
+.mce-shy::after {
+  content: '-';
+}
+body {
+  font-family: sans-serif;
+}
+table {
+  border-collapse: collapse;
+}
--- a/ant-design-jeecg-vue/public/tinymce/skins/lightgray/skin.min.css
+++ b/ant-design-jeecg-vue/public/tinymce/skins/lightgray/skin.min.css
--- a/ant-design-jeecg-vue/src/api/api.js
+++ b/ant-design-jeecg-vue/src/api/api.js
 import { getAction,deleteAction,putAction,postAction} from '@/api/manage'

-//根路径
-const doMian = "/jeecg-boot/";
-//图片预览请求地址
-const imgView = "http://127.0.0.1:8080/jeecg-boot/sys/common/view/";
+////根路径
+// const doMian = "/jeecg-boot/";
+////图片预览请求地址
+// const imgView = "http://localhost:8080/jeecg-boot/sys/common/view/";


 //角色管理
 const addRole = (params)=>postAction("/sys/role/add",params);
 const editRole = (params)=>putAction("/sys/role/edit",params);
-const getRoleList = (params)=>getAction("/sys/role/list",params);
-const deleteRole = (params)=>deleteAction("/sys/role/delete",params);
-const deleteRoleList = (params)=>deleteAction("/sys/role/deleteBatch",params);
+// const getRoleList = (params)=>getAction("/sys/role/list",params);
+// const deleteRole = (params)=>deleteAction("/sys/role/delete",params);
+// const deleteRoleList = (params)=>deleteAction("/sys/role/deleteBatch",params);
 const checkRoleCode = (params)=>getAction("/sys/role/checkRoleCode",params);
 const queryall = (params)=>getAction("/sys/role/queryall",params);

@@ -20,8 +20,8 @@ const addUser = (params)=>postAction("/sys/user/add",params);
 const editUser = (params)=>putAction("/sys/user/edit",params);
 const queryUserRole = (params)=>getAction("/sys/user/queryUserRole",params);
 const getUserList = (params)=>getAction("/sys/user/list",params);
-const deleteUser = (params)=>deleteAction("/sys/user/delete",params);
-const deleteUserList = (params)=>deleteAction("/sys/user/deleteBatch",params);
+// const deleteUser = (params)=>deleteAction("/sys/user/delete",params);
+// const deleteUserList = (params)=>deleteAction("/sys/user/deleteBatch",params);
 const frozenBatch = (params)=>putAction("/sys/user/frozenBatch",params);
 //验证用户账号是否唯一
 const checkUsername = (params)=>getAction("/sys/user/checkOnlyUser",params);
@@ -32,37 +32,41 @@ const changPassword = (params)=>putAction("/sys/user/changPassword",params);
 const addPermission= (params)=>postAction("/sys/permission/add",params);
 const editPermission= (params)=>putAction("/sys/permission/edit",params);
 const getPermissionList = (params)=>getAction("/sys/permission/list",params);
-const deletePermission = (params)=>deleteAction("/sys/permission/delete",params);
-const deletePermissionList = (params)=>deleteAction("/sys/permission/deleteBatch",params);
+// const deletePermission = (params)=>deleteAction("/sys/permission/delete",params);
+// const deletePermissionList = (params)=>deleteAction("/sys/permission/deleteBatch",params);
 const queryTreeList = (params)=>getAction("/sys/permission/queryTreeList",params);
+const queryTreeListForRole = (params)=>getAction("/sys/role/queryTreeList",params);
 const queryListAsync = (params)=>getAction("/sys/permission/queryListAsync",params);
 const queryRolePermission = (params)=>getAction("/sys/permission/queryRolePermission",params);
 const saveRolePermission = (params)=>postAction("/sys/permission/saveRolePermission",params);
 const queryPermissionsByUser = (params)=>getAction("/sys/permission/queryByUser",params);
 const loadAllRoleIds = (params)=>getAction("/sys/permission/loadAllRoleIds",params);
+const getPermissionRuleList = (params)=>getAction("/sys/permission/getPermRuleListByPermId",params);
+const queryPermissionRule = (params)=>getAction("/sys/permission/queryPermissionRule",params);

 // 部门管理
 const queryDepartTreeList = (params)=>getAction("/sysdepart/sysDepart/queryTreeList",params);
 const queryIdTree = (params)=>getAction("/sysdepart/sysDepart/queryIdTree",params);
 const queryParentName   = (params)=>getAction("/sysdepart/sysDepart/queryParentName",params);
 const searchByKeywords   = (params)=>getAction("/sysdepart/sysDepart/searchBy",params);
+const deleteByDepartId   = (params)=>deleteAction("/sysdepart/sysDepart/delete",params);

 //日志管理
-const getLogList = (params)=>getAction("/sys/log/list",params);
+//const getLogList = (params)=>getAction("/sys/log/list",params);
 const deleteLog = (params)=>deleteAction("/sys/log/delete",params);
 const deleteLogList = (params)=>deleteAction("/sys/log/deleteBatch",params);

 //数据字典
 const addDict = (params)=>postAction("/sys/dict/add",params);
 const editDict = (params)=>putAction("/sys/dict/edit",params);
-const getDictList = (params)=>getAction("/sys/dict/list",params);
+//const getDictList = (params)=>getAction("/sys/dict/list",params);
 const treeList = (params)=>getAction("/sys/dict/treeList",params);
-const delDict = (params)=>deleteAction("/sys/dict/delete",params);
-const getDictItemList = (params)=>getAction("/sys/dictItem/list",params);
+// const delDict = (params)=>deleteAction("/sys/dict/delete",params);
+//const getDictItemList = (params)=>getAction("/sys/dictItem/list",params);
 const addDictItem = (params)=>postAction("/sys/dictItem/add",params);
 const editDictItem = (params)=>putAction("/sys/dictItem/edit",params);
-const delDictItem = (params)=>deleteAction("/sys/dictItem/delete",params);
-const delDictItemList = (params)=>deleteAction("/sys/dictItem/deleteBatch",params);
+//const delDictItem = (params)=>deleteAction("/sys/dictItem/delete",params);
+//const delDictItemList = (params)=>deleteAction("/sys/dictItem/deleteBatch",params);

 //字典标签专用（通过code获取字典数组）
 export const ajaxGetDictItems = (code, params)=>getAction(`/sys/dict/getDictItems/${code}`,params);
@@ -72,29 +76,32 @@ const doReleaseData = (params)=>getAction("/sys/annountCement/doReleaseData",par
 const doReovkeData = (params)=>getAction("/sys/annountCement/doReovkeData",params);
 //获取系统访问量
 const getLoginfo = (params)=>getAction("/sys/loginfo",params);
+//数据日志访问
+// const getDataLogList = (params)=>getAction("/sys/dataLog/list",params);
+
+// 根据部门主键查询用户信息
+const queryUserByDepId = (params)=>getAction("/sys/user/queryUserByDepId",params);
+
+// 查询用户角色表里的所有信息
+const queryUserRoleMap = (params)=>getAction("/sys/user/queryUserRoleMap",params);
+// 重复校验
+const duplicateCheck = (params)=>getAction("/sys/duplicate/check",params);

 export {
-  imgView,
-  doMian,
+  // imgView,
+  // doMian,
  addRole,
  editRole,
-  getRoleList,
-  deleteRole,
-  deleteRoleList,
  checkRoleCode,
  addUser,
  editUser,
  queryUserRole,
-  queryall,
  getUserList,
-  deleteUser,
-  deleteUserList,
+  queryall,
  frozenBatch,
  checkUsername,
  changPassword,
  getPermissionList,
-  deletePermission,
-  deletePermissionList,
  addPermission,
  editPermission,
  queryTreeList,
@@ -103,26 +110,27 @@ export {
  saveRolePermission,
  queryPermissionsByUser,
  loadAllRoleIds,
+  getPermissionRuleList,
+  queryPermissionRule,
  queryDepartTreeList,
  queryIdTree,
  queryParentName,
  searchByKeywords,
-  getLogList,
+  deleteByDepartId,
  deleteLog,
  deleteLogList,
-  getDictList,
  addDict,
  editDict,
-  delDict,
  treeList,
-  getDictItemList,
  addDictItem,
  editDictItem,
-  delDictItem,
-  delDictItemList,
  doReleaseData,
  doReovkeData,
-  getLoginfo
+  getLoginfo,
+  queryUserByDepId,
+  queryUserRoleMap,
+  duplicateCheck,
+  queryTreeListForRole
 }



--- a/ant-design-jeecg-vue/src/api/index.js
+++ b/ant-design-jeecg-vue/src/api/index.js
 const api = {
    Login: '/sys/login',
-    Logout: '/auth/logout',
+    Logout: '/sys/logout',
    ForgePassword: '/auth/forge-password',
    Register: '/auth/register',
    SendSms: '/account/sms',

--- a/ant-design-jeecg-vue/src/api/login.js
+++ b/ant-design-jeecg-vue/src/api/login.js
@@ -38,12 +38,13 @@ export function getInfo() {
  })
 }

-export function logout() {
+export function logout(logoutToken) {
  return axios({
-    url: '/api/auth/logout',
+    url: '/sys/logout',
    method: 'post',
    headers: {
-      'Content-Type': 'application/json;charset=UTF-8'
+      'Content-Type': 'application/json;charset=UTF-8',
+      'X-Access-Token':  logoutToken
    }
  })
 }
\ No newline at end of file
--- a/ant-design-jeecg-vue/src/api/manage.js
+++ b/ant-design-jeecg-vue/src/api/manage.js
@@ -97,3 +97,18 @@ export function saveService(parameter) {
  })
 }

+/**
+ * 下载文件 用于excel导出
+ * @param url
+ * @param parameter
+ * @returns {*}
+ */
+export function downFile(url,parameter){
+  return axios({
+    url: url,
+    params: parameter,
+    method:'get' ,
+    responseType: 'blob'
+  })
+}
+
--- a/ant-design-jeecg-vue/src/assets/less/common.css
+++ b/ant-design-jeecg-vue/src/assets/less/common.css
+
+/*列表上方操作按钮*/
+.ant-card-body .table-operator {
+  margin-bottom: 18px;
+}
+
+/*列表td的padding设置 可以控制列表大小*/
+.ant-table-tbody .ant-table-row td {
+  padding-top: 15px;
+  padding-bottom: 15px;
+}
+
+/*列表页面弹出modal*/
+.ant-modal-cust-warp {
+  height: 100%
+}
+
+/*弹出modal Y轴滚动条*/
+.ant-modal-cust-warp .ant-modal-body {
+  height: calc(100% - 110px) !important;
+  overflow-y: auto
+}
+
+/*弹出modal 先有content后有body 故滚动条控制在body上*/
+.ant-modal-cust-warp .ant-modal-content {
+  height: 90% !important;
+  overflow-y: hidden
+}
+
--- a/ant-design-jeecg-vue/src/assets/less/index.less
+++ b/ant-design-jeecg-vue/src/assets/less/index.less
+/**
+ * 列表查询通用样式，移动端自适应
+ */
 .search{
  margin-bottom: 54px;
 }
@@ -19,3 +22,7 @@
 i {
  cursor: pointer;
 }
+.trcolor{
+  background-color: rgba(255, 192, 203, 0.31);
+  color:red;
+}
--- a/ant-design-jeecg-vue/src/assets/logo.png
+++ b/ant-design-jeecg-vue/src/assets/logo.png
--- a/ant-design-jeecg-vue/src/components/README.md
+++ b/ant-design-jeecg-vue/src/components/README.md
+####1._util包:存放自定义函数 详细见代码注释
+####2.AvatarList:显示头像群并支持tip，用法参考src\views\Home.vue（如下图）
+![输入图片说明](https://static.oschina.net/uploads/img/201904/12181253_O0Xi.png "在这里输入图片标题")
+####3.chart包:存放各种图表相关的组件,条形图柱形图折线图等等 具体用法参考首页
+####4.countDown包:一个倒计时组件，用法参考home页,简单描述,该组件有3个属性,
+target(时间/毫秒数)必填，
+format(function,该方法接收一个毫秒数的参数,用于格式化显示当前倒计时时间)非必填,
+onEnd倒计时结束触发函数
+![输入图片说明](https://static.oschina.net/uploads/img/201904/12182046_mwqJ.png "在这里输入图片标题")
+####5.dict包：数据字典专用，用法参考文件夹下readme文件
+####6.Ellipsis包：字符串截取组件,可以指定字符串的显示长度,并将全部内容显示到tip中,简单使用参考src\views\system\PermissionList.vue
+####7.jeecg包：该包下自定义了很多列表/表单中用到的组件 参考包下readme文件
+####8.jeecgbiz包：该包下定义了一些业务相关的组件，比如选择用户弹框,根据部门选择用户等等
+####9.layouts+page包：系统页面布局相关组件，比如登陆进去之后页面顶部显示什么，底部显示什么，菜单点击触发多个tab的布局等等 一般情况不需要修改
+####10.menun包：菜单组件，俩个，一个折叠菜单一个正常显示的菜单
+####11.NumberInfo:数字信息显示组件 如下图
+![输入图片说明](https://static.oschina.net/uploads/img/201904/12185858_uvJ5.png "在这里输入图片标题")
+####12.online包：该包下封装了online表单的相关组件,用于展示表单各种控件,验证表单等等,相关用法参考readme
+####13.setting包：该包下封装了首页风格切换等功能如下图
+![输入图片说明](https://static.oschina.net/uploads/img/201904/12190520_jySG.png "在这里输入图片标题")
+####14.table包：一个二次封装的table组件,用于展示列表，参考readme
+####15.tools包：
+Breadcrumb.vue：面包屑二次封装,支持路由跳转
+DetailList.vue：详情展示用法参考src\views\profile\advanced\Advanced.vue(效果如下图)
+![输入图片说明](https://static.oschina.net/uploads/img/201904/12193954_Uar6.png "在这里输入图片标题")
+````
+个人认为该页面代码有两点值得学习：
+1.vue provide/inject的使用
+2.该页面css定义方式,只定义一个顶层class,其余样式都定义在其下,这样只要顶层class不和别的页面冲突,整个页面的样式都是唯一生效的
+````
+FooterToolBar.vue:fixed定位的底部，通过是否定义内部控件的属性slot="extra"决定是左浮动或是右浮动
+HeaderNotice.vue:首页通知(如下图)
+![输入图片说明](https://static.oschina.net/uploads/img/201904/12195340_fPe0.png "在这里输入图片标题")
+HeaderInfo.vue:上下文字布局（如下图）
+![输入图片说明](https://static.oschina.net/uploads/img/201904/12195638_dG5o.png "在这里输入图片标题")
+Logo.vue:首页左上侧的log图
+![输入图片说明](https://static.oschina.net/uploads/img/201904/12200908_ihv3.png "在这里输入图片标题")
+UserMenu.vue:首页右上侧的内容
+![输入图片说明](https://static.oschina.net/uploads/img/201904/12201226_laQK.png "在这里输入图片标题")
+####16.trend包 趋势显示组件（如下图）
+![输入图片说明](https://static.oschina.net/uploads/img/201904/12201600_Wo8K.png "在这里输入图片标题")
--- a/ant-design-jeecg-vue/src/components/_util/StringUtil.js
+++ b/ant-design-jeecg-vue/src/components/_util/StringUtil.js
-
+/**
+ * 获取字符串的长度ascii长度为1 中文长度为2
+ * @param str
+ * @returns {number}
+ */
 export const getStrFullLength = (str = '') =>
  str.split('').reduce((pre, cur) => {
    const charCode = cur.charCodeAt(0)
@@ -8,6 +12,12 @@ export const getStrFullLength = (str = '') =>
    return pre + 2
  }, 0)

+/**
+ * 给定一个字符串和一个长度,将此字符串按指定长度截取
+ * @param str
+ * @param maxLength
+ * @returns {string}
+ */
 export const cutStrByFullLength = (str = '', maxLength) => {
  let showLength = 0
  return str.split('').reduce((pre, cur) => {

--- a/ant-design-jeecg-vue/src/components/chart/AreaChartTy.vue
+++ b/ant-design-jeecg-vue/src/components/chart/AreaChartTy.vue
+<template>
+  <div :style="{ padding: '0 0 32px 32px' }">
+    <h4 :style="{ marginBottom: '20px' }">{{ title }}</h4>
+
+    <v-chart ref="chart" :forceFit="true" :height="height" :data="dataSource" :scale="scale">
+      <v-tooltip/>
+      <v-axis/>
+      <v-line position="x*y" :size="lineSize"/>
+      <v-area position="x*y"/>
+    </v-chart>
+
+  </div>
+</template>
+
+<script>
+  import { triggerWindowResizeEvent } from '@/utils/util'
+
+  export default {
+    name: 'AreaChartTy',
+    props: {
+      // 图表数据
+      dataSource: {
+        type: Array,
+        required: true
+      },
+      // 图表标题
+      title: {
+        type: String,
+        default: ''
+      },
+      // x 轴别名
+      x: {
+        type: String,
+        default: 'x'
+      },
+      // y 轴别名
+      y: {
+        type: String,
+        default: 'y'
+      },
+      // 图表高度
+      height: {
+        type: Number,
+        default: 254
+      },
+      // 线的粗细
+      lineSize: {
+        type: Number,
+        default: 2
+      }
+    },
+    computed: {
+      scale() {
+        return [
+          { dataKey: 'x', title: this.x, alias: this.x },
+          { dataKey: 'y', title: this.y, alias: this.y }
+        ]
+      }
+    },
+    mounted() {
+      triggerWindowResizeEvent()
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  @import "chart";
+</style>
\ No newline at end of file
--- a/ant-design-jeecg-vue/src/components/chart/Bar.vue
+++ b/ant-design-jeecg-vue/src/components/chart/Bar.vue
 <template>
  <div :style="{ padding: '0 0 32px 32px' }">
    <h4 :style="{ marginBottom: '20px' }">{{ title }}</h4>
-    <v-chart
-      height="254"
-      :data="data"
-      :forceFit="true"
-      :padding="['auto', 'auto', '40', '50']">
-      <v-tooltip />
-      <v-axis />
+    <v-chart :forceFit="true" :height="height" :data="dataSource" :padding="padding">
+      <v-tooltip/>
+      <v-axis/>
      <v-bar position="x*y"/>
    </v-chart>
  </div>
 </template>

 <script>
-  const data = []
-  for (let i = 0; i < 12; i += 1) {
-    data.push({
-      x: `${i + 1}月`,
-      y: Math.floor(Math.random() * 1000) + 200
-    })
-  }
-  const tooltip = [
-    'x*y',
-    (x, y) => ({
-      name: x,
-      value: y
-    })
-  ]
-  const scale = [{
-    dataKey: 'x',
-    min: 2
-  }, {
-    dataKey: 'y',
-    title: '时间',
-    min: 1,
-    max: 22
-  }]
+  import { triggerWindowResizeEvent } from '@/utils/util'

  export default {
-    name: "Bar",
+    name: 'Bar',
    props: {
+      dataSource: {
+        type: Array,
+        required: true
+      },
      title: {
        type: String,
        default: ''
+      },
+      height: {
+        type: Number,
+        default: 254
      }
    },
-    data () {
-      return {
-        data,
-        scale,
-        tooltip
-      }
+    data() {
+      return { padding: ['auto', 'auto', '40', '50'] }
+    },
+    mounted() {
+      triggerWindowResizeEvent()
    }
  }
 </script>
\ No newline at end of file
--- a/ant-design-jeecg-vue/src/components/chart/BarMultid.vue
+++ b/ant-design-jeecg-vue/src/components/chart/BarMultid.vue
+<template>
+  <div :style="{ padding: '0 0 32px 32px' }">
+    <h4 :style="{ marginBottom: '20px' }">{{ title }}</h4>
+    <v-chart :forceFit="true" :height="height" :data="data" :padding="['auto', 'auto', '40', '50']">
+      <v-tooltip />
+      <v-axis />
+      <v-legend />
+      <v-bar position="x*y" color="type" :adjust="adjust" />
+    </v-chart>
+  </div>
+</template>
+
+<script>
+  import { DataSet } from '@antv/data-set'
+
+  const sourceDataConst = [
+    { type: 'Jeecg', 'Jan.': 18.9, 'Feb.': 28.8, 'Mar.': 39.3, 'Apr.': 81.4, 'May': 47, 'Jun.': 20.3, 'Jul.': 24, 'Aug.': 35.6 },
+    { type: 'Jeebt', 'Jan.': 12.4, 'Feb.': 23.2, 'Mar.': 34.5, 'Apr.': 99.7, 'May': 52.6, 'Jun.': 35.5, 'Jul.': 37.4, 'Aug.': 42.4 }
+  ];
+  const fieldsConst = ['Jan.', 'Feb.', 'Mar.', 'Apr.', 'May', 'Jun.', 'Jul.', 'Aug.'];
+  export default {
+    name: 'BarMultid',
+    props: {
+      title: {
+        type: String,
+        default: ''
+      },
+      dataSource:{
+        type:Array,
+        default:()=>[]
+      },
+      fields:{
+        type:Array,
+        default:()=>[]
+      },
+      height: {
+        type: Number,
+        default: 254
+      }
+    },
+    data() {
+      return {
+        data:"",
+        adjust: [{
+          type: 'dodge',
+          marginRatio: 1 / 32,
+        }],
+      };
+    },
+    watch: {
+      'dataSource': function () {
+        this.drawChart();
+      }
+    },
+    mounted(){
+      this.drawChart()
+    },
+    methods:{
+      drawChart(){
+        let temp = sourceDataConst;
+        if(this.dataSource && this.dataSource.length>0){
+          temp = this.dataSource
+        }
+        const dv = new DataSet.View().source(temp);
+        dv.transform({
+          type: 'fold',
+          fields:(!this.fields||this.fields.length==0)?fieldsConst:this.fields,
+          key: 'x',
+          value: 'y',
+        });
+        this.data=dv.rows;
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
--- a/ant-design-jeecg-vue/src/components/chart/DashChartDemo.vue
+++ b/ant-design-jeecg-vue/src/components/chart/DashChartDemo.vue
+<template>
+  <div :style="{ padding: '0 0 32px 32px' }">
+    <v-chart :forceFit="true" :height="height" :data="data" :scale="scale">
+      <v-coord type="polar" :startAngle="-202.5" :endAngle="22.5" :radius="0.75"></v-coord>
+      <v-axis
+        dataKey="value"
+        :zIndex="2"
+        :line="null"
+        :label="axisLabel"
+        :subTickCount="4"
+        :subTickLine="axisSubTickLine"
+        :tickLine="axisTickLine"
+        :grid="null"
+      ></v-axis>
+      <v-axis dataKey="1" :show="false"></v-axis>
+      <v-series
+        gemo="point"
+        position="value*1"
+        shape="pointer"
+        color="#1890FF"
+        :active="false"
+      ></v-series>
+      <v-guide
+        type="arc"
+        :zIndex="0"
+        :top="false"
+        :start="arcGuide1Start"
+        :end="arcGuide1End"
+        :vStyle="arcGuide1Style"
+      ></v-guide>
+      <v-guide
+        type="arc"
+        :zIndex="1"
+        :start="arcGuide2Start"
+        :end="getArcGuide2End"
+        :vStyle="arcGuide2Style"
+      ></v-guide>
+      <v-guide
+        type="html"
+        :position="htmlGuidePosition"
+        :html="getHtmlGuideHtml()"
+      ></v-guide>
+    </v-chart>
+  </div>
+</template>
+
+<script>
+  import {registerShape} from 'viser-vue';
+
+  registerShape('point', 'pointer', {
+    draw(cfg, container) {
+      let point = cfg.points[0];
+      point = this.parsePoint(point);
+      const center = this.parsePoint({
+        x: 0,
+        y: 0,
+      });
+      container.addShape('line', {
+        attrs: {
+          x1: center.x,
+          y1: center.y,
+          x2: point.x,
+          y2: point.y + 15,
+          stroke: cfg.color,
+          lineWidth: 5,
+          lineCap: 'round',
+        }
+      });
+      return container.addShape('circle', {
+        attrs: {
+          x: center.x,
+          y: center.y,
+          r: 9.75,
+          stroke: cfg.color,
+          lineWidth: 4.5,
+          fill: '#fff',
+        }
+      });
+    }
+  });
+
+  const scale = [{
+    dataKey: 'value',
+    min: 0,
+    max: 9,
+    tickInterval: 1,
+    nice: false,
+  }];
+
+  const sourceData = [
+    {value: 6.7},
+  ];
+
+  export default {
+    name: "DashChartDemo",
+    props: {
+      value: {
+        type: Number,
+        default: 6.7
+      },
+      title: {
+        type: String,
+        default: ''
+      },
+      height: {
+        type: Number,
+        default: 254
+      }
+    },
+    created() {
+      if (!this.value) {
+        this.data = sourceData;
+      } else {
+        this.data = [
+          {value: this.value},
+        ];
+      }
+      this.getData()
+    },
+    watch: {
+      'value': function (val) {
+        this.data = [
+          {value: val},
+        ];
+        this.getData();
+      }
+    },
+    methods: {
+      getData() {
+        if (this.data && this.data.length > 0) {
+          this.abcd = this.data[0].value * 10
+        } else {
+          this.abcd = 70
+        }
+      },
+      getHtmlGuideHtml() {
+        return '<div style="width: 300px;text-align: center;">\n' +
+          '<p style="font-size: 14px;color: #545454;margin: 0;">' + this.title + '</p>\n' +
+          '<p style="font-size: 36px;color: #545454;margin: 0;">' + this.abcd + '%</p>\n' +
+          '</div>'
+      },
+      getArcGuide2End() {
+        return [this.data[0].value, 0.945]
+      }
+    },
+    data() {
+      return {
+        data: [],
+        scale: scale,
+        abcd: 70,
+        axisLabel: {
+          offset: -16,
+          textStyle: {
+            fontSize: 18,
+            textAlign: 'center',
+            textBaseline: 'middle'
+          }
+        },
+        axisSubTickLine: {
+          length: -8,
+          stroke: '#fff',
+          strokeOpacity: 1,
+        },
+        axisTickLine: {
+          length: -17,
+          stroke: '#fff',
+          strokeOpacity: 1,
+        },
+        arcGuide1Start: [0, 0.945],
+        arcGuide1End: [9, 0.945],
+        arcGuide1Style: {
+          stroke: '#CBCBCB',
+          lineWidth: 18,
+        },
+        arcGuide2Start: [0, 0.945],
+        arcGuide2Style: {
+          stroke: '#1890FF',
+          lineWidth: 18,
+        },
+        htmlGuidePosition: ['50%', '100%'],
+        htmlGuideHtml: `
+        <div style="width: 300px;text-align: center;">
+          <p style="font-size: 14px;color: #545454;margin: 0;">${this.title}</p>
+          <p style="font-size: 36px;color: #545454;margin: 0;">${this.abcd}%</p>
+        </div>
+      `,
+      };
+    },
+  };
+</script>
--- a/ant-design-jeecg-vue/src/components/chart/LineChartMultid.vue
+++ b/ant-design-jeecg-vue/src/components/chart/LineChartMultid.vue
+<template>
+  <div :style="{ padding: '0 0 32px 32px' }">
+    <h4 :style="{ marginBottom: '20px' }">{{ title }}</h4>
+    <v-chart :force-fit="true" :height="height" :data="data" :scale="scale" :padding="['auto', 'auto', '40', '50']">
+      <v-tooltip />
+      <v-axis />
+      <v-legend />
+      <v-line position="type*y" color="x" />
+      <v-point position="type*y" color="x" :size="4" :v-style="style" :shape="'circle'" />
+    </v-chart>
+  </div>
+</template>
+
+<script>
+  import { DataSet } from '@antv/data-set'
+
+  const sourceDataConst = [
+    { type: 'Jan', jeecg: 7.0, jeebt: 3.9 },
+    { type: 'Feb', jeecg: 6.9, jeebt: 4.2 },
+    { type: 'Mar', jeecg: 9.5, jeebt: 5.7 },
+    { type: 'Apr', jeecg: 14.5, jeebt: 8.5 },
+    { type: 'May', jeecg: 18.4, jeebt: 11.9 },
+    { type: 'Jun', jeecg: 21.5, jeebt: 15.2 },
+    { type: 'Jul', jeecg: 25.2, jeebt: 17.0 },
+    { type: 'Aug', jeecg: 26.5, jeebt: 16.6 },
+    { type: 'Sep', jeecg: 23.3, jeebt: 14.2 },
+    { type: 'Oct', jeecg: 18.3, jeebt: 10.3 },
+    { type: 'Nov', jeecg: 13.9, jeebt: 6.6 },
+    { type: 'Dec', jeecg: 9.6, jeebt: 4.8 }
+  ];
+
+
+
+  export default {
+    name: 'LineChartMultid',
+    props: {
+      title: {
+        type: String,
+        default: ''
+      },
+      dataSource:{
+        type:Array,
+        default:()=>[]
+      },
+      fields:{
+        type:Array,
+        default: () => ['jeecg', 'jeebt']
+      },
+      height:{
+        type:Number,
+        default:254
+      }
+    },
+    data() {
+      return {
+        data:"",
+        scale: [{
+          dataKey: 'x',
+          min: 0,
+          max: 1
+        }],
+        style: { stroke: '#fff', lineWidth: 1 },
+      };
+    },
+    watch: {
+      'dataSource': function () {
+        this.drawChart();
+      }
+    },
+    mounted(){
+      this.drawChart()
+    },
+    methods:{
+      drawChart(){
+        let temp = sourceDataConst;
+        if (this.dataSource && this.dataSource.length > 0) {
+          temp = this.dataSource.map(item => {
+            // 为了防止直接修改源数据导致报错
+            let obj = Object.assign({}, item)
+            obj.type = obj.x
+            return obj
+          })
+        }
+        const dv = new DataSet.View().source(temp);
+        dv.transform({
+          type: 'fold',
+          fields: this.fields,
+          key: 'x',
+          value: 'y',
+        });
+
+        this.data=dv.rows;
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
--- a/ant-design-jeecg-vue/src/components/chart/Liquid.vue
+++ b/ant-design-jeecg-vue/src/components/chart/Liquid.vue
 <template>
  <div>
-    <v-chart 
-      :forceFit="true" 
-      :height="height" 
-      :width="width" 
-      :data="data" 
-      :scale="scale" 
+    <v-chart
+      :forceFit="true"
+      :height="height"
+      :width="width"
+      :data="data"
+      :scale="scale"
      :padding="0">
-      <v-tooltip />
+      <v-tooltip/>
      <v-interval
        :shape="['liquid-fill-gauge']"
        position="transfer*value"
        color=""
        :v-style="{
-          lineWidth: 10,
+          lineWidth: 8,
          opacity: 0.75
        }"
        :tooltip="[
@@ -47,8 +47,15 @@
 </template>

 <script>
+
+  const sourceDataConst = [
+    { transfer: '一月', value: 813 },
+    { transfer: '二月', value: 233 },
+    { transfer: '三月', value: 561 }
+  ]
+
  export default {
-    name: "Liquid",
+    name: 'Liquid',
    props: {
      height: {
        type: Number,
@@ -58,6 +65,12 @@
        type: Number,
        default: 0
      }
+    },
+    data() {
+      return {
+        data: sourceDataConst,
+        scale: []
+      }
    }
  }
 </script>

--- a/ant-design-jeecg-vue/src/components/chart/MiniArea.vue
+++ b/ant-design-jeecg-vue/src/components/chart/MiniArea.vue
 <template>
  <div class="antv-chart-mini">
    <div class="chart-wrapper" :style="{ height: 46 }">
-      <v-chart :force-fit="true" :height="height" :data="datasource" :padding="[36, 0, 18, 0]">
-        <v-tooltip />
-        <v-smooth-area position="x*y" />
+      <v-chart :force-fit="true" :height="height" :data="data" :scale="scale" :padding="[36, 0, 18, 0]">
+        <v-tooltip/>
+        <v-smooth-area position="x*y"/>
      </v-chart>
    </div>
  </div>
@@ -11,53 +11,55 @@

 <script>
  import moment from 'dayjs'
-  const data = []
+
+  const sourceData = []
  const beginDay = new Date().getTime()

  for (let i = 0; i < 10; i++) {
-    data.push({
+    sourceData.push({
      x: moment(new Date(beginDay + 1000 * 60 * 60 * 24 * i)).format('YYYY-MM-DD'),
      y: Math.round(Math.random() * 10)
    })
  }

-  console.log("123321",data)
-  const tooltip = [
-    'x*y',
-    (x, y) => ({
-      name: x,
-      value: y
-    })
-  ]
-  const scale = [{
-    dataKey: 'x',
-    min: 2
-  }, {
-    dataKey: 'y',
-    title: '时间',
-    min: 1,
-    max: 22
-  }]
-
  export default {
-    name: "MiniArea",
-    props:{
-      datasource:{
+    name: 'MiniArea',
+    props: {
+      dataSource: {
        type: Array,
-        default:()=>[]
-      }
-    },
-    created(){
-      if(this.datasource.length==0){
-        this.datasource = data;
+        default: () => []
+      },
+      // x 轴别名
+      x: {
+        type: String,
+        default: 'x'
+      },
+      // y 轴别名
+      y: {
+        type: String,
+        default: 'y'
      }
    },
-    data () {
+    data() {
      return {
-        tooltip,
-        scale,
+        data: [],
        height: 100
      }
+    },
+    computed: {
+      scale() {
+        return [
+          { dataKey: 'x', title: this.x, alias: this.x },
+          { dataKey: 'y', title: this.y, alias: this.y }
+        ]
+      }
+    },
+    created() {
+      if (this.dataSource.length === 0) {
+        this.data = sourceData
+      } else {
+        this.data = this.dataSource
+      }
    }
  }
 </script>

--- a/ant-design-jeecg-vue/src/components/chart/MiniBar.vue
+++ b/ant-design-jeecg-vue/src/components/chart/MiniBar.vue
 <template>
-  <div class="antv-chart-mini">
-    <div class="chart-wrapper" :style="{ height: 46 }">
-      <v-chart :force-fit="true" :height="height" :data="datasource" :padding="[36, 5, 18, 5]">
-        <v-tooltip />
-        <v-bar position="x*y" />
-      </v-chart>
-    </div>
+  <div :style="{'width':width==null?'auto':width+'px'}">
+    <v-chart :forceFit="width==null" :height="height" :data="data" padding="0">
+      <v-tooltip/>
+      <v-bar position="x*y"/>
+    </v-chart>
  </div>
 </template>

 <script>
  import moment from 'dayjs'
-  const data = []
+
+  const sourceData = []
  const beginDay = new Date().getTime()

  for (let i = 0; i < 10; i++) {
-    data.push({
+    sourceData.push({
      x: moment(new Date(beginDay + 1000 * 60 * 60 * 24 * i)).format('YYYY-MM-DD'),
      y: Math.round(Math.random() * 10)
    })
@@ -40,24 +39,33 @@
  }]

  export default {
-    name: "MiniBar",
-    props:{
-      datasource:{
+    name: 'MiniBar',
+    props: {
+      dataSource: {
        type: Array,
-        default:()=>[]
+        default: () => []
+      },
+      width: {
+        type: Number,
+        default: null
+      },
+      height: {
+        type: Number,
+        default: 200
      }
    },
-    created(){
-      if(this.datasource.length==0){
-        this.datasource = data;
+    created() {
+      if (this.dataSource.length === 0) {
+        this.data = sourceData
+      } else {
+        this.data = this.dataSource
      }
    },
-    data () {
+    data() {
      return {
-        data,
        tooltip,
-        scale,
-        height: 100
+        data: [],
+        scale
      }
    }
  }

--- a/ant-design-jeecg-vue/src/components/chart/MiniProgress.vue
+++ b/ant-design-jeecg-vue/src/components/chart/MiniProgress.vue
 <template>
  <div class="chart-mini-progress">
    <div class="target" :style="{ left: target + '%'}">
-      <span :style="{ backgroundColor: color }" />
+      <span :style="{ backgroundColor: color }"/>
      <span :style="{ backgroundColor: color }"/>
    </div>
    <div class="progress-wrapper">
-      <div class="progress" :style="{ backgroundColor: color, width: percentage + '%', height: height }"></div>
+      <div class="progress" :style="{ backgroundColor: color, width: percentage + '%', height: height+'px' }"></div>
    </div>
  </div>
 </template>

 <script>
  export default {
-    name: "MiniProgress",
+    name: 'MiniProgress',
    props: {
      target: {
        type: Number,
        default: 0
      },
      height: {
-        type: String,
-        default: '10px'
+        type: Number,
+        default: 10
      },
      color: {
        type: String,
@@ -64,7 +64,7 @@
      position: relative;

      .progress {
-        transition: all .4s cubic-bezier(.08,.82,.17,1) 0s;
+        transition: all .4s cubic-bezier(.08, .82, .17, 1) 0s;
        border-radius: 1px 0 0 1px;
        background-color: #1890ff;
        width: 0;

--- a/ant-design-jeecg-vue/src/components/chart/Pie.vue
+++ b/ant-design-jeecg-vue/src/components/chart/Pie.vue
+<template>
+  <v-chart :forceFit="true" :height="height" :data="data" :scale="scale">
+    <v-tooltip :showTitle="false" dataKey="item*percent"/>
+    <v-axis/>
+    <v-legend dataKey="item"/>
+    <v-pie position="percent" color="item" :v-style="pieStyle" :label="labelConfig"/>
+    <v-coord type="theta"/>
+  </v-chart>
+</template>
+
+<script>
+  const DataSet = require('@antv/data-set')
+
+  const sourceData = [
+    { item: '事例一', percent: 40 },
+    { item: '事例二', percent: 21 },
+    { item: '事例三', percent: 17 },
+    { item: '事例四', percent: 13 },
+    { item: '事例五', percent: 9 }
+  ]
+
+  const scale = [{
+    dataKey: 'percent',
+    min: 0,
+    formatter: '.0%'
+  }]
+
+  export default {
+    props: {
+      title: {
+        type: String,
+        default: ''
+      },
+      height: {
+        type: Number,
+        default: 254
+      },
+      dataSource: {
+        type: Array,
+        default: () => []
+      }
+    },
+    created() {
+      this.change()
+    },
+    watch: {
+      'dataSource': function() {
+        this.change()
+      }
+    },
+    methods: {
+      change() {
+        if (this.dataSource.length === 0) {
+          this.data = sourceData
+        } else {
+          const dv = new DataSet.View().source(this.dataSource)
+          dv.transform({
+            type: 'percent',
+            field: 'count',
+            dimension: 'item',
+            as: 'percent'
+          })
+          this.data = dv.rows
+        }
+      }
+    },
+    data() {
+      return {
+        data: '',
+        scale,
+        pieStyle: {
+          stroke: '#fff',
+          lineWidth: 1
+        },
+        labelConfig: ['percent', {
+          formatter: (val, item) => {
+            return item.point.item + ': ' + val
+          }
+        }]
+      }
+    }
+  }
+</script>
\ No newline at end of file
--- a/ant-design-jeecg-vue/src/components/chart/README.md
+++ b/ant-design-jeecg-vue/src/components/chart/README.md
+# 报表组件文档
+
+## 柱状图
+
+##### 引用方式
+
+```js 
+import Bar from '@/components/chart/Bar'
+```
+
+##### 参数列表
+
+| 参数名        | 类型     | 必填 | 说明         |
+|------------|--------|----|------------|
+| title      | string |    | 报表标题       |
+| dataSource | array  | ✔️ | 报表数据源      |
+| height     | number |    | 报表高度，默认254 |
+
+##### dataSource 示例
+
+```json
+[
+    {
+        "x": "1月",
+        "y": 320
+    },
+    {
+        "x": "2月",
+        "y": 457
+    },
+    {
+        "x": "3月",
+        "y": 182
+    }
+]
+```
+
+## 多列柱状图
+
+##### 引用方式
+
+```js 
+import BarMultid from '@/components/chart/BarMultid'
+```
+
+##### 参数列表
+
+| 参数名        | 类型     | 必填 | 说明         |
+|------------|--------|----|------------|
+| title      | string |    | 报表标题       |
+| fields     | array  |    | 主列字段列表     |
+| dataSource | array  |    | 报表数据源      |
+| height     | number |    | 报表高度，默认254 |
+
+##### fields 示例
+
+```json
+["Jan.", "Feb.", "Mar.", "Apr.", "May", "Jun.", "Jul.", "Aug."]
+```
+
+##### dataSource 示例
+
+```json
+[
+    {
+        "type": "Jeecg", // 列名
+        "Jan.": 18.9,
+        "Feb.": 28.8,
+        "Mar.": 39.3,
+        "Apr.": 81.4,
+        "May": 47,
+        "Jun.": 20.3,
+        "Jul.": 24,
+        "Aug.": 35.6
+    },
+    {
+        "type": "Jeebt",
+        "Jan.": 12.4,
+        "Feb.": 23.2,
+        "Mar.": 34.5,
+        "Apr.": 99.7,
+        "May": 52.6,
+        "Jun.": 35.5,
+        "Jul.": 37.4,
+        "Aug.": 42.4
+    }
+]
+```
+
+## 迷你柱状图
+
+不带标题和数据轴的柱状图
+
+##### 引用方式
+
+```js 
+import MiniBar from '@/components/chart/MiniBar'
+```
+
+##### 参数列表
+
+| 参数名        | 类型     | 必填 | 说明            |
+|------------|--------|----|---------------|
+| width      | number |    | 报表宽度度，默认自适应宽度 |
+| height     | number |    | 报表高度，默认200    |
+| dataSource | array  |    | 报表数据源         |
+
+##### dataSource 示例
+
+```json
+[
+    {
+        "x": "1月",
+        "y": 320
+    },
+    {
+        "x": "2月",
+        "y": 457
+    },
+    {
+        "x": "3月",
+        "y": 182
+    }
+]
+```
+
+## 面积图
+
+##### 引用方式
+
+```js 
+import AreaChartTy from '@/components/chart/AreaChartTy'
+```
+
+##### 参数列表
+
+| 参数名        | 类型     | 必填 | 说明         |
+|------------|--------|----|------------|
+| title      | string |    | 报表标题       |
+| dataSource | array  | ✔️ | 报表数据源      |
+| height     | number |    | 报表高度，默认254 |
+| lineSize   | number |    | 线的粗细，默认2   |
+
+##### dataSource 示例
+
+```json
+[
+    {
+        "x": "1月",
+        "y": 320
+    },
+    {
+        "x": "2月",
+        "y": 457
+    },
+    {
+        "x": "3月",
+        "y": 182
+    }
+]
+```
+
+## 多行折线图
+
+##### 引用方式
+
+```js 
+import LineChartMultid from '@/components/chart/LineChartMultid'
+```
+
+##### 参数列表
+
+| 参数名        | 类型     | 必填 | 说明         |
+|------------|--------|----|------------|
+| title      | string |    | 报表标题       |
+| fields     | array  |    | 主列字段列表     |
+| dataSource | array  |    | 报表数据源      |
+| height     | number |    | 报表高度，默认254 |
+
+##### fields 示例
+
+```json
+["jeecg", "jeebt"]
+```
+
+##### dataSource 示例
+
+```json
+[
+    {
+        "type": "Jan", // 列名
+        "jeecg": 7,
+        "jeebt": 3.9
+    },
+    { "type": "Feb", "jeecg": 6.9, "jeebt": 4.2 },
+    { "type": "Mar", "jeecg": 9.5, "jeebt": 5.7 },
+    { "type": "Apr", "jeecg": 14.5, "jeebt": 8.5 },
+    { "type": "May", "jeecg": 18.4, "jeebt": 11.9 },
+    { "type": "Jun", "jeecg": 21.5, "jeebt": 15.2 },
+    { "type": "Jul", "jeecg": 25.2, "jeebt": 17 },
+    { "type": "Aug", "jeecg": 26.5, "jeebt": 16.6 },
+    { "type": "Sep", "jeecg": 23.3, "jeebt": 14.2 },
+    { "type": "Oct", "jeecg": 18.3, "jeebt": 10.3 },
+    { "type": "Nov", "jeecg": 13.9, "jeebt": 6.6 },
+    { "type": "Dec", "jeecg": 9.6, "jeebt": 4.8 }
+]
+```
+
+## 饼状图
+
+##### 引用方式
+
+```js 
+import Pie from '@/components/chart/Pie'
+```
+
+##### 参数列表
+
+| 参数名        | 类型     | 必填 | 说明         |
+|------------|--------|----|------------|
+| dataSource | array  |    | 报表数据源      |
+| height     | number |    | 报表高度，默认254 |
+
+##### dataSource 示例
+
+```json
+[
+    // 所有的 percent 相加等于 100
+    { "item": "一月", "percent": 40 },
+    { "item": "二月", "percent": 21 },
+    { "item": "三月", "percent": 17 },
+    { "item": "四月", "percent": 13 },
+    { "item": "五月", "percent": 9 }
+]
+```
+
+## 雷达图
+
+##### 引用方式
+
+```js 
+import Radar from '@/components/chart/Radar'
+```
+
+##### 参数列表
+
+| 参数名        | 类型     | 必填 | 说明         |
+|------------|--------|----|------------|
+| dataSource | array  |    | 报表数据源      |
+| height     | number |    | 报表高度，默认254 |
+
+##### dataSource 示例
+
+```json
+[
+    // score 最小值为 0，最大值为 100
+    { "item": "一月", "score": 40 },
+    { "item": "二月", "score": 20 },
+    { "item": "三月", "score": 67 },
+    { "item": "四月", "score": 43 },
+    { "item": "五月", "score": 90 }
+]
+```
+
+## 进度条
+
+##### 引用方式
+
+```js 
+import MiniProgress from '@/components/chart/MiniProgress'
+```
+
+##### 参数列表
+
+| 参数名        | 类型     | 必填 | 说明                |
+|------------|--------|----|-------------------|
+| percentage | number |    | 当前进度百分比，默认0，最高100 |
+| target     | number |    | 目标值，默认10          |
+| height     | number |    | 进度条高度，默认10        |
+| color      | string |    | 进度条颜色，默认 #13C2C2  |
+
+## 仪表盘
+
+##### 引用方式
+
+```js 
+import DashChartDemo from '@/components/chart/DashChartDemo'
+```
+
+##### 参数列表
+
+| 参数名    | 类型     | 必填 | 说明             |
+|--------|--------|----|----------------|
+| title  | string |    | 报表标题           |
+| value  | number |    | 当前值，默认6.7，最大为9 |
+| height | number |    | 报表高度，默认254     |
+
+## 排名列表
+
+##### 引用方式
+
+```js 
+import RankList from '@/components/chart/RankList'
+```
+
+##### 参数列表
+
+| 参数名    | 类型     | 必填 | 说明           |
+|--------|--------|----|--------------|
+| title  | string |    | 报表标题         |
+| list   | array  |    | 排名列表数据       |
+| height | number |    | 报表高度，默认自适应高度 |
+
+##### list 示例
+
+```json
+[
+    {
+        "name": "北京朝阳 1 号店",
+        "total": 1981
+    },
+    { "name": "北京朝阳 2 号店", "total": 1359 },
+    { "name": "北京朝阳 3 号店", "total": 1354 },
+    { "name": "北京朝阳 4 号店", "total": 263 },
+    { "name": "北京朝阳 5 号店", "total": 446 },
+    { "name": "北京朝阳 6 号店", "total": 796 }
+]
+```
\ No newline at end of file
--- a/ant-design-jeecg-vue/src/components/chart/Radar.vue
+++ b/ant-design-jeecg-vue/src/components/chart/Radar.vue
 <template>
-  <v-chart :forceFit="true" height="400" :data="data" :padding="[20, 20, 95, 20]" :scale="scale">
+  <v-chart :forceFit="true" :height="height" :data="data" :padding="[20, 20, 95, 20]" :scale="scale">
    <v-tooltip></v-tooltip>
-    <v-axis :dataKey="axis1Opts.dataKey" :line="axis1Opts.line" :tickLine="axis1Opts.tickLine" :grid="axis1Opts.grid" />
-    <v-axis :dataKey="axis2Opts.dataKey" :line="axis2Opts.line" :tickLine="axis2Opts.tickLine" :grid="axis2Opts.grid" />
-    <v-legend dataKey="user" marker="circle" :offset="30" />
-    <v-coord type="polar" radius="0.8" />
-    <v-line position="item*score" color="user" :size="2" />
-    <v-point position="item*score" color="user" :size="4" shape="circle" />
+    <v-axis :dataKey="axis1Opts.dataKey" :line="axis1Opts.line" :tickLine="axis1Opts.tickLine" :grid="axis1Opts.grid"/>
+    <v-axis :dataKey="axis2Opts.dataKey" :line="axis2Opts.line" :tickLine="axis2Opts.tickLine" :grid="axis2Opts.grid"/>
+    <v-legend dataKey="user" marker="circle" :offset="30"/>
+    <v-coord type="polar" radius="0.8"/>
+    <v-line position="item*score" color="user" :size="2"/>
+    <v-point position="item*score" color="user" :size="4" shape="circle"/>
  </v-chart>
 </template>

@@ -38,26 +38,48 @@
    {
      dataKey: 'score',
      min: 0,
-      max: 80
+      max: 100
    }, {
      dataKey: 'user',
      alias: '类型'
    }
  ]

+  const sourceData = [
+    { item: '示例一', score: 40 },
+    { item: '示例二', score: 20 },
+    { item: '示例三', score: 67 },
+    { item: '示例四', score: 43 },
+    { item: '示例五', score: 90 }
+  ]
+
  export default {
    name: 'Radar',
    props: {
-      data: {
+      height: {
+        type: Number,
+        default: 254
+      },
+      dataSource: {
        type: Array,
-        default: null,
+        default: () => []
      }
    },
-    data () {
+    data() {
      return {
        axis1Opts,
        axis2Opts,
-        scale
+        scale,
+        data: sourceData
+      }
+    },
+    watch: {
+      dataSource(newVal) {
+        if (newVal.length === 0) {
+          this.data = sourceData
+        } else {
+          this.data = newVal
+        }
      }
    }
  }

--- a/ant-design-jeecg-vue/src/components/chart/RankList.vue
+++ b/ant-design-jeecg-vue/src/components/chart/RankList.vue
 <template>
  <div class="rank">
    <h4 class="title">{{ title }}</h4>
-    <ul class="list">
+    <ul class="list" :style="{height:height?`${height}px`:'auto',overflow:'auto'}">
      <li :key="index" v-for="(item, index) in list">
        <span :class="index < 3 ? 'active' : null">{{ index + 1 }}</span>
        <span>{{ item.name }}</span>
@@ -23,6 +23,10 @@
      list: {
        type: Array,
        default: null
+      },
+      height: {
+        type: Number,
+        default: null
      }
    }
  }

--- a/ant-design-jeecg-vue/src/components/chart/TransferBar.vue
+++ b/ant-design-jeecg-vue/src/components/chart/TransferBar.vue
@@ -2,63 +2,65 @@
  <div :style="{ padding: '0 0 32px 32px' }">
    <h4 :style="{ marginBottom: '20px' }">{{ title }}</h4>
    <v-chart
-      height="254"
+      :height="height"
      :data="data"
      :scale="scale"
      :forceFit="true"
      :padding="['auto', 'auto', '40', '50']">
-      <v-tooltip />
-      <v-axis />
+      <v-tooltip/>
+      <v-axis/>
      <v-bar position="x*y"/>
    </v-chart>
  </div>
 </template>

 <script>
-  const tooltip = [
-    'x*y',
-    (x, y) => ({
-      name: x,
-      value: y
-    })
-  ]
-  const scale = [{
-    dataKey: 'x',
-    title: '日期(天)',
-    alias: '日期(天)',
-    min: 2
-  }, {
-    dataKey: 'y',
-    title: '流量(Gb)',
-    alias: '流量(Gb)',
-    min: 1
-  }]

  export default {
-    name: "Bar",
+    name: 'Bar',
    props: {
      title: {
        type: String,
        default: ''
+      },
+      x: {
+        type: String,
+        default: 'x'
+      },
+      y: {
+        type: String,
+        default: 'y'
+      },
+      data: {
+        type: Array,
+        default: () => []
+      },
+      height: {
+        type: Number,
+        default: 254
      }
    },
-    data () {
-      return {
-        data: [],
-        scale,
-        tooltip
+    data() {
+      return {}
+    },
+    computed: {
+      scale() {
+        return [
+          { dataKey: 'x', title: this.x, alias: this.x },
+          { dataKey: 'y', title: this.y, alias: this.y }
+        ]
      }
    },
-    created () {
-      this.getMonthBar()
+    created() {
+      // this.getMonthBar()
    },
    methods: {
-      getMonthBar() {
-        this.$http.get('/analysis/month-bar')
-          .then(res => {
-            this.data = res.result
-          })
-      }
+      // getMonthBar() {
+      //   this.$http.get('/analysis/month-bar')
+      //     .then(res => {
+      //       this.data = res.result
+      //     })
+      // }
    }
  }
 </script>
\ No newline at end of file
--- a/ant-design-jeecg-vue/src/components/chart/Trend.vue
+++ b/ant-design-jeecg-vue/src/components/chart/Trend.vue
@@ -10,11 +10,13 @@
  export default {
    name: "Trend",
    props: {
+      // 同title
      term: {
        type: String,
        default: '',
        required: true
      },
+      // 百分比
      percentage: {
        type: Number,
        default: null

--- a/ant-design-jeecg-vue/src/components/dict/DictSelectTag.vue
+++ b/ant-design-jeecg-vue/src/components/dict/DictSelectTag.vue
@@ -9,10 +9,11 @@
  import {ajaxGetDictItems} from '@/api/api'

  export default {
-    name: "DictSelectTag",
+    name: "JDictSelectTag",
    props: {
      dictCode: String,
      placeholder: String,
+      triggerChange: Boolean,
      value: String,// 1.接收一个 value prop
    },
    data() {
@@ -37,7 +38,11 @@
      },
      handleInput(val) {
        console.log(val);
-        this.$emit('input', val); // 2.触发 input 事件，并传入新值
+        if(this.triggerChange){
+          this.$emit('change', val);
+        }else{
+          this.$emit('input', val);
+        }
      }
    }
  }

--- a/ant-design-jeecg-vue/src/components/dict/DictSelectUtil.js
+++ b/ant-design-jeecg-vue/src/components/dict/DictSelectUtil.js
--- a/ant-design-jeecg-vue/src/components/dict/README.md
+++ b/ant-design-jeecg-vue/src/components/dict/README.md
--- a/ant-design-jeecg-vue/src/components/dict/UserInfoTag.vue
+++ b/ant-design-jeecg-vue/src/components/dict/UserInfoTag.vue
--- a/ant-design-jeecg-vue/src/components/dict/index.js
+++ b/ant-design-jeecg-vue/src/components/dict/index.js
-import T from './DictSelectTag.vue'
-const DictSelectTag = {
+import T from './JDictSelectTag.vue'
+const JDictSelectTag = {
  install: function (Vue) {
-    Vue.component('DictSelectTag',T);
+    Vue.component('JDictSelectTag',T);
  }
 }
-export default DictSelectTag;
\ No newline at end of file
+export default JDictSelectTag;
\ No newline at end of file
--- a/ant-design-jeecg-vue/src/components/jeecg/JCheckbox.vue
+++ b/ant-design-jeecg-vue/src/components/jeecg/JCheckbox.vue
--- a/ant-design-jeecg-vue/src/components/jeecg/JDate.vue
+++ b/ant-design-jeecg-vue/src/components/jeecg/JDate.vue
--- a/ant-design-jeecg-vue/src/components/jeecg/JEditableTable.vue
+++ b/ant-design-jeecg-vue/src/components/jeecg/JEditableTable.vue
--- a/ant-design-jeecg-vue/src/components/jeecg/JEditor.vue
+++ b/ant-design-jeecg-vue/src/components/jeecg/JEditor.vue
--- a/ant-design-jeecg-vue/src/components/jeecg/JEllipsis.vue
+++ b/ant-design-jeecg-vue/src/components/jeecg/JEllipsis.vue
--- a/ant-design-jeecg-vue/src/components/jeecg/JImportModal.vue
+++ b/ant-design-jeecg-vue/src/components/jeecg/JImportModal.vue
--- a/ant-design-jeecg-vue/src/components/jeecg/JSelectMultiple.vue
+++ b/ant-design-jeecg-vue/src/components/jeecg/JSelectMultiple.vue
--- a/ant-design-jeecg-vue/src/components/jeecg/JSuperQuery.vue
+++ b/ant-design-jeecg-vue/src/components/jeecg/JSuperQuery.vue
--- a/ant-design-jeecg-vue/src/components/jeecg/README.md
+++ b/ant-design-jeecg-vue/src/components/jeecg/README.md
--- a/ant-design-jeecg-vue/src/components/jeecg/README_JEditableTable.md
+++ b/ant-design-jeecg-vue/src/components/jeecg/README_JEditableTable.md
--- a/ant-design-jeecg-vue/src/components/jeecgbiz/JSearchUserByDep.vue
+++ b/ant-design-jeecg-vue/src/components/jeecgbiz/JSearchUserByDep.vue
--- a/ant-design-jeecg-vue/src/components/jeecgbiz/JSearchUserByDepModal.vue
+++ b/ant-design-jeecg-vue/src/components/jeecgbiz/JSearchUserByDepModal.vue
--- a/ant-design-jeecg-vue/src/components/jeecgbiz/JSelectUser.vue
+++ b/ant-design-jeecg-vue/src/components/jeecgbiz/JSelectUser.vue
--- a/ant-design-jeecg-vue/src/components/jeecgbiz/SearchUserByDepModal.vue
+++ b/ant-design-jeecg-vue/src/components/jeecgbiz/SearchUserByDepModal.vue
--- a/ant-design-jeecg-vue/src/components/jeecgbiz/SelectMultipleUserModal.vue
+++ b/ant-design-jeecg-vue/src/components/jeecgbiz/SelectMultipleUserModal.vue
--- a/ant-design-jeecg-vue/src/components/jeecgbiz/modal/SelectUserListModal.vue
+++ b/ant-design-jeecg-vue/src/components/jeecgbiz/modal/SelectUserListModal.vue
--- a/ant-design-jeecg-vue/src/components/layouts/TabLayout.vue
+++ b/ant-design-jeecg-vue/src/components/layouts/TabLayout.vue
--- a/ant-design-jeecg-vue/src/components/layouts/UserLayout.vue
+++ b/ant-design-jeecg-vue/src/components/layouts/UserLayout.vue
--- a/ant-design-jeecg-vue/src/components/menu/SideMenu.vue
+++ b/ant-design-jeecg-vue/src/components/menu/SideMenu.vue
--- a/ant-design-jeecg-vue/src/components/menu/index.js
+++ b/ant-design-jeecg-vue/src/components/menu/index.js
--- a/ant-design-jeecg-vue/src/components/page/GlobalHeader.vue
+++ b/ant-design-jeecg-vue/src/components/page/GlobalHeader.vue
--- a/ant-design-jeecg-vue/src/components/page/GlobalLayout.vue
+++ b/ant-design-jeecg-vue/src/components/page/GlobalLayout.vue
--- a/ant-design-jeecg-vue/src/components/page/PageLayout.vue
+++ b/ant-design-jeecg-vue/src/components/page/PageLayout.vue
 <template>
-  <div :style="!$route.meta.pageHeader ? 'margin: -16px -24px 0px;' : null">
+  <div :style="!$route.meta.pageHeader ? 'margin: -10px -24px 0;' : null">
    <!-- pageHeader , route meta hideHeader:true on hide -->
    <page-header v-if="!$route.meta.pageHeader" :title="title" :logo="logo" :avatar="avatar">
      <slot slot="action" name="action"></slot>

--- a/ant-design-jeecg-vue/src/components/setting/SettingDrawer.vue
+++ b/ant-design-jeecg-vue/src/components/setting/SettingDrawer.vue
--- a/ant-design-jeecg-vue/src/components/tools/Logo.vue
+++ b/ant-design-jeecg-vue/src/components/tools/Logo.vue
--- a/ant-design-jeecg-vue/src/components/tools/UserMenu.vue
+++ b/ant-design-jeecg-vue/src/components/tools/UserMenu.vue
--- a/ant-design-jeecg-vue/src/config/router.config.js
+++ b/ant-design-jeecg-vue/src/config/router.config.js
--- a/ant-design-jeecg-vue/src/defaultSettings.js
+++ b/ant-design-jeecg-vue/src/defaultSettings.js
--- a/ant-design-jeecg-vue/src/main.js
+++ b/ant-design-jeecg-vue/src/main.js
--- a/ant-design-jeecg-vue/src/mixins/JEditableTableOneToManyMixin.js
+++ b/ant-design-jeecg-vue/src/mixins/JEditableTableOneToManyMixin.js
--- a/ant-design-jeecg-vue/src/mixins/JeecgListMixin.js
+++ b/ant-design-jeecg-vue/src/mixins/JeecgListMixin.js
--- a/ant-design-jeecg-vue/src/store/modules/app.js
+++ b/ant-design-jeecg-vue/src/store/modules/app.js
--- a/ant-design-jeecg-vue/src/store/modules/user.js
+++ b/ant-design-jeecg-vue/src/store/modules/user.js
--- a/ant-design-jeecg-vue/src/utils/JEditableTableUtil.js
+++ b/ant-design-jeecg-vue/src/utils/JEditableTableUtil.js
--- a/ant-design-jeecg-vue/src/utils/axios.js
+++ b/ant-design-jeecg-vue/src/utils/axios.js
--- a/ant-design-jeecg-vue/src/utils/filter.js
+++ b/ant-design-jeecg-vue/src/utils/filter.js
--- a/ant-design-jeecg-vue/src/utils/hasPermission.js
+++ b/ant-design-jeecg-vue/src/utils/hasPermission.js
--- a/ant-design-jeecg-vue/src/utils/mixin.js
+++ b/ant-design-jeecg-vue/src/utils/mixin.js
--- a/ant-design-jeecg-vue/src/utils/request.js
+++ b/ant-design-jeecg-vue/src/utils/request.js
--- a/ant-design-jeecg-vue/src/utils/util.js
+++ b/ant-design-jeecg-vue/src/utils/util.js
--- a/ant-design-jeecg-vue/src/utils/validate.js
+++ b/ant-design-jeecg-vue/src/utils/validate.js
--- a/ant-design-jeecg-vue/src/views/account/center/Index.vue
+++ b/ant-design-jeecg-vue/src/views/account/center/Index.vue
--- a/ant-design-jeecg-vue/src/views/dashboard/Analysis.vue
+++ b/ant-design-jeecg-vue/src/views/dashboard/Analysis.vue
--- a/ant-design-jeecg-vue/src/views/dashboard/Workplace.vue
+++ b/ant-design-jeecg-vue/src/views/dashboard/Workplace.vue
--- a/ant-design-jeecg-vue/src/views/jeecg/FlowTest.vue
+++ b/ant-design-jeecg-vue/src/views/jeecg/FlowTest.vue
--- a/ant-design-jeecg-vue/src/views/jeecg/JSearchUserByDepList.vue
+++ b/ant-design-jeecg-vue/src/views/jeecg/JSearchUserByDepList.vue
--- a/ant-design-jeecg-vue/src/views/jeecg/JeecgDemoList.vue
+++ b/ant-design-jeecg-vue/src/views/jeecg/JeecgDemoList.vue
--- a/ant-design-jeecg-vue/src/views/jeecg/JeecgEditableTableExample.vue
+++ b/ant-design-jeecg-vue/src/views/jeecg/JeecgEditableTableExample.vue
--- a/ant-design-jeecg-vue/src/views/jeecg/JeecgOrderMainList.vue
+++ b/ant-design-jeecg-vue/src/views/jeecg/JeecgOrderMainList.vue
--- a/ant-design-jeecg-vue/src/views/jeecg/JeecgOrderMainListForJEditableTable.vue
+++ b/ant-design-jeecg-vue/src/views/jeecg/JeecgOrderMainListForJEditableTable.vue
--- a/ant-design-jeecg-vue/src/views/jeecg/PrintDemoList.vue
+++ b/ant-design-jeecg-vue/src/views/jeecg/PrintDemoList.vue
--- a/ant-design-jeecg-vue/src/views/jeecg/SearchUserByDepList.vue
+++ b/ant-design-jeecg-vue/src/views/jeecg/SearchUserByDepList.vue
--- a/ant-design-jeecg-vue/src/views/jeecg/SelectDemo.vue
+++ b/ant-design-jeecg-vue/src/views/jeecg/SelectDemo.vue
--- a/ant-design-jeecg-vue/src/views/jeecg/TableExpandeSub.vue
+++ b/ant-design-jeecg-vue/src/views/jeecg/TableExpandeSub.vue
--- a/ant-design-jeecg-vue/src/views/jeecg/helloworld.vue
+++ b/ant-design-jeecg-vue/src/views/jeecg/helloworld.vue
--- a/ant-design-jeecg-vue/src/views/jeecg/modules/JeecgOrderMainModal.vue
+++ b/ant-design-jeecg-vue/src/views/jeecg/modules/JeecgOrderMainModal.vue
--- a/ant-design-jeecg-vue/src/views/jeecg/modules/JeecgOrderModalForJEditableTable.vue
+++ b/ant-design-jeecg-vue/src/views/jeecg/modules/JeecgOrderModalForJEditableTable.vue
--- a/ant-design-jeecg-vue/src/views/jeecg/report/Analysis.vue
+++ b/ant-design-jeecg-vue/src/views/jeecg/report/Analysis.vue
--- a/ant-design-jeecg-vue/src/views/jeecg/report/ArchivesStatisticst.vue
+++ b/ant-design-jeecg-vue/src/views/jeecg/report/ArchivesStatisticst.vue
--- a/ant-design-jeecg-vue/src/views/jeecg/report/ViserChartDemo.vue
+++ b/ant-design-jeecg-vue/src/views/jeecg/report/ViserChartDemo.vue
--- a/ant-design-jeecg-vue/src/views/jeecg/tablist/JeecgOrderCustomerList.vue
+++ b/ant-design-jeecg-vue/src/views/jeecg/tablist/JeecgOrderCustomerList.vue
--- a/ant-design-jeecg-vue/src/views/jeecg/tablist/JeecgOrderDMainList.vue
+++ b/ant-design-jeecg-vue/src/views/jeecg/tablist/JeecgOrderDMainList.vue
--- a/ant-design-jeecg-vue/src/views/jeecg/tablist/JeecgOrderTicketList.vue
+++ b/ant-design-jeecg-vue/src/views/jeecg/tablist/JeecgOrderTicketList.vue
--- a/ant-design-jeecg-vue/src/views/jeecg/tablist/form/JeecgOrderCustomerModal.vue
+++ b/ant-design-jeecg-vue/src/views/jeecg/tablist/form/JeecgOrderCustomerModal.vue
--- a/ant-design-jeecg-vue/src/views/jeecg/tablist/form/JeecgOrderDMainModal.vue
+++ b/ant-design-jeecg-vue/src/views/jeecg/tablist/form/JeecgOrderDMainModal.vue
--- a/ant-design-jeecg-vue/src/views/jeecg/tablist/form/JeecgOrderTicketModal.vue
+++ b/ant-design-jeecg-vue/src/views/jeecg/tablist/form/JeecgOrderTicketModal.vue
--- a/ant-design-jeecg-vue/src/views/modules/message/SysMessageList.vue
+++ b/ant-design-jeecg-vue/src/views/modules/message/SysMessageList.vue
--- a/ant-design-jeecg-vue/src/views/modules/message/SysMessageTemplateList.vue
+++ b/ant-design-jeecg-vue/src/views/modules/message/SysMessageTemplateList.vue
--- a/ant-design-jeecg-vue/src/views/modules/message/modules/SysMessageModal.vue
+++ b/ant-design-jeecg-vue/src/views/modules/message/modules/SysMessageModal.vue
--- a/ant-design-jeecg-vue/src/views/modules/message/modules/SysMessageTemplateModal.vue
+++ b/ant-design-jeecg-vue/src/views/modules/message/modules/SysMessageTemplateModal.vue
--- a/ant-design-jeecg-vue/src/views/modules/message/modules/SysMessageTestModal.vue
+++ b/ant-design-jeecg-vue/src/views/modules/message/modules/SysMessageTestModal.vue
--- a/ant-design-jeecg-vue/src/views/modules/online/cgreport/OnlCgreportHeadList.vue
+++ b/ant-design-jeecg-vue/src/views/modules/online/cgreport/OnlCgreportHeadList.vue
--- a/ant-design-jeecg-vue/src/views/modules/online/cgreport/auto/OnlCgreportAutoList.vue
+++ b/ant-design-jeecg-vue/src/views/modules/online/cgreport/auto/OnlCgreportAutoList.vue
--- a/ant-design-jeecg-vue/src/views/modules/online/cgreport/auto/OnlCgreportQueryFormItem.vue
+++ b/ant-design-jeecg-vue/src/views/modules/online/cgreport/auto/OnlCgreportQueryFormItem.vue
--- a/ant-design-jeecg-vue/src/views/modules/online/cgreport/modules/OnlCgreportHeadModal.vue
+++ b/ant-design-jeecg-vue/src/views/modules/online/cgreport/modules/OnlCgreportHeadModal.vue
--- a/ant-design-jeecg-vue/src/views/monitor/HttpTrace.vue
+++ b/ant-design-jeecg-vue/src/views/monitor/HttpTrace.vue
--- a/ant-design-jeecg-vue/src/views/monitor/JvmInfo.vue
+++ b/ant-design-jeecg-vue/src/views/monitor/JvmInfo.vue
--- a/ant-design-jeecg-vue/src/views/monitor/RedisInfo.vue
+++ b/ant-design-jeecg-vue/src/views/monitor/RedisInfo.vue
--- a/ant-design-jeecg-vue/src/views/monitor/RedisTerminal.vue
+++ b/ant-design-jeecg-vue/src/views/monitor/RedisTerminal.vue
--- a/ant-design-jeecg-vue/src/views/monitor/SystemInfo.vue
+++ b/ant-design-jeecg-vue/src/views/monitor/SystemInfo.vue
--- a/ant-design-jeecg-vue/src/views/monitor/TomcatInfo.vue
+++ b/ant-design-jeecg-vue/src/views/monitor/TomcatInfo.vue
--- a/ant-design-jeecg-vue/src/views/system/DataLogList.vue
+++ b/ant-design-jeecg-vue/src/views/system/DataLogList.vue
--- a/ant-design-jeecg-vue/src/views/system/DepartList.vue
+++ b/ant-design-jeecg-vue/src/views/system/DepartList.vue
--- a/ant-design-jeecg-vue/src/views/system/DepartList2.vue
+++ b/ant-design-jeecg-vue/src/views/system/DepartList2.vue
--- a/ant-design-jeecg-vue/src/views/system/DictItemList.vue
+++ b/ant-design-jeecg-vue/src/views/system/DictItemList.vue
--- a/ant-design-jeecg-vue/src/views/system/DictList.vue
+++ b/ant-design-jeecg-vue/src/views/system/DictList.vue
--- a/ant-design-jeecg-vue/src/views/system/LogList.vue
+++ b/ant-design-jeecg-vue/src/views/system/LogList.vue
--- a/ant-design-jeecg-vue/src/views/system/PermissionDataRuleList.vue
+++ b/ant-design-jeecg-vue/src/views/system/PermissionDataRuleList.vue
--- a/ant-design-jeecg-vue/src/views/system/PermissionList.vue
+++ b/ant-design-jeecg-vue/src/views/system/PermissionList.vue
--- a/ant-design-jeecg-vue/src/views/system/QuartzJobList.vue
+++ b/ant-design-jeecg-vue/src/views/system/QuartzJobList.vue
--- a/ant-design-jeecg-vue/src/views/system/RoleList.vue
+++ b/ant-design-jeecg-vue/src/views/system/RoleList.vue
--- a/ant-design-jeecg-vue/src/views/system/SysAnnouncementList.vue
+++ b/ant-design-jeecg-vue/src/views/system/SysAnnouncementList.vue
--- a/ant-design-jeecg-vue/src/views/system/UserList.vue
+++ b/ant-design-jeecg-vue/src/views/system/UserList.vue
--- a/ant-design-jeecg-vue/src/views/system/modules/DataLogCompareModal.vue
+++ b/ant-design-jeecg-vue/src/views/system/modules/DataLogCompareModal.vue
--- a/ant-design-jeecg-vue/src/views/system/modules/DataLogModal.vue
+++ b/ant-design-jeecg-vue/src/views/system/modules/DataLogModal.vue
--- a/ant-design-jeecg-vue/src/views/system/modules/DepartModal.vue
+++ b/ant-design-jeecg-vue/src/views/system/modules/DepartModal.vue
--- a/ant-design-jeecg-vue/src/views/system/modules/DepartWindow.vue
+++ b/ant-design-jeecg-vue/src/views/system/modules/DepartWindow.vue
--- a/ant-design-jeecg-vue/src/views/system/modules/DictItemModal.vue
+++ b/ant-design-jeecg-vue/src/views/system/modules/DictItemModal.vue
--- a/ant-design-jeecg-vue/src/views/system/modules/DictModal.vue
+++ b/ant-design-jeecg-vue/src/views/system/modules/DictModal.vue
--- a/ant-design-jeecg-vue/src/views/system/modules/PermissionDataRuleModal.vue
+++ b/ant-design-jeecg-vue/src/views/system/modules/PermissionDataRuleModal.vue
--- a/ant-design-jeecg-vue/src/views/system/modules/PermissionModal.vue
+++ b/ant-design-jeecg-vue/src/views/system/modules/PermissionModal.vue
--- a/ant-design-jeecg-vue/src/views/system/modules/RoleDataruleModal.vue
+++ b/ant-design-jeecg-vue/src/views/system/modules/RoleDataruleModal.vue
--- a/ant-design-jeecg-vue/src/views/system/modules/UserModal.vue
+++ b/ant-design-jeecg-vue/src/views/system/modules/UserModal.vue
--- a/ant-design-jeecg-vue/src/views/system/modules/UserRoleModal.vue
+++ b/ant-design-jeecg-vue/src/views/system/modules/UserRoleModal.vue
--- a/ant-design-jeecg-vue/src/views/user/Login.vue
+++ b/ant-design-jeecg-vue/src/views/user/Login.vue
--- a/ant-design-jeecg-vue/vue.config.js
+++ b/ant-design-jeecg-vue/vue.config.js
--- a/ant-design-jeecg-vue/yarn.lock
+++ b/ant-design-jeecg-vue/yarn.lock
--- a/jeecg-boot/README.md
+++ b/jeecg-boot/README.md
--- a/jeecg-boot/docs/- 项目说明
+++ b/jeecg-boot/docs/- 项目说明
--- a/jeecg-boot/docs/db/sys-init-20190225.sql
+++ b/jeecg-boot/docs/db/sys-init-20190225.sql
--- a/jeecg-boot/pom.xml
+++ b/jeecg-boot/pom.xml
--- a/jeecg-boot/src/main/java/org/jeecg/JeecgApplication.java
+++ b/jeecg-boot/src/main/java/org/jeecg/JeecgApplication.java
--- a/jeecg-boot/src/main/java/org/jeecg/JeecgCodeGenerator.java
+++ b/jeecg-boot/src/main/java/org/jeecg/JeecgCodeGenerator.java
--- a/jeecg-boot/src/main/java/org/jeecg/JeecgOneGUI.java
+++ b/jeecg-boot/src/main/java/org/jeecg/JeecgOneGUI.java
--- a/jeecg-boot/src/main/java/org/jeecg/JeecgOneToMainUtil.java
+++ b/jeecg-boot/src/main/java/org/jeecg/JeecgOneToMainUtil.java
--- a/jeecg-boot/src/main/java/org/jeecg/common/api/vo/Result.java
+++ b/jeecg-boot/src/main/java/org/jeecg/common/api/vo/Result.java
--- a/jeecg-boot/src/main/java/org/jeecg/common/aspect/DictAspect.java
+++ b/jeecg-boot/src/main/java/org/jeecg/common/aspect/DictAspect.java
--- a/jeecg-boot/src/main/java/org/jeecg/common/aspect/PermissionDataAspect.java
+++ b/jeecg-boot/src/main/java/org/jeecg/common/aspect/PermissionDataAspect.java
--- a/jeecg-boot/src/main/java/org/jeecg/common/aspect/annotation/Dict.java
+++ b/jeecg-boot/src/main/java/org/jeecg/common/aspect/annotation/Dict.java
--- a/jeecg-boot/src/main/java/org/jeecg/common/aspect/annotation/PermissionData.java
+++ b/jeecg-boot/src/main/java/org/jeecg/common/aspect/annotation/PermissionData.java
--- a/jeecg-boot/src/main/java/org/jeecg/common/constant/CommonConstant.java
+++ b/jeecg-boot/src/main/java/org/jeecg/common/constant/CommonConstant.java
--- a/jeecg-boot/src/main/java/org/jeecg/common/constant/DataBaseConstant.java
+++ b/jeecg-boot/src/main/java/org/jeecg/common/constant/DataBaseConstant.java
--- a/jeecg-boot/src/main/java/org/jeecg/common/jsonschema/CommonProperty.java
+++ b/jeecg-boot/src/main/java/org/jeecg/common/jsonschema/CommonProperty.java
--- a/jeecg-boot/src/main/java/org/jeecg/common/jsonschema/JsonSchemaDescrip.java
+++ b/jeecg-boot/src/main/java/org/jeecg/common/jsonschema/JsonSchemaDescrip.java
--- a/jeecg-boot/src/main/java/org/jeecg/common/jsonschema/JsonschemaUtil.java
+++ b/jeecg-boot/src/main/java/org/jeecg/common/jsonschema/JsonschemaUtil.java
--- a/jeecg-boot/src/main/java/org/jeecg/common/jsonschema/validate/NumberProperty.java
+++ b/jeecg-boot/src/main/java/org/jeecg/common/jsonschema/validate/NumberProperty.java
--- a/jeecg-boot/src/main/java/org/jeecg/common/jsonschema/validate/StringProperty.java
+++ b/jeecg-boot/src/main/java/org/jeecg/common/jsonschema/validate/StringProperty.java
--- a/jeecg-boot/src/main/java/org/jeecg/common/system/controller/CommonController.java
+++ b/jeecg-boot/src/main/java/org/jeecg/common/system/controller/CommonController.java
--- a/jeecg-boot/src/main/java/org/jeecg/common/system/query/QueryCondition.java
+++ b/jeecg-boot/src/main/java/org/jeecg/common/system/query/QueryCondition.java
--- a/jeecg-boot/src/main/java/org/jeecg/common/system/query/QueryGenerator.java
+++ b/jeecg-boot/src/main/java/org/jeecg/common/system/query/QueryGenerator.java
--- a/jeecg-boot/src/main/java/org/jeecg/common/system/query/QueryRuleEnum.java
+++ b/jeecg-boot/src/main/java/org/jeecg/common/system/query/QueryRuleEnum.java
--- a/jeecg-boot/src/main/java/org/jeecg/common/util/DateUtils.java
+++ b/jeecg-boot/src/main/java/org/jeecg/common/util/DateUtils.java
--- a/jeecg-boot/src/main/java/org/jeecg/common/util/MD5Util.java
+++ b/jeecg-boot/src/main/java/org/jeecg/common/util/MD5Util.java
--- a/jeecg-boot/src/main/java/org/jeecg/common/util/MyClassLoader.java
+++ b/jeecg-boot/src/main/java/org/jeecg/common/util/MyClassLoader.java
--- a/jeecg-boot/src/main/java/org/jeecg/common/util/RedisUtil.java
+++ b/jeecg-boot/src/main/java/org/jeecg/common/util/RedisUtil.java
--- a/jeecg-boot/src/main/java/org/jeecg/common/util/UUIDGenerator.java
+++ b/jeecg-boot/src/main/java/org/jeecg/common/util/UUIDGenerator.java
--- a/jeecg-boot/src/main/java/org/jeecg/common/util/oConvertUtils.java
+++ b/jeecg-boot/src/main/java/org/jeecg/common/util/oConvertUtils.java
--- a/jeecg-boot/src/main/java/org/jeecg/config/AutoPoiConfig.java
+++ b/jeecg-boot/src/main/java/org/jeecg/config/AutoPoiConfig.java
--- a/jeecg-boot/src/main/java/org/jeecg/config/RedisConfig.java
+++ b/jeecg-boot/src/main/java/org/jeecg/config/RedisConfig.java
--- a/jeecg-boot/src/main/java/org/jeecg/config/ShiroConfig.java
+++ b/jeecg-boot/src/main/java/org/jeecg/config/ShiroConfig.java
--- a/jeecg-boot/src/main/java/org/jeecg/config/WebMvcConfiguration.java
+++ b/jeecg-boot/src/main/java/org/jeecg/config/WebMvcConfiguration.java
--- a/jeecg-boot/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.java
+++ b/jeecg-boot/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/mock/MockController.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/demo/mock/MockController.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/mock/json/area.json
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/demo/mock/json/area.json
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/mock/json/getCntrNoCountInfo.json
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/demo/mock/json/getCntrNoCountInfo.json
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/mock/json/graphreport_chart.json
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/demo/mock/json/graphreport_chart.json
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/mock/json/sysdatalog.json
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/demo/mock/json/sysdatalog.json
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/mock/json/task_process.json
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/demo/mock/json/task_process.json
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/mock/json/user_info.json
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/demo/mock/json/user_info.json
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/controller/AutoController.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/controller/AutoController.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/controller/JeecgDemoController.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/controller/JeecgDemoController.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/controller/JeecgOrderDMainController.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/controller/JeecgOrderDMainController.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/controller/JeecgOrderMainController.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/controller/JeecgOrderMainController.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/entity/JeecgDemo.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/entity/JeecgDemo.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderCustomer.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderCustomer.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderTicket.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderTicket.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgDemoServiceImpl.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgDemoServiceImpl.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgOrderMainServiceImpl.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgOrderMainServiceImpl.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/vo/JeecgOrderMainPage.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/vo/JeecgOrderMainPage.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/message/controller/SysMessageController.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/message/controller/SysMessageController.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/message/controller/SysMessageTemplateController.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/message/controller/SysMessageTemplateController.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/message/entity/MsgParams.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/message/entity/MsgParams.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/message/entity/SysMessage.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/message/entity/SysMessage.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/message/entity/SysMessageTemplate.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/message/entity/SysMessageTemplate.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/message/handle/ISendMsgHandle.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/message/handle/ISendMsgHandle.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/message/handle/enums/SendMsgStatusEnum.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/message/handle/enums/SendMsgStatusEnum.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/message/handle/enums/SendMsgTypeEnum.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/message/handle/enums/SendMsgTypeEnum.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/message/handle/impl/EmailSendMsgHandle.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/message/handle/impl/EmailSendMsgHandle.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/message/handle/impl/SmsSendMsgHandle.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/message/handle/impl/SmsSendMsgHandle.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/message/handle/impl/WxSendMsgHandle.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/message/handle/impl/WxSendMsgHandle.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/message/job/SendMsgJob.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/message/job/SendMsgJob.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/message/mapper/SysMessageMapper.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/message/mapper/SysMessageMapper.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/message/mapper/SysMessageTemplateMapper.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/message/mapper/SysMessageTemplateMapper.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/message/mapper/xml/SysMessageMapper.xml
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/message/mapper/xml/SysMessageMapper.xml
--- a/jeecg-boot/src/main/java/org/jeecg/modules/message/mapper/xml/SysMessageTemplateMapper.xml
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/message/mapper/xml/SysMessageTemplateMapper.xml
--- a/jeecg-boot/src/main/java/org/jeecg/modules/message/service/ISysMessageService.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/message/service/ISysMessageService.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/message/service/ISysMessageTemplateService.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/message/service/ISysMessageTemplateService.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/message/service/impl/SysMessageServiceImpl.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/message/service/impl/SysMessageServiceImpl.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/message/service/impl/SysMessageTemplateServiceImpl.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/message/service/impl/SysMessageTemplateServiceImpl.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/message/util/PushMsgUtil.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/message/util/PushMsgUtil.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/monitor/controller/RedisController.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/monitor/controller/RedisController.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/monitor/domain/RedisInfo.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/monitor/domain/RedisInfo.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/monitor/exception/RedisConnectException.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/monitor/exception/RedisConnectException.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/monitor/service/RedisService.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/monitor/service/RedisService.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/monitor/service/impl/RedisServiceImpl.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/monitor/service/impl/RedisServiceImpl.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/ngalain/aop/LogRecordAspect.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/ngalain/aop/LogRecordAspect.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/ngalain/controller/NgAlainController.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/ngalain/controller/NgAlainController.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/ngalain/mapper/NgAlainMapper.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/ngalain/mapper/NgAlainMapper.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/ngalain/mapper/xml/NgAlainMapper.xml
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/ngalain/mapper/xml/NgAlainMapper.xml
--- a/jeecg-boot/src/main/java/org/jeecg/modules/ngalain/service/NgAlainService.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/ngalain/service/NgAlainService.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/ngalain/service/impl/NgAlainServiceImpl.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/ngalain/service/impl/NgAlainServiceImpl.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/controller/OnlCgreportAPI.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/controller/OnlCgreportAPI.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/controller/OnlCgreportHeadController.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/controller/OnlCgreportHeadController.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/controller/OnlCgreportItemController.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/controller/OnlCgreportItemController.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/controller/OnlCgreportParamController.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/controller/OnlCgreportParamController.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/def/CgReportConstant.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/def/CgReportConstant.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/entity/OnlCgreportHead.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/entity/OnlCgreportHead.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/entity/OnlCgreportItem.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/entity/OnlCgreportItem.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/entity/OnlCgreportParam.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/entity/OnlCgreportParam.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/mapper/OnlCgreportHeadMapper.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/mapper/OnlCgreportHeadMapper.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/mapper/OnlCgreportItemMapper.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/mapper/OnlCgreportItemMapper.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/mapper/OnlCgreportParamMapper.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/mapper/OnlCgreportParamMapper.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/mapper/xml/OnlCgreportHeadMapper.xml
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/mapper/xml/OnlCgreportHeadMapper.xml
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/mapper/xml/OnlCgreportItemMapper.xml
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/mapper/xml/OnlCgreportItemMapper.xml
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/mapper/xml/OnlCgreportParamMapper.xml
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/mapper/xml/OnlCgreportParamMapper.xml
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/model/OnlCgreportModel.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/model/OnlCgreportModel.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/service/CgReportExcelServiceI.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/service/CgReportExcelServiceI.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/service/IOnlCgreportHeadService.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/service/IOnlCgreportHeadService.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/service/IOnlCgreportItemService.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/service/IOnlCgreportItemService.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/service/IOnlCgreportParamService.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/service/IOnlCgreportParamService.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/service/impl/CgReportExcelServiceImpl.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/service/impl/CgReportExcelServiceImpl.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/service/impl/OnlCgreportHeadServiceImpl.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/service/impl/OnlCgreportHeadServiceImpl.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/service/impl/OnlCgreportItemServiceImpl.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/service/impl/OnlCgreportItemServiceImpl.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/service/impl/OnlCgreportParamServiceImpl.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/service/impl/OnlCgreportParamServiceImpl.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/util/BrowserType.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/util/BrowserType.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/util/BrowserUtils.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/util/BrowserUtils.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/util/CgReportQueryParamUtil.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/util/CgReportQueryParamUtil.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/util/SqlUtil.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/util/SqlUtil.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/quartz/controller/QuartzJobController.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/quartz/controller/QuartzJobController.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/quartz/entity/QuartzJob.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/quartz/entity/QuartzJob.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/shiro/authc/MyRealm.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/shiro/authc/MyRealm.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/shiro/authc/util/JwtUtil.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/shiro/authc/util/JwtUtil.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/controller/DuplicateCheckController.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/controller/DuplicateCheckController.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/controller/LoginController.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/controller/LoginController.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/controller/SysDataLogController.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/controller/SysDataLogController.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/controller/SysDictController.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/controller/SysDictController.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/controller/SysDictItemController.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/controller/SysDictItemController.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/controller/SysLogController.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/controller/SysLogController.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/entity/SysAnnouncement.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/entity/SysAnnouncement.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/entity/SysDataLog.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/entity/SysDataLog.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/entity/SysDepart.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/entity/SysDepart.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/entity/SysDict.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/entity/SysDict.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/entity/SysDictItem.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/entity/SysDictItem.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/entity/SysLog.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/entity/SysLog.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/entity/SysPermission.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/entity/SysPermission.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/entity/SysPermissionDataRule.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/entity/SysPermissionDataRule.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/entity/SysRole.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/entity/SysRole.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/entity/SysRolePermission.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/entity/SysRolePermission.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/entity/SysUser.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/entity/SysUser.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/entity/SysUserDepart.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/entity/SysUserDepart.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/SysDataLogMapper.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/SysDataLogMapper.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/SysDictItemMapper.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/SysDictItemMapper.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/SysDictMapper.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/SysDictMapper.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/SysPermissionDataRuleMapper.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/SysPermissionDataRuleMapper.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/SysPermissionMapper.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/SysPermissionMapper.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/SysUserDepartMapper.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/SysUserDepartMapper.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/xml/SysDataLogMapper.xml
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/xml/SysDataLogMapper.xml
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionDataRuleMapper.xml
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionDataRuleMapper.xml
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserDepartMapper.xml
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserDepartMapper.xml
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/model/DepartIdModel.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/model/DepartIdModel.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/model/DuplicateCheckVo.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/model/DuplicateCheckVo.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/model/SysDictTree.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/model/SysDictTree.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/model/SysPermissionTree.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/model/SysPermissionTree.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/model/SysUserCacheInfo.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/model/SysUserCacheInfo.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/model/SysUserDepartsVO.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/model/SysUserDepartsVO.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/model/TreeModel.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/model/TreeModel.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysDataLogService.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysDataLogService.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysDictItemService.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysDictItemService.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysDictService.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysDictService.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysPermissionDataRuleService.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysPermissionDataRuleService.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysPermissionService.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysPermissionService.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysUserDepartService.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysUserDepartService.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysUserRoleService.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysUserRoleService.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/AutoPoiDictService.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/AutoPoiDictService.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysDataLogServiceImpl.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysDataLogServiceImpl.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysDictItemServiceImpl.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysDictItemServiceImpl.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionDataRuleImpl.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionDataRuleImpl.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysUserDepartServiceImpl.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysUserDepartServiceImpl.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysUserRoleServiceImpl.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysUserRoleServiceImpl.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/controller/FindsDepartsChildrenUtil.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/controller/FindsDepartsChildrenUtil.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/util/JeecgDataAutorUtils.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/util/JeecgDataAutorUtils.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/util/PermissionDataUtil.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/util/PermissionDataUtil.java
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/vo/SysDictPage.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/vo/SysDictPage.java
--- a/jeecg-boot/src/main/resources/application-dev.yml
+++ b/jeecg-boot/src/main/resources/application-dev.yml
--- a/jeecg-boot/src/main/resources/application-prod.yml
+++ b/jeecg-boot/src/main/resources/application-prod.yml
--- a/jeecg-boot/src/main/resources/application-test.yml
+++ b/jeecg-boot/src/main/resources/application-test.yml
--- a/jeecg-boot/src/main/resources/application.yml
+++ b/jeecg-boot/src/main/resources/application.yml
--- a/jeecg-boot/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
+++ b/jeecg-boot/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
--- a/jeecg-boot/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
+++ b/jeecg-boot/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
--- a/jeecg-boot/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
+++ b/jeecg-boot/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
--- a/jeecg-boot/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal__Style@Drawer.vuei
+++ b/jeecg-boot/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal__Style@Drawer.vuei
--- a/jeecg-boot/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/controller/${entityPackage}/${entityName}Controller.javai
+++ b/jeecg-boot/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/controller/${entityPackage}/${entityName}Controller.javai
--- a/jeecg-boot/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/entity/${entityPackage}/${entityName}.javai
+++ b/jeecg-boot/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/entity/${entityPackage}/${entityName}.javai
--- a/jeecg-boot/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/vue/${entityPackage}/${entityName}List.vuei
+++ b/jeecg-boot/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/vue/${entityPackage}/${entityName}List.vuei
--- a/jeecg-boot/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/vue/${entityPackage}/modules/${entityName}Modal.vuei
+++ b/jeecg-boot/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/vue/${entityPackage}/modules/${entityName}Modal.vuei
--- a/jeecg-boot/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/vue/${entityPackage}/modules/${entityName}Modal__Style@Drawer.vuei
+++ b/jeecg-boot/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/vue/${entityPackage}/modules/${entityName}Modal__Style@Drawer.vuei
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
+++ b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
+++ b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
+++ b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai
+++ b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai
+++ b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml
+++ b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai
+++ b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai
+++ b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai
+++ b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai
+++ b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai
+++ b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
+++ b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
+++ b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
+++ b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
+++ b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
+++ b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai
+++ b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai
+++ b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml
+++ b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml
+++ b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai
+++ b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai
+++ b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai
+++ b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai
+++ b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai
+++ b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
+++ b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/[1-n]List.vuei
+++ b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/[1-n]List.vuei
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
+++ b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Modal.vuei
+++ b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Modal.vuei
--- a/jeecg-boot/src/main/resources/jeecg/jeecg_config.properties
+++ b/jeecg-boot/src/main/resources/jeecg/jeecg_config.properties
--- a/jeecg-boot/src/main/resources/logback-spring.xml
+++ b/jeecg-boot/src/main/resources/logback-spring.xml
--- a/jeecg-boot/src/test/java/org/jeecg/SampleTest.java
+++ b/jeecg-boot/src/test/java/org/jeecg/SampleTest.java