ibiz4j 部署微服务应用

app_web/src/locale/lanres/entities/dst-view/dst-view_en_US.ts

@@ -26,7 +26,6 @@ export default {
 	},
 	main_form: {
 		details: {
-			router_meta: "动态表单测试", 
 			group1: "页面基本信息", 
 			formpage1: "基本信息", 
 			srforikey: "", 

app_web/src/locale/lanres/entities/dst-view/dst-view_zh_CN.ts

@@ -25,7 +25,6 @@ export default {
 	},
 	main_form: {
 		details: {
-			router_meta: "动态表单测试", 
 			group1: "页面基本信息", 
 			formpage1: "基本信息", 
 			srforikey: "", 

app_web/src/widgets/dst-router/main-form/main-form-base.vue

@@ -7,7 +7,7 @@
     <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.dstrouter.main_form.details.group1')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
     <row>
         <i-col v-show="detailsModel.routername.visible" :style="{}"  :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
-    <app-form-item name='routername' :itemRules="this.rules().routername" class='' :caption="$t('entities.dstrouter.main_form.details.routername')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.routername.error" :isEmptyCaption="false" labelPos="TOP">
+    <app-form-item name='routername' :itemRules="this.rules().routername" class='' :caption="$t('entities.dstrouter.main_form.details.routername')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.routername.error" :isEmptyCaption="false" labelPos="LEFT">
     <input-box 
     v-model="data.routername"  
     @enter="onEnter($event)"  
@@ -21,7 +21,7 @@
 
 </i-col>
 <i-col v-show="detailsModel.routerpath.visible" :style="{}"  :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
-    <app-form-item name='routerpath' :itemRules="this.rules().routerpath" class='' :caption="$t('entities.dstrouter.main_form.details.routerpath')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.routerpath.error" :isEmptyCaption="false" labelPos="TOP">
+    <app-form-item name='routerpath' :itemRules="this.rules().routerpath" class='' :caption="$t('entities.dstrouter.main_form.details.routerpath')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.routerpath.error" :isEmptyCaption="false" labelPos="LEFT">
     <input-box 
     v-model="data.routerpath"  
     @enter="onEnter($event)"  
@@ -35,14 +35,14 @@
 
 </i-col>
 <i-col v-show="detailsModel.component.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='component' :itemRules="this.rules().component" class='' :caption="$t('entities.dstrouter.main_form.details.component')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.component.error" :isEmptyCaption="false" labelPos="TOP">
+    <app-form-item name='component' :itemRules="this.rules().component" class='' :caption="$t('entities.dstrouter.main_form.details.component')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.component.error" :isEmptyCaption="false" labelPos="LEFT">
     <input-box v-model="data.component" :textareaId="this.$util.createUUID()"  :disabled="detailsModel.component.disabled" type='textarea' textareaStyle="height:200px;" ></input-box>
 
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.meta.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='meta' :itemRules="this.rules().meta" class='' :caption="$t('entities.dstrouter.main_form.details.meta')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.meta.error" :isEmptyCaption="false" labelPos="TOP">
+    <app-form-item name='meta' :itemRules="this.rules().meta" class='' :caption="$t('entities.dstrouter.main_form.details.meta')" uiStyle="DEFAULT" :labelWidth="0" :isShowCaption="false" :error="detailsModel.meta.error" :isEmptyCaption="false" labelPos="NONE">
     <avue-custom-form :isParseString="true" :isFormData="false"  v-model="data.meta" :formData="data" :url="`/lite/ibzlite-web/components/router_meta`" :formState="formState"></avue-custom-form>
 </app-form-item>
 
@@ -652,7 +652,7 @@ export default class MainBase extends Vue implements ControlInterface {
 , 
         component: new FormItemModel({ caption: '组件', detailType: 'FORMITEM', name: 'component', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
-        meta: new FormItemModel({ caption: 'meta', detailType: 'FORMITEM', name: 'meta', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+        meta: new FormItemModel({ caption: 'meta', detailType: 'FORMITEM', name: 'meta', visible: true, isShowCaption: false, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         parentid: new FormItemModel({ caption: '父路径标识', detailType: 'FORMITEM', name: 'parentid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 

app_web/src/widgets/dst-view/main-form/main-form-base.vue

@@ -67,10 +67,6 @@
 
 </app-form-item>
 
-</i-col>
-<i-col v-show="detailsModel.router_meta.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-part name="router_meta" :context="context" :viewparams="viewparams" :data="mixinData" :formState="formState" systemCodeName="ibzlite" appCodeName="web" deCodeName="DstView" formCodeName="Main" formDetailCodeName="router_meta" @change="onFormItemValueChange"></app-form-part>
-
 </i-col>
     
     </row>
@@ -417,7 +413,6 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof MainBase
      */
     public data: any = {
-        router_meta: null,
         srforikey: null,
         srfkey: null,
         srfmajortext: null,
@@ -654,8 +649,6 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof MainBase
      */
     public detailsModel: any = {
-        router_meta: new FormPartModel({ caption: '动态表单测试', detailType: 'FORMPART', name: 'router_meta', visible: true, isShowCaption: true, form: this, isControlledContent: false  })
-, 
         group1: new FormGroupPanelModel({ caption: '页面基本信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: false, form: this, isControlledContent: false , uiActionGroup: { caption: '', langbase: 'entities.dstview.main_form', extractMode: 'ITEM', details: [] }, isManageContainer: false, showMoreModeItems: []  })
 , 
         formpage1: new FormPageModel({ caption: '基本信息', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this, isControlledContent: false  })
@@ -943,7 +936,6 @@ export default class MainBase extends Vue implements ControlInterface {
 
 
 
-
     }
 
     /**

app_web/src/widgets/dst-view/main-form/main-form-model.ts

@@ -24,10 +24,6 @@ export default class MainModel {
         name: 'srffrontuf',
         prop: 'srffrontuf',
         dataType: 'TEXT',
-      },
-        {
-        name: 'router_meta',
-        dataType:'FORMPART'
       },
       {
         name: 'srforikey',

app_web/src/widgets/meta-model/main-form/main-form-base.vue

@@ -36,8 +36,7 @@
 </i-col>
 <i-col v-show="detailsModel.modelcfg.visible" :style="{}"  :sm="{ span: 24, offset: 0 }" :md="{ span: 24, offset: 0 }" :lg="{ span: 24, offset: 0 }" :xl="{ span: 24, offset: 0 }">
     <app-form-item name='modelcfg' :itemRules="this.rules().modelcfg" class='' :caption="$t('entities.metamodel.main_form.details.modelcfg')" uiStyle="DEFAULT" :labelWidth="0" :isShowCaption="false" :error="detailsModel.modelcfg.error" :isEmptyCaption="false" labelPos="NONE">
-    <input-box v-model="data.modelcfg" :textareaId="this.$util.createUUID()"  :disabled="detailsModel.modelcfg.disabled" type='textarea' textareaStyle="height:200px;" ></input-box>
-
+    <avue-custom-form :isParseString="true" :isFormData="false"  v-model="data.modelcfg" :formData="data"  :formState="formState"></avue-custom-form>
 </app-form-item>
 
 </i-col>

app_web/src/widgets/meta-relationship/main-form/main-form-base.vue

@@ -117,7 +117,7 @@
 
 </i-col>
 <i-col v-show="detailsModel.dstlookups.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='dstlookups' :itemRules="this.rules().dstlookups" class='' :caption="$t('entities.metarelationship.main_form.details.dstlookups')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.dstlookups.error" :isEmptyCaption="false" labelPos="LEFT">
+    <app-form-item name='dstlookups' :itemRules="this.rules().dstlookups" class='' :caption="$t('entities.metarelationship.main_form.details.dstlookups')" uiStyle="DEFAULT" :labelWidth="0" :isShowCaption="false" :error="detailsModel.dstlookups.error" :isEmptyCaption="false" labelPos="NONE">
     <avue-custom-form :isParseString="true" :isFormData="false"  v-model="data.dstlookups" :formData="data" :url="`/lite/ibzlite-web/components/lookup`" :formState="formState"></avue-custom-form>
 </app-form-item>
 
@@ -747,7 +747,7 @@ export default class MainBase extends Vue implements ControlInterface {
 , 
         nestedname: new FormItemModel({ caption: '嵌套代码名称', detailType: 'FORMITEM', name: 'nestedname', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
-        dstlookups: new FormItemModel({ caption: 'Lookup', detailType: 'FORMITEM', name: 'dstlookups', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+        dstlookups: new FormItemModel({ caption: 'Lookup', detailType: 'FORMITEM', name: 'dstlookups', visible: true, isShowCaption: false, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         refentityid: new FormItemModel({ caption: '引用实体标识', detailType: 'FORMITEM', name: 'refentityid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 

config.xml

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

ibzlite-app/ibzlite-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 /ibzlite-app-web.jar
 
-EXPOSE 8080
+EXPOSE 30010
 
 ADD ibzlite-app-web.jar /ibzlite-app-web.jar

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

@@ -3,9 +3,22 @@ services:
   ibzlite-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzlite-app-web:latest
     ports:
-      - "8080:8080"
+      - "30010:30010"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
+      - SERVER_PORT=30010
+      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
+      - SPRING_REDIS_HOST=172.16.100.243
+      - SPRING_REDIS_PORT=6379
+      - SPRING_REDIS_DATABASE=0
+      - SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
+      - SPRING_DATASOURCE_PASSWORD=@6dEfb3@
+      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
+      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
+      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
+      - NACOS=172.16.102.211:8848
     deploy:
       resources:
            limits:

ibzlite-provider/ibzlite-provider-api/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 /ibzlite-provider-api.jar
 
-EXPOSE 40010
+EXPOSE 8081
 
 ADD ibzlite-provider-api.jar /ibzlite-provider-api.jar

ibzlite-provider/ibzlite-provider-api/src/main/docker/ibzlite-provider-api.yaml

@@ -3,22 +3,9 @@ services:
   ibzlite-provider-api:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzlite-provider-api:latest
     ports:
-      - "40010:40010"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
-      - SERVER_PORT=40010
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
-      - SPRING_REDIS_HOST=172.16.100.243
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
-      - SPRING_DATASOURCE_PASSWORD=@6dEfb3@
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
-      - NACOS=172.16.102.211:8848
     deploy:
       resources:
            limits: