Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibzuaa
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibzuaa
提交
683cc673
提交
683cc673
编写于
6月 13, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ibiz4j 部署微服务接口
上级
df4358df
变更
11
隐藏空白字符变更
内嵌
并排
正在显示
11 个修改的文件
包含
27 行增加
和
9 行删除
+27
-9
config.xml
config.xml
+5
-0
SysAppServiceImpl.java
...a/cn/ibizlab/core/uaa/service/impl/SysAppServiceImpl.java
+1
-0
SysAuthLogServiceImpl.java
.../ibizlab/core/uaa/service/impl/SysAuthLogServiceImpl.java
+1
-1
SysPSSystemServiceImpl.java
...ibizlab/core/uaa/service/impl/SysPSSystemServiceImpl.java
+1
-1
SysPermissionServiceImpl.java
...izlab/core/uaa/service/impl/SysPermissionServiceImpl.java
+1
-1
SysRolePermissionServiceImpl.java
...b/core/uaa/service/impl/SysRolePermissionServiceImpl.java
+1
-1
SysRoleServiceImpl.java
.../cn/ibizlab/core/uaa/service/impl/SysRoleServiceImpl.java
+1
-1
SysUserRoleServiceImpl.java
...ibizlab/core/uaa/service/impl/SysUserRoleServiceImpl.java
+1
-1
SysUserServiceImpl.java
.../cn/ibizlab/core/uaa/service/impl/SysUserServiceImpl.java
+1
-1
Dockerfile
...a-provider/ibzuaa-provider-api/src/main/docker/Dockerfile
+1
-1
ibzuaa-provider-api.yaml
...uaa-provider-api/src/main/docker/ibzuaa-provider-api.yaml
+13
-1
未找到文件。
config.xml
浏览文件 @
683cc673
...
...
@@ -37,6 +37,11 @@
git clone -b master $para2 ibzuaa/
export NODE_OPTIONS=--max-old-space-size=4096
cd ibzuaa/
mvn clean package -Papi
cd ibzuaa-provider/ibzuaa-provider-api
mvn -Papi docker:build
mvn -Papi docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/ibzuaa-provider-api.yaml ibzlab-rt --with-registry-auth
</command>
</hudson.tasks.Shell>
</builders>
...
...
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysAppServiceImpl.java
浏览文件 @
683cc673
...
...
@@ -125,3 +125,4 @@ public class SysAppServiceImpl implements ISysAppService {
}
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysAuthLogServiceImpl.java
浏览文件 @
683cc673
...
...
@@ -96,7 +96,6 @@ public class SysAuthLogServiceImpl extends ServiceImpl<SysAuthLogMapper, SysAuth
public
boolean
checkKey
(
SysAuthLog
et
)
{
return
(!
ObjectUtils
.
isEmpty
(
et
.
getLogid
()))&&(!
Objects
.
isNull
(
this
.
getById
(
et
.
getLogid
())));
}
@Override
@Transactional
public
SysAuthLog
get
(
String
key
)
{
...
...
@@ -184,3 +183,4 @@ public class SysAuthLogServiceImpl extends ServiceImpl<SysAuthLogMapper, SysAuth
}
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysPSSystemServiceImpl.java
浏览文件 @
683cc673
...
...
@@ -51,7 +51,6 @@ public class SysPSSystemServiceImpl extends ServiceImpl<SysPSSystemMapper, SysPS
public
boolean
checkKey
(
SysPSSystem
et
)
{
return
(!
ObjectUtils
.
isEmpty
(
et
.
getPssystemid
()))&&(!
Objects
.
isNull
(
this
.
getById
(
et
.
getPssystemid
())));
}
@Override
@Transactional
public
SysPSSystem
get
(
String
key
)
{
...
...
@@ -193,3 +192,4 @@ public class SysPSSystemServiceImpl extends ServiceImpl<SysPSSystemMapper, SysPS
}
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysPermissionServiceImpl.java
浏览文件 @
683cc673
...
...
@@ -130,7 +130,6 @@ public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, S
public
boolean
checkKey
(
SysPermission
et
)
{
return
(!
ObjectUtils
.
isEmpty
(
et
.
getPermissionid
()))&&(!
Objects
.
isNull
(
this
.
getById
(
et
.
getPermissionid
())));
}
@Override
@Transactional
public
SysPermission
get
(
String
key
)
{
...
...
@@ -187,3 +186,4 @@ public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, S
}
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysRolePermissionServiceImpl.java
浏览文件 @
683cc673
...
...
@@ -104,7 +104,6 @@ public class SysRolePermissionServiceImpl extends ServiceImpl<SysRolePermissionM
public
boolean
checkKey
(
SysRolePermission
et
)
{
return
(!
ObjectUtils
.
isEmpty
(
et
.
getRolepermissionid
()))&&(!
Objects
.
isNull
(
this
.
getById
(
et
.
getRolepermissionid
())));
}
@Override
@Transactional
public
boolean
save
(
SysRolePermission
et
)
{
...
...
@@ -245,3 +244,4 @@ public class SysRolePermissionServiceImpl extends ServiceImpl<SysRolePermissionM
}
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysRoleServiceImpl.java
浏览文件 @
683cc673
...
...
@@ -148,7 +148,6 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
}
/**
* 查询集合 DEFAULT
*/
...
...
@@ -190,3 +189,4 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
}
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysUserRoleServiceImpl.java
浏览文件 @
683cc673
...
...
@@ -57,7 +57,6 @@ public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUs
public
boolean
checkKey
(
SysUserRole
et
)
{
return
(!
ObjectUtils
.
isEmpty
(
et
.
getUserroleid
()))&&(!
Objects
.
isNull
(
this
.
getById
(
et
.
getUserroleid
())));
}
@Override
public
SysUserRole
getDraft
(
SysUserRole
et
)
{
fillParentData
(
et
);
...
...
@@ -243,3 +242,4 @@ public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUs
}
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysUserServiceImpl.java
浏览文件 @
683cc673
...
...
@@ -80,7 +80,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
public
boolean
checkKey
(
SysUser
et
)
{
return
(!
ObjectUtils
.
isEmpty
(
et
.
getUserid
()))&&(!
Objects
.
isNull
(
this
.
getById
(
et
.
getUserid
())));
}
@Override
@Transactional
public
SysUser
get
(
String
key
)
{
...
...
@@ -187,3 +186,4 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
}
ibzuaa-provider/ibzuaa-provider-api/src/main/docker/Dockerfile
浏览文件 @
683cc673
...
...
@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzuaa-provider-api.jar
EXPOSE
8081
EXPOSE
40002
ADD
ibzuaa-provider-api.jar /ibzuaa-provider-api.jar
ibzuaa-provider/ibzuaa-provider-api/src/main/docker/ibzuaa-provider-api.yaml
浏览文件 @
683cc673
...
...
@@ -3,9 +3,21 @@ services:
ibzuaa-provider-api
:
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-provider-api:latest
ports
:
-
"
8081:8081
"
-
"
40002:40002
"
networks
:
-
agent_network
environment
:
-
SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
-
SERVER_PORT=40002
-
SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
-
SPRING_REDIS_HOST=172.16.100.243
-
SPRING_REDIS_PORT=6379
-
SPRING_REDIS_DATABASE=0
-
SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
-
SPRING_DATASOURCE_PASSWORD=@6dEfb3@
-
SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
-
SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-
SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
deploy
:
resources
:
limits
:
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录