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

app_Web/src/locale/lanres/entities/ibizbook/ibizbook_en_US.ts

@@ -22,6 +22,7 @@ export default {
     borrower: "借阅人",
     borrowway: "借阅方式",
     returnlib: "归还图馆",
+    borrowerid: "借阅人ID",
   },
 	views: {
 		statewizardview: {
@@ -374,11 +375,11 @@ export default {
 			srfdeid: "", 
 			srfsourcekey: "", 
 			ibizbookid: "图书标识", 
-			borrower: "", 
 			author: "图书作者", 
 			formitem: "表格选择视图", 
 			formitem1: "数据选择视图", 
 			formitem2: "多选数据选择", 
+			borrowerid: "借阅人ID", 
 		},
 		uiactions: {
 		},

app_Web/src/locale/lanres/entities/ibizbook/ibizbook_zh_CN.ts

@@ -21,6 +21,7 @@ export default {
     borrower: "借阅人",
     borrowway: "借阅方式",
     returnlib: "归还图馆",
+    borrowerid: "借阅人ID",
   },
 	views: {
 		statewizardview: {
@@ -373,11 +374,11 @@ export default {
 			srfdeid: "", 
 			srfsourcekey: "", 
 			ibizbookid: "图书标识", 
-			borrower: "", 
 			author: "图书作者", 
 			formitem: "表格选择视图", 
 			formitem1: "数据选择视图", 
 			formitem2: "多选数据选择", 
+			borrowerid: "借阅人ID", 
 		},
 		uiactions: {
 		},

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

@@ -98,6 +98,10 @@ export default class GuideModel {
         name: 'returnlib',
         prop: 'returnlib',
       },
+      {
+        name: 'borrowerid',
+        prop: 'borrowerid',
+      },
     ]
   }
 

app_Web/src/widgets/ibizbook/inter-func-form-2-form/inter-func-form-2-form-base.vue

@@ -5,21 +5,7 @@
             <i-col v-show="detailsModel.group1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-group :uiService="appUIService" :data="transformData(data)" :manageContainerStatus="detailsModel.group1.manageContainerStatus"  :isManageContainer="detailsModel.group1.isManageContainer" @managecontainerclick="manageContainerClick('group1')" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.ibizbook.interfuncform_2_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
     <row>
-        <i-col v-show="detailsModel.borrower.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='borrower' :itemRules="this.rules().borrower" class='' :caption="$t('entities.ibizbook.interfuncform_2_form.details.borrower')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.borrower.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box 
-    v-model="data.borrower"  
-    @enter="onEnter($event)"  
-      
-    :disabled="detailsModel.borrower.disabled" 
-    type='text' 
-    style="">
-</input-box>
-
-</app-form-item>
-
-</i-col>
-<i-col v-show="detailsModel.author.visible" :style="{}"  :lg="{ span: 24, offset: 0 }" :xl="{ span: 6, offset: 0 }">
+        <i-col v-show="detailsModel.author.visible" :style="{}"  :lg="{ span: 24, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='author' :itemRules="this.rules().author" class='' :caption="$t('entities.ibizbook.interfuncform_2_form.details.author')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.author.error" :isEmptyCaption="false" labelPos="LEFT">
     
 <app-picker 
@@ -54,7 +40,7 @@
   :localParam ='{ }' 
   :disabled="detailsModel.formitem.disabled"
   name='formitem'
-  valueitem='' 
+  valueitem='borrowerid' 
   :value="data.formitem"
   editortype="pickup-no-ac" 
   :pickupView="{ viewname: 'ibizcustomer-pickup-grid-view', title: $t('entities.ibizcustomer.views.pickupgridview.title'), deResParameters: [], parameters: [{ pathName: 'ibizcustomers', parameterName: 'ibizcustomer' }, { pathName: 'pickupgridview', parameterName: 'pickupgridview' } ], placement:'' }"
@@ -77,7 +63,7 @@
   :localParam ='{ }' 
   :disabled="detailsModel.formitem1.disabled"
   name='formitem1'
-  valueitem='borrower' 
+  valueitem='borrowerid' 
   :value="data.formitem1"
   editortype="pickup-no-ac" 
   :pickupView="{ viewname: 'ibizcustomer-pickup-view', title: $t('entities.ibizcustomer.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'ibizcustomers', parameterName: 'ibizcustomer' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
@@ -101,7 +87,7 @@
     :localContext ='{ }' 
     :localParam ='{ }' 
     :service="service"
-    valueitem='borrower' 
+    valueitem='borrowerid' 
     :acParams="{ }"
     :pickupView="{ viewname: 'ibizcustomer-mpickup-view', title: $t('entities.ibizcustomer.views.mpickupview.title'), deResParameters: [], parameters: [{ pathName: 'ibizcustomers', parameterName: 'ibizcustomer' }, { pathName: 'mpickupview', parameterName: 'mpickupview' } ], placement:'' }"
     @formitemvaluechange="onFormItemValueChange" 
@@ -110,6 +96,20 @@
 
 </app-form-item>
 
+</i-col>
+<i-col v-show="detailsModel.borrowerid.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='borrowerid' :itemRules="this.rules().borrowerid" class='' :caption="$t('entities.ibizbook.interfuncform_2_form.details.borrowerid')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.borrowerid.error" :isEmptyCaption="false" labelPos="LEFT">
+    <input-box 
+    v-model="data.borrowerid"  
+    @enter="onEnter($event)"  
+     unit=""  
+    :disabled="detailsModel.borrowerid.disabled" 
+    type='text' 
+    style="">
+</input-box>
+
+</app-form-item>
+
 </i-col>
     
     </row>
@@ -512,11 +512,11 @@ export default class InterFuncForm_2Base extends Vue implements ControlInterface
         srfdeid: null,
         srfsourcekey: null,
         ibizbookid: null,
-        borrower: null,
         author: null,
         formitem: null,
         formitem1: null,
         formitem2: null,
+        borrowerid: null,
         ibizbook:null,
     };
 
@@ -568,10 +568,6 @@ export default class InterFuncForm_2Base extends Vue implements ControlInterface
      */
     public rules() :any {
     return {
-        borrower: [
-            { required: this.detailsModel.borrower.required, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.borrower.required, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
         author: [
             { required: this.detailsModel.author.required, type: 'string', message: '图书作者 值不能为空', trigger: 'change' },
             { required: this.detailsModel.author.required, type: 'string', message: '图书作者 值不能为空', trigger: 'blur' },
@@ -588,6 +584,10 @@ export default class InterFuncForm_2Base extends Vue implements ControlInterface
             { required: this.detailsModel.formitem2.required, type: 'string', message: '多选数据选择 值不能为空', trigger: 'change' },
             { required: this.detailsModel.formitem2.required, type: 'string', message: '多选数据选择 值不能为空', trigger: 'blur' },
         ],
+        borrowerid: [
+            { required: this.detailsModel.borrowerid.required, type: 'string', message: '借阅人ID 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.borrowerid.required, type: 'string', message: '借阅人ID 值不能为空', trigger: 'blur' },
+        ],
         }
     }
 
@@ -714,8 +714,6 @@ export default class InterFuncForm_2Base extends Vue implements ControlInterface
         srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         ibizbookid: new FormItemModel({ caption: '图书标识', detailType: 'FORMITEM', name: 'ibizbookid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
-, 
-        borrower: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'borrower', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         author: new FormItemModel({ caption: '图书作者', detailType: 'FORMITEM', name: 'author', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
@@ -724,6 +722,8 @@ export default class InterFuncForm_2Base extends Vue implements ControlInterface
         formitem1: new FormItemModel({ caption: '数据选择视图', detailType: 'FORMITEM', name: 'formitem1', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         formitem2: new FormItemModel({ caption: '多选数据选择', detailType: 'FORMITEM', name: 'formitem2', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+, 
+        borrowerid: new FormItemModel({ caption: '借阅人ID', detailType: 'FORMITEM', name: 'borrowerid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
     };
 
@@ -835,18 +835,6 @@ export default class InterFuncForm_2Base extends Vue implements ControlInterface
         this.formDataChange({ name: 'ibizbookid', newVal: newVal, oldVal: oldVal });
     }
 
-    /**
-     * 监控表单属性 borrower 值
-     *
-     * @param {*} newVal
-     * @param {*} oldVal
-     * @memberof InterFuncForm_2Base
-     */
-    @Watch('data.borrower')
-    onBorrowerChange(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'borrower', newVal: newVal, oldVal: oldVal });
-    }
-
     /**
      * 监控表单属性 author 值
      *
@@ -895,6 +883,18 @@ export default class InterFuncForm_2Base extends Vue implements ControlInterface
         this.formDataChange({ name: 'formitem2', newVal: newVal, oldVal: oldVal });
     }
 
+    /**
+     * 监控表单属性 borrowerid 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof InterFuncForm_2Base
+     */
+    @Watch('data.borrowerid')
+    onBorroweridChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'borrowerid', newVal: newVal, oldVal: oldVal });
+    }
+
 
     /**
      * 显示更多模式切换操作

app_Web/src/widgets/ibizbook/inter-func-form-2-form/inter-func-form-2-form-model.ts

@@ -60,10 +60,6 @@ export default class InterFuncForm_2Model {
         prop: 'ibizbookid',
         dataType: 'GUID',
       },
-      {
-        name: 'borrower',
-        dataType:'FORMITEM',
-      },
       {
         name: 'author',
         prop: 'author',
@@ -71,15 +67,23 @@ export default class InterFuncForm_2Model {
       },
       {
         name: 'formitem',
-        dataType:'FORMITEM',
+        prop: 'borrower',
+        dataType: 'TEXT',
       },
       {
         name: 'formitem1',
-        dataType:'FORMITEM',
+        prop: 'borrower',
+        dataType: 'TEXT',
       },
       {
         name: 'formitem2',
-        dataType:'FORMITEM',
+        prop: 'borrower',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'borrowerid',
+        prop: 'borrowerid',
+        dataType: 'TEXT',
       },
       {
         name: 'ibizbook',

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

@@ -78,6 +78,9 @@ export default class MainModel {
       {
         name: 'returnlib',
       },
+      {
+        name: 'borrowerid',
+      },
     ]
   }
 

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

@@ -98,6 +98,10 @@ export default class StateGuideModel {
         name: 'returnlib',
         prop: 'returnlib',
       },
+      {
+        name: 'borrowerid',
+        prop: 'borrowerid',
+      },
     ]
   }
 

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: