Jeecg-Boot 2.1.2版本发布

README.md

@@ -11,7 +11,7 @@ https://www.oschina.net/p/jeecg-boot
 Jeecg-Boot 快速开发平台（前后端分离版本）
 ===============
 
-当前最新版本： 2.1.1（发布日期：20191021）
+当前最新版本： 2.1.2（发布日期：20191122）
 
 [![AUR](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://github.com/zhangdaiscott/jeecg-boot/blob/master/LICENSE)
 [![](https://img.shields.io/badge/Author-JEECG团队-orange.svg)](http://www.jeecg.com)

ant-design-vue-jeecg/README.md

@@ -1,7 +1,7 @@
 Ant Design Jeecg Vue
 ====
 
-当前最新版本： 2.0.2（发布日期：20190708）
+当前最新版本： 2.1.2（发布日期：20191122）
 
 Overview
 ----

ant-design-vue-jeecg/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-antd-jeecg",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "private": true,
   "scripts": {
     "pre": "cnpm install || yarn --registry https://registry.npm.taobao.org || npm install --registry https://registry.npm.taobao.org ",
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@antv/data-set": "^0.10.2",
-    "@jeecg/antd-online": "1.2.0",
+    "@jeecg/antd-online": "2.1.2",
     "@tinymce/tinymce-vue": "^2.0.0",
     "ant-design-vue": "^1.4.0",
     "apexcharts": "^3.6.5",
@@ -34,7 +34,7 @@
     "vue-loader": "^15.7.0",
     "vue-ls": "^3.2.0",
     "vue-photo-preview": "^1.1.3",
-    "vue-print-nb-jeecg": "^1.0.8",
+    "vue-print-nb-jeecg": "^1.0.9",
     "vue-property-decorator": "^7.3.0",
     "vue-router": "^3.0.1",
     "vue-splitpane": "^1.0.4",
@@ -51,6 +51,7 @@
     "babel-eslint": "^10.0.1",
     "eslint": "^5.16.0",
     "eslint-plugin-vue": "^5.1.0",
+    "html-webpack-plugin": "^4.0.0-beta.11",
     "less": "^3.9.0",
     "less-loader": "^4.1.0",
     "node-sass": "^4.11.0",

ant-design-vue-jeecg/src/components/chart/BarMultid.vue

@@ -31,6 +31,11 @@
         type: Array,
         default: () => ['Jan.', 'Feb.', 'Mar.', 'Apr.', 'May', 'Jun.', 'Jul.', 'Aug.']
       },
+      // 别名，需要的格式：[{field:'name',alias:'姓名'}, {field:'sex',alias:'性别'}]
+      aliases:{
+        type: Array,
+        default: () => []
+      },
       height: {
         type: Number,
         default: 254
@@ -55,13 +60,22 @@
         })
 
         // bar 使用不了 - 和 / 所以替换下
-        return dv.rows.map(row => {
+        let rows = dv.rows.map(row => {
           if (typeof row.x === 'string') {
             row.x = row.x.replace(/[-/]/g, '_')
           }
           return row
         })
-
+        // 替换别名
+        rows.forEach(row => {
+          for (let item of this.aliases) {
+            if (item.field === row.type) {
+              row.type = item.alias
+              break
+            }
+          }
+        })
+        return rows
       }
     }
   }

ant-design-vue-jeecg/src/components/chart/LineChartMultid.vue

@@ -42,6 +42,11 @@
         type: Array,
         default: () => ['jeecg', 'jeebt']
       },
+      // 别名，需要的格式：[{field:'name',alias:'姓名'}, {field:'sex',alias:'性别'}]
+      aliases:{
+        type: Array,
+        default: () => []
+      },
       height: {
         type: Number,
         default: 254
@@ -66,7 +71,17 @@
           key: 'x',
           value: 'y'
         })
-        return dv.rows
+        let rows =  dv.rows
+        // 替换别名
+        rows.forEach(row => {
+          for (let item of this.aliases) {
+            if (item.field === row.x) {
+              row.x = item.alias
+              break
+            }
+          }
+        })
+        return rows
       }
     }
   }

ant-design-vue-jeecg/src/components/dict/JDictSelectUtil.js

@@ -28,13 +28,16 @@ export async function initDictOptions(dictCode) {
  * @return String
  */
 export function filterDictText(dictOptions, text) {
-  let re = "";
-  dictOptions.forEach(function (option) {
-    if (text === option.value) {
-      re = option.text;
+  //--update-begin----author:sunjianlei---date:20191025------for:修复字典替换方法在字典没有加载完成之前报错的问题、修复没有找到字典时返回空值的问题---
+  if (dictOptions instanceof Array) {
+    for (let dictItem of dictOptions) {
+      if (text === dictItem.value) {
+        return dictItem.text
+      }
     }
-  });
-  return re;
+  }
+  return text
+//--update-end----author:sunjianlei---date:20191025------for:修复字典替换方法在字典没有加载完成之前报错的问题、修复没有找到字典时返回空值的问题---
 }
 
 /**
@@ -58,7 +61,7 @@ export function filterMultiDictText(dictOptions, text) {
     }
   });
   if(re==""){
-    return "";
+    return text;
   }
   return re.substring(0,re.length-1);
 }

ant-design-vue-jeecg/src/components/jeecg/JEditableTable.vue

@@ -181,6 +181,7 @@
                           :options="col.options"
                           :getPopupContainer="getParentContainer"
                           :placeholder="replaceProps(col, col.placeholder)"
+                          :filterOption="(i,o)=>handleSelectFilterOption(i,o,col)"
                           @change="(v)=>handleChangeSelectCommon(v,id,row,col)"
                           @search="(v)=>handleSearchSelect(v,id,row,col)"
                           @blur="(v)=>handleBlurSearch(v,id,row,col)"
@@ -514,7 +515,7 @@
                     </div>
 
                     <!-- else (normal) -->
-                    <span v-else :key="i"  v-bind="buildProps(row,col)" >{{ inputValues[rowIndex][col.key] }}</span>
+                    <span v-else :key="i" v-bind="buildProps(row,col)">{{ inputValues[rowIndex][col.key] }}</span>
                   </template>
                 </div>
               </div>
@@ -657,17 +658,6 @@
     created() {
       // 当前显示的tr
       this.visibleTrEls = []
-      // 用来存储input表单的值
-      // 数组里的每项都是一个对象，对象里每个key都是input的rowKey，值就是input的值，其中有个id的字段来区分
-      // 示例：
-      // [{
-      //    id: "_jet-4sp0iu-15541771111770"
-      //    dbDefaultVal: "aaa",
-      //    dbFieldName: "bbb",
-      //    dbFieldTxt: "ccc",
-      //    dbLength: 32
-      // }]
-      this.inputValues = []
       this.disabledRowIds = (this.disabledRowIds || [])
     },
     // 计算属性
@@ -827,15 +817,18 @@
               for (let columnKey in this.disabledRows) {
                 // 判断是否有该属性
                 if (this.disabledRows.hasOwnProperty(columnKey) && data.hasOwnProperty(columnKey)) {
-                  // row[columnKey] =
-
                   if (disabled !== true) {
-                    disabled = this.disabledRows[columnKey] === data[columnKey]
+                    let temp = this.disabledRows[columnKey]
+                    // 禁用规则可以是一个数组
+                    if (temp instanceof Array) {
+                      disabled = temp.includes(data[columnKey])
+                    } else {
+                      disabled = (temp === data[columnKey])
+                    }
                     if (disabled) {
                       disabledRowIds.push(row.id)
                     }
                   }
-
                 }
               }
             })
@@ -870,9 +863,9 @@
                 column.options = column.options.map(item => {
                   if (item) {
                     return {
+                      ...item,
                       text: item.text || item.title,
-                      title: item.text || item.title,
-                      value: item.value
+                      title: item.text || item.title
                     }
                   }
                   return {}
@@ -925,10 +918,20 @@
 
       /** 初始化列表 */
       initialize() {
+        // inputValues：用来存储input表单的值
+        // 数组里的每项都是一个对象，对象里每个key都是input的rowKey，值就是input的值，其中有个id的字段来区分
+        // 示例：
+        // [{
+        //    id: "_jet-4sp0iu-15541771111770"
+        //    dbDefaultVal: "aaa",
+        //    dbFieldName: "bbb",
+        //    dbFieldTxt: "ccc",
+        //    dbLength: 32
+        // }]
+        this.inputValues = []
         this.visibleTrEls = []
         this.rows = []
         this.deleteIds = []
-        this.inputValues = []
         this.selectValues = {}
         this.checkboxValues = {}
         this.jdateValues = {}
@@ -1094,16 +1097,17 @@
         }
         this.rows = rows
 
+        let rowValue = this.getValuesSync({
+          validate: false,
+          rowIds: [this.removeCaseId(row.id)]
+        }).values[0]
+
         this.$nextTick(() => {
           this.updateFormValues()
         })
         // 触发add事件
         this.$emit('added', {
-          row: (() => {
-            let r = Object.assign({}, row)
-            r.id = this.removeCaseId(r.id)
-            return r
-          })(),
+          row: rowValue,
           target: this
         })
         // 设置滚动条位置
@@ -1600,9 +1604,16 @@
       clearSelection() {
         this.selectedRowIds = []
       },
+      /** 用于搜索下拉框中的内容 */
+      handleSelectFilterOption(input, option, column) {
+        if (column.allowSearch === true) {
+          return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        }
+        return true
+      },
       /** select 搜索时的事件，用于动态添加options */
       handleSearchSelect(value, id, row, col) {
-        if (col.allowInput === true) {
+        if (col.allowSearch !== true && col.allowInput === true) {
           // 是否找到了对应的项，找不到则添加这一项
           let flag = false
           for (let option of col.options) {
@@ -1941,7 +1952,7 @@
           }
         }
         // 判断select是否允许输入
-        if (col.type === FormTypes.select && col.allowInput === true) {
+        if (col.type === FormTypes.select && (col.allowInput === true || col.allowSearch === true)) {
           props['showSearch'] = true
         }
 
@@ -2022,7 +2033,6 @@
         this.elemValueChange(FormTypes.list_multi, row, column, value)
       },
       handleSearchSelectChange(value, id, row, column) {
-        console.log(value)
         this.searchSelectValues = this.bindValuesChange(value, id, 'searchSelectValues')
         this.validateOneInput(value, row, column, this.notPassedIds, true, 'change')
         this.elemValueChange(FormTypes.sel_search, row, column, value)

ant-design-vue-jeecg/src/components/jeecg/JEditor.vue

@@ -61,6 +61,7 @@
           toolbar: this.toolbar,
           branding: false,
           menubar: false,
+          toolbar_drawer: false,
           images_upload_handler: (blobInfo, success) => {
             const img = 'data:image/jpeg;base64,' + blobInfo.base64()
             success(img)

ant-design-vue-jeecg/src/components/jeecg/JSuperQuery.vue

@@ -63,7 +63,33 @@
               </a-col>
 
               <a-col :span="8">
-                <j-dict-select-tag v-if="item.dictCode" v-model="item.val" :dictCode="item.dictCode" placeholder="请选择"/>
+                <template v-if="item.dictCode">
+                  <template v-if="item.type === 'table-dict'">
+                    <j-popup
+                      v-model="item.val"
+                      :code="item.dictTable"
+                      :field="item.dictCode"
+                      :orgFields="item.dictCode"
+                      :destFields="item.dictCode"
+                    ></j-popup>
+                  </template>
+                  <j-dict-select-tag v-else v-model="item.val" :dictCode="item.dictCode" placeholder="请选择"/>
+                </template>
+                <j-select-multi-user
+                  v-else-if="item.type === 'select-user'"
+                  v-model="item.val"
+                  :buttons="false"
+                  :multiple="false"
+                  placeholder="请选择用户"
+                  :returnKeys="['id', item.customReturnField || 'username']"
+                />
+                <j-select-depart
+                  v-else-if="item.type === 'select-depart'"
+                  v-model="item.val"
+                  :multi="false"
+                  placeholder="请选择部门"
+                  :customReturnField="item.customReturnField || 'id'"
+                />
                 <j-date v-else-if=" item.type=='date' " v-model="item.val" placeholder="请选择日期" style="width: 100%"></j-date>
                 <j-date v-else-if=" item.type=='datetime' " v-model="item.val" placeholder="请选择时间" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%"></j-date>
                 <a-input-number v-else-if=" item.type=='int'||item.type=='number' " style="width: 100%" placeholder="请输入数值" v-model="item.val"/>
@@ -86,7 +112,10 @@
             <div slot="title">
               保存的查询
             </div>
+
+            <a-empty v-if="treeData.length === 0" class="j-super-query-history-empty" description="没有保存任何查询"/>
             <a-tree
+              v-else
               class="j-super-query-history-tree"
               showIcon
               :treeData="treeData"
@@ -113,10 +142,12 @@
 <script>
   import * as utils from '@/utils/util'
   import JDate from '@/components/jeecg/JDate.vue'
+  import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
+  import JSelectMultiUser from '@/components/jeecgbiz/JSelectMultiUser'
 
   export default {
     name: 'JSuperQuery',
-    components: { JDate },
+    components: { JDate, JSelectDepart, JSelectMultiUser },
     props: {
       /*
        fieldList: [{
@@ -182,7 +213,6 @@
               return item
             })
           }
-          console.log({ list })
         }
       }
     },
@@ -222,9 +252,12 @@
       handleSelected(option, item) {
         let index = option.data.attrs['data-idx']
 
-        let { type, dictCode } = this.fieldList[index]
+        let { type, dictCode, dictTable, customReturnField } = this.fieldList[index]
         item['type'] = type
         item['dictCode'] = dictCode
+        item['dictTable'] = dictTable
+        item['customReturnField'] = customReturnField
+        this.$set(item, 'val', '')
       },
       handleReset() {
         this.queryParamsModel = [{}]
@@ -338,6 +371,24 @@
       }
     }
 
+    .j-super-query-history-empty /deep/ {
+      .ant-empty-image {
+        height: 80px;
+        line-height: 80px;
+        margin-bottom: 0;
+      }
+
+      img {
+        width: 80px;
+        height: 65px;
+      }
+
+      .ant-empty-description {
+        color: #afafaf;
+        margin: 8px 0;
+      }
+    }
+
     .j-super-query-history-tree /deep/ {
       .ant-tree-switcher {
         display: none;

ant-design-vue-jeecg/src/components/jeecgbiz/JSelectBizComponent/index.vue

@@ -1,6 +1,6 @@
 <template>
   <a-row class="j-select-biz-component-box" type="flex" :gutter="8">
-    <a-col class="left">
+    <a-col class="left" :class="{'full': !buttons}">
       <a-select
         mode="multiple"
         :placeholder="placeholder"
@@ -10,10 +10,11 @@
         :disabled="disabled"
         :open="false"
         style="width: 100%;"
+        @click.native="visible=(buttons?visible:true)"
       />
     </a-col>
 
-    <a-col class="right">
+    <a-col v-if="buttons" class="right">
       <a-button type="primary" icon="search" :disabled="disabled" @click="visible=true">{{selectButtonText}}</a-button>
     </a-col>
 
@@ -57,6 +58,11 @@
         type: Boolean,
         default: true
       },
+      // 是否显示按钮，默认 true
+      buttons: {
+        type: Boolean,
+        default: true
+      },
 
       /* 可复用属性 */
 
@@ -153,5 +159,9 @@
     .right {
       width: #{$width};
     }
+
+    .full {
+      width: 100%;
+    }
   }
 </style>

ant-design-vue-jeecg/src/components/jeecgbiz/JSelectDepart.vue

@@ -11,7 +11,7 @@
       :modal-width="modalWidth"
       :multi="multi"
       :rootOpened="rootOpened"
-      :depart-id="value"
+      :depart-id="departIds"
       @ok="handleOK"
       @initComp="initComp"/>
   </div>
@@ -48,6 +48,11 @@
         type: Boolean,
         required: false,
         default: false
+      },
+      // 自定义返回字段，默认返回 id
+      customReturnField: {
+        type: String,
+        default: 'id'
       }
     },
     data(){
@@ -63,7 +68,9 @@
     },
     watch:{
       value(val){
-        this.departIds = val
+        if (this.customReturnField === 'id') {
+          this.departIds = val
+        }
       }
     },
     methods:{
@@ -73,21 +80,17 @@
       openModal(){
         this.$refs.innerDepartSelectModal.show()
       },
-      handleOK(rows,idstr){
-        console.log("当前选中部门",rows)
-        console.log("当前选中部门ID",idstr)
-        if(!rows){
+      handleOK(rows, idstr) {
+        let value = ''
+        if (!rows && rows.length <= 0) {
           this.departNames = ''
-          this.departIds=''
-        }else{
-          let temp = ''
-          for(let item of rows){
-            temp+=','+item.departName
-          }
-          this.departNames = temp.substring(1)
-          this.departIds=idstr
+          this.departIds = ''
+        } else {
+          value = rows.map(row => row[this.customReturnField]).join(',')
+          this.departNames = rows.map(row => row['departName']).join(',')
+          this.departIds = idstr
         }
-        this.$emit("change",this.departIds)
+        this.$emit("change", value)
       },
       getDepartNames(){
         return this.departNames

ant-design-vue-jeecg/src/components/jeecgbiz/JSelectMultiUser.vue

@@ -5,7 +5,6 @@
     name="用户"
     displayKey="realname"
 
-    :returnKeys="returnKeys"
     :listUrl="url.list"
     :columns="columns"
     queryParamText="账号"
@@ -24,7 +23,6 @@
     props: ['value'],
     data() {
       return {
-        returnKeys: ['id', 'username'],
         url: { list: '/sys/user/list' },
         columns: [
           { title: '姓名', align: 'center', width: 100, dataIndex: 'realname' },
@@ -33,6 +31,17 @@
           { title: '出生日期', align: 'center', width: 100, dataIndex: 'birthday' }
         ]
       }
+    },
+    watch: {
+      $attrs: {
+        deep: true,
+        immediate: true,
+        handler(val) {
+          if (!val.returnKeys) {
+            val.returnKeys = ['id', 'username']
+          }
+        }
+      }
     }
   }
 </script>

ant-design-vue-jeecg/src/components/jeecgbiz/modal/JSelectDepartModal.vue

@@ -63,7 +63,7 @@
         handler() {
           if (this.departId) {
             this.checkedKeys = this.departId.split(",");
-            console.log('this.departId', this.departId)
+            // console.log('this.departId', this.departId)
           } else {
             this.checkedKeys = [];
           }
@@ -75,7 +75,6 @@
         this.visible=true
         this.checkedRows=[]
         this.checkedKeys=[]
-        console.log("this.multi",this.multi)
       },
       loadDepart(){
         queryDepartTreeList().then(res=>{
@@ -133,39 +132,29 @@
       },
       onCheck (checkedKeys,info) {
         if(!this.multi){
-          let arr = checkedKeys.checked.filter(item=>{
-            return this.checkedKeys.indexOf(item)<0
-          })
+          let arr = checkedKeys.checked.filter(item => this.checkedKeys.indexOf(item) < 0)
           this.checkedKeys = [...arr]
-          this.checkedRows=[info.node.dataRef]
+          this.checkedRows = (this.checkedKeys.length === 0) ? [] : [info.node.dataRef]
         }else{
           this.checkedKeys = checkedKeys.checked
-          this.checkedRows.push(info.node.dataRef)
+          this.checkedRows = this.getCheckedRows(this.checkedKeys)
         }
-        //this.$emit("input",this.checkedKeys.join(","))
-        //console.log(this.checkedKeys.join(","))
       },
-      onSelect (selectedKeys,info) {
-        console.log(selectedKeys)
+      onSelect(selectedKeys,info) {
         let keys = []
         keys.push(selectedKeys[0])
-        if(!this.checkedKeys || this.checkedKeys.length==0 || !this.multi){
+        if(!this.checkedKeys || this.checkedKeys.length===0 || !this.multi){
           this.checkedKeys = [...keys]
           this.checkedRows=[info.node.dataRef]
         }else{
           let currKey = info.node.dataRef.key
           if(this.checkedKeys.indexOf(currKey)>=0){
-            this.checkedKeys = this.checkedKeys.filter(item=>{
-              return item !=currKey
-            })
-            this.checkedRows=this.checkedRows.filter(item=>{
-              return item.key !=currKey
-            })
+            this.checkedKeys = this.checkedKeys.filter(item=> item !==currKey)
           }else{
-            this.checkedRows.push(info.node.dataRef)
             this.checkedKeys.push(...keys)
           }
         }
+        this.checkedRows = this.getCheckedRows(this.checkedKeys)
       },
       onExpand (expandedKeys) {
         this.expandedKeys = expandedKeys
@@ -215,6 +204,32 @@
         })
 
 
+      },
+      // 根据 checkedKeys 获取 rows
+      getCheckedRows(checkedKeys) {
+        const forChildren = (list, key) => {
+          for (let item of list) {
+            if (item.id === key) {
+              return item
+            }
+            if (item.children instanceof Array) {
+              let value = forChildren(item.children, key)
+              if (value != null) {
+                return value
+              }
+            }
+          }
+          return null
+        }
+
+        let rows = []
+        for (let key of checkedKeys) {
+          let row = forChildren(this.treeData, key)
+          if (row != null) {
+            rows.push(row)
+          }
+        }
+        return rows
       }
     }
   }

ant-design-vue-jeecg/src/components/jeecgbiz/modal/JSelectUserByDepModal.vue

@@ -157,8 +157,9 @@
         console.log("props userIds: ", this.userIds)
         if (this.userIds) {
           let currUserIds = this.userIds
+          let userIdsArr = currUserIds.split(',');
           for (let item of this.dataSource) {
-            if (currUserIds.indexOf(item.username) >= 0) {
+            if (userIdsArr.includes(item.username)) {
               names += "," + item.realname
             }
           }

ant-design-vue-jeecg/src/mixins/JeecgListMixin.js

@@ -51,9 +51,12 @@ export const JeecgListMixin = {
     }
   },
   created() {
-    this.loadData();
-    //初始化字典配置 在自己页面定义
-    this.initDictConfig();
+    if(!this.disableMixinCreated){
+      console.log(' -- mixin created -- ')
+      this.loadData();
+      //初始化字典配置 在自己页面定义
+      this.initDictConfig();
+    }
   },
   methods:{
     loadData(arg) {
@@ -149,6 +152,7 @@ export const JeecgListMixin = {
           title: "确认删除",
           content: "是否删除选中数据?",
           onOk: function () {
+            that.loading = true;
             deleteAction(that.url.deleteBatch, {ids: ids}).then((res) => {
               if (res.success) {
                 that.$message.success(res.message);
@@ -157,6 +161,8 @@ export const JeecgListMixin = {
               } else {
                 that.$message.warning(res.message);
               }
+            }).finally(() => {
+              that.loading = false;
             });
           }
         });

ant-design-vue-jeecg/src/utils/request.js

@@ -8,7 +8,7 @@ import { ACCESS_TOKEN } from "@/store/mutation-types"
 // 创建 axios 实例
 const service = axios.create({
   baseURL: '/jeecg-boot', // api base_url
-  timeout: 15000 // 请求超时时间
+  timeout: 6000 // 请求超时时间
 })
 
 const err = (error) => {

ant-design-vue-jeecg/src/utils/util.js

@@ -1,3 +1,4 @@
+import * as api from '@/api/api'
 import { isURL } from '@/utils/validate'
 
 export function timeFix() {
@@ -254,4 +255,25 @@ export function cssExpand(css, id) {
   }
   // 应用新样式
   document.head.appendChild(style)
+}
+
+/**
+ * 重复值验证工具方法
+ *
+ * 使用示例：
+ * { validator: (rule, value, callback) => validateDuplicateValue('sys_fill_rule', 'rule_code', value, this.model.id, callback) }
+ *
+ * @param tableName 被验证的表名
+ * @param fieldName 被验证的字段名
+ * @param fieldVal 被验证的值
+ * @param dataId 数据ID，可空
+ * @param callback
+ */
+export function validateDuplicateValue(tableName, fieldName, fieldVal, dataId, callback) {
+  let params = { tableName, fieldName, fieldVal, dataId }
+  api.duplicateCheck(params).then(res => {
+    res['success'] ? callback() : callback(res['message'])
+  }).catch(err => {
+    callback(err.message || err)
+  })
 }

ant-design-vue-jeecg/src/views/jeecg/SelectDemo.vue

@@ -39,8 +39,8 @@
         <!--  部门选择控件 -->
         <a-row :gutter="24">
           <a-col :span="12">
-            <a-form-item label="选择部门">
-              <j-select-depart v-decorator="['departId']" :trigger-change="true"></j-select-depart>
+            <a-form-item label="选择部门 自定义返回值">
+              <j-select-depart v-decorator="['departId']" :trigger-change="true" customReturnField="departName"></j-select-depart>
             </a-form-item>
           </a-col>
           <a-col :span="12">选中的部门ID(v-decorator):{{ getDepartIdValue() }}</a-col>
@@ -69,7 +69,7 @@
         <a-row :gutter="24">
           <a-col :span="12">
             <a-form-item label="选择用户">
-              <j-select-multi-user v-model="multiUser"></j-select-multi-user>
+              <j-select-multi-user v-model="multiUser" ></j-select-multi-user>
             </a-form-item>
           </a-col>
           <a-col :span="12">选中的用户(v-model):{{ multiUser }}</a-col>
@@ -217,7 +217,7 @@
         <a-row :gutter="24">
           <a-col :span="12">
             <a-form-item label="树字典">
-              <j-tree-dict parentCode="A01" />
+              <j-tree-dict parentCode="B01" />
             </a-form-item>
           </a-col>
           <a-col :span="12"></a-col>

ant-design-vue-jeecg/src/views/modules/online/cgform/OnlCgformHeadList.vue

@@ -177,13 +177,14 @@
   import JDictSelectTag from '../../../../components/dict/JDictSelectTag.vue'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import Clipboard from 'clipboard'
+
   import { filterObj } from '@/utils/util';
 
   export default {
     name: 'OnlCgformHeadList',
     mixins: [JeecgListMixin],
     components: {
-      JDictSelectTag
+      JDictSelectTag,
     },
     data() {
       return {

ant-design-vue-jeecg/src/views/modules/online/cgform/auto/OnlCgformTreeList.vue

@@ -132,6 +132,7 @@
 
       <j-import-modal ref="importModal" :url="getImportUrl()" @ok="importOk"></j-import-modal>
 
+      <process-inst-pic-modal ref="processInstPicModal"></process-inst-pic-modal>
     </div>
   </a-card>
 </template>
@@ -691,6 +692,12 @@
           }
         });
       },
+      handlePreviewPic: function(record){
+        var flowCode = this.flowCodePre+this.currentTableName;
+        var dataId = record.id;
+        this.$refs.processInstPicModal.preview(flowCode,dataId);
+        this.$refs.processInstPicModal.title="流程图";
+      }
 
     }
   }

ant-design-vue-jeecg/src/views/system/SysFillRuleList.vue

@@ -0,0 +1,187 @@
+<template>
+  <a-card :bordered="false">
+
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="6" :sm="8">
+            <a-form-item label="规则名称">
+              <a-input placeholder="请输入规则名称" v-model="queryParam.ruleName"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <a-form-item label="规则Code">
+              <a-input placeholder="请输入规则Code" v-model="queryParam.ruleCode"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('填值规则')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel">
+            <a-icon type="delete"/>
+            删除
+          </a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作
+          <a-icon type="down"/>
+        </a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <a-alert type="info" showIcon style="margin-bottom: 16px;">
+      <template slot="message">
+        <span>已选择</span>
+        <a style="font-weight: 600;padding: 0 4px;">{{ selectedRowKeys.length }}</a>
+        <span>项</span>
+        <template v-if="selectedRowKeys.length>0">
+          <a-divider type="vertical"/>
+          <a @click="onClearSelected">清空</a>
+        </template>
+      </template>
+    </a-alert>
+
+    <a-table
+      ref="table"
+      size="middle"
+      bordered
+      rowKey="id"
+      :columns="columns"
+      :dataSource="dataSource"
+      :pagination="ipagination"
+      :loading="loading"
+      :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+      @change="handleTableChange">
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+          <a-divider type="vertical"/>
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
+            <a-menu slot="overlay">
+              <a-menu-item @click="handleTest(record)">
+                功能测试
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+    </a-table>
+    <!-- table区域-end -->
+
+    <!-- 表单区域 -->
+    <sys-fill-rule-modal ref="modalForm" @ok="modalFormOk"/>
+  </a-card>
+</template>
+
+<script>
+  import { getAction } from '@/api/manage'
+  import SysFillRuleModal from './modules/SysFillRuleModal'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+
+  export default {
+    name: 'SysFillRuleList',
+    mixins: [JeecgListMixin],
+    components: { SysFillRuleModal },
+    data() {
+      return {
+        description: '填值规则管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key: 'rowIndex',
+            width: 60,
+            align: 'center',
+            customRender: (t, r, index) => 1 + index
+          },
+          {
+            title: '规则名称',
+            align: 'center',
+            dataIndex: 'ruleName'
+          },
+          {
+            title: '规则Code',
+            align: 'center',
+            dataIndex: 'ruleCode'
+          },
+          {
+            title: '规则实现类',
+            align: 'center',
+            dataIndex: 'ruleClass'
+          },
+          {
+            title: '规则参数',
+            align: 'center',
+            dataIndex: 'ruleParams'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align: 'center',
+            scopedSlots: { customRender: 'action' },
+          }
+        ],
+        url: {
+          list: '/sys/fillRule/list',
+          test: '/sys/fillRule/testFillRule',
+          delete: '/sys/fillRule/delete',
+          deleteBatch: '/sys/fillRule/deleteBatch',
+          exportXlsUrl: '/sys/fillRule/exportXls',
+          importExcelUrl: '/sys/fillRule/importExcel',
+        },
+      }
+    },
+    computed: {
+      importExcelUrl() {
+        return `${window._CONFIG['domianURL']}${this.url.importExcelUrl}`
+      }
+    },
+    methods: {
+      handleTest(record) {
+        let closeLoading = this.$message.loading('生成中...', 0)
+
+        getAction(this.url.test, {
+          ruleCode: record.ruleCode
+        }).then(res => {
+          if (res.success) {
+            this.$info({
+              title: '填值规则功能测试',
+              content: '生成结果：' + res.result
+            })
+          } else {
+            this.$message.warn(res.message)
+          }
+        }).finally(() => {
+          closeLoading()
+        })
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less'
+</style>

ant-design-vue-jeecg/src/views/system/SysPositionList.vue

@@ -19,7 +19,7 @@
           <template v-if="toggleSearchStatus">
             <a-col :md="6" :sm="8">
               <a-form-item label="职级">
-                <j-dict-select-tag v-model="queryParam.rank" placeholder="请选择职级" dictCode="position_rank"/>
+                <j-dict-select-tag v-model="queryParam.postRank" placeholder="请选择职级" dictCode="position_rank"/>
               </a-form-item>
             </a-col>
 
@@ -143,7 +143,7 @@
           {
             title: '职级',
             align: 'center',
-            dataIndex: 'rank_dictText'
+            dataIndex: 'postRank_dictText'
           },
           // {
           //   title: '公司id',

ant-design-vue-jeecg/src/views/system/UserList.vue

@@ -65,7 +65,7 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator" style="border-top: 5px">
-      <a-button @click="handleAdd" v-has="'user:add'" type="primary" icon="plus">添加用户</a-button>
+      <a-button @click="handleAdd" type="primary" icon="plus" v-has="'user:add'">添加用户</a-button>
       <a-button type="primary" icon="download" @click="handleExportXls('用户信息')">导出</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
@@ -119,6 +119,7 @@
 
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
+
           <a-divider type="vertical"/>
 
           <a-dropdown>

ant-design-vue-jeecg/src/views/system/modules/SysFillRuleModal.vue

@@ -0,0 +1,158 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="800"
+    :visible="visible"
+    :maskClosable="false"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭">
+
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="规则名称">
+          <a-input placeholder="请输入规则名称" v-decorator="['ruleName', validatorRules.ruleName]"/>
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="规则Code">
+          <a-input placeholder="请输入规则Code" :disabled="disabledCode" v-decorator="['ruleCode', validatorRules.ruleCode]"/>
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="规则实现类">
+          <a-input placeholder="请输入规则实现类" v-decorator="['ruleClass', validatorRules.ruleClass]"/>
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="规则参数">
+          <a-textarea placeholder="请输入规则参数" :rows="5" v-decorator="['ruleParams', validatorRules.ruleParams]"/>
+        </a-form-item>
+
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+  import pick from 'lodash.pick'
+  import { httpAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'SysFillRuleModal',
+    components: {},
+    data() {
+      return {
+        title: '操作',
+        visible: false,
+        model: {},
+        labelCol: { xs: { span: 24 }, sm: { span: 5 } },
+        wrapperCol: { xs: { span: 24 }, sm: { span: 16 } },
+
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules: {
+          ruleName: { rules: [{ required: true, message: '规则名称不能为空' }] },
+          ruleCode: {
+            rules: [
+              { required: true, message: '规则Code不能为空' },
+              { validator: (rule, value, callback) => validateDuplicateValue('sys_fill_rule', 'rule_code', value, this.model.id, callback) }
+            ]
+          },
+          ruleClass: { rules: [{ required: true, message: '规则实现类不能为空' }] },
+          ruleParams: {
+            rules: [{
+              validator: (rule, value, callback) => {
+
+                try {
+                  let json = JSON.parse(value)
+                  if (json instanceof Array) {
+                    callback('只能传递JSON对象，不能传递JSON数组')
+                  } else if (json instanceof Object) {
+                    callback()
+                  } else {
+                    callback('请输入JSON字符串')
+                  }
+                } catch {
+                  callback('请输入JSON字符串')
+                }
+              }
+            }]
+          },
+        },
+        url: {
+          add: '/sys/fillRule/add',
+          edit: '/sys/fillRule/edit',
+        },
+      }
+    },
+    computed: {
+      disabledCode() {
+        return !!this.model.id
+      }
+    },
+    created() {
+    },
+    methods: {
+      add() {
+        this.edit({})
+      },
+      edit(record) {
+        this.form.resetFields()
+        this.model = Object.assign({}, record)
+        this.visible = true
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model, 'ruleName', 'ruleCode', 'ruleClass', 'ruleParams'))
+        })
+      },
+      close() {
+        this.$emit('close')
+        this.visible = false
+      },
+      handleOk() {
+        const that = this
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true
+            let httpUrl = this.url.add, method = 'post'
+            if (this.model.id) {
+              httpUrl = this.url.edit
+              method = 'put'
+            }
+
+            let formData = Object.assign(this.model, values)
+            httpAction(httpUrl, formData, method).then((res) => {
+              if (res.success) {
+                that.$message.success(res.message)
+                that.$emit('ok')
+              } else {
+                that.$message.warning(res.message)
+              }
+            }).finally(() => {
+              that.confirmLoading = false
+              that.close()
+            })
+          }
+        })
+      },
+      handleCancel() {
+        this.close()
+      }
+
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+
+</style>

ant-design-vue-jeecg/src/views/system/modules/SysPositionModal.vue

@@ -33,7 +33,7 @@
             placeholder="请选择职级"
             :triggerChange="true"
             dictCode="position_rank"
-            v-decorator="['rank', validatorRules.rank]"
+            v-decorator="['postRank', validatorRules.postRank]"
           />
         </a-form-item>
         <!--<a-form-item-->
@@ -104,7 +104,7 @@
             ]
           },
           name: { rules: [{ required: true, message: '请输入职务名称' }] },
-          rank: { rules: [{ required: true, message: '请选择职级' }] },
+          postRank: { rules: [{ required: true, message: '请选择职级' }] },
         },
         url: {
           add: '/sys/position/add',
@@ -126,7 +126,7 @@
           this.form.setFieldsValue(pick(this.model,
             'code',
             'name',
-            'rank',
+            'postRank',
             // 'companyId'
           ))
         })

ant-design-vue-jeecg/src/views/user/Login.vue

@@ -84,7 +84,7 @@
       </a-tabs>
 
       <a-form-item>
-        <a-checkbox v-model="formLogin.rememberMe">自动登陆</a-checkbox>
+        <a-checkbox v-decorator="['rememberMe', {initialValue: true, valuePropName: 'checked'}]" >自动登陆</a-checkbox>
         <router-link :to="{ name: 'alteration'}" class="forge-password" style="float: right;">
           忘记密码
         </router-link>
@@ -201,13 +201,6 @@
           time: 60,
           smsSendBtn: false,
         },
-        formLogin: {
-          username: "",
-          password: "",
-          captcha: "",
-          mobile: "",
-          rememberMe: true
-        },
         validatorRules:{
           username:{rules: [{ required: true, message: '请输入用户名!',validator: 'click'}]},
           password:{rules: [{ required: true, message: '请输入密码!',validator: 'click'}]},
@@ -251,19 +244,18 @@
       },
       handleSubmit () {
         let that = this
-        let loginParams = {
-          remember_me: that.formLogin.rememberMe
-        };
+        let loginParams = {};
         that.loginBtn = true;
         // 使用账户密码登陆
         if (that.customActiveKey === 'tab1') {
-          that.form.validateFields([ 'username', 'password','inputCode' ], { force: true }, (err, values) => {
+          that.form.validateFields([ 'username', 'password','inputCode', 'rememberMe' ], { force: true }, (err, values) => {
             if (!err) {
               loginParams.username = values.username
               // update-begin- --- author:scott ------ date:20190805 ---- for:密码加密逻辑暂时注释掉，有点问题
               //loginParams.password = md5(values.password)
               //loginParams.password = encryption(values.password,that.encryptedString.key,that.encryptedString.iv)
               loginParams.password = values.password
+              loginParams.remember_me = values.rememberMe
               // update-begin- --- author:scott ------ date:20190805 ---- for:密码加密逻辑暂时注释掉，有点问题
               let checkParams = this.$refs.jgraphicCodeRef.getLoginParam()
               loginParams.captcha = checkParams.checkCode
@@ -282,10 +274,11 @@
           })
           // 使用手机号登陆
         } else {
-          that.form.validateFields([ 'mobile', 'captcha' ], { force: true }, (err, values) => {
+          that.form.validateFields([ 'mobile', 'captcha', 'rememberMe' ], { force: true }, (err, values) => {
             if (!err) {
               loginParams.mobile = values.mobile
               loginParams.captcha = values.captcha
+              loginParams.remember_me = values.rememberMe
               that.PhoneLogin(loginParams).then((res) => {
                 console.log(res.result);
                 this.departConfirm(res)

ant-design-vue-jeecg/yarn.lock

@@ -826,9 +826,9 @@
   integrity sha512-1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA==
 
 "@hapi/hoek@8.x.x", "@hapi/hoek@^8.3.0":
-  version "8.3.2"
-  resolved "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.3.2.tgz#91e7188edebc5d876f0b91a860f555ff06f0782b"
-  integrity sha512-NP5SG4bzix+EtSMtcudp8TvI0lB46mXNo8uFpTDw6tqxGx4z5yx+giIunEFA0Z7oUO4DuWrOJV9xqR2tJVEdyA==
+  version "8.5.0"
+  resolved "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.5.0.tgz#2f9ce301c8898e1c3248b0a8564696b24d1a9a5a"
+  integrity sha512-7XYT10CZfPsH7j9F1Jmg1+d0ezOux2oM2GfArAzLwWe4mE2Dr3hVjsAL6+TFY49RRJlCdJDMw3nJsLFroTc8Kw==
 
 "@hapi/joi@^15.0.1":
   version "15.1.1"
@@ -856,10 +856,10 @@
     cssnano-preset-default "^4.0.0"
     postcss "^7.0.0"
 
-"@jeecg/antd-online@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/@jeecg/antd-online/-/antd-online-1.2.0.tgz#a1cee6539484fc7e9595fe08270f39c5dc43c7f7"
-  integrity sha512-i3vgaN6cZ5BE3qB1wHUxK+nuo91Ov7cAgOymFTlJwd10yMU34Bkgyt0qDvEznLzZG916itRKd6seDXsApM3gpA==
+"@jeecg/antd-online@2.1.2":
+  version "2.1.2"
+  resolved "https://registry.npmjs.org/@jeecg/antd-online/-/antd-online-2.1.2.tgz#4b03b5a7d09e91227e33797ab6018fe103ab2906"
+  integrity sha512-h6cgnrEarE7m1KDOFuLGhSsw45XVgyZgalqBrymy/IslUyLy0h85DCj+GUrTL0OmcLNOR57zctqbnLjwukU5IQ==
 
 "@mrmlnc/readdir-enhanced@^2.2.1":
   version "2.2.1"
@@ -920,14 +920,14 @@
   integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
 
 "@types/node@*":
-  version "12.11.1"
-  resolved "https://registry.npmjs.org/@types/node/-/node-12.11.1.tgz#1fd7b821f798b7fa29f667a1be8f3442bb8922a3"
-  integrity sha512-TJtwsqZ39pqcljJpajeoofYRfeZ7/I/OMUQ5pR4q5wOKf2ocrUvBAZUMhWsOvKx3dVc/aaV5GluBivt0sWqA5A==
+  version "12.12.5"
+  resolved "https://registry.npmjs.org/@types/node/-/node-12.12.5.tgz#66103d2eddc543d44a04394abb7be52506d7f290"
+  integrity sha512-KEjODidV4XYUlJBF3XdjSH5FWoMCtO0utnhtdLf1AgeuZLOrRbvmU/gaRCVg7ZaQDjVf3l84egiY0mRNe5xE4A==
 
 "@types/node@^8.0.53":
-  version "8.10.55"
-  resolved "https://registry.npmjs.org/@types/node/-/node-8.10.55.tgz#3951a64ebce1927b050fd1e420dc6f332be8a1e0"
-  integrity sha512-iZeh1EgupfmAAOASk580R1SL5lWF3CsBVgVH0395qyNF8fhO16xy1UwAav2PdGxIIsYRn7RzJgMGjdsvam6YYg==
+  version "8.10.58"
+  resolved "https://registry.npmjs.org/@types/node/-/node-8.10.58.tgz#98c14ce95a634701bd2d59d52df882c0610dd0eb"
+  integrity sha512-NNcUk/rAdR7Pie7WiA5NHp345dTkD62qaxqscQXVIjCjog/ZXsrG8Wo7dZMZAzE7PSpA+qR2S3TYTeFCKuBFxQ==
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.0"
@@ -956,10 +956,10 @@
     lodash.kebabcase "^4.1.1"
     svg-tags "^1.0.0"
 
-"@vue/babel-preset-app@^3.12.0":
-  version "3.12.0"
-  resolved "https://registry.npmjs.org/@vue/babel-preset-app/-/babel-preset-app-3.12.0.tgz#76cc9ee2c35725ce673c78321b91bb60210c1c75"
-  integrity sha512-zUeHItaHrmTAH//kjdvKp0PAzIeveCejYEpYjqstJ07FTc8uT2UYnSITB1pvv1LZocUMAFlJ3soTcHH6pZU68Q==
+"@vue/babel-preset-app@^3.12.1":
+  version "3.12.1"
+  resolved "https://registry.npmjs.org/@vue/babel-preset-app/-/babel-preset-app-3.12.1.tgz#24c477052f078f30fdb7735103b14dd1fa2cbfe1"
+  integrity sha512-Zjy5jQaikV1Pz+ri0YgXFS7q4/5wCxB5tRkDOEIt5+4105u0Feb/pvH20nVL6nx9GyXrECFfcm7Yxr/z++OaPQ==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/plugin-proposal-class-properties" "^7.0.0"
@@ -1022,28 +1022,28 @@
     "@vue/babel-plugin-transform-vue-jsx" "^1.0.0"
     camelcase "^5.0.0"
 
-"@vue/cli-overlay@^3.12.0":
-  version "3.12.0"
-  resolved "https://registry.npmjs.org/@vue/cli-overlay/-/cli-overlay-3.12.0.tgz#eb6afe93bcc42488ab99dd80692ef3afbb09ef77"
-  integrity sha512-WF1dc4wH6MtUU9NDJVA89peqXiP8kZGz41CPdy6d9fyFf3mP05m4pECyFrr+uvMvO7SmwpDm6E7uliHEAvs/+Q==
+"@vue/cli-overlay@^3.12.1":
+  version "3.12.1"
+  resolved "https://registry.npmjs.org/@vue/cli-overlay/-/cli-overlay-3.12.1.tgz#bdfde8f7123561ab06e4e4c60b854cc5092f5ab1"
+  integrity sha512-Bym92EN+lj+cNRN2ozbYyH+V8DMXWGbCDUk+hiJ4EYDBZfBkZKvalk1/mOBFwyxiopnnbOEBAAhL/UuMQ1xARg==
 
 "@vue/cli-plugin-babel@^3.3.0":
-  version "3.12.0"
-  resolved "https://registry.npmjs.org/@vue/cli-plugin-babel/-/cli-plugin-babel-3.12.0.tgz#2a8ce3d5a030bc5256c3fb212b0cf32ff1de8ea5"
-  integrity sha512-8ZzNeSM9gV+w0F8+ex3MZ7+NsdmXfdsAiZkd2TKNTWv2Mu8ZQ/iv3Lcn/vzB9oCGzVdWhdmHBcVwsKknPckLxw==
+  version "3.12.1"
+  resolved "https://registry.npmjs.org/@vue/cli-plugin-babel/-/cli-plugin-babel-3.12.1.tgz#9a79159de8cd086b013fa6d78a39830b2e2ec706"
+  integrity sha512-Zetvz8PikLCGomeKOKu8pC9YQ7cfxs7pGpvEOzaxGdhMnebhjAYR6i6dOB57A6N5lhxQksXCtYTv26QgfiIpdg==
   dependencies:
     "@babel/core" "^7.0.0"
-    "@vue/babel-preset-app" "^3.12.0"
-    "@vue/cli-shared-utils" "^3.12.0"
+    "@vue/babel-preset-app" "^3.12.1"
+    "@vue/cli-shared-utils" "^3.12.1"
     babel-loader "^8.0.5"
     webpack "^4.0.0"
 
 "@vue/cli-plugin-eslint@^3.3.0":
-  version "3.12.0"
-  resolved "https://registry.npmjs.org/@vue/cli-plugin-eslint/-/cli-plugin-eslint-3.12.0.tgz#f02990b693bd1f52127f13ce14a1e06d8ad84164"
-  integrity sha512-0LKwKi+x0yxQjKOq3bXBXjn3XfhybLgSIJz4TNuvhcxh7NZt9NrvaU3iZUVb1gMUNBlFy7arK3Kame4kGQoFeQ==
+  version "3.12.1"
+  resolved "https://registry.npmjs.org/@vue/cli-plugin-eslint/-/cli-plugin-eslint-3.12.1.tgz#302c463867f38e790bb996eafdf7159c782dc8cf"
+  integrity sha512-tVTZlEZsy3sQbO4LLWFK11yzlWwqVAqaM+IY+BeWHITBzEJKh2KmouG+x6x/reXiU3qROsMJ4Ej3Hs8buSMWyQ==
   dependencies:
-    "@vue/cli-shared-utils" "^3.12.0"
+    "@vue/cli-shared-utils" "^3.12.1"
     babel-eslint "^10.0.1"
     eslint-loader "^2.1.2"
     globby "^9.2.0"
@@ -1054,14 +1054,14 @@
     eslint-plugin-vue "^4.7.1"
 
 "@vue/cli-service@^3.3.0":
-  version "3.12.0"
-  resolved "https://registry.npmjs.org/@vue/cli-service/-/cli-service-3.12.0.tgz#d4578c39b7084793f2b8a5375b4d746295aa36fb"
-  integrity sha512-f66kLWeuurDtxtevxYojYk/zFu9Dy7/m3NmWtd8lWjQT/Do1A5QITm3+RdtYSubaZUVVlapNzdn6TuIvW6jL4A==
+  version "3.12.1"
+  resolved "https://registry.npmjs.org/@vue/cli-service/-/cli-service-3.12.1.tgz#13220b1c189254e7c003390df329086f9b6e77e6"
+  integrity sha512-PDxNrTGnSKzeV1ruFlsRIAO8JcPizwT0EJXq9GeyooU+p+sOkv7aKkCBJQVYNjZapD1NOGWx6CvAAC/wAW+gew==
   dependencies:
     "@intervolga/optimize-cssnano-plugin" "^1.0.5"
     "@soda/friendly-errors-webpack-plugin" "^1.7.1"
-    "@vue/cli-overlay" "^3.12.0"
-    "@vue/cli-shared-utils" "^3.12.0"
+    "@vue/cli-overlay" "^3.12.1"
+    "@vue/cli-shared-utils" "^3.12.1"
     "@vue/component-compiler-utils" "^3.0.0"
     "@vue/preload-webpack-plugin" "^1.1.0"
     "@vue/web-component-wrapper" "^1.2.0"
@@ -1115,10 +1115,10 @@
     webpack-dev-server "^3.4.1"
     webpack-merge "^4.2.1"
 
-"@vue/cli-shared-utils@^3.12.0":
-  version "3.12.0"
-  resolved "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-3.12.0.tgz#48fcd786129cf02278b9c91f2c3491199f777248"
-  integrity sha512-8XEn4s0Cc+98eqdGSQJSrzSKIsf0FMDmfDvgXjT7I2qZWs9e0toOAm7RooypRSad2FhwxzY2bLPgCkNPDJN/jQ==
+"@vue/cli-shared-utils@^3.12.1":
+  version "3.12.1"
+  resolved "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-3.12.1.tgz#bcf076287ddadeebbb97c6a748dfe9ff50ec8df0"
+  integrity sha512-jFblzRFjutGwu5utOKdVlPlsbA1lBUNNQlAThzNqej+JtTKJjnvjlhjKX0Gq0oOny5FjKWhoyfQ74p9h1qE6JQ==
   dependencies:
     "@hapi/joi" "^15.0.1"
     chalk "^2.4.1"
@@ -1134,9 +1134,9 @@
     string.prototype.padstart "^3.0.0"
 
 "@vue/component-compiler-utils@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.0.0.tgz#d16fa26b836c06df5baaeb45f3d80afc47e35634"
-  integrity sha512-am+04/0UX7ektcmvhYmrf84BDVAD8afFOf4asZjN84q8xzxFclbk5x0MtxuKGfp+zjN5WWPJn3fjFAWtDdIGSw==
+  version "3.0.1"
+  resolved "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.0.1.tgz#2d3a2e1b2b217d1163dfb4081d9762169925aa08"
+  integrity sha512-jl3yELdFGyeHEplXB/9pnk9O7G9EA629y5ZQXdHLrFFV9XaYQsaS5qgZ1FqwYugaUtzQMcre7/noSFjRw/PfiA==
   dependencies:
     consolidate "^0.15.1"
     hash-sum "^1.0.2"
@@ -1144,7 +1144,7 @@
     merge-source-map "^1.1.0"
     postcss "^7.0.14"
     postcss-selector-parser "^5.0.0"
-    prettier "1.16.3"
+    prettier "^1.18.2"
     source-map "~0.6.1"
     vue-template-es2015-compiler "^1.9.0"
 
@@ -1509,9 +1509,9 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1:
     color-convert "^1.9.0"
 
 ant-design-vue@^1.4.0:
-  version "1.4.1"
-  resolved "https://registry.npmjs.org/ant-design-vue/-/ant-design-vue-1.4.1.tgz#351078f5f5c49ebe03d45416c8d835ccd9607ce9"
-  integrity sha512-NhHT3m7RTnx1UWRNzHGl6cRVPocAlRBhQvT7HEtXVy+7e9JzZiR1oHgPDKzU2ruhgT/ZerAD1XxvyH+2lfShzQ==
+  version "1.4.4"
+  resolved "https://registry.npmjs.org/ant-design-vue/-/ant-design-vue-1.4.4.tgz#e3950489324a870273928ed22f5dabf6284424a7"
+  integrity sha512-ASRR/rn+ONAeNWd96MzCpReZa4177fdwEBHpgPc/L0Bj/1EakJNN54JacKVXCXxnJt0VI2UXByfgUibpnOQwRQ==
   dependencies:
     "@ant-design/icons" "^2.1.1"
     "@ant-design/icons-vue" "^2.0.0"
@@ -1556,9 +1556,9 @@ anymatch@^2.0.0:
     normalize-path "^2.1.1"
 
 apexcharts@^3.6.5:
-  version "3.10.0"
-  resolved "https://registry.npmjs.org/apexcharts/-/apexcharts-3.10.0.tgz#a72c7d8728ea79cd9f7d2603e82235d441d46388"
-  integrity sha512-DtqM5hsMerjrq+InZQ6JHQQin86YSrYMMRqL0e4zPPKvLj1+P4F2ZKnTdQGLJBP8/qOJhpj6cOeHIdA+m52ECQ==
+  version "3.10.1"
+  resolved "https://registry.npmjs.org/apexcharts/-/apexcharts-3.10.1.tgz#ac85b08796f0fef656ecc0458cf0362f75f63bad"
+  integrity sha512-gwxCvzQSNIVBhGHr31Ha+bmUsA3qWw6atMflVCIqZXBqcRvG1iMoxNV6GnhG975KpFErca5FFDg3xVHYQJRW/A==
   dependencies:
     promise-polyfill "8.1.0"
     svg.draggable.js "^2.2.2"
@@ -1713,9 +1713,9 @@ async-limiter@~1.0.0:
   integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
 
 async-validator@^3.0.3:
-  version "3.2.0"
-  resolved "https://registry.npmjs.org/async-validator/-/async-validator-3.2.0.tgz#fcbd644e7b5b7c9304d29a4752c3f06214ef0d56"
-  integrity sha512-QBuW7Qrg8wbh7Wtqw1QdN162GUmXDs9gayxFaXcCOf3bCqHJ/TQep0H4I63iVk7Q3kIGWU4wbAr/C0Uj64JiMw==
+  version "3.2.1"
+  resolved "https://registry.npmjs.org/async-validator/-/async-validator-3.2.1.tgz#19ac8655c1296a5331b00c75f2492f0d33cae1f8"
+  integrity sha512-yc96RhAthww0n52m9osoI1uDQbbyd/N2xwPWS1gVvngSWOsKerpBFCulvmhp8GfNwUay41TWskNTd3swQM1XMA==
 
 async@^2.1.2, async@^2.4.1, async@^2.6.2:
   version "2.6.3"
@@ -1757,16 +1757,16 @@ autoprefixer@^6.0.2, autoprefixer@^6.3.1:
     postcss-value-parser "^3.2.3"
 
 autoprefixer@^9.5.1:
-  version "9.6.5"
-  resolved "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.6.5.tgz#98f4afe7e93cccf323287515d426019619775e5e"
-  integrity sha512-rGd50YV8LgwFQ2WQp4XzOTG69u1qQsXn0amww7tjqV5jJuNazgFKYEVItEBngyyvVITKOg20zr2V+9VsrXJQ2g==
+  version "9.7.1"
+  resolved "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.7.1.tgz#9ffc44c55f5ca89253d9bb7186cefb01ef57747f"
+  integrity sha512-w3b5y1PXWlhYulevrTJ0lizkQ5CyqfeU6BIRDbuhsMupstHQOeb1Ur80tcB1zxSu7AwyY/qCQ7Vvqklh31ZBFw==
   dependencies:
-    browserslist "^4.7.0"
-    caniuse-lite "^1.0.30000999"
+    browserslist "^4.7.2"
+    caniuse-lite "^1.0.30001006"
     chalk "^2.4.2"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
-    postcss "^7.0.18"
+    postcss "^7.0.21"
     postcss-value-parser "^4.0.2"
 
 aws-sign2@~0.7.0:
@@ -2578,14 +2578,14 @@ browserslist@^3.2.6:
     caniuse-lite "^1.0.30000844"
     electron-to-chromium "^1.3.47"
 
-browserslist@^4.0.0, browserslist@^4.3.4, browserslist@^4.5.4, browserslist@^4.7.0:
-  version "4.7.1"
-  resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.7.1.tgz#bd400d1aea56538580e8c4d5f1c54ac11b5ab468"
-  integrity sha512-QtULFqKIAtiyNx7NhZ/p4rB8m3xDozVo/pi5VgTlADLF2tNigz/QH+v0m5qhn7XfHT7u+607NcCNOnC0HZAlMg==
+browserslist@^4.0.0, browserslist@^4.3.4, browserslist@^4.5.4, browserslist@^4.7.2:
+  version "4.7.2"
+  resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.7.2.tgz#1bb984531a476b5d389cedecb195b2cd69fb1348"
+  integrity sha512-uZavT/gZXJd2UTi9Ov7/Z340WOSQ3+m1iBVRUknf+okKxonL9P83S3ctiBDtuRmRu8PiCHjqyueqQ9HYlJhxiw==
   dependencies:
-    caniuse-lite "^1.0.30000999"
-    electron-to-chromium "^1.3.284"
-    node-releases "^1.1.36"
+    caniuse-lite "^1.0.30001004"
+    electron-to-chromium "^1.3.295"
+    node-releases "^1.1.38"
 
 buffer-from@^1.0.0:
   version "1.1.1"
@@ -2733,7 +2733,7 @@ callsites@^3.0.0:
   resolved "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
-camel-case@3.0.x:
+camel-case@3.0.x, camel-case@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"
   integrity sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=
@@ -2795,14 +2795,14 @@ caniuse-api@^3.0.0:
     lodash.uniq "^4.5.0"
 
 caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
-  version "1.0.30000999"
-  resolved "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000999.tgz#4f0071fbaeeafc12adebeec31b355c0868f07de9"
-  integrity sha512-NzRdDmSmg/kp+eNIE1FT+/aXsyGy0PPoAmSrRAR4kFFOs+P19csnJWx4OeIKo6sxurr4xzlsso3rO7SkK71SGw==
+  version "1.0.30001008"
+  resolved "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001008.tgz#1691f28db0e08bf6abb5e472d8aaea392ec4a995"
+  integrity sha512-Fog+uREPKb/RDc0puoAqqBZB05I8wYff+TIMDkYw9Lweq7+hUEN5fNLpIaBX6AJxq4sndqPct8fYLrDUV6u4xw==
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000999:
-  version "1.0.30000999"
-  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000999.tgz#427253a69ad7bea4aa8d8345687b8eec51ca0e43"
-  integrity sha512-1CUyKyecPeksKwXZvYw0tEoaMCo/RwBlXmEtN5vVnabvO0KPd9RQLcaAuR9/1F+KDMv6esmOFWlsXuzDk+8rxg==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001004, caniuse-lite@^1.0.30001006:
+  version "1.0.30001008"
+  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001008.tgz#b8841b1df78a9f5ed9702537ef592f1f8772c0d9"
+  integrity sha512-b8DJyb+VVXZGRgJUa30cbk8gKHZ3LOZTBLaUEEVr2P4xpmFigOCc62CO4uzquW641Ouq1Rm9N+rWLWdSYDaDIw==
 
 case-sensitive-paths-webpack-plugin@^2.2.0:
   version "2.2.0"
@@ -2933,7 +2933,7 @@ classnames@^2.2.5:
   resolved "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz#43935bffdd291f326dad0a205309b38d00f650ce"
   integrity sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==
 
-clean-css@4.2.x:
+clean-css@4.2.x, clean-css@^4.2.1:
   version "4.2.1"
   resolved "https://registry.npmjs.org/clean-css/-/clean-css-4.2.1.tgz#2d411ef76b8569b6d0c84068dabe85b0aa5e5c17"
   integrity sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==
@@ -3067,9 +3067,9 @@ code-point-at@^1.0.0:
   integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
 
 codemirror@^5.46.0:
-  version "5.49.0"
-  resolved "https://registry.npmjs.org/codemirror/-/codemirror-5.49.0.tgz#adedbffcc81091e4a0334bcb96b1ae3b7ada5e3f"
-  integrity sha512-Hyzr0HToBdZpLBN9dYFO/KlJAsKH37/cXVHPAqa+imml0R92tb9AkmsvjnXL+SluEvjjdfkDgRjc65NG5jnMYA==
+  version "5.49.2"
+  resolved "https://registry.npmjs.org/codemirror/-/codemirror-5.49.2.tgz#c84fdaf11b19803f828b0c67060c7bc6d154ccad"
+  integrity sha512-dwJ2HRPHm8w51WB5YTF9J7m6Z5dtkqbU9ntMZ1dqXyFB9IpjoUFDj80ahRVEoVanfIp6pfASJbOlbWdEf8FOzQ==
 
 collection-visit@^1.0.0:
   version "1.0.0"
@@ -3159,6 +3159,11 @@ commander@2.17.x:
   resolved "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
   integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
 
+commander@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.npmjs.org/commander/-/commander-4.0.1.tgz#b67622721785993182e807f4883633e6401ba53c"
+  integrity sha512-IPF4ouhCP+qdlcmCedhxX4xiGBPyigb8v5NeUp+0LyhwLgxMqyp3S0vl7TAPfS/hiP7FC3caI/PB9lTmP8r1NA==
+
 commander@~2.19.0:
   version "2.19.0"
   resolved "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
@@ -3227,11 +3232,9 @@ connect-history-api-fallback@^1.3.0, connect-history-api-fallback@^1.6.0:
   integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==
 
 console-browserify@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
-  integrity sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=
-  dependencies:
-    date-now "^0.1.4"
+  version "1.2.0"
+  resolved "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
+  integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==
 
 console-control-strings@^1.0.0, console-control-strings@~1.1.0:
   version "1.1.0"
@@ -3547,21 +3550,13 @@ css-selector-tokenizer@^0.7.0:
     fastparse "^1.1.1"
     regexpu-core "^1.0.0"
 
-css-tree@1.0.0-alpha.29:
-  version "1.0.0-alpha.29"
-  resolved "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.29.tgz#3fa9d4ef3142cbd1c301e7664c1f352bd82f5a39"
-  integrity sha512-sRNb1XydwkW9IOci6iB2xmy8IGCj6r/fr+JWitvJ2JxQRPzN3T4AGGVWCMlVmVwM1gtgALJRmGIlWv5ppnGGkg==
-  dependencies:
-    mdn-data "~1.1.0"
-    source-map "^0.5.3"
-
-css-tree@1.0.0-alpha.33:
-  version "1.0.0-alpha.33"
-  resolved "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.33.tgz#970e20e5a91f7a378ddd0fc58d0b6c8d4f3be93e"
-  integrity sha512-SPt57bh5nQnpsTBsx/IXbO14sRc9xXu5MtMAVuo0BaQQmyf0NupNPPSoMaqiAF5tDFafYsTkfeH4Q/HCKXkg4w==
+css-tree@1.0.0-alpha.37:
+  version "1.0.0-alpha.37"
+  resolved "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz#98bebd62c4c1d9f960ec340cf9f7522e30709a22"
+  integrity sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==
   dependencies:
     mdn-data "2.0.4"
-    source-map "^0.5.3"
+    source-map "^0.6.1"
 
 css-unit-converter@^1.1.1:
   version "1.1.1"
@@ -3699,12 +3694,12 @@ cssnano@^4.0.0, cssnano@^4.1.10:
     is-resolvable "^1.0.0"
     postcss "^7.0.0"
 
-csso@^3.5.1:
-  version "3.5.1"
-  resolved "https://registry.npmjs.org/csso/-/csso-3.5.1.tgz#7b9eb8be61628973c1b261e169d2f024008e758b"
-  integrity sha512-vrqULLffYU1Q2tLdJvaCYbONStnfkfimRxXNaGjxMldI0C7JPBC4rB1RyjhfdZ4m1frm8pM9uRPKH3d2knZ8gg==
+csso@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.npmjs.org/csso/-/csso-4.0.2.tgz#e5f81ab3a56b8eefb7f0092ce7279329f454de3d"
+  integrity sha512-kS7/oeNVXkHWxby5tHVxlhjizRCSv8QdU7hB2FpdAibDU8FjTAolhNjKNTiLzXtUrKT6HwClE81yXwEk1309wg==
   dependencies:
-    css-tree "1.0.0-alpha.29"
+    css-tree "1.0.0-alpha.37"
 
 csso@~2.3.1:
   version "2.3.2"
@@ -3898,11 +3893,6 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
-date-now@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
-  integrity sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=
-
 dayjs@^1.8.0:
   version "1.8.16"
   resolved "https://registry.npmjs.org/dayjs/-/dayjs-1.8.16.tgz#2a3771de537255191b947957af2fd90012e71e64"
@@ -4302,10 +4292,10 @@ ejs@^2.6.1:
   resolved "https://registry.npmjs.org/ejs/-/ejs-2.7.1.tgz#5b5ab57f718b79d4aca9254457afecd36fa80228"
   integrity sha512-kS/gEPzZs3Y1rRsbGX4UOSjtP/CeJP0CxSNZHYxGfVM/VgLcv0ZqM7C45YyTj2DI2g7+P9Dd24C+IMIg6D0nYQ==
 
-electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.284, electron-to-chromium@^1.3.47:
-  version "1.3.285"
-  resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.285.tgz#909576db2ee4dfec74a87aa30c92f66ebfc78748"
-  integrity sha512-DYR9KW723sUbGK++DCmCmM95AbNXT4Q0tlCFMcYijFjayhuDqlGYR68OemlP8MJj0gjkwdeItIUfd0oLCgw+4A==
+electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.295, electron-to-chromium@^1.3.47:
+  version "1.3.302"
+  resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.302.tgz#4c7ba3d56166507a56f7eb603fdde1ed701f5ac8"
+  integrity sha512-1qConyiVEbj4xZRBXqtGR003+9tV0rJF0PS6aeO0Ln/UL637js9hdwweCl07meh/kJoI2N4W8q3R3g3F5z46ww==
 
 elliptic@^6.0.0:
   version "6.5.1"
@@ -4398,9 +4388,9 @@ error-stack-parser@^2.0.0:
     stackframe "^1.1.0"
 
 es-abstract@^1.12.0, es-abstract@^1.4.3, es-abstract@^1.5.0, es-abstract@^1.5.1, es-abstract@^1.7.0:
-  version "1.15.0"
-  resolved "https://registry.npmjs.org/es-abstract/-/es-abstract-1.15.0.tgz#8884928ec7e40a79e3c9bc812d37d10c8b24cc57"
-  integrity sha512-bhkEqWJ2t2lMeaJDuk7okMkJWI/yqgH/EoGwpcvv0XW9RWQsRspI4wt6xuyuvMvvQE3gg/D9HXppgk21w78GyQ==
+  version "1.16.0"
+  resolved "https://registry.npmjs.org/es-abstract/-/es-abstract-1.16.0.tgz#d3a26dc9c3283ac9750dca569586e976d9dcc06d"
+  integrity sha512-xdQnfykZ9JMEiasTAJZJdMWCQ1Vm00NBw79/AWi7ELfZuuPCSOMDZbT9mkOfSctVtfhb+sAAzrm+j//GjjLHLg==
   dependencies:
     es-to-primitive "^1.2.0"
     function-bind "^1.1.1"
@@ -4422,14 +4412,14 @@ es-to-primitive@^1.2.0:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
-es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.50, es5-ext@^0.10.51, es5-ext@~0.10.14:
-  version "0.10.51"
-  resolved "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.51.tgz#ed2d7d9d48a12df86e0299287e93a09ff478842f"
-  integrity sha512-oRpWzM2WcLHVKpnrcyB7OW8j/s67Ba04JCm0WnNv3RiABSvs7mrQlutB8DBv793gKcp0XENR8Il8WxGTlZ73gQ==
+es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.50, es5-ext@~0.10.14:
+  version "0.10.52"
+  resolved "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.52.tgz#bb21777e919a04263736ded120a9d665f10ea63f"
+  integrity sha512-bWCbE9fbpYQY4CU6hJbJ1vSz70EClMlDgJ7BmwI+zEJhxrwjesZRPglGJlsZhu0334U3hI+gaspwksH9IGD6ag==
   dependencies:
     es6-iterator "~2.0.3"
-    es6-symbol "~3.1.1"
-    next-tick "^1.0.0"
+    es6-symbol "~3.1.2"
+    next-tick "~1.0.0"
 
 es6-iterator@^2.0.3, es6-iterator@~2.0.1, es6-iterator@~2.0.3:
   version "2.0.3"
@@ -4471,13 +4461,13 @@ es6-symbol@3.1.1:
     d "1"
     es5-ext "~0.10.14"
 
-es6-symbol@^3.1.1, es6-symbol@~3.1.1:
-  version "3.1.2"
-  resolved "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.2.tgz#859fdd34f32e905ff06d752e7171ddd4444a7ed1"
-  integrity sha512-/ZypxQsArlv+KHpGvng52/Iz8by3EQPxhmbuz8yFG89N/caTFBSbcXONDw0aMjy827gQg26XAjP4uXFvnfINmQ==
+es6-symbol@^3.1.1, es6-symbol@~3.1.1, es6-symbol@~3.1.2:
+  version "3.1.3"
+  resolved "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18"
+  integrity sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==
   dependencies:
     d "^1.0.1"
-    es5-ext "^0.10.51"
+    ext "^1.1.2"
 
 es6-weak-map@^2.0.1:
   version "2.0.3"
@@ -4619,13 +4609,13 @@ eslint-scope@^4.0.0, eslint-scope@^4.0.3:
     estraverse "^4.1.1"
 
 eslint-utils@^1.3.1, eslint-utils@^1.4.2:
-  version "1.4.2"
-  resolved "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.2.tgz#166a5180ef6ab7eb462f162fd0e6f2463d7309ab"
-  integrity sha512-eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q==
+  version "1.4.3"
+  resolved "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f"
+  integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==
   dependencies:
-    eslint-visitor-keys "^1.0.0"
+    eslint-visitor-keys "^1.1.0"
 
-eslint-visitor-keys@^1.0.0:
+eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0:
   version "1.1.0"
   resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
   integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==
@@ -4930,6 +4920,13 @@ express@^4.16.2, express@^4.16.3, express@^4.17.1:
     utils-merge "1.0.1"
     vary "~1.1.2"
 
+ext@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.npmjs.org/ext/-/ext-1.1.2.tgz#d1d216c83641bb4cb7684622b063cff44a19ce35"
+  integrity sha512-/KLjJdTNyDepCihrk4HQt57nAE1IRCEo5jUt+WgWGCr1oARhibDvmI2DMcSNWood1T9AUWwq+jaV1wvRqaXfnA==
+  dependencies:
+    type "^2.0.0"
+
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
@@ -5211,9 +5208,9 @@ flatted@^2.0.0:
   integrity sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==
 
 flatten@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
-  integrity sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=
+  version "1.0.3"
+  resolved "https://registry.npmjs.org/flatten/-/flatten-1.0.3.tgz#c1283ac9f27b368abc1e36d1ff7b04501a30356b"
+  integrity sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg==
 
 flush-write-stream@^1.0.0:
   version "1.1.1"
@@ -5439,9 +5436,9 @@ glob-to-regexp@^0.3.0:
   integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
 
 glob@^7.0.0, glob@^7.0.3, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@~7.1.1, glob@~7.1.4:
-  version "7.1.4"
-  resolved "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
-  integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
+  version "7.1.5"
+  resolved "https://registry.npmjs.org/glob/-/glob-7.1.5.tgz#6714c69bee20f3c3e64c4dd905553e532b40cdc0"
+  integrity sha512-J9dlskqUXK1OeTOYBEn5s8aMukWMwWfs+rPTn/jn50Ux4MNXVhubL1wu/j2t+H4NVI+cXEcCaYellqaPVGXNqQ==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -5514,9 +5511,9 @@ good-listener@^1.2.2:
     delegate "^3.1.2"
 
 graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
-  version "4.2.2"
-  resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz#6f0952605d0140c1cfdb138ed005775b92d67b02"
-  integrity sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==
+  version "4.2.3"
+  resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
+  integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
 
 graphlib@^2.1.7:
   version "2.1.7"
@@ -5642,7 +5639,7 @@ hash.js@^1.0.0, hash.js@^1.0.3:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.1"
 
-he@1.2.x, he@^1.1.0:
+he@1.2.x, he@^1.1.0, he@^1.2.0:
   version "1.2.0"
   resolved "https://registry.npmjs.org/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
   integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
@@ -5653,9 +5650,9 @@ hex-color-regex@^1.1.0:
   integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==
 
 highlight.js@^9.6.0:
-  version "9.15.10"
-  resolved "https://registry.npmjs.org/highlight.js/-/highlight.js-9.15.10.tgz#7b18ed75c90348c045eef9ed08ca1319a2219ad2"
-  integrity sha512-RoV7OkQm0T3os3Dd2VHLNMoaoDVx77Wygln3n9l5YV172XonWG6rgQD3XnF/BuFFZw9A0TJgmMSO8FEWQgvcXw==
+  version "9.16.2"
+  resolved "https://registry.npmjs.org/highlight.js/-/highlight.js-9.16.2.tgz#68368d039ffe1c6211bcc07e483daf95de3e403e"
+  integrity sha512-feMUrVLZvjy0oC7FVJQcSQRqbBq9kwqnYE4+Kj9ZjbHh3g+BisiPgF49NyQbVLNdrL/qqZr3Ca9yOKwgn2i/tw==
 
 hmac-drbg@^1.0.0:
   version "1.0.1"
@@ -5714,6 +5711,19 @@ html-entities@^1.2.0, html-entities@^1.2.1:
   resolved "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
   integrity sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=
 
+html-minifier-terser@^5.0.1:
+  version "5.0.2"
+  resolved "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-5.0.2.tgz#0e67a0b062ae1dd0719fc73199479298f807ae16"
+  integrity sha512-VAaitmbBuHaPKv9bj47XKypRhgDxT/cDLvsPiiF7w+omrN3K0eQhpigV9Z1ilrmHa9e0rOYcD6R/+LCDADGcnQ==
+  dependencies:
+    camel-case "^3.0.0"
+    clean-css "^4.2.1"
+    commander "^4.0.0"
+    he "^1.2.0"
+    param-case "^2.1.1"
+    relateurl "^0.2.7"
+    terser "^4.3.9"
+
 html-minifier@^3.2.3:
   version "3.5.21"
   resolved "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.21.tgz#d0040e054730e354db008463593194015212d20c"
@@ -5745,6 +5755,18 @@ html-webpack-plugin@^3.2.0:
     toposort "^1.0.0"
     util.promisify "1.0.0"
 
+html-webpack-plugin@^4.0.0-beta.11:
+  version "4.0.0-beta.11"
+  resolved "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-4.0.0-beta.11.tgz#3059a69144b5aecef97708196ca32f9e68677715"
+  integrity sha512-4Xzepf0qWxf8CGg7/WQM5qBB2Lc/NFI7MhU59eUDTkuQp3skZczH4UA1d6oQyDEIoMDgERVhRyTdtUPZ5s5HBg==
+  dependencies:
+    html-minifier-terser "^5.0.1"
+    loader-utils "^1.2.3"
+    lodash "^4.17.15"
+    pretty-error "^2.1.1"
+    tapable "^1.1.3"
+    util.promisify "1.0.0"
+
 htmlparser2@^3.3.0:
   version "3.10.1"
   resolved "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f"
@@ -7044,11 +7066,6 @@ mdn-data@2.0.4:
   resolved "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz#699b3c38ac6f1d728091a64650b65d388502fd5b"
   integrity sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==
 
-mdn-data@~1.1.0:
-  version "1.1.4"
-  resolved "https://registry.npmjs.org/mdn-data/-/mdn-data-1.1.4.tgz#50b5d4ffc4575276573c4eedb8780812a8419f01"
-  integrity sha512-FSYbp3lyKjyj3E7fMl6rYvUdX0FBXaluGqlFoYESWQlyUTq8R+wp0rkFxoYFqZlHCvsUXGjyJmLQSnXToYhOSA==
-
 media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
@@ -7402,7 +7419,7 @@ neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.1:
   resolved "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
   integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==
 
-next-tick@^1.0.0:
+next-tick@~1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
   integrity sha1-yobR/ogoFpsBICCOPchCS524NCw=
@@ -7503,17 +7520,17 @@ node-pre-gyp@^0.12.0:
     semver "^5.3.0"
     tar "^4"
 
-node-releases@^1.1.36:
-  version "1.1.36"
-  resolved "https://registry.npmjs.org/node-releases/-/node-releases-1.1.36.tgz#44b7cb8254138e87bdbfa47761d0f825e20900b4"
-  integrity sha512-ggXhX6QGyJSjj3r+6ml2LqqC28XOWmKtpb+a15/Zpr9V3yoNazxJNlcQDS9bYaid5FReEWHEgToH1mwoUceWwg==
+node-releases@^1.1.38:
+  version "1.1.39"
+  resolved "https://registry.npmjs.org/node-releases/-/node-releases-1.1.39.tgz#c1011f30343aff5b633153b10ff691d278d08e8d"
+  integrity sha512-8MRC/ErwNCHOlAFycy9OPca46fQYUjbJRDcZTHVWIGXIjYLM73k70vv3WkYutVnM4cCo4hE0MqBVVZjP6vjISA==
   dependencies:
     semver "^6.3.0"
 
 node-sass@^4.11.0:
-  version "4.12.0"
-  resolved "https://registry.npmjs.org/node-sass/-/node-sass-4.12.0.tgz#0914f531932380114a30cc5fa4fa63233a25f017"
-  integrity sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ==
+  version "4.13.0"
+  resolved "https://registry.npmjs.org/node-sass/-/node-sass-4.13.0.tgz#b647288babdd6a1cb726de4545516b31f90da066"
+  integrity sha512-W1XBrvoJ1dy7VsvTAS5q1V45lREbTlZQqFbiHb3R3OTTCma0XBtuG6xZ6Z4506nR4lmHPTqVRwxT6KgtWC97CA==
   dependencies:
     async-foreach "^0.1.3"
     chalk "^1.1.1"
@@ -7522,7 +7539,7 @@ node-sass@^4.11.0:
     get-stdin "^4.0.1"
     glob "^7.0.3"
     in-publish "^2.0.0"
-    lodash "^4.17.11"
+    lodash "^4.17.15"
     meow "^3.7.0"
     mkdirp "^0.5.1"
     nan "^2.13.2"
@@ -7972,7 +7989,7 @@ parallel-transform@^1.1.0:
     inherits "^2.0.3"
     readable-stream "^2.1.5"
 
-param-case@2.1.x:
+param-case@2.1.x, param-case@^2.1.1:
   version "2.1.1"
   resolved "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247"
   integrity sha1-35T9jPZTHs915r75oIWPvHK+Ikc=
@@ -8208,7 +8225,7 @@ point-at-length@~1.0.2:
     isarray "~0.0.1"
     parse-svg-path "~0.1.1"
 
-portfinder@^1.0.20, portfinder@^1.0.24, portfinder@^1.0.9:
+portfinder@^1.0.20, portfinder@^1.0.25, portfinder@^1.0.9:
   version "1.0.25"
   resolved "https://registry.npmjs.org/portfinder/-/portfinder-1.0.25.tgz#254fd337ffba869f4b9d37edc298059cb4d35eca"
   integrity sha512-6ElJnHBbxVA1XSLgBp7G1FiCkQdlqGzuF7DswL5tcea+E8UpuvPU7beVAjjRwCioTS9ZluNbu+ZyRvgTsmqEBg==
@@ -8823,10 +8840,10 @@ postcss@^6.0.1, postcss@^6.0.23, postcss@^6.0.8:
     source-map "^0.6.1"
     supports-color "^5.4.0"
 
-postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.18, postcss@^7.0.5:
-  version "7.0.18"
-  resolved "https://registry.npmjs.org/postcss/-/postcss-7.0.18.tgz#4b9cda95ae6c069c67a4d933029eddd4838ac233"
-  integrity sha512-/7g1QXXgegpF+9GJj4iN7ChGF40sYuGYJ8WZu8DZWnmhQ/G36hfdk3q9LBJmoK+lZ+yzZ5KYpOoxq7LF1BxE8g==
+postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.21, postcss@^7.0.5:
+  version "7.0.21"
+  resolved "https://registry.npmjs.org/postcss/-/postcss-7.0.21.tgz#06bb07824c19c2021c5d056d5b10c35b989f7e17"
+  integrity sha512-uIFtJElxJo29QC753JzhidoAhvp/e/Exezkdhfmt8AymWT6/5B7W1WmponYWkHk2eg6sONyTch0A3nkMPun3SQ==
   dependencies:
     chalk "^2.4.2"
     source-map "^0.6.1"
@@ -8842,17 +8859,12 @@ prepend-http@^1.0.0:
   resolved "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
   integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=
 
-prettier@1.16.3:
-  version "1.16.3"
-  resolved "https://registry.npmjs.org/prettier/-/prettier-1.16.3.tgz#8c62168453badef702f34b45b6ee899574a6a65d"
-  integrity sha512-kn/GU6SMRYPxUakNXhpP0EedT/KmaPzr0H5lIsDogrykbaxOpOfAFfk5XA7DZrJyMAv1wlMV3CPcZruGXVVUZw==
-
-prettier@^1.7.0:
+prettier@^1.18.2, prettier@^1.7.0:
   version "1.18.2"
   resolved "https://registry.npmjs.org/prettier/-/prettier-1.18.2.tgz#6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea"
   integrity sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw==
 
-pretty-error@^2.0.2:
+pretty-error@^2.0.2, pretty-error@^2.1.1:
   version "2.1.1"
   resolved "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.1.tgz#5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3"
   integrity sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=
@@ -9260,9 +9272,9 @@ regjsgen@^0.2.0:
   integrity sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=
 
 regjsgen@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.0.tgz#a7634dc08f89209c2049adda3525711fb97265dd"
-  integrity sha512-RnIrLhrXCX5ow/E5/Mh2O4e/oa1/jW0eaBKTSy3LaCj+M3Bqvm97GWDp2yUtzIs4LEn65zR2yiYGFqb2ApnzDA==
+  version "0.5.1"
+  resolved "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.1.tgz#48f0bf1a5ea205196929c0d9798b42d1ed98443c"
+  integrity sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg==
 
 regjsparser@^0.1.4:
   version "0.1.5"
@@ -9283,7 +9295,7 @@ regression@~2.0.0:
   resolved "https://registry.npmjs.org/regression/-/regression-2.0.1.tgz#8d29c3e8224a10850c35e337e85a8b2fac3b0c87"
   integrity sha1-jSnD6CJKEIUMNeM36FqLL6w7DIc=
 
-relateurl@0.2.x:
+relateurl@0.2.x, relateurl@^0.2.7:
   version "0.2.7"
   resolved "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
   integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=
@@ -9321,19 +9333,19 @@ repeating@^2.0.0:
   dependencies:
     is-finite "^1.0.0"
 
-request-promise-core@1.1.2:
-  version "1.1.2"
-  resolved "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.2.tgz#339f6aababcafdb31c799ff158700336301d3346"
-  integrity sha512-UHYyq1MO8GsefGEt7EprS8UrXsm1TxEvFUX1IMTuSLU2Rh7fTIdFtl8xD7JiEYiWU2dl+NYAjCTksTehQUxPag==
+request-promise-core@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz#e9a3c081b51380dfea677336061fea879a829ee9"
+  integrity sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==
   dependencies:
-    lodash "^4.17.11"
+    lodash "^4.17.15"
 
 request-promise-native@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.7.tgz#a49868a624bdea5069f1251d0a836e0d89aa2c59"
-  integrity sha512-rIMnbBdgNViL37nZ1b3L/VfPOpSi0TqVDQPAvO6U14lMzOLrt5nilxCQqtDKhZeDiW0/hkCXGoQjhgJd/tCh6w==
+  version "1.0.8"
+  resolved "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.8.tgz#a455b960b826e44e2bf8999af64dff2bfe58cb36"
+  integrity sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ==
   dependencies:
-    request-promise-core "1.1.2"
+    request-promise-core "1.1.3"
     stealthy-require "^1.1.1"
     tough-cookie "^2.3.3"
 
@@ -9977,9 +9989,9 @@ source-map-support@^0.4.15:
     source-map "^0.5.6"
 
 source-map-support@~0.5.12:
-  version "0.5.13"
-  resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932"
-  integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==
+  version "0.5.16"
+  resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042"
+  integrity sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
@@ -10440,16 +10452,16 @@ svgo@^0.7.0:
     whet.extend "~0.9.9"
 
 svgo@^1.0.0:
-  version "1.3.0"
-  resolved "https://registry.npmjs.org/svgo/-/svgo-1.3.0.tgz#bae51ba95ded9a33a36b7c46ce9c359ae9154313"
-  integrity sha512-MLfUA6O+qauLDbym+mMZgtXCGRfIxyQoeH6IKVcFslyODEe/ElJNwr0FohQ3xG4C6HK6bk3KYPPXwHVJk3V5NQ==
+  version "1.3.2"
+  resolved "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz#b6dc511c063346c9e415b81e43401145b96d4167"
+  integrity sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==
   dependencies:
     chalk "^2.4.1"
     coa "^2.0.2"
     css-select "^2.0.0"
     css-select-base-adapter "^0.1.1"
-    css-tree "1.0.0-alpha.33"
-    csso "^3.5.1"
+    css-tree "1.0.0-alpha.37"
+    csso "^4.0.2"
     js-yaml "^3.13.1"
     mkdirp "~0.5.1"
     object.values "^1.1.0"
@@ -10555,6 +10567,15 @@ terser@^4.1.2:
     source-map "~0.6.1"
     source-map-support "~0.5.12"
 
+terser@^4.3.9:
+  version "4.4.0"
+  resolved "https://registry.npmjs.org/terser/-/terser-4.4.0.tgz#22c46b4817cf4c9565434bfe6ad47336af259ac3"
+  integrity sha512-oDG16n2WKm27JO8h4y/w3iqBGAOSCtq7k8dRmrn4Wf9NouL0b2WpMHGChFGZq4nFAQy1FsNJrVQHfurXOSTmOA==
+  dependencies:
+    commander "^2.20.0"
+    source-map "~0.6.1"
+    source-map-support "~0.5.12"
+
 text-table@^0.2.0, text-table@~0.2.0:
   version "0.2.0"
   resolved "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
@@ -10629,9 +10650,9 @@ tinycolor2@^1.4.1:
   integrity sha1-9PrTM0R7wLB9TcjpIJ2POaisd+g=
 
 tinymce@^5.0.2:
-  version "5.1.0"
-  resolved "https://registry.npmjs.org/tinymce/-/tinymce-5.1.0.tgz#34eff28ada9b93305a0d08860cf82d2edff269ca"
-  integrity sha512-zprr8gLHNCxxT4ebgwwIg1erhxQs1GUb3YHgNlRAuGRButDsrn35e1HW9YtMli/AnuY+ECcqyqhEI/wUNMYEFw==
+  version "5.1.1"
+  resolved "https://registry.npmjs.org/tinymce/-/tinymce-5.1.1.tgz#fd0d2ad1d07e9aa60a88d391b1cdcaa6402f3104"
+  integrity sha512-gdIt9kMNkQrDA0vm9mLcqnDBMMwDV6xsIaug0UzbRUnLpcOjR8JnE0P12GwrA/+9/p8IZiHcolGN9xAD/XxDzw==
 
 tmp@^0.0.33:
   version "0.0.33"
@@ -10782,6 +10803,11 @@ type@^1.0.1:
   resolved "https://registry.npmjs.org/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0"
   integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==
 
+type@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/type/-/type-2.0.0.tgz#5f16ff6ef2eb44f260494dae271033b29c09a9c3"
+  integrity sha512-KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow==
+
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
@@ -11053,14 +11079,14 @@ viser@^2.0.0:
     lodash "^4.17.4"
 
 vm-browserify@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.0.tgz#bd76d6a23323e2ca8ffa12028dc04559c75f9019"
-  integrity sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw==
+  version "1.1.2"
+  resolved "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
+  integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
 
 vue-apexcharts@^1.3.2:
-  version "1.5.0"
-  resolved "https://registry.npmjs.org/vue-apexcharts/-/vue-apexcharts-1.5.0.tgz#55209d87f389a4929f888fb3a21ef3ddd7f8177d"
-  integrity sha512-BhwhC45vQkhcsYwDGXjVczGL1KReedu/4lNH+hr0SzKNL8FgK4BQZgE+BJHwBQ5gt1Bd9JYnwe/DPWumC7O3bg==
+  version "1.5.1"
+  resolved "https://registry.npmjs.org/vue-apexcharts/-/vue-apexcharts-1.5.1.tgz#f235d3c8047690f598864b70bd389081efff7576"
+  integrity sha512-faMfIj7g4MEceWjh5Aux7NfEdJYiSvMK6ml6UA2oeQH444kU4z532zR8P6AvCj0x6LzV2fgv2POzt0poMaoIjg==
 
 vue-class-component@^6.0.0, vue-class-component@^6.2.0:
   version "6.3.2"
@@ -11126,9 +11152,9 @@ vue-loader@^13.0.5:
     vue-template-es2015-compiler "^1.6.0"
 
 vue-loader@^15.7.0:
-  version "15.7.1"
-  resolved "https://registry.npmjs.org/vue-loader/-/vue-loader-15.7.1.tgz#6ccacd4122aa80f69baaac08ff295a62e3aefcfd"
-  integrity sha512-fwIKtA23Pl/rqfYP5TSGK7gkEuLhoTvRYW+TU7ER3q9GpNLt/PjG5NLv3XHRDiTg7OPM1JcckBgds+VnAc+HbA==
+  version "15.7.2"
+  resolved "https://registry.npmjs.org/vue-loader/-/vue-loader-15.7.2.tgz#cc89e2716df87f70fe656c9da9d7f8bec06c73d6"
+  integrity sha512-H/P9xt/nkocyu4hZKg5TzPqyCT1oKOaCSk9zs0JCbJuy0Q8KtR0bjJpnT/5R5x/Ckd1GFkkLQnQ1C4x6xXeLZg==
   dependencies:
     "@vue/component-compiler-utils" "^3.0.0"
     hash-sum "^1.0.2"
@@ -11163,10 +11189,10 @@ vue-photo-preview@^1.1.3:
     webpack "^3.6.0"
     webpack-dev-server "^2.9.1"
 
-vue-print-nb-jeecg@^1.0.8:
-  version "1.0.8"
-  resolved "https://registry.npmjs.org/vue-print-nb-jeecg/-/vue-print-nb-jeecg-1.0.8.tgz#554de1bbf4695189bf335258c3fa7d1290ad36f6"
-  integrity sha512-MwScHs3zQ9AYCn1M3GcW1ZsaxHKygqHOPuFgK5ohvhfUNA94k83lD4619IQ5asOqIz9FGWqVIprKOxyyCzXnxQ==
+vue-print-nb-jeecg@^1.0.9:
+  version "1.0.9"
+  resolved "https://registry.npmjs.org/vue-print-nb-jeecg/-/vue-print-nb-jeecg-1.0.9.tgz#9c071d7527748ac4059b01d0071fb902fcff97e1"
+  integrity sha512-dWLbThjeq/hBo50wcKoHrJAxLEZcqiwoIFEjZQEvntVQs76PdDrWvpkC8F8tGZ5G9GXs9ihrddkXpaIltHJ1dQ==
   dependencies:
     babel-plugin-transform-runtime "^6.23.0"
 
@@ -11356,9 +11382,9 @@ webpack-dev-server@^2.9.1:
     yargs "6.6.0"
 
 webpack-dev-server@^3.4.1:
-  version "3.8.2"
-  resolved "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.8.2.tgz#3292427bf6510da9a3ac2d500b924a4197667ff9"
-  integrity sha512-0xxogS7n5jHDQWy0WST0q6Ykp7UGj4YvWh+HVN71JoE7BwPxMZrwgraBvmdEMbDVMBzF0u+mEzn8TQzBm5NYJQ==
+  version "3.9.0"
+  resolved "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.9.0.tgz#27c3b5d0f6b6677c4304465ac817623c8b27b89c"
+  integrity sha512-E6uQ4kRrTX9URN9s/lIbqTAztwEPdvzVrcmHE8EQ9YnuT9J8Es5Wrd8n9BKg1a0oZ5EgEke/EQFgUsp18dSTBw==
   dependencies:
     ansi-html "0.0.7"
     bonjour "^3.5.0"
@@ -11378,7 +11404,7 @@ webpack-dev-server@^3.4.1:
     loglevel "^1.6.4"
     opn "^5.5.0"
     p-retry "^3.0.1"
-    portfinder "^1.0.24"
+    portfinder "^1.0.25"
     schema-utils "^1.0.0"
     selfsigned "^1.10.7"
     semver "^6.3.0"

jeecg-boot/README.md

@@ -1,7 +1,7 @@
 Jeecg-Boot 快速开发平台
 ===============
 
-当前最新版本： 2.1.1（发布日期：20191021）
+当前最新版本： 2.1.2（发布日期：20191122）
 
 
 ## 后端技术架构
@@ -39,7 +39,7 @@ Jeecg-Boot 快速开发平台
 
 - 在线演示 ：  [http://boot.jeecg.org](http://boot.jeecg.org)
 
-- 在线教程：  [http://doc.jeecg.com/1273753](http://doc.jeecg.com/1273753)
+- 在线文档：  [http://doc.jeecg.com/1273753](http://doc.jeecg.com/1273753)
 
 - 常见问题：  [入门常见问题大全](http://www.jeecg.org/forum.php?mod=viewthread&tid=7816&extra=page%3D1)
 

jeecg-boot/db/增量升级脚步/Mysql 2.1.0升级2.1.1增量.sql

@@ -1,108 +0,0 @@
-
-
-UPDATE `sys_dict_item` SET  `item_text` = '可见/可访问(授权后可见/可访问)'  WHERE `id` = '83250269359855501ec4e9c0b7e21596';
-
-
--- ----------------------------
--- Table structure for oss_file
--- ----------------------------
-DROP TABLE IF EXISTS `oss_file`;
-CREATE TABLE `oss_file` (
-  `id` varchar(32) NOT NULL COMMENT '主键id',
-  `file_name` varchar(255) default NULL COMMENT '文件名称',
-  `url` varchar(255) default NULL COMMENT '文件地址',
-  `create_by` varchar(32) default NULL COMMENT '创建人登录名称',
-  `create_time` datetime default NULL COMMENT '创建日期',
-  `update_by` varchar(32) default NULL COMMENT '更新人登录名称',
-  `update_time` datetime default NULL COMMENT '更新日期',
-  PRIMARY KEY  (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Oss File';
-INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status) VALUES ('1166535831146504193', '2a470fc0c3954d9dbb61de6d80846549', '对象存储', '/oss/file', 'modules/oss/OSSFileList', null, null, 1, null, '1', 1, 0, '', 1, 1, 0, 0, null, 'admin', '2019-08-28 02:19:50', 'admin', '2019-08-28 02:20:57', 0, 0, '1');
-
-
-
-ALTER TABLE sys_permission
-  add COLUMN  internal_or_external  tinyint(1)
-  comment '外链菜单打开方式 0/内部打开 1/外部打开';
-
-INSERT INTO `sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) VALUES ('1170592628746878978', 'd7d6e2e4e2934f2c9385a623fd98c6f3', '菜单管理', '/isystem/newPermissionList', 'system/NewPermissionList', NULL, NULL, '1', NULL, '1', '100', '0', NULL, '1', '1', '0', '0', NULL, 'admin', '2019-09-08 15:00:05', 'admin', '2019-09-08 15:02:57', '0', '0', '1', '0');
-
-ALTER TABLE `sys_permission`
-ADD INDEX `index_menu_type`(`menu_type`),
-ADD INDEX `index_menu_hidden`(`hidden`),
-ADD INDEX `index_menu_status`(`status`);
-
-ALTER TABLE `sys_depart`
-ADD COLUMN `org_category`  varchar(10) NOT NULL DEFAULT 1 COMMENT '机构类别 1组织机构，2岗位' AFTER `description`;
-
-INSERT INTO `sys_dict` (`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`, `type`) VALUES ('1174511106530525185', '机构类型', 'org_category', '机构类型 1组织机构，2岗位', '0', 'admin', '2019-09-19 10:30:43', NULL, NULL, '0');
-INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('1174511197735665665', '1174511106530525185', '组织机构', '1', '组织机构', '1', '1', 'admin', '2019-09-19 10:31:05', NULL, NULL);
-INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('1174511244036587521', '1174511106530525185', '岗位', '2', '岗位', '1', '1', 'admin', '2019-09-19 10:31:16', NULL, NULL);
-
-ALTER TABLE `sys_user`
-  ADD COLUMN `work_no` varchar(100) NULL COMMENT '工号，唯一键' AFTER `activiti_sync`,
-  ADD COLUMN `post` varchar(100) NULL COMMENT '职务，关联职务表' AFTER `work_no`,
-  ADD COLUMN `telephone` varchar(45) NULL COMMENT '座机号' AFTER `post`,
-  ADD UNIQUE INDEX `uniq_sys_user_work_no` (`work_no`);
-
-
-DROP TABLE IF EXISTS `sys_position`;
-CREATE TABLE `sys_position` (
-  `id` varchar(32) NOT NULL,
-  `code` varchar(100) DEFAULT NULL COMMENT '职务编码',
-  `name` varchar(100) DEFAULT NULL COMMENT '职务名称',
-  `rank` varchar(2) DEFAULT NULL COMMENT '职级',
-  `company_id` varchar(255) DEFAULT NULL COMMENT '公司id',
-  `create_by` varchar(50) DEFAULT NULL COMMENT '创建人',
-  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
-  `update_by` varchar(50) DEFAULT NULL COMMENT '修改人',
-  `update_time` datetime DEFAULT NULL COMMENT '修改时间',
-  `sys_org_code` varchar(50) DEFAULT NULL COMMENT '组织机构编码',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
--- 职务菜单
-INSERT INTO `sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `is_route`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) VALUES ('1174506953255182338', 'd7d6e2e4e2934f2c9385a623fd98c6f3', '职务管理', '/isystem/position', 'system/SysPositionList', '1', NULL, NULL, '1', NULL, '1', '2', '0', NULL, '1', '0', '0', NULL, 'admin', '2019-09-19 10:14:13', 'admin', '2019-09-19 10:15:22', '0', '0', '1', '0');
-
--- 职务职级字典
-INSERT INTO `sys_dict` (`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`, `type`) VALUES ('1174509082208395266', '职务职级', 'position_rank', '职务表职级字典', '0', 'admin', '2019-09-19 10:22:41', NULL, NULL, '0');
-INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('1174509601047994369', '1174509082208395266', '员工', '1', '', '1', '1', 'admin', '2019-09-19 10:24:45', NULL, NULL);
-INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('1174509667297026049', '1174509082208395266', '小组长', '2', '', '2', '1', 'admin', '2019-09-19 10:25:01', NULL, NULL);
-INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('1174509713568587777', '1174509082208395266', '部门经理', '3', '', '3', '1', 'admin', '2019-09-19 10:25:12', NULL, NULL);
-INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('1174509788361416705', '1174509082208395266', '副总经理', '4', '', '4', '1', 'admin', '2019-09-19 10:25:30', NULL, NULL);
-INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('1174509835803189250', '1174509082208395266', '总经理', '5', '', '5', '1', 'admin', '2019-09-19 10:25:41', NULL, NULL);
-INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('1174509861333917697', '1174509082208395266', '董事长', '6', '', '6', '1', 'admin', '2019-09-19 10:25:47', NULL, NULL);
-
--- 通讯录菜单
-INSERT INTO `sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `is_route`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) VALUES ('1174590283938041857', 'd7d6e2e4e2934f2c9385a623fd98c6f3', '通讯录', '/isystem/addressList', 'system/AddressList', '1', NULL, NULL, '1', NULL, '1', '3', '0', NULL, '1', '0', '0', NULL, 'admin', '2019-09-19 15:45:21', NULL, NULL, '0', '0', '1', '0');
-
-
-DELETE FROM sys_dict_item WHERE dict_id = "1174509082208395266";
-INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('1174509601047994369', '1174509082208395266', '员级', '1', '', '1', '1', 'admin', '2019-09-19 10:24:45', 'admin', '2019-09-23 11:46:39');
-INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('1174509667297026049', '1174509082208395266', '助级', '2', '', '2', '1', 'admin', '2019-09-19 10:25:01', 'admin', '2019-09-23 11:46:47');
-INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('1174509713568587777', '1174509082208395266', '中级', '3', '', '3', '1', 'admin', '2019-09-19 10:25:12', 'admin', '2019-09-23 11:46:56');
-INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('1174509788361416705', '1174509082208395266', '副高级', '4', '', '4', '1', 'admin', '2019-09-19 10:25:30', 'admin', '2019-09-23 11:47:06');
-INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('1174509835803189250', '1174509082208395266', '正高级', '5', '', '5', '1', 'admin', '2019-09-19 10:25:41', 'admin', '2019-09-23 11:47:12');
-
-ALTER TABLE  sys_user
-MODIFY COLUMN `sex` tinyint(1) NULL COMMENT '性别(0-默认未知,1-男,2-女)' AFTER `birthday`;
-
-ALTER TABLE  sys_permission
-MODIFY COLUMN `sort_no` double(8, 2) NULL DEFAULT NULL COMMENT '菜单排序' AFTER `perms_type`;
-
-INSERT INTO `sys_dict`(`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`, `type`) VALUES ('1178295274528845826', '表单权限策略', 'form_perms_type', '', 0, 'admin', '2019-09-29 21:07:39', 'admin', '2019-09-29 21:08:26', NULL);
-INSERT INTO `sys_dict_item`(`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('1178295553450061826', '1178295274528845826', '可编辑(未授权禁用)', '2', '', 2, 1, 'admin', '2019-09-29 21:08:46', 'admin', '2019-09-29 21:09:18');
-INSERT INTO `sys_dict_item`(`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('1178295639554928641', '1178295274528845826', '可见(未授权不可见)', '1', '', 1, 1, 'admin', '2019-09-29 21:09:06', 'admin', '2019-09-29 21:09:24');
-
-ALTER TABLE `sys_role`
-  ADD UNIQUE INDEX `uniq_sys_role_role_code` (`role_code`) USING BTREE ;
-
-INSERT INTO `sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`) VALUES ('f2849d3814fc97993bfc519ae6bbf049', 'e41b69c57a941a3bbcce45032fe57605', 'AUTO复制表单', '/online/copyform/:code', 'modules/online/cgform/OnlCgformCopyList', NULL, NULL, '1', NULL, '1', '1', '0', NULL, '1', '1', '0', '1', NULL, 'admin', '2019-08-29 16:05:37', NULL, NULL, '0', '0', '1');
-
-ALTER TABLE `onl_cgform_head`
-ADD COLUMN `copy_version`  int(11) NULL COMMENT '复制版本号' AFTER `form_template_mobile`,
-ADD COLUMN `copy_type`  int(3) NULL DEFAULT 0 COMMENT '复制表类型1为复制表 0为原始表' AFTER `copy_version`,
-ADD COLUMN `physic_id`  varchar(32) NULL COMMENT '原始表ID' AFTER `copy_type`;
-
-ALTER TABLE `onl_cgform_head`
-ADD COLUMN `scroll`  int(3) NULL DEFAULT 0 COMMENT '是否有横向滚动条' AFTER `form_template_mobile`;

jeecg-boot/jeecg-boot-base-common/pom.xml

@@ -3,12 +3,12 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>jeecg-boot-base-common</artifactId>
-	<version>2.1.1</version>
+	<version>2.1.2</version>
 
 	<parent>
 		<groupId>org.jeecgframework.boot</groupId>
 		<artifactId>jeecg-boot-parent</artifactId>
-		<version>2.1.1</version>
+		<version>2.1.2</version>
 	</parent>
 	
 	<repositories>

jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/es/JeecgElasticsearchTemplate.java

@@ -11,6 +11,10 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
 /**
  * 关于 ElasticSearch 的一些方法（创建索引、添加数据、查询等）
  *
@@ -20,11 +24,54 @@ import org.springframework.stereotype.Component;
 @Component
 public class JeecgElasticsearchTemplate {
 
-    @Value("${jeecg.elasticsearch.cluster-nodes}")
+    /**
+     * 用户配置是否通过，未通过就不走任何方法
+     */
+    private static boolean configIsPassed = true;
+    /**
+     * 是否已检测过配置
+     */
+    private static boolean configIsChecked = false;
+
     private String baseUrl;
 
     private final String FORMAT_JSON = "format=json";
 
+    public JeecgElasticsearchTemplate(@Value("${jeecg.elasticsearch.cluster-nodes}") String baseUrl) {
+        log.debug("JeecgElasticsearchTemplate BaseURL：" + baseUrl);
+
+        //  未检测过配置，进行检测操作
+        if (!configIsChecked) {
+            configIsChecked = true;
+            // 为空则代表未配置 baseUrl
+            if (StringUtils.isEmpty(baseUrl)) {
+                configIsPassed = false;
+            } else {
+                this.baseUrl = baseUrl;
+                // 判断配置的地址是否有效
+                try {
+                    RestUtil.get(this.getBaseUrl().toString());
+                } catch (Exception e) {
+                    configIsPassed = false;
+                }
+            }
+            if (configIsPassed) {
+                log.info("ElasticSearch服务连接成功");
+            } else {
+                log.warn("ElasticSearch 服务连接失败，原因：配置未通过。可能是BaseURL未配置或配置有误，也可能是Elasticsearch服务未启动。接下来将会拒绝执行任何方法！");
+            }
+        }
+    }
+
+    /**
+     * 检查配置是否通过，未通过就抛出异常，中断执行
+     */
+    private void checkConfig() {
+        if (!configIsPassed) {
+            throw new RuntimeException("配置未通过，拒绝执行该方法");
+        }
+    }
+
     public StringBuilder getBaseUrl(String indexName, String typeName) {
         typeName = typeName.trim().toLowerCase();
         return this.getBaseUrl(indexName).append("/").append(typeName);
@@ -43,6 +90,7 @@ public class JeecgElasticsearchTemplate {
      * cat 查询ElasticSearch系统数据，返回json
      */
     public <T> ResponseEntity<T> _cat(String urlAfter, Class<T> responseType) {
+        this.checkConfig();
         String url = this.getBaseUrl().append("/_cat").append(urlAfter).append("?").append(FORMAT_JSON).toString();
         return RestUtil.request(url, HttpMethod.GET, null, null, null, responseType);
     }
@@ -53,6 +101,7 @@ public class JeecgElasticsearchTemplate {
      * 查询地址：GET http://{baseUrl}/_cat/indices
      */
     public JSONArray getIndices() {
+        this.checkConfig();
         return getIndices(null);
     }
 
@@ -63,6 +112,7 @@ public class JeecgElasticsearchTemplate {
      * 查询地址：GET http://{baseUrl}/_cat/indices/{indexName}
      */
     public JSONArray getIndices(String indexName) {
+        this.checkConfig();
         StringBuilder urlAfter = new StringBuilder("/indices");
         if (!StringUtils.isEmpty(indexName)) {
             urlAfter.append("/").append(indexName.trim().toLowerCase());
@@ -74,6 +124,7 @@ public class JeecgElasticsearchTemplate {
      * 索引是否存在
      */
     public boolean indexExists(String indexName) {
+        this.checkConfig();
         try {
             JSONArray array = getIndices(indexName);
             return array != null;
@@ -92,6 +143,7 @@ public class JeecgElasticsearchTemplate {
      * 查询地址：PUT http://{baseUrl}/{indexName}
      */
     public boolean createIndex(String indexName) {
+        this.checkConfig();
         String url = this.getBaseUrl(indexName).toString();
 
         /* 返回结果 （仅供参考）
@@ -119,6 +171,7 @@ public class JeecgElasticsearchTemplate {
      * 查询地址：DELETE http://{baseUrl}/{indexName}
      */
     public boolean removeIndex(String indexName) {
+        this.checkConfig();
         String url = this.getBaseUrl(indexName).toString();
         try {
             return RestUtil.delete(url).getBoolean("acknowledged");
@@ -136,6 +189,7 @@ public class JeecgElasticsearchTemplate {
      * 保存数据，详见：saveOrUpdate
      */
     public boolean save(String indexName, String typeName, String dataId, JSONObject data) {
+        this.checkConfig();
         return this.saveOrUpdate(indexName, typeName, dataId, data);
     }
 
@@ -143,6 +197,7 @@ public class JeecgElasticsearchTemplate {
      * 更新数据，详见：saveOrUpdate
      */
     public boolean update(String indexName, String typeName, String dataId, JSONObject data) {
+        this.checkConfig();
         return this.saveOrUpdate(indexName, typeName, dataId, data);
     }
 
@@ -158,6 +213,7 @@ public class JeecgElasticsearchTemplate {
      * @return
      */
     public boolean saveOrUpdate(String indexName, String typeName, String dataId, JSONObject data) {
+        this.checkConfig();
         String url = this.getBaseUrl(indexName, typeName).append("/").append(dataId).toString();
         /* 返回结果（仅供参考）
        "createIndexA2": {
@@ -178,12 +234,17 @@ public class JeecgElasticsearchTemplate {
 
         try {
             // 去掉 data 中为空的值
-            for (String key : data.keySet()) {
+            Set<String> keys = data.keySet();
+            List<String> emptyKeys = new ArrayList<>(keys.size());
+            for (String key : keys) {
                 String value = data.getString(key);
                 if (StringUtils.isEmpty(value)) {
-                    data.remove(key);
+                    emptyKeys.add(key);
                 }
             }
+            for (String key : emptyKeys) {
+                data.remove(key);
+            }
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -198,6 +259,7 @@ public class JeecgElasticsearchTemplate {
      * 请求地址：DELETE http://{baseUrl}/{indexName}/{typeName}/{dataId}
      */
     public boolean delete(String indexName, String typeName, String dataId) {
+        this.checkConfig();
         String url = this.getBaseUrl(indexName, typeName).append("/").append(dataId).toString();
         /* 返回结果（仅供参考）
         {
@@ -235,6 +297,7 @@ public class JeecgElasticsearchTemplate {
      * 请求地址：POST http://{baseUrl}/{indexName}/{typeName}/_search
      */
     public JSONObject search(String indexName, String typeName, JSONObject queryObject) {
+        this.checkConfig();
         String url = this.getBaseUrl(indexName, typeName).append("/_search").toString();
 
         log.info("search: " + queryObject.toJSONString());

jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/handler/IFillRuleHandler.java

@@ -0,0 +1,16 @@
+package org.jeecg.common.handler;
+
+import com.alibaba.fastjson.JSONObject;
+
+/**
+ * 填值规则接口
+ *
+ * @author Yan_东
+ * 如需使用填值规则功能，规则实现类必须实现此接口
+ */
+public interface IFillRuleHandler {
+
+    public Object execute(JSONObject params, JSONObject formData);
+
+}
+

jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java

@@ -6,6 +6,7 @@ import java.util.List;
 import org.jeecg.common.system.vo.ComboModel;
 import org.jeecg.common.system.vo.DictModel;
 import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.system.vo.SysDepartModel;
 
 /**
  * @Description: 底层共通业务API，提供其他独立模块调用
@@ -115,12 +116,26 @@ public interface ISysBaseAPI {
 	 */
 	public List<ComboModel> queryAllUser();
 
+    /**
+     * 获取所有有效用户 带参
+     * userIds 默认选中用户
+     * @return
+     */
+    public List<ComboModel> queryAllUser(String[] userIds);
+
 	/**
 	 * 获取所有角色
 	 * @return
 	 */
 	public List<ComboModel> queryAllRole();
 
+	/**
+	 * 获取所有角色 带参
+     * roleIds 默认选中角色
+	 * @return
+	 */
+	public List<ComboModel> queryAllRole(String[] roleIds );
+
 	/**
 	 * 通过用户账号查询角色Id集合
 	 * @param username
@@ -141,5 +156,11 @@ public interface ISysBaseAPI {
 	 * @return
 	 */
 	public DictModel getParentDepartId(String departId);
+
+	/**
+	 * 查询所有部门
+	 * @return
+	 */
+	public List<SysDepartModel> getAllSysDepart();
 	
 }

jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/system/query/QueryGenerator.java

@@ -19,9 +19,9 @@ import org.apache.commons.beanutils.PropertyUtils;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.util.JeecgDataAutorUtils;
 import org.jeecg.common.system.util.JwtUtil;
+import org.jeecg.common.system.vo.SysPermissionDataRuleModel;
 import org.jeecg.common.util.SqlInjectionUtil;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.system.entity.SysPermissionDataRule;
 import org.springframework.util.NumberUtils;
 
 import com.alibaba.fastjson.JSON;
@@ -94,7 +94,7 @@ public class QueryGenerator {
 		
 		//区间条件组装 模糊查询 高级查询组装 简单排序 权限查询
 		PropertyDescriptor origDescriptors[] = PropertyUtils.getPropertyDescriptors(searchObj);
-		Map<String,SysPermissionDataRule> ruleMap = getRuleMap();
+		Map<String,SysPermissionDataRuleModel> ruleMap = getRuleMap();
 		
 		//权限规则自定义SQL表达式
 		for (String c : ruleMap.keySet()) {
@@ -444,14 +444,14 @@ public class QueryGenerator {
 	 * 
 	 * @return
 	 */
-	public static Map<String, SysPermissionDataRule> getRuleMap() {
-		Map<String, SysPermissionDataRule> ruleMap = new HashMap<String, SysPermissionDataRule>();
-		List<SysPermissionDataRule> list =JeecgDataAutorUtils.loadDataSearchConditon();
+	public static Map<String, SysPermissionDataRuleModel> getRuleMap() {
+		Map<String, SysPermissionDataRuleModel> ruleMap = new HashMap<String, SysPermissionDataRuleModel>();
+		List<SysPermissionDataRuleModel> list =JeecgDataAutorUtils.loadDataSearchConditon();
 		if(list != null&&list.size()>0){
 			if(list.get(0)==null){
 				return ruleMap;
 			}
-			for (SysPermissionDataRule rule : list) {
+			for (SysPermissionDataRuleModel rule : list) {
 				String column = rule.getRuleColumn();
 				if(QueryRuleEnum.SQL_RULES.getValue().equals(rule.getRuleConditions())) {
 					column = SQL_RULES_COLUMN+rule.getId();
@@ -462,7 +462,7 @@ public class QueryGenerator {
 		return ruleMap;
 	}
 	
-	private static void addRuleToQueryWrapper(SysPermissionDataRule dataRule,String name, Class propertyType, QueryWrapper<?> queryWrapper) {
+	private static void addRuleToQueryWrapper(SysPermissionDataRuleModel dataRule, String name, Class propertyType, QueryWrapper<?> queryWrapper) {
 		QueryRuleEnum rule = QueryRuleEnum.getByValue(dataRule.getRuleConditions());
 		if(rule.equals(QueryRuleEnum.IN) && ! propertyType.equals(String.class)) {
 			String[] values = dataRule.getRuleValue().split(",");
@@ -636,7 +636,7 @@ public class QueryGenerator {
 	public static String installAuthJdbc(Class<?> clazz) {
 		StringBuffer sb = new StringBuffer();
 		//权限查询
-		Map<String,SysPermissionDataRule> ruleMap = getRuleMap();
+		Map<String,SysPermissionDataRuleModel> ruleMap = getRuleMap();
 		PropertyDescriptor origDescriptors[] = PropertyUtils.getPropertyDescriptors(clazz);
 		String sql_and = " and ";
 		for (String c : ruleMap.keySet()) {
@@ -651,7 +651,7 @@ public class QueryGenerator {
 				continue;
 			}
 			if(ruleMap.containsKey(name)) {
-				SysPermissionDataRule dataRule = ruleMap.get(name);
+				SysPermissionDataRuleModel dataRule = ruleMap.get(name);
 				QueryRuleEnum rule = QueryRuleEnum.getByValue(dataRule.getRuleConditions());
 				Class propType = origDescriptors[i].getPropertyType();
 				boolean isString = propType.equals(String.class);
@@ -677,7 +677,7 @@ public class QueryGenerator {
 	 */
 	public static void installAuthMplus(QueryWrapper<?> queryWrapper,Class<?> clazz) {
 		//权限查询
-		Map<String,SysPermissionDataRule> ruleMap = getRuleMap();
+		Map<String,SysPermissionDataRuleModel> ruleMap = getRuleMap();
 		PropertyDescriptor origDescriptors[] = PropertyUtils.getPropertyDescriptors(clazz);
 		for (String c : ruleMap.keySet()) {
 			if(oConvertUtils.isNotEmpty(c) && c.startsWith(SQL_RULES_COLUMN)){

jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/system/util/JeecgDataAutorUtils.java

@@ -1,15 +1,14 @@
 package org.jeecg.common.system.util;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
+import org.jeecg.common.system.vo.SysPermissionDataRuleModel;
 import org.jeecg.common.system.vo.SysUserCacheInfo;
 import org.jeecg.common.util.SpringContextUtils;
-import org.jeecg.modules.system.entity.SysPermissionDataRule;
 import org.springframework.util.StringUtils;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @ClassName: JeecgDataAutorUtils
  * @Description: 数据权限查询规则容器工具类
@@ -29,16 +28,16 @@ public class JeecgDataAutorUtils {
 	 * 往链接请求里面，传入数据查询条件
 	 * 
 	 * @param request
-	 * @param MENU_DATA_AUTHOR_RULES
+	 * @param dataRules
 	 */
-	public static synchronized void installDataSearchConditon(HttpServletRequest request, List<SysPermissionDataRule> dataRules) {
+	public static synchronized void installDataSearchConditon(HttpServletRequest request, List<SysPermissionDataRuleModel> dataRules) {
 		@SuppressWarnings("unchecked")
-		List<SysPermissionDataRule> list = (List<SysPermissionDataRule>)loadDataSearchConditon();// 1.先从request获取MENU_DATA_AUTHOR_RULES，如果存则获取到LIST
+		List<SysPermissionDataRuleModel> list = (List<SysPermissionDataRuleModel>)loadDataSearchConditon();// 1.先从request获取MENU_DATA_AUTHOR_RULES，如果存则获取到LIST
 		if (list==null) {
 			// 2.如果不存在，则new一个list
-			list = new ArrayList<SysPermissionDataRule>();
+			list = new ArrayList<SysPermissionDataRuleModel>();
 		}
-		for (SysPermissionDataRule tsDataRule : dataRules) {
+		for (SysPermissionDataRuleModel tsDataRule : dataRules) {
 			list.add(tsDataRule);
 		}
 		request.setAttribute(MENU_DATA_AUTHOR_RULES, list); // 3.往list里面增量存指
@@ -47,19 +46,17 @@ public class JeecgDataAutorUtils {
 	/**
 	 * 获取请求对应的数据权限规则
 	 * 
-	 * @param request
 	 * @return
 	 */
 	@SuppressWarnings("unchecked")
-	public static synchronized List<SysPermissionDataRule> loadDataSearchConditon() {
-		return (List<SysPermissionDataRule>) SpringContextUtils.getHttpServletRequest().getAttribute(MENU_DATA_AUTHOR_RULES);
+	public static synchronized List<SysPermissionDataRuleModel> loadDataSearchConditon() {
+		return (List<SysPermissionDataRuleModel>) SpringContextUtils.getHttpServletRequest().getAttribute(MENU_DATA_AUTHOR_RULES);
 				
 	}
 
 	/**
 	 * 获取请求对应的数据权限SQL
 	 * 
-	 * @param request
 	 * @return
 	 */
 	public static synchronized String loadDataSearchConditonSQLString() {
@@ -70,7 +67,7 @@ public class JeecgDataAutorUtils {
 	 * 往链接请求里面，传入数据查询条件
 	 * 
 	 * @param request
-	 * @param MENU_DATA_AUTHOR_RULE_SQL
+	 * @param sql
 	 */
 	public static synchronized void installDataSearchConditon(HttpServletRequest request, String sql) {
 		String ruleSql = (String)loadDataSearchConditonSQLString();

jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/system/vo/ComboModel.java

@@ -14,13 +14,19 @@ import java.io.Serializable;
 public class ComboModel implements Serializable {
     private String id;
     private String title;
+    /**文档管理 表单table默认选中*/
+    private boolean checked;
+    /**文档管理 表单table 用户账号*/
+    private String username;
 
     public ComboModel(){
 
     };
 
-    public ComboModel(String id,String title){
+    public ComboModel(String id,String title,boolean checked,String username){
         this.id = id;
         this.title = title;
+        this.checked = false;
+        this.username = username;
     };
 }

jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/system/vo/SysDepartModel.java

@@ -0,0 +1,147 @@
+package org.jeecg.common.system.vo;
+
+/**
+ * lvdandan 部门机构model
+ */
+public class SysDepartModel {
+    /**ID*/
+    private String id;
+    /**父机构ID*/
+    private String parentId;
+    /**机构/部门名称*/
+    private String departName;
+    /**英文名*/
+    private String departNameEn;
+    /**缩写*/
+    private String departNameAbbr;
+    /**排序*/
+    private Integer departOrder;
+    /**描述*/
+    private Object description;
+    /**机构类别 1组织机构，2岗位*/
+    private String orgCategory;
+    /**机构类型*/
+    private String orgType;
+    /**机构编码*/
+    private String orgCode;
+    /**手机号*/
+    private String mobile;
+    /**传真*/
+    private String fax;
+    /**地址*/
+    private String address;
+    /**备注*/
+    private String memo;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
+    }
+
+    public String getDepartName() {
+        return departName;
+    }
+
+    public void setDepartName(String departName) {
+        this.departName = departName;
+    }
+
+    public String getDepartNameEn() {
+        return departNameEn;
+    }
+
+    public void setDepartNameEn(String departNameEn) {
+        this.departNameEn = departNameEn;
+    }
+
+    public String getDepartNameAbbr() {
+        return departNameAbbr;
+    }
+
+    public void setDepartNameAbbr(String departNameAbbr) {
+        this.departNameAbbr = departNameAbbr;
+    }
+
+    public Integer getDepartOrder() {
+        return departOrder;
+    }
+
+    public void setDepartOrder(Integer departOrder) {
+        this.departOrder = departOrder;
+    }
+
+    public Object getDescription() {
+        return description;
+    }
+
+    public void setDescription(Object description) {
+        this.description = description;
+    }
+
+    public String getOrgCategory() {
+        return orgCategory;
+    }
+
+    public void setOrgCategory(String orgCategory) {
+        this.orgCategory = orgCategory;
+    }
+
+    public String getOrgType() {
+        return orgType;
+    }
+
+    public void setOrgType(String orgType) {
+        this.orgType = orgType;
+    }
+
+    public String getOrgCode() {
+        return orgCode;
+    }
+
+    public void setOrgCode(String orgCode) {
+        this.orgCode = orgCode;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public String getFax() {
+        return fax;
+    }
+
+    public void setFax(String fax) {
+        this.fax = fax;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getMemo() {
+        return memo;
+    }
+
+    public void setMemo(String memo) {
+        this.memo = memo;
+    }
+}

jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/system/vo/SysPermissionDataRuleModel.java

@@ -0,0 +1,151 @@
+package org.jeecg.common.system.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 菜单权限规则表
+ * </p>
+ *
+ * @Author huangzhilin
+ * @since 2019-03-29
+ */
+public class SysPermissionDataRuleModel {
+
+    /**
+     * id
+     */
+    private String id;
+
+    /**
+     * 对应的菜单id
+     */
+    private String permissionId;
+
+    /**
+     * 规则名称
+     */
+    private String ruleName;
+
+    /**
+     * 字段
+     */
+    private String ruleColumn;
+
+    /**
+     * 条件
+     */
+    private String ruleConditions;
+
+    /**
+     * 规则值
+     */
+    private String ruleValue;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 创建人
+     */
+    private String createBy;
+
+    /**
+     * 修改时间
+     */
+    private Date updateTime;
+
+    /**
+     * 修改人
+     */
+    private String updateBy;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getPermissionId() {
+        return permissionId;
+    }
+
+    public void setPermissionId(String permissionId) {
+        this.permissionId = permissionId;
+    }
+
+    public String getRuleName() {
+        return ruleName;
+    }
+
+    public void setRuleName(String ruleName) {
+        this.ruleName = ruleName;
+    }
+
+    public String getRuleColumn() {
+        return ruleColumn;
+    }
+
+    public void setRuleColumn(String ruleColumn) {
+        this.ruleColumn = ruleColumn;
+    }
+
+    public String getRuleConditions() {
+        return ruleConditions;
+    }
+
+    public void setRuleConditions(String ruleConditions) {
+        this.ruleConditions = ruleConditions;
+    }
+
+    public String getRuleValue() {
+        return ruleValue;
+    }
+
+    public void setRuleValue(String ruleValue) {
+        this.ruleValue = ruleValue;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(String updateBy) {
+        this.updateBy = updateBy;
+    }
+}

jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/FillRuleUtil.java

@@ -0,0 +1,51 @@
+package org.jeecg.common.util;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang.StringUtils;
+import org.jeecg.common.handler.IFillRuleHandler;
+
+
+/**
+ * 规则值自动生成工具类
+ *
+ * @author qinfeng
+ * @举例： 自动生成订单号；自动生成当前日期
+ */
+public class FillRuleUtil {
+
+    /**
+     * @param ruleCode ruleCode
+     * @return
+     */
+    @SuppressWarnings("unchecked")
+    public static Object executeRule(String ruleCode, JSONObject formData) {
+        if (!StringUtils.isEmpty(ruleCode)) {
+            try {
+                // 获取 Service
+                ServiceImpl impl = (ServiceImpl) SpringContextUtils.getBean("sysFillRuleServiceImpl");
+                // 根据 ruleCode 查询出实体
+                QueryWrapper queryWrapper = new QueryWrapper();
+                queryWrapper.eq("rule_code", ruleCode);
+                JSONObject entity = JSON.parseObject(JSON.toJSONString(impl.getOne(queryWrapper)));
+                // 获取必要的参数
+                String ruleClass = entity.getString("ruleClass");
+                JSONObject params = entity.getJSONObject("ruleParams");
+                if (params == null) {
+                    params = new JSONObject();
+                }
+                if (formData == null) {
+                    formData = new JSONObject();
+                }
+                // 通过反射执行配置的类里的方法
+                IFillRuleHandler ruleHandler = (IFillRuleHandler) Class.forName(ruleClass).newInstance();
+                return ruleHandler.execute(params, formData);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return null;
+    }
+}

jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/RestDesformUtil.java

@@ -0,0 +1,121 @@
+package org.jeecg.common.util;
+
+import com.alibaba.fastjson.JSONObject;
+import org.jeecg.common.api.vo.Result;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+
+/**
+ * 通过 RESTful 风格的接口操纵 desform 里的数据
+ *
+ * @author sunjianlei
+ */
+public class RestDesformUtil {
+
+    private static String domain = null;
+    private static String path = null;
+
+    static {
+        domain = SpringContextUtils.getDomain();
+        path = SpringContextUtils.getApplicationContext().getEnvironment().getProperty("server.servlet.context-path");
+    }
+
+    /**
+     * 查询数据
+     *
+     * @param desformCode
+     * @param dataId
+     * @param token
+     * @return
+     */
+    public static Result queryOne(String desformCode, String dataId, String token) {
+        String url = getBaseUrl(desformCode, dataId).toString();
+        HttpHeaders headers = getHeaders(token);
+        ResponseEntity<JSONObject> result = RestUtil.request(url, HttpMethod.GET, headers, null, null, JSONObject.class);
+        return packageReturn(result);
+    }
+
+    /**
+     * 新增数据
+     *
+     * @param desformCode
+     * @param formData
+     * @param token
+     * @return
+     */
+    public static Result addOne(String desformCode, JSONObject formData, String token) {
+        return addOrEditOne(desformCode, formData, token, HttpMethod.POST);
+    }
+
+    /**
+     * 修改数据
+     *
+     * @param desformCode
+     * @param formData
+     * @param token
+     * @return
+     */
+    public static Result editOne(String desformCode, JSONObject formData, String token) {
+        return addOrEditOne(desformCode, formData, token, HttpMethod.PUT);
+    }
+
+    private static Result addOrEditOne(String desformCode, JSONObject formData, String token, HttpMethod method) {
+        String url = getBaseUrl(desformCode).toString();
+        HttpHeaders headers = getHeaders(token);
+        ResponseEntity<JSONObject> result = RestUtil.request(url, method, headers, null, formData, JSONObject.class);
+        return packageReturn(result);
+    }
+
+    /**
+     * 删除数据
+     *
+     * @param desformCode
+     * @param dataId
+     * @param token
+     * @return
+     */
+    public static Result removeOne(String desformCode, String dataId, String token) {
+        String url = getBaseUrl(desformCode, dataId).toString();
+        HttpHeaders headers = getHeaders(token);
+        ResponseEntity<JSONObject> result = RestUtil.request(url, HttpMethod.DELETE, headers, null, null, JSONObject.class);
+        return packageReturn(result);
+    }
+
+    private static Result packageReturn(ResponseEntity<JSONObject> result) {
+        if (result.getBody() != null) {
+            return result.getBody().toJavaObject(Result.class);
+        }
+        return Result.error("操作失败");
+    }
+
+    private static StringBuilder getBaseUrl() {
+        StringBuilder builder = new StringBuilder(domain).append(path);
+        builder.append("/desform/api");
+        return builder;
+    }
+
+    private static StringBuilder getBaseUrl(String desformCode, String dataId) {
+        StringBuilder builder = getBaseUrl();
+        builder.append("/").append(desformCode);
+        if (dataId != null) {
+            builder.append("/").append(dataId);
+        }
+        return builder;
+    }
+
+    private static StringBuilder getBaseUrl(String desformCode) {
+        return getBaseUrl(desformCode, null);
+    }
+
+    private static HttpHeaders getHeaders(String token) {
+        HttpHeaders headers = new HttpHeaders();
+        String mediaType = MediaType.APPLICATION_JSON_UTF8_VALUE;
+        headers.setContentType(MediaType.parseMediaType(mediaType));
+        headers.set("Accept", mediaType);
+        headers.set("X-Access-Token", token);
+        return headers;
+    }
+
+}

jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/TokenUtils.java

@@ -1,5 +1,6 @@
 package org.jeecg.common.util;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.authc.AuthenticationException;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.api.ISysBaseAPI;
@@ -13,13 +14,29 @@ import javax.servlet.http.HttpServletRequest;
  * @Date 2019/9/23 14:12
  * @Description: 编程校验token有效性
  */
+@Slf4j
 public class TokenUtils {
 
+    /**
+     * 获取 request 里传递的 token
+     *
+     * @param request
+     * @return
+     */
+    public static String getTokenByRequest(HttpServletRequest request) {
+        String token = request.getParameter("token");
+        if (token == null) {
+            token = request.getHeader("X-Access-Token");
+        }
+        return token;
+    }
+
     /**
      * 验证Token
      */
     public static boolean verifyToken(HttpServletRequest request, ISysBaseAPI sysBaseAPI, RedisUtil redisUtil) {
-        String token = request.getParameter("token");
+        log.info(" -- url --" + request.getRequestURL());
+        String token = getTokenByRequest(request);
 
         // 解密获得username，用于和数据库进行对比
         String username = JwtUtil.getUsername(token);

jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/oConvertUtils.java

@@ -1,5 +1,8 @@
 package org.jeecg.common.util;
 
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+
 import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Field;
 import java.math.BigDecimal;
@@ -28,6 +31,7 @@ import javax.servlet.http.HttpServletRequest;
  * @Author  张代浩
  *
  */
+@Slf4j
 public class oConvertUtils {
 	public static boolean isEmpty(Object object) {
 		if (object == null) {
@@ -588,4 +592,43 @@ public class oConvertUtils {
 		}
 		return select;
 	}
+
+	/**
+	 * 将entityList转换成modelList
+	 * @param fromList
+	 * @param tClass
+	 * @param <F>
+	 * @param <T>
+	 * @return
+	 */
+	public static<F,T> List<T> entityListToModelList(List<F> fromList, Class<T> tClass){
+		if(fromList.isEmpty() || fromList == null){
+			return null;
+		}
+		List<T> tList = new ArrayList<>();
+		for(F f : fromList){
+			T t = entityToModel(f, tClass);
+			tList.add(t);
+		}
+		return tList;
+	}
+
+	public static<F,T> T entityToModel(F entity, Class<T> modelClass) {
+		log.debug("entityToModel : Entity属性的值赋值到Model");
+		Object model = null;
+		if (entity == null || modelClass ==null) {
+			return null;
+		}
+
+		try {
+			model = modelClass.newInstance();
+		} catch (InstantiationException e) {
+			log.error("entityToModel : 实例化异常", e);
+		} catch (IllegalAccessException e) {
+			log.error("entityToModel : 安全权限异常", e);
+		}
+		BeanUtils.copyProperties(entity, model);
+		return (T)model;
+	}
+
 }

jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/oss/OssBootUtil.java

@@ -0,0 +1,156 @@
+package org.jeecg.common.util.oss;
+
+import com.aliyun.oss.ClientConfiguration;
+import com.aliyun.oss.OSSClient;
+import com.aliyun.oss.common.auth.DefaultCredentialProvider;
+import com.aliyun.oss.model.CannedAccessControlList;
+import com.aliyun.oss.model.PutObjectResult;
+import org.apache.tomcat.util.http.fileupload.FileItemStream;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.UUID;
+
+/**
+ * @Description: 阿里云 oss 上传工具类(高依赖版)
+ * @Date: 2019/5/10
+ */
+public class OssBootUtil {
+
+    private static String endPoint;
+    private static String accessKeyId;
+    private static String accessKeySecret;
+    private static String bucketName;
+    private static String staticDomain;
+
+    public static void setEndPoint(String endPoint) {
+        OssBootUtil.endPoint = endPoint;
+    }
+
+    public static void setAccessKeyId(String accessKeyId) {
+        OssBootUtil.accessKeyId = accessKeyId;
+    }
+
+    public static void setAccessKeySecret(String accessKeySecret) {
+        OssBootUtil.accessKeySecret = accessKeySecret;
+    }
+
+    public static void setBucketName(String bucketName) {
+        OssBootUtil.bucketName = bucketName;
+    }
+
+    public static void setStaticDomain(String staticDomain) {
+        OssBootUtil.staticDomain = staticDomain;
+    }
+
+    /**
+     * oss 工具客户端
+     */
+    private static OSSClient ossClient = null;
+    private static String FILE_URL;
+
+    /**
+     * 上传文件至阿里云 OSS
+     * 文件上传成功,返回文件完整访问路径
+     * 文件上传失败,返回 null
+     *
+     * @param file    待上传文件
+     * @param fileDir 文件保存目录
+     * @return oss 中的相对文件路径
+     */
+    public static String upload(MultipartFile file, String fileDir) {
+        initOSS(endPoint, accessKeyId, accessKeySecret);
+        StringBuilder fileUrl = new StringBuilder();
+        try {
+            String suffix = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf('.'));
+            String fileName = UUID.randomUUID().toString().replace("-", "") + suffix;
+            if (!fileDir.endsWith("/")) {
+                fileDir = fileDir.concat("/");
+            }
+            fileUrl = fileUrl.append(fileDir + fileName);
+
+            FILE_URL = "https://" + bucketName + "." + endPoint + "/" + fileUrl;
+            //FILE_URL = staticDomain + "/" + fileUrl;
+            PutObjectResult result = ossClient.putObject(bucketName, fileUrl.toString(), file.getInputStream());
+            // 设置权限(公开读)
+            ossClient.setBucketAcl(bucketName, CannedAccessControlList.PublicRead);
+            if (result != null) {
+                System.out.println("------OSS文件上传成功------" + fileUrl);
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            return null;
+        }
+        return FILE_URL;
+    }
+
+
+    /**
+     * 上传文件至阿里云 OSS
+     * 文件上传成功,返回文件完整访问路径
+     * 文件上传失败,返回 null
+     *
+     * @param file    待上传文件
+     * @param fileDir 文件保存目录
+     * @return oss 中的相对文件路径
+     */
+    public static String upload(FileItemStream file, String fileDir) {
+        initOSS(endPoint, accessKeyId, accessKeySecret);
+        StringBuilder fileUrl = new StringBuilder();
+        try {
+            String suffix = file.getName().substring(file.getName().lastIndexOf('.'));
+            String fileName = UUID.randomUUID().toString().replace("-", "") + suffix;
+            if (!fileDir.endsWith("/")) {
+                fileDir = fileDir.concat("/");
+            }
+            fileUrl = fileUrl.append(fileDir + fileName);
+
+            FILE_URL = "https://" + bucketName + "." + endPoint + "/" + fileUrl;
+            //FILE_URL = staticDomain + "/" + fileUrl;
+            PutObjectResult result = ossClient.putObject(bucketName, fileUrl.toString(), file.openStream());
+            // 设置权限(公开读)
+            ossClient.setBucketAcl(bucketName, CannedAccessControlList.PublicRead);
+            if (result != null) {
+                System.out.println("------OSS文件上传成功------" + fileUrl);
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            return null;
+        }
+        return FILE_URL;
+    }
+
+    /**
+     * 删除文件
+     * @param url
+     */
+    public static void deleteUrl(String url) {
+        String bucketUrl = "https://" + bucketName + "." + endPoint + "/";
+        //String bucketUrl = staticDomain + "/";
+        url = url.replace(bucketUrl,"");
+        ossClient.deleteObject(bucketName, url);
+    }
+
+    /**
+     * 删除文件
+     * @param fileName
+     */
+    public static void delete(String fileName) {
+        ossClient.deleteObject(bucketName, fileName);
+    }
+
+    /**
+     * 初始化 oss 客户端
+     *
+     * @return
+     */
+    private static OSSClient initOSS(String endpoint, String accessKeyId, String accessKeySecret) {
+        if (ossClient == null) {
+            ossClient = new OSSClient(endpoint,
+                    new DefaultCredentialProvider(accessKeyId, accessKeySecret),
+                    new ClientConfiguration());
+        }
+        return ossClient;
+    }
+
+}

jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/SysPermissionDataRule.java

@@ -1,78 +0,0 @@
-package org.jeecg.modules.system.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 菜单权限规则表
- * </p>
- *
- * @Author huangzhilin
- * @since 2019-03-29
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class SysPermissionDataRule implements Serializable {
-	
-	private static final long serialVersionUID = 1L;
-	
-	/**
-	 * id
-	 */
-	@TableId(type = IdType.ID_WORKER_STR)
-	private String id;
-	
-	/**
-	 * 对应的菜单id
-	 */
-	private String permissionId;
-	
-	/**
-	 * 规则名称
-	 */
-	private String ruleName;
-	
-	/**
-	 * 字段
-	 */
-	private String ruleColumn;
-	
-	/**
-	 * 条件
-	 */
-	private String ruleConditions;
-	
-	/**
-	 * 规则值
-	 */
-	private String ruleValue;
-	
-	/**
-	 * 创建时间
-	 */
-	private Date createTime;
-	
-	/**
-	 * 创建人
-	 */
-	private String createBy;
-	
-	/**
-	 * 修改时间
-	 */
-	private Date updateTime;
-	
-	/**
-	 * 修改人
-	 */
-	private String updateBy;
-}

jeecg-boot/jeecg-boot-module-system/pom.xml

@@ -3,12 +3,12 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>jeecg-boot-module-system</artifactId>
-	<version>2.1.1</version>
+	<version>2.1.2</version>
 
 	<parent>
 		<groupId>org.jeecgframework.boot</groupId>
 		<artifactId>jeecg-boot-parent</artifactId>
-		<version>2.1.1</version>
+		<version>2.1.2</version>
 	</parent>
 
 	<repositories>

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/JeecgApplication.java

@@ -1,15 +1,20 @@
 package org.jeecg;
 
-import lombok.extern.slf4j.Slf4j;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+import org.apache.catalina.Context;
+import org.apache.tomcat.util.scan.StandardJarScanner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
 import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.Bean;
 import org.springframework.core.env.Environment;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
-import java.net.InetAddress;
-import java.net.UnknownHostException;
+import lombok.extern.slf4j.Slf4j;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 @Slf4j
 @EnableSwagger2
@@ -17,19 +22,34 @@ import java.net.UnknownHostException;
 @EnableAutoConfiguration
 public class JeecgApplication {
 
-  public static void main(String[] args) throws UnknownHostException {
-    ConfigurableApplicationContext application = SpringApplication.run(JeecgApplication.class, args);
-    Environment env = application.getEnvironment();
-    String ip = InetAddress.getLocalHost().getHostAddress();
-    String port = env.getProperty("server.port");
-    String path = env.getProperty("server.servlet.context-path");
-    log.info("\n----------------------------------------------------------\n\t" +
-        "Application Jeecg-Boot is running! Access URLs:\n\t" +
-        "Local: \t\thttp://localhost:" + port + path + "/\n\t" +
-        "External: \thttp://" + ip + ":" + port + path + "/\n\t" +
-        "swagger-ui: \thttp://" + ip + ":" + port + path + "/swagger-ui.html\n\t" +
-        "Doc: \t\thttp://" + ip + ":" + port + path + "/doc.html\n" +
-        "----------------------------------------------------------");
-
-  }
+    public static void main(String[] args) throws UnknownHostException {
+        //System.setProperty("spring.devtools.restart.enabled", "true");
+
+        ConfigurableApplicationContext application = SpringApplication.run(JeecgApplication.class, args);
+        Environment env = application.getEnvironment();
+        String ip = InetAddress.getLocalHost().getHostAddress();
+        String port = env.getProperty("server.port");
+        String path = env.getProperty("server.servlet.context-path");
+        log.info("\n----------------------------------------------------------\n\t" +
+                "Application Jeecg-Boot is running! Access URLs:\n\t" +
+                "Local: \t\thttp://localhost:" + port + path + "/\n\t" +
+                "External: \thttp://" + ip + ":" + port + path + "/\n\t" +
+                "swagger-ui: \thttp://" + ip + ":" + port + path + "/swagger-ui.html\n\t" +
+                "Doc: \t\thttp://" + ip + ":" + port + path + "/doc.html\n" +
+                "----------------------------------------------------------");
+
+    }
+
+    /**
+     * tomcat-embed-jasper引用后提示jar找不到的问题
+     */
+    @Bean
+    public TomcatServletWebServerFactory tomcatFactory() {
+        return new TomcatServletWebServerFactory() {
+            @Override
+            protected void postProcessContext(Context context) {
+                ((StandardJarScanner) context.getJarScanner()).setScanManifest(false);
+            }
+        };
+    }
 }

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/config/ShiroConfig.java

@@ -116,10 +116,13 @@ public class ShiroConfig {
 		//测试示例
 		filterChainDefinitionMap.put("/test/jeecgDemo/html", "anon"); //模板页面
 		filterChainDefinitionMap.put("/test/jeecgDemo/redis/**", "anon"); //redis测试
-		
+
+		//排除Online请求
+		filterChainDefinitionMap.put("/auto/cgform/**", "anon");
+
 		//websocket排除
 		filterChainDefinitionMap.put("/websocket/**", "anon");
-
+		
 		// 添加自己的过滤器并且取名为jwt
 		Map<String, Filter> filterMap = new HashMap<String, Filter>(1);
 		filterMap.put("jwt", new JwtFilter());
@@ -205,7 +208,9 @@ public class ShiroConfig {
     public RedisManager redisManager() {
         log.info("===============(2)创建RedisManager,连接Redis..URL= " + host + ":" + port);
         RedisManager redisManager = new RedisManager();
-        redisManager.setHost(host + ":" + port);//老版本是分别setHost和setPort,新版本只需要setHost就可以了
+		redisManager.setHost(host);
+		redisManager.setPort(oConvertUtils.getInt(port));
+		redisManager.setTimeout(0);
         if (!StringUtils.isEmpty(redisPassword)) {
             redisManager.setPassword(redisPassword);
         }

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.java

@@ -136,35 +136,23 @@ public class MybatisInterceptor implements Interceptor {
 				log.debug("------field.name------" + field.getName());
 				try {
 					if ("updateBy".equals(field.getName())) {
-						field.setAccessible(true);
-						Object local_updateBy = field.get(parameter);
-						field.setAccessible(false);
-						if (local_updateBy == null || local_updateBy.equals("")) {
-							String updateBy = "jeecg";
-							// 获取登录用户信息
-							LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-							if (sysUser != null) {
-								// 登录账号
-								updateBy = sysUser.getUsername();
-							}
-							if (oConvertUtils.isNotEmpty(updateBy)) {
-								field.setAccessible(true);
-								field.set(parameter, updateBy);
-								field.setAccessible(false);
-							}
+						//获取登录用户信息
+						LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+						if (sysUser != null) {
+							// 登录账号
+							String updateBy = sysUser.getUsername();
+							field.setAccessible(true);
+							field.set(parameter, updateBy);
+							field.setAccessible(false);
 						}
 					}
 					if ("updateTime".equals(field.getName())) {
 						field.setAccessible(true);
-						Object local_updateDate = field.get(parameter);
+						field.set(parameter, new Date());
 						field.setAccessible(false);
-						if (local_updateDate == null || local_updateDate.equals("")) {
-							field.setAccessible(true);
-							field.set(parameter, new Date());
-							field.setAccessible(false);
-						}
 					}
 				} catch (Exception e) {
+					e.printStackTrace();
 				}
 			}
 		}

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/config/oss/OSSAutoConfiguration.java

@@ -1,35 +0,0 @@
-package org.jeecg.config.oss;
-
-import org.jeecg.config.oss.OSSAutoConfiguration.OSSConfigurationImportSelector;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-import org.springframework.context.annotation.ImportSelector;
-import org.springframework.core.type.AnnotationMetadata;
-
-/**
- * Object Storage Service auto configuration.
- */
-@Configuration
-@EnableConfigurationProperties(OSSProperties.class)
-@Import(OSSConfigurationImportSelector.class)
-public class OSSAutoConfiguration {
-
-	/**
-	 * {@link ImportSelector} to add {@link OSSType} configuration classes.
-	 */
-	static class OSSConfigurationImportSelector implements ImportSelector {
-
-		@Override
-		public String[] selectImports(AnnotationMetadata importingClassMetadata) {
-			OSSType[] types = OSSType.values();
-			String[] imports = new String[types.length];
-			for (int i = 0; i < types.length; i++) {
-				imports[i] = OSSConfigurations.getConfigurationClass(types[i]);
-			}
-			return imports;
-		}
-
-	}
-
-}

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/config/oss/OSSCondition.java

@@ -1,43 +0,0 @@
-package org.jeecg.config.oss;
-
-import org.springframework.boot.autoconfigure.condition.ConditionMessage;
-import org.springframework.boot.autoconfigure.condition.ConditionOutcome;
-import org.springframework.boot.autoconfigure.condition.SpringBootCondition;
-import org.springframework.boot.context.properties.bind.BindException;
-import org.springframework.boot.context.properties.bind.BindResult;
-import org.springframework.boot.context.properties.bind.Binder;
-import org.springframework.context.annotation.ConditionContext;
-import org.springframework.core.env.Environment;
-import org.springframework.core.type.AnnotatedTypeMetadata;
-import org.springframework.core.type.AnnotationMetadata;
-import org.springframework.core.type.ClassMetadata;
-
-/**
- * General OSS condition used with all OSS configuration classes.
- */
-public class OSSCondition extends SpringBootCondition {
-
-	@Override
-	public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeMetadata metadata) {
-		String sourceClass = "";
-		if (metadata instanceof ClassMetadata) {
-			sourceClass = ((ClassMetadata) metadata).getClassName();
-		}
-		ConditionMessage.Builder message = ConditionMessage.forCondition("OSS", sourceClass);
-		Environment environment = context.getEnvironment();
-		try {
-			BindResult<OSSType> specified = Binder.get(environment).bind("oss.type", OSSType.class);
-			if (!specified.isBound()) {
-				return ConditionOutcome.match(message.because("automatic OSS type"));
-			}
-			OSSType required = OSSConfigurations.getType(((AnnotationMetadata) metadata).getClassName());
-			if (specified.get() == required) {
-				return ConditionOutcome.match(message.because(specified.get() + " OSS type"));
-			}
-		}
-		catch (BindException ex) {
-		}
-		return ConditionOutcome.noMatch(message.because("unknown OSS type"));
-	}
-
-}

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/config/oss/OSSConfigurations.java

@@ -1,44 +0,0 @@
-package org.jeecg.config.oss;
-
-import java.util.Collections;
-import java.util.EnumMap;
-import java.util.Map;
-
-import org.jeecg.config.oss.aliyun.AliYunOSSAutoConfiguration;
-import org.jeecg.config.oss.tencent.QcCOSAutoConfiguration;
-import org.springframework.util.Assert;
-
-
-/**
- * Mappings between {@link OSSType} and {@code @Configuration}.
- */
-final class OSSConfigurations {
-
-	private static final Map<OSSType, Class<?>> MAPPINGS;
-
-	static {
-		Map<OSSType, Class<?>> mappings = new EnumMap<>(OSSType.class);
-		mappings.put(OSSType.ALIYUN, AliYunOSSAutoConfiguration.class);
-		mappings.put(OSSType.QC, QcCOSAutoConfiguration.class);
-		MAPPINGS = Collections.unmodifiableMap(mappings);
-	}
-
-	private OSSConfigurations() {
-	}
-
-	public static String getConfigurationClass(OSSType ossType) {
-		Class<?> configurationClass = MAPPINGS.get(ossType);
-		Assert.state(configurationClass != null, () -> "Unknown OSS type " + ossType);
-		return configurationClass.getName();
-	}
-
-	public static OSSType getType(String configurationClassName) {
-		for (Map.Entry<OSSType, Class<?>> entry : MAPPINGS.entrySet()) {
-			if (entry.getValue().getName().equals(configurationClassName)) {
-				return entry.getKey();
-			}
-		}
-		throw new IllegalStateException("Unknown configuration class " + configurationClassName);
-	}
-
-}

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/config/oss/OSSManager.java

@@ -1,15 +0,0 @@
-package org.jeecg.config.oss;
-
-import java.io.InputStream;
-
-/**
- * 简单上传,删除对象接口.
- * 可扩展
- */
-public interface OSSManager {
-
-	void upload(String fileName, InputStream inputStream);
-
-	void delete(String fileName);
-
-}

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/config/oss/OSSProperties.java

@@ -1,48 +0,0 @@
-package org.jeecg.config.oss;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import lombok.Getter;
-import lombok.Setter;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-/**
- * Configuration properties for OSS support.
- */
-@Getter
-@Setter
-@ConfigurationProperties(prefix = "jeecg.oss")
-public class OSSProperties {
-
-	/**
-	 * OSS type.
-	 */
-	private OSSType type;
-
-	/**
-	 * OSS Endpoint.
-	 */
-	private String endpoint;
-
-	/**
-	 * OSS Access key.
-	 */
-	private String accessKey;
-
-	/**
-	 * OSS Secret key.
-	 */
-	private String secretKey;
-
-	/**
-	 * OSS Bucket Name.
-	 */
-	private String bucketName;
-
-	/**
-	 * Additional OSS properties.
-	 */
-	private Map<String, String> properties = new HashMap<>();
-
-}

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/config/oss/OSSType.java

@@ -1,10 +0,0 @@
-package org.jeecg.config.oss;
-
-/**
- * Supported OSS types.
- */
-public enum OSSType {
-
-	ALIYUN, QC
-
-}

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/config/oss/OssBootConfiguration.java

@@ -0,0 +1,31 @@
+package org.jeecg.config.oss;
+
+import org.jeecg.common.util.oss.OssBootUtil;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class OssBootConfiguration {
+
+    @Value("${jeecg.oss.endpoint}")
+    private String endpoint;
+    @Value("${jeecg.oss.accessKey}")
+    private String accessKeyId;
+    @Value("${jeecg.oss.secretKey}")
+    private String accessKeySecret;
+    @Value("${jeecg.oss.bucketName}")
+    private String bucketName;
+    @Value("${jeecg.oss.staticDomain}")
+    private String staticDomain;
+
+
+    @Bean
+    public void initOssBootConfiguration() {
+        OssBootUtil.setEndPoint(endpoint);
+        OssBootUtil.setAccessKeyId(accessKeyId);
+        OssBootUtil.setAccessKeySecret(accessKeySecret);
+        OssBootUtil.setBucketName(bucketName);
+        OssBootUtil.setStaticDomain(staticDomain);
+    }
+}

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/config/oss/aliyun/AliYunOSSAutoConfiguration.java

@@ -1,81 +0,0 @@
-package org.jeecg.config.oss.aliyun;
-
-import java.util.Map;
-import java.util.Properties;
-
-import com.aliyun.oss.ClientBuilderConfiguration;
-import com.aliyun.oss.OSS;
-import com.aliyun.oss.OSSClientBuilder;
-import com.aliyun.oss.common.comm.Protocol;
-import org.jeecg.config.oss.OSSCondition;
-import org.jeecg.config.oss.OSSManager;
-import org.jeecg.config.oss.OSSProperties;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * AliYun OSS configuration.
- */
-@Configuration
-@ConditionalOnClass({ OSS.class })
-@ConditionalOnProperty(prefix = "jeecg.oss", name = "type",havingValue = "aliyun")
-@Conditional(OSSCondition.class)
-public class AliYunOSSAutoConfiguration {
-
-	private final OSSProperties properties;
-
-	public AliYunOSSAutoConfiguration(OSSProperties ossProperties) {
-		this.properties = ossProperties;
-	}
-
-	@Bean
-	@ConditionalOnMissingBean
-	public ClientBuilderConfiguration clientConfiguration(OSSProperties ossProperties) {
-		Properties properties = asProperties(ossProperties.getProperties());
-		ClientBuilderConfiguration configuration = new ClientBuilderConfiguration();
-		configuration.setMaxConnections(Integer.parseInt(properties.getProperty("aliyun.maxConnections", "5")));
-		configuration.setSocketTimeout(Integer.parseInt(properties.getProperty("aliyun.socketTimeout", "50000")));
-		configuration
-				.setConnectionTimeout(Integer.parseInt(properties.getProperty("aliyun.connectionTimeout", "50000")));
-		configuration.setConnectionRequestTimeout(
-				Integer.parseInt(properties.getProperty("aliyun.connectionRequestTimeout", "-1")));
-		configuration
-				.setIdleConnectionTime(Integer.parseInt(properties.getProperty("aliyun.idleConnectionTime", "60000")));
-		configuration.setMaxErrorRetry(Integer.parseInt(properties.getProperty("aliyun.maxErrorRetry", "3")));
-		configuration.setSupportCname(Boolean.parseBoolean(properties.getProperty("aliyun.supportCname", "false")));
-		configuration.setSLDEnabled(Boolean.parseBoolean(properties.getProperty("aliyun.sldEnabled", "false")));
-		configuration.setProtocol(Protocol.HTTP);
-		if (Protocol.HTTPS.toString().equals(properties.getProperty("aliyun.protocol"))) {
-			configuration.setProtocol(Protocol.HTTPS);
-		}
-		if (properties.getProperty("aliyun.userAgent") != null) {
-			configuration.setUserAgent(properties.getProperty("aliyun.userAgent"));
-		}
-
-		return configuration;
-	}
-
-	@Bean(destroyMethod = "shutdown")
-	@ConditionalOnMissingBean
-	public OSS ossClient(ClientBuilderConfiguration clientConfiguration) {
-		return new OSSClientBuilder().build(this.properties.getEndpoint(), this.properties.getAccessKey(),
-				this.properties.getSecretKey(), clientConfiguration);
-	}
-
-	@Bean
-	@ConditionalOnMissingBean
-	public OSSManager ossManager(OSS ossClient) {
-		return new AliYunOSSManager(ossClient, this.properties);
-	}
-
-	private Properties asProperties(Map<String, String> source) {
-		Properties properties = new Properties();
-		properties.putAll(source);
-		return properties;
-	}
-
-}

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/config/oss/aliyun/AliYunOSSManager.java

@@ -1,33 +0,0 @@
-package org.jeecg.config.oss.aliyun;
-
-import java.io.InputStream;
-
-import com.aliyun.oss.OSS;
-import org.jeecg.config.oss.OSSManager;
-import org.jeecg.config.oss.OSSProperties;
-
-/**
- * Object Storage Service of AliYun.
- */
-public class AliYunOSSManager implements OSSManager {
-
-	private OSS client;
-
-	private OSSProperties properties;
-
-	AliYunOSSManager(OSS client, OSSProperties properties) {
-		this.client = client;
-		this.properties = properties;
-	}
-
-	@Override
-	public void upload(String fileName, InputStream inputStream) {
-		this.client.putObject(this.properties.getBucketName(), fileName, inputStream);
-	}
-
-	@Override
-	public void delete(String fileName) {
-		this.client.deleteObject(this.properties.getBucketName(), fileName);
-	}
-
-}

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/config/oss/tencent/QcCOSAutoConfiguration.java

@@ -1,71 +0,0 @@
-package org.jeecg.config.oss.tencent;
-
-import java.util.Map;
-import java.util.Properties;
-
-import com.qcloud.cos.COS;
-import com.qcloud.cos.COSClient;
-import com.qcloud.cos.ClientConfig;
-import com.qcloud.cos.auth.BasicCOSCredentials;
-import com.qcloud.cos.auth.COSCredentials;
-import com.qcloud.cos.region.Region;
-import org.jeecg.config.oss.OSSCondition;
-import org.jeecg.config.oss.OSSManager;
-import org.jeecg.config.oss.OSSProperties;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@ConditionalOnClass({ COS.class })
-@ConditionalOnProperty(prefix = "jeecg.oss", name = "type",havingValue = "qc")
-@Conditional(OSSCondition.class)
-public class QcCOSAutoConfiguration {
-
-	private final OSSProperties properties;
-
-	public QcCOSAutoConfiguration(OSSProperties ossProperties) {
-		this.properties = ossProperties;
-	}
-
-	@Bean
-	@ConditionalOnMissingBean
-	public ClientConfig clientConfiguration(OSSProperties ossProperties) {
-		Properties properties = asProperties(ossProperties.getProperties());
-		ClientConfig configuration = new ClientConfig();
-		configuration.setMaxConnectionsCount(Integer.parseInt(properties.getProperty("qc.maxConnectionsCount", "5")));
-		configuration.setSocketTimeout(Integer.parseInt(properties.getProperty("qc.socketTimeout", "50000")));
-		configuration.setConnectionTimeout(Integer.parseInt(properties.getProperty("qc.connectionTimeout", "50000")));
-		configuration.setConnectionRequestTimeout(
-				Integer.parseInt(properties.getProperty("qc.connectionRequestTimeout", "-1")));
-		configuration.setRegion(new Region(properties.getProperty("qc.region")));
-		if (properties.getProperty("qc.userAgent") != null) {
-			configuration.setUserAgent(properties.getProperty("qc.userAgent"));
-		}
-
-		return configuration;
-	}
-
-	@Bean(destroyMethod = "shutdown")
-	@ConditionalOnMissingBean
-	public COS ossClient(ClientConfig clientConfig) {
-		COSCredentials cred = new BasicCOSCredentials(this.properties.getAccessKey(), this.properties.getSecretKey());
-		return new COSClient(cred, clientConfig);
-	}
-
-	@Bean
-	@ConditionalOnMissingBean
-	public OSSManager ossManager(COS client) {
-		return new QcCOSManager(client, this.properties);
-	}
-
-	private Properties asProperties(Map<String, String> source) {
-		Properties properties = new Properties();
-		properties.putAll(source);
-		return properties;
-	}
-
-}

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/config/oss/tencent/QcCOSManager.java

@@ -1,39 +0,0 @@
-package org.jeecg.config.oss.tencent;
-
-import java.io.InputStream;
-
-import com.qcloud.cos.COS;
-import com.qcloud.cos.model.ObjectMetadata;
-import org.jeecg.config.oss.OSSManager;
-import org.jeecg.config.oss.OSSProperties;
-
-/**
- * Object Storage Service of Tencent cloud.
- */
-public class QcCOSManager implements OSSManager {
-
-	private COS client;
-
-	private OSSProperties properties;
-
-	QcCOSManager(COS client, OSSProperties properties) {
-		this.client = client;
-		this.properties = properties;
-	}
-
-	@Override
-	public void upload(String fileName, InputStream inputStream) {
-		ObjectMetadata objectMetadata = new ObjectMetadata();
-		objectMetadata.setContentLength(10);
-		objectMetadata.setContentType("application/octet-stream");
-		this.client.putObject(this.properties.getBucketName(),
-				this.properties.getProperties().get("qc.prefix") + "/" + fileName, inputStream, objectMetadata);
-	}
-
-	@Override
-	public void delete(String fileName) {
-		this.client.deleteObject(this.properties.getBucketName(),
-				this.properties.getProperties().get("qc.prefix") + "/" + fileName);
-	}
-
-}

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oss/service/impl/OSSFileServiceImpl.java

@@ -1,41 +1,33 @@
 package org.jeecg.modules.oss.service.impl;
 
-import java.io.IOException;
-
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.config.oss.OSSManager;
-import org.jeecg.config.oss.OSSProperties;
+import org.jeecg.common.util.oss.OssBootUtil;
 import org.jeecg.modules.oss.entity.OSSFile;
 import org.jeecg.modules.oss.mapper.OSSFileMapper;
 import org.jeecg.modules.oss.service.IOSSFileService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
+
 @Service("ossFileService")
 public class OSSFileServiceImpl extends ServiceImpl<OSSFileMapper, OSSFile> implements IOSSFileService {
 
-	@Autowired
-	private OSSManager ossManager;
-
-	@Autowired
-	private OSSProperties properties;
-
 	@Override
 	public void upload(MultipartFile multipartFile) throws IOException {
 		String fileName = multipartFile.getOriginalFilename();
 		OSSFile ossFile = new OSSFile();
 		ossFile.setFileName(fileName);
-		ossFile.setUrl("https://" + properties.getBucketName() + "." + properties.getEndpoint() + "/" + fileName);
+		String url = OssBootUtil.upload(multipartFile,"upload/test");
+		ossFile.setUrl(url);
 		this.save(ossFile);
-		ossManager.upload(fileName, multipartFile.getInputStream());
 	}
 
 	@Override
 	public boolean delete(OSSFile ossFile) {
 		try {
 			this.removeById(ossFile.getId());
-			ossManager.delete(ossFile.getFileName());
+			OssBootUtil.deleteUrl(ossFile.getUrl());
 		}
 		catch (Exception ex) {
 			return false;

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/aspect/PermissionDataAspect.java

@@ -14,6 +14,7 @@ import org.aspectj.lang.reflect.MethodSignature;
 import org.jeecg.common.aspect.annotation.PermissionData;
 import org.jeecg.common.system.util.JeecgDataAutorUtils;
 import org.jeecg.common.system.util.JwtUtil;
+import org.jeecg.common.system.vo.SysPermissionDataRuleModel;
 import org.jeecg.common.system.vo.SysUserCacheInfo;
 import org.jeecg.common.util.SpringContextUtils;
 import org.jeecg.common.util.oConvertUtils;
@@ -92,12 +93,15 @@ public class PermissionDataAspect {
 		//3.通过用户名+菜单ID 找到权限配置信息 放到request中去
 		if(currentSyspermission!=null && currentSyspermission.size()>0) {
 			String username = JwtUtil.getUserNameByToken(request);
-			List<SysPermissionDataRule> dataRules = new ArrayList<SysPermissionDataRule>();
+			List<SysPermissionDataRuleModel> dataRules = new ArrayList<SysPermissionDataRuleModel>();
 			for (SysPermission sysPermission : currentSyspermission) {
+				// update-begin--Author:scott Date:20191119 for：数据权限规则编码不规范，项目存在相同包名和类名 #722
 				List<SysPermissionDataRule> temp = sysPermissionDataRuleService.queryPermissionDataRules(username, sysPermission.getId());
 				if(temp!=null && temp.size()>0) {
-					dataRules.addAll(temp);
+					//dataRules.addAll(temp);
+					dataRules = oConvertUtils.entityListToModelList(temp,SysPermissionDataRuleModel.class);
 				}
+				// update-end--Author:scott Date:20191119 for：数据权限规则编码不规范，项目存在相同包名和类名 #722
 			}
 			if(dataRules!=null && dataRules.size()>0) {
 				JeecgDataAutorUtils.installDataSearchConditon(request, dataRules);

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java

@@ -9,6 +9,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.subject.Subject;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.constant.CacheConstant;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.api.ISysBaseAPI;
 import org.jeecg.common.system.util.JwtUtil;
@@ -117,7 +118,11 @@ public class LoginController {
 	    	//清空用户登录Token缓存
 	    	redisUtil.del(CommonConstant.PREFIX_USER_TOKEN + token);
 	    	//清空用户登录Shiro权限缓存
-	    	redisUtil.del(CommonConstant.PREFIX_USER_SHIRO_CACHE + sysUser.getId());
+			redisUtil.del(CommonConstant.PREFIX_USER_SHIRO_CACHE + sysUser.getId());
+			//清空用户的缓存信息（包括部门信息），例如sys:cache:user::<username>
+			redisUtil.del(String.format("%s::%s", CacheConstant.SYS_USERS_CACHE, sysUser.getUsername()));
+			//调用shiro的logout
+			SecurityUtils.getSubject().logout();
 	    	return Result.ok("退出登录成功！");
 	    }else {
 	    	return Result.error("Token无效!");

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysFillRuleController.java

@@ -0,0 +1,213 @@
+package org.jeecg.modules.system.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.FillRuleUtil;
+import org.jeecg.modules.system.entity.SysFillRule;
+import org.jeecg.modules.system.service.ISysFillRuleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+
+/**
+ * @Description: 填值规则
+ * @Author: jeecg-boot
+ * @Date: 2019-11-07
+ * @Version: V1.0
+ */
+@Slf4j
+@Api(tags = "填值规则")
+@RestController
+@RequestMapping("/sys/fillRule")
+public class SysFillRuleController extends JeecgController<SysFillRule, ISysFillRuleService> {
+    @Autowired
+    private ISysFillRuleService sysFillRuleService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param sysFillRule
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "填值规则-分页列表查询")
+    @ApiOperation(value = "填值规则-分页列表查询", notes = "填值规则-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<?> queryPageList(SysFillRule sysFillRule,
+                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                   HttpServletRequest req) {
+        QueryWrapper<SysFillRule> queryWrapper = QueryGenerator.initQueryWrapper(sysFillRule, req.getParameterMap());
+        Page<SysFillRule> page = new Page<>(pageNo, pageSize);
+        IPage<SysFillRule> pageList = sysFillRuleService.page(page, queryWrapper);
+        return Result.ok(pageList);
+    }
+
+    /**
+     * 测试 ruleCode
+     *
+     * @param ruleCode
+     * @return
+     */
+    @GetMapping(value = "/testFillRule")
+    public Result testFillRule(@RequestParam("ruleCode") String ruleCode) {
+        Object result = FillRuleUtil.executeRule(ruleCode, new JSONObject());
+        return Result.ok(result);
+    }
+
+    /**
+     * 添加
+     *
+     * @param sysFillRule
+     * @return
+     */
+    @AutoLog(value = "填值规则-添加")
+    @ApiOperation(value = "填值规则-添加", notes = "填值规则-添加")
+    @PostMapping(value = "/add")
+    public Result<?> add(@RequestBody SysFillRule sysFillRule) {
+        sysFillRuleService.save(sysFillRule);
+        return Result.ok("添加成功！");
+    }
+
+    /**
+     * 编辑
+     *
+     * @param sysFillRule
+     * @return
+     */
+    @AutoLog(value = "填值规则-编辑")
+    @ApiOperation(value = "填值规则-编辑", notes = "填值规则-编辑")
+    @PutMapping(value = "/edit")
+    public Result<?> edit(@RequestBody SysFillRule sysFillRule) {
+        sysFillRuleService.updateById(sysFillRule);
+        return Result.ok("编辑成功!");
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "填值规则-通过id删除")
+    @ApiOperation(value = "填值规则-通过id删除", notes = "填值规则-通过id删除")
+    @DeleteMapping(value = "/delete")
+    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+        sysFillRuleService.removeById(id);
+        return Result.ok("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "填值规则-批量删除")
+    @ApiOperation(value = "填值规则-批量删除", notes = "填值规则-批量删除")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        this.sysFillRuleService.removeByIds(Arrays.asList(ids.split(",")));
+        return Result.ok("批量删除成功！");
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "填值规则-通过id查询")
+    @ApiOperation(value = "填值规则-通过id查询", notes = "填值规则-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
+        SysFillRule sysFillRule = sysFillRuleService.getById(id);
+        return Result.ok(sysFillRule);
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param sysFillRule
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, SysFillRule sysFillRule) {
+        return super.exportXls(request, sysFillRule, SysFillRule.class, "填值规则");
+    }
+
+    /**
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, SysFillRule.class);
+    }
+
+    /**
+     * 通过 ruleCode 执行自定义填值规则
+     *
+     * @param ruleCode 要执行的填值规则编码
+     * @param formData 表单数据，可根据表单数据的不同生成不同的填值结果
+     * @return 运行后的结果
+     */
+    @PutMapping("/executeRuleByCode/{ruleCode}")
+    public Result executeByRuleCode(@PathVariable("ruleCode") String ruleCode, @RequestBody JSONObject formData) {
+        Object result = FillRuleUtil.executeRule(ruleCode, formData);
+        return Result.ok(result);
+    }
+
+
+    /**
+     * 批量通过 ruleCode 执行自定义填值规则
+     *
+     * @param ruleData 要执行的填值规则JSON数组：
+     *                 示例： { "commonFormData": {}, rules: [ { "ruleCode": "xxx", "formData": null } ] }
+     * @return 运行后的结果，返回示例： [{"ruleCode": "order_num_rule", "result": "CN2019111117212984"}]
+     *
+     */
+    @PutMapping("/executeRuleByCodeBatch")
+    public Result executeByRuleCodeBatch(@RequestBody JSONObject ruleData) {
+        JSONObject commonFormData = ruleData.getJSONObject("commonFormData");
+        JSONArray rules = ruleData.getJSONArray("rules");
+        // 遍历 rules ，批量执行规则
+        JSONArray results = new JSONArray(rules.size());
+        for (int i = 0; i < rules.size(); i++) {
+            JSONObject rule = rules.getJSONObject(i);
+            String ruleCode = rule.getString("ruleCode");
+            JSONObject formData = rule.getJSONObject("formData");
+            // 如果没有传递 formData，就用common的
+            if (formData == null) {
+                formData = commonFormData;
+            }
+            // 执行填值规则
+            Object result = FillRuleUtil.executeRule(ruleCode, formData);
+            JSONObject obj = new JSONObject(rules.size());
+            obj.put("ruleCode", ruleCode);
+            obj.put("result", result);
+            results.add(obj);
+        }
+        return Result.ok(results);
+    }
+
+}

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java

@@ -182,6 +182,7 @@ public class SysPermissionController {
 			log.info(" ------ 通过令牌获取用户拥有的访问菜单 ---- TOKEN ------ " + token);
 			String username = JwtUtil.getUsername(token);
 			List<SysPermission> metaList = sysPermissionService.queryByUser(username);
+			//添加首页路由
 			PermissionDataUtil.addIndexPage(metaList);
 			JSONObject json = new JSONObject();
 			JSONArray menujsonArray = new JSONArray();
@@ -196,8 +197,11 @@ public class SysPermissionController {
 			List<SysPermission> allAuthList = sysPermissionService.list(query);
 			JSONArray allauthjsonArray = new JSONArray();
 			this.getAllAuthJsonArray(allauthjsonArray, allAuthList);
+			//路由菜单
 			json.put("menu", menujsonArray);
+			//按钮权限
 			json.put("auth", authjsonArray);
+			//全部权限配置（按钮权限，访问权限）
 			json.put("allAuth", allauthjsonArray);
 			result.setResult(json);
 			result.success("查询成功");
@@ -517,7 +521,12 @@ public class SysPermissionController {
 		}
 	}
 
-	private JSONObject getPermissionJsonObject(SysPermission permission) {
+	/**
+	 * 根据菜单配置生成路由json
+	 * @param permission
+	 * @return
+	 */
+		private JSONObject getPermissionJsonObject(SysPermission permission) {
 		JSONObject json = new JSONObject();
 		// 类型(0：一级菜单 1：子菜单 2：按钮)
 		if (permission.getMenuType().equals(CommonConstant.MENU_TYPE_2)) {

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysFillRule.java

@@ -0,0 +1,86 @@
+package org.jeecg.modules.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * @Description: 填值规则
+ * @Author: jeecg-boot
+ * @Date: 2019-11-07
+ * @Version: V1.0
+ */
+@Data
+@TableName("sys_fill_rule")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "sys_fill_rule对象", description = "填值规则")
+public class SysFillRule {
+
+    /**
+     * 主键ID
+     */
+    @TableId(type = IdType.ID_WORKER_STR)
+    @ApiModelProperty(value = "主键ID")
+    private java.lang.String id;
+    /**
+     * 规则名称
+     */
+    @Excel(name = "规则名称", width = 15)
+    @ApiModelProperty(value = "规则名称")
+    private java.lang.String ruleName;
+    /**
+     * 规则Code
+     */
+    @Excel(name = "规则Code", width = 15)
+    @ApiModelProperty(value = "规则Code")
+    private java.lang.String ruleCode;
+    /**
+     * 规则实现类
+     */
+    @Excel(name = "规则实现类", width = 15)
+    @ApiModelProperty(value = "规则实现类")
+    private java.lang.String ruleClass;
+    /**
+     * 规则参数
+     */
+    @Excel(name = "规则参数", width = 15)
+    @ApiModelProperty(value = "规则参数")
+    private java.lang.String ruleParams;
+    /**
+     * 修改人
+     */
+    @Excel(name = "修改人", width = 15)
+    @ApiModelProperty(value = "修改人")
+    private java.lang.String updateBy;
+    /**
+     * 修改时间
+     */
+    @Excel(name = "修改时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "修改时间")
+    private java.util.Date updateTime;
+    /**
+     * 创建人
+     */
+    @Excel(name = "创建人", width = 15)
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+    /**
+     * 创建时间
+     */
+    @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间")
+    private java.util.Date createTime;
+}

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysPosition.java

@@ -47,10 +47,10 @@ public class SysPosition {
     /**
      * 职级
      */
-    @Excel(name = "职级", width = 15)
+    @Excel(name = "职级", width = 15,dicCode ="position_rank")
     @ApiModelProperty(value = "职级")
     @Dict(dicCode = "position_rank")
-    private java.lang.String rank;
+    private java.lang.String postRank;
     /**
      * 公司id
      */

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysFillRuleMapper.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.system.entity.SysFillRule;
+
+/**
+ * @Description: 填值规则
+ * @Author: jeecg-boot
+ * @Date: 2019-11-07
+ * @Version: V1.0
+ */
+public interface SysFillRuleMapper extends BaseMapper<SysFillRule> {
+
+}

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml

@@ -58,9 +58,9 @@
 		select id as "value",depart_name as "text" from sys_depart where del_flag = '0'
 	</select>
 	
-		<!-- 查询部门信息 作为字典数据 -->
+		<!-- 查询用户信息 作为字典数据 -->
 	<select id="queryAllUserBackDictModel" resultType="org.jeecg.common.system.vo.DictModel">
-		select username as "value",realname as "text" from sys_depart where del_flag = '0'
+		select username as "value",realname as "text" from sys_user where del_flag = '0'
 	</select>
 	
 	<!--通过查询指定table的 text code 获取字典数据，且支持关键字查询 -->

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysFillRuleMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.system.mapper.SysFillRuleMapper">
+
+</mapper>

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysFillRuleService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.system.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.system.entity.SysFillRule;
+
+/**
+ * @Description: 填值规则
+ * @Author: jeecg-boot
+ * @Date: 2019-11-07
+ * @Version: V1.0
+ */
+public interface ISysFillRuleService extends IService<SysFillRule> {
+
+}

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java

@@ -21,6 +21,7 @@ import org.jeecg.common.system.api.ISysBaseAPI;
 import org.jeecg.common.system.vo.ComboModel;
 import org.jeecg.common.system.vo.DictModel;
 import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.system.vo.SysDepartModel;
 import org.jeecg.common.util.IPUtils;
 import org.jeecg.common.util.SpringContextUtils;
 import org.jeecg.common.util.oConvertUtils;
@@ -283,6 +284,27 @@ public class SysBaseApiImpl implements ISysBaseAPI {
 		return list;
 	}
 
+    @Override
+    public List<ComboModel> queryAllUser(String[] userIds) {
+        List<ComboModel> list = new ArrayList<ComboModel>();
+        List<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().eq("status","1").eq("del_flag","0"));
+        for(SysUser user : userList){
+            ComboModel model = new ComboModel();
+            model.setUsername(user.getUsername());
+            model.setTitle(user.getRealname());
+            model.setId(user.getId());
+            if(oConvertUtils.isNotEmpty(userIds)){
+                for(int i = 0; i<userIds.length;i++){
+                    if(userIds[i].equals(user.getId())){
+                        model.setChecked(true);
+                    }
+                }
+            }
+            list.add(model);
+        }
+        return list;
+    }
+
 	@Override
 	public List<ComboModel> queryAllRole() {
 		List<ComboModel> list = new ArrayList<ComboModel>();
@@ -296,6 +318,26 @@ public class SysBaseApiImpl implements ISysBaseAPI {
 		return list;
 	}
 
+    @Override
+    public List<ComboModel> queryAllRole(String[] roleIds) {
+        List<ComboModel> list = new ArrayList<ComboModel>();
+        List<SysRole> roleList = roleMapper.selectList(new QueryWrapper<SysRole>());
+        for(SysRole role : roleList){
+            ComboModel model = new ComboModel();
+            model.setTitle(role.getRoleName());
+            model.setId(role.getId());
+            if(oConvertUtils.isNotEmpty(roleIds)) {
+                for (int i = 0; i < roleIds.length; i++) {
+                    if (roleIds[i].equals(role.getId())) {
+                        model.setChecked(true);
+                    }
+                }
+            }
+            list.add(model);
+        }
+        return list;
+    }
+
 	@Override
 	public List<String> getRoleIdsByUsername(String username) {
 		return sysUserRoleMapper.getRoleIdByUserName(username);
@@ -312,4 +354,16 @@ public class SysBaseApiImpl implements ISysBaseAPI {
 		DictModel model = new DictModel(depart.getId(),depart.getParentId());
 		return model;
 	}
+
+	@Override
+	public List<SysDepartModel> getAllSysDepart() {
+		List<SysDepartModel> departModelList = new ArrayList<SysDepartModel>();
+		List<SysDepart> departList = departMapper.selectList(new QueryWrapper<SysDepart>().eq("del_flag","0"));
+		for(SysDepart depart : departList){
+			SysDepartModel model = new SysDepartModel();
+			BeanUtils.copyProperties(depart,model);
+			departModelList.add(model);
+		}
+		return departModelList;
+	}
 }

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysFillRuleServiceImpl.java

@@ -0,0 +1,18 @@
+package org.jeecg.modules.system.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.system.entity.SysFillRule;
+import org.jeecg.modules.system.mapper.SysFillRuleMapper;
+import org.jeecg.modules.system.service.ISysFillRuleService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description: 填值规则
+ * @Author: jeecg-boot
+ * @Date: 2019-11-07
+ * @Version: V1.0
+ */
+@Service("sysFillRuleServiceImpl")
+public class SysFillRuleServiceImpl extends ServiceImpl<SysFillRuleMapper, SysFillRule> implements ISysFillRuleService {
+
+}

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionDataRuleImpl.java

@@ -60,12 +60,14 @@ public class SysPermissionDataRuleImpl extends ServiceImpl<SysPermissionDataRule
 	@Override
 	public List<SysPermissionDataRule> queryPermissionDataRules(String username,String permissionId) {
 		List<String> idsList = this.baseMapper.queryDataRuleIds(username, permissionId);
-		if(idsList==null || idsList.size()==0 || idsList.get(0)==null ) {
+		//update-begin--Author:scott  Date:20191119  for：数据权限失效问题处理--------------------
+		if(idsList==null || idsList.size()==0) {
 			return null;
 		}
+		//update-end--Author:scott  Date:20191119  for：数据权限失效问题处理--------------------
 		Set<String> set = new HashSet<String>();
 		for (String ids : idsList) {
-			if(ids==null) {
+			if(oConvertUtils.isEmpty(ids)) {
 				continue;
 			}
 			String[] arr = ids.split(",");

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java

@@ -260,6 +260,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
 
 	@Override
+	@CacheEvict(value= {CacheConstant.SYS_USERS_CACHE}, key="#username")
 	public void updateUserDepart(String username,String orgCode) {
 		baseMapper.updateUserDepart(username, orgCode);
 	}

jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dev.yml

@@ -4,9 +4,10 @@ server:
     max-swallow-size: -1
   servlet:
     context-path: /jeecg-boot
-    compression:
-      enabled: true
-      mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*
+  compression:
+    enabled: true
+    min-response-size: 1024
+    mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*
         
 management:
  endpoints:
@@ -95,7 +96,7 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+          url: jdbc:mysql://127.0.0.1:3306/jeecg-boot-os?characterEncoding=UTF-8&useUnicode=true&useSSL=false
           username: root
           password: root
           driver-class-name: com.mysql.jdbc.Driver
@@ -147,33 +148,15 @@ jeecg :
      excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**
   #阿里云oss存储配置
   oss:
-    type: aliyun
     endpoint: oss-cn-beijing.aliyuncs.com
-    accessKey: ??
+    accessKey: WegDpuKzOuPK6D3N
     secretKey: ??
     bucketName: jeecgos
-    properties:
-      aliyun:
-        protocol: https
+    staticDomain: ??
   # ElasticSearch 设置
   elasticsearch:
-    cluster-name: my-application
+    cluster-name: jeecg-ES
     cluster-nodes: 127.0.0.1:9200
-#  #腾讯云cos存储配置
-#  oss:
-#    type: qc
-#    #跟地区有关
-#    endpoint: cos.ap-beijing-1.myqcloud.com
-#    accessKey: ??
-#    secretKey: ??
-#    bucketName: jeecg-1251108935
-#    properties:
-#      qc:
-#        #地区
-#        region: ap-beijing-1
-#        #存储路径
-#        prefix: jeecgboot
-
 #Mybatis输出sql日志
 logging:
   level:

jeecg-boot/jeecg-boot-module-system/src/main/resources/application-prod.yml

@@ -4,9 +4,10 @@ server:
     max-swallow-size: -1
   servlet:
     context-path: /jeecg-boot
-    compression:
-      enabled: true
-      mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*
+  compression:
+    enabled: true
+    min-response-size: 1024
+    mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*
 
 management:
  endpoints:
@@ -138,38 +139,21 @@ jeecg :
     webapp: /opt/jeecg-boot/webapp
   #短信秘钥
   sms:
-     accessKeyId: ??
+     accessKeyId: LTAIpW4gUG7xYDNI
      accessKeySecret: ??
   shiro:
      excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**
   #阿里云oss存储配置
   oss:
-    type: aliyun
     endpoint: oss-cn-beijing.aliyuncs.com
-    accessKey: ???
-    secretKey: ???
-    bucketName: ???
-    properties:
-      aliyun:
-        protocol: https
+    accessKey: WegDpuKzOuPK6D3N
+    secretKey: ??
+    bucketName: jeecgos
+    staticDomain: ??
   # ElasticSearch 设置
   elasticsearch:
-    cluster-name: my-application
+    cluster-name: jeecg-ES
     cluster-nodes: 127.0.0.1:9200
-#  #腾讯云cos存储配置
-#  oss:
-#    type: qc
-#    #跟地区有关
-#    endpoint: cos.ap-beijing.myqcloud.com
-#    accessKey: yourSecretKeyId
-#    secretKey: yourSecretKey
-#    bucketName: yourBucketName
-#    properties:
-#      qc:
-#        #地区
-#        region: ap-beijing
-#        #存储路径
-#        prefix: project
 #cas单点登录
 cas:
   prefixUrl: http://cas.example.org:8443/cas

jeecg-boot/jeecg-boot-module-system/src/main/resources/application-test.yml

@@ -1,12 +1,13 @@
 server:
-    port: 8080
-    tomcat: 
-        max-swallow-size: -1
-    servlet:
-       context-path: /jeecg-boot
-       compression:
-         enabled: true
-         mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*
+  port: 8080
+  tomcat:
+    max-swallow-size: -1
+  servlet:
+    context-path: /jeecg-boot
+  compression:
+    enabled: true
+    min-response-size: 1024
+    mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*
         
 management:
  endpoints:
@@ -141,39 +142,21 @@ jeecg :
     webapp: D://webapp
   #短信秘钥
   sms:
-     accessKeyId: ??
+     accessKeyId: LTAIpW4gUG7xYDNI
      accessKeySecret: ??
   shiro:
      excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**
   #阿里云oss存储配置
   oss:
-    type: aliyun
     endpoint: oss-cn-beijing.aliyuncs.com
-    accessKey: ???
-    secretKey: ???
-    bucketName: ???
-    properties:
-      aliyun:
-        protocol: https
+    accessKey: WegDpuKzOuPK6D3N
+    secretKey: ??
+    bucketName: jeecgos
+    staticDomain: ??
   # ElasticSearch 设置
   elasticsearch:
-    cluster-name: my-application
+    cluster-name: jeecg-ES
     cluster-nodes: 127.0.0.1:9200
-#  #腾讯云cos存储配置
-#  oss:
-#    type: qc
-#    #跟地区有关
-#    endpoint: cos.ap-beijing.myqcloud.com
-#    accessKey: yourSecretKeyId
-#    secretKey: yourSecretKey
-#    bucketName: yourBucketName
-#    properties:
-#      qc:
-#        #地区
-#        region: ap-beijing
-#        #存储路径
-#        prefix: project
-
 #cas单点登录
 cas:
   prefixUrl: http://cas.example.org:8443/cas

jeecg-boot/jeecg-boot-module-system/src/main/resources/banner.txt

@@ -9,6 +9,6 @@ ${AnsiColor.BRIGHT_BLUE}
 
 
 ${AnsiColor.BRIGHT_GREEN}
-Jeecg  Boot Version: 2.1.1
+Jeecg  Boot Version: 2.1.2
 Spring Boot Version: ${spring-boot.version}${spring-boot.formatted-version}
 ${AnsiColor.BLACK}

jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/jeecg_config.properties

@@ -1,5 +1,5 @@
 #code_generate_project_path
-project_path=E:\\eclipse2018-workspace\\jeecg-boot
+project_path=E:\\workspace-ui\\jeecg-boot-framework\\jeecg-boot-module-system
 #bussi_package[User defined]
 bussi_package=org.jeecg.modules.demo
 

jeecg-boot/pom.xml

@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jeecgframework.boot</groupId>
   <artifactId>jeecg-boot-parent</artifactId>
-  <version>2.1.1</version>
+  <version>2.1.2</version>
   <packaging>pom</packaging>
   
   	<parent>
@@ -16,7 +16,7 @@
 	<modules>
 		<module>jeecg-boot-base-common</module>
 		<module>jeecg-boot-module-system</module>
-	</modules> 
+	</modules>
 	
 	<distributionManagement>
 	  	<repository>
@@ -51,7 +51,7 @@
 	</repositories>
 	
     <properties>
-        <jeecgboot.common.version>2.1.1</jeecgboot.common.version>
+        <jeecgboot.common.version>2.1.2</jeecgboot.common.version>
         <java.version>1.8</java.version>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -62,7 +62,6 @@
         <aliyun-java-sdk-core.version>3.2.3</aliyun-java-sdk-core.version>
 		<aliyun-java-sdk-dysmsapi.version>1.0.0</aliyun-java-sdk-dysmsapi.version>
 		<aliyun.oss.version>3.6.0</aliyun.oss.version>
-		<qc.cos.version>5.6.5</qc.cos.version>
     </properties>
     
 	<dependencies>
@@ -105,7 +104,7 @@
 			<artifactId>commons-lang</artifactId>
 			<version>${commons.version}</version>
 		</dependency>
-		
+
 		<!-- freemarker -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -131,7 +130,7 @@
 		   <artifactId>druid-spring-boot-starter</artifactId>
 		   <version>${druid.version}</version>
 		</dependency>
-
+		
 		<!-- 动态数据源 -->
 		<dependency>
 		  <groupId>com.baomidou</groupId>
@@ -168,12 +167,12 @@
 			<scope>runtime</scope>
 		</dependency>
         <!-- postgresql驱动 -->
-        <dependency>
-            <groupId>postgresql</groupId>
-            <artifactId>postgresql</artifactId>
-            <version>42.2.5</version>
-            <scope>runtime</scope>
-        </dependency>
+		<dependency>
+			<groupId>org.postgresql</groupId>
+			<artifactId>postgresql</artifactId>
+			<version>42.2.6</version>
+			<scope>runtime</scope>
+		</dependency>
 		
 		 <!-- Quartz定时任务 -->
         <dependency>
@@ -187,30 +186,14 @@
 			<artifactId>java-jwt</artifactId>
 			<version>3.7.0</version>
 		</dependency>
-
-        <!--  online form-->
-        <dependency>
-            <groupId>org.jeecgframework.boot</groupId>
-            <artifactId>online-form</artifactId>
-            <version>1.2.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-core</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-collections</groupId>
-                    <artifactId>commons-collections</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
+		
 		<!--shiro-->
 		<dependency>
 		    <groupId>org.apache.shiro</groupId>
 		    <artifactId>shiro-spring-boot-starter</artifactId>
 		    <version>1.4.0</version>
 		</dependency>
+		<!-- shiro-redis -->
         <dependency>
             <groupId>org.crazycake</groupId>
             <artifactId>shiro-redis</artifactId>
@@ -222,7 +205,7 @@
                 </exclusion>
             </exclusions>
         </dependency>
-		
+
 		<!-- Swagger API文档 -->
         <dependency>
 		    <groupId>io.springfox</groupId>
@@ -272,7 +255,7 @@
 		<dependency>
 			<groupId>org.jeecgframework.boot</groupId>
 			<artifactId>codegenerate</artifactId>
-			<version>1.0.7</version>
+			<version>1.0.8</version>
 		</dependency>
 		
         <!-- AutoPoi Excel工具类-->
@@ -305,7 +288,23 @@
 			<artifactId>aliyun-java-sdk-core</artifactId>
 			<version>${aliyun-java-sdk-core.version}</version>
 		</dependency>
-		
+
+		<dependency>
+			<groupId>org.jeecgframework.boot</groupId>
+			<artifactId>online-form</artifactId>
+			<version>2.1.2</version>
+		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-core</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-collections</groupId>
+					<artifactId>commons-collections</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
 		<!--HttpClient-->
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
@@ -319,16 +318,12 @@
 		   <artifactId>spring-boot-starter-websocket</artifactId>
 		</dependency>
 
+		<!-- aliyun oss -->
 		<dependency>
 			<groupId>com.aliyun.oss</groupId>
 			<artifactId>aliyun-sdk-oss</artifactId>
 			<version>${aliyun.oss.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>com.qcloud</groupId>
-			<artifactId>cos_api</artifactId>
-			<version>${qc.cos.version}</version>
-		</dependency>
 
 	</dependencies>
 
@@ -353,8 +348,8 @@
 			<!--<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
-			</plugin> -->
-			<!--指定JDK编译版本 -->
+			</plugin>
+			 指定JDK编译版本 -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>