Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibzrt
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibzrt
提交
3c0c97c8
提交
3c0c97c8
编写于
4年前
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ibiz4j 发布系统代码 [ibiz-rt,ibizlab-runtime]
上级
a4377c89
变更
7
显示空白字符变更
内嵌
并排
正在显示
7 个修改的文件
包含
166 行增加
和
179 行删除
+166
-179
config.xml
config.xml
+0
-5
Dockerfile
ibzrt-app/ibzrt-app-web/src/main/docker/Dockerfile
+1
-1
ibzrt-app-web.yaml
ibzrt-app/ibzrt-app-web/src/main/docker/ibzrt-app-web.yaml
+1
-14
application-dev.yml
ibzrt-boot/src/main/resources/application-dev.yml
+152
-152
pom.xml
ibzrt-dependencies/pom.xml
+2
-6
ExceptionTranslator.java
...main/java/cn/ibizlab/util/errors/ExceptionTranslator.java
+1
-1
AppController.java
...til/src/main/java/cn/ibizlab/util/rest/AppController.java
+9
-0
未找到文件。
config.xml
浏览文件 @
3c0c97c8
...
...
@@ -37,11 +37,6 @@
git clone -b master $para2 ibzrt/
export NODE_OPTIONS=--max-old-space-size=4096
cd ibzrt/
mvn clean package -Pweb
cd ibzrt-app/ibzrt-app-web
mvn -Pweb docker:build
mvn -Pweb docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/ibzrt-app-web.yaml ibzlab-rt --with-registry-auth
</command>
</hudson.tasks.Shell>
</builders>
...
...
This diff is collapsed.
Click to expand it.
ibzrt-app/ibzrt-app-web/src/main/docker/Dockerfile
浏览文件 @
3c0c97c8
...
...
@@ -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 /ibzrt-app-web.jar
EXPOSE
3000
0
EXPOSE
808
0
ADD
ibzrt-app-web.jar /ibzrt-app-web.jar
This diff is collapsed.
Click to expand it.
ibzrt-app/ibzrt-app-web/src/main/docker/ibzrt-app-web.yaml
浏览文件 @
3c0c97c8
...
...
@@ -3,22 +3,9 @@ services:
ibzrt-app-web
:
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/ibzrt-app-web:latest
ports
:
-
"
30000:3000
0"
-
"
8080:808
0"
networks
:
-
agent_network
environment
:
-
SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
-
SERVER_PORT=30000
-
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&allowMultiQueries=true
-
SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-
SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
-
NACOS=172.16.102.211:8848
deploy
:
resources
:
limits
:
...
...
This diff is collapsed.
Click to expand it.
ibzrt-boot/src/main/resources/application-dev.yml
浏览文件 @
3c0c97c8
This diff is collapsed.
Click to expand it.
ibzrt-dependencies/pom.xml
浏览文件 @
3c0c97c8
...
...
@@ -233,12 +233,6 @@
<version>
${jsonwebtoken-jjwt.version}
</version>
</dependency>
<dependency>
<groupId>
com.alibaba
</groupId>
<artifactId>
druid-spring-boot-starter
</artifactId>
<version>
${alibaba-druid.version}
</version>
</dependency>
<dependency>
<groupId>
org.zalando
</groupId>
<artifactId>
problem-spring-web
</artifactId>
...
...
@@ -351,6 +345,8 @@
</dependency>
</dependencies>
</project>
This diff is collapsed.
Click to expand it.
ibzrt-util/src/main/java/cn/ibizlab/util/errors/ExceptionTranslator.java
浏览文件 @
3c0c97c8
...
...
@@ -101,7 +101,7 @@ public class ExceptionTranslator implements ProblemHandling {
public
static
HttpHeaders
createFailureAlert
(
String
entityName
,
String
errorKey
,
String
defaultMessage
)
{
HttpHeaders
headers
=
new
HttpHeaders
();
headers
.
add
(
"X-ibz-error"
,
"error."
+
errorKey
);
headers
.
add
(
"X-ibz-error"
,
errorKey
);
headers
.
add
(
"X-ibz-params"
,
entityName
);
return
headers
;
}
...
...
This diff is collapsed.
Click to expand it.
ibzrt-util/src/main/java/cn/ibizlab/util/rest/AppController.java
浏览文件 @
3c0c97c8
...
...
@@ -59,6 +59,7 @@ public class AppController {
appData
.
put
(
"enablepermissionvalid"
,
false
);
else
appData
.
put
(
"enablepermissionvalid"
,
enablePermissionValid
);
fillAppData
(
appData
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
appData
);
}
...
...
@@ -87,4 +88,12 @@ public class AppController {
throw
new
BadRequestAlertException
(
"获取配置失败,参数缺失"
,
"IBZConfig"
,
configType
);
return
ResponseEntity
.
ok
(
ibzConfigService
.
getConfig
(
configType
,
targetType
,
userId
));
}
/**
* 应用参数扩展
* @param appData
*/
protected
void
fillAppData
(
JSONObject
appData
){
}
}
This diff is collapsed.
Click to expand it.
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录