From 2397ddc1b7f7459ad2db11120911f6ffa5848783 Mon Sep 17 00:00:00 2001
From: "chen.ma" <machencoding@163.com>
Date: Wed, 24 Nov 2021 22:28:51 +0800
Subject: [PATCH] Convert yaml format to properties.

---
 .../src/main/resources/application.properties | 31 +++++++++++++++++++
 .../src/main/resources/application.yaml       | 30 ------------------
 2 files changed, 31 insertions(+), 30 deletions(-)
 create mode 100644 hippo4j-server/src/main/resources/application.properties
 delete mode 100644 hippo4j-server/src/main/resources/application.yaml

diff --git a/hippo4j-server/src/main/resources/application.properties b/hippo4j-server/src/main/resources/application.properties
new file mode 100644
index 00000000..333fda82
--- /dev/null
+++ b/hippo4j-server/src/main/resources/application.properties
@@ -0,0 +1,31 @@
+#*************** Spring Boot Related Configurations ***************#
+### Server startup port
+server.port=6691
+
+
+#*************** Dynamic Thread Pool Custom Configuration ***************#
+### Custom Logging Tenant
+tenant=hippo4j
+
+
+#*************** Config Module Related Configurations ***************#
+### Hikari Datasource
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.url=jdbc:mysql://localhost:3306/hippo_manager?characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
+spring.datasource.username=root
+spring.datasource.password=root
+spring.datasource.hikari.pool-name=Hikari
+spring.datasource.hikari.connectionTimeout=30000
+spring.datasource.hikari.idleTimeout=30000
+spring.datasource.hikari.validationTimeout=3000
+spring.datasource.hikari.maxLifetime=120000
+spring.datasource.hikari.loginTimeout=5
+spring.datasource.hikari.minimumIdle=5
+spring.datasource.hikari.maximumPoolSize=15
+spring.datasource.hikari.connection-test-query=SELECT 1
+
+### Mybatis-Plus Config
+mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
+mybatis-plus.global-config.db-config.logic-delete-field=delFlag
+mybatis-plus.global-config.db-config.logic-delete-value=1
+mybatis-plus.global-config.db-config.logic-not-delete-value=0
diff --git a/hippo4j-server/src/main/resources/application.yaml b/hippo4j-server/src/main/resources/application.yaml
deleted file mode 100644
index cababb66..00000000
--- a/hippo4j-server/src/main/resources/application.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-server:
-  port: 6691
-
-tenant: hippo
-
-spring:
-  datasource:
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://localhost:3306/hippo_manager?characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
-    username: root
-    password: root
-    hikari:
-      pool-name: Hikari
-      connectionTimeout: 30000
-      idleTimeout: 30000
-      validationTimeout: 3000
-      maxLifetime: 120000
-      loginTimeout: 5
-      minimumIdle: 5
-      maximumPoolSize: 15
-      connection-test-query: SELECT 1
-
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-  global-config:
-    db-config:
-      logic-delete-field: delFlag
-      logic-delete-value: 1
-      logic-not-delete-value: 0