From 6be0f02c75c496d43061faa5e92069b4a3cbd44a Mon Sep 17 00:00:00 2001
From: mainmain <57514971+mainmainer@users.noreply.github.com>
Date: Wed, 29 Nov 2023 10:14:52 +0800
Subject: [PATCH] [improvement] add database config (#447)

Co-authored-by: zuopengge
---
 .../dictionary/MultiCustomDictionary.java     |  2 +-
 common/pom.xml                                |  6 ++++++
 .../common/config/DataBaseConfig.java         | 20 +++++++++++++++++++
 .../common/config/JdbcTemplateConfig.java     | 18 +++++++++++++++++
 4 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 common/src/main/java/com/tencent/supersonic/common/config/DataBaseConfig.java
 create mode 100644 common/src/main/java/com/tencent/supersonic/common/config/JdbcTemplateConfig.java

diff --git a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/MultiCustomDictionary.java b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/MultiCustomDictionary.java
index 35ecf2b83..8ddfd1a84 100644
--- a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/MultiCustomDictionary.java
+++ b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/MultiCustomDictionary.java
@@ -223,7 +223,7 @@ public class MultiCustomDictionary extends DynamicCustomDictionary {
                     if (customNatureCollector.isEmpty()) {
                         for (int i = Nature.begin.ordinal() + 1; i < Nature.values().length; ++i) {
                             Nature nature = Nature.values()[i];
-                            if(Objects.nonNull(nature)) {
+                            if (Objects.nonNull(nature)) {
                                 customNatureCollector.add(nature);
                             }
                         }
diff --git a/common/pom.xml b/common/pom.xml
index f092fa247..0a9bda594 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -52,6 +52,12 @@
             <version>${commons.lang.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid</artifactId>
+            <version>${alibaba.druid.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
diff --git a/common/src/main/java/com/tencent/supersonic/common/config/DataBaseConfig.java b/common/src/main/java/com/tencent/supersonic/common/config/DataBaseConfig.java
new file mode 100644
index 000000000..e1fea5c05
--- /dev/null
+++ b/common/src/main/java/com/tencent/supersonic/common/config/DataBaseConfig.java
@@ -0,0 +1,20 @@
+package com.tencent.supersonic.common.config;
+
+import com.alibaba.druid.pool.DruidDataSource;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+
+import javax.sql.DataSource;
+
+@Configuration
+@Primary
+public class DataBaseConfig {
+
+    @Bean("h2")
+    @ConfigurationProperties("spring.datasource")
+    public DataSource dataSource() {
+        return new DruidDataSource();
+    }
+}
diff --git a/common/src/main/java/com/tencent/supersonic/common/config/JdbcTemplateConfig.java b/common/src/main/java/com/tencent/supersonic/common/config/JdbcTemplateConfig.java
new file mode 100644
index 000000000..698182eaf
--- /dev/null
+++ b/common/src/main/java/com/tencent/supersonic/common/config/JdbcTemplateConfig.java
@@ -0,0 +1,18 @@
+package com.tencent.supersonic.common.config;
+
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.jdbc.core.JdbcTemplate;
+
+import javax.sql.DataSource;
+
+@Configuration
+public class JdbcTemplateConfig {
+
+    @Bean
+    public JdbcTemplate jdbcTemplate(@Qualifier("h2") DataSource dataSource) {
+        return new JdbcTemplate(dataSource);
+    }
+
+}