ShineKOT 部署微服务应用 [后台服务，演示应用]

app_Web/public/assets/json/data-dictionary.json

@@ -824,6 +824,35 @@
             }
         ]
     }, 
+    {
+        "srfkey": "IsExtendEditor",
+        "emptytext": "未定义",
+        "codelisttype":"static",
+        "items": [
+             {
+                "id": "1",
+                "label": "是",
+                "text": "是",
+                "class":"",
+                "data":"",
+                "codename":"Item_1",
+                "value": "1",
+                
+                "disabled": false
+            }
+            , {
+                "id": "0",
+                "label": "否",
+                "text": "否",
+                "class":"",
+                "data":"",
+                "codename":"Item_0",
+                "value": "0",
+                
+                "disabled": false
+            }
+        ]
+    }, 
     {
         "srfkey": "HARDWARETYPE",
         "emptytext": "未定义",

app_Web/src/locale/lanres/codelist/codelist_en_US.ts

@@ -114,6 +114,11 @@ export default {
         "fileupload": "文件上传类",
         "empty": ""
     },
+    IsExtendEditor: {
+        "1": "是",
+        "0": "否",
+        "empty": ""
+    },
     HARDWARETYPE: {
         "Storage": "存储",
         "CPU": "处理器",

app_Web/src/locale/lanres/codelist/codelist_zh_CN.ts

@@ -114,6 +114,11 @@ export default {
         "fileupload": "文件上传类",
         "empty": "",
     },
+    IsExtendEditor: {
+        "1": "是",
+        "0": "否",
+        "empty": "",
+    },
     HARDWARETYPE: {
         "Storage": "存储",
         "CPU": "处理器",

app_Web/src/locale/lanres/entities/ibizappeditor/ibizappeditor_en_US.ts

@@ -11,6 +11,7 @@ export default {
     rditordescription: "编辑器描述",
     documentaddress: "文档地址",
     amount: "数量",
+    isextendeditor: "是否为扩展编辑器",
   },
 	views: {
 		gridview: {
@@ -44,6 +45,7 @@ export default {
 			amount: "数量", 
 			ibizappeditorname: "编辑器名称", 
 			ibizappeditortype: "编辑器类型", 
+			isextendeditor: "是否为扩展编辑器", 
 			documentaddress: "文档地址", 
 			rditordescription: "编辑器描述", 
 			createman: "建立人", 

app_Web/src/locale/lanres/entities/ibizappeditor/ibizappeditor_zh_CN.ts

@@ -10,6 +10,7 @@ export default {
     rditordescription: "编辑器描述",
     documentaddress: "文档地址",
     amount: "数量",
+    isextendeditor: "是否为扩展编辑器",
   },
 	views: {
 		gridview: {
@@ -43,6 +44,7 @@ export default {
 			amount: "数量", 
 			ibizappeditorname: "编辑器名称", 
 			ibizappeditortype: "编辑器类型", 
+			isextendeditor: "是否为扩展编辑器", 
 			documentaddress: "文档地址", 
 			rditordescription: "编辑器描述", 
 			createman: "建立人", 

app_Web/src/mock/codelist/codelist.ts

@@ -832,6 +832,35 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
             },
         ]
     },
+    {
+        srfkey: "IsExtendEditor",
+        emptytext: "未定义",
+        "codelisttype":"static",
+        items: [
+            {
+                id: "1",
+                label: "是",
+                text: "是",
+                "class":"",
+                "data":"",
+                "codename":"Item_1",
+                value: "1",
+                
+                disabled: false,
+            },
+            {
+                id: "0",
+                label: "否",
+                text: "否",
+                "class":"",
+                "data":"",
+                "codename":"Item_0",
+                value: "0",
+                
+                disabled: false,
+            },
+        ]
+    },
     {
         srfkey: "HARDWARETYPE",
         emptytext: "未定义",

app_Web/src/widgets/ibizappeditor/app-editor-amount-portlet/app-editor-amount-portlet-model.ts

@@ -45,6 +45,9 @@ export default class AppEditorAmountModel {
       {
         name: 'amount',
       },
+      {
+        name: 'isextendeditor',
+      },
     ]
   }
 

app_Web/src/widgets/ibizappeditor/app-editor-list-view-portlet/app-editor-list-view-portlet-model.ts

@@ -45,6 +45,9 @@ export default class AppEditorListViewModel {
       {
         name: 'amount',
       },
+      {
+        name: 'isextendeditor',
+      },
     ]
   }
 

app_Web/src/widgets/ibizappeditor/editor-chart-portlet/editor-chart-portlet-model.ts

@@ -45,6 +45,9 @@ export default class EditorChartModel {
       {
         name: 'amount',
       },
+      {
+        name: 'isextendeditor',
+      },
     ]
   }
 

app_Web/src/widgets/ibizappeditor/main-form/main-form-base.vue

@@ -49,6 +49,27 @@
 
 </app-form-item>
 
+</i-col>
+<i-col v-show="detailsModel.isextendeditor.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='isextendeditor' :itemRules="this.rules().isextendeditor" class='' :caption="$t('entities.ibizappeditor.main_form.details.isextendeditor')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.isextendeditor.error" :isEmptyCaption="false" labelPos="LEFT">
+    
+ <dropdown-list 
+    v-model="data.isextendeditor" 
+    :data="data" 
+    :context="context"
+    :viewparams="viewparams"
+    :formState="formState" 
+    :localContext ='{ }' 
+    :localParam ='{ }' 
+    :disabled="detailsModel.isextendeditor.disabled" 
+    valueType="string"
+    tag='IsExtendEditor' 
+    codelistType='STATIC'
+    placeholder='请选择...' style="">
+ </dropdown-list>
+
+</app-form-item>
+
 </i-col>
 <i-col v-show="detailsModel.documentaddress.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='documentaddress' :itemRules="this.rules().documentaddress" class='' :caption="$t('entities.ibizappeditor.main_form.details.documentaddress')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.documentaddress.error" :isEmptyCaption="false" labelPos="LEFT">
@@ -543,6 +564,7 @@ export default class MainBase extends Vue implements ControlInterface {
         amount: null,
         ibizappeditorname: null,
         ibizappeditortype: null,
+        isextendeditor: null,
         documentaddress: null,
         rditordescription: null,
         createman: null,
@@ -608,6 +630,10 @@ export default class MainBase extends Vue implements ControlInterface {
             { required: this.detailsModel.ibizappeditortype.required, type: 'string', message: '编辑器类型 值不能为空', trigger: 'change' },
             { required: this.detailsModel.ibizappeditortype.required, type: 'string', message: '编辑器类型 值不能为空', trigger: 'blur' },
         ],
+        isextendeditor: [
+            { required: this.detailsModel.isextendeditor.required, type: 'string', message: '是否为扩展编辑器 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.isextendeditor.required, type: 'string', message: '是否为扩展编辑器 值不能为空', trigger: 'blur' },
+        ],
         documentaddress: [
             { required: this.detailsModel.documentaddress.required, type: 'string', message: '文档地址 值不能为空', trigger: 'change' },
             { required: this.detailsModel.documentaddress.required, type: 'string', message: '文档地址 值不能为空', trigger: 'blur' },
@@ -768,6 +794,8 @@ export default class MainBase extends Vue implements ControlInterface {
         ibizappeditorname: new FormItemModel({ caption: '编辑器名称', detailType: 'FORMITEM', name: 'ibizappeditorname', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         ibizappeditortype: new FormItemModel({ caption: '编辑器类型', detailType: 'FORMITEM', name: 'ibizappeditortype', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+, 
+        isextendeditor: new FormItemModel({ caption: '是否为扩展编辑器', detailType: 'FORMITEM', name: 'isextendeditor', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         documentaddress: new FormItemModel({ caption: '文档地址', detailType: 'FORMITEM', name: 'documentaddress', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
@@ -928,6 +956,18 @@ export default class MainBase extends Vue implements ControlInterface {
         this.formDataChange({ name: 'ibizappeditortype', newVal: newVal, oldVal: oldVal });
     }
 
+    /**
+     * 监控表单属性 isextendeditor 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof MainBase
+     */
+    @Watch('data.isextendeditor')
+    onIsextendeditorChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'isextendeditor', newVal: newVal, oldVal: oldVal });
+    }
+
     /**
      * 监控表单属性 documentaddress 值
      *
@@ -1074,6 +1114,7 @@ export default class MainBase extends Vue implements ControlInterface {
 
 
 
+
 
 
     }

app_Web/src/widgets/ibizappeditor/main-form/main-form-model.ts

@@ -75,6 +75,11 @@ export default class MainModel {
         prop: 'ibizappeditortype',
         dataType: 'TEXT',
       },
+      {
+        name: 'isextendeditor',
+        prop: 'isextendeditor',
+        dataType: 'TEXT',
+      },
       {
         name: 'documentaddress',
         prop: 'documentaddress',

app_Web/src/widgets/ibizbook/gridexpbar-grid-grid/gridexpbar-grid-grid-base.vue

@@ -930,17 +930,17 @@ export default class Gridexpbar_gridBase extends Vue implements ControlInterface
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
-            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
+            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
             "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
-            "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000}
+            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
+            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
+            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizbook/internal-func-grid/internal-func-grid-base.vue

@@ -1199,17 +1199,17 @@ export default class InternalFuncBase extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
-            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
+            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
             "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
-            "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000}
+            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
+            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
+            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizbook/main2-grid/main2-grid-base.vue

@@ -1079,17 +1079,17 @@ export default class Main2Base extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
-            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
+            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
             "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
-            "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000}
+            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
+            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
+            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizbook/main3-grid/main3-grid-base.vue

@@ -1079,17 +1079,17 @@ export default class Main3Base extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
-            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
+            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
             "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
-            "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000}
+            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
+            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
+            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizbook/main4-grid/main4-grid-base.vue

@@ -1070,17 +1070,17 @@ export default class Main4Base extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
-            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
+            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
             "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
-            "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000}
+            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
+            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
+            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizbook/main5-grid/main5-grid-base.vue

@@ -1086,17 +1086,17 @@ export default class Main5Base extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
-            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
+            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
             "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
-            "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000}
+            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
+            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
+            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizbook/main6-grid/main6-grid-base.vue

@@ -1287,17 +1287,17 @@ export default class Main6Base extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
-            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
+            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
             "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
-            "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000}
+            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
+            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
+            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizbook/new-default-grid/new-default-grid-base.vue

@@ -1206,17 +1206,17 @@ export default class NewDefaultBase extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
-            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
+            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
             "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
-            "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000}
+            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
+            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
+            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizbook/row-edit-grid/row-edit-grid-base.vue

@@ -1287,17 +1287,17 @@ export default class RowEditBase extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
-            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
+            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
             "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
-            "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000}
+            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
+            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
+            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizbook/row-rules-grid/row-rules-grid-base.vue

@@ -1183,17 +1183,17 @@ export default class RowRulesBase extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
-            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
+            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
             "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
-            "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000}
+            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
+            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
+            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizbook/tree-table-treegridex/tree-table-treegridex-base.vue

@@ -15,6 +15,11 @@
         <template slot="empty">
             {{$t('entities.ibizbook.treetable_treegridex.nodata')}}
         </template>
+        <el-table-column show-overflow-tooltip prop="author" label="作者" :width="50"  :align="''">
+        <template v-slot="{ row }">
+            <span>{{ getColumnValue(row, 'author') }}</span>
+        </template>
+        </el-table-column>
         <el-table-column show-overflow-tooltip prop="subtext" label="图书描述" :width="50"  :align="''">
         <template v-slot="{ row }">
             <span>{{ getColumnValue(row, 'subtext') }}</span>
@@ -25,11 +30,6 @@
             <span>{{ getColumnValue(row, 'ibizbookname') }}</span>
         </template>
         </el-table-column>
-        <el-table-column show-overflow-tooltip prop="author" label="作者" :width="50"  :align="''">
-        <template v-slot="{ row }">
-            <span>{{ getColumnValue(row, 'author') }}</span>
-        </template>
-        </el-table-column>
     </el-table>
 </template>
 

app_Web/src/widgets/ibizbook/ui-action-grid-grid/ui-action-grid-grid-base.vue

@@ -1304,17 +1304,17 @@ export default class UiActionGridBase extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
-            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
+            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
             "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
-            "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000}
+            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
+            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
+            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizbook/update-default-grid/update-default-grid-base.vue

@@ -1206,17 +1206,17 @@ export default class UpdateDefaultBase extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
-            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
+            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
             "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
-            "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000}
+            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
+            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
+            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizbook/usr-gantt/usr-gantt-base.vue

@@ -238,42 +238,42 @@ export default class UsrBase extends Vue implements ControlInterface {
             labelField: 'text',
             columns: [
                 {
-                    label: '图书名称',
-                    value: 'ibizbookname',
+                    label: '借出日期',
+                    value: 'lendouttime',
                     render: (task: any) => {
-                        return this.getColumnValue(task, 'ibizbookname')
+                        return this.getColumnValue(task, 'lendouttime')
                     },
                     width: 200,
                 },
                 {
-                    label: '出版社',
-                    value: 'press',
+                    label: '归还日期',
+                    value: 'returntime',
                     render: (task: any) => {
-                        return this.getColumnValue(task, 'press')
+                        return this.getColumnValue(task, 'returntime')
                     },
                     width: 200,
                 },
                 {
-                    label: '作者',
-                    value: 'author',
+                    label: '图书名称',
+                    value: 'ibizbookname',
                     render: (task: any) => {
-                        return this.getColumnValue(task, 'author')
+                        return this.getColumnValue(task, 'ibizbookname')
                     },
                     width: 200,
                 },
                 {
-                    label: '借出日期',
-                    value: 'lendouttime',
+                    label: '出版社',
+                    value: 'press',
                     render: (task: any) => {
-                        return this.getColumnValue(task, 'lendouttime')
+                        return this.getColumnValue(task, 'press')
                     },
                     width: 200,
                 },
                 {
-                    label: '归还日期',
-                    value: 'returntime',
+                    label: '作者',
+                    value: 'author',
                     render: (task: any) => {
-                        return this.getColumnValue(task, 'returntime')
+                        return this.getColumnValue(task, 'author')
                     },
                     width: 200,
                 },

app_Web/src/widgets/ibizorder/main-grid/main-grid-base.vue

@@ -1114,10 +1114,10 @@ export default class MainBase extends Vue implements ControlInterface {
             serviceName:'ibizorder',
             appDeLogicName:'订单',
             importData:{
-            "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000},
-            "ORDERTYPE":{"codelist":{"type":"DYNAMIC","tag":"ORDERTYPE","isnumber":false},"headername":"订单类型","isuniqueitem":false,"name":"ordertype","order":1000},
             "IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000},
-            "ORDERTIME":{"headername":"订单时间","isuniqueitem":false,"name":"ordertime","order":1000}
+            "ORDERTYPE":{"codelist":{"type":"DYNAMIC","tag":"ORDERTYPE","isnumber":false},"headername":"订单类型","isuniqueitem":false,"name":"ordertype","order":1000},
+            "ORDERTIME":{"headername":"订单时间","isuniqueitem":false,"name":"ordertime","order":1000},
+            "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizorder/main2-grid/main2-grid-base.vue

@@ -1030,10 +1030,10 @@ export default class Main2Base extends Vue implements ControlInterface {
             serviceName:'ibizorder',
             appDeLogicName:'订单',
             importData:{
-            "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000},
-            "ORDERTYPE":{"codelist":{"type":"DYNAMIC","tag":"ORDERTYPE","isnumber":false},"headername":"订单类型","isuniqueitem":false,"name":"ordertype","order":1000},
             "IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000},
-            "ORDERTIME":{"headername":"订单时间","isuniqueitem":false,"name":"ordertime","order":1000}
+            "ORDERTYPE":{"codelist":{"type":"DYNAMIC","tag":"ORDERTYPE","isnumber":false},"headername":"订单类型","isuniqueitem":false,"name":"ordertype","order":1000},
+            "ORDERTIME":{"headername":"订单时间","isuniqueitem":false,"name":"ordertime","order":1000},
+            "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizorder/uipart-0015-grid/uipart-0015-grid-base.vue

@@ -1066,10 +1066,10 @@ export default class UIPART_0015Base extends Vue implements ControlInterface {
             serviceName:'ibizorder',
             appDeLogicName:'订单',
             importData:{
-            "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000},
-            "ORDERTYPE":{"codelist":{"type":"DYNAMIC","tag":"ORDERTYPE","isnumber":false},"headername":"订单类型","isuniqueitem":false,"name":"ordertype","order":1000},
             "IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000},
-            "ORDERTIME":{"headername":"订单时间","isuniqueitem":false,"name":"ordertime","order":1000}
+            "ORDERTYPE":{"codelist":{"type":"DYNAMIC","tag":"ORDERTYPE","isnumber":false},"headername":"订单类型","isuniqueitem":false,"name":"ordertype","order":1000},
+            "ORDERTIME":{"headername":"订单时间","isuniqueitem":false,"name":"ordertime","order":1000},
+            "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizorder/uipart-0017-grid/uipart-0017-grid-base.vue

@@ -1189,10 +1189,10 @@ export default class UIPART_0017Base extends Vue implements ControlInterface {
             serviceName:'ibizorder',
             appDeLogicName:'订单',
             importData:{
-            "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000},
-            "ORDERTYPE":{"codelist":{"type":"DYNAMIC","tag":"ORDERTYPE","isnumber":false},"headername":"订单类型","isuniqueitem":false,"name":"ordertype","order":1000},
             "IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000},
-            "ORDERTIME":{"headername":"订单时间","isuniqueitem":false,"name":"ordertime","order":1000}
+            "ORDERTYPE":{"codelist":{"type":"DYNAMIC","tag":"ORDERTYPE","isnumber":false},"headername":"订单类型","isuniqueitem":false,"name":"ordertype","order":1000},
+            "ORDERTIME":{"headername":"订单时间","isuniqueitem":false,"name":"ordertime","order":1000},
+            "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizorder/uipart-0018-grid/uipart-0018-grid-base.vue

@@ -1121,10 +1121,10 @@ export default class UIPART_0018Base extends Vue implements ControlInterface {
             serviceName:'ibizorder',
             appDeLogicName:'订单',
             importData:{
-            "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000},
-            "ORDERTYPE":{"codelist":{"type":"DYNAMIC","tag":"ORDERTYPE","isnumber":false},"headername":"订单类型","isuniqueitem":false,"name":"ordertype","order":1000},
             "IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000},
-            "ORDERTIME":{"headername":"订单时间","isuniqueitem":false,"name":"ordertime","order":1000}
+            "ORDERTYPE":{"codelist":{"type":"DYNAMIC","tag":"ORDERTYPE","isnumber":false},"headername":"订单类型","isuniqueitem":false,"name":"ordertype","order":1000},
+            "ORDERTIME":{"headername":"订单时间","isuniqueitem":false,"name":"ordertime","order":1000},
+            "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

config.xml

@@ -37,11 +37,11 @@
 	  git clone -b master $para2 demosys/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd demosys/
-      mvn clean package -Pdemoapi
-      cd demo-provider/demo-provider-demoapi
-      mvn -Pdemoapi docker:build
-      mvn -Pdemoapi docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/demo-provider-demoapi.yaml iBizDemo --with-registry-auth      
+      mvn clean package -Pweb
+      cd demo-app/demo-app-web
+      mvn -Pweb docker:build
+      mvn -Pweb docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/demo-app-web.yaml iBizDemo --with-registry-auth
       </command>
     </hudson.tasks.Shell>
   </builders>

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

@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /demo-app-web.jar
 
-EXPOSE 8080
+EXPOSE 51001
 
 ADD demo-app-web.jar /demo-app-web.jar

demo-app/demo-app-web/src/main/docker/demo-app-web.yaml

@@ -3,9 +3,24 @@ services:
   demo-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/demo-app-web:latest
     ports:
-      - "8080:8080"
+      - "51001:51001"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
+      - SERVER_PORT=51001
+      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
+      - SPRING_REDIS_HOST=172.16.240.110
+      - SPRING_REDIS_PORT=6379
+      - SPRING_REDIS_DATABASE=0
+      - SPRING_DATASOURCE_USERNAME=a_LAB01_df847bdfd
+      - SPRING_DATASOURCE_PASSWORD=3d6@460A
+      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_df847bdfd?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
+      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
+      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_df847bdfd
+      - NACOS=172.16.240.110:8848
+      - SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
+      - SEATA_ENABLED=true
     deploy:
       resources:
            limits:

demo-provider/demo-provider-demoapi/src/main/docker/Dockerfile

@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /demo-provider-demoapi.jar
 
-EXPOSE 51000
+EXPOSE 8081
 
 ADD demo-provider-demoapi.jar /demo-provider-demoapi.jar

demo-provider/demo-provider-demoapi/src/main/docker/demo-provider-demoapi.yaml

@@ -3,24 +3,9 @@ services:
   demo-provider-demoapi:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/demo-provider-demoapi:latest
     ports:
-      - "51000:51000"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-      - SERVER_PORT=51000
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
-      - SPRING_REDIS_HOST=172.16.240.110
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_df847bdfd
-      - SPRING_DATASOURCE_PASSWORD=3d6@460A
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_df847bdfd?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_df847bdfd
-      - NACOS=172.16.240.110:8848
-      - SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
-      - SEATA_ENABLED=true
     deploy:
       resources:
            limits: