From be7724c67d9a2364e3788d2259a5802dc2544f2d Mon Sep 17 00:00:00 2001
From: shirenchuang <shirenchuang@didiglobal.com>
Date: Fri, 9 Jul 2021 11:21:20 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 distribution/conf/application.yml         | 28 +++++++++++++++++++++++
 distribution/conf/application.yml.example |  2 ++
 pom.xml                                   |  4 +++-
 3 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 distribution/conf/application.yml

diff --git a/distribution/conf/application.yml b/distribution/conf/application.yml
new file mode 100644
index 00000000..6b78c104
--- /dev/null
+++ b/distribution/conf/application.yml
@@ -0,0 +1,28 @@
+
+## kafka-manager的配置文件，该文件中的配置会覆盖默认配置
+## 下面的配置信息基本就是jar中的 application.yml默认配置了;
+## 可以只修改自己变更的配置,其他的删除就行了; 比如只配置一下mysql
+
+
+server:
+  port: 8080
+  tomcat:
+    accept-count: 1000
+    max-connections: 10000
+    max-threads: 800
+    min-spare-threads: 100
+
+spring:
+  application:
+    name: kafkamanager
+  profiles:
+    active: dev
+  datasource:
+    kafka-manager:
+      jdbc-url: jdbc:mysql://localhost:3306/logi_kafka_manager?characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+      username: root
+      password: 123456
+      driver-class-name: com.mysql.cj.jdbc.Driver
+  main:
+    allow-bean-definition-overriding: true
+
diff --git a/distribution/conf/application.yml.example b/distribution/conf/application.yml.example
index cc017629..31c135af 100644
--- a/distribution/conf/application.yml.example
+++ b/distribution/conf/application.yml.example
@@ -15,6 +15,8 @@ server:
 spring:
   application:
     name: kafkamanager
+  profiles:
+    active: dev
   datasource:
     kafka-manager:
       jdbc-url: jdbc:mysql://localhost:3306/logi_kafka_manager?characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
diff --git a/pom.xml b/pom.xml
index 030b3037..f94e109f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
     </parent>
 
     <properties>
-        <kafka-manager.revision>2.4.2-SNAPSHOT</kafka-manager.revision>
+        <kafka-manager.revision>2.4.3-SNAPSHOT</kafka-manager.revision>
         <swagger2.version>2.7.0</swagger2.version>
         <swagger.version>1.5.13</swagger.version>
 
@@ -32,7 +32,9 @@
     </properties>
 
     <modules>
+<!--
         <module>kafka-manager-console</module>
+-->
         <module>kafka-manager-common</module>
         <module>kafka-manager-dao</module>
         <module>kafka-manager-core</module>