From f6ba8bc95e9baadc4cfa57aa4aa1dd82110dddc0 Mon Sep 17 00:00:00 2001
From: zengqiao <zengqiao@didiglobal.com>
Date: Mon, 17 Jan 2022 13:17:07 +0800
Subject: [PATCH] =?UTF-8?q?Swagger=E6=8F=90=E7=A4=BA=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=92=8CPOM=E4=B8=AD=E7=89=88=E6=9C=AC=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 distribution/conf/application.yml                          | 1 +
 distribution/conf/application.yml.example                  | 1 +
 .../kafka/manager/service/utils/ConfigUtils.java           | 5 ++++-
 .../xiaojukeji/kafka/manager/web/config/SwaggerConfig.java | 7 ++++++-
 kafka-manager-web/src/main/resources/application.yml       | 1 +
 5 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/distribution/conf/application.yml b/distribution/conf/application.yml
index 6b78c104..a11cb737 100644
--- a/distribution/conf/application.yml
+++ b/distribution/conf/application.yml
@@ -15,6 +15,7 @@ server:
 spring:
   application:
     name: kafkamanager
+    version: @project.version@
   profiles:
     active: dev
   datasource:
diff --git a/distribution/conf/application.yml.example b/distribution/conf/application.yml.example
index 1278e3d2..3894a570 100644
--- a/distribution/conf/application.yml.example
+++ b/distribution/conf/application.yml.example
@@ -15,6 +15,7 @@ server:
 spring:
   application:
     name: kafkamanager
+    version: @project.version@
   profiles:
     active: dev
   datasource:
diff --git a/kafka-manager-core/src/main/java/com/xiaojukeji/kafka/manager/service/utils/ConfigUtils.java b/kafka-manager-core/src/main/java/com/xiaojukeji/kafka/manager/service/utils/ConfigUtils.java
index 751e08c2..40b73868 100644
--- a/kafka-manager-core/src/main/java/com/xiaojukeji/kafka/manager/service/utils/ConfigUtils.java
+++ b/kafka-manager-core/src/main/java/com/xiaojukeji/kafka/manager/service/utils/ConfigUtils.java
@@ -18,6 +18,9 @@ public class ConfigUtils {
     @Value(value = "${custom.idc:cn}")
     private String idc;
 
-    @Value(value = "${spring.profiles.active}")
+    @Value(value = "${spring.profiles.active:dev}")
     private String kafkaManagerEnv;
+
+    @Value(value = "${spring.application.version:unknown}")
+    private String applicationVersion;
 }
diff --git a/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/config/SwaggerConfig.java b/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/config/SwaggerConfig.java
index f4ae13a4..f8406cfe 100644
--- a/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/config/SwaggerConfig.java
+++ b/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/config/SwaggerConfig.java
@@ -1,5 +1,7 @@
 package com.xiaojukeji.kafka.manager.web.config;
 
+import com.xiaojukeji.kafka.manager.service.utils.ConfigUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.*;
@@ -20,6 +22,9 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 @EnableWebMvc
 @EnableSwagger2
 public class SwaggerConfig implements WebMvcConfigurer {
+    @Autowired
+    private ConfigUtils configUtils;
+
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
         registry.addResourceHandler("swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/");
@@ -41,7 +46,7 @@ public class SwaggerConfig implements WebMvcConfigurer {
         return new ApiInfoBuilder()
                 .title("LogiKM接口文档")
                 .description("欢迎使用滴滴LogiKM")
-                .version("2.5.0")
+                .version(configUtils.getApplicationVersion())
                 .build();
     }
 
diff --git a/kafka-manager-web/src/main/resources/application.yml b/kafka-manager-web/src/main/resources/application.yml
index 19ba8593..3cce7463 100644
--- a/kafka-manager-web/src/main/resources/application.yml
+++ b/kafka-manager-web/src/main/resources/application.yml
@@ -9,6 +9,7 @@ server:
 spring:
   application:
     name: kafkamanager
+    version: @project.version@
   profiles:
     active: dev
   datasource: