jackwang 部署微服务应用

app_PIM/src/locale/lanres/entities/hrarchives/hrarchives_en_US.ts

@@ -261,28 +261,6 @@ export default {
 			tip: "Help",
 		},
 	},
-	v_005toolbar_toolbar: {
-		tbitem1_ff_003: {
-			caption: "编辑",
-			tip: "编辑",
-		},
-		tbitem1_remove_sep: {
-			caption: "",
-			tip: "",
-		},
-		tbitem1_remove: {
-			caption: "删除并关闭",
-			tip: "删除并关闭",
-		},
-		tbitem2: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem22: {
-			caption: "关闭",
-			tip: "关闭",
-		},
-	},
 	gridviewtoolbar_toolbar: {
 		tbitem1_ff_002: {
 			caption: "新建",
@@ -325,4 +303,26 @@ export default {
 			tip: "Filter",
 		},
 	},
+	v_005toolbar_toolbar: {
+		tbitem1_ff_003: {
+			caption: "编辑",
+			tip: "编辑",
+		},
+		tbitem1_remove_sep: {
+			caption: "",
+			tip: "",
+		},
+		tbitem1_remove: {
+			caption: "删除并关闭",
+			tip: "删除并关闭",
+		},
+		tbitem2: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem22: {
+			caption: "关闭",
+			tip: "关闭",
+		},
+	},
 };
\ No newline at end of file

app_PIM/src/locale/lanres/entities/hrarchives/hrarchives_zh_CN.ts

@@ -260,28 +260,6 @@ export default {
 			tip: "帮助",
 		},
 	},
-	v_005toolbar_toolbar: {
-		tbitem1_ff_003: {
-			caption: "编辑",
-			tip: "编辑",
-		},
-		tbitem1_remove_sep: {
-			caption: "",
-			tip: "",
-		},
-		tbitem1_remove: {
-			caption: "删除并关闭",
-			tip: "删除并关闭",
-		},
-		tbitem2: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem22: {
-			caption: "关闭",
-			tip: "关闭",
-		},
-	},
 	gridviewtoolbar_toolbar: {
 		tbitem1_ff_002: {
 			caption: "新建",
@@ -324,4 +302,26 @@ export default {
 			tip: "过滤",
 		},
 	},
+	v_005toolbar_toolbar: {
+		tbitem1_ff_003: {
+			caption: "编辑",
+			tip: "编辑",
+		},
+		tbitem1_remove_sep: {
+			caption: "",
+			tip: "",
+		},
+		tbitem1_remove: {
+			caption: "删除并关闭",
+			tip: "删除并关闭",
+		},
+		tbitem2: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem22: {
+			caption: "关闭",
+			tip: "关闭",
+		},
+	},
 };
\ No newline at end of file

app_PIM/src/pages/ungroup/pim/page-register.ts

@@ -17,7 +17,6 @@ export const PageComponents = {
         Vue.component('hrpost-rel-v-002', () => import('@pages/human-resource/hrpost-rel-v-002/hrpost-rel-v-002.vue'));
         Vue.component('hremployee-pickup-grid-view', () => import('@pages/human-resource/hremployee-pickup-grid-view/hremployee-pickup-grid-view.vue'));
         Vue.component('hrcontract-grid-view', () => import('@pages/human-resource/hrcontract-grid-view/hrcontract-grid-view.vue'));
-        Vue.component('hrarchives-v-002', () => import('@pages/human-resource/hrarchives-v-002/hrarchives-v-002.vue'));
         Vue.component('hromhierarchy-tree-exp-view', () => import('@pages/base/hromhierarchy-tree-exp-view/hromhierarchy-tree-exp-view.vue'));
         Vue.component('hrlegal-grid-view', () => import('@pages/base/hrlegal-grid-view/hrlegal-grid-view.vue'));
         Vue.component('hrpost-v-006', () => import('@pages/human-resource/hrpost-v-006/hrpost-v-006.vue'));
@@ -31,7 +30,6 @@ export const PageComponents = {
         Vue.component('hrpost-pickup-grid-view', () => import('@pages/human-resource/hrpost-pickup-grid-view/hrpost-pickup-grid-view.vue'));
         Vue.component('hrcontract-v-002', () => import('@pages/human-resource/hrcontract-v-002/hrcontract-v-002.vue'));
         Vue.component('hrduty-edu-v-001', () => import('@pages/human-resource/hrduty-edu-v-001/hrduty-edu-v-001.vue'));
-        Vue.component('hrarchives-grid-view', () => import('@pages/human-resource/hrarchives-grid-view/hrarchives-grid-view.vue'));
         Vue.component('hrorganization-edit-view', () => import('@pages/base/hrorganization-edit-view/hrorganization-edit-view.vue'));
         Vue.component('hromhierarchy-cat-grid-view', () => import('@pages/base/hromhierarchy-cat-grid-view/hromhierarchy-cat-grid-view.vue'));
         Vue.component('hremployee-v-001', () => import('@pages/human-resource/hremployee-v-001/hremployee-v-001.vue'));
@@ -54,8 +52,8 @@ export const PageComponents = {
         Vue.component('hrtechnical-title-v-003', () => import('@pages/human-resource/hrtechnical-title-v-003/hrtechnical-title-v-003.vue'));
         Vue.component('hrpost-v-005', () => import('@pages/human-resource/hrpost-v-005/hrpost-v-005.vue'));
         Vue.component('hrlegal-edit-view', () => import('@pages/base/hrlegal-edit-view/hrlegal-edit-view.vue'));
-        Vue.component('hrduty-pickup-view', () => import('@pages/human-resource/hrduty-pickup-view/hrduty-pickup-view.vue'));
         Vue.component('hrorganization-grid-view', () => import('@pages/base/hrorganization-grid-view/hrorganization-grid-view.vue'));
+        Vue.component('hrduty-pickup-view', () => import('@pages/human-resource/hrduty-pickup-view/hrduty-pickup-view.vue'));
         Vue.component('hrtransfer-apply-wfdyna-exp-grid-view', () => import('@pages/pcm/hrtransfer-apply-wfdyna-exp-grid-view/hrtransfer-apply-wfdyna-exp-grid-view.vue'));
         Vue.component('hremployee-v-006', () => import('@pages/human-resource/hremployee-v-006/hremployee-v-006.vue'));
         Vue.component('hremployee-v-002', () => import('@pages/human-resource/hremployee-v-002/hremployee-v-002.vue'));
@@ -81,20 +79,18 @@ export const PageComponents = {
         Vue.component('hrorg-contact-grid-view', () => import('@pages/base/hrorg-contact-grid-view/hrorg-contact-grid-view.vue'));
         Vue.component('hroperation-unit-grid-view', () => import('@pages/base/hroperation-unit-grid-view/hroperation-unit-grid-view.vue'));
         Vue.component('hrtraining-record-edit-view', () => import('@pages/human-resource/hrtraining-record-edit-view/hrtraining-record-edit-view.vue'));
-        Vue.component('hrarchives-v-004', () => import('@pages/human-resource/hrarchives-v-004/hrarchives-v-004.vue'));
         Vue.component('hrorg-contact-v-001', () => import('@pages/base/hrorg-contact-v-001/hrorg-contact-v-001.vue'));
         Vue.component('hrorg-address-v-001', () => import('@pages/base/hrorg-address-v-001/hrorg-address-v-001.vue'));
         Vue.component('hrpost-v-001', () => import('@pages/human-resource/hrpost-v-001/hrpost-v-001.vue'));
         Vue.component('hromhierarchy-grid-view', () => import('@pages/base/hromhierarchy-grid-view/hromhierarchy-grid-view.vue'));
         Vue.component('hrduty-cert-grid-view', () => import('@pages/human-resource/hrduty-cert-grid-view/hrduty-cert-grid-view.vue'));
         Vue.component('hrduty-skill-v-002', () => import('@pages/human-resource/hrduty-skill-v-002/hrduty-skill-v-002.vue'));
-        Vue.component('hrarchives-v-005', () => import('@pages/human-resource/hrarchives-v-005/hrarchives-v-005.vue'));
         Vue.component('hremployee-tree-exp-view', () => import('@pages/human-resource/hremployee-tree-exp-view/hremployee-tree-exp-view.vue'));
         Vue.component('hremployee-tab-exp-view', () => import('@pages/human-resource/hremployee-tab-exp-view/hremployee-tab-exp-view.vue'));
         Vue.component('hrcontract-edit-view', () => import('@pages/human-resource/hrcontract-edit-view/hrcontract-edit-view.vue'));
-        Vue.component('hrorganization-pickup-view', () => import('@pages/base/hrorganization-pickup-view/hrorganization-pickup-view.vue'));
         Vue.component('hromhierarchy-cat-dashboard-view', () => import('@pages/base/hromhierarchy-cat-dashboard-view/hromhierarchy-cat-dashboard-view.vue'));
         Vue.component('hrduty-edu-grid-view', () => import('@pages/human-resource/hrduty-edu-grid-view/hrduty-edu-grid-view.vue'));
+        Vue.component('hrorganization-pickup-view', () => import('@pages/base/hrorganization-pickup-view/hrorganization-pickup-view.vue'));
         Vue.component('hroperation-unit-tab-exp-view', () => import('@pages/base/hroperation-unit-tab-exp-view/hroperation-unit-tab-exp-view.vue'));
         Vue.component('hrlanguage-ability-grid-view', () => import('@pages/human-resource/hrlanguage-ability-grid-view/hrlanguage-ability-grid-view.vue'));
         Vue.component('hrorg-address-grid-view', () => import('@pages/base/hrorg-address-grid-view/hrorg-address-grid-view.vue'));
@@ -135,7 +131,6 @@ export const PageComponents = {
         Vue.component('hrarchives-edit-view', () => import('@pages/human-resource/hrarchives-edit-view/hrarchives-edit-view.vue'));
         Vue.component('hrarchives-v-001', () => import('@pages/human-resource/hrarchives-v-001/hrarchives-v-001.vue'));
         Vue.component('hromhierarchy-pickup-grid-view', () => import('@pages/base/hromhierarchy-pickup-grid-view/hromhierarchy-pickup-grid-view.vue'));
-        Vue.component('hrarchives-v-003', () => import('@pages/human-resource/hrarchives-v-003/hrarchives-v-003.vue'));
         Vue.component('hrcertificate-tab-exp-view', () => import('@pages/human-resource/hrcertificate-tab-exp-view/hrcertificate-tab-exp-view.vue'));
         Vue.component('hrdistribution-v-001', () => import('@pages/human-resource/hrdistribution-v-001/hrdistribution-v-001.vue'));
         Vue.component('hrtransfer-apply-v-004', () => import('@pages/pcm/hrtransfer-apply-v-004/hrtransfer-apply-v-004.vue'));

app_PIM/src/store/modules/view-action/state.ts

@@ -387,15 +387,6 @@ export const viewstate: any = {
                 'af1a0e288eecf89cd99ed798594e1753',
             ],
         },
-        {
-            viewtag: '4577fe920c1f8dc9da44a0cab28ca33b',
-            viewmodule: 'HumanResource',
-            viewname: 'HRArchivesV_003',
-            viewaction: '',
-            viewdatachange: false,
-            refviews: [
-            ],
-        },
         {
             viewtag: '4726bc4ee402aed771ecabe7a6ecdaae',
             viewmodule: 'HumanResource',
@@ -414,19 +405,18 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
+                '286e8ac9eca7b6eb8058fde93995db10',
                 '8e90bfab442fc1c89453722dfe094408',
+                '1556b6299248ca949822a15645afc066',
                 '997c27311a28f6ed4e41153c43a5f723',
+                'bae1de77dc5bd2584e2dcf7201a06495',
                 '0d8ac739134947cc5f6545d4041024de',
                 '10c50502a4eebb3c2f6373326db96fc5',
-                '41036146909ab3f28ff59b80370514b2',
-                'c01c4604589a2c171c4f41f2ac11f4e2',
-                '71c5da4234a5c4d3e46c572556dd52d9',
-                '114f056047eddd92374e982356e59852',
-                '286e8ac9eca7b6eb8058fde93995db10',
-                '1556b6299248ca949822a15645afc066',
-                'bae1de77dc5bd2584e2dcf7201a06495',
                 'b9130f18de0b66cd31ecaddb5a841aae',
+                '41036146909ab3f28ff59b80370514b2',
                 '8edb721608ec0094af042929943e498e',
+                '114f056047eddd92374e982356e59852',
+                '71c5da4234a5c4d3e46c572556dd52d9',
             ],
         },
         {
@@ -511,18 +501,6 @@ export const viewstate: any = {
                 '069985244f19f8c6f8e74e39ef573e9a',
             ],
         },
-        {
-            viewtag: '5748c15cb24deb3f3fb24d68668711dd',
-            viewmodule: 'HumanResource',
-            viewname: 'HRArchivesV_005',
-            viewaction: '',
-            viewdatachange: false,
-            refviews: [
-                '4726bc4ee402aed771ecabe7a6ecdaae',
-                'd33bb4278ea65f691909636c691a0666',
-                'c01c4604589a2c171c4f41f2ac11f4e2',
-            ],
-        },
         {
             viewtag: '57dbe1035c2366090a02ceb7c8269ebb',
             viewmodule: 'HumanResource',
@@ -779,17 +757,6 @@ export const viewstate: any = {
                 'e7ba37699bd458dc8dd5c02abac8dadd',
             ],
         },
-        {
-            viewtag: '8bd2a4a14135c358985d4ff9b7ffb88e',
-            viewmodule: 'HumanResource',
-            viewname: 'HRArchivesV_002',
-            viewaction: '',
-            viewdatachange: false,
-            refviews: [
-                'ec9d9fe37bbfc3fcb623e2dc34b48dbc',
-                'e7ba37699bd458dc8dd5c02abac8dadd',
-            ],
-        },
         {
             viewtag: '8db1cc9344908f2f9e2fb21f3849a539',
             viewmodule: 'HumanResource',
@@ -1155,17 +1122,6 @@ export const viewstate: any = {
             refviews: [
             ],
         },
-        {
-            viewtag: 'c01c4604589a2c171c4f41f2ac11f4e2',
-            viewmodule: 'HumanResource',
-            viewname: 'HRArchivesGridView',
-            viewaction: '',
-            viewdatachange: false,
-            refviews: [
-                '5748c15cb24deb3f3fb24d68668711dd',
-                '8bd2a4a14135c358985d4ff9b7ffb88e',
-            ],
-        },
         {
             viewtag: 'c1a754fe9d4ff67c56d0bb4b6ae949be',
             viewmodule: 'HumanResource',
@@ -1271,16 +1227,6 @@ export const viewstate: any = {
             refviews: [
             ],
         },
-        {
-            viewtag: 'd33bb4278ea65f691909636c691a0666',
-            viewmodule: 'HumanResource',
-            viewname: 'HRArchivesV_004',
-            viewaction: '',
-            viewdatachange: false,
-            refviews: [
-                '4577fe920c1f8dc9da44a0cab28ca33b',
-            ],
-        },
         {
             viewtag: 'd4d0e128d8c7e5c141f99540b62fd9bf',
             viewmodule: 'HumanResource',

app_PIM/src/widgets/app/pim-appmenu/pim-appmenu-base.tsx

@@ -94,8 +94,8 @@ export class PIMBase extends Vue {
         Object.assign(viewparam, {});
         const deResParameters: any[] = [];
         const parameters: any[] = [
-            { pathName: 'hrarchives', parameterName: 'hrarchives' },
-            { pathName: 'gridview', parameterName: 'gridview' },
+            { pathName: 'hrtechnicaltitles', parameterName: 'hrtechnicaltitle' },
+            { pathName: 'tabexpview', parameterName: 'tabexpview' },
         ];
         const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
         if(Object.is(this.$route.fullPath,path)){

app_PIM/src/widgets/app/pim-appmenu/pim-appmenu-model.ts

@@ -210,7 +210,7 @@ export default class PIMModel {
                         	textcls: '',
                         	appfunctag: '_12',
                         	appfuncyype: 'APPVIEW',
-                        	viewname: 'hrarchives-grid-view',
+                        	viewname: 'hrtechnical-title-tab-exp-view',
                         	resourcetag: '',
                         }
                         ,
@@ -595,12 +595,12 @@ export default class PIMModel {
             appfunctag: '_12',
             appfuncyype: 'APPVIEW',
             openmode: '',
-            codename: 'hrarchivesgridview',
+            codename: 'hrtechnicaltitletabexpview',
             deResParameters: [],
-            routepath: '/pim/:pim?/hrarchives/:hrarchives?/gridview/:gridview?',
+            routepath: '/pim/:pim?/hrtechnicaltitles/:hrtechnicaltitle?/tabexpview/:tabexpview?',
             parameters: [
-                { pathName: 'hrarchives', parameterName: 'hrarchives' },
-                { pathName: 'gridview', parameterName: 'gridview' },
+                { pathName: 'hrtechnicaltitles', parameterName: 'hrtechnicaltitle' },
+                { pathName: 'tabexpview', parameterName: 'tabexpview' },
             ],
         },
         {

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: