增量升级脚步语法错误修复

系统设置菜单消失 #2079
Failed to execute 'getComputedStyle' on 'Window
升级代码生成器模板

1、支持自定义下拉树的生成
2、oracle下 三级联动配置了，导致生成报错
3、高级查询支持下拉搜索和下拉多选
4、树表单支持更多的控件生成

ant-design-vue-jeecg/README.md

@@ -111,7 +111,7 @@ Docker 镜像使用
 
  ``` 
 # 1.修改前端项目的后台域名
-    public/index.html  
+    .env.development
     域名改成： http://jeecg-boot-system:8080/jeecg-boot
    
 # 2.先进入打包前端项目

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

@@ -15,7 +15,7 @@
       @change="handleChange"
       @preview="handlePreview"
       :class="!isMultiple?'imgupload':''">
-      <div style="width:104px;height:104px">
+      <div :style="{'width':(!isMultiple?'104px':'auto'),'height':(!isMultiple?'104px':'auto')}">
         <img v-if="!isMultiple && picUrl" :src="getAvatarView()" style="width:100%;height:100%"/>
         <div v-else class="iconp">
           <a-icon :type="uploadLoading ? 'loading' : 'plus'" />

ant-design-vue-jeecg/src/components/jeecg/JVxeTable/components/JVxeTable.js

@@ -864,6 +864,8 @@ export default {
     trigger(name, event = {}) {
       event.$target = this
       event.$table = this.$refs.vxe
+      //online增强参数兼容
+      event.target = this
       this.$emit(name, event)
     },
 

ant-design-vue-jeecg/src/components/jeecg/JVxeTable/mixins/JVxeCellMixins.js

@@ -149,6 +149,8 @@ export default {
     packageEvent(name, event = {}) {
       event.row = this.row
       event.column = this.column
+      //online增强参数兼容
+      event.column['key'] = this.column['property']
       event.cellTarget = this
       if (!event.type) {
         event.type = name

ant-design-vue-jeecg/src/components/layouts/TabLayout.vue

@@ -186,7 +186,12 @@
       },
       tabCallBack() {
         this.$nextTick(() => {
+          //update-begin-author:taoyan date: 20201211 for:【新版】online报错 JT-100
+         setTimeout(()=>{
+           //省市区组件里面给window绑定了个resize事件 导致切换页面的时候触发了他的resize，但是切换页面，省市区组件还没被销毁前就触发了该事件，导致控制台报错，加个延迟
            triggerWindowResizeEvent()
+         },20)
+          //update-end-author:taoyan date: 20201211 for:【新版】online报错 JT-100
         })
       },
       editPage(key, action) {

ant-design-vue-jeecg/src/components/setting/SettingDrawer.vue

@@ -87,7 +87,7 @@
           </div>
           <div :style="{ marginTop: '24px' }">
             <a-list :split="false">
-              <a-list-item  slot="renderItem" slot-scope="item, index">
+              <a-list-item>
                 <a-tooltip slot="actions">
                   <template slot="title">
                     该设定仅 [顶部栏导航] 时有效
@@ -101,19 +101,19 @@
                   <div slot="title">内容区域宽度</div>
                 </a-list-item-meta>
               </a-list-item>
-              <a-list-item  slot="renderItem" slot-scope="item, index">
+              <a-list-item>
                 <a-switch slot="actions" size="small" :defaultChecked="fixedHeader" @change="handleFixedHeader" />
                 <a-list-item-meta>
                   <div slot="title">固定 Header</div>
                 </a-list-item-meta>
               </a-list-item>
-              <a-list-item  slot="renderItem" slot-scope="item, index">
+              <a-list-item>
                 <a-switch slot="actions" size="small" :disabled="!fixedHeader" :defaultChecked="autoHideHeader" @change="handleFixedHeaderHidden" />
                 <a-list-item-meta>
                   <div slot="title" :style="{ textDecoration: !fixedHeader ? 'line-through' : 'unset' }">下滑时隐藏 Header</div>
                 </a-list-item-meta>
               </a-list-item>
-              <a-list-item  slot="renderItem" slot-scope="item, index">
+              <a-list-item>
                 <a-switch slot="actions" size="small" :disabled="(layoutMode === 'topmenu')" :checked="dataFixSiderbar" @change="handleFixSiderbar" />
                 <a-list-item-meta>
                   <div slot="title" :style="{ textDecoration: layoutMode === 'topmenu' ? 'line-through' : 'unset' }">固定侧边菜单</div>
@@ -128,13 +128,13 @@
           <h3 class="setting-drawer-index-title">其他设置</h3>
           <div>
             <a-list :split="false">
-              <a-list-item  slot="renderItem" slot-scope="item, index">
+              <a-list-item>
                 <a-switch slot="actions" size="small" :defaultChecked="colorWeak" @change="onColorWeak" />
                 <a-list-item-meta>
                   <div slot="title">色弱模式</div>
                 </a-list-item-meta>
               </a-list-item>
-              <a-list-item  slot="renderItem" slot-scope="item, index">
+              <a-list-item>
                 <a-switch slot="actions" size="small" :defaultChecked="multipage" @change="onMultipageWeak" />
                 <a-list-item-meta>
                   <div slot="title">多页签模式</div>

ant-design-vue-jeecg/src/views/examples/list/TableInnerEditList.vue

@@ -62,7 +62,7 @@
     </div>
 
     <div class="table-operator">
-      <a-button type="primary" icon="plus" @click="() => $router.push({name: 'anime-add'})">新建</a-button>
+      <a-button type="primary" icon="plus" @click="() => this.handleModalVisible(true)">新建</a-button>
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
           <a-menu-item key="1"><a-icon type="delete" />删除</a-menu-item>
@@ -111,7 +111,14 @@
         </div>
       </template>
     </s-table>
-
+    <a-modal title="新建规则" destroyOnClose :visible="visibleCreateModal" @ok="handleCreateModalOk" @cancel="handleCreateModalCancel">
+      <!---->
+      <a-form style="margin-top: 8px" :autoFormCreate="(form)=>{this.createForm = form}">
+        <a-form-item :labelCol="{ span: 5 }" :wrapperCol="{ span: 15 }" label="描述" fieldDecoratorId="description" :fieldDecoratorOptions="{rules: [{ required: true, message: '请输入至少五个字符的规则描述！', min: 5 }]}">
+          <a-input placeholder="请输入" />
+        </a-form-item>
+      </a-form>
+    </a-modal>
   </a-card>
 </template>
 
@@ -181,7 +188,8 @@
         },
 
         selectedRowKeys: [],
-        selectedRows: []
+        selectedRows: [],
+        visibleCreateModal:false
       }
     },
     methods: {
@@ -230,6 +238,16 @@
       toggleAdvanced () {
         this.advanced = !this.advanced
       },
+      //添加逻辑
+      handleModalVisible(isVisible) {
+        this.visibleCreateModal = isVisible;
+      },
+      handleCreateModalCancel() {
+        this.visibleCreateModal = false;
+      },
+      handleCreateModalOk() {
+        this.visibleCreateModal = false;
+      },
     },
     watch: {
       /*

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

@@ -1,10 +1,12 @@
 <template>
   <a-card :bordered="false">
-    <a-row>
+    <a-row style="margin-top: 20px">
       <a-col :md="2" :sm="4">
         <a-select defaultValue="POST" style="width: 90px" @change="handleChange" size="large">
           <a-select-option value="POST">POST</a-select-option>
-          <!--<a-select-option value="GET">GET</a-select-option>-->
+          <a-select-option value="GET">GET</a-select-option>
+          <a-select-option value="PUT">PUT</a-select-option>
+          <a-select-option value="DELETE">DELETE</a-select-option>
         </a-select>
       </a-col>
       <a-col :md="22" :sm="20">
@@ -19,7 +21,7 @@
 
     <a-tabs defaultActiveKey="2">
       <a-tab-pane tab="params" key="2">
-        <textarea style="width:100%;font-size: 16px;font-weight:500" :rows="13" @input="changeVal">
+        <textarea style="width:100%;font-size: 16px;font-weight:500" :rows="13" @blur="changeVal">
         </textarea>
       </a-tab-pane>
     </a-tabs>
@@ -33,7 +35,7 @@
   </a-card>
 </template>
 <script>
-  import { postAction,getAction } from '@/api/manage'
+  import { axios } from '@/utils/request'
   import { ACCESS_TOKEN } from "@/store/mutation-types"
   import Vue from 'vue'
   export default {
@@ -49,28 +51,25 @@
     methods: {
       onSearch (value) {
         let that = this
+        if(!value){
+          that.$message.error("请填写路径")
+          return false
+        }
         this.resultJson = {};
-        if("POST"===this.requestMethod.toUpperCase()){
-          postAction(value,this.paramJson).then((res)=>{
+          axios({
+            url: value,
+            method: this.requestMethod,
+            data: this.paramJson
+          }).then((res) => {
             console.log(res)
             this.resultJson = res
           }).catch((err) => {
             that.$message.error("请求异常："+err)
           })
-        }else {
-          getAction(value,this.paramJson).then((res)=>{
-            console.log(res)
-            this.resultJson = res;
-          }).catch((err) => {
-            that.$message.error("请求异常："+err)
-          })
-        }
       },
       changeVal(e){
         try {
           let json = e.target.value;
-          json = json.replace(/\n/g,"");
-          json = json.replace(/\s*/g,"");
           if(json.indexOf(",}")>0){
             json = json.replace(",}","}");
           }

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

@@ -89,10 +89,10 @@
           <a-popover title="自定义列" trigger="click" placement="leftBottom">
             <template slot="content">
               <a-checkbox-group @change="onColSettingsChange" v-model="settingColumns" :defaultValue="settingColumns">
-                <a-row>
+                <a-row style="width: 400px">
                   <template v-for="(item,index) in defColumns">
                     <template v-if="item.key!='rowIndex'&& item.dataIndex!='action'">
-                        <a-col :span="12"><a-checkbox :value="item.dataIndex">{{ item.title }}</a-checkbox></a-col>
+                        <a-col :span="12"><a-checkbox :value="item.dataIndex"><j-ellipsis :value="item.title" :length="10"></j-ellipsis></a-checkbox></a-col>
                     </template>
                   </template>
                 </a-row>
@@ -118,10 +118,10 @@
         <div slot="filterDropdown">
           <a-card>
             <a-checkbox-group @change="onColSettingsChange" v-model="settingColumns" :defaultValue="settingColumns">
-              <a-row>
+              <a-row style="width: 400px">
                 <template v-for="(item,index) in defColumns">
                   <template v-if="item.key!='rowIndex'&& item.dataIndex!='action'">
-                    <a-col :span="12"><a-checkbox :value="item.dataIndex">{{ item.title }}</a-checkbox></a-col>
+                    <a-col :span="12"><a-checkbox :value="item.dataIndex"><j-ellipsis :value="item.title" :length="10"></j-ellipsis></a-checkbox></a-col>
                   </template>
                 </template>
               </a-row>

ant-design-vue-jeecg/src/views/modules/monitor/TomcatInfo.vue

@@ -110,14 +110,15 @@
           getAction('actuator/metrics/tomcat.sessions.active.current'),
           getAction('actuator/metrics/tomcat.sessions.active.max'),
           getAction('actuator/metrics/tomcat.sessions.rejected'),
-          getAction('actuator/metrics/tomcat.global.sent'),
-          getAction('actuator/metrics/tomcat.global.request.max'),
-          getAction('actuator/metrics/tomcat.global.request'),
+          // 2.3.5.RELEASE 无此API
+          // getAction('actuator/metrics/tomcat.global.sent'),
+          // getAction('actuator/metrics/tomcat.global.request.max'),
+          // getAction('actuator/metrics/tomcat.global.request'),
+          // getAction('actuator/metrics/tomcat.threads.current'),
+          // getAction('actuator/metrics/tomcat.threads.config.max')
           // 2.1.3.RELEASE 无此API
           //getAction('actuator/metrics/tomcat.servlet.request'),
           // getAction('actuator/metrics/tomcat.servlet.request.max'),
-          getAction('actuator/metrics/tomcat.threads.current'),
-          getAction('actuator/metrics/tomcat.threads.config.max')
         ]).then((res) => {
           let tomcatInfo = []
           res.forEach((value, id) => {

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

@@ -58,6 +58,7 @@
             :pagination="ipagination"
             :loading="loading"
             @change="handleTableChange"
+            :rowClassName="getRowClassname"
           >
 
           <span slot="action" slot-scope="text, record">
@@ -200,8 +201,22 @@
           this.screenWidth = 600;
         }
       },
+      //update--begin--autor:wangshuai-----date:20191204------for：系统管理 数据字典禁用和正常区别开，添加背景颜色 teambition JT-22------
+      //增加样式方法返回值
+      getRowClassname(record){
+        if(record.status==0){
+          return "data-rule-invalid"
+        }
+      }
+      //update--end--autor:wangshuai-----date:20191204------for：系统管理 数据字典禁用和正常区别开，添加背景颜色 teambition JT-22------
     }
   }
 </script>
-<style scoped>
+<style lang="less" scoped>
+//update--begin--autor:wangshuai-----date:20191204------for：系统管理 数据字典禁用和正常区别开，添加背景颜色 teambition JT-22------
+/deep/ .data-rule-invalid{
+  background: #f4f4f4;
+  color: #bababa;
+}
+//update--begin--autor:wangshuai-----date:20191204------for：系统管理 数据字典禁用和正常区别开，添加背景颜色 teambition JT-22------
 </style>

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

@@ -53,7 +53,7 @@
               </a-menu-item>
 
               <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)" placement="topLeft">
                   <a>删除</a>
                 </a-popconfirm>
               </a-menu-item>

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

@@ -28,7 +28,7 @@
 
         <template v-if="!model.id">
           <a-form-item label="登录密码" :labelCol="labelCol" :wrapperCol="wrapperCol" >
-            <a-input type="password" placeholder="请输入登录密码" v-decorator="[ 'password']" />
+            <a-input type="password" placeholder="请输入登录密码" v-decorator="[ 'password',validatorRules.password]" />
           </a-form-item>
 
           <a-form-item label="确认密码" :labelCol="labelCol" :wrapperCol="wrapperCol" >

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

@@ -183,8 +183,8 @@
           return false
         }
         this.departResolve().then(()=>{
-          if(this.isMultiTenant){
           this.$store.dispatch('saveTenant', this.tenant_id);
+          if(this.isMultiTenant){
             this.$emit('success')
           }else{
             this.$emit('success')

jeecg-boot/README.md

@@ -39,9 +39,9 @@ Jeecg-Boot 低代码开发平台
 
 - 在线演示 ：  [http://boot.jeecg.com](http://boot.jeecg.com)
 
-- 在线文档：  [http://doc.jeecg.com/1273753](http://doc.jeecg.com/1273753)
+- 在线文档：  [http://doc.jeecg.com](http://doc.jeecg.com)
 
-- 常见问题：  [入门常见问题大全](http://bbs.jeecg.com/forum.php?mod=viewthread&tid=7816&extra=page%3D1)
+- 常见问题：  [http://jeecg.com/doc/qa](http://jeecg.com/doc/qa)
 
 - QQ交流群 ：  ③816531124、①284271917、②769925425
 
@@ -100,7 +100,7 @@ QueryWrapper<?> queryWrapper = QueryGenerator.initQueryWrapper(?, req.getParamet
 > 功能说明：   一键生成的代码（包括：controller、service、dao、mapper、entity、vue）
  
  - 模板位置： src/main/resources/jeecg/code-template
- - 技术文档： http://doc.jeecg.com/1273927
+ - 技术文档： http://doc.jeecg.com/2043916
 
 
 

jeecg-boot/db/jeecgboot-mysql-5.7.sql

@@ -21,6 +21,7 @@ create database `jeecg-boot` default character set utf8mb4 collate utf8mb4_gener
 
 SET NAMES utf8mb4;
 SET FOREIGN_KEY_CHECKS = 0;
+USE `jeecg-boot`;
 
 -- ----------------------------
 -- Table structure for ces_field_kongj
@@ -5040,8 +5041,8 @@ CREATE TABLE `sys_user`  (
 -- ----------------------------
 INSERT INTO `sys_user` VALUES ('3d464b4ea0d2491aab8a7bde74c57e95', 'zhangsan', '张三', '02ea098224c7d0d2077c14b9a3a1ed16', 'x5xRdeKB', 'https://static.jeecg.com/temp/jmlogo_1606575041993.png', NULL, NULL, NULL, NULL, '财务部', 1, 0, NULL, NULL, 1, '0005', '总经理', NULL, 'admin', '2020-05-14 21:26:24', 'admin', '2020-09-09 14:42:51', 1, '', '', NULL);
 INSERT INTO `sys_user` VALUES ('a75d45a015c44384a04449ee80dc3503', 'jeecg', 'jeecg', '58a714412072f0b9', 'mIgiYJow', 'https://static.jeecg.com/temp/国炬软件logo_1606575029126.png', NULL, 1, NULL, NULL, 'A02A01', 1, 0, NULL, NULL, 1, '00002', 'devleader', NULL, 'admin', '2019-02-13 16:02:36', 'admin', '2020-11-26 15:16:05', 1, '', NULL, NULL);
-INSERT INTO `sys_user` VALUES ('e9ca23d68d884d4ebb19d07889727dae', 'admin', '管理员', 'cb362cfeefbf3d8d', 'RCGTeGiH', 'https://static.jeecg.com/temp/国炬软件logo_1606575029126.png', '2018-12-05 00:00:00', 1, 'jeecg@163.com', '18611111111', 'A01', 1, 0, NULL, NULL, 1, '00001', '总经理', NULL, NULL, '2038-06-21 17:54:10', 'admin', '2020-07-10 15:27:10', 2, 'c6d7cb4deeac411cb3384b1b31278596', '', NULL);
-INSERT INTO `sys_user` VALUES ('f0019fdebedb443c98dcb17d88222c38', 'zhagnxiao', '张小红', 'f898134e5e52ae11a2ffb2c3b57a4e90', 'go3jJ4zX', 'https://static.jeecg.com/temp/jmlogo_1606575041993.png', '2019-04-01 00:00:00', NULL, NULL, NULL, '研发部,财务部', 2, 0, NULL, NULL, 1, '00003', '', NULL, 'admin', '2023-10-01 19:34:10', 'admin', '2020-11-26 15:24:59', 1, '', '', NULL);
+INSERT INTO `sys_user` VALUES ('e9ca23d68d884d4ebb19d07889727dae', 'admin', '管理员', 'cb362cfeefbf3d8d', 'RCGTeGiH', 'https://static.jeecg.com/temp/国炬软件logo_1606575029126.png', '2018-12-05 00:00:00', 1, 'jeecg@163.com', '18611111111', 'A01', 1, 0, NULL, NULL, 1, '00001', '总经理', NULL, NULL, '2020-06-21 17:54:10', 'admin', '2020-07-10 15:27:10', 2, 'c6d7cb4deeac411cb3384b1b31278596', '', NULL);
+INSERT INTO `sys_user` VALUES ('f0019fdebedb443c98dcb17d88222c38', 'zhagnxiao', '张小红', 'f898134e5e52ae11a2ffb2c3b57a4e90', 'go3jJ4zX', 'https://static.jeecg.com/temp/jmlogo_1606575041993.png', '2019-04-01 00:00:00', NULL, NULL, NULL, '研发部,财务部', 2, 0, NULL, NULL, 1, '00003', '', NULL, 'admin', '2020-10-01 19:34:10', 'admin', '2020-11-26 15:24:59', 1, '', '', NULL);
 
 -- ----------------------------
 -- Table structure for sys_user_agent
@@ -5363,6 +5364,18 @@ DROP TABLE IF EXISTS QRTZ_TRIGGERS;
 DROP TABLE IF EXISTS QRTZ_JOB_DETAILS;
 DROP TABLE IF EXISTS QRTZ_CALENDARS;
 
+drop table if exists qrtz_fired_triggers;
+drop table if exists qrtz_paused_trigger_grps;
+drop table if exists qrtz_scheduler_state;
+drop table if exists qrtz_locks;
+drop table if exists qrtz_simple_triggers;
+drop table if exists qrtz_simprop_triggers;
+drop table if exists qrtz_cron_triggers;
+drop table if exists qrtz_blob_triggers;
+drop table if exists qrtz_triggers;
+drop table if exists qrtz_job_details;
+drop table if exists qrtz_calendars;
+
 
 CREATE TABLE QRTZ_JOB_DETAILS
   (

jeecg-boot/db/jeecgboot-oracle11g.sql

@@ -6767,8 +6767,8 @@ COMMENT ON TABLE "JEECGBOOT"."SYS_USER" IS '用户表';
 -- ----------------------------
 INSERT INTO "JEECGBOOT"."SYS_USER" VALUES ('3d464b4ea0d2491aab8a7bde74c57e95', 'zhangsan', '张三', '02ea098224c7d0d2077c14b9a3a1ed16', 'x5xRdeKB', 'https://static.jeecg.com/temp/jmlogo_1606575041993.png', NULL, NULL, NULL, NULL, '财务部', '1', '0', NULL, NULL, '1', '0005', '总经理', NULL, 'admin', TO_DATE('2020-05-14 21:26:24', 'SYYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2020-09-09 14:42:51', 'SYYYY-MM-DD HH24:MI:SS'), '1', NULL, NULL, NULL);
 INSERT INTO "JEECGBOOT"."SYS_USER" VALUES ('a75d45a015c44384a04449ee80dc3503', 'jeecg', 'jeecg', '58a714412072f0b9', 'mIgiYJow', 'https://static.jeecg.com/temp/国炬软件logo_1606575029126.png', NULL, '1', NULL, NULL, 'A02A01', '1', '0', NULL, NULL, '1', '00002', 'devleader', NULL, 'admin', TO_DATE('2019-02-13 16:02:36', 'SYYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2020-11-26 15:16:05', 'SYYYY-MM-DD HH24:MI:SS'), '1', NULL, NULL, NULL);
-INSERT INTO "JEECGBOOT"."SYS_USER" VALUES ('e9ca23d68d884d4ebb19d07889727dae', 'admin', '管理员', 'cb362cfeefbf3d8d', 'RCGTeGiH', 'https://static.jeecg.com/temp/国炬软件logo_1606575029126.png', TO_DATE('2018-12-05 00:00:00', 'SYYYY-MM-DD HH24:MI:SS'), '1', 'jeecg@163.com', '18611111111', 'A01', '1', '0', NULL, NULL, '1', '00001', '总经理', NULL, NULL, TO_DATE('2038-06-21 17:54:10', 'SYYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2020-07-10 15:27:10', 'SYYYY-MM-DD HH24:MI:SS'), '2', 'c6d7cb4deeac411cb3384b1b31278596', NULL, NULL);
-INSERT INTO "JEECGBOOT"."SYS_USER" VALUES ('f0019fdebedb443c98dcb17d88222c38', 'zhagnxiao', '张小红', 'f898134e5e52ae11a2ffb2c3b57a4e90', 'go3jJ4zX', 'https://static.jeecg.com/temp/jmlogo_1606575041993.png', TO_DATE('2019-04-01 00:00:00', 'SYYYY-MM-DD HH24:MI:SS'), NULL, NULL, NULL, '研发部,财务部', '2', '0', NULL, NULL, '1', '00003', NULL, NULL, 'admin', TO_DATE('2023-10-01 19:34:10', 'SYYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2020-11-26 15:24:59', 'SYYYY-MM-DD HH24:MI:SS'), '1', NULL, NULL, NULL);
+INSERT INTO "JEECGBOOT"."SYS_USER" VALUES ('e9ca23d68d884d4ebb19d07889727dae', 'admin', '管理员', 'cb362cfeefbf3d8d', 'RCGTeGiH', 'https://static.jeecg.com/temp/国炬软件logo_1606575029126.png', TO_DATE('2018-12-05 00:00:00', 'SYYYY-MM-DD HH24:MI:SS'), '1', 'jeecg@163.com', '18611111111', 'A01', '1', '0', NULL, NULL, '1', '00001', '总经理', NULL, NULL, TO_DATE('2020-06-21 17:54:10', 'SYYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2020-07-10 15:27:10', 'SYYYY-MM-DD HH24:MI:SS'), '2', 'c6d7cb4deeac411cb3384b1b31278596', NULL, NULL);
+INSERT INTO "JEECGBOOT"."SYS_USER" VALUES ('f0019fdebedb443c98dcb17d88222c38', 'zhagnxiao', '张小红', 'f898134e5e52ae11a2ffb2c3b57a4e90', 'go3jJ4zX', 'https://static.jeecg.com/temp/jmlogo_1606575041993.png', TO_DATE('2019-04-01 00:00:00', 'SYYYY-MM-DD HH24:MI:SS'), NULL, NULL, NULL, '研发部,财务部', '2', '0', NULL, NULL, '1', '00003', NULL, NULL, 'admin', TO_DATE('2020-10-01 19:34:10', 'SYYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2020-11-26 15:24:59', 'SYYYY-MM-DD HH24:MI:SS'), '1', NULL, NULL, NULL);
 
 -- ----------------------------
 -- Table structure for SYS_USER_AGENT

jeecg-boot/db/jeecgboot-sqlserver2017.sql

@@ -17004,10 +17004,10 @@ GO
 INSERT INTO [dbo].[sys_user]  VALUES (N'a75d45a015c44384a04449ee80dc3503', N'jeecg', N'jeecg', N'58a714412072f0b9', N'mIgiYJow', N'https://static.jeecg.com/temp/国炬软件logo_1606575029126.png', NULL, N'1', NULL, NULL, N'A02A01', N'1', N'0', NULL, NULL, N'1', N'00002', N'devleader', NULL, N'admin', N'2019-02-13 16:02:36.0000000', N'admin', N'2020-11-26 15:16:05.0000000', N'1', N'', NULL, NULL)
 GO
 
-INSERT INTO [dbo].[sys_user]  VALUES (N'e9ca23d68d884d4ebb19d07889727dae', N'admin', N'管理员', N'cb362cfeefbf3d8d', N'RCGTeGiH', N'https://static.jeecg.com/temp/国炬软件logo_1606575029126.png', N'2018-12-05 00:00:00.0000000', N'1', N'jeecg@163.com', N'18611111111', N'A01', N'1', N'0', NULL, NULL, N'1', N'00001', N'总经理', NULL, NULL, N'2038-06-21 17:54:10.0000000', N'admin', N'2020-07-10 15:27:10.0000000', N'2', N'c6d7cb4deeac411cb3384b1b31278596', N'', NULL)
+INSERT INTO [dbo].[sys_user]  VALUES (N'e9ca23d68d884d4ebb19d07889727dae', N'admin', N'管理员', N'cb362cfeefbf3d8d', N'RCGTeGiH', N'https://static.jeecg.com/temp/国炬软件logo_1606575029126.png', N'2018-12-05 00:00:00.0000000', N'1', N'jeecg@163.com', N'18611111111', N'A01', N'1', N'0', NULL, NULL, N'1', N'00001', N'总经理', NULL, NULL, N'2020-06-21 17:54:10.0000000', N'admin', N'2020-07-10 15:27:10.0000000', N'2', N'c6d7cb4deeac411cb3384b1b31278596', N'', NULL)
 GO
 
-INSERT INTO [dbo].[sys_user]  VALUES (N'f0019fdebedb443c98dcb17d88222c38', N'zhagnxiao', N'张小红', N'f898134e5e52ae11a2ffb2c3b57a4e90', N'go3jJ4zX', N'https://static.jeecg.com/temp/jmlogo_1606575041993.png', N'2019-04-01 00:00:00.0000000', NULL, NULL, NULL, N'研发部,财务部', N'2', N'0', NULL, NULL, N'1', N'00003', N'', NULL, N'admin', N'2023-10-01 19:34:10.0000000', N'admin', N'2020-11-26 15:24:59.0000000', N'1', N'', N'', NULL)
+INSERT INTO [dbo].[sys_user]  VALUES (N'f0019fdebedb443c98dcb17d88222c38', N'zhagnxiao', N'张小红', N'f898134e5e52ae11a2ffb2c3b57a4e90', N'go3jJ4zX', N'https://static.jeecg.com/temp/jmlogo_1606575041993.png', N'2019-04-01 00:00:00.0000000', NULL, NULL, NULL, N'研发部,财务部', N'2', N'0', NULL, NULL, N'1', N'00003', N'', NULL, N'admin', N'2020-10-01 19:34:10.0000000', N'admin', N'2020-11-26 15:24:59.0000000', N'1', N'', N'', NULL)
 GO
 
 

jeecg-boot/db/增量SQL/2.3升级到2.4增量mysql.sql

@@ -23,7 +23,7 @@ CREATE TABLE `sys_third_account` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 ALTER TABLE `sys_user`
-DROP COLUMN `third_id`
+DROP COLUMN `third_id`,
 DROP COLUMN `third_type`;
 
 update sys_permission set component = 'examples/list/UserList' where id = '05b3c82ddb2536a4a5ee1a4c46b5abef';

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

@@ -76,6 +76,12 @@
 			<version>${commons.version}</version>
 		</dependency>
 
+		<!-- 拼音库 -->
+		<dependency>
+			<groupId>com.belerweb</groupId>
+			<artifactId>pinyin4j</artifactId>
+			<version>${pinyin4j.version}</version>
+		</dependency>
 		<!-- freemarker -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -153,7 +159,7 @@
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-re</artifactId>
-			<version>2.3.06</version>
+			<version>2.3.07</version>
 		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
@@ -216,13 +222,6 @@
 			</exclusions>
 		</dependency>
 
-		<!-- hutool工具类-->
-		<dependency>
-			<groupId>cn.hutool</groupId>
-			<artifactId>hutool-all</artifactId>
-			<version>${hutool-all.version}</version>
-		</dependency>
-
 		<!-- mini文件存储服务 -->
 		<dependency>
 			<groupId>io.minio</groupId>

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

@@ -1,5 +1,7 @@
 package org.jeecg.common.util;
 
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.extra.pinyin.PinyinUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.constant.DataBaseConstant;
@@ -16,10 +18,15 @@ import java.io.InputStream;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.SQLException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 @Slf4j
 public class CommonUtils {
 
+   //中文正则
+    private static Pattern ZHONGWEN_PATTERN = Pattern.compile("[\u4e00-\u9fa5]");
+
     public static String uploadOnlineImage(byte[] data,String basePath,String bizPath,String uploadType){
         String dbPath = null;
         String fileName = "image" + Math.round(Math.random() * 100000000000L);
@@ -68,9 +75,28 @@ public class CommonUtils {
         }
         //替换上传文件名字的特殊字符
         fileName = fileName.replace("=","").replace(",","").replace("&","").replace("#", "");
+       //替换上传文件名字中的中文
+        if(ifContainChinese(fileName)){
+            fileName= PinyinUtil.getPinyin(fileName,  StrUtil.EMPTY);
+        }
+        //替换上传文件名字中的空格
+        fileName=fileName.replaceAll("\\s","");
         return fileName;
     }
 
+    // java 判断字符串里是否包含中文字符
+    public static boolean ifContainChinese(String str) {
+        if(str.getBytes().length == str.length()){
+            return false;
+        }else{
+            Matcher m = ZHONGWEN_PATTERN.matcher(str);
+            if (m.find()) {
+                return true;
+            }
+            return false;
+        }
+    }
+
     /**
      * 统一全局上传
      * @Return: java.lang.String
@@ -129,7 +155,7 @@ public class CommonUtils {
                 String dbType = md.getDatabaseProductName().toLowerCase();
                 if(dbType.indexOf("mysql")>=0) {
                     DB_TYPE = DataBaseConstant.DB_TYPE_MYSQL;
-                }else if(dbType.indexOf("oracle")>=0) {
+                }else if(dbType.indexOf("oracle")>=0 ||dbType.indexOf("dm")>=0) {
                     DB_TYPE = DataBaseConstant.DB_TYPE_ORACLE;
                 }else if(dbType.indexOf("sqlserver")>=0||dbType.indexOf("sql server")>=0) {
                     DB_TYPE = DataBaseConstant.DB_TYPE_SQLSERVER;

jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/FreemarkerParseFactory.java

@@ -6,8 +6,6 @@ import freemarker.template.Configuration;
 import freemarker.template.Template;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.jeecgframework.codegenerate.generate.util.SimpleFormat;
 
 import java.io.StringWriter;

jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/WebMvcConfiguration.java

@@ -1,9 +1,15 @@
 package org.jeecg.config;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.actuate.trace.http.InMemoryHttpTraceRepository;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 import org.springframework.web.filter.CorsFilter;
@@ -11,6 +17,8 @@ import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
+import java.util.List;
+
 /**
  * Spring Boot 2.0 解决跨域问题
  *
@@ -63,4 +71,29 @@ public class WebMvcConfiguration implements WebMvcConfigurer {
         return new CorsFilter(urlBasedCorsConfigurationSource);
     }
 
+    /**
+    * 添加Long转json精度丢失是配置
+    * @Return: void
+    */
+    @Override
+    public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
+        MappingJackson2HttpMessageConverter jackson2HttpMessageConverter = new MappingJackson2HttpMessageConverter();
+        ObjectMapper objectMapper = new ObjectMapper();
+        SimpleModule simpleModule = new SimpleModule();
+        simpleModule.addSerializer(Long.class, ToStringSerializer.instance);
+        simpleModule.addSerializer(Long.TYPE, ToStringSerializer.instance);
+        objectMapper.registerModule(simpleModule);
+        jackson2HttpMessageConverter.setObjectMapper(objectMapper);
+        converters.add(jackson2HttpMessageConverter);
+    }
+
+    /**
+     * SpringBootAdmin的Httptrace不见了
+     * https://blog.csdn.net/u013810234/article/details/110097201
+     */
+    @Bean
+    public InMemoryHttpTraceRepository getInMemoryHttpTrace(){
+        return new InMemoryHttpTraceRepository();
+    }
+
 }

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

@@ -11,7 +11,7 @@ import org.jeecgframework.codegenerate.window.CodeWindow;
  */
 public class JeecgOneGUI {
 
-	/** 详细使用手册： http://doc.jeecg.com/1275846 */
+	/** 详细使用手册： http://doc.jeecg.com/2043919 */
     public static void main(String[] args) {
     	new CodeWindow().pack();
 	}

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

@@ -5,7 +5,6 @@ import org.apache.catalina.Context;
 import org.apache.tomcat.util.scan.StandardJarScanner;
 import org.jeecg.common.util.oConvertUtils;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
@@ -17,6 +16,9 @@ import org.springframework.core.env.Environment;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 
+/**
+* 单体启动类（采用此类启动项目为单体模式）
+*/
 @Slf4j
 @SpringBootApplication
 public class JeecgSystemApplication extends SpringBootServletInitializer {

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

@@ -889,8 +889,12 @@ public class SysUserController {
                 return result;
             }
         }
-
-		if (!smscode.equals(code)) {
+        if(null == code){
+            result.setMessage("手机验证码失效，请重新获取");
+            result.setSuccess(false);
+            return result;
+        }
+		if (!smscode.equals(code.toString())) {
 			result.setMessage("手机验证码错误");
 			result.setSuccess(false);
 			return result;

jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/common/utils.ftl

@@ -76,14 +76,24 @@
 
 <#-- ** 高级查询生成 * -->
 <#function superQueryFieldList po>
+    <#assign superQuery_dictTable="">
+    <#assign superQuery_dictText="">
+    <#if po.dictTable?default("")?trim?length gt 1>
+        <#assign superQuery_dictTable="${po.dictTable}">
+    </#if>
+    <#if po.dictText?default("")?trim?length gt 1>
+        <#assign superQuery_dictText="${po.dictText}">
+    </#if>
   <#if po.classType=="popup">
       <#return "{type:'${po.classType}',value:'${po.fieldName}',text:'${po.filedComment}', popup:{code:'${po.dictTable}',field:'${po.dictField?split(',')[0]}',orgFields:'${po.dictField?split(',')[0]}',destFields:'${po.dictText?split(',')[0]}'}}">
   <#elseif po.classType=="sel_user" || po.classType=="sel_depart" || po.classType=="datetime" || po.classType=="date" || po.classType=="pca" || po.classType=="switch">
       <#return "{type:'${po.classType}',value:'${po.fieldName}',text:'${po.filedComment}'}">
   <#else>
-      <#if po.dictTable?? && po.dictTable!="" && po.classType!="sel_tree" && po.classType!="cat_tree" && po.classType!="link_down">
+      <#if po.classType=="sel_search" || po.classType=="list_multi">
+          <#return "{type:'${po.classType}',value:'${po.fieldName}',text:'${po.filedComment}',dictTable:'${superQuery_dictTable}', dictText:'${superQuery_dictText}', dictCode:'${po.dictField}'}">
+      <#elseif po.dictTable?? && po.dictTable!="" && po.classType!="sel_tree" && po.classType!="cat_tree" && po.classType!="link_down">
           <#return "{type:'${po.fieldDbType}',value:'${po.fieldName}',text:'${po.filedComment}',dictCode:'${po.dictTable},${po.dictText},${po.dictField}'}">
-      <#elseif po.dictField?? && po.dictTable!="" && po.classType!="sel_tree" && po.classType!="cat_tree" && po.classType!="link_down">
+      <#elseif po.dictField?? && po.classType!="sel_tree" && po.classType!="cat_tree" && po.classType!="link_down">
           <#return "{type:'${po.fieldDbType}',value:'${po.fieldName}',text:'${po.filedComment}',dictCode:'${po.dictField}'}">
       <#elseif po.fieldDbType=="Text">
           <#return "{type:'string',value:'${po.fieldName}',text:'${po.filedComment}'}">

jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei

@@ -31,7 +31,7 @@
 <#list columns as po>
 <#if po.isShow =='Y' && po.fieldName != 'id'>
 <#assign form_field_dictCode="">
-	<#if po.dictTable?default("")?trim?length gt 1>
+	<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
 		<#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
 	<#elseif po.dictField?default("")?trim?length gt 1>
 		<#assign form_field_dictCode="${po.dictField}">
@@ -101,6 +101,24 @@
               <j-editor v-decorator="['${po.fieldName}',{trigger:'input'}]" <#if po.readonly=='Y'>disabled</#if>/>
     <#elseif po.fieldDbType=='Blob'>
               <a-input v-decorator="['${po.fieldName}String'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
+		<#elseif po.classType == 'sel_tree'>
+  	    <#assign form_tree_select = true>
+  	          <j-tree-select
+                ref="treeSelect"
+                placeholder="请选择${po.filedComment}"
+                v-decorator="['${po.fieldName}'${autoWriteRules(po)}]"
+                <#if po.dictText??>
+                <#if po.dictText?split(',')[2]?? && po.dictText?split(',')[0]??>
+                dict="${po.dictTable},${po.dictText?split(',')[2]},${po.dictText?split(',')[0]}"
+                <#elseif po.dictText?split(',')[1]??>
+                pidField="${po.dictText?split(',')[1]}"
+                <#elseif po.dictText?split(',')[3]??>
+                hasChildField="${po.dictText?split(',')[3]}"
+                </#if>
+                </#if>
+                pidValue="${po.dictField}"
+                <#if po.readonly=='Y'>disabled</#if>>
+              </j-tree-select>
 	<#else>
               <a-input v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if> ></a-input>
     </#if>

jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei

@@ -31,7 +31,7 @@
 <#list columns as po>
 <#if po.isShow =='Y' && po.fieldName != 'id'>
 <#assign form_field_dictCode="">
-	<#if po.dictTable?default("")?trim?length gt 1>
+	<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
 		<#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
 	<#elseif po.dictField?default("")?trim?length gt 1>
 		<#assign form_field_dictCode="${po.dictField}">
@@ -106,6 +106,24 @@
               <j-editor v-decorator="['${po.fieldName}',{trigger:'input'}]" <#if po.readonly=='Y'>disabled</#if>/>
     <#elseif po.fieldDbType=='Blob'>
               <a-input v-decorator="['${po.fieldName}String'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
+		<#elseif po.classType == 'sel_tree'>
+  	    <#assign form_tree_select = true>
+  	          <j-tree-select
+                ref="treeSelect"
+                placeholder="请选择${po.filedComment}"
+                v-decorator="['${po.fieldName}'${autoWriteRules(po)}]"
+                <#if po.dictText??>
+                <#if po.dictText?split(',')[2]?? && po.dictText?split(',')[0]??>
+                dict="${po.dictTable},${po.dictText?split(',')[2]},${po.dictText?split(',')[0]}"
+                <#elseif po.dictText?split(',')[1]??>
+                pidField="${po.dictText?split(',')[1]}"
+                <#elseif po.dictText?split(',')[3]??>
+                hasChildField="${po.dictText?split(',')[3]}"
+                </#if>
+                </#if>
+                pidValue="${po.dictField}"
+                <#if po.readonly=='Y'>disabled</#if>>
+              </j-tree-select>
 	<#else>
               <a-input v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
     </#if>

jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei

@@ -32,7 +32,7 @@
 <#list sub.colums as po>
 <#if po.isShow =='Y' && po.fieldName != 'id'>
 <#assign form_field_dictCode="">
-	<#if po.dictTable?default("")?trim?length gt 1>
+	<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
 		<#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
 	<#elseif po.dictField?default("")?trim?length gt 1>
 		<#assign form_field_dictCode="${po.dictField}">

jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei

@@ -182,6 +182,8 @@
         ref="table"
         size="middle"
         rowKey="id"
+        class="j-table-force-nowrap"
+        :scroll="{x:true}"
         :columns="columns"
         :dataSource="dataSource"
         :pagination="ipagination"
@@ -219,7 +221,7 @@
                 <a @click="handleAddChild(record)">添加下级</a>
               </a-menu-item>
               <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDeleteNode(record.id)">
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDeleteNode(record.id)" placement="topLeft">
                   <a>删除</a>
                 </a-popconfirm>
               </a-menu-item>

jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei

@@ -23,11 +23,17 @@
 <#assign form_tree_select = false>
 <#assign form_switch=false>
 <#assign pidFieldName = "">
-
+<#assign form_select_search = false>
+<#assign form_cat_tree = false>
+<#assign form_cat_back = "">
+<#assign form_pca = false>
+<#assign form_editor = false>
+<#assign form_md = false>
+<#assign form_sel_tree = false>
 <#list columns as po>
 <#if po.isShow =='Y'>
 <#assign form_field_dictCode="">
-	<#if po.dictTable?default("")?trim?length gt 1>
+	<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
 		<#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
 	<#elseif po.dictField?default("")?trim?length gt 1>
 		<#assign form_field_dictCode="${po.dictField}">
@@ -87,10 +93,51 @@
 	<#elseif po.classType=='image'>
 	    <#assign form_image = true>
           <j-image-upload isMultiple <#if po.uploadnum??>:number=${po.uploadnum}</#if> v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" <#if po.readonly=='Y'>disabled</#if>></j-image-upload>
+  <#elseif po.classType=='sel_search'>
+      <#assign form_select_search = true>
+          <j-search-select-tag v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" dict="${form_field_dictCode}" <#if po.readonly=='Y'>disabled</#if> />
+	<#elseif po.classType=='cat_tree'>
+      <#assign form_cat_tree = true>
+          <j-category-select v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" pcode="${po.dictField?default("")}" placeholder="请选择${po.filedComment}" <#if po.dictText?default("")?trim?length gt 1>back="${po.dictText}" @change="handleCategoryChange"</#if> <#if po.readonly=='Y'>disabled</#if>/>
+      <#if po.dictText?default("")?trim?length gt 1>
+      <#assign form_cat_back = "${po.dictText}">
+      </#if>
+  <#elseif po.classType =='pca'>
+      <#assign form_pca=true>
+          <j-area-linkage type="cascader" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入省市区" <#if po.readonly=='Y'>disabled</#if> />    
+	<#elseif po.classType=='umeditor'>
+      <#assign form_editor = true>
+          <j-editor v-decorator="['${po.fieldName}',{trigger:'input'}]" <#if po.readonly=='Y'>disabled</#if>/>
+  <#elseif po.classType =='markdown'>
+      <#assign form_md=true>
+          <j-markdown-editor v-decorator="['${po.fieldName}']" id="${po.fieldName}"></j-markdown-editor>    
+	<#elseif po.classType == 'sel_tree'>
+	    <#assign form_tree_select = true>
+	          <j-tree-select
+              ref="treeSelect"
+              placeholder="请选择${po.filedComment}"
+              v-decorator="['${po.fieldName}'${autoWriteRules(po)}]"
+              <#if po.dictText??>
+              <#if po.dictText?split(',')[2]?? && po.dictText?split(',')[0]??>
+              dict="${po.dictTable},${po.dictText?split(',')[2]},${po.dictText?split(',')[0]}"
+              <#elseif po.dictText?split(',')[1]??>
+              pidField="${po.dictText?split(',')[1]}"
+              <#elseif po.dictText?split(',')[3]??>
+              hasChildField="${po.dictText?split(',')[3]}"
+              </#if>
+              </#if>
+              pidValue="${po.dictField}"
+              <#if po.readonly=='Y'>disabled</#if>>
+            </j-tree-select>
 	<#else>
           <a-input v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
     </#if>
         </a-form-item>
+        <#if form_cat_tree && form_cat_back?length gt 1>
+        <a-form-item v-show="false">
+          <a-input v-decorator="['${form_cat_back}']"></a-input>
+        </a-form-item>
+        </#if>
 </#if>
 </#list>    
         
@@ -131,7 +178,21 @@
   <#if form_switch==true >
   import JSwitch from '@/components/jeecg/JSwitch'
   </#if>
-  
+  <#if form_select_search>
+  import JSearchSelectTag from '@/components/dict/JSearchSelectTag'
+  </#if>
+  <#if form_cat_tree>
+  import JCategorySelect from '@/components/jeecg/JCategorySelect'
+  </#if>
+  <#if form_pca>
+  import JAreaLinkage from '@comp/jeecg/JAreaLinkage'
+  </#if>
+  <#if form_editor>
+  import JEditor from '@/components/jeecg/JEditor'
+  </#if>
+  <#if form_md>
+  import JMarkdownEditor from '@/components/jeecg/JMarkdownEditor/index'
+  </#if>  
   export default {
     name: "${entityName}Modal",
     components: { 
@@ -160,7 +221,22 @@
       JSwitch,
     </#if>
     <#if form_tree_select>
-      JTreeSelect
+      JTreeSelect,
+  	</#if>
+    <#if form_select_search>
+      JSearchSelectTag,
+    </#if>
+    <#if form_cat_tree>
+      JCategorySelect,
+    </#if>
+    <#if form_pca>
+      JAreaLinkage,
+    </#if>
+    <#if form_editor>
+      JEditor,
+    </#if>
+    <#if form_md>
+      JMarkdownEditor,
     </#if>
     },
     data () {

jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei

@@ -31,7 +31,7 @@
 <#list columns as po>
 <#if po.isShow =='Y' && po.fieldName != 'id'>
 <#assign form_field_dictCode="">
-	<#if po.dictTable?default("")?trim?length gt 1>
+	<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
 		<#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
 	<#elseif po.dictField?default("")?trim?length gt 1>
 		<#assign form_field_dictCode="${po.dictField}">
@@ -101,6 +101,24 @@
               <j-editor v-decorator="['${po.fieldName}',{trigger:'input'}]" <#if po.readonly=='Y'>disabled</#if>/>
     <#elseif po.fieldDbType=='Blob'>
               <a-input v-decorator="['${po.fieldName}String'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
+    <#elseif po.classType == 'sel_tree'>
+        <#assign form_tree_select = true>
+              <j-tree-select
+                ref="treeSelect"
+                placeholder="请选择${po.filedComment}"
+                v-decorator="['${po.fieldName}'${autoWriteRules(po)}]"
+                <#if po.dictText??>
+                <#if po.dictText?split(',')[2]?? && po.dictText?split(',')[0]??>
+                dict="${po.dictTable},${po.dictText?split(',')[2]},${po.dictText?split(',')[0]}"
+                <#elseif po.dictText?split(',')[1]??>
+                pidField="${po.dictText?split(',')[1]}"
+                <#elseif po.dictText?split(',')[3]??>
+                hasChildField="${po.dictText?split(',')[3]}"
+                </#if>
+                </#if>
+                pidValue="${po.dictField}"
+                <#if po.readonly=='Y'>disabled</#if>>
+              </j-tree-select>
 	<#else>
               <a-input v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
     </#if>

jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Modal.vuei

@@ -33,7 +33,7 @@
 <#list sub.originalColumns as po>
 <#if po.isShow =='Y' && po.fieldName != 'id'>
 <#assign form_field_dictCode="">
-	<#if po.dictTable?default("")?trim?length gt 1>
+	<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
 		<#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
 	<#elseif po.dictField?default("")?trim?length gt 1>
 		<#assign form_field_dictCode="${po.dictField}">

jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei

@@ -32,7 +32,7 @@
 <#list columns as po>
 <#if po.isShow =='Y' && po.fieldName != 'id'>
 <#assign form_field_dictCode="">
-	<#if po.dictTable?default("")?trim?length gt 1>
+  <#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
 		<#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
 	<#elseif po.dictField?default("")?trim?length gt 1>
 		<#assign form_field_dictCode="${po.dictField}">
@@ -107,6 +107,24 @@
               <j-editor v-decorator="['${po.fieldName}',{trigger:'input'}]" <#if po.readonly=='Y'>disabled</#if>/>
     <#elseif po.fieldDbType=='Blob'>
               <a-input v-decorator="['${po.fieldName}String'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
+		<#elseif po.classType == 'sel_tree'>
+  	    <#assign form_tree_select = true>
+  	          <j-tree-select
+                ref="treeSelect"
+                placeholder="请选择${po.filedComment}"
+                v-decorator="['${po.fieldName}'${autoWriteRules(po)}]"
+                <#if po.dictText??>
+                <#if po.dictText?split(',')[2]?? && po.dictText?split(',')[0]??>
+                dict="${po.dictTable},${po.dictText?split(',')[2]},${po.dictText?split(',')[0]}"
+                <#elseif po.dictText?split(',')[1]??>
+                pidField="${po.dictText?split(',')[1]}"
+                <#elseif po.dictText?split(',')[3]??>
+                hasChildField="${po.dictText?split(',')[3]}"
+                </#if>
+                </#if>
+                pidValue="${po.dictField}"
+                <#if po.readonly=='Y'>disabled</#if>>
+              </j-tree-select>
 	<#else>
               <a-input v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
     </#if>

jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei

@@ -19,7 +19,7 @@
 <#list sub.colums as po>
 <#if po.isShow =='Y'>
 <#assign form_field_dictCode="">
-	<#if po.dictTable?default("")?trim?length gt 1>
+	<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
 		<#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
 	<#elseif po.dictField?default("")?trim?length gt 1>
 		<#assign form_field_dictCode="${po.dictField}">

jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei

@@ -31,7 +31,7 @@
 <#list columns as po>
 <#if po.isShow =='Y' && po.fieldName != 'id'>
 <#assign form_field_dictCode="">
-	<#if po.dictTable?default("")?trim?length gt 1>
+	<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
 		<#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
 	<#elseif po.dictField?default("")?trim?length gt 1>
 		<#assign form_field_dictCode="${po.dictField}">
@@ -106,6 +106,24 @@
               <j-editor v-decorator="['${po.fieldName}',{trigger:'input'}]" <#if po.readonly=='Y'>disabled</#if>/>
     <#elseif po.fieldDbType=='Blob'>
               <a-input v-decorator="['${po.fieldName}String'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
+		<#elseif po.classType == 'sel_tree'>
+  	    <#assign form_tree_select = true>
+  	          <j-tree-select
+                ref="treeSelect"
+                placeholder="请选择${po.filedComment}"
+                v-decorator="['${po.fieldName}'${autoWriteRules(po)}]"
+                <#if po.dictText??>
+                <#if po.dictText?split(',')[2]?? && po.dictText?split(',')[0]??>
+                dict="${po.dictTable},${po.dictText?split(',')[2]},${po.dictText?split(',')[0]}"
+                <#elseif po.dictText?split(',')[1]??>
+                pidField="${po.dictText?split(',')[1]}"
+                <#elseif po.dictText?split(',')[3]??>
+                hasChildField="${po.dictText?split(',')[3]}"
+                </#if>
+                </#if>
+                pidValue="${po.dictField}"
+                <#if po.readonly=='Y'>disabled</#if>>
+              </j-tree-select>
 	<#else>
               <a-input v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
     </#if>

jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei

@@ -32,7 +32,7 @@
 <#list sub.colums as po>
 <#if po.isShow =='Y' && po.fieldName != 'id'>
 <#assign form_field_dictCode="">
-	<#if po.dictTable?default("")?trim?length gt 1>
+	<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
 		<#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
 	<#elseif po.dictField?default("")?trim?length gt 1>
 		<#assign form_field_dictCode="${po.dictField}">

jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei

@@ -34,7 +34,7 @@
            <#list columns as po>
            <#if po.isShow =='Y' && po.fieldName != 'id'>
            <#assign form_field_dictCode="">
-           	<#if po.dictTable?default("")?trim?length gt 1>
+           	<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
            		<#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
            	<#elseif po.dictField?default("")?trim?length gt 1>
            		<#assign form_field_dictCode="${po.dictField}">
@@ -109,6 +109,24 @@
                          <j-editor v-decorator="['${po.fieldName}',{trigger:'input'}]" <#if po.readonly=='Y'>disabled</#if>/>
                <#elseif po.fieldDbType=='Blob'>
                          <a-input v-decorator="['${po.fieldName}String'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
+           	<#elseif po.classType == 'sel_tree'>
+           	    <#assign form_tree_select = true>
+           	          <j-tree-select
+                         ref="treeSelect"
+                         placeholder="请选择${po.filedComment}"
+                         v-decorator="['${po.fieldName}'${autoWriteRules(po)}]"
+                         <#if po.dictText??>
+                         <#if po.dictText?split(',')[2]?? && po.dictText?split(',')[0]??>
+                         dict="${po.dictTable},${po.dictText?split(',')[2]},${po.dictText?split(',')[0]}"
+                         <#elseif po.dictText?split(',')[1]??>
+                         pidField="${po.dictText?split(',')[1]}"
+                         <#elseif po.dictText?split(',')[3]??>
+                         hasChildField="${po.dictText?split(',')[3]}"
+                         </#if>
+                         </#if>
+                         pidValue="${po.dictField}"
+                         <#if po.readonly=='Y'>disabled</#if>>
+                       </j-tree-select>
            	<#else>
                          <a-input v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
                </#if>

jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-redis/src/main/java/org/jeecg/boot/starter/redis/config/RedisConfiguration.java

@@ -7,7 +7,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.jeecg.boot.starter.redis.prop.JeecgRedisProperties;
 import org.jeecg.boot.starter.redis.service.RedisReceiver;
 import org.jeecg.common.constant.GlobalConstants;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -41,7 +40,6 @@ public class RedisConfiguration {
      * @return
      */
     @Bean
-    @ConditionalOnMissingBean(RedisTemplate.class)
     public RedisTemplate<String, Object> redisTemplate(LettuceConnectionFactory lettuceConnectionFactory) {
         log.info(" --- redis config init --- ");
         // 设置序列化

jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/JeecgSystemCloudApplication.java

@@ -17,18 +17,22 @@ import org.springframework.core.env.Environment;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 
+/**
+ * 微服务启动类（采用此类启动项目为微服务模式）
+ *  注意： 需要先在naocs里面创建配置文件，参考文档 http://doc.jeecg.com/2043906
+ */
 @Slf4j
 @SpringBootApplication
 @EnableFeignClients(basePackages = {"org.jeecg"})
-public class JeecgSystemApplication extends SpringBootServletInitializer {
+public class JeecgSystemCloudApplication extends SpringBootServletInitializer {
 
     @Override
     protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
-        return application.sources(JeecgSystemApplication.class);
+        return application.sources(JeecgSystemCloudApplication.class);
     }
 
     public static void main(String[] args) throws UnknownHostException {
-        ConfigurableApplicationContext application = SpringApplication.run(JeecgSystemApplication.class, args);
+        ConfigurableApplicationContext application = SpringApplication.run(JeecgSystemCloudApplication.class, args);
         Environment env = application.getEnvironment();
         String ip = InetAddress.getLocalHost().getHostAddress();
         String port = env.getProperty("server.port");

jeecg-boot/pom.xml

@@ -36,7 +36,7 @@
 		<commons.version>2.6</commons.version>
 		<aliyun-java-sdk-dysmsapi.version>1.0.0</aliyun-java-sdk-dysmsapi.version>
 		<aliyun.oss.version>3.6.0</aliyun.oss.version>
-		<shiro.version>1.7.0</shiro.version>
+		<shiro.version>1.6.0</shiro.version>
 		<java-jwt.version>3.11.0</java-jwt.version>
 		<shiro-redis.version>3.1.0</shiro-redis.version>
 		<codegenerate.version>1.2.5</codegenerate.version>
@@ -45,6 +45,7 @@
 		<justauth-spring-boot-starter.version>1.3.2</justauth-spring-boot-starter.version>
 		<dom4j.version>1.6.1</dom4j.version>
 		<qiniu-java-sdk.version>7.2.23</qiniu-java-sdk.version>
+		<pinyin4j.version>2.5.1</pinyin4j.version>
 	</properties>
 
 	<modules>