Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
iBiz人力资源
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
iBiz企业套件
iBiz人力资源
提交
342a092c
提交
342a092c
编写于
8月 05, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
jackwang 部署微服务应用
上级
530c082b
变更
9
显示空白字符变更
内嵌
并排
正在显示
9 个修改的文件
包含
139 行增加
和
30 行删除
+139
-30
hromhierarchys.ts
app_PIM/src/mock/entity/hromhierarchys/hromhierarchys.ts
+89
-0
hromhierarchy-cat-v-002.html
...base/hromhierarchy-cat-v-002/hromhierarchy-cat-v-002.html
+1
-1
hromhierarchy-service-base.ts
...M/src/service/hromhierarchy/hromhierarchy-service-base.ts
+20
-0
tree-001-treeview-service.ts
...mhierarchy/tree-001-treeview/tree-001-treeview-service.ts
+4
-4
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/mock/entity/hromhierarchys/hromhierarchys.ts
浏览文件 @
342a092c
...
...
@@ -516,6 +516,95 @@ mock.onGet(new RegExp(/^\/hromhierarchies\/fetchdefault(\?[\w-./?%&=,]*)*$/)).re
return
[
status
,
records
?
records
:
[]];
});
// FetchRootOrg
mock
.
onGet
(
new
RegExp
(
/^
\/
hromhierarchycats
\/([
a-zA-Z0-9
\-\;]{1,35})\/
hromhierarchies
\/
fetchrootorg$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:hromhierarchy 方法: FetchRootOrg"
);
console
.
table
({
url
:
config
.
url
,
method
:
config
.
method
,
data
:
config
.
data
});
let
status
=
MockAdapter
.
mockStatus
(
config
);
if
(
status
!==
200
)
{
return
[
status
,
null
];
}
const
paramArray
:
Array
<
any
>
=
[
'omhierarchycatid'
];
let
tempValue
:
any
=
{};
const
matchArray
:
any
=
new
RegExp
(
/^
\/
hromhierarchycats
\/([
a-zA-Z0-9
\-\;]{1,35})\/
hromhierarchies
\/
fetchrootorg$/
).
exec
(
config
.
url
);
if
(
matchArray
&&
matchArray
.
length
>
1
&&
paramArray
&&
paramArray
.
length
>
0
){
paramArray
.
forEach
((
item
:
any
,
index
:
number
)
=>
{
Object
.
defineProperty
(
tempValue
,
item
,
{
enumerable
:
true
,
value
:
matchArray
[
index
+
1
]
});
});
}
let
items
=
mockDatas
?
mockDatas
:
[];
if
(
items
.
length
>
0
&&
paramArray
.
length
>
0
)
{
paramArray
.
forEach
((
paramkey
:
any
)
=>
{
if
(
tempValue
[
paramkey
]
&&
tempValue
[
paramkey
].
indexOf
(
";"
)
>
0
)
{
let
keysGrounp
:
Array
<
any
>
=
tempValue
[
paramkey
].
split
(
new
RegExp
(
/
[\;]
/
));
let
tempArray
:
Array
<
any
>
=
[];
keysGrounp
.
forEach
((
singlekey
:
any
)
=>
{
let
_items
=
items
.
filter
((
item
:
any
)
=>
{
return
item
[
paramkey
]
==
singlekey
});
if
(
_items
.
length
>
0
){
tempArray
.
push
(...
_items
);
}
})
items
=
tempArray
;
}
else
{
items
=
items
.
filter
((
item
:
any
)
=>
{
return
item
[
paramkey
]
==
tempValue
[
paramkey
]
});
}
})
}
console
.
groupCollapsed
(
"response数据 status: "
+
status
+
" data: "
);
console
.
table
(
items
);
console
.
groupEnd
();
console
.
groupEnd
();
return
[
status
,
items
];
});
// FetchRootOrg
mock
.
onGet
(
new
RegExp
(
/^
\/
hromhierarchies
\/
fetchrootorg$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:hromhierarchy 方法: FetchRootOrg"
);
console
.
table
({
url
:
config
.
url
,
method
:
config
.
method
,
data
:
config
.
data
});
let
status
=
MockAdapter
.
mockStatus
(
config
);
if
(
status
!==
200
)
{
return
[
status
,
null
];
}
console
.
groupCollapsed
(
"response数据 status: "
+
status
+
" data: "
);
console
.
table
(
mockDatas
);
console
.
groupEnd
();
console
.
groupEnd
();
return
[
status
,
mockDatas
?
mockDatas
:
[]];
});
// FetchRootOrg
mock
.
onGet
(
new
RegExp
(
/^
\/
hromhierarchies
\/
fetchrootorg
(\?[\w
-.
/
?%&=,
]
*
)
*$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:hromhierarchy 方法: FetchRootOrg"
);
console
.
table
({
url
:
config
.
url
,
method
:
config
.
method
,
data
:
config
.
data
});
if
(
config
.
url
.
includes
(
'page'
)){
let
url
=
config
.
url
.
split
(
'?'
)[
1
];
let
params
=
qs
.
parse
(
url
);
Object
.
assign
(
config
,
params
);
}
let
status
=
MockAdapter
.
mockStatus
(
config
);
if
(
status
!==
200
)
{
return
[
status
,
null
];
}
let
total
=
mockDatas
.
length
;
let
records
:
Array
<
any
>
=
[];
if
(
!
config
.
page
||
!
config
.
size
){
records
=
mockDatas
;
}
else
{
if
((
config
.
page
-
1
)
*
config
.
size
<
total
){
records
=
mockDatas
.
slice
(
config
.
page
,
config
.
size
);
}
}
console
.
groupCollapsed
(
"response数据 status: "
+
status
+
" data: "
);
console
.
table
(
records
?
records
:
[]);
console
.
groupEnd
();
console
.
groupEnd
();
return
[
status
,
records
?
records
:
[]];
});
// URI参数传递情况未实现
// URI参数传递情况未实现
...
...
app_PIM/src/pages/base/hromhierarchy-cat-v-002/hromhierarchy-cat-v-002.html
浏览文件 @
342a092c
<studio-view-style2
viewName=
"hromhierarchycatv_002"
viewTitle=
"结构层次类别编辑视图"
class=
'deeditview hromhierarchy-cat-v-002'
>
<studio-view-style2
viewName=
"hromhierarchycatv_002"
viewTitle=
"结构层次类别编辑视图"
class=
'deeditview hromhierarchy-cat-v-002
from-dashboard-style
'
>
<template
slot=
"toolbar"
>
<view-toolbar
mode=
"STYLE2"
:model=
"toolBarModels"
@
item-click=
"toolbar_click($event)"
/>
</template>
<view
_form
...
...
app_PIM/src/service/hromhierarchy/hromhierarchy-service-base.ts
浏览文件 @
342a092c
...
...
@@ -244,4 +244,24 @@ export default class HROMHierarchyServiceBase extends EntityService {
let
res
:
any
=
Http
.
getInstance
().
get
(
`/hromhierarchies/fetchdefault`
,
tempData
,
isloading
);
return
res
;
}
/**
* FetchRootOrg接口方法
*
* @param {*} [context={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @returns {Promise<any>}
* @memberof HROMHierarchyServiceBase
*/
public
async
FetchRootOrg
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
if
(
context
.
hromhierarchycat
&&
true
){
let
tempData
:
any
=
JSON
.
parse
(
JSON
.
stringify
(
data
));
let
res
:
any
=
Http
.
getInstance
().
get
(
`/hromhierarchycats/
${
context
.
hromhierarchycat
}
/hromhierarchies/fetchrootorg`
,
tempData
,
isloading
);
return
res
;
}
let
tempData
:
any
=
JSON
.
parse
(
JSON
.
stringify
(
data
));
let
res
:
any
=
Http
.
getInstance
().
get
(
`/hromhierarchies/fetchrootorg`
,
tempData
,
isloading
);
return
res
;
}
}
\ No newline at end of file
app_PIM/src/widgets/hromhierarchy/tree-001-treeview/tree-001-treeview-service.ts
浏览文件 @
342a092c
...
...
@@ -482,13 +482,13 @@ export default class TREE_001Service extends ControlService {
Object
.
assign
(
searchFilter
,{
sort
:
'showorder,asc'
})
const
_appEntityService
:
any
=
this
.
appEntityService
;
let
list
:
any
[]
=
[];
if
(
_appEntityService
[
'Fetch
Default'
]
&&
_appEntityService
[
'FetchDefault
'
]
instanceof
Function
)
{
const
response
:
Promise
<
any
>
=
_appEntityService
[
'Fetch
Default
'
](
context
,
searchFilter
,
false
);
if
(
_appEntityService
[
'Fetch
RootOrg'
]
&&
_appEntityService
[
'FetchRootOrg
'
]
instanceof
Function
)
{
const
response
:
Promise
<
any
>
=
_appEntityService
[
'Fetch
RootOrg
'
](
context
,
searchFilter
,
false
);
response
.
then
((
response
:
any
)
=>
{
if
(
!
response
.
status
||
response
.
status
!==
200
)
{
resolve
([]);
console
.
log
(
JSON
.
stringify
(
context
));
console
.
error
(
'查询Fetch
Default
数据集异常!'
);
console
.
error
(
'查询Fetch
RootOrg
数据集异常!'
);
}
const
data
:
any
=
response
.
data
;
if
(
Object
.
keys
(
data
).
length
>
0
)
{
...
...
@@ -500,7 +500,7 @@ export default class TREE_001Service extends ControlService {
}).
catch
((
response
:
any
)
=>
{
resolve
([]);
console
.
log
(
JSON
.
stringify
(
context
));
console
.
error
(
'查询Fetch
Default
数据集异常!'
);
console
.
error
(
'查询Fetch
RootOrg
数据集异常!'
);
});
}
})
...
...
config.xml
浏览文件 @
342a092c
...
...
@@ -37,11 +37,11 @@
git clone -b master $para2 ibizhumanresources/
export NODE_OPTIONS=--max-old-space-size=4096
cd ibizhumanresources/
mvn clean package -P
hrapi
cd humanresource-
provider/humanresource-provider-hrapi
mvn -P
hrapi
docker:build
mvn -P
hrapi
docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/humanresource-
provider-hrapi.yaml iBizEE --with-registry-auth
mvn clean package -P
pim
cd humanresource-
app/humanresource-app-pim
mvn -P
pim
docker:build
mvn -P
pim
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
浏览文件 @
342a092c
...
...
@@ -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
浏览文件 @
342a092c
...
...
@@ -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
浏览文件 @
342a092c
...
...
@@ -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
浏览文件 @
342a092c
...
...
@@ -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
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录