Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibzou
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibzou
提交
36aa5fea
提交
36aa5fea
编写于
5月 05, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ibizdev提交
上级
8f77418f
变更
16
隐藏空白字符变更
内嵌
并排
正在显示
16 个修改的文件
包含
117 行增加
和
43 行删除
+117
-43
entity-service.ts
app_web/src/service/entity-service.ts
+93
-25
ibzdepartment-service-base.ts
...b/src/service/ibzdepartment/ibzdepartment-service-base.ts
+2
-0
ibzemployee-service-base.ts
app_web/src/service/ibzemployee/ibzemployee-service-base.ts
+2
-0
ibzorganization-service-base.ts
...c/service/ibzorganization/ibzorganization-service-base.ts
+2
-0
config.xml
config.xml
+5
-5
Dockerfile
ibzou-app/ibzou-app-web/src/main/docker/Dockerfile
+1
-1
ibzou-app-web.yaml
ibzou-app/ibzou-app-web/src/main/docker/ibzou-app-web.yaml
+3
-1
application-web-dev.yml
.../ibzou-app-web/src/main/resources/application-web-dev.yml
+1
-1
application-web-prod.yml
...ibzou-app-web/src/main/resources/application-web-prod.yml
+1
-1
application-dev.yml
ibzou-boot/src/main/resources/application-dev.yml
+1
-1
Dockerfile
ibzou-provider/ibzou-provider-api/src/main/docker/Dockerfile
+1
-1
ibzou-provider-api.yaml
...bzou-provider-api/src/main/docker/ibzou-provider-api.yaml
+1
-3
application-api-dev.yml
...u-provider-api/src/main/resources/application-api-dev.yml
+1
-1
application-api-prod.yml
...-provider-api/src/main/resources/application-api-prod.yml
+1
-1
PermissionSyncJob.java
.../src/main/java/cn/ibizlab/util/job/PermissionSyncJob.java
+1
-1
SimpleUserService.java
.../main/java/cn/ibizlab/util/service/SimpleUserService.java
+1
-1
未找到文件。
app_web/src/service/entity-service.ts
浏览文件 @
36aa5fea
...
@@ -33,47 +33,65 @@ export default class EntityService {
...
@@ -33,47 +33,65 @@ export default class EntityService {
/**
/**
* 零时储存,localStorage指向
* 零时储存,localStorage指向
*
*
* @p
rotected
* @p
ublic
* @type {(string)}
* @type {(string)}
* @memberof EntityService
* @memberof EntityService
*/
*/
p
rotected
tempStorage
:
any
;
p
ublic
tempStorage
:
any
;
/**
/**
* 当前DE标识
* 当前DE标识
*
*
* @p
rotected
* @p
ublic
* @type {(string)}
* @type {(string)}
* @memberof EntityService
* @memberof EntityService
*/
*/
p
rotected
APPDEKEY
:
string
=
''
;
p
ublic
APPDEKEY
:
string
=
''
;
/**
/**
* 当前APPDE标识
* 当前APPDE标识
*
*
* @p
rotected
* @p
ublic
* @type {(string)}
* @type {(string)}
* @memberof EntityService
* @memberof EntityService
*/
*/
p
rotected
APPLYDEKEY
:
string
=
''
;
p
ublic
APPLYDEKEY
:
string
=
''
;
/**
/**
* 当前NAME
* 当前NAME
*
*
* @p
rotected
* @p
ublic
* @type {(string)}
* @type {(string)}
* @memberof EntityService
* @memberof EntityService
*/
*/
p
rotected
APPDENAME
:
string
=
''
;
p
ublic
APPDENAME
:
string
=
''
;
/**
/**
* 当前主信息名
* 当前主信息名
*
*
* @p
rotected
* @p
ublic
* @type {(string)}
* @type {(string)}
* @memberof EntityService
* @memberof EntityService
*/
*/
protected
APPDETEXT
:
string
=
''
;
public
APPDETEXT
:
string
=
''
;
/**
* 当前系统名
*
* @public
* @type {(string)}
* @memberof EntityService
*/
public
SYSTEMNAME
:
string
=
''
;
/**
* 当前应用名
*
* @public
* @type {(string)}
* @memberof EntityService
*/
public
APPNAME
:
string
=
''
;
/**
/**
* Creates an instance of EntityService.
* Creates an instance of EntityService.
...
@@ -610,13 +628,18 @@ export default class EntityService {
...
@@ -610,13 +628,18 @@ export default class EntityService {
* @param {*} [context={}]
* @param {*} [context={}]
* @param {*} [data={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @param {boolean} [isloading]
* @param {boolean} [isEmbeddedApp]
* @returns {Promise<any>}
* @returns {Promise<any>}
* @memberof EntityService
* @memberof EntityService
*/
*/
public
async
WFStart
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
public
async
WFStart
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
,
isEmbeddedApp
?:
boolean
):
Promise
<
any
>
{
const
requestData
:
any
=
{};
if
(
isEmbeddedApp
){
Object
.
assign
(
requestData
,{
wfdata
:
data
});
return
Http
.
getInstance
().
post
(
`/wfcore/
${
this
.
SYSTEMNAME
}
-app-
${
this
.
APPNAME
}
/
${
this
.
APPDENAME
}
/
${
data
[
this
.
APPDEKEY
]}
/process-instances`
,
data
,
isloading
);
return
Http
.
getInstance
().
post
(
`/
${
this
.
APPDENAME
}
/
${
data
[
this
.
APPDEKEY
]}
/wfstart`
,
requestData
,
isloading
);
}
else
{
const
requestData
:
any
=
{};
Object
.
assign
(
requestData
,{
wfdata
:
data
});
return
Http
.
getInstance
().
post
(
`/
${
this
.
APPDENAME
}
/
${
data
[
this
.
APPDEKEY
]}
/wfstart`
,
requestData
,
isloading
);
}
}
}
...
@@ -699,27 +722,72 @@ export default class EntityService {
...
@@ -699,27 +722,72 @@ export default class EntityService {
return
Http
.
getInstance
().
post
(
`/
${
this
.
APPDENAME
}
/
${
data
[
this
.
APPDEKEY
]}
/wfreassign`
,
data
,
isloading
);
return
Http
.
getInstance
().
post
(
`/
${
this
.
APPDENAME
}
/
${
data
[
this
.
APPDEKEY
]}
/wfreassign`
,
data
,
isloading
);
}
}
/**
* WFGetWorkFlow接口方法(获取工作流定义)
*
* @param {*} [context={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @returns {Promise<any>}
* @memberof EntityService
*/
public
async
WFGetWorkFlow
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
return
Http
.
getInstance
().
get
(
`/wfcore/
${
this
.
SYSTEMNAME
}
-app-
${
this
.
APPNAME
}
/
${
this
.
APPDENAME
}
/process-definitions`
);
}
/**
* WFGetWFStep接口方法(根据系统实体查找当前适配的工作流模型步骤)
*
* @param {*} [context={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @returns {Promise<any>}
* @memberof EntityService
*/
public
async
WFGetWFStep
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
return
Http
.
getInstance
().
get
(
`/wfcore/
${
this
.
SYSTEMNAME
}
-app-
${
this
.
APPNAME
}
/
${
this
.
APPDENAME
}
/process-definitions-nodes`
);
}
/**
* GetWFLink接口方法(根据业务主键和当前步骤获取操作路径)
*
* @param {*} [context={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @returns {Promise<any>}
* @memberof EntityService
*/
public
async
GetWFLink
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
return
Http
.
getInstance
().
get
(
`/wfcore/
${
this
.
SYSTEMNAME
}
-app-
${
this
.
APPNAME
}
/
${
this
.
APPDENAME
}
/
${
data
[
this
.
APPDEKEY
]}
/usertasks/
${
data
[
'taskDefinitionKey'
]}
/ways`
);
}
/**
/**
* WFSubmit接口方法
* WFSubmit接口方法
*
*
* @param {*} [context={}]
* @param {*} [context={}]
* @param {*} [data={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @param {boolean} [isloading]
* @param {boolean} [isEmbeddedApp]
* @returns {Promise<any>}
* @returns {Promise<any>}
* @memberof EntityService
* @memberof EntityService
*/
*/
public
async
WFSubmit
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
public
async
WFSubmit
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
,
isEmbeddedApp
?:
boolean
):
Promise
<
any
>
{
const
requestData
:
any
=
{};
if
(
isEmbeddedApp
){
if
(
data
.
srfwfmemo
){
return
Http
.
getInstance
().
post
(
`/wfcore/
${
this
.
SYSTEMNAME
}
-app-
${
this
.
APPNAME
}
/
${
this
.
APPDENAME
}
/
${
data
[
this
.
APPDEKEY
]}
/tasks/
${
data
[
'taskId'
]}
`
);
requestData
.
srfwfmemo
=
JSON
.
parse
(
JSON
.
stringify
(
data
)).
srfwfmemo
;
}
else
{
delete
data
.
srfwfmemo
;
const
requestData
:
any
=
{};
}
if
(
data
.
srfwfmemo
){
if
(
data
.
viewparams
){
requestData
.
srfwfmemo
=
JSON
.
parse
(
JSON
.
stringify
(
data
)).
srfwfmemo
;
delete
data
.
viewparams
;
delete
data
.
srfwfmemo
;
}
if
(
data
.
viewparams
){
delete
data
.
viewparams
;
}
Object
.
assign
(
requestData
,{
wfdata
:
data
});
Object
.
assign
(
requestData
,{
opdata
:{
srfwfiatag
:
context
.
srfwfiatag
,
srfwfstep
:
context
.
srfwfstep
}});
return
Http
.
getInstance
().
post
(
`/
${
this
.
APPDENAME
}
/
${
data
[
this
.
APPDEKEY
]}
/wfsubmit`
,
requestData
,
isloading
);
}
}
Object
.
assign
(
requestData
,{
wfdata
:
data
});
Object
.
assign
(
requestData
,{
opdata
:{
srfwfiatag
:
context
.
srfwfiatag
,
srfwfstep
:
context
.
srfwfstep
}});
return
Http
.
getInstance
().
post
(
`/
${
this
.
APPDENAME
}
/
${
data
[
this
.
APPDEKEY
]}
/wfsubmit`
,
requestData
,
isloading
);
}
}
/**
/**
...
...
app_web/src/service/ibzdepartment/ibzdepartment-service-base.ts
浏览文件 @
36aa5fea
...
@@ -32,6 +32,8 @@ export default class IBZDepartmentServiceBase extends EntityService {
...
@@ -32,6 +32,8 @@ export default class IBZDepartmentServiceBase extends EntityService {
this
.
APPDEKEY
=
'deptid'
;
this
.
APPDEKEY
=
'deptid'
;
this
.
APPDENAME
=
'ibzdepartments'
;
this
.
APPDENAME
=
'ibzdepartments'
;
this
.
APPDETEXT
=
'deptname'
;
this
.
APPDETEXT
=
'deptname'
;
this
.
APPNAME
=
'web'
;
this
.
SYSTEMNAME
=
'ibzou'
;
}
}
// 实体接口
// 实体接口
...
...
app_web/src/service/ibzemployee/ibzemployee-service-base.ts
浏览文件 @
36aa5fea
...
@@ -32,6 +32,8 @@ export default class IBZEmployeeServiceBase extends EntityService {
...
@@ -32,6 +32,8 @@ export default class IBZEmployeeServiceBase extends EntityService {
this
.
APPDEKEY
=
'userid'
;
this
.
APPDEKEY
=
'userid'
;
this
.
APPDENAME
=
'ibzemployees'
;
this
.
APPDENAME
=
'ibzemployees'
;
this
.
APPDETEXT
=
'personname'
;
this
.
APPDETEXT
=
'personname'
;
this
.
APPNAME
=
'web'
;
this
.
SYSTEMNAME
=
'ibzou'
;
}
}
// 实体接口
// 实体接口
...
...
app_web/src/service/ibzorganization/ibzorganization-service-base.ts
浏览文件 @
36aa5fea
...
@@ -32,6 +32,8 @@ export default class IBZOrganizationServiceBase extends EntityService {
...
@@ -32,6 +32,8 @@ export default class IBZOrganizationServiceBase extends EntityService {
this
.
APPDEKEY
=
'orgid'
;
this
.
APPDEKEY
=
'orgid'
;
this
.
APPDENAME
=
'ibzorganizations'
;
this
.
APPDENAME
=
'ibzorganizations'
;
this
.
APPDETEXT
=
'orgname'
;
this
.
APPDETEXT
=
'orgname'
;
this
.
APPNAME
=
'web'
;
this
.
SYSTEMNAME
=
'ibzou'
;
}
}
// 实体接口
// 实体接口
...
...
config.xml
浏览文件 @
36aa5fea
...
@@ -38,11 +38,11 @@
...
@@ -38,11 +38,11 @@
git clone -b master $para2 ibzou/
git clone -b master $para2 ibzou/
export NODE_OPTIONS=--max-old-space-size=4096
export NODE_OPTIONS=--max-old-space-size=4096
cd ibzou/
cd ibzou/
mvn clean package -P
api
mvn clean package -P
web
cd ibzou-
provider/ibzou-provider-api
cd ibzou-
app/ibzou-app-web
mvn -P
api
docker:build
mvn -P
web
docker:build
mvn -P
api
docker:push
mvn -P
web
docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/ibzou-
provider-api.yaml dev --with-registry-auth
docker -H $para1 stack deploy --compose-file=src/main/docker/ibzou-
app-web.yaml dev --with-registry-auth
</command>
</command>
</hudson.tasks.Shell>
</hudson.tasks.Shell>
</builders>
</builders>
...
...
ibzou-app/ibzou-app-web/src/main/docker/Dockerfile
浏览文件 @
36aa5fea
...
@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
...
@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \
sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzou-app-web.jar
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzou-app-web.jar
EXPOSE
8080
EXPOSE
30001
ADD
ibzou-app-web.jar /ibzou-app-web.jar
ADD
ibzou-app-web.jar /ibzou-app-web.jar
ibzou-app/ibzou-app-web/src/main/docker/ibzou-app-web.yaml
浏览文件 @
36aa5fea
...
@@ -3,9 +3,11 @@ services:
...
@@ -3,9 +3,11 @@ services:
ibzou-app-web
:
ibzou-app-web
:
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/ibzou-app-web:latest
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/ibzou-app-web:latest
ports
:
ports
:
-
"
8080:8080
"
-
"
30001:30001
"
networks
:
networks
:
-
agent_network
-
agent_network
environment
:
SPRING_CLOUD_NACOS_DISCOVERY_IP
:
172.16.180.237
deploy
:
deploy
:
mode
:
replicated
mode
:
replicated
replicas
:
1
replicas
:
1
...
...
ibzou-app/ibzou-app-web/src/main/resources/application-web-dev.yml
浏览文件 @
36aa5fea
server
:
server
:
port
:
8080
port
:
30001
\ No newline at end of file
\ No newline at end of file
ibzou-app/ibzou-app-web/src/main/resources/application-web-prod.yml
浏览文件 @
36aa5fea
server
:
server
:
port
:
8080
port
:
30001
#zuul网关路由设置
#zuul网关路由设置
zuul
:
zuul
:
...
...
ibzou-boot/src/main/resources/application-dev.yml
浏览文件 @
36aa5fea
server
:
server
:
port
:
40001
port
:
8080
ibzou-provider/ibzou-provider-api/src/main/docker/Dockerfile
浏览文件 @
36aa5fea
...
@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
...
@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \
sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzou-provider-api.jar
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzou-provider-api.jar
EXPOSE
4000
1
EXPOSE
808
1
ADD
ibzou-provider-api.jar /ibzou-provider-api.jar
ADD
ibzou-provider-api.jar /ibzou-provider-api.jar
ibzou-provider/ibzou-provider-api/src/main/docker/ibzou-provider-api.yaml
浏览文件 @
36aa5fea
...
@@ -3,11 +3,9 @@ services:
...
@@ -3,11 +3,9 @@ services:
ibzou-provider-api
:
ibzou-provider-api
:
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/ibzou-provider-api:latest
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/ibzou-provider-api:latest
ports
:
ports
:
-
"
40001:4000
1"
-
"
8081:808
1"
networks
:
networks
:
-
agent_network
-
agent_network
environment
:
SPRING_CLOUD_NACOS_DISCOVERY_IP
:
172.16.180.237
deploy
:
deploy
:
mode
:
replicated
mode
:
replicated
replicas
:
1
replicas
:
1
...
...
ibzou-provider/ibzou-provider-api/src/main/resources/application-api-dev.yml
浏览文件 @
36aa5fea
server
:
server
:
port
:
40001
port
:
8081
\ No newline at end of file
\ No newline at end of file
ibzou-provider/ibzou-provider-api/src/main/resources/application-api-prod.yml
浏览文件 @
36aa5fea
server
:
server
:
port
:
4000
1
port
:
808
1
ibzou-util/src/main/java/cn/ibizlab/util/job/PermissionSyncJob.java
浏览文件 @
36aa5fea
...
@@ -32,7 +32,7 @@ public class PermissionSyncJob implements ApplicationRunner {
...
@@ -32,7 +32,7 @@ public class PermissionSyncJob implements ApplicationRunner {
@Value
(
"${ibiz.enablePermissionValid:false}"
)
@Value
(
"${ibiz.enablePermissionValid:false}"
)
boolean
enablePermissionValid
;
//是否开启权限校验
boolean
enablePermissionValid
;
//是否开启权限校验
@Value
(
"${ibiz.systemid:
2C40DFCD-0DF5-47BF-91A5-C45F810B0001
}"
)
@Value
(
"${ibiz.systemid:
110B1A3E-4944-47C8-B4C4-EC15FB8982F3
}"
)
private
String
systemId
;
private
String
systemId
;
@Override
@Override
...
...
ibzou-util/src/main/java/cn/ibizlab/util/service/SimpleUserService.java
浏览文件 @
36aa5fea
...
@@ -22,7 +22,7 @@ public class SimpleUserService implements AuthenticationUserService{
...
@@ -22,7 +22,7 @@ public class SimpleUserService implements AuthenticationUserService{
@Value
(
"${ibiz.enablePermissionValid:false}"
)
@Value
(
"${ibiz.enablePermissionValid:false}"
)
boolean
enablePermissionValid
;
//是否开启权限校验
boolean
enablePermissionValid
;
//是否开启权限校验
@Value
(
"${ibiz.systemid:
2C40DFCD-0DF5-47BF-91A5-C45F810B0001
}"
)
@Value
(
"${ibiz.systemid:
110B1A3E-4944-47C8-B4C4-EC15FB8982F3
}"
)
private
String
systemid
;
private
String
systemid
;
@Autowired
@Autowired
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录