From c35298936d9c241f2a7ac77e77c1b5133436c6ba Mon Sep 17 00:00:00 2001 From: zhangbin1010 <391289241@qq.com> Date: Mon, 22 Mar 2021 14:00:48 +0800 Subject: [PATCH] [Upgrade] v4.2.3 --- README.md | 8 +- .../src/main/resources/bootstrap.yaml | 2 +- .../src/main/resources/bootstrap.yaml | 2 +- .../src/main/resources/bootstrap.yaml | 2 +- .../src/main/resources/bootstrap.yaml | 2 +- .../src/main/resources/bootstrap.yaml | 2 +- .../src/main/resources/bootstrap.yaml | 2 +- .../src/main/resources/bootstrap.yaml | 2 +- doc/version_history.md | 6 + dockerfiles/docker-compose-base.yaml | 218 +++++++++--------- gradle.properties | 6 +- gradle/dependencies.gradle | 2 +- 12 files changed, 130 insertions(+), 124 deletions(-) diff --git a/README.md b/README.md index bbecd813..b43d7362 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ # acp-admin-cloud -###### v4.2.2 [版本更新日志](doc/version_history.md) +###### v4.2.3 [版本更新日志](doc/version_history.md) - 使用Application Construction Platform 应用构建平台作为脚手架 - 基于 Spring Cloud -- 该项目是前后端分离架构中的“后端部分”。前端工程[v4.2.2](https://github.com/zhangbin1010/acp-admin) +- 该项目是前后端分离架构中的“后端部分”。前端工程[v4.2.3](https://github.com/zhangbin1010/acp-admin) ## 相关组件版本 -- [Spring Boot 2.4.3](https://projects.spring.io/spring-boot) -- [Acp 6.5.2](https://github.com/zhangbin1010/acp) +- [Spring Boot 2.4.4](https://projects.spring.io/spring-boot) +- [Acp 6.5.3](https://github.com/zhangbin1010/acp) ## 技术栈 - flowable diff --git a/cloud/log-server/src/main/resources/bootstrap.yaml b/cloud/log-server/src/main/resources/bootstrap.yaml index aa35d817..411bdda9 100644 --- a/cloud/log-server/src/main/resources/bootstrap.yaml +++ b/cloud/log-server/src/main/resources/bootstrap.yaml @@ -32,7 +32,7 @@ spring: group: ${spring.profiles.active} refresh: true info: - version: 4.2.2 + version: 4.2.3 app-name: ${spring.application.name} tags: environment: ${spring.profiles.active} diff --git a/cloud/oauth-server/src/main/resources/bootstrap.yaml b/cloud/oauth-server/src/main/resources/bootstrap.yaml index 3bf514f9..4249cc7b 100644 --- a/cloud/oauth-server/src/main/resources/bootstrap.yaml +++ b/cloud/oauth-server/src/main/resources/bootstrap.yaml @@ -35,7 +35,7 @@ logging: pattern: file: '[%date{yyyy-MM-dd HH:mm:ss.SSS}] [ %-5level] [%thread] %logger{96} [%X{lineno}] - %msg%n' info: - version: 4.2.2 + version: 4.2.3 app-name: ${spring.application.name} tags: environment: ${spring.profiles.active} diff --git a/cloud/route-server/src/main/resources/bootstrap.yaml b/cloud/route-server/src/main/resources/bootstrap.yaml index f864647b..0962a358 100644 --- a/cloud/route-server/src/main/resources/bootstrap.yaml +++ b/cloud/route-server/src/main/resources/bootstrap.yaml @@ -35,7 +35,7 @@ logging: pattern: file: '[%date{yyyy-MM-dd HH:mm:ss.SSS}] [ %-5level] [%thread] %logger{96} [%X{lineno}] - %msg%n' info: - version: 4.2.2 + version: 4.2.3 app-name: ${spring.application.name} tags: environment: ${spring.profiles.active} diff --git a/cloud/workflow-server/src/main/resources/bootstrap.yaml b/cloud/workflow-server/src/main/resources/bootstrap.yaml index b016c96a..c66a486d 100644 --- a/cloud/workflow-server/src/main/resources/bootstrap.yaml +++ b/cloud/workflow-server/src/main/resources/bootstrap.yaml @@ -35,7 +35,7 @@ logging: pattern: file: '[%date{yyyy-MM-dd HH:mm:ss.SSS}] [ %-5level] [%thread] %logger{96} [%X{lineno}] - %msg%n' info: - version: 4.2.2 + version: 4.2.3 app-name: ${spring.application.name} tags: environment: ${spring.profiles.active} diff --git a/common/admin-server/src/main/resources/bootstrap.yaml b/common/admin-server/src/main/resources/bootstrap.yaml index 6959f19d..6ea5486e 100644 --- a/common/admin-server/src/main/resources/bootstrap.yaml +++ b/common/admin-server/src/main/resources/bootstrap.yaml @@ -37,7 +37,7 @@ logging: pattern: file: '[%date{yyyy-MM-dd HH:mm:ss.SSS}] [ %-5level] [%thread] %logger{96} [%X{lineno}] - %msg%n' info: - version: 4.2.2 + version: 4.2.3 app-name: ${spring.application.name} tags: environment: ${spring.profiles.active} diff --git a/common/deploy-server/src/main/resources/bootstrap.yaml b/common/deploy-server/src/main/resources/bootstrap.yaml index 16fca3a3..c5427aff 100644 --- a/common/deploy-server/src/main/resources/bootstrap.yaml +++ b/common/deploy-server/src/main/resources/bootstrap.yaml @@ -35,7 +35,7 @@ logging: pattern: file: '[%date{yyyy-MM-dd HH:mm:ss.SSS}] [ %-5level] [%thread] %logger{96} [%X{lineno}] - %msg%n' info: - version: 4.2.2 + version: 4.2.3 app-name: ${spring.application.name} tags: environment: ${spring.profiles.active} diff --git a/common/gateway-server/src/main/resources/bootstrap.yaml b/common/gateway-server/src/main/resources/bootstrap.yaml index 77a80bb0..e320edf6 100644 --- a/common/gateway-server/src/main/resources/bootstrap.yaml +++ b/common/gateway-server/src/main/resources/bootstrap.yaml @@ -75,7 +75,7 @@ logging: pattern: file: '[%date{yyyy-MM-dd HH:mm:ss.SSS}] [ %-5level] [%thread] %logger{96} [%X{lineno}] - %msg%n' info: - version: 4.2.2 + version: 4.2.3 app-name: ${spring.application.name} tags: environment: ${spring.profiles.active} diff --git a/doc/version_history.md b/doc/version_history.md index ff0e55af..c8081126 100644 --- a/doc/version_history.md +++ b/doc/version_history.md @@ -1,4 +1,10 @@ ## 版本更新记录 +##### v4.2.3 +> - Global +> - [Upgrade] 修改 docker-compose-base.yaml 文件，注释暂时无用的容器组件，节省本地资源 +> - [Upgrade] 升级依赖 +> - Acp 6.5.3 +> - Spring Boot 2.4.4 ##### v4.2.2 > - Global > - [Upgrade] 升级 Gradle 至 6.8.3 diff --git a/dockerfiles/docker-compose-base.yaml b/dockerfiles/docker-compose-base.yaml index 16236641..41d106d2 100644 --- a/dockerfiles/docker-compose-base.yaml +++ b/dockerfiles/docker-compose-base.yaml @@ -40,114 +40,114 @@ services: ######################################################################################################################## ## 以下是可选监控组建，暂时注释，本地资源不够了，具备条件调试时打开 - elasticsearch: - image: elasticsearch:7.2.0 - container_name: elasticsearch - hostname: elasticsearch - restart: always - networks: - - elk - ports: - - 9200:9200 - - 9300:9300 - environment: - - TZ='Asia/Shanghai' - - "ES_JAVA_OPTS=-Xms512m -Xmx512m" - ulimits: - memlock: - soft: -1 - hard: -1 - volumes: - - ./es1/elasticsearch/data:/usr/share/elasticsearch/data - - ./es1/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml - - kibana: - image: kibana:7.2.0 - container_name: kibana - restart: always - networks: - - elk - ports: - - "5601:5601" - environment: - ELASTICSEARCH_URL: http://elasticsearch:9200 - depends_on: - - elasticsearch - - logstash: - image: logstash:7.2.0 - container_name: logstash - restart: always - networks: - - elk - ports: - - "9601:9601" - volumes: - - ./logstash/config-dir:/config-dir - command: logstash -f /config-dir - environment: - XPACK_MONITORING_ENABLED: "true" - XPACK_MONITORING_ELASTICSEARCH_URL: http://elasticsearch:9200 - depends_on: - - elasticsearch - - zoonavigator-api: - image: docker.io/elkozmon/zoonavigator-api - environment: - SERVER_HTTP_PORT: 9005 - networks: - - elk - restart: unless-stopped - depends_on: - - zookeeper - - zoonavigator-web: - image: docker.io/elkozmon/zoonavigator-web - ports: - - "8004:8000" - networks: - - elk - environment: - API_HOST: "zoonavigator-api" - API_PORT: 9005 - restart: unless-stopped - links: - - zoonavigator-api - depends_on: - - zoonavigator-api - - prometheus: - image: prom/prometheus - container_name: prometheus - networks: - - elk - ports: - - 9090:9090 - volumes: - - ./prometheus/prometheus.yml:/etc/prometheus/prometheus.yml - - grafana: - image: grafana/grafana - container_name: grafana - networks: - - elk - ports: - - 3000:3000 - depends_on: - - prometheus - environment: - - GF_AUTH_ANONYMOUS_ENABLED=true - - GF_AUTH_ANONYMOUS_ORG_ROLE=Admin - - setup_grafana_datasource: - image: appropriate/curl - container_name: setup_grafana_datasource - networks: - - elk - depends_on: - - grafana - volumes: - - ./prometheus/create-datasource-and-dashboard.sh:/create.sh:ro - command: /create.sh +# elasticsearch: +# image: elasticsearch:7.2.0 +# container_name: elasticsearch +# hostname: elasticsearch +# restart: always +# networks: +# - elk +# ports: +# - 9200:9200 +# - 9300:9300 +# environment: +# - TZ='Asia/Shanghai' +# - "ES_JAVA_OPTS=-Xms512m -Xmx512m" +# ulimits: +# memlock: +# soft: -1 +# hard: -1 +# volumes: +# - ./es1/elasticsearch/data:/usr/share/elasticsearch/data +# - ./es1/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml +# +# kibana: +# image: kibana:7.2.0 +# container_name: kibana +# restart: always +# networks: +# - elk +# ports: +# - "5601:5601" +# environment: +# ELASTICSEARCH_URL: http://elasticsearch:9200 +# depends_on: +# - elasticsearch +# +# logstash: +# image: logstash:7.2.0 +# container_name: logstash +# restart: always +# networks: +# - elk +# ports: +# - "9601:9601" +# volumes: +# - ./logstash/config-dir:/config-dir +# command: logstash -f /config-dir +# environment: +# XPACK_MONITORING_ENABLED: "true" +# XPACK_MONITORING_ELASTICSEARCH_URL: http://elasticsearch:9200 +# depends_on: +# - elasticsearch +# +# zoonavigator-api: +# image: docker.io/elkozmon/zoonavigator-api +# environment: +# SERVER_HTTP_PORT: 9005 +# networks: +# - elk +# restart: unless-stopped +# depends_on: +# - zookeeper +# +# zoonavigator-web: +# image: docker.io/elkozmon/zoonavigator-web +# ports: +# - "8004:8000" +# networks: +# - elk +# environment: +# API_HOST: "zoonavigator-api" +# API_PORT: 9005 +# restart: unless-stopped +# links: +# - zoonavigator-api +# depends_on: +# - zoonavigator-api +# +# prometheus: +# image: prom/prometheus +# container_name: prometheus +# networks: +# - elk +# ports: +# - 9090:9090 +# volumes: +# - ./prometheus/prometheus.yml:/etc/prometheus/prometheus.yml +# +# grafana: +# image: grafana/grafana +# container_name: grafana +# networks: +# - elk +# ports: +# - 3000:3000 +# depends_on: +# - prometheus +# environment: +# - GF_AUTH_ANONYMOUS_ENABLED=true +# - GF_AUTH_ANONYMOUS_ORG_ROLE=Admin +# +# setup_grafana_datasource: +# image: appropriate/curl +# container_name: setup_grafana_datasource +# networks: +# - elk +# depends_on: +# - grafana +# volumes: +# - ./prometheus/create-datasource-and-dashboard.sh:/create.sh:ro +# command: /create.sh networks: elk: \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index f39777dc..18158fbc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,11 +1,11 @@ gradleVersion=6.8.3 group=pers.acp.admin -version=4.2.2 +version=4.2.3 encoding=UTF-8 #mavenCentralUrl=https://repo.spring.io/plugins-release mavenCentralUrl=https://maven.aliyun.com/repository/public org.gradle.jvmargs=-XX:MaxPermSize=512m -Xmx1024m -Xss2m javaVersion=11 kotlinVersion=1.4.31 -springBootVersion=2.4.3 -CoreVersion=6.5.2 \ No newline at end of file +springBootVersion=2.4.4 +CoreVersion=6.5.3 \ No newline at end of file diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 8caa6762..a6e72ce1 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -5,7 +5,7 @@ ext { versions += [ jupiter : "5.7.1", junit_platform : "1.7.1", - kotlin_coroutines: "1.4.2", + kotlin_coroutines: "1.4.3", flowable : "6.6.0", mysql : "8.0.23" ] \ No newline at end of file