hebao1234 发布系统代码 [ibz-dict，字典]

app_web/src/components/app-menu-item/app-menu-item.vue

@@ -13,7 +13,7 @@
                         <template v-else>
                             <i v-if="isFirst" class='fa fa-cogs app-menu-icon'></i>
                         </template>
-                        <span ref="circleText" :class="{'app-menu-circle' : appMenuCollapseFlag, 'text' : true}" :title="$t(`app.menus.${ctrlName}.${item.name}`)">{{$t(`app.menus.${ctrlName}.${item.name}`)}}</span>
+                        <span ref="circleText" :class="{'app-menu-circle' : appMenuCollapseFlag, 'text' : true}" :title="$t(`app.menus.${ctrlName}.${item.name.toLowerCase()}`)">{{$t(`app.menus.${ctrlName}.${item.name.toLowerCase()}`)}}</span>
                     </template>
                     <app-menu-item :isCollapse="isCollapse" :menus="item.items" :ctrlName="ctrlName" :isFirst="false" :counterdata="counterdata" :popper-class="popperClass"></app-menu-item>
                 </el-submenu>
@@ -23,18 +23,18 @@
                     <el-menu-item :class="[{'isFirst' : isFirst},item.textcls]" v-show="!item.hidden" :index="item.name" :key="item.id">
                         <template v-if="item.icon && item.icon != ''">
                             <img :src="item.icon" class='app-menu-icon' />
-                            <span v-if="(isFirst && isCollapse) ? true : false" ref="circleText" :class="{'app-menu-circle' : appMenuCollapseFlag, 'text' : true}" :title="$t(`app.menus.${ctrlName}.${item.name}`)">{{$t(`app.menus.${ctrlName}.${item.name}`)}}</span>
+                            <span v-if="(isFirst && isCollapse) ? true : false" ref="circleText" :class="{'app-menu-circle' : appMenuCollapseFlag, 'text' : true}" :title="$t(`app.menus.${ctrlName}.${item.name.toLowerCase()}`)">{{$t(`app.menus.${ctrlName}.${item.name.toLowerCase()}`)}}</span>
                         </template>
                         <template v-else-if="item.iconcls && item.iconcls != ''">
                             <i :class="[item.iconcls, 'app-menu-icon']"></i>
-                            <span v-if="(isFirst && isCollapse) ? true : false" ref="circleText" :class="{'app-menu-circle' : appMenuCollapseFlag, 'text' : true}" :title="$t(`app.menus.${ctrlName}.${item.name}`)">{{$t(`app.menus.${ctrlName}.${item.name}`)}}</span>
+                            <span v-if="(isFirst && isCollapse) ? true : false" ref="circleText" :class="{'app-menu-circle' : appMenuCollapseFlag, 'text' : true}" :title="$t(`app.menus.${ctrlName}.${item.name.toLowerCase()}`)">{{$t(`app.menus.${ctrlName}.${item.name.toLowerCase()}`)}}</span>
                         </template>
                         <template v-else>
                             <i v-if="isFirst" class='fa fa-cogs app-menu-icon'></i>
-                            <span v-if="(isFirst && isCollapse) ? true : false" ref="circleText" :class="{'app-menu-circle' : appMenuCollapseFlag, 'text' : true}" :title="$t(`app.menus.${ctrlName}.${item.name}`)">{{$t(`app.menus.${ctrlName}.${item.name}`)}}</span>
+                            <span v-if="(isFirst && isCollapse) ? true : false" ref="circleText" :class="{'app-menu-circle' : appMenuCollapseFlag, 'text' : true}" :title="$t(`app.menus.${ctrlName}.${item.name.toLowerCase()}`)">{{$t(`app.menus.${ctrlName}.${item.name.toLowerCase()}`)}}</span>
                         </template>
                         <template slot="title">
-                            <span :class="{'app-menu-circle' : appMenuCollapseFlag, 'text' : true}" :title="$t(`app.menus.${ctrlName}.${item.name}`)">{{$t(`app.menus.${ctrlName}.${item.name}`)}}</span>
+                            <span :class="{'app-menu-circle' : appMenuCollapseFlag, 'text' : true}" :title="$t(`app.menus.${ctrlName}.${item.name.toLowerCase()}`)">{{$t(`app.menus.${ctrlName}.${item.name.toLowerCase()}`)}}</span>
                             <template v-if="counterdata && counterdata[item.counterid] && counterdata[item.counterid] > 0">
                                 <span class="pull-right">
                                     <badge :count="counterdata[item.counterid]" :overflow-count="9999"></badge>

app_web/src/components/app-quick-menus/app-quick-menus.vue

@@ -8,7 +8,7 @@
             <img :src="item.iconcls" v-else-if="!Object.is(item.iconcls, '')" />
             <i class="fa fa-cogs" v-else></i>
           </span>
-          <span>{{$t(`app.menus.${ctrlName}.${item.name}`)}}</span>
+          <span>{{$t(`app.menus.${ctrlName}.${item.name.toLowerCase()}`)}}</span>
           <span class="line"></span>
         </p>
         <p style=" display: 'flex' ">
@@ -37,7 +37,7 @@
             <img :src="item.iconcls" v-else-if="!Object.is(item.iconcls, '')" />
             <i class="fa fa-cogs" v-else></i>
           </span>
-          <h4>{{$t(`app.menus.${ctrlName}.${item.name}`)}}</h4>
+          <h4>{{$t(`app.menus.${ctrlName}.${item.name.toLowerCase()}`)}}</h4>
         </div>
       </card>
     </template>

app_web/src/locale/lang/BO-CN-base.ts

@@ -31,6 +31,8 @@ function getAppLocale(){
                 nomore:"དེ་ལས་མང་བ་མི་འདུག",
                 other:"གཞན་དག",
                 valueNotEmpty:"སྟོང་མི་ཆོག",
+                createFailed:"གསར་འཛུགས་ཕམ་པ།",
+                isExist:"གནས་པ་",
             },
             local:{
                 new: "གསར་འཛུགས།",

app_web/src/locale/lang/en-US-base.ts

@@ -31,6 +31,8 @@ function getAppLocale(){
                 nomore:"No more",
                 other:"other",
                 valueNotEmpty:"The value cannot be null",
+                createFailed:"Create Failed",
+                isExist:"Exist",
             },
             local:{
                 new: "New",

app_web/src/locale/lang/zh-CN-base.ts

@@ -31,6 +31,8 @@ function getAppLocale(){
                 nomore:"没有更多了",
                 other:"其他",
                 valueNotEmpty:"值不能为空",
+                createFailed:"创建失败",
+                isExist:"已存在",
             },
             local:{
                 new: "新建",

app_web/src/mock/entity/dict-catalogs/dict-catalogs.ts

@@ -86,17 +86,17 @@ mock.onDelete(new RegExp(/^\/dictcatalogs\/batch$/)).reply((config: any) => {
     return [status, {}];
 });
 
-
-// Select
-mock.onGet(new RegExp(/^\/dictcatalogs\/([a-zA-Z0-9\-\;]{1,35})\/select$/)).reply((config: any) => {
-    console.groupCollapsed("实体:dictcatalog 方法: Select");
+        
+// CheckKey
+mock.onPost(new RegExp(/^\/dictcatalogs\/?([a-zA-Z0-9\-\;]{0,35})\/checkkey$/)).reply((config: any) => {
+    console.groupCollapsed("实体:dictcatalog 方法: CheckKey");
     console.table({url:config.url, method: config.method, data:config.data});
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
         return [status, null];
     }    
     const paramArray:Array<any> = ['id'];
-    const matchArray:any = new RegExp(/^\/dictcatalogs\/([a-zA-Z0-9\-\;]{1,35})\/select$/).exec(config.url);
+    const matchArray:any = new RegExp(/^\/dictcatalogs\/([a-zA-Z0-9\-\;]{1,35})\/checkkey$/).exec(config.url);
     let tempValue: any = {};
     if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
         paramArray.forEach((item: any, index: number) => {
@@ -106,13 +106,23 @@ mock.onGet(new RegExp(/^\/dictcatalogs\/([a-zA-Z0-9\-\;]{1,35})\/select$/)).repl
             });
         });
     }
-    let items = mockDatas ? mockDatas : [];
-    let _items = items.find((item: any) => Object.is(item.id, tempValue.id));
+    //let items = mockDatas ? mockDatas : [];
+    //let _items = items.find((item: any) => Object.is(item.id, tempValue.id));
+      let data = JSON.parse(config.data);
+    mockDatas.forEach((item)=>{
+        if(item['id'] == tempValue['id'] ){
+            for(let value in data){
+              if(item.hasOwnProperty(value)){
+                  item[value] = data[value];
+              }
+            }
+        }
+    })
     console.groupCollapsed("response数据  status: "+status+" data: ");
-    console.table(_items);
+    console.table(data);
     console.groupEnd();
     console.groupEnd();
-    return [status, _items];
+    return [status, data];
 });
         
 // Create
@@ -140,44 +150,6 @@ mock.onPost(new RegExp(/^\/dictcatalogs\/?([a-zA-Z0-9\-\;]{0,35})$/)).reply((con
     console.groupEnd();
     return [status, mockDatas[0]];
 });
-        
-// Update
-mock.onPut(new RegExp(/^\/dictcatalogs\/?([a-zA-Z0-9\-\;]{0,35})$/)).reply((config: any) => {
-    console.groupCollapsed("实体:dictcatalog 方法: Update");
-    console.table({url:config.url, method: config.method, data:config.data});
-    let status = MockAdapter.mockStatus(config);
-    if (status !== 200) {
-        return [status, null];
-    }    
-    const paramArray:Array<any> = ['id'];
-    const matchArray:any = new RegExp(/^\/dictcatalogs\/([a-zA-Z0-9\-\;]{1,35})$/).exec(config.url);
-    let tempValue: any = {};
-    if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
-        paramArray.forEach((item: any, index: number) => {
-            Object.defineProperty(tempValue, item, {
-                enumerable: true,
-                value: matchArray[index + 1]
-            });
-        });
-    }
-    //let items = mockDatas ? mockDatas : [];
-    //let _items = items.find((item: any) => Object.is(item.id, tempValue.id));
-      let data = JSON.parse(config.data);
-    mockDatas.forEach((item)=>{
-        if(item['id'] == tempValue['id'] ){
-            for(let value in data){
-              if(item.hasOwnProperty(value)){
-                  item[value] = data[value];
-              }
-            }
-        }
-    })
-    console.groupCollapsed("response数据  status: "+status+" data: ");
-    console.table(data);
-    console.groupEnd();
-    console.groupEnd();
-    return [status, data];
-});
 
 // GetDraft
 mock.onGet(new RegExp(/^\/dictcatalogs\/getdraft$/)).reply((config: any) => {
@@ -195,16 +167,16 @@ mock.onGet(new RegExp(/^\/dictcatalogs\/getdraft$/)).reply((config: any) => {
     return [status, {}];
 });
         
-// CheckKey
-mock.onPost(new RegExp(/^\/dictcatalogs\/?([a-zA-Z0-9\-\;]{0,35})\/checkkey$/)).reply((config: any) => {
-    console.groupCollapsed("实体:dictcatalog 方法: CheckKey");
+// Save
+mock.onPost(new RegExp(/^\/dictcatalogs\/?([a-zA-Z0-9\-\;]{0,35})\/save$/)).reply((config: any) => {
+    console.groupCollapsed("实体:dictcatalog 方法: Save");
     console.table({url:config.url, method: config.method, data:config.data});
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
         return [status, null];
     }    
     const paramArray:Array<any> = ['id'];
-    const matchArray:any = new RegExp(/^\/dictcatalogs\/([a-zA-Z0-9\-\;]{1,35})\/checkkey$/).exec(config.url);
+    const matchArray:any = new RegExp(/^\/dictcatalogs\/([a-zA-Z0-9\-\;]{1,35})\/save$/).exec(config.url);
     let tempValue: any = {};
     if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
         paramArray.forEach((item: any, index: number) => {
@@ -233,16 +205,16 @@ mock.onPost(new RegExp(/^\/dictcatalogs\/?([a-zA-Z0-9\-\;]{0,35})\/checkkey$/)).
     return [status, data];
 });
         
-// Save
-mock.onPost(new RegExp(/^\/dictcatalogs\/?([a-zA-Z0-9\-\;]{0,35})\/save$/)).reply((config: any) => {
-    console.groupCollapsed("实体:dictcatalog 方法: Save");
+// Update
+mock.onPut(new RegExp(/^\/dictcatalogs\/?([a-zA-Z0-9\-\;]{0,35})$/)).reply((config: any) => {
+    console.groupCollapsed("实体:dictcatalog 方法: Update");
     console.table({url:config.url, method: config.method, data:config.data});
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
         return [status, null];
     }    
     const paramArray:Array<any> = ['id'];
-    const matchArray:any = new RegExp(/^\/dictcatalogs\/([a-zA-Z0-9\-\;]{1,35})\/save$/).exec(config.url);
+    const matchArray:any = new RegExp(/^\/dictcatalogs\/([a-zA-Z0-9\-\;]{1,35})$/).exec(config.url);
     let tempValue: any = {};
     if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
         paramArray.forEach((item: any, index: number) => {
@@ -322,10 +294,38 @@ mock.onGet(new RegExp(/^\/dictcatalogs\/fetchdefault(\?[\w-./?%&=,]*)*$/)).reply
 // URI参数传递情况未实现
 // URI参数传递情况未实现
 
+// Select
+mock.onGet(new RegExp(/^\/dictcatalogs\/([a-zA-Z0-9\-\;]{1,35})\/select$/)).reply((config: any) => {
+    console.groupCollapsed("实体:dictcatalog 方法: Select");
+    console.table({url:config.url, method: config.method, data:config.data});
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }    
+    const paramArray:Array<any> = ['id'];
+    const matchArray:any = new RegExp(/^\/dictcatalogs\/([a-zA-Z0-9\-\;]{1,35})\/select$/).exec(config.url);
+    let tempValue: any = {};
+    if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
+        paramArray.forEach((item: any, index: number) => {
+            Object.defineProperty(tempValue, item, {
+                enumerable: true,
+                value: matchArray[index + 1]
+            });
+        });
+    }
+    let items = mockDatas ? mockDatas : [];
+    let _items = items.find((item: any) => Object.is(item.id, tempValue.id));
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table(_items);
+    console.groupEnd();
+    console.groupEnd();
+    return [status, _items];
+});
 
-// Remove
-mock.onDelete(new RegExp(/^\/dictcatalogs\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
-    console.groupCollapsed("实体:dictcatalog 方法: Remove");
+
+// Get
+mock.onGet(new RegExp(/^\/dictcatalogs\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
+    console.groupCollapsed("实体:dictcatalog 方法: Get");
     console.table({url:config.url, method: config.method, data:config.data});
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
@@ -351,9 +351,9 @@ mock.onDelete(new RegExp(/^\/dictcatalogs\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((co
     return [status, _items?_items:{}];
 });
 
-// Get
-mock.onGet(new RegExp(/^\/dictcatalogs\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
-    console.groupCollapsed("实体:dictcatalog 方法: Get");
+// Remove
+mock.onDelete(new RegExp(/^\/dictcatalogs\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
+    console.groupCollapsed("实体:dictcatalog 方法: Remove");
     console.table({url:config.url, method: config.method, data:config.data});
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {

app_web/src/mock/entity/dict-options/dict-options.ts

@@ -87,17 +87,17 @@ mock.onDelete(new RegExp(/^\/dictoptions\/batch$/)).reply((config: any) => {
 });
 
 
-
-// Select
-mock.onGet(new RegExp(/^\/dictcatalogs\/([a-zA-Z0-9\-\;]{1,35})\/dictoptions\/([a-zA-Z0-9\-\;]{1,35})\/select$/)).reply((config: any) => {
-    console.groupCollapsed("实体:dictoption 方法: Select");
+    
+// CheckKey
+mock.onPost(new RegExp(/^\/dictcatalogs\/([a-zA-Z0-9\-\;]{1,35})\/dictoptions\/([a-zA-Z0-9\-\;]{1,35})\/checkkey$/)).reply((config: any) => {
+    console.groupCollapsed("实体:dictoption 方法: CheckKey");
     console.table({url:config.url, method: config.method, data:config.data});
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
         return [status, null];
     }
     const paramArray:Array<any> = ['id','value_key'];
-    const matchArray:any = new RegExp(/^\/dictcatalogs\/([a-zA-Z0-9\-\;]{1,35})\/dictoptions\/([a-zA-Z0-9\-\;]{1,35})\/select$/).exec(config.url);
+    const matchArray:any = new RegExp(/^\/dictcatalogs\/([a-zA-Z0-9\-\;]{1,35})\/dictoptions\/([a-zA-Z0-9\-\;]{1,35})\/checkkey$/).exec(config.url);
     let tempValue: any = {};
     if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
         paramArray.forEach((item: any, index: number) => {
@@ -107,25 +107,23 @@ mock.onGet(new RegExp(/^\/dictcatalogs\/([a-zA-Z0-9\-\;]{1,35})\/dictoptions\/([
             });
         });
     }
-    let items = mockDatas ? mockDatas : [];
-    let _items = items.find((item: any) => Object.is(item.value_key, tempValue.value_key));
     console.groupCollapsed("response数据  status: "+status+" data: ");
-    console.table(_items);
+    console.table({});
     console.groupEnd();
     console.groupEnd();
-    return [status, _items];
+    return [status, {}];
 });
-
-// Select
-mock.onGet(new RegExp(/^\/dictoptions\/([a-zA-Z0-9\-\;]{1,35})\/select$/)).reply((config: any) => {
-    console.groupCollapsed("实体:dictoption 方法: Select");
+        
+// CheckKey
+mock.onPost(new RegExp(/^\/dictoptions\/?([a-zA-Z0-9\-\;]{0,35})\/checkkey$/)).reply((config: any) => {
+    console.groupCollapsed("实体:dictoption 方法: CheckKey");
     console.table({url:config.url, method: config.method, data:config.data});
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
         return [status, null];
     }    
     const paramArray:Array<any> = ['value_key'];
-    const matchArray:any = new RegExp(/^\/dictoptions\/([a-zA-Z0-9\-\;]{1,35})\/select$/).exec(config.url);
+    const matchArray:any = new RegExp(/^\/dictoptions\/([a-zA-Z0-9\-\;]{1,35})\/checkkey$/).exec(config.url);
     let tempValue: any = {};
     if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
         paramArray.forEach((item: any, index: number) => {
@@ -135,13 +133,23 @@ mock.onGet(new RegExp(/^\/dictoptions\/([a-zA-Z0-9\-\;]{1,35})\/select$/)).reply
             });
         });
     }
-    let items = mockDatas ? mockDatas : [];
-    let _items = items.find((item: any) => Object.is(item.value_key, tempValue.value_key));
+    //let items = mockDatas ? mockDatas : [];
+    //let _items = items.find((item: any) => Object.is(item.value_key, tempValue.value_key));
+      let data = JSON.parse(config.data);
+    mockDatas.forEach((item)=>{
+        if(item['value_key'] == tempValue['value_key'] ){
+            for(let value in data){
+              if(item.hasOwnProperty(value)){
+                  item[value] = data[value];
+              }
+            }
+        }
+    })
     console.groupCollapsed("response数据  status: "+status+" data: ");
-    console.table(_items);
+    console.table(data);
     console.groupEnd();
     console.groupEnd();
-    return [status, _items];
+    return [status, data];
 });
 
     
@@ -197,72 +205,6 @@ mock.onPost(new RegExp(/^\/dictoptions\/?([a-zA-Z0-9\-\;]{0,35})$/)).reply((conf
     return [status, mockDatas[0]];
 });
 
-    
-// Update
-mock.onPut(new RegExp(/^\/dictcatalogs\/([a-zA-Z0-9\-\;]{1,35})\/dictoptions\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
-    console.groupCollapsed("实体:dictoption 方法: Update");
-    console.table({url:config.url, method: config.method, data:config.data});
-    let status = MockAdapter.mockStatus(config);
-    if (status !== 200) {
-        return [status, null];
-    }
-    const paramArray:Array<any> = ['id','value_key'];
-    const matchArray:any = new RegExp(/^\/dictcatalogs\/([a-zA-Z0-9\-\;]{1,35})\/dictoptions\/([a-zA-Z0-9\-\;]{1,35})$/).exec(config.url);
-    let tempValue: any = {};
-    if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
-        paramArray.forEach((item: any, index: number) => {
-            Object.defineProperty(tempValue, item, {
-                enumerable: true,
-                value: matchArray[index + 1]
-            });
-        });
-    }
-    console.groupCollapsed("response数据  status: "+status+" data: ");
-    console.table({});
-    console.groupEnd();
-    console.groupEnd();
-    return [status, {}];
-});
-        
-// Update
-mock.onPut(new RegExp(/^\/dictoptions\/?([a-zA-Z0-9\-\;]{0,35})$/)).reply((config: any) => {
-    console.groupCollapsed("实体:dictoption 方法: Update");
-    console.table({url:config.url, method: config.method, data:config.data});
-    let status = MockAdapter.mockStatus(config);
-    if (status !== 200) {
-        return [status, null];
-    }    
-    const paramArray:Array<any> = ['value_key'];
-    const matchArray:any = new RegExp(/^\/dictoptions\/([a-zA-Z0-9\-\;]{1,35})$/).exec(config.url);
-    let tempValue: any = {};
-    if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
-        paramArray.forEach((item: any, index: number) => {
-            Object.defineProperty(tempValue, item, {
-                enumerable: true,
-                value: matchArray[index + 1]
-            });
-        });
-    }
-    //let items = mockDatas ? mockDatas : [];
-    //let _items = items.find((item: any) => Object.is(item.value_key, tempValue.value_key));
-      let data = JSON.parse(config.data);
-    mockDatas.forEach((item)=>{
-        if(item['value_key'] == tempValue['value_key'] ){
-            for(let value in data){
-              if(item.hasOwnProperty(value)){
-                  item[value] = data[value];
-              }
-            }
-        }
-    })
-    console.groupCollapsed("response数据  status: "+status+" data: ");
-    console.table(data);
-    console.groupEnd();
-    console.groupEnd();
-    return [status, data];
-});
-
-
 
 
 // GetDraft
@@ -297,17 +239,18 @@ mock.onGet(new RegExp(/^\/dictoptions\/getdraft$/)).reply((config: any) => {
     return [status, {}];
 });
 
+
     
-// CheckKey
-mock.onPost(new RegExp(/^\/dictcatalogs\/([a-zA-Z0-9\-\;]{1,35})\/dictoptions\/([a-zA-Z0-9\-\;]{1,35})\/checkkey$/)).reply((config: any) => {
-    console.groupCollapsed("实体:dictoption 方法: CheckKey");
+// Save
+mock.onPost(new RegExp(/^\/dictcatalogs\/([a-zA-Z0-9\-\;]{1,35})\/dictoptions\/([a-zA-Z0-9\-\;]{1,35})\/save$/)).reply((config: any) => {
+    console.groupCollapsed("实体:dictoption 方法: Save");
     console.table({url:config.url, method: config.method, data:config.data});
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
         return [status, null];
     }
     const paramArray:Array<any> = ['id','value_key'];
-    const matchArray:any = new RegExp(/^\/dictcatalogs\/([a-zA-Z0-9\-\;]{1,35})\/dictoptions\/([a-zA-Z0-9\-\;]{1,35})\/checkkey$/).exec(config.url);
+    const matchArray:any = new RegExp(/^\/dictcatalogs\/([a-zA-Z0-9\-\;]{1,35})\/dictoptions\/([a-zA-Z0-9\-\;]{1,35})\/save$/).exec(config.url);
     let tempValue: any = {};
     if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
         paramArray.forEach((item: any, index: number) => {
@@ -324,16 +267,16 @@ mock.onPost(new RegExp(/^\/dictcatalogs\/([a-zA-Z0-9\-\;]{1,35})\/dictoptions\/(
     return [status, {}];
 });
         
-// CheckKey
-mock.onPost(new RegExp(/^\/dictoptions\/?([a-zA-Z0-9\-\;]{0,35})\/checkkey$/)).reply((config: any) => {
-    console.groupCollapsed("实体:dictoption 方法: CheckKey");
+// Save
+mock.onPost(new RegExp(/^\/dictoptions\/?([a-zA-Z0-9\-\;]{0,35})\/save$/)).reply((config: any) => {
+    console.groupCollapsed("实体:dictoption 方法: Save");
     console.table({url:config.url, method: config.method, data:config.data});
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
         return [status, null];
     }    
     const paramArray:Array<any> = ['value_key'];
-    const matchArray:any = new RegExp(/^\/dictoptions\/([a-zA-Z0-9\-\;]{1,35})\/checkkey$/).exec(config.url);
+    const matchArray:any = new RegExp(/^\/dictoptions\/([a-zA-Z0-9\-\;]{1,35})\/save$/).exec(config.url);
     let tempValue: any = {};
     if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
         paramArray.forEach((item: any, index: number) => {
@@ -363,16 +306,16 @@ mock.onPost(new RegExp(/^\/dictoptions\/?([a-zA-Z0-9\-\;]{0,35})\/checkkey$/)).r
 });
 
     
-// Save
-mock.onPost(new RegExp(/^\/dictcatalogs\/([a-zA-Z0-9\-\;]{1,35})\/dictoptions\/([a-zA-Z0-9\-\;]{1,35})\/save$/)).reply((config: any) => {
-    console.groupCollapsed("实体:dictoption 方法: Save");
+// Update
+mock.onPut(new RegExp(/^\/dictcatalogs\/([a-zA-Z0-9\-\;]{1,35})\/dictoptions\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
+    console.groupCollapsed("实体:dictoption 方法: Update");
     console.table({url:config.url, method: config.method, data:config.data});
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
         return [status, null];
     }
     const paramArray:Array<any> = ['id','value_key'];
-    const matchArray:any = new RegExp(/^\/dictcatalogs\/([a-zA-Z0-9\-\;]{1,35})\/dictoptions\/([a-zA-Z0-9\-\;]{1,35})\/save$/).exec(config.url);
+    const matchArray:any = new RegExp(/^\/dictcatalogs\/([a-zA-Z0-9\-\;]{1,35})\/dictoptions\/([a-zA-Z0-9\-\;]{1,35})$/).exec(config.url);
     let tempValue: any = {};
     if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
         paramArray.forEach((item: any, index: number) => {
@@ -389,16 +332,16 @@ mock.onPost(new RegExp(/^\/dictcatalogs\/([a-zA-Z0-9\-\;]{1,35})\/dictoptions\/(
     return [status, {}];
 });
         
-// Save
-mock.onPost(new RegExp(/^\/dictoptions\/?([a-zA-Z0-9\-\;]{0,35})\/save$/)).reply((config: any) => {
-    console.groupCollapsed("实体:dictoption 方法: Save");
+// Update
+mock.onPut(new RegExp(/^\/dictoptions\/?([a-zA-Z0-9\-\;]{0,35})$/)).reply((config: any) => {
+    console.groupCollapsed("实体:dictoption 方法: Update");
     console.table({url:config.url, method: config.method, data:config.data});
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
         return [status, null];
     }    
     const paramArray:Array<any> = ['value_key'];
-    const matchArray:any = new RegExp(/^\/dictoptions\/([a-zA-Z0-9\-\;]{1,35})\/save$/).exec(config.url);
+    const matchArray:any = new RegExp(/^\/dictoptions\/([a-zA-Z0-9\-\;]{1,35})$/).exec(config.url);
     let tempValue: any = {};
     if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
         paramArray.forEach((item: any, index: number) => {
@@ -538,9 +481,66 @@ mock.onGet(new RegExp(/^\/dictoptions\/fetchdefault(\?[\w-./?%&=,]*)*$/)).reply(
 // URI参数传递情况未实现
 
 
-// Remove
-mock.onDelete(new RegExp(/^\/dictcatalogs\/([a-zA-Z0-9\-\;]{1,35})\/dictoptions\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
-    console.groupCollapsed("实体:dictoption 方法: Remove");
+// Select
+mock.onGet(new RegExp(/^\/dictcatalogs\/([a-zA-Z0-9\-\;]{1,35})\/dictoptions\/([a-zA-Z0-9\-\;]{1,35})\/select$/)).reply((config: any) => {
+    console.groupCollapsed("实体:dictoption 方法: Select");
+    console.table({url:config.url, method: config.method, data:config.data});
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }
+    const paramArray:Array<any> = ['id','value_key'];
+    const matchArray:any = new RegExp(/^\/dictcatalogs\/([a-zA-Z0-9\-\;]{1,35})\/dictoptions\/([a-zA-Z0-9\-\;]{1,35})\/select$/).exec(config.url);
+    let tempValue: any = {};
+    if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
+        paramArray.forEach((item: any, index: number) => {
+            Object.defineProperty(tempValue, item, {
+                enumerable: true,
+                value: matchArray[index + 1]
+            });
+        });
+    }
+    let items = mockDatas ? mockDatas : [];
+    let _items = items.find((item: any) => Object.is(item.value_key, tempValue.value_key));
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table(_items);
+    console.groupEnd();
+    console.groupEnd();
+    return [status, _items];
+});
+
+// Select
+mock.onGet(new RegExp(/^\/dictoptions\/([a-zA-Z0-9\-\;]{1,35})\/select$/)).reply((config: any) => {
+    console.groupCollapsed("实体:dictoption 方法: Select");
+    console.table({url:config.url, method: config.method, data:config.data});
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }    
+    const paramArray:Array<any> = ['value_key'];
+    const matchArray:any = new RegExp(/^\/dictoptions\/([a-zA-Z0-9\-\;]{1,35})\/select$/).exec(config.url);
+    let tempValue: any = {};
+    if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
+        paramArray.forEach((item: any, index: number) => {
+            Object.defineProperty(tempValue, item, {
+                enumerable: true,
+                value: matchArray[index + 1]
+            });
+        });
+    }
+    let items = mockDatas ? mockDatas : [];
+    let _items = items.find((item: any) => Object.is(item.value_key, tempValue.value_key));
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table(_items);
+    console.groupEnd();
+    console.groupEnd();
+    return [status, _items];
+});
+
+
+// Get
+mock.onGet(new RegExp(/^\/dictcatalogs\/([a-zA-Z0-9\-\;]{1,35})\/dictoptions\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
+    console.groupCollapsed("实体:dictoption 方法: Get");
     console.table({url:config.url, method: config.method, data:config.data});
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
@@ -566,9 +566,9 @@ mock.onDelete(new RegExp(/^\/dictcatalogs\/([a-zA-Z0-9\-\;]{1,35})\/dictoptions\
     return [status, _items?_items:{}];
 });
 
-// Remove
-mock.onDelete(new RegExp(/^\/dictoptions\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
-    console.groupCollapsed("实体:dictoption 方法: Remove");
+// Get
+mock.onGet(new RegExp(/^\/dictoptions\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
+    console.groupCollapsed("实体:dictoption 方法: Get");
     console.table({url:config.url, method: config.method, data:config.data});
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
@@ -594,9 +594,9 @@ mock.onDelete(new RegExp(/^\/dictoptions\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((con
     return [status, _items?_items:{}];
 });
 
-// Get
-mock.onGet(new RegExp(/^\/dictcatalogs\/([a-zA-Z0-9\-\;]{1,35})\/dictoptions\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
-    console.groupCollapsed("实体:dictoption 方法: Get");
+// Remove
+mock.onDelete(new RegExp(/^\/dictcatalogs\/([a-zA-Z0-9\-\;]{1,35})\/dictoptions\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
+    console.groupCollapsed("实体:dictoption 方法: Remove");
     console.table({url:config.url, method: config.method, data:config.data});
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
@@ -622,9 +622,9 @@ mock.onGet(new RegExp(/^\/dictcatalogs\/([a-zA-Z0-9\-\;]{1,35})\/dictoptions\/([
     return [status, _items?_items:{}];
 });
 
-// Get
-mock.onGet(new RegExp(/^\/dictoptions\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
-    console.groupCollapsed("实体:dictoption 方法: Get");
+// Remove
+mock.onDelete(new RegExp(/^\/dictoptions\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
+    console.groupCollapsed("实体:dictoption 方法: Remove");
     console.table({url:config.url, method: config.method, data:config.data});
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {

app_web/src/service/dict-catalog/dict-catalog-service-base.ts

@@ -39,7 +39,7 @@ export default class DictCatalogServiceBase extends EntityService {
 // 实体接口
 
     /**
-     * Select接口方法
+     * CheckKey接口方法
      *
      * @param {*} [context={}]
      * @param {*} [data={}]
@@ -47,9 +47,8 @@ export default class DictCatalogServiceBase extends EntityService {
      * @returns {Promise<any>}
      * @memberof DictCatalogServiceBase
      */
-    public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            let res:any = Http.getInstance().get(`/dictcatalogs/${context.dictcatalog}/select`,isloading);
-            
+    public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+            let res:any = Http.getInstance().post(`/dictcatalogs/${context.dictcatalog}/checkkey`,data,isloading);
             return res;
     }
 
@@ -78,37 +77,6 @@ export default class DictCatalogServiceBase extends EntityService {
         return res;
     }
 
-    /**
-     * Update接口方法
-     *
-     * @param {*} [context={}]
-     * @param {*} [data={}]
-     * @param {boolean} [isloading]
-     * @returns {Promise<any>}
-     * @memberof DictCatalogServiceBase
-     */
-    public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        let masterData:any = {};
-        Object.assign(data,masterData);
-            let res:any = await  Http.getInstance().put(`/dictcatalogs/${context.dictcatalog}`,data,isloading);
-            
-            return res;
-    }
-
-    /**
-     * Remove接口方法
-     *
-     * @param {*} [context={}]
-     * @param {*} [data={}]
-     * @param {boolean} [isloading]
-     * @returns {Promise<any>}
-     * @memberof DictCatalogServiceBase
-     */
-    public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            let res:any = Http.getInstance().delete(`/dictcatalogs/${context.dictcatalog}`,isloading);
-            return res;
-    }
-
     /**
      * Get接口方法
      *
@@ -141,7 +109,7 @@ export default class DictCatalogServiceBase extends EntityService {
     }
 
     /**
-     * CheckKey接口方法
+     * Remove接口方法
      *
      * @param {*} [context={}]
      * @param {*} [data={}]
@@ -149,8 +117,8 @@ export default class DictCatalogServiceBase extends EntityService {
      * @returns {Promise<any>}
      * @memberof DictCatalogServiceBase
      */
-    public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            let res:any = Http.getInstance().post(`/dictcatalogs/${context.dictcatalog}/checkkey`,data,isloading);
+    public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+            let res:any = Http.getInstance().delete(`/dictcatalogs/${context.dictcatalog}`,isloading);
             return res;
     }
 
@@ -171,6 +139,23 @@ export default class DictCatalogServiceBase extends EntityService {
             return res;
     }
 
+    /**
+     * Update接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof DictCatalogServiceBase
+     */
+    public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let masterData:any = {};
+        Object.assign(data,masterData);
+            let res:any = await  Http.getInstance().put(`/dictcatalogs/${context.dictcatalog}`,data,isloading);
+            
+            return res;
+    }
+
     /**
      * FetchDefault接口方法
      *
@@ -199,4 +184,19 @@ export default class DictCatalogServiceBase extends EntityService {
         let tempData:any = JSON.parse(JSON.stringify(data));
         return await Http.getInstance().post(`/dictcatalogs/searchdefault`,tempData,isloading);
     }
+
+    /**
+     * Select接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof DictCatalogServiceBase
+     */
+    public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+            let res:any = Http.getInstance().get(`/dictcatalogs/${context.dictcatalog}/select`,isloading);
+            
+            return res;
+    }
 }
\ No newline at end of file

app_web/src/service/dict-option/dict-option-service-base.ts

@@ -39,7 +39,7 @@ export default class DictOptionServiceBase extends EntityService {
 // 实体接口
 
     /**
-     * Select接口方法
+     * CheckKey接口方法
      *
      * @param {*} [context={}]
      * @param {*} [data={}]
@@ -47,14 +47,15 @@ export default class DictOptionServiceBase extends EntityService {
      * @returns {Promise<any>}
      * @memberof DictOptionServiceBase
      */
-    public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+    public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.dictcatalog && context.dictoption){
-            let res:any = Http.getInstance().get(`/dictcatalogs/${context.dictcatalog}/dictoptions/${context.dictoption}/select`,isloading);
+            let masterData:any = {};
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/dictcatalogs/${context.dictcatalog}/dictoptions/${context.dictoption}/checkkey`,data,isloading);
             
             return res;
         }
-            let res:any = Http.getInstance().get(`/dictoptions/${context.dictoption}/select`,isloading);
-            
+            let res:any = Http.getInstance().post(`/dictoptions/${context.dictoption}/checkkey`,data,isloading);
             return res;
     }
 
@@ -96,48 +97,6 @@ export default class DictOptionServiceBase extends EntityService {
         return res;
     }
 
-    /**
-     * Update接口方法
-     *
-     * @param {*} [context={}]
-     * @param {*} [data={}]
-     * @param {boolean} [isloading]
-     * @returns {Promise<any>}
-     * @memberof DictOptionServiceBase
-     */
-    public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        if(context.dictcatalog && context.dictoption){
-            let masterData:any = {};
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().put(`/dictcatalogs/${context.dictcatalog}/dictoptions/${context.dictoption}`,data,isloading);
-            
-            return res;
-        }
-        let masterData:any = {};
-        Object.assign(data,masterData);
-            let res:any = await  Http.getInstance().put(`/dictoptions/${context.dictoption}`,data,isloading);
-            
-            return res;
-    }
-
-    /**
-     * Remove接口方法
-     *
-     * @param {*} [context={}]
-     * @param {*} [data={}]
-     * @param {boolean} [isloading]
-     * @returns {Promise<any>}
-     * @memberof DictOptionServiceBase
-     */
-    public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        if(context.dictcatalog && context.dictoption){
-            let res:any = Http.getInstance().delete(`/dictcatalogs/${context.dictcatalog}/dictoptions/${context.dictoption}`,isloading);
-            return res;
-        }
-            let res:any = Http.getInstance().delete(`/dictoptions/${context.dictoption}`,isloading);
-            return res;
-    }
-
     /**
      * Get接口方法
      *
@@ -181,7 +140,7 @@ export default class DictOptionServiceBase extends EntityService {
     }
 
     /**
-     * CheckKey接口方法
+     * Remove接口方法
      *
      * @param {*} [context={}]
      * @param {*} [data={}]
@@ -189,15 +148,12 @@ export default class DictOptionServiceBase extends EntityService {
      * @returns {Promise<any>}
      * @memberof DictOptionServiceBase
      */
-    public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+    public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.dictcatalog && context.dictoption){
-            let masterData:any = {};
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/dictcatalogs/${context.dictcatalog}/dictoptions/${context.dictoption}/checkkey`,data,isloading);
-            
+            let res:any = Http.getInstance().delete(`/dictcatalogs/${context.dictcatalog}/dictoptions/${context.dictoption}`,isloading);
             return res;
         }
-            let res:any = Http.getInstance().post(`/dictoptions/${context.dictoption}/checkkey`,data,isloading);
+            let res:any = Http.getInstance().delete(`/dictoptions/${context.dictoption}`,isloading);
             return res;
     }
 
@@ -225,6 +181,30 @@ export default class DictOptionServiceBase extends EntityService {
             return res;
     }
 
+    /**
+     * Update接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof DictOptionServiceBase
+     */
+    public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.dictcatalog && context.dictoption){
+            let masterData:any = {};
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/dictcatalogs/${context.dictcatalog}/dictoptions/${context.dictoption}`,data,isloading);
+            
+            return res;
+        }
+        let masterData:any = {};
+        Object.assign(data,masterData);
+            let res:any = await  Http.getInstance().put(`/dictoptions/${context.dictoption}`,data,isloading);
+            
+            return res;
+    }
+
     /**
      * FetchDefault接口方法
      *
@@ -262,4 +242,24 @@ export default class DictOptionServiceBase extends EntityService {
         let tempData:any = JSON.parse(JSON.stringify(data));
         return await Http.getInstance().post(`/dictoptions/searchdefault`,tempData,isloading);
     }
+
+    /**
+     * Select接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof DictOptionServiceBase
+     */
+    public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.dictcatalog && context.dictoption){
+            let res:any = Http.getInstance().get(`/dictcatalogs/${context.dictcatalog}/dictoptions/${context.dictoption}/select`,isloading);
+            
+            return res;
+        }
+            let res:any = Http.getInstance().get(`/dictoptions/${context.dictoption}/select`,isloading);
+            
+            return res;
+    }
 }
\ No newline at end of file

app_web/src/widgets/app/app-index-view-appmenu/app-index-view-appmenu-base.vue

@@ -23,7 +23,7 @@
                             <template v-else>
                                 <i class='fa fa-cogs app-menu-icon'></i>
                             </template>
-                            <span class='text' :title="$t('app.menus.appindexview.' + item0.name)">{{$t('app.menus.appindexview.' + item0.name)}}</span>
+                            <span class='text' :title="$t('app.menus.appindexview.' + item0.name.toLowerCase())">{{$t('app.menus.appindexview.' + item0.name.toLowerCase())}}</span>
                         </template>
                         <template v-for="item1 in item0.items">
                             <template v-if="item1.items && Array.isArray(item1.items) && item1.items.length > 0">
@@ -35,7 +35,7 @@
                                         <template v-else-if="item1.iconcls && item1.iconcls != ''">
                                             <i :class="[item1.iconcls, 'app-menu-icon']"></i>
                                         </template>
-                                        <span class='text' :title="$t('app.menus.appindexview.' + item1.name)">{{$t('app.menus.appindexview.' + item1.name)}}</span>
+                                        <span class='text' :title="$t('app.menus.appindexview.' + item1.name.toLowerCase())">{{$t('app.menus.appindexview.' + item1.name.toLowerCase())}}</span>
                                     </template>
                                     <template v-for="item2 in item1.items">
                                         <template v-if="item2.type =='MENUITEM'">
@@ -47,7 +47,7 @@
                                                     <i :class="[item2.iconcls, 'app-menu-icon']"></i>
                                                 </template>
                                                 <template slot="title">
-                                                    <span class="text" :title="$t('app.menus.appindexview.' + item2.name)">{{$t('app.menus.appindexview.' + item2.name)}}</span>
+                                                    <span class="text" :title="$t('app.menus.appindexview.' + item2.name.toLowerCase())">{{$t('app.menus.appindexview.' + item2.name.toLowerCase())}}</span>
                                                     <template v-if="counterdata && counterdata[item2.counterid] && counterdata[item2.counterid] > 0">
                                                         <span class="pull-right">
                                                             <badge :count="counterdata[item2.counterid]" :overflow-count="9999"></badge>
@@ -69,7 +69,7 @@
                                             <i :class="[item1.iconcls, 'app-menu-icon']"></i>
                                         </template>
                                         <template slot="title">
-                                            <span class="text" :title="$t('app.menus.appindexview.' + item1.name)">{{$t('app.menus.appindexview.' + item1.name)}} </span>
+                                            <span class="text" :title="$t('app.menus.appindexview.' + item1.name.toLowerCase())">{{$t('app.menus.appindexview.' + item1.name.toLowerCase())}} </span>
                                             <template v-if="counterdata && counterdata[item1.counterid] && counterdata[item1.counterid] > 0">
                                                 <span class="pull-right">
                                                     <badge :count="counterdata[item1.counterid]" :overflow-count="9999"></badge>
@@ -95,7 +95,7 @@
                                 <i class='fa fa-cogs app-menu-icon'></i>
                             </template>
                             <template slot="title">
-                                <span class="text" :title="$t('app.menus.appindexview.' + item0.name)">{{$t('app.menus.appindexview.' + item0.name)}}</span>
+                                <span class="text" :title="$t('app.menus.appindexview.' + item0.name.toLowerCase())">{{$t('app.menus.appindexview.' + item0.name.toLowerCase())}}</span>
                                 <template v-if="counterdata && counterdata[item0.counterid] && counterdata[item0.counterid] > 0">
                                     <span class="pull-right">
                                         <badge :count="counterdata[item0.counterid]" :overflow-count="9999"></badge>

app_web/src/widgets/dict-catalog/default-searchform/default-searchform-base.vue

@@ -742,8 +742,8 @@ export default class DefaultBase extends Vue implements ControlInterface {
         let post: Promise<any> = this.service.loadDraft(this.loaddraftAction,JSON.parse(JSON.stringify(this.context)), arg, this.showBusyIndicator);
         post.then((response: any) => {
             if (!response.status || response.status !== 200) {
-                if (response.errorMessage) {
-                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.errorMessage });
+                if (response.data && response.data.message) {
+                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data.message });
                 }
                 return;
             }

app_web/src/widgets/dict-catalog/main-grid/main-grid-base.vue

@@ -873,8 +873,8 @@ export default class MainBase extends Vue implements ControlInterface {
         const post: Promise<any> = this.service.search(this.fetchAction,JSON.parse(JSON.stringify(this.context)), arg, this.showBusyIndicator);
         post.then((response: any) => {
             if (!response.status || response.status !== 200) {
-                if (response.errorMessage) {
-                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.errorMessage });
+                if (response.data && response.data.message) {
+                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data.message });
                 }
                 return;
             }
@@ -924,7 +924,7 @@ export default class MainBase extends Vue implements ControlInterface {
             if (response && response.status === 401) {
                 return;
             }
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.errorMessage });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data && response.data.message ? response.data.message : "" });
         });
     }
 
@@ -1009,7 +1009,7 @@ export default class MainBase extends Vue implements ControlInterface {
                     resolve(response);
                 }).catch((response: any) => {
                     if (response && response.status != 200) {
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.message});
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data && response.data.message ? response.data.message : "" });
                         return;
                     }
                     if (!response || !response.status || !response.data) {
@@ -1130,6 +1130,9 @@ export default class MainBase extends Vue implements ControlInterface {
         const parentdata: any = {};
         this.$emit('beforeload', parentdata);
         Object.assign(arg, parentdata);
+        let tempViewParams:any = parentdata.viewparams?parentdata.viewparams:{};
+        Object.assign(tempViewParams,JSON.parse(JSON.stringify(this.viewparams)));
+        Object.assign(arg,{viewparams:tempViewParams});
         const post: Promise<any> = this.service.search(this.fetchAction,JSON.parse(JSON.stringify(this.context)), arg, this.showBusyIndicator);
         post.then((response: any) => {
             if (!response || response.status !== 200) {
@@ -1997,8 +2000,8 @@ export default class MainBase extends Vue implements ControlInterface {
         let post: Promise<any> = this.service.loadDraft(this.loaddraftAction, JSON.parse(JSON.stringify(this.context)), args[0], this.showBusyIndicator);
         post.then((response: any) => {
             if (!response.status || response.status !== 200) {
-                if (response.errorMessage) {
-                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.errorMessage });
+                if (response.data && response.data.message) {
+                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data.message });
                 }
                 return;
             }

app_web/src/widgets/dict-option/default-searchform/default-searchform-base.vue

@@ -742,8 +742,8 @@ export default class DefaultBase extends Vue implements ControlInterface {
         let post: Promise<any> = this.service.loadDraft(this.loaddraftAction,JSON.parse(JSON.stringify(this.context)), arg, this.showBusyIndicator);
         post.then((response: any) => {
             if (!response.status || response.status !== 200) {
-                if (response.errorMessage) {
-                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.errorMessage });
+                if (response.data && response.data.message) {
+                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data.message });
                 }
                 return;
             }

app_web/src/widgets/dict-option/main-grid/main-grid-base.vue

@@ -1332,8 +1332,8 @@ export default class MainBase extends Vue implements ControlInterface {
         const post: Promise<any> = this.service.search(this.fetchAction,JSON.parse(JSON.stringify(this.context)), arg, this.showBusyIndicator);
         post.then((response: any) => {
             if (!response.status || response.status !== 200) {
-                if (response.errorMessage) {
-                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.errorMessage });
+                if (response.data && response.data.message) {
+                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data.message });
                 }
                 return;
             }
@@ -1383,7 +1383,7 @@ export default class MainBase extends Vue implements ControlInterface {
             if (response && response.status === 401) {
                 return;
             }
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.errorMessage });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data && response.data.message ? response.data.message : "" });
         });
     }
 
@@ -1468,7 +1468,7 @@ export default class MainBase extends Vue implements ControlInterface {
                     resolve(response);
                 }).catch((response: any) => {
                     if (response && response.status != 200) {
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.message});
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data && response.data.message ? response.data.message : "" });
                         return;
                     }
                     if (!response || !response.status || !response.data) {
@@ -1589,6 +1589,9 @@ export default class MainBase extends Vue implements ControlInterface {
         const parentdata: any = {};
         this.$emit('beforeload', parentdata);
         Object.assign(arg, parentdata);
+        let tempViewParams:any = parentdata.viewparams?parentdata.viewparams:{};
+        Object.assign(tempViewParams,JSON.parse(JSON.stringify(this.viewparams)));
+        Object.assign(arg,{viewparams:tempViewParams});
         const post: Promise<any> = this.service.search(this.fetchAction,JSON.parse(JSON.stringify(this.context)), arg, this.showBusyIndicator);
         post.then((response: any) => {
             if (!response || response.status !== 200) {
@@ -2496,8 +2499,8 @@ export default class MainBase extends Vue implements ControlInterface {
         let post: Promise<any> = this.service.loadDraft(this.loaddraftAction, JSON.parse(JSON.stringify(this.context)), args[0], this.showBusyIndicator);
         post.then((response: any) => {
             if (!response.status || response.status !== 200) {
-                if (response.errorMessage) {
-                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.errorMessage });
+                if (response.data && response.data.message) {
+                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data.message });
                 }
                 return;
             }

app_web/src/widgets/dict-option/options-grid/options-grid-base.vue

@@ -1311,8 +1311,8 @@ export default class OptionsBase extends Vue implements ControlInterface {
         const post: Promise<any> = this.service.search(this.fetchAction,JSON.parse(JSON.stringify(this.context)), arg, this.showBusyIndicator);
         post.then((response: any) => {
             if (!response.status || response.status !== 200) {
-                if (response.errorMessage) {
-                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.errorMessage });
+                if (response.data && response.data.message) {
+                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data.message });
                 }
                 return;
             }
@@ -1362,7 +1362,7 @@ export default class OptionsBase extends Vue implements ControlInterface {
             if (response && response.status === 401) {
                 return;
             }
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.errorMessage });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data && response.data.message ? response.data.message : "" });
         });
     }
 
@@ -1447,7 +1447,7 @@ export default class OptionsBase extends Vue implements ControlInterface {
                     resolve(response);
                 }).catch((response: any) => {
                     if (response && response.status != 200) {
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.message});
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data && response.data.message ? response.data.message : "" });
                         return;
                     }
                     if (!response || !response.status || !response.data) {
@@ -1568,6 +1568,9 @@ export default class OptionsBase extends Vue implements ControlInterface {
         const parentdata: any = {};
         this.$emit('beforeload', parentdata);
         Object.assign(arg, parentdata);
+        let tempViewParams:any = parentdata.viewparams?parentdata.viewparams:{};
+        Object.assign(tempViewParams,JSON.parse(JSON.stringify(this.viewparams)));
+        Object.assign(arg,{viewparams:tempViewParams});
         const post: Promise<any> = this.service.search(this.fetchAction,JSON.parse(JSON.stringify(this.context)), arg, this.showBusyIndicator);
         post.then((response: any) => {
             if (!response || response.status !== 200) {
@@ -2472,8 +2475,8 @@ export default class OptionsBase extends Vue implements ControlInterface {
         let post: Promise<any> = this.service.loadDraft(this.loaddraftAction, JSON.parse(JSON.stringify(this.context)), args[0], this.showBusyIndicator);
         post.then((response: any) => {
             if (!response.status || response.status !== 200) {
-                if (response.errorMessage) {
-                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.errorMessage });
+                if (response.data && response.data.message) {
+                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data.message });
                 }
                 return;
             }

ibzdict-app/ibzdict-app-web/pom.xml

@@ -77,6 +77,32 @@
                                     <workingDirectory>../../app_web</workingDirectory>
                                 </configuration>
                             </execution>
+                            <execution>      
+                                <id>prepare</id>                                                           
+                                <configuration>
+                                    <executable>cp</executable>
+                                    <arguments>
+                                        <argument>../../${project.artifactId}.jar</argument>
+                                        <argument>${project.basedir}/src/main/docker/</argument>
+                                    </arguments>
+                                </configuration> 
+                            </execution> 
+                            <execution>    
+                                <id>buildpush</id>                                                                         
+                                <configuration>
+                                    <executable>docker</executable>
+                                    <arguments>
+                                        <argument>buildx</argument>
+                                        <argument>build</argument>
+                                        <argument>--platform</argument>
+                                        <argument>linux/amd64,linux/arm64</argument>
+                                        <argument>-t</argument>
+                                        <argument>${docker.image.prefix}/${project.artifactId}:latest</argument>
+                                        <argument>${project.basedir}/src/main/docker</argument>
+                                        <argument>--push</argument>
+                                    </arguments>                                    
+                                </configuration>
+                            </execution>    
                         </executions>
                     </plugin>
 
@@ -114,7 +140,7 @@
                                 </resource>
                             </resources>
                             </configuration>
-                    </plugin>
+                    </plugin>                       
                 </plugins>
             </build>
         </profile>

ibzdict-app/ibzdict-app-web/src/main/docker/Dockerfile

 
-FROM openjdk:8-jre-alpine
+FROM adoptopenjdk/openjdk8:jdk8u242-b08-centos
 
 ENV TZ=Asia/Shanghai \
     SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \

ibzdict-app/ibzdict-app-web/src/main/resources/application-web-prod.yml

@@ -7,14 +7,6 @@ logging:
 #zuul网关路由设置
 zuul:
   routes:
-    dict_catalog:
-      path: /dictcatalogs/**
-      serviceId: ${ibiz.ref.service.ibzdict-api:ibzdict-api}
-      stripPrefix: false
-    dict_option:
-      path: /dictoptions/**
-      serviceId: ${ibiz.ref.service.ibzdict-api:ibzdict-api}
-      stripPrefix: false
     loginv7:
       path: /v7/login
       serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
@@ -71,5 +63,13 @@ zuul:
       path: /sysauthlogs
       serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
       stripPrefix: false
+    dict_catalog:
+      path: /dictcatalogs/**
+      serviceId: ${ibiz.ref.service.ibzdict-api:ibzdict-api}
+      stripPrefix: false
+    dict_option:
+      path: /dictoptions/**
+      serviceId: ${ibiz.ref.service.ibzdict-api:ibzdict-api}
+      stripPrefix: false
   sensitive-headers:
     - Cookie,Set-Cookie,Authorization

ibzdict-core/src/main/java/cn/ibizlab/core/dict/mapper/DictCatalogMapper.java

@@ -30,7 +30,7 @@ public interface DictCatalogMapper extends BaseMapper<DictCatalog> {
     @CacheEvict(value ="dictcatalog", key = "'row:'+#p0.id")
     int updateById(@Param(Constants.ENTITY) DictCatalog entity);
     @Override
-    @CacheEvict(value ="dictcatalog", key = "'row:'+#p0.id")
+    @CacheEvict(value ="dictcatalog", key = "'row:'+#p0.id" ,condition ="#p0 != null")
     int update(@Param(Constants.ENTITY) DictCatalog entity, @Param("ew") Wrapper<DictCatalog> updateWrapper);
     @Override
     @CacheEvict(value ="dictcatalog", key = "'row:'+#p0")

ibzdict-core/src/main/java/cn/ibizlab/core/util/config/CommonAutoConfig.java

+package cn.ibizlab.core.util.config;
+
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.stereotype.Component;
+
+/**
+ * 通用配置类
+ */
+@Configuration
+public class CommonAutoConfig {
+
+    @Value("${jbpm.enable.multi.con:true}")
+    private  String flag;
+
+    /**
+     * 处理逻辑节点支持多来源配置
+     */
+    @Component
+    public class InstallSystemParamsCommandLineRunner implements CommandLineRunner {
+
+        @Override
+        public void run(String... var1){
+            System.setProperty("jbpm.enable.multi.con", flag);
+        }
+    }
+}

ibzdict-core/src/main/resources/liquibase/h2_table.xml

@@ -4,7 +4,7 @@
 
 
     <!--输出实体[DICT_CATALOG]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-dict_catalog-4-1">
+    <changeSet author="root" id="tab-dict_catalog-4-1">
         <createTable tableName="IBZDICTCATALOG">
                 <column name="CID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DICT_CATALOG_CID"/>
@@ -28,7 +28,7 @@
 
 
     <!--输出实体[DICT_OPTION]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-dict_option-17-2">
+    <changeSet author="root" id="tab-dict_option-17-2">
         <createTable tableName="IBZDICTOPTION">
                 <column name="VKEY" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DICT_OPTION_VKEY"/>
@@ -66,7 +66,7 @@
 
         <!--输出实体[DICT_CATALOG]外键关系 -->
         <!--输出实体[DICT_OPTION]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-dict_option-17-3">
+    <changeSet author="root" id="fk-dict_option-17-3">
        <addForeignKeyConstraint baseColumnNames="CID" baseTableName="IBZDICTOPTION" constraintName="DER1N_DICT_OPTION_DICT_CATALOG" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CID" referencedTableName="IBZDICTCATALOG" validate="true"/>
     </changeSet>
 

ibzdict-provider/ibzdict-provider-api/pom.xml

@@ -73,7 +73,41 @@
                                 </resource>
                             </resources>
                             </configuration>
-                    </plugin>                    
+                    </plugin>   
+
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId> 
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <version>3.0.0</version>          
+                        <executions> 
+                            <execution>      
+                                <id>prepare</id>                                                           
+                                <configuration>
+                                    <executable>cp</executable>
+                                    <arguments>
+                                        <argument>../../${project.artifactId}.jar</argument>
+                                        <argument>${project.basedir}/src/main/docker/</argument>
+                                    </arguments>
+                                </configuration> 
+                            </execution> 
+                            <execution>    
+                                <id>buildpush</id>                                                                         
+                                <configuration>
+                                    <executable>docker</executable>
+                                    <arguments>
+                                        <argument>buildx</argument>
+                                        <argument>build</argument>
+                                        <argument>--platform</argument>
+                                        <argument>linux/amd64,linux/arm64</argument>
+                                        <argument>-t</argument>
+                                        <argument>${docker.image.prefix}/${project.artifactId}:latest</argument>
+                                        <argument>${project.basedir}/src/main/docker</argument>
+                                        <argument>--push</argument>
+                                    </arguments>                                    
+                                </configuration>
+                            </execution>                             
+                        </executions>                              
+                    </plugin>                                          
                 </plugins>
             </build>
         </profile>

ibzdict-provider/ibzdict-provider-api/src/main/docker/Dockerfile

 
-FROM openjdk:8-jre-alpine
+FROM adoptopenjdk/openjdk8:jdk8u242-b08-centos
 
 ENV TZ=Asia/Shanghai \
     SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \

ibzdict-provider/ibzdict-provider-api/src/main/java/cn/ibizlab/api/rest/DictCatalogResource.java

@@ -65,26 +65,15 @@ public class DictCatalogResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    @VersionCheck(entity = "dictcatalog" , versionfield = "updatedate")
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictCatalog-Update-all')")
-    @ApiOperation(value = "更新字典", tags = {"字典" },  notes = "更新字典")
-	@RequestMapping(method = RequestMethod.PUT, value = "/dictcatalogs/{dictcatalog_id}")
-    public ResponseEntity<DictCatalogDTO> update(@PathVariable("dictcatalog_id") String dictcatalog_id, @RequestBody DictCatalogDTO dictcatalogdto) {
-		DictCatalog domain  = dictcatalogMapping.toDomain(dictcatalogdto);
-        domain .setId(dictcatalog_id);
-		dictcatalogService.update(domain );
-		DictCatalogDTO dto = dictcatalogMapping.toDto(domain);
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictCatalog-Get-all')")
+    @ApiOperation(value = "获取字典", tags = {"字典" },  notes = "获取字典")
+	@RequestMapping(method = RequestMethod.GET, value = "/dictcatalogs/{dictcatalog_id}")
+    public ResponseEntity<DictCatalogDTO> get(@PathVariable("dictcatalog_id") String dictcatalog_id) {
+        DictCatalog domain = dictcatalogService.get(dictcatalog_id);
+        DictCatalogDTO dto = dictcatalogMapping.toDto(domain);
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictCatalog-Update-all')")
-    @ApiOperation(value = "批量更新字典", tags = {"字典" },  notes = "批量更新字典")
-	@RequestMapping(method = RequestMethod.PUT, value = "/dictcatalogs/batch")
-    public ResponseEntity<Boolean> updateBatch(@RequestBody List<DictCatalogDTO> dictcatalogdtos) {
-        dictcatalogService.updateBatch(dictcatalogMapping.toDomain(dictcatalogdtos));
-        return  ResponseEntity.status(HttpStatus.OK).body(true);
-    }
-
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictCatalog-Remove-all')")
     @ApiOperation(value = "删除字典", tags = {"字典" },  notes = "删除字典")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/dictcatalogs/{dictcatalog_id}")
@@ -100,20 +89,24 @@ public class DictCatalogResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictCatalog-Get-all')")
-    @ApiOperation(value = "获取字典", tags = {"字典" },  notes = "获取字典")
-	@RequestMapping(method = RequestMethod.GET, value = "/dictcatalogs/{dictcatalog_id}")
-    public ResponseEntity<DictCatalogDTO> get(@PathVariable("dictcatalog_id") String dictcatalog_id) {
-        DictCatalog domain = dictcatalogService.get(dictcatalog_id);
-        DictCatalogDTO dto = dictcatalogMapping.toDto(domain);
+    @VersionCheck(entity = "dictcatalog" , versionfield = "updatedate")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictCatalog-Update-all')")
+    @ApiOperation(value = "更新字典", tags = {"字典" },  notes = "更新字典")
+	@RequestMapping(method = RequestMethod.PUT, value = "/dictcatalogs/{dictcatalog_id}")
+    public ResponseEntity<DictCatalogDTO> update(@PathVariable("dictcatalog_id") String dictcatalog_id, @RequestBody DictCatalogDTO dictcatalogdto) {
+		DictCatalog domain  = dictcatalogMapping.toDomain(dictcatalogdto);
+        domain .setId(dictcatalog_id);
+		dictcatalogService.update(domain );
+		DictCatalogDTO dto = dictcatalogMapping.toDto(domain);
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @ApiOperation(value = "获取字典草稿", tags = {"字典" },  notes = "获取字典草稿")
-	@RequestMapping(method = RequestMethod.GET, value = "/dictcatalogs/getdraft")
-    public ResponseEntity<DictCatalogDTO> getDraft(DictCatalogDTO dto) {
-        DictCatalog domain = dictcatalogMapping.toDomain(dto);
-        return ResponseEntity.status(HttpStatus.OK).body(dictcatalogMapping.toDto(dictcatalogService.getDraft(domain)));
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictCatalog-Update-all')")
+    @ApiOperation(value = "批量更新字典", tags = {"字典" },  notes = "批量更新字典")
+	@RequestMapping(method = RequestMethod.PUT, value = "/dictcatalogs/batch")
+    public ResponseEntity<Boolean> updateBatch(@RequestBody List<DictCatalogDTO> dictcatalogdtos) {
+        dictcatalogService.updateBatch(dictcatalogMapping.toDomain(dictcatalogdtos));
+        return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
     @ApiOperation(value = "检查字典", tags = {"字典" },  notes = "检查字典")
@@ -122,6 +115,13 @@ public class DictCatalogResource {
         return  ResponseEntity.status(HttpStatus.OK).body(dictcatalogService.checkKey(dictcatalogMapping.toDomain(dictcatalogdto)));
     }
 
+    @ApiOperation(value = "获取字典草稿", tags = {"字典" },  notes = "获取字典草稿")
+	@RequestMapping(method = RequestMethod.GET, value = "/dictcatalogs/getdraft")
+    public ResponseEntity<DictCatalogDTO> getDraft(DictCatalogDTO dto) {
+        DictCatalog domain = dictcatalogMapping.toDomain(dto);
+        return ResponseEntity.status(HttpStatus.OK).body(dictcatalogMapping.toDto(dictcatalogService.getDraft(domain)));
+    }
+
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictCatalog-Save-all')")
     @ApiOperation(value = "保存字典", tags = {"字典" },  notes = "保存字典")
 	@RequestMapping(method = RequestMethod.POST, value = "/dictcatalogs/save")

ibzdict-provider/ibzdict-provider-api/src/main/java/cn/ibizlab/api/rest/DictOptionResource.java

@@ -65,26 +65,15 @@ public class DictOptionResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    @VersionCheck(entity = "dictoption" , versionfield = "updatedate")
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictOption-Update-all')")
-    @ApiOperation(value = "更新字典项", tags = {"字典项" },  notes = "更新字典项")
-	@RequestMapping(method = RequestMethod.PUT, value = "/dictoptions/{dictoption_id}")
-    public ResponseEntity<DictOptionDTO> update(@PathVariable("dictoption_id") String dictoption_id, @RequestBody DictOptionDTO dictoptiondto) {
-		DictOption domain  = dictoptionMapping.toDomain(dictoptiondto);
-        domain .setValueKey(dictoption_id);
-		dictoptionService.update(domain );
-		DictOptionDTO dto = dictoptionMapping.toDto(domain);
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictOption-Get-all')")
+    @ApiOperation(value = "获取字典项", tags = {"字典项" },  notes = "获取字典项")
+	@RequestMapping(method = RequestMethod.GET, value = "/dictoptions/{dictoption_id}")
+    public ResponseEntity<DictOptionDTO> get(@PathVariable("dictoption_id") String dictoption_id) {
+        DictOption domain = dictoptionService.get(dictoption_id);
+        DictOptionDTO dto = dictoptionMapping.toDto(domain);
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictOption-Update-all')")
-    @ApiOperation(value = "批量更新字典项", tags = {"字典项" },  notes = "批量更新字典项")
-	@RequestMapping(method = RequestMethod.PUT, value = "/dictoptions/batch")
-    public ResponseEntity<Boolean> updateBatch(@RequestBody List<DictOptionDTO> dictoptiondtos) {
-        dictoptionService.updateBatch(dictoptionMapping.toDomain(dictoptiondtos));
-        return  ResponseEntity.status(HttpStatus.OK).body(true);
-    }
-
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictOption-Remove-all')")
     @ApiOperation(value = "删除字典项", tags = {"字典项" },  notes = "删除字典项")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/dictoptions/{dictoption_id}")
@@ -100,20 +89,24 @@ public class DictOptionResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictOption-Get-all')")
-    @ApiOperation(value = "获取字典项", tags = {"字典项" },  notes = "获取字典项")
-	@RequestMapping(method = RequestMethod.GET, value = "/dictoptions/{dictoption_id}")
-    public ResponseEntity<DictOptionDTO> get(@PathVariable("dictoption_id") String dictoption_id) {
-        DictOption domain = dictoptionService.get(dictoption_id);
-        DictOptionDTO dto = dictoptionMapping.toDto(domain);
+    @VersionCheck(entity = "dictoption" , versionfield = "updatedate")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictOption-Update-all')")
+    @ApiOperation(value = "更新字典项", tags = {"字典项" },  notes = "更新字典项")
+	@RequestMapping(method = RequestMethod.PUT, value = "/dictoptions/{dictoption_id}")
+    public ResponseEntity<DictOptionDTO> update(@PathVariable("dictoption_id") String dictoption_id, @RequestBody DictOptionDTO dictoptiondto) {
+		DictOption domain  = dictoptionMapping.toDomain(dictoptiondto);
+        domain .setValueKey(dictoption_id);
+		dictoptionService.update(domain );
+		DictOptionDTO dto = dictoptionMapping.toDto(domain);
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @ApiOperation(value = "获取字典项草稿", tags = {"字典项" },  notes = "获取字典项草稿")
-	@RequestMapping(method = RequestMethod.GET, value = "/dictoptions/getdraft")
-    public ResponseEntity<DictOptionDTO> getDraft(DictOptionDTO dto) {
-        DictOption domain = dictoptionMapping.toDomain(dto);
-        return ResponseEntity.status(HttpStatus.OK).body(dictoptionMapping.toDto(dictoptionService.getDraft(domain)));
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictOption-Update-all')")
+    @ApiOperation(value = "批量更新字典项", tags = {"字典项" },  notes = "批量更新字典项")
+	@RequestMapping(method = RequestMethod.PUT, value = "/dictoptions/batch")
+    public ResponseEntity<Boolean> updateBatch(@RequestBody List<DictOptionDTO> dictoptiondtos) {
+        dictoptionService.updateBatch(dictoptionMapping.toDomain(dictoptiondtos));
+        return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
     @ApiOperation(value = "检查字典项", tags = {"字典项" },  notes = "检查字典项")
@@ -122,6 +115,13 @@ public class DictOptionResource {
         return  ResponseEntity.status(HttpStatus.OK).body(dictoptionService.checkKey(dictoptionMapping.toDomain(dictoptiondto)));
     }
 
+    @ApiOperation(value = "获取字典项草稿", tags = {"字典项" },  notes = "获取字典项草稿")
+	@RequestMapping(method = RequestMethod.GET, value = "/dictoptions/getdraft")
+    public ResponseEntity<DictOptionDTO> getDraft(DictOptionDTO dto) {
+        DictOption domain = dictoptionMapping.toDomain(dto);
+        return ResponseEntity.status(HttpStatus.OK).body(dictoptionMapping.toDto(dictoptionService.getDraft(domain)));
+    }
+
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictOption-Save-all')")
     @ApiOperation(value = "保存字典项", tags = {"字典项" },  notes = "保存字典项")
 	@RequestMapping(method = RequestMethod.POST, value = "/dictoptions/save")
@@ -184,6 +184,30 @@ public class DictOptionResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictOption-Get-all')")
+    @ApiOperation(value = "根据字典获取字典项", tags = {"字典项" },  notes = "根据字典获取字典项")
+	@RequestMapping(method = RequestMethod.GET, value = "/dictcatalogs/{dictcatalog_id}/dictoptions/{dictoption_id}")
+    public ResponseEntity<DictOptionDTO> getByDictCatalog(@PathVariable("dictcatalog_id") String dictcatalog_id, @PathVariable("dictoption_id") String dictoption_id) {
+        DictOption domain = dictoptionService.get(dictoption_id);
+        DictOptionDTO dto = dictoptionMapping.toDto(domain);
+        return ResponseEntity.status(HttpStatus.OK).body(dto);
+    }
+
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictOption-Remove-all')")
+    @ApiOperation(value = "根据字典删除字典项", tags = {"字典项" },  notes = "根据字典删除字典项")
+	@RequestMapping(method = RequestMethod.DELETE, value = "/dictcatalogs/{dictcatalog_id}/dictoptions/{dictoption_id}")
+    public ResponseEntity<Boolean> removeByDictCatalog(@PathVariable("dictcatalog_id") String dictcatalog_id, @PathVariable("dictoption_id") String dictoption_id) {
+		return ResponseEntity.status(HttpStatus.OK).body(dictoptionService.remove(dictoption_id));
+    }
+
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictOption-Remove-all')")
+    @ApiOperation(value = "根据字典批量删除字典项", tags = {"字典项" },  notes = "根据字典批量删除字典项")
+	@RequestMapping(method = RequestMethod.DELETE, value = "/dictcatalogs/{dictcatalog_id}/dictoptions/batch")
+    public ResponseEntity<Boolean> removeBatchByDictCatalog(@RequestBody List<String> ids) {
+        dictoptionService.removeBatch(ids);
+        return  ResponseEntity.status(HttpStatus.OK).body(true);
+    }
+
     @VersionCheck(entity = "dictoption" , versionfield = "updatedate")
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictOption-Update-all')")
     @ApiOperation(value = "根据字典更新字典项", tags = {"字典项" },  notes = "根据字典更新字典项")
@@ -209,28 +233,10 @@ public class DictOptionResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictOption-Remove-all')")
-    @ApiOperation(value = "根据字典删除字典项", tags = {"字典项" },  notes = "根据字典删除字典项")
-	@RequestMapping(method = RequestMethod.DELETE, value = "/dictcatalogs/{dictcatalog_id}/dictoptions/{dictoption_id}")
-    public ResponseEntity<Boolean> removeByDictCatalog(@PathVariable("dictcatalog_id") String dictcatalog_id, @PathVariable("dictoption_id") String dictoption_id) {
-		return ResponseEntity.status(HttpStatus.OK).body(dictoptionService.remove(dictoption_id));
-    }
-
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictOption-Remove-all')")
-    @ApiOperation(value = "根据字典批量删除字典项", tags = {"字典项" },  notes = "根据字典批量删除字典项")
-	@RequestMapping(method = RequestMethod.DELETE, value = "/dictcatalogs/{dictcatalog_id}/dictoptions/batch")
-    public ResponseEntity<Boolean> removeBatchByDictCatalog(@RequestBody List<String> ids) {
-        dictoptionService.removeBatch(ids);
-        return  ResponseEntity.status(HttpStatus.OK).body(true);
-    }
-
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictOption-Get-all')")
-    @ApiOperation(value = "根据字典获取字典项", tags = {"字典项" },  notes = "根据字典获取字典项")
-	@RequestMapping(method = RequestMethod.GET, value = "/dictcatalogs/{dictcatalog_id}/dictoptions/{dictoption_id}")
-    public ResponseEntity<DictOptionDTO> getByDictCatalog(@PathVariable("dictcatalog_id") String dictcatalog_id, @PathVariable("dictoption_id") String dictoption_id) {
-        DictOption domain = dictoptionService.get(dictoption_id);
-        DictOptionDTO dto = dictoptionMapping.toDto(domain);
-        return ResponseEntity.status(HttpStatus.OK).body(dto);
+    @ApiOperation(value = "根据字典检查字典项", tags = {"字典项" },  notes = "根据字典检查字典项")
+	@RequestMapping(method = RequestMethod.POST, value = "/dictcatalogs/{dictcatalog_id}/dictoptions/checkkey")
+    public ResponseEntity<Boolean> checkKeyByDictCatalog(@PathVariable("dictcatalog_id") String dictcatalog_id, @RequestBody DictOptionDTO dictoptiondto) {
+        return  ResponseEntity.status(HttpStatus.OK).body(dictoptionService.checkKey(dictoptionMapping.toDomain(dictoptiondto)));
     }
 
     @ApiOperation(value = "根据字典获取字典项草稿", tags = {"字典项" },  notes = "根据字典获取字典项草稿")
@@ -241,12 +247,6 @@ public class DictOptionResource {
         return ResponseEntity.status(HttpStatus.OK).body(dictoptionMapping.toDto(dictoptionService.getDraft(domain)));
     }
 
-    @ApiOperation(value = "根据字典检查字典项", tags = {"字典项" },  notes = "根据字典检查字典项")
-	@RequestMapping(method = RequestMethod.POST, value = "/dictcatalogs/{dictcatalog_id}/dictoptions/checkkey")
-    public ResponseEntity<Boolean> checkKeyByDictCatalog(@PathVariable("dictcatalog_id") String dictcatalog_id, @RequestBody DictOptionDTO dictoptiondto) {
-        return  ResponseEntity.status(HttpStatus.OK).body(dictoptionService.checkKey(dictoptionMapping.toDomain(dictoptiondto)));
-    }
-
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictOption-Save-all')")
     @ApiOperation(value = "根据字典保存字典项", tags = {"字典项" },  notes = "根据字典保存字典项")
 	@RequestMapping(method = RequestMethod.POST, value = "/dictcatalogs/{dictcatalog_id}/dictoptions/save")

ibzdict-util/src/main/java/cn/ibizlab/util/aspect/DELogicAspect.java

@@ -28,6 +28,7 @@ import org.springframework.expression.ExpressionParser;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
 import org.springframework.expression.spel.support.StandardEvaluationContext;
 import org.springframework.stereotype.Component;
+import org.springframework.util.ClassUtils;
 import org.springframework.util.DigestUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
@@ -80,7 +81,7 @@ public class DELogicAspect {
             if(!ObjectUtils.isEmpty(entity)) {
                 String id = DEFieldCacheMap.getDEKeyField(entity.getClass());
                 if(StringUtils.isEmpty(id)) {
-                    log.debug("无法获取实体主键属性[{}]",entity.getClass().getSimpleName());
+                    log.debug("无法获取实体主键属性[{}]",getEntityName(entity));
                     return point.proceed();
                 }
                 entity.set(id, arg);
@@ -101,6 +102,17 @@ public class DELogicAspect {
         return point.proceed();
     }
 
+    /**
+     * 判断类是否被代理类代理
+     */
+    private String getEntityName(Object entity){
+        String entityName = entity.getClass().getSimpleName();
+        if(entityName.contains("$$")){
+            entityName = ClassUtils.getUserClass(entity.getClass()).getSimpleName();
+        }
+        return entityName;
+    }
+
     /**
      * 前附加逻辑
      *
@@ -108,7 +120,7 @@ public class DELogicAspect {
      * @param action
      */
     private void executeBeforeLogic(EntityBase entity, String action) {
-        Resource bpmnFile = getLocalModel(entity.getClass().getSimpleName(), action, LogicExecMode.BEFORE);
+        Resource bpmnFile = getLocalModel(getEntityName(entity), action, LogicExecMode.BEFORE);
         if (bpmnFile != null && bpmnFile.exists() && isValid(bpmnFile, entity, action)) {
             executeLogic(bpmnFile, entity, action);
         }
@@ -121,7 +133,7 @@ public class DELogicAspect {
      * @param action
      */
     private void executeAfterLogic(EntityBase entity, String action) {
-        Resource bpmnFile = getLocalModel(entity.getClass().getSimpleName(), action, LogicExecMode.AFTER);
+        Resource bpmnFile = getLocalModel(getEntityName(entity), action, LogicExecMode.AFTER);
         if (bpmnFile != null && bpmnFile.exists() && isValid(bpmnFile, entity, action)) {
             executeLogic(bpmnFile, entity, action);
         }
@@ -134,7 +146,7 @@ public class DELogicAspect {
      * @param action
      */
     private void executeLogic(EntityBase entity, String action) {
-        Resource bpmnFile = getLocalModel(entity.getClass().getSimpleName(), action, LogicExecMode.EXEC);
+        Resource bpmnFile = getLocalModel(getEntityName(entity), action, LogicExecMode.EXEC);
         if (bpmnFile != null && bpmnFile.exists() && isValid(bpmnFile, entity, action)) {
             executeLogic(bpmnFile, entity, action);
         }
@@ -148,7 +160,7 @@ public class DELogicAspect {
      */
     private void executeLogic(Resource bpmnFile, Object entity, String action) {
         try {
-            log.debug("开始执行实体处理逻辑[{}:{}:{}:本地模式]", entity.getClass().getSimpleName(), action, bpmnFile.getFilename());
+            log.debug("开始执行实体处理逻辑[{}:{}:{}:本地模式]", getEntityName(entity), action, bpmnFile.getFilename());
             String bpmnId = DigestUtils.md5DigestAsHex(bpmnFile.getURL().getPath().getBytes());
             DELogic logic = getDELogic(bpmnFile);
             if (logic == null) {
@@ -172,9 +184,9 @@ public class DELogicAspect {
                 }
             }
             kieSession.startProcess(mainProcess.getId());
-            log.debug("实体处理逻辑[{}:{}:{}:本地模式]执行结束", entity.getClass().getSimpleName(), action, bpmnFile.getFilename());
-        } catch (IOException e) {
-            log.error("实体处理逻辑[{}:{}:{}:本地模式]发生异常", entity.getClass().getSimpleName(), action, bpmnFile.getFilename());
+            log.debug("实体处理逻辑[{}:{}:{}:本地模式]执行结束", getEntityName(entity), action, bpmnFile.getFilename());
+        } catch (Exception e) {
+            log.error("实体处理逻辑[{}:{}:{}:本地模式]发生异常", getEntityName(entity), action, bpmnFile.getFilename());
             throw new BadRequestAlertException("执行实体处理逻辑发生异常" + e.getMessage(), "DELogicAspect", "executeLogic");
         }
     }
@@ -414,7 +426,7 @@ public class DELogicAspect {
      * @return
      */
     private boolean isValid(Resource bpmn, Object entity, Object action) {
-        String logicId = String.format("%s%s%s", entity.getClass().getSimpleName(), action, bpmn.getFilename()).toLowerCase();
+        String logicId = String.format("%s%s%s", getEntityName(entity), action, bpmn.getFilename()).toLowerCase();
         if (validLogic.containsKey(logicId)) {
             return true;
         } else {

ibzdict-util/src/main/java/cn/ibizlab/util/cache/cache/CusCaffeineCache.java

+package cn.ibizlab.util.cache.cache;
+
+import cn.ibizlab.util.helper.Globs;
+import org.springframework.cache.caffeine.CaffeineCache;
+import com.github.benmanes.caffeine.cache.Cache;
+
+import javax.validation.constraints.NotNull;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * 自定义的Caffeine缓存
+ */
+public class CusCaffeineCache extends CaffeineCache{
+
+    public CusCaffeineCache(String name, Cache<Object, Object> cache) {
+        super(name,cache);
+    }
+
+    public CusCaffeineCache(String name, Cache<Object, Object> cache, boolean allowNullValues) {
+        super(name,cache,allowNullValues);
+    }
+
+
+    @Override
+    public void evict(@NotNull Object key) {
+        if (key instanceof String && ((String) key).startsWith("glob:")) {
+            String globPattern = ((String)key).split("glob:")[1];
+            // 将Glob匹配转换成正则匹配
+            String regexPattern = Globs.toUnixRegexPattern(globPattern);
+            // String regexPattern = Globs.toWindowsRegexPattern(globPattern);
+
+            Cache<Object,Object> cache = super.getNativeCache();
+            Set<Object> keySet = cache.asMap().keySet();
+            keySet = keySet.stream().filter(o->o.toString().matches(regexPattern)).collect(Collectors.toSet());
+
+            cache.invalidateAll(keySet);
+        }else{
+            super.evict(key);
+        }
+    }
+}

ibzdict-util/src/main/java/cn/ibizlab/util/cache/cache/CusRedisCache.java

@@ -4,6 +4,8 @@ import org.springframework.data.redis.cache.RedisCache;
 import org.springframework.data.redis.cache.RedisCacheConfiguration;
 import org.springframework.data.redis.cache.RedisCacheWriter;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * 自定义的redis缓存
  */
@@ -12,4 +14,18 @@ public class CusRedisCache extends RedisCache {
     public CusRedisCache(String name, RedisCacheWriter redisCacheWriter, RedisCacheConfiguration configuration) {
         super(name, redisCacheWriter, configuration);
     }
+
+    @Override
+    public void evict(@NotNull Object key) {
+        if (key instanceof String && ((String) key).startsWith("glob:")) {
+            String globPattern = ((String)key).split("glob:")[1];
+
+            byte[] globPatternBytes = super.getCacheConfiguration().getConversionService().convert(globPattern,byte[].class);
+            if(globPatternBytes!=null){
+                super.getNativeCache().clean(super.getName(),globPatternBytes);
+            }
+        }else{
+            super.evict(key);
+        }
+    }
 }

ibzdict-util/src/main/java/cn/ibizlab/util/cache/cacheManager/LayeringCacheManager.java

@@ -15,6 +15,7 @@ import java.util.Collections;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.TimeUnit;
+import cn.ibizlab.util.cache.cache.CusCaffeineCache;
 import cn.ibizlab.util.cache.cache.CusRedisCache;
 import cn.ibizlab.util.cache.cache.LayeringCache;
 
@@ -80,7 +81,7 @@ public class LayeringCacheManager implements CacheManager {
      * @return
      */
     protected Cache createCache(String cacheName) {
-        return new LayeringCache(cacheName,new CaffeineCache(cacheName, this.cacheBuilder.build(), true),new CusRedisCache(cacheName, redisCacheWriter, redisConfiguration),redisTemplate);
+        return new LayeringCache(cacheName,new CusCaffeineCache(cacheName, this.cacheBuilder.build(), true),new CusRedisCache(cacheName, redisCacheWriter, redisConfiguration),redisTemplate);
     }
 
     /**

ibzdict-util/src/main/java/cn/ibizlab/util/client/IBZWFFallback.java

@@ -3,6 +3,7 @@ package cn.ibizlab.util.client;
 import org.springframework.stereotype.Component;
 import com.alibaba.fastjson.JSONObject;
 import java.util.*;
+import java.io.Serializable;
 
 @Component
 public class IBZWFFallback implements IBZWFFeignClient {
@@ -26,4 +27,20 @@ public class IBZWFFallback implements IBZWFFeignClient {
     public JSONObject wfstart(String system, String appname, String entity, String businessKey, JSONObject instance) {
         return null;
     }
+
+    @Override
+    public Map<String, Map<String, Object>> getTask(String system, String userId, String entity, String instTag, String instTag2 ,String taskType) {
+        return null;
+    }
+
+    @Override
+    public Map<String, Map<String, Object>> getTaskByStep(String system, String userId, String entity, String instTag, String instTag2 , String taskType, String srfwfstep) {
+        return null;
+    }
+
+    @Override
+    public Integer getDataAccessMode(String system, String entity, Serializable businessKey) {
+        return null;
+    }
+
 }

ibzdict-util/src/main/java/cn/ibizlab/util/client/IBZWFFeignClient.java

@@ -4,6 +4,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 import com.alibaba.fastjson.JSONObject;
 import java.util.*;
+import java.io.Serializable;
 
 @FeignClient(value = "${ibiz.ref.service.wf:ibzwf-api}",contextId = "wf",fallback = IBZWFFallback.class)
 public interface IBZWFFeignClient
@@ -25,4 +26,15 @@ public interface IBZWFFeignClient
 					   @PathVariable("entity") String entity,
 					   @PathVariable("businessKey") String businessKey, @RequestBody JSONObject instance);
 
+	@RequestMapping(method = RequestMethod.POST, value = "/{system}-user-{userId}/{insttag}/{insttag2}/{entity}/tasks")
+	Map<String, Map<String, Object>> getTask(@PathVariable("system") String system, @PathVariable("userId") String userId,
+													 @PathVariable("entity") String entity, @PathVariable("insttag") String instTag, @PathVariable("insttag2") String instTag2, @RequestParam("srfwf") String taskType);
+
+	@RequestMapping(method = RequestMethod.POST, value = "/{system}-user-{userId}/{insttag}/{insttag2}/{entity}/tasks")
+	Map<String, Map<String, Object>> getTaskByStep(@PathVariable("system") String system, @PathVariable("userId") String userId,
+													 @PathVariable("entity") String entity, @PathVariable("insttag") String instTag, @PathVariable("insttag2") String instTag2 , @RequestParam("srfwf") String taskType, @RequestParam("n_taskdefinitionkey_eq") String srfwfstep);
+
+	@RequestMapping(method = RequestMethod.GET, value = "/{system}/{entity}/{businessKey}/dataaccessmode")
+	Integer getDataAccessMode(@PathVariable("system") String system, @PathVariable("entity") String entity, @PathVariable("businessKey") Serializable businessKey);
+
 }

ibzdict-util/src/main/java/cn/ibizlab/util/domain/DELogic.java

@@ -17,4 +17,6 @@ public class DELogic implements Serializable {
     List<DELogic> refLogic;
     List<Resource> refRuleFiles;
     String md5;
+    int logicMode;
+    long loadedTime;
 }

ibzdict-util/src/main/java/cn/ibizlab/util/enums/DEFieldDefaultValueType.java

@@ -43,5 +43,21 @@ public enum DEFieldDefaultValueType {
     /**
      * 默认值
      */
-    NONE
+    NONE,
+    /**
+     * 用户自定义
+     */
+    USER,
+    /**
+     * 用户自定义2
+     */
+    USER2,
+    /**
+     * 用户自定义3
+     */
+    USER3,
+    /**
+     * 用户自定义4
+     */
+    USER4
 }

ibzdict-util/src/main/java/cn/ibizlab/util/enums/DEPredefinedFieldType.java

@@ -55,5 +55,17 @@ public enum DEPredefinedFieldType {
     /**
      * 不处理
      */
-    NONE
+    NONE,
+    /**
+     * 动态父类型
+     */
+    PARENTTYPE,
+    /**
+     * 动态父标识
+     */
+    PARENTID,
+    /**
+     * 动态父名称
+     */
+    PARENTNAME
 }

ibzdict-util/src/main/java/cn/ibizlab/util/helper/Globs.java

+package cn.ibizlab.util.helper;
+
+import java.util.regex.PatternSyntaxException;
+
+/**
+ * Copy from class sun.nio.fs.Globs
+ */
+public class Globs {
+    private Globs() { }
+
+    private static final String regexMetaChars = ".^$+{[]|()";
+    private static final String globMetaChars = "\\*?[{";
+
+    private static boolean isRegexMeta(char c) {
+        return regexMetaChars.indexOf(c) != -1;
+    }
+
+    private static boolean isGlobMeta(char c) {
+        return globMetaChars.indexOf(c) != -1;
+    }
+    private static char EOL = 0;  //TBD
+
+    private static char next(String glob, int i) {
+        if (i < glob.length()) {
+            return glob.charAt(i);
+        }
+        return EOL;
+    }
+
+    /**
+     * Creates a regex pattern from the given glob expression.
+     *
+     * @throws  PatternSyntaxException
+     */
+    private static String toRegexPattern(String globPattern, boolean isDos) {
+        boolean inGroup = false;
+        StringBuilder regex = new StringBuilder("^");
+
+        int i = 0;
+        while (i < globPattern.length()) {
+            char c = globPattern.charAt(i++);
+            switch (c) {
+                case '\\':
+                    // escape special characters
+                    if (i == globPattern.length()) {
+                        throw new PatternSyntaxException("No character to escape",
+                                globPattern, i - 1);
+                    }
+                    char next = globPattern.charAt(i++);
+                    if (isGlobMeta(next) || isRegexMeta(next)) {
+                        regex.append('\\');
+                    }
+                    regex.append(next);
+                    break;
+                case '/':
+                    if (isDos) {
+                        regex.append("\\\\");
+                    } else {
+                        regex.append(c);
+                    }
+                    break;
+                case '[':
+                    // don't match name separator in class
+                    if (isDos) {
+                        regex.append("[[^\\\\]&&[");
+                    } else {
+                        regex.append("[[^/]&&[");
+                    }
+                    if (next(globPattern, i) == '^') {
+                        // escape the regex negation char if it appears
+                        regex.append("\\^");
+                        i++;
+                    } else {
+                        // negation
+                        if (next(globPattern, i) == '!') {
+                            regex.append('^');
+                            i++;
+                        }
+                        // hyphen allowed at start
+                        if (next(globPattern, i) == '-') {
+                            regex.append('-');
+                            i++;
+                        }
+                    }
+                    boolean hasRangeStart = false;
+                    char last = 0;
+                    while (i < globPattern.length()) {
+                        c = globPattern.charAt(i++);
+                        if (c == ']') {
+                            break;
+                        }
+                        if (c == '/' || (isDos && c == '\\')) {
+                            throw new PatternSyntaxException("Explicit 'name separator' in class",
+                                    globPattern, i - 1);
+                        }
+                        // TBD: how to specify ']' in a class?
+                        if (c == '\\' || c == '[' ||
+                                c == '&' && next(globPattern, i) == '&') {
+                            // escape '\', '[' or "&&" for regex class
+                            regex.append('\\');
+                        }
+                        regex.append(c);
+
+                        if (c == '-') {
+                            if (!hasRangeStart) {
+                                throw new PatternSyntaxException("Invalid range",
+                                        globPattern, i - 1);
+                            }
+                            if ((c = next(globPattern, i++)) == EOL || c == ']') {
+                                break;
+                            }
+                            if (c < last) {
+                                throw new PatternSyntaxException("Invalid range",
+                                        globPattern, i - 3);
+                            }
+                            regex.append(c);
+                            hasRangeStart = false;
+                        } else {
+                            hasRangeStart = true;
+                            last = c;
+                        }
+                    }
+                    if (c != ']') {
+                        throw new PatternSyntaxException("Missing ']", globPattern, i - 1);
+                    }
+                    regex.append("]]");
+                    break;
+                case '{':
+                    if (inGroup) {
+                        throw new PatternSyntaxException("Cannot nest groups",
+                                globPattern, i - 1);
+                    }
+                    regex.append("(?:(?:");
+                    inGroup = true;
+                    break;
+                case '}':
+                    if (inGroup) {
+                        regex.append("))");
+                        inGroup = false;
+                    } else {
+                        regex.append('}');
+                    }
+                    break;
+                case ',':
+                    if (inGroup) {
+                        regex.append(")|(?:");
+                    } else {
+                        regex.append(',');
+                    }
+                    break;
+                case '*':
+                    if (next(globPattern, i) == '*') {
+                        // crosses directory boundaries
+                        regex.append(".*");
+                        i++;
+                    } else {
+                        // within directory boundary
+                        if (isDos) {
+                            regex.append("[^\\\\]*");
+                        } else {
+                            regex.append("[^/]*");
+                        }
+                    }
+                    break;
+                case '?':
+                    if (isDos) {
+                        regex.append("[^\\\\]");
+                    } else {
+                        regex.append("[^/]");
+                    }
+                    break;
+
+                default:
+                    if (isRegexMeta(c)) {
+                        regex.append('\\');
+                    }
+                    regex.append(c);
+            }
+        }
+
+        if (inGroup) {
+            throw new PatternSyntaxException("Missing '}", globPattern, i - 1);
+        }
+
+        return regex.append('$').toString();
+    }
+
+    public static String toUnixRegexPattern(String globPattern) {
+        return toRegexPattern(globPattern, false);
+    }
+
+    public static String toWindowsRegexPattern(String globPattern) {
+        return toRegexPattern(globPattern, true);
+    }
+}

ibzdict-util/src/main/java/cn/ibizlab/util/helper/RuleUtils.java

@@ -280,22 +280,26 @@ public class RuleUtils
 				}
                 return finalTime.getTime()<tm.getTime();
             }
-            else if (finalObject instanceof Integer)
-            {
-                return (((Integer) finalObject).intValue() < ((Integer)exp).intValue());
-            }
-            else if (finalObject instanceof Double)
-            {
-                return (((Double) finalObject).doubleValue() < ((Double)exp).doubleValue());
-            }
-            else if (finalObject instanceof Float)
-            {
-                return (((Float) finalObject).floatValue() < ((Float)exp).floatValue());
-            }
-            else if (finalObject instanceof String)
-            {
-                return finalObject.toString().compareToIgnoreCase(exp.toString())<0;
-            }
+			else if (finalObject instanceof Integer)
+			{
+				return Integer.parseInt(finalObject.toString()) < Integer.parseInt(exp.toString());
+			}
+			else if (finalObject instanceof Double)
+			{
+				return Double.parseDouble(finalObject.toString()) < Double.parseDouble(exp.toString());
+			}
+			else if (finalObject instanceof Float)
+			{
+				return Float.parseFloat(finalObject.toString()) < Float.parseFloat(exp.toString());
+			}
+			else if (finalObject instanceof String)
+			{
+				return finalObject.toString().compareToIgnoreCase(exp.toString())<0;
+			}
+			else if (finalObject instanceof Long)
+			{
+				return Long.parseLong(finalObject.toString()) < Long.parseLong(exp.toString());
+			}
             else
                 return false;
         }

ibzdict-util/src/main/java/cn/ibizlab/util/rest/AppController.java

@@ -12,6 +12,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import java.util.*;
 
 @RestController
@@ -95,6 +96,26 @@ public class AppController {
 		return ResponseEntity.ok(ibzConfigService.getConfig(configType,targetType,userId));
 	}
 
+	@RequestMapping(method = RequestMethod.GET, value = "/configs/share/{id}")
+	public ResponseEntity<JSONObject> getShareConfig(@PathVariable("id") String id) {
+		JSONObject jo = ibzConfigService.getShareConfig(id);
+		if (jo == null) {
+			throw new BadRequestAlertException("无效的共享配置数据", "IBZConfig", id);
+		}
+		return ResponseEntity.ok(jo);
+	}
+
+	@RequestMapping(method = RequestMethod.GET, value = "/configs/share/{configType}/{targetType}")
+	public ResponseEntity<String> shareConfig(@PathVariable("configType") String configType, @PathVariable("targetType") String targetType) {
+		String userId = AuthenticationUser.getAuthenticationUser().getUserid();
+		if (StringUtils.isEmpty(userId)) {
+			throw new BadRequestAlertException("分享配置失败，参数缺失", "IBZConfig", configType);
+		}
+		String id = IdWorker.get32UUID();
+		ibzConfigService.saveShareConfig(id, configType, targetType, userId);
+		return ResponseEntity.ok(id);
+	}
+
 	/**
 	* 应用参数扩展
 	* @param appData

ibzdict-util/src/main/java/cn/ibizlab/util/security/AuthenticationInfo.java

@@ -9,6 +9,10 @@ import java.io.Serializable;
 @AllArgsConstructor
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class AuthenticationInfo implements Serializable {
-    private final String token;
-    private final AuthenticationUser user;
+    private String token;
+    private AuthenticationUser user;
+    
+    public AuthenticationInfo() {
+
+    }
 }

ibzdict-util/src/main/java/cn/ibizlab/util/security/AuthenticationUser.java

@@ -260,7 +260,6 @@ public class AuthenticationUser implements UserDetails
 		{
 			sessionParams = getUserSessionParam();
 			sessionParams.put("srfsystemid",this.getSrfsystemid());
-			sessionParams.put("srfdynainstid",this.getSrfdynainstid());
 			sessionParams.put("srfpersonid", this.getUserid());
 			sessionParams.put("srfpersonname", this.getPersonname());
 			sessionParams.put("srforgsectorid", this.getMdeptid());

ibzdict-util/src/main/java/cn/ibizlab/util/service/AuthenticationUserService.java

@@ -24,7 +24,7 @@ public interface AuthenticationUserService extends UserDetailsService {
     @Cacheable( value="ibzuaa_users", key = "'getByUsername:'+#p0")
     AuthenticationUser loadUserByLogin(String username,String password);
 
-    @CacheEvict( value="ibzuaa_users", key = "'getByUsername:'+#p0")
+    @CacheEvict( value="ibzuaa_users", key = "'glob:*getByUsername:'+#p0")
     default void resetByUsername(String username){}
 
 

ibzdict-util/src/main/java/cn/ibizlab/util/service/IBZConfigService.java

@@ -64,4 +64,14 @@ public class IBZConfigService extends ServiceImpl<IBZConfigMapper, IBZConfig> im
         this.remove(Wrappers.query(IBZConfig.builder().systemId(systemId).cfgType(cfgType).targetType(targetType).userId(userId).build()));
     }
 
+    @Cacheable(value="ibzrt_shareconfigs",key = "'cfgid:'+#p0")
+    public JSONObject saveShareConfig(String id, String cfgType,String targetType,String userId){
+        return this.getConfig(cfgType, targetType, userId);
+    }
+
+    @Cacheable(value="ibzrt_shareconfigs",key = "'cfgid:'+#p0")
+    public JSONObject getShareConfig(String id){
+        return null;
+    }
+
 }
\ No newline at end of file

ibzdict-util/src/main/java/cn/ibizlab/util/web/SearchContextHandlerMethodArgumentResolver.java

 package cn.ibizlab.util.web;
 
 import cn.ibizlab.util.filter.SearchContextBase;
+import cn.ibizlab.util.domain.DTOBase;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.MethodParameter;
@@ -24,7 +25,7 @@ public class SearchContextHandlerMethodArgumentResolver implements HandlerMethod
 
 	@Override
 	public boolean supportsParameter(MethodParameter parameter) {
-		return SearchContextBase.class.isAssignableFrom(parameter.getParameterType());
+		return SearchContextBase.class.isAssignableFrom(parameter.getParameterType()) || DTOBase.class.isAssignableFrom(parameter.getParameterType());
 	}
 
 	@Override
@@ -35,7 +36,7 @@ public class SearchContextHandlerMethodArgumentResolver implements HandlerMethod
 		for (String key : params.keySet()) {
 			set.put(key,params.get(key)[0]);
 		}
-		if((!set.containsKey("size")) ){
+		if(SearchContextBase.class.isAssignableFrom(parameter.getParameterType()) && (!set.containsKey("size"))){
 			set.put("size", pageLimit);
 		}
 		String json = objectMapper.writeValueAsString(set);

ibzdict-util/src/main/resources/application-sys.yml

@@ -23,7 +23,7 @@ spring:
   datasource:
     username: a_A_5d9d78509
     password: '@6dEfb3@'
-    url: jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
+    url: jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true&serverTimezone=GMT%2B8
     driver-class-name: com.mysql.jdbc.Driver
     filters: stat,wall,log4j2
     #配置初始化大小/最小/最大