ShineKOT 发布系统代码 [后台服务，演示应用]

app_Web/src/locale/lanres/entities/ibizappview/ibizappview_en_US.ts

@@ -39,11 +39,11 @@ export default {
 			ibizappviewtype: "应用视图类型", 
 			ibizinstanceaddress: "实例地址", 
 			ibizyuqueaddress: "文档地址", 
+			ibizappviewid: "应用视图数据信息标识", 
 			createman: "建立人", 
 			createdate: "建立时间", 
 			updateman: "更新人", 
 			updatedate: "更新时间", 
-			ibizappviewid: "应用视图数据信息标识", 
 		},
 		uiactions: {
 		},

app_Web/src/locale/lanres/entities/ibizappview/ibizappview_zh_CN.ts

@@ -38,11 +38,11 @@ export default {
 			ibizappviewtype: "应用视图类型", 
 			ibizinstanceaddress: "实例地址", 
 			ibizyuqueaddress: "文档地址", 
+			ibizappviewid: "应用视图数据信息标识", 
 			createman: "建立人", 
 			createdate: "建立时间", 
 			updateman: "更新人", 
 			updatedate: "更新时间", 
-			ibizappviewid: "应用视图数据信息标识", 
 		},
 		uiactions: {
 		},

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

@@ -70,6 +70,16 @@
 
 </app-form-item>
 
+</i-col>
+<i-col v-show="detailsModel.ibizappviewid.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='ibizappviewid' :itemRules="this.rules().ibizappviewid" class='' :caption="$t('entities.ibizappview.main_form.details.ibizappviewid')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.ibizappviewid.error" :isEmptyCaption="false" labelPos="LEFT">
+    
+<app-span name='ibizappviewid' :value="data.ibizappviewid" dataType="GUID"     :precision="0"
+:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style="">  
+</app-span>
+
+</app-form-item>
+
 </i-col>
     
     </row>
@@ -304,7 +314,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @type {string}
      * @memberof MainBase
      */
-    public formKeyItemName: string = '';
+    public formKeyItemName: string = 'ibizappviewid';
 
     /**
      * 是否自动加载
@@ -536,11 +546,11 @@ export default class MainBase extends Vue implements ControlInterface {
         ibizappviewtype: null,
         ibizinstanceaddress: null,
         ibizyuqueaddress: null,
+        ibizappviewid: null,
         createman: null,
         createdate: null,
         updateman: null,
         updatedate: null,
-        ibizappviewid: null,
         ibizappview:null,
     };
 
@@ -608,6 +618,10 @@ export default class MainBase extends Vue implements ControlInterface {
             { required: this.detailsModel.ibizyuqueaddress.required, type: 'string', message: '文档地址 值不能为空', trigger: 'change' },
             { required: this.detailsModel.ibizyuqueaddress.required, type: 'string', message: '文档地址 值不能为空', trigger: 'blur' },
         ],
+        ibizappviewid: [
+            { required: this.detailsModel.ibizappviewid.required, type: 'string', message: '应用视图数据信息标识 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.ibizappviewid.required, type: 'string', message: '应用视图数据信息标识 值不能为空', trigger: 'blur' },
+        ],
         createman: [
             { required: this.detailsModel.createman.required, type: 'string', message: '建立人 值不能为空', trigger: 'change' },
             { required: this.detailsModel.createman.required, type: 'string', message: '建立人 值不能为空', trigger: 'blur' },
@@ -760,6 +774,8 @@ export default class MainBase extends Vue implements ControlInterface {
         ibizinstanceaddress: new FormItemModel({ caption: '实例地址', detailType: 'FORMITEM', name: 'ibizinstanceaddress', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         ibizyuqueaddress: new FormItemModel({ caption: '文档地址', detailType: 'FORMITEM', name: 'ibizyuqueaddress', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+, 
+        ibizappviewid: new FormItemModel({ caption: '应用视图数据信息标识', detailType: 'FORMITEM', name: 'ibizappviewid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         createman: new FormItemModel({ caption: '建立人', detailType: 'FORMITEM', name: 'createman', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
@@ -768,8 +784,6 @@ export default class MainBase extends Vue implements ControlInterface {
         updateman: new FormItemModel({ caption: '更新人', detailType: 'FORMITEM', name: 'updateman', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         updatedate: new FormItemModel({ caption: '更新时间', detailType: 'FORMITEM', name: 'updatedate', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
-, 
-        ibizappviewid: new FormItemModel({ caption: '应用视图数据信息标识', detailType: 'FORMITEM', name: 'ibizappviewid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         form: new FormTabPanelModel({ caption: 'form', detailType: 'TABPANEL', name: 'form', visible: true, isShowCaption: true, form: this, tabPages: [{ name: 'formpage1', index: 0, visible: true }, { name: 'formpage2', index: 1, visible: true }] }),
     };
@@ -918,6 +932,18 @@ export default class MainBase extends Vue implements ControlInterface {
         this.formDataChange({ name: 'ibizyuqueaddress', newVal: newVal, oldVal: oldVal });
     }
 
+    /**
+     * 监控表单属性 ibizappviewid 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof MainBase
+     */
+    @Watch('data.ibizappviewid')
+    onIbizappviewidChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'ibizappviewid', newVal: newVal, oldVal: oldVal });
+    }
+
     /**
      * 监控表单属性 createman 值
      *
@@ -966,18 +992,6 @@ export default class MainBase extends Vue implements ControlInterface {
         this.formDataChange({ name: 'updatedate', newVal: newVal, oldVal: oldVal });
     }
 
-    /**
-     * 监控表单属性 ibizappviewid 值
-     *
-     * @param {*} newVal
-     * @param {*} oldVal
-     * @memberof MainBase
-     */
-    @Watch('data.ibizappviewid')
-    onIbizappviewidChange(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'ibizappviewid', newVal: newVal, oldVal: oldVal });
-    }
-
 
     /**
      * 显示更多模式切换操作
@@ -1514,6 +1528,7 @@ export default class MainBase extends Vue implements ControlInterface {
             const data = response.data;
             this.resetDraftFormStates();
             this.onFormLoad(data,'loadDraft');
+            this.data.ibizappviewid = null;
             data.ibizappview = null;
             this.$emit('load', data);
             this.$nextTick(() => {

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

@@ -75,6 +75,11 @@ export default class MainModel {
         prop: 'ibizyuqueaddress',
         dataType: 'TEXT',
       },
+      {
+        name: 'ibizappviewid',
+        prop: 'ibizappviewid',
+        dataType: 'GUID',
+      },
       {
         name: 'createman',
         prop: 'createman',
@@ -95,11 +100,6 @@ export default class MainModel {
         prop: 'updatedate',
         dataType: 'DATETIME',
       },
-      {
-        name: 'ibizappviewid',
-        prop: 'ibizappviewid',
-        dataType: 'GUID',
-      },
       {
         name: 'ibizappview',
         prop: 'ibizappviewid',

app_Web/src/widgets/ibizappview/main-form/main-form-service.ts

@@ -172,6 +172,7 @@ export default class MainService extends ControlService {
     @Errorlog
     public add(action: string, context: any = {},data: any = {}, isloading?: boolean,isWorkflow?:boolean): Promise<any> {
         const {data:Data,context:Context} = this.handleRequestData(action,context,data);
+        Object.assign(Data,{ibizappviewid: data.ibizappviewid, srffrontuf: '1'});
         return new Promise((resolve: any, reject: any) => {
             let result: Promise<any>;
             const _appEntityService: any = this.appEntityService;

app_Web/src/widgets/ibizbook/guide-wizardpanel/guide-wizardpanel-model.ts

@@ -122,6 +122,10 @@ export default class GuideModel {
         name: 'borrower3',
         prop: 'borrower3',
       },
+      {
+        name: 'borrower3_id',
+        prop: 'borrower3_id',
+      },
     ]
   }
 

app_Web/src/widgets/ibizbook/main-multieditviewpanel/main-multieditviewpanel-model.ts

@@ -96,6 +96,9 @@ export default class MainModel {
       {
         name: 'borrower3',
       },
+      {
+        name: 'borrower3_id',
+      },
     ]
   }
 

app_Web/src/widgets/ibizbook/state-field-guide-wizardpanel/state-field-guide-wizardpanel-model.ts

@@ -122,6 +122,10 @@ export default class StateFieldGuideModel {
         name: 'borrower3',
         prop: 'borrower3',
       },
+      {
+        name: 'borrower3_id',
+        prop: 'borrower3_id',
+      },
     ]
   }
 

config.xml

@@ -37,11 +37,6 @@
 	  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      
       </command>
     </hudson.tasks.Shell>
   </builders>

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: