Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
iBiz人力资源
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
iBiz企业套件
iBiz人力资源
提交
7531262e
提交
7531262e
编写于
8月 05, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
jackwang 部署微服务应用
上级
be67a328
变更
10
隐藏空白字符变更
内嵌
并排
正在显示
10 个修改的文件
包含
221 行增加
和
71 行删除
+221
-71
hromhierarchy-cat_en_US.ts
...res/entities/hromhierarchy-cat/hromhierarchy-cat_en_US.ts
+12
-4
hromhierarchy-cat_zh_CN.ts
...res/entities/hromhierarchy-cat/hromhierarchy-cat_zh_CN.ts
+12
-4
hromhierarchy-cat-v-002-base.tsx
.../hromhierarchy-cat-v-002/hromhierarchy-cat-v-002-base.tsx
+41
-38
state.ts
app_PIM/src/store/modules/view-action/state.ts
+1
-0
hromhierarchy-cat-ui-service-base.ts
...ce/hromhierarchy-cat/hromhierarchy-cat-ui-service-base.ts
+130
-0
config.xml
config.xml
+5
-5
Dockerfile
...urce-app/humanresource-app-pim/src/main/docker/Dockerfile
+1
-1
humanresource-app-pim.yaml
...source-app-pim/src/main/docker/humanresource-app-pim.yaml
+17
-1
Dockerfile
...r/humanresource-provider-hrapi/src/main/docker/Dockerfile
+1
-1
humanresource-provider-hrapi.yaml
...r-hrapi/src/main/docker/humanresource-provider-hrapi.yaml
+1
-17
未找到文件。
app_PIM/src/locale/lanres/entities/hromhierarchy-cat/hromhierarchy-cat_en_US.ts
浏览文件 @
7531262e
...
@@ -139,15 +139,23 @@ export default {
...
@@ -139,15 +139,23 @@ export default {
},
},
},
},
v_002toolbar_toolbar
:
{
v_002toolbar_toolbar
:
{
tbitem1
:
{
tbitem1
_ff_001
:
{
caption
:
"
Save And Close
"
,
caption
:
"
编辑
"
,
tip
:
"
Save And Close Window
"
,
tip
:
"
编辑
"
,
},
},
seperator1
:
{
tbitem1_remove_sep
:
{
caption
:
""
,
caption
:
""
,
tip
:
""
,
tip
:
""
,
},
},
tbitem1_remove
:
{
caption
:
"删除并关闭"
,
tip
:
"删除并关闭"
,
},
tbitem2
:
{
tbitem2
:
{
caption
:
"-"
,
tip
:
""
,
},
tbitem22
:
{
caption
:
"关闭"
,
caption
:
"关闭"
,
tip
:
"关闭"
,
tip
:
"关闭"
,
},
},
...
...
app_PIM/src/locale/lanres/entities/hromhierarchy-cat/hromhierarchy-cat_zh_CN.ts
浏览文件 @
7531262e
...
@@ -138,15 +138,23 @@ export default {
...
@@ -138,15 +138,23 @@ export default {
},
},
},
},
v_002toolbar_toolbar
:
{
v_002toolbar_toolbar
:
{
tbitem1
:
{
tbitem1
_ff_001
:
{
caption
:
"
保存并关闭
"
,
caption
:
"
编辑
"
,
tip
:
"
保存并关闭
"
,
tip
:
"
编辑
"
,
},
},
seperator1
:
{
tbitem1_remove_sep
:
{
caption
:
""
,
caption
:
""
,
tip
:
""
,
tip
:
""
,
},
},
tbitem1_remove
:
{
caption
:
"删除并关闭"
,
tip
:
"删除并关闭"
,
},
tbitem2
:
{
tbitem2
:
{
caption
:
"-"
,
tip
:
""
,
},
tbitem22
:
{
caption
:
"关闭"
,
caption
:
"关闭"
,
tip
:
"关闭"
,
tip
:
"关闭"
,
},
},
...
...
app_PIM/src/pages/base/hromhierarchy-cat-v-002/hromhierarchy-cat-v-002-base.tsx
浏览文件 @
7531262e
...
@@ -99,10 +99,13 @@ export class HROMHierarchyCatV_002Base extends EditViewBase {
...
@@ -99,10 +99,13 @@ export class HROMHierarchyCatV_002Base extends EditViewBase {
* @memberof HROMHierarchyCatV_002
* @memberof HROMHierarchyCatV_002
*/
*/
public
toolBarModels
:
any
=
{
public
toolBarModels
:
any
=
{
tbitem1
:
{
name
:
'tbitem1'
,
caption
:
'保存并关闭'
,
'isShowCaption'
:
true
,
'isShowIcon'
:
true
,
tooltip
:
'保存并关闭'
,
iconcls
:
'fa fa-power-off'
,
icon
:
''
,
disabled
:
false
,
type
:
'DEUIACTION'
,
visabled
:
true
,
noprivdisplaymode
:
2
,
dataaccaction
:
''
,
uiaction
:
{
tag
:
'SaveAndExit'
,
target
:
'
'
,
class
:
''
}
},
tbitem1
_ff_001
:
{
name
:
'tbitem1_ff_001'
,
caption
:
'编辑'
,
'isShowCaption'
:
true
,
'isShowIcon'
:
true
,
tooltip
:
'编辑'
,
disabled
:
false
,
type
:
'DEUIACTION'
,
visabled
:
true
,
noprivdisplaymode
:
2
,
dataaccaction
:
''
,
uiaction
:
{
tag
:
'FF_001'
,
target
:
'SINGLEKEY
'
,
class
:
''
}
},
seperator1
:
{
name
:
'seperator1'
,
type
:
'SEPERATOR'
,
visabled
:
true
,
dataaccaction
:
''
,
uiaction
:
{
}
},
tbitem1_remove_sep
:
{
name
:
'tbitem1_remove_sep'
,
type
:
'SEPERATOR'
,
visabled
:
true
,
dataaccaction
:
''
,
uiaction
:
{
}
},
tbitem2
:
{
name
:
'tbitem2'
,
caption
:
'关闭'
,
'isShowCaption'
:
true
,
'isShowIcon'
:
true
,
tooltip
:
'关闭'
,
iconcls
:
'fa fa-sign-out'
,
icon
:
''
,
disabled
:
false
,
type
:
'DEUIACTION'
,
visabled
:
true
,
noprivdisplaymode
:
2
,
dataaccaction
:
''
,
uiaction
:
{
tag
:
'Exit'
,
target
:
''
,
class
:
''
}
},
tbitem1_remove
:
{
name
:
'tbitem1_remove'
,
caption
:
'删除并关闭'
,
'isShowCaption'
:
true
,
'isShowIcon'
:
true
,
tooltip
:
'删除并关闭'
,
disabled
:
false
,
type
:
'DEUIACTION'
,
visabled
:
true
,
noprivdisplaymode
:
2
,
dataaccaction
:
''
,
uiaction
:
{
tag
:
'Remove'
,
target
:
'SINGLEKEY'
,
class
:
''
}
},
tbitem2
:
{
name
:
'tbitem2'
,
type
:
'SEPERATOR'
,
visabled
:
true
,
dataaccaction
:
''
,
uiaction
:
{
}
},
tbitem22
:
{
name
:
'tbitem22'
,
caption
:
'关闭'
,
'isShowCaption'
:
true
,
'isShowIcon'
:
true
,
tooltip
:
'关闭'
,
iconcls
:
'fa fa-sign-out'
,
icon
:
''
,
disabled
:
false
,
type
:
'DEUIACTION'
,
visabled
:
true
,
noprivdisplaymode
:
2
,
dataaccaction
:
''
,
uiaction
:
{
tag
:
'Exit'
,
target
:
''
,
class
:
''
}
},
};
};
...
@@ -152,11 +155,14 @@ export class HROMHierarchyCatV_002Base extends EditViewBase {
...
@@ -152,11 +155,14 @@ export class HROMHierarchyCatV_002Base extends EditViewBase {
* @memberof HROMHierarchyCatV_002Base
* @memberof HROMHierarchyCatV_002Base
*/
*/
public
toolbar_click
(
$event
:
any
,
$event2
?:
any
):
void
{
public
toolbar_click
(
$event
:
any
,
$event2
?:
any
):
void
{
if
(
Object
.
is
(
$event
.
tag
,
'tbitem1'
))
{
if
(
Object
.
is
(
$event
.
tag
,
'tbitem1_ff_001'
))
{
this
.
toolbar_tbitem1_click
(
null
,
''
,
$event2
);
this
.
toolbar_tbitem1_ff_001_click
(
null
,
''
,
$event2
);
}
if
(
Object
.
is
(
$event
.
tag
,
'tbitem1_remove'
))
{
this
.
toolbar_tbitem1_remove_click
(
null
,
''
,
$event2
);
}
}
if
(
Object
.
is
(
$event
.
tag
,
'tbitem2'
))
{
if
(
Object
.
is
(
$event
.
tag
,
'tbitem2
2
'
))
{
this
.
toolbar_tbitem2_click
(
null
,
''
,
$event2
);
this
.
toolbar_tbitem2
2
_click
(
null
,
''
,
$event2
);
}
}
}
}
...
@@ -201,7 +207,7 @@ export class HROMHierarchyCatV_002Base extends EditViewBase {
...
@@ -201,7 +207,7 @@ export class HROMHierarchyCatV_002Base extends EditViewBase {
* @param {*} [$event]
* @param {*} [$event]
* @memberof
* @memberof
*/
*/
public
toolbar_tbitem1_click
(
params
:
any
=
{},
tag
?:
any
,
$event
?:
any
)
{
public
toolbar_tbitem1_
ff_001_
click
(
params
:
any
=
{},
tag
?:
any
,
$event
?:
any
)
{
// 参数
// 参数
// 取数
// 取数
let
datas
:
any
[]
=
[];
let
datas
:
any
[]
=
[];
...
@@ -218,7 +224,8 @@ export class HROMHierarchyCatV_002Base extends EditViewBase {
...
@@ -218,7 +224,8 @@ export class HROMHierarchyCatV_002Base extends EditViewBase {
datas
=
[
params
];
datas
=
[
params
];
}
}
// 界面行为
// 界面行为
this
.
SaveAndExit
(
datas
,
contextJO
,
paramJO
,
$event
,
xData
,
this
,
"HROMHierarchyCat"
);
const
curUIService
:
HROMHierarchyCatUIService
=
new
HROMHierarchyCatUIService
();
curUIService
.
HROMHierarchyCat_FF_001
(
datas
,
contextJO
,
paramJO
,
$event
,
xData
,
this
,
"HROMHierarchyCat"
);
}
}
/**
/**
...
@@ -229,7 +236,7 @@ export class HROMHierarchyCatV_002Base extends EditViewBase {
...
@@ -229,7 +236,7 @@ export class HROMHierarchyCatV_002Base extends EditViewBase {
* @param {*} [$event]
* @param {*} [$event]
* @memberof
* @memberof
*/
*/
public
toolbar_tbitem
2
_click
(
params
:
any
=
{},
tag
?:
any
,
$event
?:
any
)
{
public
toolbar_tbitem
1_remove
_click
(
params
:
any
=
{},
tag
?:
any
,
$event
?:
any
)
{
// 参数
// 参数
// 取数
// 取数
let
datas
:
any
[]
=
[];
let
datas
:
any
[]
=
[];
...
@@ -246,42 +253,38 @@ export class HROMHierarchyCatV_002Base extends EditViewBase {
...
@@ -246,42 +253,38 @@ export class HROMHierarchyCatV_002Base extends EditViewBase {
datas
=
[
params
];
datas
=
[
params
];
}
}
// 界面行为
// 界面行为
this
.
Exit
(
datas
,
contextJO
,
paramJO
,
$event
,
xData
,
this
,
"HROMHierarchyCat"
);
const
curUIService
:
HROMHierarchyCatUIService
=
new
HROMHierarchyCatUIService
();
curUIService
.
HROMHierarchyCat_Remove
(
datas
,
contextJO
,
paramJO
,
$event
,
xData
,
this
,
"HROMHierarchyCat"
);
}
}
/**
/**
*
保存并关闭
*
逻辑事件
*
*
* @param {any[]} args 当前数据
* @param {*} [params={}]
* @param {any} contextJO 行为附加上下文
* @param {*} [tag]
* @param {*} [params] 附加参数
* @param {*} [$event]
* @param {*} [$event] 事件源
* @memberof
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @memberof HROMHierarchyCatV_002Base
*/
*/
public
SaveAndExit
(
args
:
any
[],
contextJO
?:
any
,
params
?:
any
,
$event
?:
any
,
xData
?:
any
,
actionContext
?:
any
,
srfParentDeName
?:
string
)
{
public
toolbar_tbitem22_click
(
params
:
any
=
{},
tag
?:
any
,
$event
?:
any
)
{
// 参数
// 取数
let
datas
:
any
[]
=
[];
let
xData
:
any
=
null
;
// _this 指向容器对象
const
_this
:
any
=
this
;
const
_this
:
any
=
this
;
if
(
xData
&&
xData
.
saveAndExit
instanceof
Function
)
{
let
paramJO
:
any
=
{};
xData
.
saveAndExit
().
then
((
response
:
any
)
=>
{
let
contextJO
:
any
=
{};
if
(
!
response
||
response
.
status
!==
200
)
{
xData
=
this
.
$refs
.
form
;
return
;
if
(
xData
.
getDatas
&&
xData
.
getDatas
instanceof
Function
)
{
}
datas
=
[...
xData
.
getDatas
()];
if
(
window
.
parent
){
}
window
.
parent
.
postMessage
([{
...
response
.
data
}],
'*'
);
if
(
params
){
}
datas
=
[
params
];
});
}
else
if
(
_this
.
saveAndExit
&&
_this
.
saveAndExit
instanceof
Function
)
{
_this
.
saveAndExit
().
then
((
response
:
any
)
=>
{
if
(
!
response
||
response
.
status
!==
200
)
{
return
;
}
if
(
window
.
parent
){
window
.
parent
.
postMessage
([{
...
response
.
data
}],
'*'
);
}
});
}
}
// 界面行为
this
.
Exit
(
datas
,
contextJO
,
paramJO
,
$event
,
xData
,
this
,
"HROMHierarchyCat"
);
}
}
/**
/**
* 关闭
* 关闭
*
*
...
...
app_PIM/src/store/modules/view-action/state.ts
浏览文件 @
7531262e
...
@@ -60,6 +60,7 @@ export const viewstate: any = {
...
@@ -60,6 +60,7 @@ export const viewstate: any = {
viewaction
:
''
,
viewaction
:
''
,
viewdatachange
:
false
,
viewdatachange
:
false
,
refviews
:
[
refviews
:
[
'aa2c4d945f9d880dd836ebe74ca9f547'
,
'bf1effbdf9fb9d7d2a1c9d281ab35441'
,
'bf1effbdf9fb9d7d2a1c9d281ab35441'
,
],
],
},
},
...
...
app_PIM/src/uiservice/hromhierarchy-cat/hromhierarchy-cat-ui-service-base.ts
浏览文件 @
7531262e
...
@@ -113,6 +113,136 @@ export default class HROMHierarchyCatUIServiceBase extends UIService {
...
@@ -113,6 +113,136 @@ export default class HROMHierarchyCatUIServiceBase extends UIService {
public
initDeMainStateOPPrivsMap
(){
public
initDeMainStateOPPrivsMap
(){
}
}
/**
* 编辑
*
* @param {any[]} args 当前数据
* @param {any} context 行为附加上下文
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @param {*} [srfParentDeName] 父实体名称
* @returns {Promise<any>}
*/
public
async
HROMHierarchyCat_FF_001
(
args
:
any
[],
context
:
any
=
{}
,
params
:
any
=
{},
$event
?:
any
,
xData
?:
any
,
actionContext
?:
any
,
srfParentDeName
?:
string
)
{
let
data
:
any
=
{};
let
parentContext
:
any
=
{};
let
parentViewParam
:
any
=
{};
const
_this
:
any
=
actionContext
;
const
_args
:
any
[]
=
Util
.
deepCopy
(
args
);
const
actionTarget
:
string
|
null
=
'SINGLEKEY'
;
Object
.
assign
(
context
,
{
hromhierarchycat
:
'%hromhierarchycat%'
});
Object
.
assign
(
params
,
{
omhierarchycatid
:
'%hromhierarchycat%'
});
Object
.
assign
(
params
,
{
omhierarchycatname
:
'%omhierarchycatname%'
});
if
(
_this
.
context
){
parentContext
=
_this
.
context
;
}
if
(
_this
.
viewparams
){
parentViewParam
=
_this
.
viewparams
;
}
context
=
UIActionTool
.
handleContextParam
(
actionTarget
,
_args
,
parentContext
,
parentViewParam
,
context
);
data
=
UIActionTool
.
handleActionParam
(
actionTarget
,
_args
,
parentContext
,
parentViewParam
,
params
);
context
=
Object
.
assign
({},
actionContext
.
context
,
context
);
let
parentObj
:
any
=
{
srfparentdename
:
srfParentDeName
?
srfParentDeName
:
null
,
srfparentkey
:
srfParentDeName
?
context
[
srfParentDeName
.
toLowerCase
()]:
null
};
Object
.
assign
(
data
,
parentObj
);
Object
.
assign
(
context
,
parentObj
);
let
deResParameters
:
any
[]
=
[];
const
parameters
:
any
[]
=
[
{
pathName
:
'hromhierarchycats'
,
parameterName
:
'hromhierarchycat'
},
];
const
openDrawer
=
(
view
:
any
,
data
:
any
)
=>
{
let
container
:
Subject
<
any
>
=
actionContext
.
$appdrawer
.
openDrawer
(
view
,
context
,
data
);
container
.
subscribe
((
result
:
any
)
=>
{
if
(
!
result
||
!
Object
.
is
(
result
.
ret
,
'OK'
))
{
return
;
}
const
_this
:
any
=
actionContext
;
if
(
xData
&&
xData
.
refresh
&&
xData
.
refresh
instanceof
Function
)
{
xData
.
refresh
(
args
);
}
return
result
.
datas
;
});
}
const
view
:
any
=
{
viewname
:
'hromhierarchy-cat-edit-view'
,
height
:
0
,
width
:
600
,
title
:
actionContext
.
$t
(
'entities.hromhierarchycat.views.editview.title'
),
placement
:
'DRAWER_RIGHT'
,
};
openDrawer
(
view
,
data
);
}
/**
* 删除并关闭
*
* @param {any[]} args 当前数据
* @param {any} context 行为附加上下文
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @param {*} [srfParentDeName] 父实体名称
* @returns {Promise<any>}
*/
public
async
HROMHierarchyCat_Remove
(
args
:
any
[],
context
:
any
=
{},
params
:
any
=
{},
$event
?:
any
,
xData
?:
any
,
actionContext
?:
any
,
srfParentDeName
?:
string
){
let
data
:
any
=
{};
let
parentContext
:
any
=
{};
let
parentViewParam
:
any
=
{};
const
_this
:
any
=
actionContext
;
const
_args
:
any
[]
=
Util
.
deepCopy
(
args
);
const
actionTarget
:
string
|
null
=
'SINGLEKEY'
;
Object
.
assign
(
context
,
{
hromhierarchycat
:
'%hromhierarchycat%'
});
Object
.
assign
(
params
,
{
omhierarchycatid
:
'%hromhierarchycat%'
});
Object
.
assign
(
params
,
{
omhierarchycatname
:
'%omhierarchycatname%'
});
if
(
_this
.
context
){
parentContext
=
_this
.
context
;
}
if
(
_this
.
viewparams
){
parentViewParam
=
_this
.
viewparams
;
}
context
=
UIActionTool
.
handleContextParam
(
actionTarget
,
_args
,
parentContext
,
parentViewParam
,
context
);
data
=
UIActionTool
.
handleActionParam
(
actionTarget
,
_args
,
parentContext
,
parentViewParam
,
params
);
context
=
Object
.
assign
({},
actionContext
.
context
,
context
);
let
parentObj
:
any
=
{
srfparentdename
:
srfParentDeName
?
srfParentDeName
:
null
,
srfparentkey
:
srfParentDeName
?
context
[
srfParentDeName
.
toLowerCase
()]:
null
};
Object
.
assign
(
data
,
parentObj
);
Object
.
assign
(
context
,
parentObj
);
// 直接调实体服务需要转换的数据
if
(
context
&&
context
.
srfsessionid
){
context
.
srfsessionkey
=
context
.
srfsessionid
;
delete
context
.
srfsessionid
;
}
actionContext
.
closeView
(
null
);
const
backend
=
()
=>
{
const
curService
:
HROMHierarchyCatService
=
new
HROMHierarchyCatService
();
curService
.
Remove
(
context
,
data
,
true
).
then
((
response
:
any
)
=>
{
if
(
!
response
||
response
.
status
!==
200
)
{
actionContext
.
$Notice
.
error
({
title
:
'错误'
,
desc
:
response
.
message
});
return
;
}
actionContext
.
$Notice
.
success
({
title
:
'成功'
,
desc
:
'删除并关闭成功!'
});
const
_this
:
any
=
actionContext
;
if
(
xData
&&
xData
.
refresh
&&
xData
.
refresh
instanceof
Function
)
{
xData
.
refresh
(
args
);
}
return
response
;
}).
catch
((
response
:
any
)
=>
{
if
(
!
response
||
!
response
.
status
||
!
response
.
data
)
{
actionContext
.
$Notice
.
error
({
title
:
'错误'
,
desc
:
'系统异常!'
});
return
;
}
if
(
response
.
status
===
401
)
{
return
;
}
return
response
;
});
};
backend
();
}
/**
/**
* 获取指定数据的重定向页面
* 获取指定数据的重定向页面
...
...
config.xml
浏览文件 @
7531262e
...
@@ -37,11 +37,11 @@
...
@@ -37,11 +37,11 @@
git clone -b master $para2 ibizhumanresources/
git clone -b master $para2 ibizhumanresources/
export NODE_OPTIONS=--max-old-space-size=4096
export NODE_OPTIONS=--max-old-space-size=4096
cd ibizhumanresources/
cd ibizhumanresources/
mvn clean package -P
hrapi
mvn clean package -P
pim
cd humanresource-
provider/humanresource-provider-hrapi
cd humanresource-
app/humanresource-app-pim
mvn -P
hrapi
docker:build
mvn -P
pim
docker:build
mvn -P
hrapi
docker:push
mvn -P
pim
docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/humanresource-
provider-hrapi.yaml iBizEE --with-registry-auth
docker -H $para1 stack deploy --compose-file=src/main/docker/humanresource-
app-pim.yaml iBizEE --with-registry-auth
</command>
</command>
</hudson.tasks.Shell>
</hudson.tasks.Shell>
</builders>
</builders>
...
...
humanresource-app/humanresource-app-pim/src/main/docker/Dockerfile
浏览文件 @
7531262e
...
@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
...
@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /humanresource-app-pim.jar
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
ADD
humanresource-app-pim.jar /humanresource-app-pim.jar
humanresource-app/humanresource-app-pim/src/main/docker/humanresource-app-pim.yaml
浏览文件 @
7531262e
...
@@ -3,9 +3,25 @@ services:
...
@@ -3,9 +3,25 @@ services:
humanresource-app-pim
:
humanresource-app-pim
:
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-app-pim:latest
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-app-pim:latest
ports
:
ports
:
-
"
8080:8080
"
-
"
10327:10327
"
networks
:
networks
:
-
agent_network
-
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
:
deploy
:
resources
:
resources
:
limits
:
limits
:
...
...
humanresource-provider/humanresource-provider-hrapi/src/main/docker/Dockerfile
浏览文件 @
7531262e
...
@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
...
@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /humanresource-provider-hrapi.jar
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
ADD
humanresource-provider-hrapi.jar /humanresource-provider-hrapi.jar
humanresource-provider/humanresource-provider-hrapi/src/main/docker/humanresource-provider-hrapi.yaml
浏览文件 @
7531262e
...
@@ -3,25 +3,9 @@ services:
...
@@ -3,25 +3,9 @@ services:
humanresource-provider-hrapi
:
humanresource-provider-hrapi
:
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-provider-hrapi:latest
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-provider-hrapi:latest
ports
:
ports
:
-
"
10317:10317
"
-
"
8081:8081
"
networks
:
networks
:
-
agent_network
-
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
:
deploy
:
resources
:
resources
:
limits
:
limits
:
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录