Skip to content

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

jackwang 部署微服务应用

上级 83b825f8
隐藏空白字符变更
内嵌 并排
正在显示 包含 63 行增加 和 55 行删除
app_PIM/src/locale/lanres/entities/hrcertificate/hrcertificate_en_US.ts
浏览文件 @ 782fa3a6
......@@ -278,7 +278,7 @@ export default {
tip: "Filter",
},
},
gridviewtoolbar_toolbar: {
v_003toolbar_toolbar: {
tbitem3: {
caption: "New",
tip: "New",
......@@ -312,7 +312,7 @@ export default {
tip: "Filter",
},
},
v_003toolbar_toolbar: {
gridviewtoolbar_toolbar: {
tbitem3: {
caption: "New",
tip: "New",
......
app_PIM/src/locale/lanres/entities/hrcertificate/hrcertificate_zh_CN.ts
浏览文件 @ 782fa3a6
......@@ -277,7 +277,7 @@ export default {
tip: "过滤",
},
},
gridviewtoolbar_toolbar: {
v_003toolbar_toolbar: {
tbitem3: {
caption: "新建",
tip: "新建",
......@@ -311,7 +311,7 @@ export default {
tip: "过滤",
},
},
v_003toolbar_toolbar: {
gridviewtoolbar_toolbar: {
tbitem3: {
caption: "新建",
tip: "新建",
......
app_PIM/src/widgets/hrcertificate/tab-exp-viewtabexppanel-tabexppanel/tab-exp-viewtabexppanel-tabexppanel-base.tsx
浏览文件 @ 782fa3a6
......@@ -66,9 +66,9 @@ export class TabExpViewtabexppanelTabexppanelBase extends TabExpPanelControlBase
*/
protected isInit: any = {
tabviewpanel: true ,
tabviewpanel4: false ,
tabviewpanel3: false ,
tabviewpanel2: false ,
tabviewpanel3: false ,
tabviewpanel4: false ,
}
/**
......
app_PIM/src/widgets/hrcertificate/tab-exp-viewtabexppanel-tabexppanel/tab-exp-viewtabexppanel-tabexppanel.html
浏览文件 @ 782fa3a6
......@@ -30,16 +30,16 @@
@closeview="closeView($event)">
</view_tabviewpanel>
</tab-pane>
<tab-pane :index="1" name='tabviewpanel4' tab='tabexpviewtabexppanel' class=''
<tab-pane :index="1" name='tabviewpanel2' tab='tabexpviewtabexppanel' class=''
:label="(h) =>{
return h('div', [
h('i',{
class:'fa fa-book',
class:'fa fa-warning',
style:{
'margin-right' : '2px'
}
}),
h('span', '全部证书'),
h('span', '即将过期证书'),
h('Badge', {
props: {
count: undefined,
......@@ -48,17 +48,17 @@
})
])
}" >
<view_tabviewpanel4
<view_tabviewpanel2
: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.tabviewpanel2"
name="tabviewpanel2"
ref='tabviewpanel2'
:expActive="activatedTabViewPanel === 'tabviewpanel2'"
@viewpanelDatasChange = "tabViewPanelDatasChange"
@closeview="closeView($event)">
</view_tabviewpanel4>
</view_tabviewpanel2>
</tab-pane>
<tab-pane :index="2" name='tabviewpanel3' tab='tabexpviewtabexppanel' class=''
:label="(h) =>{
......@@ -90,16 +90,16 @@
@closeview="closeView($event)">
</view_tabviewpanel3>
</tab-pane>
<tab-pane :index="3" name='tabviewpanel2' tab='tabexpviewtabexppanel' class=''
<tab-pane :index="3" name='tabviewpanel4' tab='tabexpviewtabexppanel' class=''
:label="(h) =>{
return h('div', [
h('i',{
class:'fa fa-warning',
class:'fa fa-book',
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/hrcertificate/tab-exp-viewtabexppanel-tabexppanel/tab-exp-viewtabexppanel-tabexppanel.vue
浏览文件 @ 782fa3a6
......@@ -4,9 +4,9 @@ import { Component } from 'vue-property-decorator';
import { VueLifeCycleProcessing } from '@/studio-core';
import { TabExpViewtabexppanelTabexppanelBase } from './tab-exp-viewtabexppanel-tabexppanel-base';
import view_tabviewpanel from '@widgets/hrcertificate/tab-exp-viewtabviewpanel-tabviewpanel/tab-exp-viewtabviewpanel-tabviewpanel.vue';
import view_tabviewpanel4 from '@widgets/hrcertificate/tab-exp-viewtabviewpanel4-tabviewpanel/tab-exp-viewtabviewpanel4-tabviewpanel.vue';
import view_tabviewpanel3 from '@widgets/hrcertificate/tab-exp-viewtabviewpanel3-tabviewpanel/tab-exp-viewtabviewpanel3-tabviewpanel.vue';
import view_tabviewpanel2 from '@widgets/hrcertificate/tab-exp-viewtabviewpanel2-tabviewpanel/tab-exp-viewtabviewpanel2-tabviewpanel.vue';
import view_tabviewpanel3 from '@widgets/hrcertificate/tab-exp-viewtabviewpanel3-tabviewpanel/tab-exp-viewtabviewpanel3-tabviewpanel.vue';
import view_tabviewpanel4 from '@widgets/hrcertificate/tab-exp-viewtabviewpanel4-tabviewpanel/tab-exp-viewtabviewpanel4-tabviewpanel.vue';
/**
......@@ -19,9 +19,9 @@ import view_tabviewpanel2 from '@widgets/hrcertificate/tab-exp-viewtabviewpanel2
@Component({
components: {
view_tabviewpanel,
view_tabviewpanel4,
view_tabviewpanel3,
view_tabviewpanel2,
view_tabviewpanel3,
view_tabviewpanel4,
}
})
......
app_PIM/src/widgets/hrcertificate/tab-exp-viewtabviewpanel2-tabviewpanel/tab-exp-viewtabviewpanel2-tabviewpanel.html
浏览文件 @ 782fa3a6
<div class='tabviewpanel' v-if='isActivied'>
<hrcertificate-v-003
<hrcertificate-v-006
class='viewcontainer2'
:viewdata="viewdata"
:viewparam="viewparam"
......
app_PIM/src/widgets/hrcertificate/tab-exp-viewtabviewpanel3-tabviewpanel/tab-exp-viewtabviewpanel3-tabviewpanel.html
浏览文件 @ 782fa3a6
<div class='tabviewpanel' v-if='isActivied'>
<hrcertificate-v-006
<hrcertificate-v-003
class='viewcontainer2'
:viewdata="viewdata"
:viewparam="viewparam"
......
app_PIM/src/widgets/hrtechnical-title/main-form/main-form-base.tsx
浏览文件 @ 782fa3a6
......@@ -105,6 +105,14 @@ export class MainEditFormBase extends EditFormControlBase {
* @memberof MainEditFormBase
*/
public rules: any = {
hremployeename: [
{ required: true, type: 'string', message: '员工姓名 值不能为空', trigger: 'change' },
{ required: true, type: 'string', message: '员工姓名 值不能为空', trigger: 'blur' },
],
hrtechnicaltitlename: [
{ required: true, type: 'string', message: '职称名称 值不能为空', trigger: 'change' },
{ required: true, type: 'string', message: '职称名称 值不能为空', trigger: 'blur' },
],
}
/**
......
config.xml
浏览文件 @ 782fa3a6
......@@ -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
浏览文件 @ 782fa3a6
......@@ -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
浏览文件 @ 782fa3a6
......@@ -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
浏览文件 @ 782fa3a6
......@@ -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
浏览文件 @ 782fa3a6
......@@ -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 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或