From a460e169ab21641a6325888dc4f4e49e3395a65e Mon Sep 17 00:00:00 2001
From: Yang Jing <yangbajing@gmail.com>
Date: Sun, 5 Jul 2020 16:07:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20Spring=20=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E9=85=8D=E7=BD=AE=E4=B8=BA=E4=BD=BF=E7=94=A8=20MySQL?=
 =?UTF-8?q?=20=E6=95=B0=E6=8D=AE=E5=BA=93=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                    |  2 +-
 web/src/main/resources/application-mysql.yml | 29 -------------------
 web/src/main/resources/application.yml       | 30 ++++++++++++++++++--
 3 files changed, 29 insertions(+), 32 deletions(-)
 delete mode 100644 web/src/main/resources/application-mysql.yml

diff --git a/README.md b/README.md
index 48e45106..02177bdc 100644
--- a/README.md
+++ b/README.md
@@ -76,7 +76,7 @@ create user admin encrypted password 'admin';
 create database kafka_manager owner=admin template=template0 encoding='UTF-8' lc_collate='zh_CN.UTF-8' lc_ctype='zh_CN.UTF-8';
 ```
 
-***根据所选择的数据库，使用 `-Dspring.profiles.active=pg` 指定配置文件，默认使用 `mysql`。***
+***默认配置使用 MySQL 数据库，若要使用 PostgreSQL 数据库，使用 `-Dspring.profiles.active=pg` 指定 `application-pg.yml` 配置文件。***
 
 ---
 
diff --git a/web/src/main/resources/application-mysql.yml b/web/src/main/resources/application-mysql.yml
deleted file mode 100644
index ea9dcc7c..00000000
--- a/web/src/main/resources/application-mysql.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-server:
-  port: 8080
-  tomcat:
-    accept-count: 100
-    max-connections: 1000
-    max-threads: 20
-    min-spare-threads: 20
-
-spring:
-  application:
-    name: kafkamanager
-  datasource:
-    kafka-manager:
-      driver-class-name: org.mariadb.jdbc.Driver
-      jdbc-url: jdbc:mysql://localhost:3306/kafka_manager?characterEncoding=UTF-8&serverTimezone=GMT%2B8
-      username: admin
-      password: admin
-  main:
-    allow-bean-definition-overriding: true
-
-logging:
-  config: classpath:logback-spring.xml
-
-# kafka监控
-kafka-monitor:
-  enabled: true
-  notify-kafka:
-    cluster-id: 95
-    topic-name: kmo_monitor
diff --git a/web/src/main/resources/application.yml b/web/src/main/resources/application.yml
index dc1be31b..ea9dcc7c 100644
--- a/web/src/main/resources/application.yml
+++ b/web/src/main/resources/application.yml
@@ -1,3 +1,29 @@
+server:
+  port: 8080
+  tomcat:
+    accept-count: 100
+    max-connections: 1000
+    max-threads: 20
+    min-spare-threads: 20
+
 spring:
-  profiles:
-    active: mysql
\ No newline at end of file
+  application:
+    name: kafkamanager
+  datasource:
+    kafka-manager:
+      driver-class-name: org.mariadb.jdbc.Driver
+      jdbc-url: jdbc:mysql://localhost:3306/kafka_manager?characterEncoding=UTF-8&serverTimezone=GMT%2B8
+      username: admin
+      password: admin
+  main:
+    allow-bean-definition-overriding: true
+
+logging:
+  config: classpath:logback-spring.xml
+
+# kafka监控
+kafka-monitor:
+  enabled: true
+  notify-kafka:
+    cluster-id: 95
+    topic-name: kmo_monitor