Skip to content

I
iBiz人力资源
提交 2c294dea 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

Miracle 部署微服务应用

上级 c2ffa35d
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 124 行增加 和 1370 行删除
app_PIM/public/assets/json/data-dictionary.json
浏览文件 @ 2c294dea
......@@ -926,7 +926,7 @@
"text": "调入",
"data":"",
"codename":"Movein",
"color": "rgba(255, 0, 17, 1)",
"color": "rgba(0, 55, 255, 1)",
"value": "MOVEIN",
"disabled": false,
......@@ -938,7 +938,7 @@
"text": "调出",
"data":"",
"codename":"Moveout",
"color": "rgba(0, 89, 255, 1)",
"color": "rgba(162, 0, 255, 1)",
"value": "MOVEOUT",
"disabled": false,
......
app_PIM/src/locale/lanres/entities/hrarchives/hrarchives_en_US.ts
浏览文件 @ 2c294dea
......@@ -234,49 +234,17 @@ export default {
},
},
editviewtoolbar_toolbar: {
tbitem3: {
caption: "Save",
tip: "Save",
},
tbitem4: {
caption: "Save And New",
tip: "Save And New",
},
tbitem5: {
tbitem1: {
caption: "Save And Close",
tip: "Save And Close Window",
},
tbitem6: {
caption: "-",
tip: "",
},
tbitem7: {
caption: "Remove And Close",
tip: "Remove And Close Window",
},
tbitem8: {
caption: "-",
tip: "",
},
tbitem12: {
caption: "New",
tip: "New",
},
tbitem13: {
caption: "-",
tip: "",
},
tbitem14: {
caption: "Copy",
tip: "Copy {0}",
},
tbitem16: {
caption: "-",
seperator1: {
caption: "",
tip: "",
},
tbitem22: {
caption: "Help",
tip: "Help",
tbitem2: {
caption: "关闭",
tip: "关闭",
},
},
v_005toolbar_toolbar: {
......
app_PIM/src/locale/lanres/entities/hrarchives/hrarchives_zh_CN.ts
浏览文件 @ 2c294dea
......@@ -233,49 +233,17 @@ export default {
},
},
editviewtoolbar_toolbar: {
tbitem3: {
caption: "保存",
tip: "保存",
},
tbitem4: {
caption: "保存并新建",
tip: "保存并新建",
},
tbitem5: {
tbitem1: {
caption: "保存并关闭",
tip: "保存并关闭",
},
tbitem6: {
caption: "-",
tip: "",
},
tbitem7: {
caption: "删除并关闭",
tip: "删除并关闭",
},
tbitem8: {
caption: "-",
tip: "",
},
tbitem12: {
caption: "新建",
tip: "新建",
},
tbitem13: {
caption: "-",
tip: "",
},
tbitem14: {
caption: "拷贝",
tip: "拷贝",
},
tbitem16: {
caption: "-",
seperator1: {
caption: "",
tip: "",
},
tbitem22: {
caption: "帮助",
tip: "帮助",
tbitem2: {
caption: "关闭",
tip: "关闭",
},
},
v_005toolbar_toolbar: {
......
app_PIM/src/locale/lanres/entities/hrtransfer-apply/hrtransfer-apply_en_US.ts
浏览文件 @ 2c294dea
......@@ -370,64 +370,6 @@ export default {
tip: "Help",
},
},
wfdynaeditviewtoolbar_toolbar: {
tbitem3: {
caption: "Save",
tip: "Save",
},
tbitem4: {
caption: "Save And New",
tip: "Save And New",
},
tbitem5: {
caption: "Save And Close",
tip: "Save And Close Window",
},
tbitem6: {
caption: "-",
tip: "",
},
tbitem7: {
caption: "Remove And Close",
tip: "Remove And Close Window",
},
tbitem8: {
caption: "-",
tip: "",
},
tbitem9_saveandstart: {
caption: "开始",
tip: "开始",
},
tbitem10: {
caption: "Workflow step",
tip: "当前流程步骤",
},
tbitem11: {
caption: "-",
tip: "",
},
tbitem12: {
caption: "New",
tip: "New",
},
tbitem13: {
caption: "-",
tip: "",
},
tbitem14: {
caption: "Copy",
tip: "Copy {0}",
},
tbitem16: {
caption: "-",
tip: "",
},
tbitem23: {
caption: "Help",
tip: "Help",
},
},
gridviewtoolbar_toolbar: {
tbitem3: {
caption: "New",
......
app_PIM/src/locale/lanres/entities/hrtransfer-apply/hrtransfer-apply_zh_CN.ts
浏览文件 @ 2c294dea
......@@ -369,64 +369,6 @@ export default {
tip: "帮助",
},
},
wfdynaeditviewtoolbar_toolbar: {
tbitem3: {
caption: "保存",
tip: "保存",
},
tbitem4: {
caption: "保存并新建",
tip: "保存并新建",
},
tbitem5: {
caption: "保存并关闭",
tip: "保存并关闭",
},
tbitem6: {
caption: "-",
tip: "",
},
tbitem7: {
caption: "删除并关闭",
tip: "删除并关闭",
},
tbitem8: {
caption: "-",
tip: "",
},
tbitem9_saveandstart: {
caption: "开始",
tip: "开始",
},
tbitem10: {
caption: "当前流程步骤",
tip: "当前流程步骤",
},
tbitem11: {
caption: "-",
tip: "",
},
tbitem12: {
caption: "新建",
tip: "新建",
},
tbitem13: {
caption: "-",
tip: "",
},
tbitem14: {
caption: "拷贝",
tip: "拷贝",
},
tbitem16: {
caption: "-",
tip: "",
},
tbitem23: {
caption: "帮助",
tip: "帮助",
},
},
gridviewtoolbar_toolbar: {
tbitem3: {
caption: "新建",
......
app_PIM/src/mock/codelist/codelist.ts
浏览文件 @ 2c294dea
......@@ -860,7 +860,7 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
text: "调入",
"data":"",
"codename":"Movein",
"color": "rgba(255, 0, 17, 1)",
"color": "rgba(0, 55, 255, 1)",
value: "MOVEIN",
disabled: false,
......@@ -871,7 +871,7 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
text: "调出",
"data":"",
"codename":"Moveout",
"color": "rgba(0, 89, 255, 1)",
"color": "rgba(162, 0, 255, 1)",
value: "MOVEOUT",
disabled: false,
......
app_PIM/src/pages/human-resource/hrarchives-borrow-grid-view/hrarchives-borrow-grid-view.html
浏览文件 @ 2c294dea
<studio-view-style2 viewName="hrarchivesborrowgridview" viewTitle="档案借阅表格视图" class='degridview hrarchives-borrow-grid-view'>
<template slot='title'>
<span class='caption-info'>{{viewCaption}}</span>
</template>
<i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" placeholder="档案借阅名称" search @on-search="onSearch($event)"/>
<template slot="toolbar">
<view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/> </template>
......
app_PIM/src/pages/pcm/hrtransfer-apply-wfdyna-edit-view/hrtransfer-apply-wfdyna-edit-view.html
浏览文件 @ 2c294dea
......@@ -2,8 +2,6 @@
<template slot='title'>
<span class='caption-info'>{{viewCaption}}</span>
</template>
<template slot="toolbar">
<view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/> </template>
<div class='toolbar-container'>
<tooltip :transfer="true" :max-width="600" v-for="(linkItem, index) in linkModel" :key="index">
<i-button @click="dynamic_toolbar_click(linkItem, $event)">
......
app_PIM/src/pages/pcm/hrtransfer-apply-wfdyna-exp-grid-view/hrtransfer-apply-wfdyna-exp-grid-view-base.tsx
浏览文件 @ 2c294dea
......@@ -741,16 +741,28 @@ export class HRTransferApplyWFDynaExpGridViewBase extends ViewBase {
}
const parameters: any[] = [
{ pathName: 'hrtransferapplies', parameterName: 'hrtransferapply' },
{ pathName: 'wfdynaeditview', parameterName: 'wfdynaeditview' },
];
const _this: any = this;
const openIndexViewTab = (data: any) => {
const _data: any = { w: (new Date().getTime()) };
Object.assign(_data, data);
const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
this.$router.push(routePath);
const openDrawer = (view: any, data: any) => {
let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
container.subscribe((result: any) => {
if (!result || !Object.is(result.ret, 'OK')) {
return;
}
if (!xData || !(xData.refresh instanceof Function)) {
return;
}
xData.refresh(result.datas);
});
}
openIndexViewTab(data);
const view: any = {
viewname: 'hrtransfer-apply-wfdyna-edit-view',
height: 0,
width: 600,
title: this.$t('entities.hrtransferapply.views.wfdynaeditview.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
}
......@@ -780,14 +792,28 @@ export class HRTransferApplyWFDynaExpGridViewBase extends ViewBase {
}
const parameters: any[] = [
{ pathName: 'hrtransferapplies', parameterName: 'hrtransferapply' },
{ pathName: 'wfdynaeditview', parameterName: 'wfdynaeditview' },
];
const _this: any = this;
const openIndexViewTab = (data: any) => {
const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
this.$router.push(routePath+'?userTaskId='+this.viewparams.userTaskId);
const openDrawer = (view: any, data: any) => {
let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
container.subscribe((result: any) => {
if (!result || !Object.is(result.ret, 'OK')) {
return;
}
if (!xData || !(xData.refresh instanceof Function)) {
return;
}
xData.refresh(result.datas);
});
}
openIndexViewTab(data);
const view: any = {
viewname: 'hrtransfer-apply-wfdyna-edit-view',
height: 0,
width: 600,
title: this.$t('entities.hrtransferapply.views.wfdynaeditview.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
}
......
app_PIM/src/widgets/hrarchives/v-006tabexppanel-tabexppanel/v-006tabexppanel-tabexppanel-base.tsx
浏览文件 @ 2c294dea
......@@ -66,9 +66,9 @@ export class V_006tabexppanelTabexppanelBase extends TabExpPanelControlBase {
*/
protected isInit: any = {
tabviewpanel: true ,
tabviewpanel2: false ,
tabviewpanel3: false ,
tabviewpanel4: false ,
tabviewpanel2: false ,
}
/**
......
app_PIM/src/widgets/hrarchives/v-006tabexppanel-tabexppanel/v-006tabexppanel-tabexppanel.html
浏览文件 @ 2c294dea
......@@ -30,16 +30,16 @@
@closeview="closeView($event)">
</view_tabviewpanel>
</tab-pane>
<tab-pane :index="1" name='tabviewpanel3' tab='v_006tabexppanel' class=''
<tab-pane :index="1" name='tabviewpanel2' tab='v_006tabexppanel' class=''
:label="(h) =>{
return h('div', [
h('i',{
class:'fa fa-user',
class:'fa fa-warning',
style:{
'margin-right' : '2px'
}
}),
h('span', '员工不在档'),
h('span', '非员工在档'),
h('Badge', {
props: {
count: undefined,
......@@ -48,28 +48,28 @@
})
])
}" >
<view_tabviewpanel3
<view_tabviewpanel2
:viewState="viewState"
:viewparams="JSON.parse(JSON.stringify(viewparams))"
:context="JSON.parse(JSON.stringify(context))"
v-if="isInit.tabviewpanel3"
name="tabviewpanel3"
ref='tabviewpanel3'
:expActive="activatedTabViewPanel === 'tabviewpanel3'"
v-if="isInit.tabviewpanel2"
name="tabviewpanel2"
ref='tabviewpanel2'
:expActive="activatedTabViewPanel === 'tabviewpanel2'"
@viewpanelDatasChange = "tabViewPanelDatasChange"
@closeview="closeView($event)">
</view_tabviewpanel3>
</view_tabviewpanel2>
</tab-pane>
<tab-pane :index="2" name='tabviewpanel4' tab='v_006tabexppanel' class=''
<tab-pane :index="2" name='tabviewpanel3' tab='v_006tabexppanel' class=''
:label="(h) =>{
return h('div', [
h('i',{
class:'fa fa-list-alt',
class:'fa fa-user',
style:{
'margin-right' : '2px'
}
}),
h('span', '全部档案'),
h('span', '员工不在档'),
h('Badge', {
props: {
count: undefined,
......@@ -78,28 +78,28 @@
})
])
}" >
<view_tabviewpanel4
<view_tabviewpanel3
:viewState="viewState"
:viewparams="JSON.parse(JSON.stringify(viewparams))"
:context="JSON.parse(JSON.stringify(context))"
v-if="isInit.tabviewpanel4"
name="tabviewpanel4"
ref='tabviewpanel4'
:expActive="activatedTabViewPanel === 'tabviewpanel4'"
v-if="isInit.tabviewpanel3"
name="tabviewpanel3"
ref='tabviewpanel3'
:expActive="activatedTabViewPanel === 'tabviewpanel3'"
@viewpanelDatasChange = "tabViewPanelDatasChange"
@closeview="closeView($event)">
</view_tabviewpanel4>
</view_tabviewpanel3>
</tab-pane>
<tab-pane :index="3" name='tabviewpanel2' tab='v_006tabexppanel' class=''
<tab-pane :index="3" name='tabviewpanel4' tab='v_006tabexppanel' class=''
:label="(h) =>{
return h('div', [
h('i',{
class:'fa fa-warning',
class:'fa fa-list-alt',
style:{
'margin-right' : '2px'
}
}),
h('span', '非员工在档'),
h('span', '全部档案'),
h('Badge', {
props: {
count: undefined,
......@@ -108,17 +108,17 @@
})
])
}" >
<view_tabviewpanel2
<view_tabviewpanel4
:viewState="viewState"
:viewparams="JSON.parse(JSON.stringify(viewparams))"
:context="JSON.parse(JSON.stringify(context))"
v-if="isInit.tabviewpanel2"
name="tabviewpanel2"
ref='tabviewpanel2'
:expActive="activatedTabViewPanel === 'tabviewpanel2'"
v-if="isInit.tabviewpanel4"
name="tabviewpanel4"
ref='tabviewpanel4'
:expActive="activatedTabViewPanel === 'tabviewpanel4'"
@viewpanelDatasChange = "tabViewPanelDatasChange"
@closeview="closeView($event)">
</view_tabviewpanel2>
</view_tabviewpanel4>
</tab-pane>
</tabs>
</div>
\ No newline at end of file
app_PIM/src/widgets/hrarchives/v-006tabexppanel-tabexppanel/v-006tabexppanel-tabexppanel.vue
浏览文件 @ 2c294dea
......@@ -4,9 +4,9 @@ import { Component } from 'vue-property-decorator';
import { VueLifeCycleProcessing } from '@/studio-core';
import { V_006tabexppanelTabexppanelBase } from './v-006tabexppanel-tabexppanel-base';
import view_tabviewpanel from '@widgets/hrarchives/v-006tabviewpanel-tabviewpanel/v-006tabviewpanel-tabviewpanel.vue';
import view_tabviewpanel2 from '@widgets/hrarchives/v-006tabviewpanel2-tabviewpanel/v-006tabviewpanel2-tabviewpanel.vue';
import view_tabviewpanel3 from '@widgets/hrarchives/v-006tabviewpanel3-tabviewpanel/v-006tabviewpanel3-tabviewpanel.vue';
import view_tabviewpanel4 from '@widgets/hrarchives/v-006tabviewpanel4-tabviewpanel/v-006tabviewpanel4-tabviewpanel.vue';
import view_tabviewpanel2 from '@widgets/hrarchives/v-006tabviewpanel2-tabviewpanel/v-006tabviewpanel2-tabviewpanel.vue';
/**
......@@ -19,9 +19,9 @@ import view_tabviewpanel2 from '@widgets/hrarchives/v-006tabviewpanel2-tabviewpa
@Component({
components: {
view_tabviewpanel,
view_tabviewpanel2,
view_tabviewpanel3,
view_tabviewpanel4,
view_tabviewpanel2,
}
})
......
config.xml
浏览文件 @ 2c294dea
......@@ -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
浏览文件 @ 2c294dea
......@@ -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
浏览文件 @ 2c294dea
......@@ -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
浏览文件 @ 2c294dea
......@@ -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
浏览文件 @ 2c294dea
......@@ -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:
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或