merge origin/main

NiuMl · Jul 2, 2023 · dd17391 · dd17391
2 parents 009bd99 + 754a0da
commit dd17391
Show file tree

Hide file tree

Showing 107 changed files with 61 additions and 6,813 deletions.
diff --git a/.github/workflows/pushdocker.yml b/.github/workflows/pushdocker.yml
@@ -35,19 +35,21 @@ jobs:
         run: |
           echo "current version: ${{ steps.chat2db_version.outputs.substring }}"
 
-      # 安装nodejs
+      # 安装node
       - name: Install Node.js
         uses: actions/setup-node@main
         with:
           node-version: 16
+          cache: "yarn"
+          cache-dependency-path: chat2db-client/yarn.lock
 
       # 构建静态文件信息
-      - name: Npm install & build & copy
+      - name: Yarn install & build & copy
         run: |
-          cd ali-dbhub-client
-          npm install 
-          npm run build:desktop
-          mv dist ../ali-dbhub-server/ali-dbhub-server-start/src/main/resources/static/front
+          cd chat2db-client
+          yarn install 
+          yarn run build:web:prod --appVersion=${{ steps.chat2db_version.outputs.substring }}
+          cp -r dist ../chat2db-server/chat2db-server-start/src/main/resources/static/front
 
       # 安装java
       - name: Install Java and Maven
@@ -59,7 +61,7 @@ jobs:
 
       # 编译服务端java版本
       - name: Build Java
-        run: mvn clean package -B '-Dmaven.test.skip=true' -f ali-dbhub-server/pom.xml
+        run: mvn clean package -B '-Dmaven.test.skip=true' -f chat2db-server/pom.xml
 
 
       - name: Set up QEMU

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -104,7 +104,7 @@ jobs:
         uses: actions/setup-node@main
         with:
           node-version: 16
-          cache: 'yarn'
+          cache: "yarn"
           cache-dependency-path: chat2db-client/yarn.lock
 
       # 安装java
@@ -120,7 +120,7 @@ jobs:
         run: |
           cd chat2db-client
           yarn install 
-          yarn run build:web:desktop --appVersion=${{ steps.chat2db_version.outputs.substring }}
+          yarn run build:web:prod --appVersion=${{ steps.chat2db_version.outputs.substring }}
           cp -r dist ../chat2db-server/chat2db-server-start/src/main/resources/static/front
 
       # 编译服务端java版本
@@ -163,7 +163,6 @@ jobs:
           args: "-c.extraMetadata.version=${{ steps.chat2db_version.outputs.substring }} --mac --x64"
           release: true
 
-
       # amd64 notarization
       - name: Notarization amd64 App
         if: ${{ runner.os == 'macOS' && matrix.arch == 'amd64' }}
@@ -218,7 +217,7 @@ jobs:
           endpoint: "oss-accelerate.aliyuncs.com"
           access-key-id: ${{ secrets.OSS_ACCESS_KEY_ID }}
           access-key-secret: ${{ secrets.OSS_ACCESS_KEY_SECRET }}
-          ossutil-version: 'latest'
+          ossutil-version: "latest"
       - name: Upload to oss
         run: |
           ossutil cp -rf --acl=public-read ./oss_temp_file/ oss://chat2db/release/${{ steps.chat2db_version.outputs.substring }}/

diff --git a/README.md b/README.md
@@ -27,9 +27,10 @@
 Languages： English | [中文](README_CN.md)
 </div>
 
+
 ## DEMO
 
-https://github.com/chat2db/Chat2DB/assets/22975773/b58db908-5768-4a71-aa30-135d202e505f
+https://github.com/chat2db/Chat2DB/assets/22975773/79e9dded-375b-44cf-9979-bb7572465a2e
 
 
 ## 📖 Introduction
@@ -47,10 +48,10 @@ https://github.com/chat2db/Chat2DB/assets/22975773/b58db908-5768-4a71-aa30-135d2
 
 | Description                   | Download                                                                                                                                                   |
 |-----------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Windows      | [https://oss-chat2db.alibaba.com/release/1.0.11/Chat2DB%20Setup%201.0.11.exe](https://oss-chat2db.alibaba.com/release/1.0.11/Chat2DB%20Setup%201.0.11.exe) |
-| MacOS ARM64 | [https://oss-chat2db.alibaba.com/release/1.0.11/Chat2DB-1.0.11-arm64.dmg](https://oss-chat2db.alibaba.com/release/1.0.11/Chat2DB-1.0.11-arm64.dmg)         |
-| MacOS X64  | [https://oss-chat2db.alibaba.com/release/1.0.11/Chat2DB-1.0.11.dmg](https://oss-chat2db.alibaba.com/release/1.0.11/Chat2DB-1.0.11.dmg)                     |
-| Jar包         | [https://oss-chat2db.alibaba.com/release/1.0.11/chat2db-server-start.jar](https://oss-chat2db.alibaba.com/release/1.0.11/chat2db-server-start.jar)         |
+| Windows      | [https://oss-chat2db.alibaba.com/release/2.0.0/Chat2DB%20Setup%202.0.0.exe](https://oss-chat2db.alibaba.com/release/2.0.0/Chat2DB%20Setup%202.0.0.exe) |
+| MacOS ARM64 | [https://oss-chat2db.alibaba.com/release/2.0.0/Chat2DB-2.0.0-arm64.dmg](https://oss-chat2db.alibaba.com/release/2.0.0/Chat2DB-2.0.0-arm64.dmg)         |
+| MacOS X64  | [https://oss-chat2db.alibaba.com/release/2.0.0/Chat2DB-2.0.0.dmg](https://oss-chat2db.alibaba.com/release/2.0.0/Chat2DB-2.0.0.dmg)                     |
+| Jar包         | [https://oss-chat2db.alibaba.com/release/2.0.0/chat2db-server-start.jar](https://oss-chat2db.alibaba.com/release/2.0.0/chat2db-server-start.jar)         |
 
 ## 🚀 Supported databases
 | Databases     | Status    |

diff --git a/README_CN.md b/README_CN.md
@@ -50,10 +50,10 @@ https://github.com/chat2db/Chat2DB/assets/22975773/b58db908-5768-4a71-aa30-135d2
 ## ⏬ 下载安装
 | 描述                   | 下载地址                                                                                                                                                       |
 |-----------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Windows               | [https://oss-chat2db.alibaba.com/release/1.0.11/Chat2DB%20Setup%201.0.11.exe](https://oss-chat2db.alibaba.com/release/1.0.10/Chat2DB%20Setup%201.0.10.exe) |
-| MacOS ARM64 (Apple芯片) | [https://oss-chat2db.alibaba.com/release/1.0.11/Chat2DB-1.0.11-arm64.dmg](https://oss-chat2db.alibaba.com/release/1.0.10/Chat2DB-1.0.10-arm64.dmg)         |
-| MacOS X64 (Intel芯片)   | [https://oss-chat2db.alibaba.com/release/1.0.11/Chat2DB-1.0.11.dmg](https://oss-chat2db.alibaba.com/release/1.0.10/Chat2DB-1.0.10.dmg)                     |       
-| Jar包                  | [https://oss-chat2db.alibaba.com/release/1.0.11/chat2db-server-start.jar](https://oss-chat2db.alibaba.com/release/1.0.10/chat2db-server-start.jar)         |                                                                                                                
+| Windows               | [https://oss-chat2db.alibaba.com/release/2.0.0/Chat2DB%20Setup%202.0.0.exe](https://oss-chat2db.alibaba.com/release/2.0.0/Chat2DB%20Setup%202.0.0.exe) |
+| MacOS ARM64 (Apple芯片) | [https://oss-chat2db.alibaba.com/release/2.0.0/Chat2DB-2.0.0-arm64.dmg](https://oss-chat2db.alibaba.com/release/2.0.0/Chat2DB-2.0.0-arm64.dmg)         |
+| MacOS X64 (Intel芯片)   | [https://oss-chat2db.alibaba.com/release/2.0.0/Chat2DB-2.0.0.dmg](https://oss-chat2db.alibaba.com/release/2.0.0/Chat2DB-2.0.0.dmg)                     |       
+| Jar包                  | [https://oss-chat2db.alibaba.com/release/2.0.0/chat2db-server-start.jar](https://oss-chat2db.alibaba.com/release/2.0.0/chat2db-server-start.jar)         |                                                                                                                
 
 ## 🚀 支持的数据库
 | 数据库        | 支持计划    |

diff --git a/chat2db-server/chat2db-server-domain/chat2db-server-domain-support/pom.xml b/chat2db-server/chat2db-server-domain/chat2db-server-domain-support/pom.xml
diff --git a/...n-support/src/main/java/ai/chat2db/server/domain/support/datasource/DataSourceManger.java b/...n-support/src/main/java/ai/chat2db/server/domain/support/datasource/DataSourceManger.java
diff --git a/...domain-support/src/main/java/ai/chat2db/server/domain/support/datasource/IDataSource.java b/...domain-support/src/main/java/ai/chat2db/server/domain/support/datasource/IDataSource.java
diff --git a/...omain-support/src/main/java/ai/chat2db/server/domain/support/datasource/MyDataSource.java b/...omain-support/src/main/java/ai/chat2db/server/domain/support/datasource/MyDataSource.java