Skip to content

Commit c352989

Browse files
zhangbinhubzhangbinhub
committed
[Upgrade] v4.2.3
1 parent 4a0d9b8 commit c352989

File tree

12 files changed

+130
-124
lines changed

12 files changed

+130
-124
lines changed

‎README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# acp-admin-cloud
2-
###### v4.2.2 [版本更新日志](doc/version_history.md)
2+
###### v4.2.3 [版本更新日志](doc/version_history.md)
33
- 使用Application Construction Platform 应用构建平台作为脚手架
44
- 基于 Spring Cloud
5-
- 该项目是前后端分离架构中的“后端部分”。前端工程[v4.2.2](https://github.com/zhangbin1010/acp-admin)
5+
- 该项目是前后端分离架构中的“后端部分”。前端工程[v4.2.3](https://github.com/zhangbin1010/acp-admin)
66

77
## 相关组件版本
8-
- [Spring Boot 2.4.3](https://projects.spring.io/spring-boot)
9-
- [Acp 6.5.2](https://github.com/zhangbin1010/acp)
8+
- [Spring Boot 2.4.4](https://projects.spring.io/spring-boot)
9+
- [Acp 6.5.3](https://github.com/zhangbin1010/acp)
1010

1111
## 技术栈
1212
- flowable

‎cloud/log-server/src/main/resources/bootstrap.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ spring:
3232
group: ${spring.profiles.active}
3333
refresh: true
3434
info:
35-
version: 4.2.2
35+
version: 4.2.3
3636
app-name: ${spring.application.name}
3737
tags:
3838
environment: ${spring.profiles.active}

‎cloud/oauth-server/src/main/resources/bootstrap.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ logging:
3535
pattern:
3636
file: '[%date{yyyy-MM-dd HH:mm:ss.SSS}] [ %-5level] [%thread] %logger{96} [%X{lineno}] - %msg%n'
3737
info:
38-
version: 4.2.2
38+
version: 4.2.3
3939
app-name: ${spring.application.name}
4040
tags:
4141
environment: ${spring.profiles.active}

‎cloud/route-server/src/main/resources/bootstrap.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ logging:
3535
pattern:
3636
file: '[%date{yyyy-MM-dd HH:mm:ss.SSS}] [ %-5level] [%thread] %logger{96} [%X{lineno}] - %msg%n'
3737
info:
38-
version: 4.2.2
38+
version: 4.2.3
3939
app-name: ${spring.application.name}
4040
tags:
4141
environment: ${spring.profiles.active}

‎cloud/workflow-server/src/main/resources/bootstrap.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ logging:
3535
pattern:
3636
file: '[%date{yyyy-MM-dd HH:mm:ss.SSS}] [ %-5level] [%thread] %logger{96} [%X{lineno}] - %msg%n'
3737
info:
38-
version: 4.2.2
38+
version: 4.2.3
3939
app-name: ${spring.application.name}
4040
tags:
4141
environment: ${spring.profiles.active}

‎common/admin-server/src/main/resources/bootstrap.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ logging:
3737
pattern:
3838
file: '[%date{yyyy-MM-dd HH:mm:ss.SSS}] [ %-5level] [%thread] %logger{96} [%X{lineno}] - %msg%n'
3939
info:
40-
version: 4.2.2
40+
version: 4.2.3
4141
app-name: ${spring.application.name}
4242
tags:
4343
environment: ${spring.profiles.active}

‎common/deploy-server/src/main/resources/bootstrap.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ logging:
3535
pattern:
3636
file: '[%date{yyyy-MM-dd HH:mm:ss.SSS}] [ %-5level] [%thread] %logger{96} [%X{lineno}] - %msg%n'
3737
info:
38-
version: 4.2.2
38+
version: 4.2.3
3939
app-name: ${spring.application.name}
4040
tags:
4141
environment: ${spring.profiles.active}

‎common/gateway-server/src/main/resources/bootstrap.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ logging:
7575
pattern:
7676
file: '[%date{yyyy-MM-dd HH:mm:ss.SSS}] [ %-5level] [%thread] %logger{96} [%X{lineno}] - %msg%n'
7777
info:
78-
version: 4.2.2
78+
version: 4.2.3
7979
app-name: ${spring.application.name}
8080
tags:
8181
environment: ${spring.profiles.active}

‎doc/version_history.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
## 版本更新记录
2+
##### v4.2.3
3+
> - Global
4+
> - [Upgrade] 修改 docker-compose-base.yaml 文件，注释暂时无用的容器组件，节省本地资源
5+
> - [Upgrade] 升级依赖
6+
> - Acp 6.5.3
7+
> - Spring Boot 2.4.4
28
##### v4.2.2
39
> - Global
410
> - [Upgrade] 升级 Gradle 至 6.8.3

‎dockerfiles/docker-compose-base.yaml

+109-109
Original file line numberDiff line numberDiff line change
@@ -40,114 +40,114 @@ services:
4040

4141
########################################################################################################################
4242
## 以下是可选监控组建，暂时注释，本地资源不够了，具备条件调试时打开
43-
elasticsearch:
44-
image: elasticsearch:7.2.0
45-
container_name: elasticsearch
46-
hostname: elasticsearch
47-
restart: always
48-
networks:
49-
- elk
50-
ports:
51-
- 9200:9200
52-
- 9300:9300
53-
environment:
54-
- TZ='Asia/Shanghai'
55-
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
56-
ulimits:
57-
memlock:
58-
soft: -1
59-
hard: -1
60-
volumes:
61-
- ./es1/elasticsearch/data:/usr/share/elasticsearch/data
62-
- ./es1/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml
63-
64-
kibana:
65-
image: kibana:7.2.0
66-
container_name: kibana
67-
restart: always
68-
networks:
69-
- elk
70-
ports:
71-
- "5601:5601"
72-
environment:
73-
ELASTICSEARCH_URL: http://elasticsearch:9200
74-
depends_on:
75-
- elasticsearch
76-
77-
logstash:
78-
image: logstash:7.2.0
79-
container_name: logstash
80-
restart: always
81-
networks:
82-
- elk
83-
ports:
84-
- "9601:9601"
85-
volumes:
86-
- ./logstash/config-dir:/config-dir
87-
command: logstash -f /config-dir
88-
environment:
89-
XPACK_MONITORING_ENABLED: "true"
90-
XPACK_MONITORING_ELASTICSEARCH_URL: http://elasticsearch:9200
91-
depends_on:
92-
- elasticsearch
93-
94-
zoonavigator-api:
95-
image: docker.io/elkozmon/zoonavigator-api
96-
environment:
97-
SERVER_HTTP_PORT: 9005
98-
networks:
99-
- elk
100-
restart: unless-stopped
101-
depends_on:
102-
- zookeeper
103-
104-
zoonavigator-web:
105-
image: docker.io/elkozmon/zoonavigator-web
106-
ports:
107-
- "8004:8000"
108-
networks:
109-
- elk
110-
environment:
111-
API_HOST: "zoonavigator-api"
112-
API_PORT: 9005
113-
restart: unless-stopped
114-
links:
115-
- zoonavigator-api
116-
depends_on:
117-
- zoonavigator-api
118-
119-
prometheus:
120-
image: prom/prometheus
121-
container_name: prometheus
122-
networks:
123-
- elk
124-
ports:
125-
- 9090:9090
126-
volumes:
127-
- ./prometheus/prometheus.yml:/etc/prometheus/prometheus.yml
128-
129-
grafana:
130-
image: grafana/grafana
131-
container_name: grafana
132-
networks:
133-
- elk
134-
ports:
135-
- 3000:3000
136-
depends_on:
137-
- prometheus
138-
environment:
139-
- GF_AUTH_ANONYMOUS_ENABLED=true
140-
- GF_AUTH_ANONYMOUS_ORG_ROLE=Admin
141-
142-
setup_grafana_datasource:
143-
image: appropriate/curl
144-
container_name: setup_grafana_datasource
145-
networks:
146-
- elk
147-
depends_on:
148-
- grafana
149-
volumes:
150-
- ./prometheus/create-datasource-and-dashboard.sh:/create.sh:ro
151-
command: /create.sh
43+
# elasticsearch:
44+
# image: elasticsearch:7.2.0
45+
# container_name: elasticsearch
46+
# hostname: elasticsearch
47+
# restart: always
48+
# networks:
49+
# - elk
50+
# ports:
51+
# - 9200:9200
52+
# - 9300:9300
53+
# environment:
54+
# - TZ='Asia/Shanghai'
55+
# - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
56+
# ulimits:
57+
# memlock:
58+
# soft: -1
59+
# hard: -1
60+
# volumes:
61+
# - ./es1/elasticsearch/data:/usr/share/elasticsearch/data
62+
# - ./es1/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml
63+
#
64+
# kibana:
65+
# image: kibana:7.2.0
66+
# container_name: kibana
67+
# restart: always
68+
# networks:
69+
# - elk
70+
# ports:
71+
# - "5601:5601"
72+
# environment:
73+
# ELASTICSEARCH_URL: http://elasticsearch:9200
74+
# depends_on:
75+
# - elasticsearch
76+
#
77+
# logstash:
78+
# image: logstash:7.2.0
79+
# container_name: logstash
80+
# restart: always
81+
# networks:
82+
# - elk
83+
# ports:
84+
# - "9601:9601"
85+
# volumes:
86+
# - ./logstash/config-dir:/config-dir
87+
# command: logstash -f /config-dir
88+
# environment:
89+
# XPACK_MONITORING_ENABLED: "true"
90+
# XPACK_MONITORING_ELASTICSEARCH_URL: http://elasticsearch:9200
91+
# depends_on:
92+
# - elasticsearch
93+
#
94+
# zoonavigator-api:
95+
# image: docker.io/elkozmon/zoonavigator-api
96+
# environment:
97+
# SERVER_HTTP_PORT: 9005
98+
# networks:
99+
# - elk
100+
# restart: unless-stopped
101+
# depends_on:
102+
# - zookeeper
103+
#
104+
# zoonavigator-web:
105+
# image: docker.io/elkozmon/zoonavigator-web
106+
# ports:
107+
# - "8004:8000"
108+
# networks:
109+
# - elk
110+
# environment:
111+
# API_HOST: "zoonavigator-api"
112+
# API_PORT: 9005
113+
# restart: unless-stopped
114+
# links:
115+
# - zoonavigator-api
116+
# depends_on:
117+
# - zoonavigator-api
118+
#
119+
# prometheus:
120+
# image: prom/prometheus
121+
# container_name: prometheus
122+
# networks:
123+
# - elk
124+
# ports:
125+
# - 9090:9090
126+
# volumes:
127+
# - ./prometheus/prometheus.yml:/etc/prometheus/prometheus.yml
128+
#
129+
# grafana:
130+
# image: grafana/grafana
131+
# container_name: grafana
132+
# networks:
133+
# - elk
134+
# ports:
135+
# - 3000:3000
136+
# depends_on:
137+
# - prometheus
138+
# environment:
139+
# - GF_AUTH_ANONYMOUS_ENABLED=true
140+
# - GF_AUTH_ANONYMOUS_ORG_ROLE=Admin
141+
#
142+
# setup_grafana_datasource:
143+
# image: appropriate/curl
144+
# container_name: setup_grafana_datasource
145+
# networks:
146+
# - elk
147+
# depends_on:
148+
# - grafana
149+
# volumes:
150+
# - ./prometheus/create-datasource-and-dashboard.sh:/create.sh:ro
151+
# command: /create.sh
152152
networks:
153153
elk:

‎gradle.properties

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
gradleVersion=6.8.3
22
group=pers.acp.admin
3-
version=4.2.2
3+
version=4.2.3
44
encoding=UTF-8
55
#mavenCentralUrl=https://repo.spring.io/plugins-release
66
mavenCentralUrl=https://maven.aliyun.com/repository/public
77
org.gradle.jvmargs=-XX:MaxPermSize=512m -Xmx1024m -Xss2m
88
javaVersion=11
99
kotlinVersion=1.4.31
10-
springBootVersion=2.4.3
11-
CoreVersion=6.5.2
10+
springBootVersion=2.4.4
11+
CoreVersion=6.5.3

‎gradle/dependencies.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ext {
55
versions += [
66
jupiter : "5.7.1",
77
junit_platform : "1.7.1",
8-
kotlin_coroutines: "1.4.2",
8+
kotlin_coroutines: "1.4.3",
99
flowable : "6.6.0",
1010
mysql : "8.0.23"
1111
]

0 commit comments

Comments
 (0)