From f3cdec08040029e389b1da44413ed99934e71c87 Mon Sep 17 00:00:00 2001
From: EricDing <128116675+sadadw1@users.noreply.github.com>
Date: Mon, 19 Aug 2024 17:08:39 +0800
Subject: [PATCH] fix: datasource close 20240819 (#879)

* feat: add prometheus-trace-etl release

* feat: add gitlab log release jdk21

* feat: update athena

* feat: update check code file path

* feat: add code generator and mybatis generator

* feat: add mybtais generator

* fix: update test error

* fix: add HikariDataSource close
---
 .../run/mone/ai/codegen/FeatureGenerator.java | 45 +++++++++----------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/jcommon/codegen/src/main/java/run/mone/ai/codegen/FeatureGenerator.java b/jcommon/codegen/src/main/java/run/mone/ai/codegen/FeatureGenerator.java
index 5ddc8b3df..b5f946410 100644
--- a/jcommon/codegen/src/main/java/run/mone/ai/codegen/FeatureGenerator.java
+++ b/jcommon/codegen/src/main/java/run/mone/ai/codegen/FeatureGenerator.java
@@ -8,15 +8,11 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.jdbc.core.JdbcTemplate;
-import run.mone.ai.codegen.bo.FeatureGenerateType;
 import run.mone.ai.codegen.bo.FeatureGenerateBo;
+import run.mone.ai.codegen.bo.FeatureGenerateType;
 import run.mone.ai.codegen.util.TemplateUtils;
 
 import java.lang.reflect.Type;
-import run.mone.ai.codegen.bo.FeatureGeneratType;
-import run.mone.ai.codegen.bo.FeatureGenerateBo;
-import run.mone.ai.codegen.util.TemplateUtils;
-
 import java.util.Base64;
 import java.util.HashMap;
 import java.util.Map;
@@ -141,26 +137,29 @@ public static void generateWithGenerator(FeatureGenerateBo featureGenerateBo) {
         }
 
         //配置数据源
-        HikariDataSource dataSource = new HikariDataSource();
-        dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
-        dataSource.setJdbcUrl(featureGenerateBo.getJdbcUrl());
-        dataSource.setUsername(featureGenerateBo.getUserName());
-        dataSource.setPassword(featureGenerateBo.getPassword());
-
-        //创建mapper相关代码
-
-        if (FeatureGenerateType.CODE_WITH_TEMPLATE == featureGenType) {
-            GlobalConfig globalConfig = createGlobalConfigUseStyle(featureGenerateBo);
-            Generator generator = new Generator(dataSource, globalConfig);
-            generator.generate();
-            return;
-        }
+        try (HikariDataSource dataSource = new HikariDataSource()) {
+            dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
+            dataSource.setJdbcUrl(featureGenerateBo.getJdbcUrl());
+            dataSource.setUsername(featureGenerateBo.getUserName());
+            dataSource.setPassword(featureGenerateBo.getPassword());
+
+            //创建mapper相关代码
+
+            if (FeatureGenerateType.CODE_WITH_TEMPLATE == featureGenType) {
+                GlobalConfig globalConfig = createGlobalConfigUseStyle(featureGenerateBo);
+                Generator generator = new Generator(dataSource, globalConfig);
+                generator.generate();
+                return;
+            }
 
-        //创建table
+            //创建table
 
-        if (FeatureGenerateType.TABLE == featureGenType) {
-            JdbcTemplate jt = new JdbcTemplate(dataSource);
-            jt.update(featureGenerateBo.getSql());
+            if (FeatureGenerateType.TABLE == featureGenType) {
+                JdbcTemplate jt = new JdbcTemplate(dataSource);
+                jt.update(featureGenerateBo.getSql());
+            }
+        } catch (Exception e) {
+            log.error("generate with template error", e);
         }
     }