From cc0e33802b51221a09c18ab59d639d06623fee22 Mon Sep 17 00:00:00 2001
From: shanhexi <wdbb8848@163.com>
Date: Sun, 9 Jul 2023 15:19:12 +0800
Subject: [PATCH 1/7] =?UTF-8?q?fix:driver=E9=BB=98=E8=AE=A4=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E7=AC=AC=E4=B8=80=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Driver/index.tsx                | 18 ++++++++++++------
 .../CreateConnection/config/dataSource.ts      |  3 ++-
 .../CreateConnection/config/types.ts           |  2 ++
 .../src/components/CreateConnection/index.tsx  |  4 +++-
 chat2db-client/src/utils/localStorage.ts       |  2 +-
 5 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/chat2db-client/src/components/CreateConnection/components/Driver/index.tsx b/chat2db-client/src/components/CreateConnection/components/Driver/index.tsx
index cceef6d2..fb91152a 100644
--- a/chat2db-client/src/components/CreateConnection/components/Driver/index.tsx
+++ b/chat2db-client/src/components/CreateConnection/components/Driver/index.tsx
@@ -25,7 +25,7 @@ enum DownloadStatus {
 export default memo<IProps>(function Driver(props) {
   const { className, backfillData, onChange } = props;
   const [downloadStatus, setDownloadStatus] = useState<DownloadStatus>();
-  const [driveForm] = Form.useForm();
+  const [driverForm] = Form.useForm();
   const [driverObj, setDriverObj] = useState<IDriverResponse>();
   const [uploadDriverModal, setUploadDriverModal] = useState(false);
   const [driverSaved, setDriverSaved] = useState<any>({});
@@ -38,7 +38,7 @@ export default memo<IProps>(function Driver(props) {
 
   useEffect(() => {
     if (backfillData) {
-      driveForm.setFieldsValue({
+      driverForm.setFieldsValue({
         jdbcDriverClass: backfillData?.driverConfig?.jdbcDriverClass,
         jdbcDriver: backfillData?.driverConfig?.jdbcDriver
       })
@@ -48,6 +48,12 @@ export default memo<IProps>(function Driver(props) {
   function getDriverList() {
     connectionService.getDriverList({ dbType: backfillData.type }).then(res => {
       setDriverObj(res)
+      if (res.driverConfigList?.length) {
+        driverForm.setFieldsValue({
+          jdbcDriverClass: res.driverConfigList[0].jdbcDriverClass,
+          jdbcDriver: res.driverConfigList[0].jdbcDriver
+        })
+      }
     })
   }
 
@@ -65,7 +71,7 @@ export default memo<IProps>(function Driver(props) {
   function downloadDrive() {
     setDownloadStatus(DownloadStatus.Loading)
     connectionService.downloadDriver({ dbType: backfillData.type }).then(res => {
-      // setDownloadStatus(DownloadStatus.Success)
+      setDownloadStatus(DownloadStatus.Success);
       getDriverList();
     }).catch(() => {
       setDownloadStatus(DownloadStatus.Error)
@@ -74,7 +80,7 @@ export default memo<IProps>(function Driver(props) {
 
   function onValuesChange(data: any) {
     const selected = driverObj?.driverConfigList.find(t => t.jdbcDriver === data.jdbcDriver);
-    driveForm.setFieldsValue({
+    driverForm.setFieldsValue({
       jdbcDriverClass: selected?.jdbcDriverClass
     });
     onChange({
@@ -85,7 +91,7 @@ export default memo<IProps>(function Driver(props) {
 
   return <div className={classnames(styles.box, className)}>
     <Form
-      form={driveForm}
+      form={driverForm}
       onValuesChange={onValuesChange}
       colon={false}
     >
@@ -124,7 +130,7 @@ export default memo<IProps>(function Driver(props) {
             (downloadStatus === DownloadStatus.Success) && <div className={classnames(styles.downloadText, styles.downloadTextSuccess)}>{i18n('connection.text.downloadSuccess')}</div>
           }
 
-        </div> : <div></div>
+        </div> : <div />
       }
 
       <div
diff --git a/chat2db-client/src/components/CreateConnection/config/dataSource.ts b/chat2db-client/src/components/CreateConnection/config/dataSource.ts
index 00e8c935..32d218fd 100644
--- a/chat2db-client/src/components/CreateConnection/config/dataSource.ts
+++ b/chat2db-client/src/components/CreateConnection/config/dataSource.ts
@@ -39,6 +39,8 @@ export const sshConfig: IConnectionConfig['ssh'] = {
       labelNameEN: 'Port',
       name: 'port',
       required: false,
+      placeholder: '不必填',
+      placeholderEN: '不必填',
       styles: {
         width: '30%',
         labelWidthEN: '40px',
@@ -55,7 +57,6 @@ export const sshConfig: IConnectionConfig['ssh'] = {
       required: false,
       styles: {
         width: '70%',
-
       }
     },
     {
diff --git a/chat2db-client/src/components/CreateConnection/config/types.ts b/chat2db-client/src/components/CreateConnection/config/types.ts
index d7b8d217..db41741e 100644
--- a/chat2db-client/src/components/CreateConnection/config/types.ts
+++ b/chat2db-client/src/components/CreateConnection/config/types.ts
@@ -20,6 +20,8 @@ export interface IFormItem {
   selected?: any;
   selects?: ISelect[];
   labelTextAlign?: 'right';
+  placeholder?: string;
+  placeholderEN?: string;
   styles?: {
     width?: string; // 表单占用的长度 推荐百分比 默认值为 100%
     labelWidthEN?: string; // 英文环境下表单label的长度 推荐px 默认值为 70px
diff --git a/chat2db-client/src/components/CreateConnection/index.tsx b/chat2db-client/src/components/CreateConnection/index.tsx
index 86562d2b..160e0e65 100644
--- a/chat2db-client/src/components/CreateConnection/index.tsx
+++ b/chat2db-client/src/components/CreateConnection/index.tsx
@@ -407,6 +407,7 @@ function RenderForm(props: IRenderFormProps) {
     const name = t.name;
     const width = t?.styles?.width || '100%';
     const labelWidth = isEn ? t?.styles?.labelWidthEN || '100px' : t?.styles?.labelWidthCN || '70px';
+    const placeholder = isEn ? t.placeholderEN : t.placeholder;
     const labelAlign = t?.styles?.labelAlign || 'left';
 
     const FormItemTypes: { [key in InputType]: () => React.ReactNode } = {
@@ -417,7 +418,7 @@ function RenderForm(props: IRenderFormProps) {
           style={{ '--form-label-width': labelWidth } as any}
           labelAlign={labelAlign}
         >
-          <Input />
+          <Input placeholder={placeholder} />
         </Form.Item>
       ),
 
@@ -429,6 +430,7 @@ function RenderForm(props: IRenderFormProps) {
           labelAlign={labelAlign}
         >
           <Select
+            placeholder={placeholder}
             value={t.defaultValue}
             onChange={(e) => {
               selectChange({ name: name, value: e });
diff --git a/chat2db-client/src/utils/localStorage.ts b/chat2db-client/src/utils/localStorage.ts
index 9258d463..30aa2a21 100644
--- a/chat2db-client/src/utils/localStorage.ts
+++ b/chat2db-client/src/utils/localStorage.ts
@@ -10,7 +10,7 @@ export function setLang(lang: LangType) {
 }
 
 export function getTheme(): ThemeType {
-  return (localStorage.getItem('theme') as ThemeType) || ThemeType.Dark;
+  return (localStorage.getItem('theme') as ThemeType) || ThemeType.Light;
 }
 
 export function setTheme(theme: ThemeType) {

From 2749f537d72d21dd1be405d2a69d477d027f5f4a Mon Sep 17 00:00:00 2001
From: shanhexi <wdbb8848@163.com>
Date: Sun, 9 Jul 2023 15:21:50 +0800
Subject: [PATCH 2/7] =?UTF-8?q?fix:driver=E9=BB=98=E8=AE=A4=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E7=AC=AC=E4=B8=80=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/CreateConnection/components/Driver/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chat2db-client/src/components/CreateConnection/components/Driver/index.tsx b/chat2db-client/src/components/CreateConnection/components/Driver/index.tsx
index fb91152a..08dedfd6 100644
--- a/chat2db-client/src/components/CreateConnection/components/Driver/index.tsx
+++ b/chat2db-client/src/components/CreateConnection/components/Driver/index.tsx
@@ -48,7 +48,7 @@ export default memo<IProps>(function Driver(props) {
   function getDriverList() {
     connectionService.getDriverList({ dbType: backfillData.type }).then(res => {
       setDriverObj(res)
-      if (res.driverConfigList?.length) {
+      if (res.driverConfigList?.length && !backfillData?.driverConfig?.jdbcDriver) {
         driverForm.setFieldsValue({
           jdbcDriverClass: res.driverConfigList[0].jdbcDriverClass,
           jdbcDriver: res.driverConfigList[0].jdbcDriver

From eb9be2dc68a29b4113e31e082f3a88ed10da19e2 Mon Sep 17 00:00:00 2001
From: shanhexi <wdbb8848@163.com>
Date: Sun, 9 Jul 2023 15:31:58 +0800
Subject: [PATCH 3/7] style

---
 chat2db-client/src/components/UploadDriver/index.tsx |  2 +-
 chat2db-client/src/i18n/en-us/connection.ts          |  2 +-
 chat2db-client/src/i18n/zh-cn/connection.ts          |  2 +-
 chat2db-client/src/styles/antd.less                  | 11 +++++++++++
 chat2db-client/src/styles/global.less                |  1 +
 5 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 chat2db-client/src/styles/antd.less

diff --git a/chat2db-client/src/components/UploadDriver/index.tsx b/chat2db-client/src/components/UploadDriver/index.tsx
index c5dcd391..20e8c2e2 100644
--- a/chat2db-client/src/components/UploadDriver/index.tsx
+++ b/chat2db-client/src/components/UploadDriver/index.tsx
@@ -50,7 +50,7 @@ export default memo<IProps>(function UploadDriver(props) {
   return <div className={classnames(styles.box, className)}>
     <div>
       <Form
-        labelCol={{ span: 5 }}
+        labelCol={{ span: 3 }}
         wrapperCol={{ span: 16 }}
       >
         <Form.Item label="Class">
diff --git a/chat2db-client/src/i18n/en-us/connection.ts b/chat2db-client/src/i18n/en-us/connection.ts
index 70e1d088..41c75686 100644
--- a/chat2db-client/src/i18n/en-us/connection.ts
+++ b/chat2db-client/src/i18n/en-us/connection.ts
@@ -17,7 +17,7 @@ export default {
   'connection.message.testSshConnection': 'Test the ssh connection',
   'connection.tableHeader.name': 'Name',
   'connection.tableHeader.value': 'Value',
-  'connection.title.uploadDriver': 'Upload Driver',
+  'connection.title.uploadDriver': 'Upload',
   'connection.tips.customUpload': "Upload driver",
   'connection.title.driver': 'Driver',
   'connection.button.clickUpload': 'Click to Upload',
diff --git a/chat2db-client/src/i18n/zh-cn/connection.ts b/chat2db-client/src/i18n/zh-cn/connection.ts
index 6206da9c..4dfa26ad 100644
--- a/chat2db-client/src/i18n/zh-cn/connection.ts
+++ b/chat2db-client/src/i18n/zh-cn/connection.ts
@@ -17,7 +17,7 @@ export default {
   'connection.message.testSshConnection': '测试ssh连接',
   'connection.tableHeader.name': '名称',
   'connection.tableHeader.value': '值',
-  'connection.title.uploadDriver': '上传驱动',
+  'connection.title.uploadDriver': '上传',
   'connection.tips.customUpload': '上传驱动',
   'connection.title.driver': '驱动',
   'connection.button.clickUpload': '点击上传',
diff --git a/chat2db-client/src/styles/antd.less b/chat2db-client/src/styles/antd.less
new file mode 100644
index 00000000..a160ba44
--- /dev/null
+++ b/chat2db-client/src/styles/antd.less
@@ -0,0 +1,11 @@
+
+:root{
+  :global{
+    .ant-modal-header{
+      border-bottom: 0px;
+    }
+    .ant-modal-footer{
+      border-top: 0px;
+    }
+  }
+}
\ No newline at end of file
diff --git a/chat2db-client/src/styles/global.less b/chat2db-client/src/styles/global.less
index 81a0e74e..09511845 100644
--- a/chat2db-client/src/styles/global.less
+++ b/chat2db-client/src/styles/global.less
@@ -1,5 +1,6 @@
 @import '../theme/custom/dark.less';
 @import '../theme/custom/light.less';
+@import './antd.less';
 
 html,
 body {

From ab267beccdd5850cee90b81c0ec8afd92768869e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sh=E5=B0=8F=E9=87=91=E9=B1=BC3?= <yanfeng_cn@foxmail.com>
Date: Sun, 9 Jul 2023 15:59:51 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=9A=84=E6=96=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 chat2db-client/src/layouts/index.tsx | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/chat2db-client/src/layouts/index.tsx b/chat2db-client/src/layouts/index.tsx
index 62cf2aaf..8fc4db59 100644
--- a/chat2db-client/src/layouts/index.tsx
+++ b/chat2db-client/src/layouts/index.tsx
@@ -24,7 +24,7 @@ import registerMessage from './init/registerMessage';
 import registerNotification from './init/registerNotification';
 import { NotificationInstance } from 'antd/es/notification/interface';
 import { ModalStaticFunctions } from 'antd/es/modal/confirm';
-import Sub from './sub'
+import Sub from './sub';
 declare global {
   interface Window {
     _Lang: string;
@@ -81,7 +81,6 @@ const restartCount = 200;
 
 let staticNotification: NotificationInstance;
 
-
 function AppContainer() {
   const { token } = useToken();
   const [initEnd, setInitEnd] = useState(false);
@@ -92,7 +91,6 @@ function AppContainer() {
 
   // staticNotification = staticFunction.notification
 
-
   useEffect(() => {
     let date = new Date('2030-12-30 12:30:00').toUTCString();
     document.cookie = `CHAT2DB.LOCALE=${getLang()};Expires=${date}`;
@@ -196,12 +194,12 @@ function AppContainer() {
                   </div>
                 )}
                 <div className={styles.hint}>
-                  <Setting text={i18n('common.text.setting')} />
+                  <Setting />
                 </div>
                 {serviceFail && (
                   <>
                     <div className={styles.github}>
-                      {i18n('common.text.contactUs')}-github：
+                      {i18n('common.text.contactUs')}：
                       <a target="_blank" href="https://github.com/chat2db/Chat2DB">
                         github
                       </a>
@@ -220,4 +218,4 @@ function AppContainer() {
       )}
     </div>
   );
-}
\ No newline at end of file
+}

From 58c4b441d3c31ab00bb2666d28162451539f91d6 Mon Sep 17 00:00:00 2001
From: shanhexi <wdbb8848@163.com>
Date: Sun, 9 Jul 2023 16:00:23 +0800
Subject: [PATCH 5/7] =?UTF-8?q?feat:=20=E5=AF=86=E9=92=A5=E8=BF=9E?=
 =?UTF-8?q?=E6=8E=A5ssh?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CreateConnection/config/dataSource.ts     | 145 +++++++-----------
 .../CreateConnection/config/types.ts          |   2 +-
 2 files changed, 57 insertions(+), 90 deletions(-)

diff --git a/chat2db-client/src/components/CreateConnection/config/dataSource.ts b/chat2db-client/src/components/CreateConnection/config/dataSource.ts
index 32d218fd..84af4446 100644
--- a/chat2db-client/src/components/CreateConnection/config/dataSource.ts
+++ b/chat2db-client/src/components/CreateConnection/config/dataSource.ts
@@ -5,7 +5,7 @@ import { InputType, AuthenticationType, SSHAuthenticationType, OperationColumn }
 export const sshConfig: IConnectionConfig['ssh'] = {
   items: [
     {
-      defaultValue: 'false',
+      defaultValue: false,
       inputType: InputType.SELECT,
       labelNameCN: '使用SSH',
       labelNameEN: 'USE SSH',
@@ -13,10 +13,12 @@ export const sshConfig: IConnectionConfig['ssh'] = {
       required: false,
       selects: [
         {
-          value: 'false',
+          label: 'false',
+          value: false,
         },
         {
-          value: 'true',
+          label: 'true',
+          value: true,
         },
       ],
 
@@ -40,7 +42,7 @@ export const sshConfig: IConnectionConfig['ssh'] = {
       name: 'port',
       required: false,
       placeholder: '不必填',
-      placeholderEN: '不必填',
+      placeholderEN: 'Need not fill in',
       styles: {
         width: '30%',
         labelWidthEN: '40px',
@@ -72,14 +74,57 @@ export const sshConfig: IConnectionConfig['ssh'] = {
       }
     },
     {
-      defaultValue: '',
-      inputType: InputType.PASSWORD,
-      labelNameCN: '密码',
-      labelNameEN: 'Password',
-      name: 'password',
+      defaultValue: 'password',
+      inputType: InputType.SELECT,
+      labelNameCN: '身份验证',
+      labelNameEN: 'Authentication',
+      name: 'authenticationType',
       required: true,
-
+      selects: [
+        {
+          items: [
+            {
+              defaultValue: '',
+              inputType: InputType.PASSWORD,
+              labelNameCN: '密码',
+              labelNameEN: 'Password',
+              name: 'password',
+              required: true,
+            },
+          ],
+          label: 'password',
+          value: 'password',
+        },
+        {
+          items: [
+            {
+              defaultValue: '',
+              inputType: InputType.INPUT,
+              labelNameCN: 'Private key file',
+              labelNameEN: 'Private key file',
+              name: 'keyFile',
+              required: true,
+              placeholder: '/user/userName/.ssh/xxxx',
+              placeholderEN: '/user/userName/.ssh/xxxx',
+            },
+            {
+              defaultValue: '',
+              inputType: InputType.INPUT,
+              labelNameCN: 'Passphrase',
+              labelNameEN: 'Passphrase',
+              name: 'passphrase',
+              required: true,
+            },
+          ],
+          label: 'private',
+          value: 'privateKey',
+        },
+      ],
+      styles: {
+        width: '50%',
+      }
     },
+
   ]
 }
 
@@ -296,85 +341,7 @@ export const dataSourceFormConfigs: IConnectionConfig[] = [
       pattern: /jdbc:postgresql:\/\/(.*):(\d+)(\/(\w+))?/,
       template: 'jdbc:postgresql://{host}:{port}/{database}',
     },
-    ssh: {
-      items: [
-        {
-          defaultValue: 'false',
-          inputType: InputType.SELECT,
-          labelNameCN: '使用SSH',
-          labelNameEN: 'USE SSH',
-          name: 'use',
-          required: false,
-          selects: [
-            {
-              value: 'false',
-            },
-            {
-              value: 'true',
-            },
-          ],
-
-        },
-        {
-          defaultValue: '',
-          inputType: InputType.INPUT,
-          labelNameCN: 'SSH 主机',
-          labelNameEN: 'SSH Hostname',
-          name: 'hostName',
-          required: false,
-          styles: {
-            width: '70%',
-          }
-        },
-        {
-          defaultValue: '',
-          inputType: InputType.INPUT,
-          labelNameCN: 'SSH 端口',
-          labelNameEN: 'Port',
-          name: 'port',
-          required: false,
-          styles: {
-            width: '30%',
-            labelWidthEN: '40px',
-            labelWidthCN: '40px',
-            labelAlign: 'right'
-          }
-        },
-        {
-          defaultValue: '',
-          inputType: InputType.INPUT,
-          labelNameCN: '用户名',
-          labelNameEN: 'SSH UserName',
-          name: 'userName',
-          required: false,
-          styles: {
-            width: '70%',
-
-          }
-        },
-        {
-          defaultValue: '',
-          inputType: InputType.INPUT,
-          labelNameCN: '本地端口',
-          labelNameEN: 'LocalPort',
-          name: 'localPort',
-          required: false,
-          styles: {
-            width: '30%',
-            labelAlign: 'right'
-          }
-        },
-        {
-          defaultValue: '',
-          inputType: InputType.PASSWORD,
-          labelNameCN: '密码',
-          labelNameEN: 'Password',
-          name: 'password',
-          required: true,
-
-        },
-      ]
-    },
+    ssh: sshConfig,
   },
   // ORACLE
   {
diff --git a/chat2db-client/src/components/CreateConnection/config/types.ts b/chat2db-client/src/components/CreateConnection/config/types.ts
index db41741e..2cbef252 100644
--- a/chat2db-client/src/components/CreateConnection/config/types.ts
+++ b/chat2db-client/src/components/CreateConnection/config/types.ts
@@ -2,7 +2,7 @@ import { InputType, AuthenticationType, SSHAuthenticationType } from './enum';
 import { DatabaseTypeCode, OperationColumn } from '@/constants';
 
 export type ISelect = {
-  value?: AuthenticationType | SSHAuthenticationType | string;
+  value?: AuthenticationType | SSHAuthenticationType | string | boolean;
   label?: string;
   rest?: {
     [key in string]: any

From 180478b990ad6de857b26f2e854dd9148ba7b695 Mon Sep 17 00:00:00 2001
From: shanhexi <wdbb8848@163.com>
Date: Sun, 9 Jul 2023 17:06:11 +0800
Subject: [PATCH 6/7] fix: ui schema selete

---
 .../CreateConnection/config/dataSource.ts     | 38 +++++++++----------
 .../src/components/CreateConnection/index.tsx | 32 +++++++++++-----
 2 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/chat2db-client/src/components/CreateConnection/config/dataSource.ts b/chat2db-client/src/components/CreateConnection/config/dataSource.ts
index 84af4446..de1c6490 100644
--- a/chat2db-client/src/components/CreateConnection/config/dataSource.ts
+++ b/chat2db-client/src/components/CreateConnection/config/dataSource.ts
@@ -100,7 +100,7 @@ export const sshConfig: IConnectionConfig['ssh'] = {
             {
               defaultValue: '',
               inputType: InputType.INPUT,
-              labelNameCN: 'Private key file',
+              labelNameCN: '密钥文件',
               labelNameEN: 'Private key file',
               name: 'keyFile',
               required: true,
@@ -110,14 +110,14 @@ export const sshConfig: IConnectionConfig['ssh'] = {
             {
               defaultValue: '',
               inputType: InputType.INPUT,
-              labelNameCN: 'Passphrase',
+              labelNameCN: '密码短语',
               labelNameEN: 'Passphrase',
               name: 'passphrase',
               required: true,
             },
           ],
-          label: 'private',
-          value: 'privateKey',
+          label: 'Private key',
+          value: 'keyFile',
         },
       ],
       styles: {
@@ -172,7 +172,7 @@ export const dataSourceFormConfigs: IConnectionConfig[] = [
           inputType: InputType.SELECT,
           labelNameCN: '身份验证',
           labelNameEN: 'Authentication',
-          name: 'authentication',
+          name: 'authenticationType',
           required: true,
           selects: [
             {
@@ -281,7 +281,7 @@ export const dataSourceFormConfigs: IConnectionConfig[] = [
           inputType: InputType.SELECT,
           labelNameCN: '身份验证',
           labelNameEN: 'Authentication',
-          name: 'authentication',
+          name: 'authenticationType',
           required: true,
           selects: [
             {
@@ -427,7 +427,7 @@ export const dataSourceFormConfigs: IConnectionConfig[] = [
           inputType: InputType.SELECT,
           labelNameCN: '身份验证',
           labelNameEN: 'Authentication',
-          name: 'authentication',
+          name: 'authenticationType',
           required: true,
           selects: [
             {
@@ -526,7 +526,7 @@ export const dataSourceFormConfigs: IConnectionConfig[] = [
           inputType: InputType.SELECT,
           labelNameCN: '身份验证',
           labelNameEN: 'Authentication',
-          name: 'authentication',
+          name: 'authenticationType',
           required: true,
           selects: [
             {
@@ -662,7 +662,7 @@ export const dataSourceFormConfigs: IConnectionConfig[] = [
           inputType: InputType.SELECT,
           labelNameCN: '身份验证',
           labelNameEN: 'Authentication',
-          name: 'authentication',
+          name: 'authenticationType',
           required: true,
           selects: [
             {
@@ -809,7 +809,7 @@ export const dataSourceFormConfigs: IConnectionConfig[] = [
           inputType: InputType.SELECT,
           labelNameCN: '身份验证',
           labelNameEN: 'Authentication',
-          name: 'authentication',
+          name: 'authenticationType',
           required: true,
           selects: [
             {
@@ -918,7 +918,7 @@ export const dataSourceFormConfigs: IConnectionConfig[] = [
           inputType: InputType.SELECT,
           labelNameCN: '身份验证',
           labelNameEN: 'Authentication',
-          name: 'authentication',
+          name: 'authenticationType',
           required: true,
           selects: [
             {
@@ -1027,7 +1027,7 @@ export const dataSourceFormConfigs: IConnectionConfig[] = [
           inputType: InputType.SELECT,
           labelNameCN: '身份验证',
           labelNameEN: 'Authentication',
-          name: 'authentication',
+          name: 'authenticationType',
           required: true,
           selects: [
             {
@@ -1141,7 +1141,7 @@ export const dataSourceFormConfigs: IConnectionConfig[] = [
           inputType: InputType.SELECT,
           labelNameCN: '身份验证',
           labelNameEN: 'Authentication',
-          name: 'authentication',
+          name: 'authenticationType',
           required: true,
           selects: [
             {
@@ -1260,7 +1260,7 @@ export const dataSourceFormConfigs: IConnectionConfig[] = [
           inputType: InputType.SELECT,
           labelNameCN: '身份验证',
           labelNameEN: 'Authentication',
-          name: 'authentication',
+          name: 'authenticationType',
           required: true,
           selects: [
             {
@@ -1379,7 +1379,7 @@ export const dataSourceFormConfigs: IConnectionConfig[] = [
           inputType: InputType.SELECT,
           labelNameCN: '身份验证',
           labelNameEN: 'Authentication',
-          name: 'authentication',
+          name: 'authenticationType',
           required: true,
           selects: [
             {
@@ -1498,7 +1498,7 @@ export const dataSourceFormConfigs: IConnectionConfig[] = [
           inputType: InputType.SELECT,
           labelNameCN: '身份验证',
           labelNameEN: 'Authentication',
-          name: 'authentication',
+          name: 'authenticationType',
           required: true,
           selects: [
             {
@@ -1617,7 +1617,7 @@ export const dataSourceFormConfigs: IConnectionConfig[] = [
           inputType: InputType.SELECT,
           labelNameCN: '身份验证',
           labelNameEN: 'Authentication',
-          name: 'authentication',
+          name: 'authenticationType',
           required: true,
           selects: [
             {
@@ -1736,7 +1736,7 @@ export const dataSourceFormConfigs: IConnectionConfig[] = [
           inputType: InputType.SELECT,
           labelNameCN: '身份验证',
           labelNameEN: 'Authentication',
-          name: 'authentication',
+          name: 'authenticationType',
           required: true,
           selects: [
             {
@@ -1855,7 +1855,7 @@ export const dataSourceFormConfigs: IConnectionConfig[] = [
           inputType: InputType.SELECT,
           labelNameCN: '身份验证',
           labelNameEN: 'Authentication',
-          name: 'authentication',
+          name: 'authenticationType',
           required: true,
           selects: [
             {
diff --git a/chat2db-client/src/components/CreateConnection/index.tsx b/chat2db-client/src/components/CreateConnection/index.tsx
index 160e0e65..ca07679f 100644
--- a/chat2db-client/src/components/CreateConnection/index.tsx
+++ b/chat2db-client/src/components/CreateConnection/index.tsx
@@ -3,11 +3,12 @@ import { i18n, isEn } from '@/i18n';
 import styles from './index.less';
 import classnames from 'classnames';
 
-import connectionService, { IDriverResponse } from '@/service/connection';
+import connectionService from '@/service/connection';
 
 import { DatabaseTypeCode, ConnectionEnvType, databaseMap } from '@/constants';
 import { dataSourceFormConfigs } from './config/dataSource';
 import { IConnectionConfig, IFormItem, ISelect } from './config/types';
+import { AuthenticationType } from './config/enum';
 import { IConnectionDetails } from '@/typings';
 import { InputType } from './config/enum';
 import { deepClone } from '@/utils';
@@ -80,11 +81,6 @@ export default function CreateConnection(props: IProps) {
       if (!res) {
         return;
       }
-      if (res.user) {
-        res.authentication = 1;
-      } else {
-        res.authentication = 2;
-      }
       setBackfillData(res);
     }).finally(() => {
       setTimeout(() => {
@@ -102,12 +98,14 @@ export default function CreateConnection(props: IProps) {
 
   const getItems = () => [
     {
+      forceRender: true,
       key: 'driver',
       label: i18n('connection.title.driver'),
       children: <Driver backfillData={backfillData} onChange={driverFormChange}></Driver>,
     },
     {
       key: 'ssh',
+      forceRender: true,
       label: i18n('connection.label.sshConfiguration'),
       children: (
         <div className={styles.sshBox}>
@@ -126,6 +124,7 @@ export default function CreateConnection(props: IProps) {
       ),
     },
     {
+      forceRender: true,
       key: 'extendInfo',
       label: i18n('connection.label.advancedConfiguration'),
       children: (
@@ -269,13 +268,14 @@ interface IRenderFormProps {
 function RenderForm(props: IRenderFormProps) {
   const { tab, form, backfillData, dataSourceFormConfigProps } = props;
   useEffect(() => {
-    form.resetFields()
+    form.resetFields();
+    changeDataSourceFormConfig(backfillData);
   }, [backfillData.id, backfillData.type])
 
   let aliasChanged = false;
 
   const [dataSourceFormConfig, setDataSourceFormConfig] = useState<IConnectionConfig>(dataSourceFormConfigProps);
-
+  console.log(dataSourceFormConfig.ssh.items[5].defaultValue)
   useEffect(() => {
     setDataSourceFormConfig(dataSourceFormConfigProps)
   }, [dataSourceFormConfigProps])
@@ -291,8 +291,6 @@ function RenderForm(props: IRenderFormProps) {
       return;
     }
     if (tab === 'baseInfo') {
-      // TODO:
-      // selectChange({ name: 'authentication', value: backfillData.user ? 1 : 2 });
       regEXFormatting({ url: backfillData.url }, backfillData);
     }
 
@@ -304,6 +302,20 @@ function RenderForm(props: IRenderFormProps) {
     }
   }, [backfillData]);
 
+  function changeDataSourceFormConfig(backfillData: any) {
+    dataSourceFormConfig.ssh.items.forEach((t: IFormItem) => {
+      if (t.selects) {
+        t.defaultValue = backfillData?.ssh?.[t.name] || 'password'
+      }
+    });
+    dataSourceFormConfig.baseInfo.items.forEach((t: IFormItem) => {
+      if (t.selects) {
+        t.defaultValue = backfillData[t.name] || AuthenticationType.USERANDPASSWORD
+      }
+    });
+    setDataSourceFormConfig({ ...dataSourceFormConfig })
+  }
+
   function initialFormData(dataSourceFormConfig: IFormItem[] | undefined) {
     let initValue: any = {};
     dataSourceFormConfig?.map((t) => {

From fe056de42bb6ac5b866f92af05c520edc6c926b5 Mon Sep 17 00:00:00 2001
From: jipengfei-jpf <1558143046@qq.com>
Date: Sun, 9 Jul 2023 17:06:23 +0800
Subject: [PATCH 7/7] fix exception

---
 .../main/resources/i18n/messages.properties   |  5 ++-
 .../resources/i18n/messages_en_US.properties  |  5 ++-
 .../resources/i18n/messages_zh_CN.properties  |  5 ++-
 .../common/exception/ConnectionException.java | 25 ++++++++++++
 .../server/tools/common/util/I18nUtils.java   |  8 ++--
 .../data/source/DataSourceController.java     |  6 +++
 .../request/DataSourceCreateRequest.java      |  9 ++++-
 .../source/request/DataSourceTestRequest.java |  5 ++-
 .../data/source/vo/DataSourceVO.java          |  4 ++
 .../ai/chat2db/spi/sql/Chat2DBContext.java    | 12 +++---
 .../ai/chat2db/spi/sql/IDriverManager.java    | 38 +++++--------------
 .../java/ai/chat2db/spi/sql/SQLExecutor.java  |  6 ++-
 12 files changed, 85 insertions(+), 43 deletions(-)
 create mode 100644 chat2db-server/chat2db-server-tools/chat2db-server-tools-common/src/main/java/ai/chat2db/server/tools/common/exception/ConnectionException.java

diff --git a/chat2db-server/chat2db-server-start/src/main/resources/i18n/messages.properties b/chat2db-server/chat2db-server-start/src/main/resources/i18n/messages.properties
index 6725b57d..8a386da5 100644
--- a/chat2db-server/chat2db-server-start/src/main/resources/i18n/messages.properties
+++ b/chat2db-server/chat2db-server-start/src/main/resources/i18n/messages.properties
@@ -6,4 +6,7 @@ common.paramError=The parameter is incorrect
 common.paramDetailError=The parameter: {0} is incorrect
 common.paramCheckError=The following parameters are not valid:
 common.maxUploadSize=The file exceeds the maximum limit
-dataSource.sqlAnalysisError=Invalid statements
\ No newline at end of file
+dataSource.sqlAnalysisError=Invalid statements
+connection.error=Connection failed, please check the connection information
+connection.ssh.error=SSH connection failed, please check the connection information
+connection.driver.load.error=Failed to load driver class, please check the driver jar package
\ No newline at end of file
diff --git a/chat2db-server/chat2db-server-start/src/main/resources/i18n/messages_en_US.properties b/chat2db-server/chat2db-server-start/src/main/resources/i18n/messages_en_US.properties
index 0dbbdd8e..c20e292b 100644
--- a/chat2db-server/chat2db-server-start/src/main/resources/i18n/messages_en_US.properties
+++ b/chat2db-server/chat2db-server-start/src/main/resources/i18n/messages_en_US.properties
@@ -6,4 +6,7 @@ common.paramError=The parameter is incorrect
 common.paramDetailError=The parameter: {0} is incorrect
 common.paramCheckError=The following parameters are not valid
 common.maxUploadSize=The file exceeds the maximum limit
-dataSource.sqlAnalysisError=Invalid statements
\ No newline at end of file
+dataSource.sqlAnalysisError=Invalid statements
+connection.error=Connection failed, please check the connection information
+connection.ssh.error=SSH connection failed, please check the connection information
+connection.driver.load.error=Failed to load driver class, please check the driver jar package
\ No newline at end of file
diff --git a/chat2db-server/chat2db-server-start/src/main/resources/i18n/messages_zh_CN.properties b/chat2db-server/chat2db-server-start/src/main/resources/i18n/messages_zh_CN.properties
index d8f7314a..0c608b71 100644
--- a/chat2db-server/chat2db-server-start/src/main/resources/i18n/messages_zh_CN.properties
+++ b/chat2db-server/chat2db-server-start/src/main/resources/i18n/messages_zh_CN.properties
@@ -8,4 +8,7 @@ common.paramCheckError=请检查以下参数:
 common.maxUploadSize=您输入的文件超过最大限制
 
 
-dataSource.sqlAnalysisError=不合法的执行语句
\ No newline at end of file
+dataSource.sqlAnalysisError=不合法的执行语句
+connection.error=数据库链接异常，请检查数据库配置
+connection.ssh.error=SSH 链接异常，请检查SSH配置
+connection.driver.load.error=数据库驱动加载异常，请检查驱动配置
\ No newline at end of file
diff --git a/chat2db-server/chat2db-server-tools/chat2db-server-tools-common/src/main/java/ai/chat2db/server/tools/common/exception/ConnectionException.java b/chat2db-server/chat2db-server-tools/chat2db-server-tools-common/src/main/java/ai/chat2db/server/tools/common/exception/ConnectionException.java
new file mode 100644
index 00000000..854f746f
--- /dev/null
+++ b/chat2db-server/chat2db-server-tools/chat2db-server-tools-common/src/main/java/ai/chat2db/server/tools/common/exception/ConnectionException.java
@@ -0,0 +1,25 @@
+package ai.chat2db.server.tools.common.exception;
+
+import ai.chat2db.server.tools.base.excption.BusinessException;
+import lombok.Getter;
+
+@Getter
+public class ConnectionException extends BusinessException {
+
+
+    public ConnectionException() {
+        this("connection.error");
+    }
+
+    public ConnectionException(String code) {
+        this(code, null);
+    }
+
+    public ConnectionException(String code, Object[] args) {
+        super(code,args);
+    }
+
+    public ConnectionException(String code, Object[] args, Throwable throwable) {
+        super(code,args, throwable);
+    }
+}
diff --git a/chat2db-server/chat2db-server-tools/chat2db-server-tools-common/src/main/java/ai/chat2db/server/tools/common/util/I18nUtils.java b/chat2db-server/chat2db-server-tools/chat2db-server-tools-common/src/main/java/ai/chat2db/server/tools/common/util/I18nUtils.java
index dc21a1de..7b99f1c7 100644
--- a/chat2db-server/chat2db-server-tools/chat2db-server-tools-common/src/main/java/ai/chat2db/server/tools/common/util/I18nUtils.java
+++ b/chat2db-server/chat2db-server-tools/chat2db-server-tools-common/src/main/java/ai/chat2db/server/tools/common/util/I18nUtils.java
@@ -1,5 +1,7 @@
 package ai.chat2db.server.tools.common.util;
 
+import java.util.Locale;
+
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.InitializingBean;
@@ -9,8 +11,6 @@ import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.lang.Nullable;
 import org.springframework.stereotype.Component;
 
-import java.util.Locale;
-
 /**
  * i18n utility
  *
@@ -19,7 +19,7 @@ import java.util.Locale;
 @Slf4j
 @Component
 public class I18nUtils implements InitializingBean {
-    public static final String DEFAULT_message_Code="";
+    public static final String DEFAULT_message_Code="common.systemError";
     @Resource
     private MessageSource messageSource;
     private static MessageSource messageSourceStatic;
@@ -34,7 +34,7 @@ public class I18nUtils implements InitializingBean {
         } catch (NoSuchMessageException e) {
             log.error("no message.", e);
         }
-        return messageSourceStatic.getMessage(messageCode, args, LocaleContextHolder.getLocale());
+        return messageSourceStatic.getMessage(DEFAULT_message_Code, args, LocaleContextHolder.getLocale());
     }
 
     /**
diff --git a/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/data/source/DataSourceController.java b/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/data/source/DataSourceController.java
index bc86b91a..d5c888aa 100644
--- a/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/data/source/DataSourceController.java
+++ b/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/data/source/DataSourceController.java
@@ -38,6 +38,7 @@ import com.jcraft.jsch.Session;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -179,6 +180,11 @@ public class DataSourceController {
     public DataResult<DataSourceVO> queryById(@PathVariable("id") Long id) {
         DataResult<DataSource> dataResult = dataSourceService.queryById(id);
         DataSourceVO dataSourceVO = dataSourceWebConverter.dto2vo(dataResult.getData());
+        if(StringUtils.isNotBlank(dataSourceVO.getUser())){
+            dataSourceVO.setAuthenticationType("1");
+        }else {
+            dataSourceVO.setAuthenticationType("2");
+        }
         return DataResult.of(dataSourceVO);
     }
 
diff --git a/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/data/source/request/DataSourceCreateRequest.java b/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/data/source/request/DataSourceCreateRequest.java
index 62152e82..91a269ca 100644
--- a/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/data/source/request/DataSourceCreateRequest.java
+++ b/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/data/source/request/DataSourceCreateRequest.java
@@ -42,9 +42,13 @@ public class DataSourceCreateRequest {
     @NotNull
     private String password;
 
+    /**
+     * 认证类型
+     */
+    private String authenticationType;
+
     /**
      * 连接类型
-     * @see DbTypeEnum
      */
     @NotNull
     private String type;
@@ -100,4 +104,7 @@ public class DataSourceCreateRequest {
      * 驱动配置
      */
     private DriverConfig driverConfig;
+
+
+
 }
diff --git a/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/data/source/request/DataSourceTestRequest.java b/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/data/source/request/DataSourceTestRequest.java
index 083dbe2c..30b3966a 100644
--- a/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/data/source/request/DataSourceTestRequest.java
+++ b/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/data/source/request/DataSourceTestRequest.java
@@ -47,7 +47,10 @@ public class DataSourceTestRequest {
     @NotNull
     private String type;
 
-
+    /**
+     * 认证类型
+     */
+    private String authenticationType;
 
     /**
      * host
diff --git a/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/data/source/vo/DataSourceVO.java b/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/data/source/vo/DataSourceVO.java
index dd4bca44..15964537 100644
--- a/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/data/source/vo/DataSourceVO.java
+++ b/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/data/source/vo/DataSourceVO.java
@@ -40,6 +40,10 @@ public class DataSourceVO {
      */
     private String password;
 
+    /**
+     * 认证类型
+     */
+    private String authenticationType;
     /**
      * 连接类型
      */
diff --git a/chat2db-server/chat2db-spi/src/main/java/ai/chat2db/spi/sql/Chat2DBContext.java b/chat2db-server/chat2db-spi/src/main/java/ai/chat2db/spi/sql/Chat2DBContext.java
index bc67f6b8..962a5e75 100644
--- a/chat2db-server/chat2db-spi/src/main/java/ai/chat2db/spi/sql/Chat2DBContext.java
+++ b/chat2db-server/chat2db-spi/src/main/java/ai/chat2db/spi/sql/Chat2DBContext.java
@@ -8,6 +8,8 @@ import java.util.Map;
 import java.util.ServiceLoader;
 import java.util.concurrent.ConcurrentHashMap;
 
+import ai.chat2db.server.tools.base.excption.BusinessException;
+import ai.chat2db.server.tools.common.exception.ConnectionException;
 import ai.chat2db.spi.DBManage;
 import ai.chat2db.spi.MetaData;
 import ai.chat2db.spi.Plugin;
@@ -101,6 +103,10 @@ public class Chat2DBContext {
                 if (session != null) {
                     url = url.replace(host, "127.0.0.1").replace(port, ssh.getLocalPort());
                 }
+            }catch (Exception e){
+                throw new ConnectionException("connection.ssh.error",null,e);
+            }
+            try {
                 DriverConfig config = connectInfo.getDriverConfig();
                 if (config == null) {
                     config = getDefaultDriverConfig(connectInfo.getDbType());
@@ -111,27 +117,23 @@ public class Chat2DBContext {
                     connectInfo.getDriverConfig(), connectInfo.getExtendMap());
 
             } catch (Exception e1) {
-                log.error("GetConnect error", e1);
                 if (connection != null) {
                     try {
                         connection.close();
                     } catch (SQLException e) {
-                        log.error("session close error", e);
                     }
                 }
                 if (session != null) {
                     try {
                         session.delPortForwardingL(Integer.parseInt(ssh.getLocalPort()));
                     } catch (JSchException e) {
-                        log.error("session delPortForwardingL error", e);
                     }
                     try {
                         session.disconnect();
                     } catch (Exception e) {
-                        log.error("session disconnect error", e);
                     }
                 }
-                throw new RuntimeException("GetConnect error", e1);
+                throw new BusinessException("connection.error",null,e1);
             }
             connectInfo.setSession(session);
             connectInfo.setConnection(connection);
diff --git a/chat2db-server/chat2db-spi/src/main/java/ai/chat2db/spi/sql/IDriverManager.java b/chat2db-server/chat2db-spi/src/main/java/ai/chat2db/spi/sql/IDriverManager.java
index 7d126a03..e5a84958 100644
--- a/chat2db-server/chat2db-spi/src/main/java/ai/chat2db/spi/sql/IDriverManager.java
+++ b/chat2db-server/chat2db-spi/src/main/java/ai/chat2db/spi/sql/IDriverManager.java
@@ -1,12 +1,12 @@
 
 package ai.chat2db.spi.sql;
+
 import java.io.File;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.sql.Connection;
 import java.sql.Driver;
-import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.util.Map;
 import java.util.Properties;
@@ -14,6 +14,7 @@ import java.util.concurrent.ConcurrentHashMap;
 
 import com.alibaba.fastjson2.JSON;
 
+import ai.chat2db.server.tools.common.exception.ConnectionException;
 import ai.chat2db.spi.config.DriverConfig;
 import ai.chat2db.spi.model.DriverEntry;
 import ai.chat2db.spi.util.JdbcJarUtils;
@@ -62,7 +63,13 @@ public class IDriverManager {
         if (StringUtils.isNotEmpty(password)) {
             info.put("password", password);
         }
-        info.putAll(properties);
+        if (properties != null && !properties.isEmpty()) {
+            for (Map.Entry<String, Object> entry : properties.entrySet()) {
+                if (entry.getKey() != null && entry.getValue() != null) {
+                    info.put(entry.getKey(), entry.getValue());
+                }
+            }
+        }
         return getConnection(url, info, driver);
     }
 
@@ -91,10 +98,8 @@ public class IDriverManager {
         }
 
         if (reason != null) {
-            DriverManager.println("getConnection failed: " + reason);
             throw reason;
         } else {
-            DriverManager.println("getConnection: no suitable driver found for " + url);
             throw new SQLException("No suitable driver found for " + url, "08001");
         }
     }
@@ -123,8 +128,7 @@ public class IDriverManager {
                 DRIVER_ENTRY_MAP.put(driver.getJdbcDriver(), driverEntry);
                 return driverEntry;
             } catch (Exception e) {
-                log.error("getJDBCDriver error", e);
-                throw new SQLException("getJDBCDriver error", "08001");
+                throw new ConnectionException("connection.driver.load.error", null, e);
             }
         }
 
@@ -169,26 +173,4 @@ public class IDriverManager {
         }
     }
 
-    //private static List<Class> loadClass(String jarPath, ClassLoader classLoader) throws IOException {
-    //    Long s1 = System.currentTimeMillis();
-    //    JarFile jarFile = new JarFile(getFullPath(jarPath));
-    //    Enumeration<JarEntry> entries = jarFile.entries();
-    //    List<Class> classes = new ArrayList();
-    //    while (entries.hasMoreElements()) {
-    //        JarEntry jarEntry = entries.nextElement();
-    //        if (jarEntry.getName().endsWith(".class") && !jarEntry.getName().contains("$")) {
-    //            String className = jarEntry.getName().substring(0, jarEntry.getName().length() - 6).replaceAll("/",
-    //                ".");
-    //            try {
-    //                classes.add(classLoader.loadClass(className));
-    //               // log.info("loadClass:{}", className);
-    //            } catch (Throwable var7) {
-    //                //log.error("getClasses error "+className, var7);
-    //            }
-    //        }
-    //    }
-    //    log.info("loadClass cost:{}", System.currentTimeMillis() - s1);
-    //    return classes;
-    //}
-
 }
\ No newline at end of file
diff --git a/chat2db-server/chat2db-spi/src/main/java/ai/chat2db/spi/sql/SQLExecutor.java b/chat2db-server/chat2db-spi/src/main/java/ai/chat2db/spi/sql/SQLExecutor.java
index e438750a..bbea8af8 100644
--- a/chat2db-server/chat2db-spi/src/main/java/ai/chat2db/spi/sql/SQLExecutor.java
+++ b/chat2db-server/chat2db-spi/src/main/java/ai/chat2db/spi/sql/SQLExecutor.java
@@ -11,6 +11,7 @@ import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import ai.chat2db.server.tools.base.constant.EasyToolsConstant;
 import ai.chat2db.spi.model.*;
 
 import cn.hutool.core.date.TimeInterval;
@@ -94,6 +95,7 @@ public class SQLExecutor {
 
         ExecuteResult executeResult = ExecuteResult.builder().sql(sql).success(Boolean.TRUE).build();
         try (Statement stmt = connection.createStatement()) {
+            stmt.setFetchSize(EasyToolsConstant.MAX_PAGE_SIZE);
             TimeInterval timeInterval = new TimeInterval();
             boolean query = stmt.execute(sql.replaceFirst(";", ""));
             executeResult.setDescription("执行成功");
@@ -121,7 +123,9 @@ public class SQLExecutor {
                     List<List<String>> dataList = Lists.newArrayList();
                     executeResult.setDataList(dataList);
 
-                    while (rs.next()) {
+                    int n = 0;
+                    while (rs.next() && n < EasyToolsConstant.MAX_PAGE_SIZE) {
+                        n++;
                         List<String> row = Lists.newArrayListWithExpectedSize(col);
                         dataList.add(row);
                         for (int i = 1; i <= col; i++) {