Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibzou
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibzou
提交
b3676d08
提交
b3676d08
编写于
7月 20, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
lab_qyk 发布系统代码
上级
b08f2e62
变更
21
展开全部
显示空白字符变更
内嵌
并排
正在显示
21 个修改的文件
包含
33 行增加
和
287 行删除
+33
-287
ibzemployee-service-base.ts
app_web/src/service/ibzemployee/ibzemployee-service-base.ts
+0
-1
main-form-base.vue
...eb/src/widgets/ibzdepartment/main-form/main-form-base.vue
+1
-1
new-form-form-base.vue
...idgets/ibzdepartment/new-form-form/new-form-form-base.vue
+1
-1
main-form-base.vue
...b/src/widgets/ibzdept-member/main-form/main-form-base.vue
+1
-1
main-form-base.vue
app_web/src/widgets/ibzemployee/main-form/main-form-base.vue
+1
-1
new-form-form-base.vue
.../widgets/ibzemployee/new-form-form/new-form-form-base.vue
+1
-1
main-form-base.vue
.../src/widgets/ibzorganization/main-form/main-form-base.vue
+1
-1
new-form-form-base.vue
...gets/ibzorganization/new-form-form/new-form-form-base.vue
+1
-1
main-form-base.vue
app_web/src/widgets/ibzpost/main-form/main-form-base.vue
+1
-1
main-form-base.vue
...b/src/widgets/ibzteam-member/main-form/main-form-base.vue
+1
-1
main-form-base.vue
app_web/src/widgets/ibzteam/main-form/main-form-base.vue
+1
-1
Dockerfile
ibzou-app/ibzou-app-web/src/main/docker/Dockerfile
+4
-1
h2_table.xml
ibzou-core/src/main/resources/liquibase/h2_table.xml
+8
-267
Dockerfile
ibzou-provider/ibzou-provider-api/src/main/docker/Dockerfile
+4
-1
IBZDepartmentMapping.java
...ain/java/cn/ibizlab/api/mapping/IBZDepartmentMapping.java
+1
-1
IBZDeptMemberMapping.java
...ain/java/cn/ibizlab/api/mapping/IBZDeptMemberMapping.java
+1
-1
IBZEmployeeMapping.java
.../main/java/cn/ibizlab/api/mapping/IBZEmployeeMapping.java
+1
-1
IBZOrganizationMapping.java
...n/java/cn/ibizlab/api/mapping/IBZOrganizationMapping.java
+1
-1
IBZPostMapping.java
.../src/main/java/cn/ibizlab/api/mapping/IBZPostMapping.java
+1
-1
IBZTeamMapping.java
.../src/main/java/cn/ibizlab/api/mapping/IBZTeamMapping.java
+1
-1
IBZTeamMemberMapping.java
...ain/java/cn/ibizlab/api/mapping/IBZTeamMemberMapping.java
+1
-1
未找到文件。
app_web/src/service/ibzemployee/ibzemployee-service-base.ts
浏览文件 @
b3676d08
import
{
Http
,
Util
}
from
'@/utils'
;
import
EntityService
from
'../entity-service'
;
import
SaveDeptMemberLogic
from
'@/service/ibzemployee/save-dept-member-logic'
;
...
...
app_web/src/widgets/ibzdepartment/main-form/main-form-base.vue
浏览文件 @
b3676d08
...
...
@@ -1646,8 +1646,8 @@ export default class MainBase extends Vue implements ControlInterface {
}
const
arg
:
any
=
{
...
opt
};
const
data
=
this
.
getValues
();
Object
.
assign
(
arg
,
data
);
Object
.
assign
(
arg
,
this
.
context
);
Object
.
assign
(
arg
,
data
);
if
(
ifStateNext
)
{
this
.
drcounter
=
0
;
if
(
this
.
drcounter
!==
0
){
...
...
app_web/src/widgets/ibzdepartment/new-form-form/new-form-form-base.vue
浏览文件 @
b3676d08
...
...
@@ -1433,8 +1433,8 @@ export default class NewFormBase extends Vue implements ControlInterface {
}
const
arg
:
any
=
{
...
opt
};
const
data
=
this
.
getValues
();
Object
.
assign
(
arg
,
data
);
Object
.
assign
(
arg
,
this
.
context
);
Object
.
assign
(
arg
,
data
);
if
(
ifStateNext
)
{
this
.
drcounter
=
0
;
if
(
this
.
drcounter
!==
0
){
...
...
app_web/src/widgets/ibzdept-member/main-form/main-form-base.vue
浏览文件 @
b3676d08
...
...
@@ -1366,8 +1366,8 @@ export default class MainBase extends Vue implements ControlInterface {
}
const
arg
:
any
=
{
...
opt
};
const
data
=
this
.
getValues
();
Object
.
assign
(
arg
,
data
);
Object
.
assign
(
arg
,
this
.
context
);
Object
.
assign
(
arg
,
data
);
if
(
ifStateNext
)
{
this
.
drcounter
=
0
;
if
(
this
.
drcounter
!==
0
){
...
...
app_web/src/widgets/ibzemployee/main-form/main-form-base.vue
浏览文件 @
b3676d08
...
...
@@ -2067,8 +2067,8 @@ export default class MainBase extends Vue implements ControlInterface {
}
const
arg
:
any
=
{
...
opt
};
const
data
=
this
.
getValues
();
Object
.
assign
(
arg
,
data
);
Object
.
assign
(
arg
,
this
.
context
);
Object
.
assign
(
arg
,
data
);
if
(
ifStateNext
)
{
this
.
drcounter
=
1
;
if
(
this
.
drcounter
!==
0
){
...
...
app_web/src/widgets/ibzemployee/new-form-form/new-form-form-base.vue
浏览文件 @
b3676d08
...
...
@@ -1525,8 +1525,8 @@ export default class NewFormBase extends Vue implements ControlInterface {
}
const
arg
:
any
=
{
...
opt
};
const
data
=
this
.
getValues
();
Object
.
assign
(
arg
,
data
);
Object
.
assign
(
arg
,
this
.
context
);
Object
.
assign
(
arg
,
data
);
if
(
ifStateNext
)
{
this
.
drcounter
=
0
;
if
(
this
.
drcounter
!==
0
){
...
...
app_web/src/widgets/ibzorganization/main-form/main-form-base.vue
浏览文件 @
b3676d08
...
...
@@ -1494,8 +1494,8 @@ export default class MainBase extends Vue implements ControlInterface {
}
const
arg
:
any
=
{
...
opt
};
const
data
=
this
.
getValues
();
Object
.
assign
(
arg
,
data
);
Object
.
assign
(
arg
,
this
.
context
);
Object
.
assign
(
arg
,
data
);
if
(
ifStateNext
)
{
this
.
drcounter
=
0
;
if
(
this
.
drcounter
!==
0
){
...
...
app_web/src/widgets/ibzorganization/new-form-form/new-form-form-base.vue
浏览文件 @
b3676d08
...
...
@@ -1376,8 +1376,8 @@ export default class NewFormBase extends Vue implements ControlInterface {
}
const
arg
:
any
=
{
...
opt
};
const
data
=
this
.
getValues
();
Object
.
assign
(
arg
,
data
);
Object
.
assign
(
arg
,
this
.
context
);
Object
.
assign
(
arg
,
data
);
if
(
ifStateNext
)
{
this
.
drcounter
=
0
;
if
(
this
.
drcounter
!==
0
){
...
...
app_web/src/widgets/ibzpost/main-form/main-form-base.vue
浏览文件 @
b3676d08
...
...
@@ -1333,8 +1333,8 @@ export default class MainBase extends Vue implements ControlInterface {
}
const
arg
:
any
=
{
...
opt
};
const
data
=
this
.
getValues
();
Object
.
assign
(
arg
,
data
);
Object
.
assign
(
arg
,
this
.
context
);
Object
.
assign
(
arg
,
data
);
if
(
ifStateNext
)
{
this
.
drcounter
=
0
;
if
(
this
.
drcounter
!==
0
){
...
...
app_web/src/widgets/ibzteam-member/main-form/main-form-base.vue
浏览文件 @
b3676d08
...
...
@@ -1410,8 +1410,8 @@ export default class MainBase extends Vue implements ControlInterface {
}
const
arg
:
any
=
{
...
opt
};
const
data
=
this
.
getValues
();
Object
.
assign
(
arg
,
data
);
Object
.
assign
(
arg
,
this
.
context
);
Object
.
assign
(
arg
,
data
);
if
(
ifStateNext
)
{
this
.
drcounter
=
0
;
if
(
this
.
drcounter
!==
0
){
...
...
app_web/src/widgets/ibzteam/main-form/main-form-base.vue
浏览文件 @
b3676d08
...
...
@@ -1344,8 +1344,8 @@ export default class MainBase extends Vue implements ControlInterface {
}
const
arg
:
any
=
{
...
opt
};
const
data
=
this
.
getValues
();
Object
.
assign
(
arg
,
data
);
Object
.
assign
(
arg
,
this
.
context
);
Object
.
assign
(
arg
,
data
);
if
(
ifStateNext
)
{
this
.
drcounter
=
1
;
if
(
this
.
drcounter
!==
0
){
...
...
ibzou-app/ibzou-app-web/src/main/docker/Dockerfile
浏览文件 @
b3676d08
FROM
openjdk:8-jre-alpine
ENV
SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \
ENV
TZ=Asia/Shanghai \
SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \
IBIZ_SLEEP=0 \
JAVA_OPTS=""
RUN
ln
-snf
/usr/share/zoneinfo/
$TZ
/etc/localtime
&&
echo
$TZ
>
/etc/timezone
CMD
echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzou-app-web.jar
...
...
ibzou-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @
b3676d08
此差异已折叠。
点击以展开。
ibzou-provider/ibzou-provider-api/src/main/docker/Dockerfile
浏览文件 @
b3676d08
FROM
openjdk:8-jre-alpine
ENV
SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \
ENV
TZ=Asia/Shanghai \
SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \
IBIZ_SLEEP=0 \
JAVA_OPTS=""
RUN
ln
-snf
/usr/share/zoneinfo/
$TZ
/etc/localtime
&&
echo
$TZ
>
/etc/timezone
CMD
echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzou-provider-api.jar
...
...
ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/mapping/IBZDepartmentMapping.java
浏览文件 @
b3676d08
...
...
@@ -6,7 +6,7 @@ import cn.ibizlab.api.dto.IBZDepartmentDTO;
import
cn.ibizlab.util.domain.MappingBase
;
import
org.mapstruct.factory.Mappers
;
@Mapper
(
componentModel
=
"spring"
,
uses
=
{},
@Mapper
(
componentModel
=
"spring"
,
uses
=
{},
implementationName
=
"apiIBZDepartmentMapping"
,
nullValuePropertyMappingStrategy
=
NullValuePropertyMappingStrategy
.
IGNORE
,
nullValueCheckStrategy
=
NullValueCheckStrategy
.
ALWAYS
)
public
interface
IBZDepartmentMapping
extends
MappingBase
<
IBZDepartmentDTO
,
IBZDepartment
>
{
...
...
ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/mapping/IBZDeptMemberMapping.java
浏览文件 @
b3676d08
...
...
@@ -6,7 +6,7 @@ import cn.ibizlab.api.dto.IBZDeptMemberDTO;
import
cn.ibizlab.util.domain.MappingBase
;
import
org.mapstruct.factory.Mappers
;
@Mapper
(
componentModel
=
"spring"
,
uses
=
{},
@Mapper
(
componentModel
=
"spring"
,
uses
=
{},
implementationName
=
"apiIBZDeptMemberMapping"
,
nullValuePropertyMappingStrategy
=
NullValuePropertyMappingStrategy
.
IGNORE
,
nullValueCheckStrategy
=
NullValueCheckStrategy
.
ALWAYS
)
public
interface
IBZDeptMemberMapping
extends
MappingBase
<
IBZDeptMemberDTO
,
IBZDeptMember
>
{
...
...
ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/mapping/IBZEmployeeMapping.java
浏览文件 @
b3676d08
...
...
@@ -6,7 +6,7 @@ import cn.ibizlab.api.dto.IBZEmployeeDTO;
import
cn.ibizlab.util.domain.MappingBase
;
import
org.mapstruct.factory.Mappers
;
@Mapper
(
componentModel
=
"spring"
,
uses
=
{},
@Mapper
(
componentModel
=
"spring"
,
uses
=
{},
implementationName
=
"apiIBZEmployeeMapping"
,
nullValuePropertyMappingStrategy
=
NullValuePropertyMappingStrategy
.
IGNORE
,
nullValueCheckStrategy
=
NullValueCheckStrategy
.
ALWAYS
)
public
interface
IBZEmployeeMapping
extends
MappingBase
<
IBZEmployeeDTO
,
IBZEmployee
>
{
...
...
ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/mapping/IBZOrganizationMapping.java
浏览文件 @
b3676d08
...
...
@@ -6,7 +6,7 @@ import cn.ibizlab.api.dto.IBZOrganizationDTO;
import
cn.ibizlab.util.domain.MappingBase
;
import
org.mapstruct.factory.Mappers
;
@Mapper
(
componentModel
=
"spring"
,
uses
=
{},
@Mapper
(
componentModel
=
"spring"
,
uses
=
{},
implementationName
=
"apiIBZOrganizationMapping"
,
nullValuePropertyMappingStrategy
=
NullValuePropertyMappingStrategy
.
IGNORE
,
nullValueCheckStrategy
=
NullValueCheckStrategy
.
ALWAYS
)
public
interface
IBZOrganizationMapping
extends
MappingBase
<
IBZOrganizationDTO
,
IBZOrganization
>
{
...
...
ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/mapping/IBZPostMapping.java
浏览文件 @
b3676d08
...
...
@@ -6,7 +6,7 @@ import cn.ibizlab.api.dto.IBZPostDTO;
import
cn.ibizlab.util.domain.MappingBase
;
import
org.mapstruct.factory.Mappers
;
@Mapper
(
componentModel
=
"spring"
,
uses
=
{},
@Mapper
(
componentModel
=
"spring"
,
uses
=
{},
implementationName
=
"apiIBZPostMapping"
,
nullValuePropertyMappingStrategy
=
NullValuePropertyMappingStrategy
.
IGNORE
,
nullValueCheckStrategy
=
NullValueCheckStrategy
.
ALWAYS
)
public
interface
IBZPostMapping
extends
MappingBase
<
IBZPostDTO
,
IBZPost
>
{
...
...
ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/mapping/IBZTeamMapping.java
浏览文件 @
b3676d08
...
...
@@ -6,7 +6,7 @@ import cn.ibizlab.api.dto.IBZTeamDTO;
import
cn.ibizlab.util.domain.MappingBase
;
import
org.mapstruct.factory.Mappers
;
@Mapper
(
componentModel
=
"spring"
,
uses
=
{},
@Mapper
(
componentModel
=
"spring"
,
uses
=
{},
implementationName
=
"apiIBZTeamMapping"
,
nullValuePropertyMappingStrategy
=
NullValuePropertyMappingStrategy
.
IGNORE
,
nullValueCheckStrategy
=
NullValueCheckStrategy
.
ALWAYS
)
public
interface
IBZTeamMapping
extends
MappingBase
<
IBZTeamDTO
,
IBZTeam
>
{
...
...
ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/mapping/IBZTeamMemberMapping.java
浏览文件 @
b3676d08
...
...
@@ -6,7 +6,7 @@ import cn.ibizlab.api.dto.IBZTeamMemberDTO;
import
cn.ibizlab.util.domain.MappingBase
;
import
org.mapstruct.factory.Mappers
;
@Mapper
(
componentModel
=
"spring"
,
uses
=
{},
@Mapper
(
componentModel
=
"spring"
,
uses
=
{},
implementationName
=
"apiIBZTeamMemberMapping"
,
nullValuePropertyMappingStrategy
=
NullValuePropertyMappingStrategy
.
IGNORE
,
nullValueCheckStrategy
=
NullValueCheckStrategy
.
ALWAYS
)
public
interface
IBZTeamMemberMapping
extends
MappingBase
<
IBZTeamMemberDTO
,
IBZTeamMember
>
{
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录