Skip to content

Commit a090565

Browse files
chat2db-jerrychat2db-jerry
committed
Merge remote-tracking branch 'origin/developing' into team
2 parents 0dfc9a7 + acca6c5 commit a090565

26 files changed

Lines changed: 200 additions & 107 deletions

File tree

‎.github/workflows/release.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ jobs:
285285
content: |
286286
{
287287
"title": "Windows-release-打包完成通知",
288-
"text": "# Windows-release-打包完成通知 \n ![bang]http://oss.sqlgpt.cn/static/happy100.jpg) \n ### 任务id：[${{ github.run_id }}](https://github.com/chat2db/Chat2DB/actions/runs/${{ github.run_id }}) \n ### Windows下载地址：[https://oss-chat2db.alibaba.com/release/${{ steps.chat2db_version.outputs.substring }}/Chat2DB%20Setup%20${{ steps.chat2db_version.outputs.substring }}.exe]http://oss.sqlgpt.cn/release/${{ steps.chat2db_version.outputs.substring }}/Chat2DB%20Setup%20${{ steps.chat2db_version.outputs.substring }}.exe) "
288+
"text": "# Windows-release-打包完成通知 \n ![bang](https://oss.sqlgpt.cn/static/happy100.jpg) \n ### 任务id：[${{ github.run_id }}](https://github.com/chat2db/Chat2DB/actions/runs/${{ github.run_id }}) \n ### Windows下载地址：[https://oss.sqlgpt.cn/release/${{ steps.chat2db_version.outputs.substring }}/Chat2DB%20Setup%20${{ steps.chat2db_version.outputs.substring }}.exe](https://oss.sqlgpt.cn/release/${{ steps.chat2db_version.outputs.substring }}/Chat2DB%20Setup%20${{ steps.chat2db_version.outputs.substring }}.exe) "
289289
}
290290
291291
# 构建完成通知
@@ -298,7 +298,7 @@ jobs:
298298
content: |
299299
{
300300
"title": "MacOS-amd64-release-构建完成通知",
301-
"text": "# MacOS-amd64-release-打包完成通知 \n ![bang]http://oss.sqlgpt.cn/static/happy100.jpg) \n ### 任务id：[${{ github.run_id }}](https://github.com/chat2db/Chat2DB/actions/runs/${{ github.run_id }}) \n ### Intel芯片下载地址：[https://oss-chat2db.alibaba.com/release/${{ steps.chat2db_version.outputs.substring }}/Chat2DB-${{ steps.chat2db_version.outputs.substring }}.dmg]http://oss.sqlgpt.cn/release/${{ steps.chat2db_version.outputs.substring }}/Chat2DB-${{ steps.chat2db_version.outputs.substring }}.dmg) \n ### jar包下载地址：[https://oss-chat2db.alibaba.com/release/${{ steps.chat2db_version.outputs.substring }}/chat2db-server-start.zip]http://oss.sqlgpt.cn/release/${{ steps.chat2db_version.outputs.substring }}/chat2db-server-start.zip) "
301+
"text": "# MacOS-amd64-release-打包完成通知 \n ![bang](https://oss.sqlgpt.cn/static/happy100.jpg) \n ### 任务id：[${{ github.run_id }}](https://github.com/chat2db/Chat2DB/actions/runs/${{ github.run_id }}) \n ### Intel芯片下载地址：[https://oss.sqlgpt.cn/release/${{ steps.chat2db_version.outputs.substring }}/Chat2DB-${{ steps.chat2db_version.outputs.substring }}.dmg](https://oss.sqlgpt.cn/release/${{ steps.chat2db_version.outputs.substring }}/Chat2DB-${{ steps.chat2db_version.outputs.substring }}.dmg) \n ### jar包下载地址：[https://oss.sqlgpt.cn/release/${{ steps.chat2db_version.outputs.substring }}/chat2db-server-start.zip](https://oss.sqlgpt.cn/release/${{ steps.chat2db_version.outputs.substring }}/chat2db-server-start.zip) "
302302
}
303303
304304
# 构建完成通知
@@ -311,7 +311,7 @@ jobs:
311311
content: |
312312
{
313313
"title": "MacOS-arm64-release-构建完成通知",
314-
"text": "# MacOS-arm64-release-打包完成通知 \n ![bang]http://oss.sqlgpt.cn/static/happy100.jpg) \n ### 任务id：[${{ github.run_id }}](https://github.com/chat2db/Chat2DB/actions/runs/${{ github.run_id }}) \n ### Apple芯片下载地址：[https://oss-chat2db.alibaba.com/release/${{ steps.chat2db_version.outputs.substring }}/Chat2DB-${{ steps.chat2db_version.outputs.substring }}-arm64.dmg]http://oss.sqlgpt.cn/release/${{ steps.chat2db_version.outputs.substring }}/Chat2DB-${{ steps.chat2db_version.outputs.substring }}-arm64.dmg) "
314+
"text": "# MacOS-arm64-release-打包完成通知 \n ![bang](https://oss.sqlgpt.cn/static/happy100.jpg) \n ### 任务id：[${{ github.run_id }}](https://github.com/chat2db/Chat2DB/actions/runs/${{ github.run_id }}) \n ### Apple芯片下载地址：[https://oss.sqlgpt.cn/release/${{ steps.chat2db_version.outputs.substring }}/Chat2DB-${{ steps.chat2db_version.outputs.substring }}-arm64.dmg](https://oss.sqlgpt.cn/release/${{ steps.chat2db_version.outputs.substring }}/Chat2DB-${{ steps.chat2db_version.outputs.substring }}-arm64.dmg) "
315315
}
316316
317317
# 构建完成通知
@@ -324,5 +324,5 @@ jobs:
324324
content: |
325325
{
326326
"title": "Linux-test-打包完成通知",
327-
"text": "# Linux-test-打包完成通知 \n ![bang]http://oss.sqlgpt.cn/static/happy100.jpg) \n ### 任务id：[${{ github.run_id }}](https://github.com/chat2db/Chat2DB/actions/runs/${{ github.run_id }}) \n ### Linux下载地址：[https://oss-chat2db.alibaba.com/release/${{ steps.chat2db_version.outputs.substring }}/Chat2DB-${{ steps.chat2db_version.outputs.substring }}.AppImage]http://oss.sqlgpt.cn/release/${{ steps.chat2db_version.outputs.substring }}/Chat2DB-${{ steps.chat2db_version.outputs.substring }}.AppImage)"
327+
"text": "# Linux-test-打包完成通知 \n ![bang](https://oss.sqlgpt.cn/static/happy100.jpg) \n ### 任务id：[${{ github.run_id }}](https://github.com/chat2db/Chat2DB/actions/runs/${{ github.run_id }}) \n ### Linux下载地址：[https://oss.sqlgpt.cn/release/${{ steps.chat2db_version.outputs.substring }}/Chat2DB-${{ steps.chat2db_version.outputs.substring }}.AppImage](https://oss.sqlgpt.cn/release/${{ steps.chat2db_version.outputs.substring }}/Chat2DB-${{ steps.chat2db_version.outputs.substring }}.AppImage)"
328328
}

‎.github/workflows/release_test.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ jobs:
274274
content: |
275275
{
276276
"title": "Windows-test-打包完成通知",
277-
"text": "# Windows-test-打包完成通知 \n ![bang](http://oss.sqlgpt.cn/static/bang100.gif) \n ### 任务id：[${{ github.run_id }}](https://github.com/chat2db/Chat2DB/actions/runs/${{ github.run_id }}) \n ### Windows下载地址：[http://oss.sqlgpt.cn/test/99.0.${{ github.run_id }}/Chat2DB-Test%20Setup%2099.0.${{ github.run_id }}-Test.exe](http://oss.sqlgpt.cn/test/99.0.${{ github.run_id }}/Chat2DB-Test%20Setup%2099.0.${{ github.run_id }}-Test.exe) "
277+
"text": "# Windows-test-打包完成通知 \n ![bang](https://oss.sqlgpt.cn/static/bang100.gif) \n ### 任务id：[${{ github.run_id }}](https://github.com/chat2db/Chat2DB/actions/runs/${{ github.run_id }}) \n ### Windows下载地址：[https://oss.sqlgpt.cn/test/99.0.${{ github.run_id }}/Chat2DB-Test%20Setup%2099.0.${{ github.run_id }}-Test.exe](https://oss.sqlgpt.cn/test/99.0.${{ github.run_id }}/Chat2DB-Test%20Setup%2099.0.${{ github.run_id }}-Test.exe) "
278278
}
279279
280280
# 构建完成通知
@@ -287,7 +287,7 @@ jobs:
287287
content: |
288288
{
289289
"title": "MacOS-amd64-test-构建完成通知",
290-
"text": "# MacOS-amd64-test-打包完成通知 \n ![bang](http://oss.sqlgpt.cn/static/bang100.gif) \n ### 任务id：[${{ github.run_id }}](https://github.com/chat2db/Chat2DB/actions/runs/${{ github.run_id }}) \n ### Intel芯片下载地址：[http://oss.sqlgpt.cn/test/99.0.${{ github.run_id }}/Chat2DB-Test-99.0.${{ github.run_id }}-Test.dmg](http://oss.sqlgpt.cn/test/99.0.${{ github.run_id }}/Chat2DB-Test-99.0.${{ github.run_id }}-Test.dmg) \n ### jar包下载地址：[http://oss.sqlgpt.cn/test/99.0.${{ github.run_id }}/chat2db-server-start.zip](http://oss.sqlgpt.cn/test/99.0.${{ github.run_id }}/${{ github.run_id }}/chat2db-server-start.zip) "
290+
"text": "# MacOS-amd64-test-打包完成通知 \n ![bang](https://oss.sqlgpt.cn/static/bang100.gif) \n ### 任务id：[${{ github.run_id }}](https://github.com/chat2db/Chat2DB/actions/runs/${{ github.run_id }}) \n ### Intel芯片下载地址：[https://oss.sqlgpt.cn/test/99.0.${{ github.run_id }}/Chat2DB-Test-99.0.${{ github.run_id }}-Test.dmg](https://oss.sqlgpt.cn/test/99.0.${{ github.run_id }}/Chat2DB-Test-99.0.${{ github.run_id }}-Test.dmg) \n ### jar包下载地址：[https://oss.sqlgpt.cn/test/99.0.${{ github.run_id }}/chat2db-server-start.zip](https://oss.sqlgpt.cn/test/99.0.${{ github.run_id }}/${{ github.run_id }}/chat2db-server-start.zip) "
291291
}
292292
293293
# 构建完成通知
@@ -300,7 +300,7 @@ jobs:
300300
content: |
301301
{
302302
"title": "MacOS-arm64-test-构建完成通知",
303-
"text": "# MacOS-arm64-test-打包完成通知 \n ![bang](http://oss.sqlgpt.cn/static/bang100.gif) \n ### 任务id：[${{ github.run_id }}](https://github.com/chat2db/Chat2DB/actions/runs/${{ github.run_id }}) \n ### Apple芯片下载地址：[http://oss.sqlgpt.cn/test/99.0.${{ github.run_id }}/Chat2DB-Test-99.0.${{ github.run_id }}-Test-arm64.dmg](http://oss.sqlgpt.cn/test/99.0.${{ github.run_id }}/Chat2DB-Test-99.0.${{ github.run_id }}-Test-arm64.dmg) "
303+
"text": "# MacOS-arm64-test-打包完成通知 \n ![bang](https://oss.sqlgpt.cn/static/bang100.gif) \n ### 任务id：[${{ github.run_id }}](https://github.com/chat2db/Chat2DB/actions/runs/${{ github.run_id }}) \n ### Apple芯片下载地址：[https://oss.sqlgpt.cn/test/99.0.${{ github.run_id }}/Chat2DB-Test-99.0.${{ github.run_id }}-Test-arm64.dmg](https://oss.sqlgpt.cn/test/99.0.${{ github.run_id }}/Chat2DB-Test-99.0.${{ github.run_id }}-Test-arm64.dmg) "
304304
}
305305
306306
# 构建完成通知
@@ -313,5 +313,5 @@ jobs:
313313
content: |
314314
{
315315
"title": "Linux-test-打包完成通知",
316-
"text": "# Linux-test-打包完成通知 \n ![bang](http://oss.sqlgpt.cn/static/bang100.gif) \n ### 任务id：[${{ github.run_id }}](https://github.com/chat2db/Chat2DB/actions/runs/${{ github.run_id }}) \n ### Linux下载地址：[http://oss.sqlgpt.cn/test/99.0.${{ github.run_id }}/Chat2DB-Test-99.0.${{ github.run_id }}-Test.AppImage](http://oss.sqlgpt.cn/test/99.0.${{ github.run_id }}/Chat2DB-Test-99.0.${{ github.run_id }}-Test.AppImage) "
316+
"text": "# Linux-test-打包完成通知 \n ![bang](https://oss.sqlgpt.cn/static/bang100.gif) \n ### 任务id：[${{ github.run_id }}](https://github.com/chat2db/Chat2DB/actions/runs/${{ github.run_id }}) \n ### Linux下载地址：[https://oss.sqlgpt.cn/test/99.0.${{ github.run_id }}/Chat2DB-Test-99.0.${{ github.run_id }}-Test.AppImage](https://oss.sqlgpt.cn/test/99.0.${{ github.run_id }}/Chat2DB-Test-99.0.${{ github.run_id }}-Test.AppImage) "
317317
}

‎.github/workflows/test.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
# fail-fast: false
99
# matrix:
1010
# include:
11+
# - os: macos-latest
12+
# arch: amd64
1113
# - os: ubuntu-latest
1214
# runs-on: ${{ matrix.os }}
1315
# steps:
@@ -24,7 +26,7 @@
2426
#
2527
# # java.security 开放tls1 Linux
2628
# - name: Enable tls1
27-
# if: ${{ runner.os == 'Linux' }}
2829
# run: |
29-
# sed -i "s/\(^jdk.tls.disabledAlgorithms=\)\(.*\)\( TLSv1, TLSv1.1,\)\(.*\)/\1\2\4/" ${{ env.JAVA_HOME }}/conf/security/java.security
30-
# cat ${{ env.JAVA_HOME }}/conf/security/java.security
30+
# ls ${{ env.JAVA_HOME }}
31+
# ls ${{ env.JAVA_HOME }}/legal/jdk.zipfs/
32+
# cat ${{ env.JAVA_HOME }}/legal/jdk.zipfs/ADDITIONAL_LICENSE_INFO

‎CHANGELOG.md‎

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,28 @@
1+
2+
# 2.0.9
3+
4+
## 🐞 Bug Fixes
5+
6+
-Fix the issue of Windows flash back
7+
8+
## 🐞 问题修复
9+
10+
- 修复windows闪退的问题
11+
12+
# 2.0.8
13+
14+
## 🐞 Bug Fixes
15+
16+
- Repair the Scientific notation in some databases [Issue #378](https://github.com/chat2db/Chat2DB/issues/378)
17+
- Fix some cases where data is not displayed
18+
19+
## 🐞 问题修复
20+
21+
- 修复部分数据库出现科学计数法的情况 [Issue #378](https://github.com/chat2db/Chat2DB/issues/378)
22+
- 修复部分情况数据不展示
23+
124
# 2.0.7
25+
226
## ⭐ New Features
327

428
- Export query result as file is supported
@@ -7,12 +31,20 @@
731

832
- Fixed ai config issues [Issue #346](https://github.com/chat2db/Chat2DB/issues/346)
933

34+
## ⭐ 新特性
35+
36+
- 支持导出查询结果
37+
38+
## 🐞 问题修复
39+
40+
- 修复ai配置 [Issue #346](https://github.com/chat2db/Chat2DB/issues/346)
1041

1142
# 2.0.6
1243

1344
## 🐞 Bug Fixes
1445

15-
- Fixed: When there are too many tables under the selected library, the "New Console" button at the bottom disappears [Issue #314](https://github.com/chat2db/Chat2DB/issues/314)
46+
- Fixed: When there are too many tables under the selected library, the "New Console" button at the bottom
47+
disappears [Issue #314](https://github.com/chat2db/Chat2DB/issues/314)
1648

1749
## 🐞 问题修复
1850

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ $ yarn run start:web
169169
$ cd ../chat2db-server
170170
$ mvn clean install # maven 3.8 or later needs to be installed
171171
$ cd chat2db-server/chat2db-server-start/target/
172-
$ java -jar -Dchatgpt.apiKey=xxxxx chat2db-server-start.jar # To launch the chat application, you need to enter the ChatGPT key for the chatgpt.apiKey. Without entering it, you won't be able to use the AIGC function.
172+
$ java -jar -Dloader.path=/lib -Dchatgpt.apiKey=xxxxx chat2db-server-start.jar # To launch the chat application, you need to enter the ChatGPT key for the chatgpt.apiKey. Without entering it, you won't be able to use the AIGC function.
173173
```
174174

175175
## 📑 Documentation

‎README_CN.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ $ yarn run start:web
162162
$ cd ../chat2db-server
163163
$ mvn clean install # 需要安装maven 3.8以上版本
164164
$ cd chat2db-server/chat2db-server-start/target/
165-
$ java -jar -Dchatgpt.apiKey=xxxxx chat2db-server-start.jar # 启动应用 chatgpt.apiKey 需要输入ChatGPT的key,如果不输入无法使用AIGC功能
165+
$ java -jar -Dloader.path=/lib -Dchatgpt.apiKey=xxxxx chat2db-server-start.jar # 启动应用 chatgpt.apiKey 需要输入ChatGPT的key,如果不输入无法使用AIGC功能
166166
```
167167

168168
## 📑 文档

‎chat2db-client/.umirc.prod.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import { defineConfig } from 'umi';
22
import { extractYarnConfig } from './src/utils/webpack';
33
const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin');
4-
5-
// const UMI_PublicPath = process.env.UMI_PublicPath || './static/front/';
4+
const UMI_PublicPath = process.env.UMI_PublicPath || './static/front/';
65
const yarn_config = extractYarnConfig(process.argv);
76

87
const chainWebpack = (config: any, { webpack }: any) => {
@@ -14,7 +13,7 @@ const chainWebpack = (config: any, { webpack }: any) => {
1413
};
1514

1615
export default defineConfig({
17-
publicPath: './static/front/',
16+
publicPath: UMI_PublicPath,
1817
chainWebpack,
1918
define: {
2019
'process.env.UMI_ENV': process.env.UMI_ENV,

‎chat2db-client/.umirc.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ export default defineConfig({
4444
changeOrigin: true,
4545
},
4646
},
47+
targets:{
48+
chrome: 80,
49+
},
4750
headScripts: [
4851
`if (localStorage.getItem('app-local-storage-versions') !== 'v2') {
4952
localStorage.clear();

‎chat2db-client/.vscode/settings.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,15 @@
3535
"USERANDPASSWORD",
3636
"ahooks",
3737
"antd",
38+
"bgcolor",
3839
"chatgpt",
3940
"datas",
4041
"datasource",
4142
"dbhub",
4243
"echarts",
4344
"favicons",
4445
"findstr",
46+
"gtag",
4547
"lsof",
4648
"netstat",
4749
"pgsql",

‎chat2db-client/package.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"build:prod": "npm run build:web:prod && npm run build:main:prod",
1717
"build:web": "umi build",
1818
"build:web:desktop": "cross-env UMI_ENV=desktop cross-env APP_VERSION=${npm_config_app_version} cross-env APP_PORT=${npm_config_app_port} umi build",
19-
"build:web:prod": "cross-env UMI_ENV=prod cross-env APP_VERSION=${npm_config_app_version} cross-env APP_PORT=${npm_config_app_port} umi build",
19+
"build:web:prod": "cross-env UMI_ENV=prod cross-env APP_VERSION=${npm_config_app_version} cross-env APP_PORT=${npm_config_app_port} cross-env UMI_PublicPath=${npm_config_public_path} umi build",
2020
"postinstall": "umi setup",
2121
"lint": "umi lint",
2222
"start": "concurrently \"npm run start:web\" \"npm run start:main\"",
@@ -28,6 +28,7 @@
2828
"ahooks": "^3.7.7",
2929
"ali-react-table": "^2.6.1",
3030
"antd": "^5.6.0",
31+
"copy-to-clipboard": "^3.3.3",
3132
"echarts": "^5.4.2",
3233
"echarts-for-react": "^3.0.2",
3334
"event-source-polyfill": "^1.0.31",
@@ -52,7 +53,7 @@
5253
"@umijs/plugins": "^4.0.55",
5354
"concurrently": "^8.1.0",
5455
"cross-env": "^7.0.3",
55-
"electron": "^22.0.0",
56+
"electron": "^22.3.0",
5657
"electron-builder": "^23.6.0",
5758
"electron-debug": "^3.2.0",
5859
"electron-reload": "^2.0.0-alpha.1",
@@ -118,4 +119,4 @@
118119
]
119120
}
120121
}
121-
}
122+
}

0 commit comments

Comments
 (0)