Merge pull request #272 from zhangbin1010/dev

[Upgrade] v4.2.3

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

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}

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}

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}

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}

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}

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}

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}

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

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:

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
+springBootVersion=2.4.4
+CoreVersion=6.5.3

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"
 ]