From add658c7b53376e106e5bdf3547813d58d13a30b Mon Sep 17 00:00:00 2001 From: tmlx1990 Date: Wed, 6 Dec 2023 18:13:48 +0800 Subject: [PATCH] =?UTF-8?q?hutool=E7=9A=84SQL=E6=A0=BC=E5=BC=8F=E5=8C=96?= =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E8=83=BD=E5=A4=84=E7=90=86=E5=B8=A6=E6=B3=A8?= =?UTF-8?q?=E9=87=8A=E7=9A=84=E5=86=85=E5=AE=B9=E3=80=82=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E4=BD=BF=E7=94=A8JSQLFormatter=E5=BC=80?= =?UTF-8?q?=E6=BA=90=E9=A1=B9=E7=9B=AE=E6=9D=A5=E5=A4=84=E7=90=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chat2db-server-web/chat2db-server-web-api/pom.xml | 5 +++++ .../server/web/api/controller/sql/SqlController.java | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/chat2db-server/chat2db-server-web/chat2db-server-web-api/pom.xml b/chat2db-server/chat2db-server-web/chat2db-server-web-api/pom.xml index 590b8421..9d80aad7 100644 --- a/chat2db-server/chat2db-server-web/chat2db-server-web-api/pom.xml +++ b/chat2db-server/chat2db-server-web/chat2db-server-web-api/pom.xml @@ -89,6 +89,11 @@ java-jwt + + com.manticore-projects.jsqlformatter + jsqlformatter + 1.0.0 + diff --git a/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/sql/SqlController.java b/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/sql/SqlController.java index 17bcfa61..d7b8e0b2 100644 --- a/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/sql/SqlController.java +++ b/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/sql/SqlController.java @@ -3,7 +3,7 @@ package ai.chat2db.server.web.api.controller.sql; import ai.chat2db.server.tools.base.wrapper.result.DataResult; import ai.chat2db.server.web.api.aspect.ConnectionInfoAspect; import ai.chat2db.server.web.api.controller.sql.request.SqlFormatRequest; -import cn.hutool.db.sql.SqlFormatter; +import com.manticore.jsqlformatter.JSQLFormatter; import jakarta.validation.Valid; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -19,18 +19,19 @@ public class SqlController { /** * SQL Format + * * @param sqlFormatRequest * @return */ @GetMapping("/format") public DataResult list(@Valid SqlFormatRequest sqlFormatRequest) { - String sql = sqlFormatRequest.getSql(); try { - sql = SqlFormatter.format(sql); + sql = JSQLFormatter.format(sql); } catch (Exception e) { // ignore } return DataResult.of(sql); } + }