jackwang 部署微服务应用

app_PIM/public/assets/json/view-config.json

@@ -489,6 +489,16 @@
         "viewtag": "90f2bd2f58c482b25a1e1db0f8e4ca26",
         "memo": "系统自动添加"
     },
+    "hremployeelistexpview": {
+        "title": "员工信息",
+        "caption": "员工信息",
+        "viewtype": "DELISTEXPVIEW",
+        "viewmodule": "HumanResource",
+        "viewname": "HREmployeeListExpView",
+        "viewfilename": "hremployee-list-exp-view",
+        "viewtag": "92826c47e3d2b905845fe1ad5c30be62",
+        "memo": ""
+    },
     "hrlegalv_002": {
         "title": "法人预览",
         "caption": "法人",

app_PIM/src/locale/lanres/entities/hremployee/hremployee_en_US.ts

@@ -46,6 +46,10 @@ export default {
 			caption: "员工",
       		title: "员工选择表格视图",
 		},
+		listexpview: {
+			caption: "员工信息",
+      		title: "员工信息",
+		},
 		gridview: {
 			caption: "员工",
       		title: "员工表格视图",

app_PIM/src/locale/lanres/entities/hremployee/hremployee_zh_CN.ts

@@ -45,6 +45,10 @@ export default {
 			caption: "员工",
       		title: "员工选择表格视图",
 		},
+		listexpview: {
+			caption: "员工信息",
+      		title: "员工信息",
+		},
 		gridview: {
 			caption: "员工",
       		title: "员工表格视图",

app_PIM/src/mock/viewconfig/viewconfig.ts

@@ -399,6 +399,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "HROrgAddressEditView",
             "viewtag": "90f2bd2f58c482b25a1e1db0f8e4ca26"
         },
+        "hremployeelistexpview": {
+            "title": "员工信息",
+            "caption": "员工信息",
+            "viewtype": "DELISTEXPVIEW",
+            "viewmodule": "HumanResource",
+            "viewname": "HREmployeeListExpView",
+            "viewtag": "92826c47e3d2b905845fe1ad5c30be62"
+        },
         "hrlegalv_002": {
             "title": "法人预览",
             "caption": "法人",

app_PIM/src/uiservice/hremployee/hremployee-ui-service-base.ts

@@ -90,6 +90,7 @@ export default class HREmployeeUIServiceBase extends UIService {
      */  
     public initViewMap(){
         this.allViewMap.set(':',{viewname:'pickupgridview',srfappde:'hremployees'});
+        this.allViewMap.set(':',{viewname:'listexpview',srfappde:'hremployees'});
         this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'hremployees'});
         this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'hremployees'});
         this.allViewMap.set('PICKUPVIEW:',{viewname:'pickupview',srfappde:'hremployees'});

config.xml

@@ -37,11 +37,11 @@
 	  git clone -b master $para2 ibizhumanresources/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibizhumanresources/
-      mvn clean package -Phrapi
-      cd humanresource-provider/humanresource-provider-hrapi
-      mvn -Phrapi docker:build
-      mvn -Phrapi docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/humanresource-provider-hrapi.yaml iBizEE --with-registry-auth      
+      mvn clean package -Ppim
+      cd humanresource-app/humanresource-app-pim
+      mvn -Ppim docker:build
+      mvn -Ppim docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/humanresource-app-pim.yaml iBizEE --with-registry-auth
       </command>
     </hudson.tasks.Shell>
   </builders>

humanresource-app/humanresource-app-pim/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 /humanresource-app-pim.jar
 
-EXPOSE 8080
+EXPOSE 10327
 
 ADD humanresource-app-pim.jar /humanresource-app-pim.jar

humanresource-app/humanresource-app-pim/src/main/docker/humanresource-app-pim.yaml

@@ -3,9 +3,25 @@ services:
   humanresource-app-pim:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-app-pim:latest
     ports:
-      - "8080:8080"
+      - "10327:10327"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
+      - SERVER_PORT=10327
+      - 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_e85d8801c
+      - SPRING_DATASOURCE_PASSWORD=b1@@@772
+      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?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_e85d8801c
+      - CAS=https://passport.ibizlab.cn
+      - NACOS=172.16.240.110:8848
+      - SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
+      - SEATA_ENABLED=true
     deploy:
       resources:
            limits:

humanresource-provider/humanresource-provider-hrapi/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 /humanresource-provider-hrapi.jar
 
-EXPOSE 10317
+EXPOSE 8081
 
 ADD humanresource-provider-hrapi.jar /humanresource-provider-hrapi.jar

humanresource-provider/humanresource-provider-hrapi/src/main/docker/humanresource-provider-hrapi.yaml

@@ -3,25 +3,9 @@ services:
   humanresource-provider-hrapi:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-provider-hrapi:latest
     ports:
-      - "10317:10317"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-      - SERVER_PORT=10317
-      - 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_e85d8801c
-      - SPRING_DATASOURCE_PASSWORD=b1@@@772
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?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_e85d8801c
-      - CAS=https://passport.ibizlab.cn
-      - NACOS=172.16.240.110:8848
-      - SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
-      - SEATA_ENABLED=true
     deploy:
       resources:
            limits: