zhouweidong 部署微服务应用 [ibz-ou，统一组织单位]

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

@@ -35,6 +35,35 @@
                 "codename":"Item_3",
                 "value": "性别不详",
                 
+                "disabled": false
+            }
+        ]
+    }, 
+    {
+        "srfkey": "YesNo",
+        "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
             }
         ]

app_web/src/locale/lanres/codelist/codelist_en_US_base.ts

@@ -8,6 +8,11 @@ function getLocaleResourceBase(){
           "性别不详": commonLogic.appcommonhandle("性别不详",null),
           "empty": commonLogic.appcommonhandle("",null)
       },
+      YesNo: {
+          "1": commonLogic.appcommonhandle("是",null),
+          "0": commonLogic.appcommonhandle("否",null),
+          "empty": commonLogic.appcommonhandle("",null)
+      },
   };
   return data;
 }

app_web/src/locale/lanres/codelist/codelist_zh_CN_base.ts

@@ -8,6 +8,11 @@ function getLocaleResourceBase(){
           "性别不详": commonLogic.appcommonhandle("性别不详",null),
           "empty": commonLogic.appcommonhandle("",null),
       },
+      YesNo: {
+          "1": commonLogic.appcommonhandle("是",null),
+          "0": commonLogic.appcommonhandle("否",null),
+          "empty": commonLogic.appcommonhandle("",null),
+      },
   };
   return data;
 }

app_web/src/locale/lanres/entities/sys-department/sys-department_en_US_base.ts

@@ -20,6 +20,7 @@ function getLocaleResourceBase(){
 		parentdeptname: commonLogic.appcommonhandle("上级部门",null),
 		createdate: commonLogic.appcommonhandle("创建时间",null),
 		updatedate: commonLogic.appcommonhandle("最后修改时间",null),
+		isvalid: commonLogic.appcommonhandle("启用标志",null),
 	},
 		views: {
 			pickupgridview: {
@@ -79,6 +80,7 @@ function getLocaleResourceBase(){
 				leaderid: commonLogic.appcommonhandle("分管领导标识",null), 
 				leadername: commonLogic.appcommonhandle("分管领导",null), 
 				showorder: commonLogic.appcommonhandle("排序",null), 
+				isvalid: commonLogic.appcommonhandle("启用",null), 
 				createdate: commonLogic.appcommonhandle("创建时间",null), 
 				updatedate: commonLogic.appcommonhandle("最后修改时间",null), 
 			},

app_web/src/locale/lanres/entities/sys-department/sys-department_zh_CN_base.ts

@@ -20,6 +20,7 @@ function getLocaleResourceBase(){
 		parentdeptname: commonLogic.appcommonhandle("上级部门",null),
 		createdate: commonLogic.appcommonhandle("创建时间",null),
 		updatedate: commonLogic.appcommonhandle("最后修改时间",null),
+		isvalid: commonLogic.appcommonhandle("启用标志",null),
 	},
 		views: {
 			pickupgridview: {
@@ -79,6 +80,7 @@ function getLocaleResourceBase(){
 				leaderid: commonLogic.appcommonhandle("分管领导标识",null), 
 				leadername: commonLogic.appcommonhandle("分管领导",null), 
 				showorder: commonLogic.appcommonhandle("排序",null), 
+				isvalid: commonLogic.appcommonhandle("启用",null), 
 				createdate: commonLogic.appcommonhandle("创建时间",null), 
 				updatedate: commonLogic.appcommonhandle("最后修改时间",null), 
 			},

app_web/src/locale/lanres/entities/sys-organization/sys-organization_en_US_base.ts

@@ -15,6 +15,7 @@ function getLocaleResourceBase(){
 		enable: commonLogic.appcommonhandle("逻辑有效",null),
 		createdate: commonLogic.appcommonhandle("创建时间",null),
 		updatedate: commonLogic.appcommonhandle("最后修改时间",null),
+		isvalid: commonLogic.appcommonhandle("启用标志",null),
 	},
 		views: {
 			pickupgridview: {
@@ -60,6 +61,7 @@ function getLocaleResourceBase(){
 				orglevel: commonLogic.appcommonhandle("单位级别",null), 
 				shortname: commonLogic.appcommonhandle("单位简称",null), 
 				showorder: commonLogic.appcommonhandle("排序",null), 
+				isvalid: commonLogic.appcommonhandle("启用",null), 
 				porgid: commonLogic.appcommonhandle("上级单位",null), 
 				createdate: commonLogic.appcommonhandle("创建时间",null), 
 				updatedate: commonLogic.appcommonhandle("最后修改时间",null), 

app_web/src/locale/lanres/entities/sys-organization/sys-organization_zh_CN_base.ts

@@ -15,6 +15,7 @@ function getLocaleResourceBase(){
 		enable: commonLogic.appcommonhandle("逻辑有效",null),
 		createdate: commonLogic.appcommonhandle("创建时间",null),
 		updatedate: commonLogic.appcommonhandle("最后修改时间",null),
+		isvalid: commonLogic.appcommonhandle("启用标志",null),
 	},
 		views: {
 			pickupgridview: {
@@ -60,6 +61,7 @@ function getLocaleResourceBase(){
 				orglevel: commonLogic.appcommonhandle("单位级别",null), 
 				shortname: commonLogic.appcommonhandle("单位简称",null), 
 				showorder: commonLogic.appcommonhandle("排序",null), 
+				isvalid: commonLogic.appcommonhandle("启用",null), 
 				porgid: commonLogic.appcommonhandle("上级单位",null), 
 				createdate: commonLogic.appcommonhandle("创建时间",null), 
 				updatedate: commonLogic.appcommonhandle("最后修改时间",null), 

app_web/src/mock/codelist/codelist.ts

@@ -43,6 +43,35 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
                 "codename":"Item_3",
                 value: "性别不详",
                 
+                disabled: false,
+            },
+        ]
+    },
+    {
+        srfkey: "YesNo",
+        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,
             },
         ]

app_web/src/widgets/sys-department/dept-tree-treeview/dept-tree-treeview-model.ts

@@ -66,6 +66,9 @@ export default class DeptTreeModel {
       {
         name: 'updatedate',
       },
+      {
+        name: 'isvalid',
+      },
     ]
   }
 

app_web/src/widgets/sys-department/main-form/main-form-base.vue

@@ -119,6 +119,27 @@
 
 </app-form-item>
 
+</i-col>
+<i-col v-show="detailsModel.isvalid.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='isvalid' :itemRules="this.rules().isvalid" class='' :caption="$t('entities.sysdepartment.main_form.details.isvalid')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.isvalid.error" :isEmptyCaption="false" labelPos="LEFT">
+    
+ <dropdown-list 
+  v-model="data.isvalid" 
+  :data="data" 
+  :context="context"
+  :viewparams="viewparams"
+  :localContext ='{ }' 
+  :localParam ='{ }' 
+  :disabled="detailsModel.isvalid.disabled" 
+  valueType="number"
+  style="width:100px;width: 100px;" 
+  tag='YesNo' 
+  codelistType='STATIC'
+  placeholder='请选择...'>
+ </dropdown-list>
+
+</app-form-item>
+
 </i-col>
 <i-col v-show="detailsModel.createdate.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='createdate' :itemRules="this.rules().createdate" class='' :caption="$t('entities.sysdepartment.main_form.details.createdate')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.createdate.error" :isEmptyCaption="false" labelPos="LEFT">
@@ -548,6 +569,7 @@ export default class MainBase extends Vue implements ControlInterface {
         leaderid: null,
         leadername: null,
         showorder: null,
+        isvalid: null,
         createdate: null,
         updatedate: null,
         sysdepartment:null,
@@ -637,6 +659,10 @@ export default class MainBase extends Vue implements ControlInterface {
             { required: this.detailsModel.showorder.required, type: 'number', message: '排序 值不能为空', trigger: 'change' },
             { required: this.detailsModel.showorder.required, type: 'number', message: '排序 值不能为空', trigger: 'blur' },
         ],
+        isvalid: [
+            { required: this.detailsModel.isvalid.required, type: 'number', message: '启用 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.isvalid.required, type: 'number', message: '启用 值不能为空', trigger: 'blur' },
+        ],
         createdate: [
             { required: this.detailsModel.createdate.required, type: 'string', message: '创建时间 值不能为空', trigger: 'change' },
             { required: this.detailsModel.createdate.required, type: 'string', message: '创建时间 值不能为空', trigger: 'blur' },
@@ -795,6 +821,8 @@ export default class MainBase extends Vue implements ControlInterface {
         leadername: new FormItemModel({ caption: '分管领导', detailType: 'FORMITEM', name: 'leadername', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         showorder: new FormItemModel({ caption: '排序', detailType: 'FORMITEM', name: 'showorder', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+, 
+        isvalid: new FormItemModel({ caption: '启用', detailType: 'FORMITEM', name: 'isvalid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         createdate: new FormItemModel({ caption: '创建时间', detailType: 'FORMITEM', name: 'createdate', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
@@ -1054,6 +1082,18 @@ export default class MainBase extends Vue implements ControlInterface {
         this.formDataChange({ name: 'showorder', newVal: newVal, oldVal: oldVal });
     }
 
+    /**
+     * 监控表单属性 isvalid 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof MainBase
+     */
+    @Watch('data.isvalid')
+    onIsvalidChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'isvalid', newVal: newVal, oldVal: oldVal });
+    }
+
     /**
      * 监控表单属性 createdate 值
      *
@@ -1162,6 +1202,7 @@ export default class MainBase extends Vue implements ControlInterface {
 
 
 
+
 
 
     }

app_web/src/widgets/sys-department/main-form/main-form-model.ts

@@ -120,6 +120,11 @@ export default class MainModel {
         prop: 'showorder',
         dataType: 'INT',
       },
+      {
+        name: 'isvalid',
+        prop: 'isvalid',
+        dataType: 'YESNO',
+      },
       {
         name: 'createdate',
         prop: 'createdate',

app_web/src/widgets/sys-department/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel-model.ts

@@ -66,6 +66,9 @@ export default class MPickupViewpickupviewpanelModel {
       {
         name: 'updatedate',
       },
+      {
+        name: 'isvalid',
+      },
     ]
   }
 

app_web/src/widgets/sys-department/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts

@@ -66,6 +66,9 @@ export default class PickupViewpickupviewpanelModel {
       {
         name: 'updatedate',
       },
+      {
+        name: 'isvalid',
+      },
     ]
   }
 

app_web/src/widgets/sys-department/tree-exp-viewtreeexpbar-treeexpbar/tree-exp-viewtreeexpbar-treeexpbar-model.ts

@@ -66,6 +66,9 @@ export default class TreeExpViewtreeexpbarModel {
       {
         name: 'updatedate',
       },
+      {
+        name: 'isvalid',
+      },
     ]
   }
 

app_web/src/widgets/sys-organization/main-form/main-form-base.vue

@@ -77,6 +77,27 @@
 
 </app-form-item>
 
+</i-col>
+<i-col v-show="detailsModel.isvalid.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='isvalid' :itemRules="this.rules().isvalid" class='' :caption="$t('entities.sysorganization.main_form.details.isvalid')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.isvalid.error" :isEmptyCaption="false" labelPos="LEFT">
+    
+ <dropdown-list 
+  v-model="data.isvalid" 
+  :data="data" 
+  :context="context"
+  :viewparams="viewparams"
+  :localContext ='{ }' 
+  :localParam ='{ }' 
+  :disabled="detailsModel.isvalid.disabled" 
+  valueType="number"
+  style="width:100px;width: 100px;" 
+  tag='YesNo' 
+  codelistType='STATIC'
+  placeholder='请选择...'>
+ </dropdown-list>
+
+</app-form-item>
+
 </i-col>
 <i-col v-show="detailsModel.createdate.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='createdate' :itemRules="this.rules().createdate" class='' :caption="$t('entities.sysorganization.main_form.details.createdate')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.createdate.error" :isEmptyCaption="false" labelPos="LEFT">
@@ -500,6 +521,7 @@ export default class MainBase extends Vue implements ControlInterface {
         orglevel: null,
         shortname: null,
         showorder: null,
+        isvalid: null,
         porgid: null,
         createdate: null,
         updatedate: null,
@@ -578,6 +600,10 @@ export default class MainBase extends Vue implements ControlInterface {
             { required: this.detailsModel.showorder.required, type: 'number', message: '排序 值不能为空', trigger: 'change' },
             { required: this.detailsModel.showorder.required, type: 'number', message: '排序 值不能为空', trigger: 'blur' },
         ],
+        isvalid: [
+            { required: this.detailsModel.isvalid.required, type: 'number', message: '启用 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.isvalid.required, type: 'number', message: '启用 值不能为空', trigger: 'blur' },
+        ],
         createdate: [
             { required: this.detailsModel.createdate.required, type: 'string', message: '创建时间 值不能为空', trigger: 'change' },
             { required: this.detailsModel.createdate.required, type: 'string', message: '创建时间 值不能为空', trigger: 'blur' },
@@ -724,6 +750,8 @@ export default class MainBase extends Vue implements ControlInterface {
         shortname: new FormItemModel({ caption: '单位简称', detailType: 'FORMITEM', name: 'shortname', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         showorder: new FormItemModel({ caption: '排序', detailType: 'FORMITEM', name: 'showorder', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+, 
+        isvalid: new FormItemModel({ caption: '启用', detailType: 'FORMITEM', name: 'isvalid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         porgid: new FormItemModel({ caption: '上级单位', detailType: 'FORMITEM', name: 'porgid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
@@ -913,6 +941,18 @@ export default class MainBase extends Vue implements ControlInterface {
         this.formDataChange({ name: 'showorder', newVal: newVal, oldVal: oldVal });
     }
 
+    /**
+     * 监控表单属性 isvalid 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof MainBase
+     */
+    @Watch('data.isvalid')
+    onIsvalidChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'isvalid', newVal: newVal, oldVal: oldVal });
+    }
+
     /**
      * 监控表单属性 porgid 值
      *
@@ -1021,6 +1061,7 @@ export default class MainBase extends Vue implements ControlInterface {
 
 
 
+
 
     }
 

app_web/src/widgets/sys-organization/main-form/main-form-model.ts

@@ -90,6 +90,11 @@ export default class MainModel {
         prop: 'showorder',
         dataType: 'INT',
       },
+      {
+        name: 'isvalid',
+        prop: 'isvalid',
+        dataType: 'YESNO',
+      },
       {
         name: 'porgid',
         prop: 'parentorgid',

app_web/src/widgets/sys-organization/org-tree-treeview/org-tree-treeview-model.ts

@@ -51,6 +51,9 @@ export default class OrgTreeModel {
       {
         name: 'updatedate',
       },
+      {
+        name: 'isvalid',
+      },
     ]
   }
 

app_web/src/widgets/sys-organization/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts

@@ -51,6 +51,9 @@ export default class PickupViewpickupviewpanelModel {
       {
         name: 'updatedate',
       },
+      {
+        name: 'isvalid',
+      },
     ]
   }
 

app_web/src/widgets/sys-organization/tree-exp-viewtreeexpbar-treeexpbar/tree-exp-viewtreeexpbar-treeexpbar-model.ts

@@ -51,6 +51,9 @@ export default class TreeExpViewtreeexpbarModel {
       {
         name: 'updatedate',
       },
+      {
+        name: 'isvalid',
+      },
     ]
   }
 

config.xml

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

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

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

@@ -3,9 +3,23 @@ services:
   ibzou-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzou-app-web:latest
     ports:
-      - "8080:8080"
+      - "30001:30001"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
+      - SERVER_PORT=30001
+      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.100.243: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.100.243:8848
+      - SPRING_CLOUD_NACOS_DISCOVERY_GROUP=ibizdev
     deploy:
       resources:
            limits:

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

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

@@ -3,23 +3,9 @@ services:
   ibzou-provider-api:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzou-provider-api:latest
     ports:
-      - "40001:40001"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
-      - SERVER_PORT=40001
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.100.243: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.100.243:8848
-      - SPRING_CLOUD_NACOS_DISCOVERY_GROUP=ibizdev
     deploy:
       resources:
            limits: