Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibzou
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibzou
提交
bcc7f243
提交
bcc7f243
编写于
7月 01, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
zhouweidong@lab.ibiz5.com 部署微服务接口
上级
6f75e572
变更
6
显示空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
26 行增加
和
26 行删除
+26
-26
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
+1
-14
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
+14
-1
DEFieldCacheMap.java
...src/main/java/cn/ibizlab/util/helper/DEFieldCacheMap.java
+4
-4
未找到文件。
config.xml
浏览文件 @
bcc7f243
...
@@ -37,11 +37,11 @@
...
@@ -37,11 +37,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
web
mvn clean package -P
api
cd ibzou-
app/ibzou-app-web
cd ibzou-
provider/ibzou-provider-api
mvn -P
web
docker:build
mvn -P
api
docker:build
mvn -P
web
docker:push
mvn -P
api
docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/ibzou-
app-web.yaml ibzlab-rt --with-registry-auth
docker -H $para1 stack deploy --compose-file=src/main/docker/ibzou-
provider-api.yaml ibzlab-rt --with-registry-auth
</command>
</command>
</hudson.tasks.Shell>
</hudson.tasks.Shell>
</builders>
</builders>
...
...
ibzou-app/ibzou-app-web/src/main/docker/Dockerfile
浏览文件 @
bcc7f243
...
@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
...
@@ -9,6 +9,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 /ibzou-app-web.jar
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzou-app-web.jar
EXPOSE
30001
EXPOSE
8080
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
浏览文件 @
bcc7f243
...
@@ -3,22 +3,9 @@ services:
...
@@ -3,22 +3,9 @@ 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
:
-
"
30001:30001
"
-
"
8080:8080
"
networks
:
networks
:
-
agent_network
-
agent_network
environment
:
-
SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
-
SERVER_PORT=30001
-
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
-
NACOS=172.16.102.211:8848
deploy
:
deploy
:
resources
:
resources
:
limits
:
limits
:
...
...
ibzou-provider/ibzou-provider-api/src/main/docker/Dockerfile
浏览文件 @
bcc7f243
...
@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
...
@@ -9,6 +9,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 /ibzou-provider-api.jar
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzou-provider-api.jar
EXPOSE
808
1
EXPOSE
4000
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
浏览文件 @
bcc7f243
...
@@ -3,9 +3,22 @@ services:
...
@@ -3,9 +3,22 @@ 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
:
-
"
8081:808
1"
-
"
40001:4000
1"
networks
:
networks
:
-
agent_network
-
agent_network
environment
:
-
SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
-
SERVER_PORT=40001
-
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
-
NACOS=172.16.102.211:8848
deploy
:
deploy
:
resources
:
resources
:
limits
:
limits
:
...
...
ibzou-util/src/main/java/cn/ibizlab/util/helper/DEFieldCacheMap.java
浏览文件 @
bcc7f243
...
@@ -92,7 +92,7 @@ public class DEFieldCacheMap {
...
@@ -92,7 +92,7 @@ public class DEFieldCacheMap {
if
(
cacheDEField
.
containsKey
(
className
))
if
(
cacheDEField
.
containsKey
(
className
))
return
cacheDEField
.
get
(
className
);
return
cacheDEField
.
get
(
className
);
else
{
else
{
DEFieldCacheMap
.
getFieldMap
(
cla
zz
);
DEFieldCacheMap
.
getFieldMap
(
cla
ssName
);
return
cacheDEField
.
get
(
className
);
return
cacheDEField
.
get
(
className
);
}
}
}
}
...
@@ -109,7 +109,7 @@ public class DEFieldCacheMap {
...
@@ -109,7 +109,7 @@ public class DEFieldCacheMap {
if
(
cacheDEKeyField
.
containsKey
(
className
))
if
(
cacheDEKeyField
.
containsKey
(
className
))
return
cacheDEKeyField
.
get
(
className
);
return
cacheDEKeyField
.
get
(
className
);
else
{
else
{
DEFieldCacheMap
.
getFieldMap
(
cla
zz
);
DEFieldCacheMap
.
getFieldMap
(
cla
ssName
);
return
cacheDEKeyField
.
get
(
className
);
return
cacheDEKeyField
.
get
(
className
);
}
}
}
}
...
@@ -127,7 +127,7 @@ public class DEFieldCacheMap {
...
@@ -127,7 +127,7 @@ public class DEFieldCacheMap {
if
(
cacheList
.
containsKey
(
className
))
if
(
cacheList
.
containsKey
(
className
))
return
cacheList
.
get
(
className
);
return
cacheList
.
get
(
className
);
else
{
else
{
DEFieldCacheMap
.
getFieldMap
(
cla
zz
);
DEFieldCacheMap
.
getFieldMap
(
cla
ssName
);
return
cacheList
.
get
(
className
);
return
cacheList
.
get
(
className
);
}
}
}
}
...
@@ -155,7 +155,7 @@ public class DEFieldCacheMap {
...
@@ -155,7 +155,7 @@ public class DEFieldCacheMap {
if
(
cacheKey
.
containsKey
(
className
))
if
(
cacheKey
.
containsKey
(
className
))
return
cacheKey
.
get
(
className
);
return
cacheKey
.
get
(
className
);
else
{
else
{
DEFieldCacheMap
.
getFieldMap
(
cla
zz
);
DEFieldCacheMap
.
getFieldMap
(
cla
ssName
);
return
cacheKey
.
get
(
className
);
return
cacheKey
.
get
(
className
);
}
}
}
}
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录