Merge remote-tracking branch 'origin/master'

app_web/public/assets/json/view-config.json

@@ -8,8 +8,8 @@
         "viewtag": "0134ebf9391cb5f988839332c1352cd9"
     },
     "index": {
-        "title": "ibizlab-uaa",
-        "caption": "ibizlab-uaa",
+        "title": "uaa",
+        "caption": "ibizlab",
         "viewtype": "APPINDEXVIEW",
         "viewmodule": "uaa",
         "viewname": "Index",

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

@@ -54,8 +54,8 @@ export default {
         // 非实体视图
         views: {
             index: {
-                caption: "ibizlab-uaa",
-                title: "ibizlab-uaa",
+                caption: "ibizlab",
+                title: "uaa",
             },
         },
         utilview:{

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

@@ -54,8 +54,8 @@ export default {
         // 非实体视图
         views: {
             index: {
-                caption: "ibizlab-uaa",
-                title: "ibizlab-uaa",
+                caption: "ibizlab",
+                title: "uaa",
             },
         },
         utilview:{

app_web/src/mock/app/main-appmenu/main-appmenu.ts

@@ -79,7 +79,7 @@ mock.onGet('v7/mainappmenu').reply((config: any) => {
 	iconcls: 'fa fa-buysellads',
 	icon: '',
 	textcls: '',
-	appfunctag: '_2',
+	appfunctag: 'Auto12',
 	resourcetag: '',
 },
         ],

app_web/src/mock/viewconfig/viewconfig.ts

@@ -16,8 +16,8 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewtag": "0134ebf9391cb5f988839332c1352cd9"
         },
         "index": {
-            "title": "ibizlab-uaa",
-            "caption": "ibizlab-uaa",
+            "title": "uaa",
+            "caption": "ibizlab",
             "viewtype": "APPINDEXVIEW",
             "viewmodule": "uaa",
             "viewname": "Index",

app_web/src/widgets/app/main-appmenu/main-appmenu-base.vue

@@ -586,8 +586,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 case 'Auto5': 
                     this.clickAuto5(item);
                     return;
-                case '_2': 
-                    this.click_2(item);
+                case 'Auto12': 
+                    this.clickAuto12(item);
                     return;
                 case 'Auto6': 
                     this.clickAuto6(item);
@@ -651,7 +651,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @param {*} [item={}]
      * @memberof Main
      */
-    public click_2(item: any = {}) {
+    public clickAuto12(item: any = {}) {
         const viewparam: any = {};
         Object.assign(viewparam, {});
         const deResParameters: any[] = [];

app_web/src/widgets/app/main-appmenu/main-appmenu-model.ts

@@ -86,7 +86,7 @@ export default class MainModel {
 	iconcls: 'fa fa-buysellads',
 	icon: '',
 	textcls: '',
-	appfunctag: '_2',
+	appfunctag: 'Auto12',
 	resourcetag: '',
 	authtag:'web-Main-menuitem2',
 },
@@ -125,7 +125,7 @@ export default class MainModel {
             ],
         },
         {
-            appfunctag: '_2',
+            appfunctag: 'Auto12',
             appfuncyype: 'APPVIEW',
             openmode: '',
             codename: 'sysappgridview',

app_web/vue.config.js

@@ -30,7 +30,7 @@ module.exports = {
             filename: 'index.html',
             // 当使用 title 选项时，
             // template 中的 title 标签需要是 <title><%= htmlWebpackPlugin.options.title %></title>
-            title: 'ibizlab-uaa',
+            title: 'uaa',
             // 在这个页面中包含的块，默认情况下会包含
             // 提取出来的通用 chunk 和 vendor chunk。
             // chunks: ['chunk-vendors', 'chunk-common', 'index']

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

@@ -67,6 +67,13 @@ feign:
     enabled: true
   sentinel:
     enabled: true
+  compression:
+    request:
+      enabled: true
+      mime-types: application/javascript,text/css,application/json,application/xml,text/html,text/xml,text/plain
+      min-response-size: 10240
+    response:
+      enabled: true
 
 #Log配置
 logging: