Merge pull request OtterMind#1041 from chat2db/dev

shanhexi · web-flow · commit 306a202f45b0 · 2023-12-28T18:07:44.000+08:00
Dev
diff --git a/.github/workflows/pushdocker.yml b/.github/workflows/pushdocker.yml
@@ -49,8 +49,8 @@ jobs:
           cd chat2db-client
           yarn install 
           yarn run build:web:prod --app_version=${{ steps.chat2db_version.outputs.substring }}
-          cp -r dist ../chat2db-server/chat2db-server-start/src/main/resources/static/front
-          cp -r dist/index.html ../chat2db-server/chat2db-server-start/src/main/resources/thymeleaf/
+          cp -r dist ../chat2db-server/chat2db-server-web-start/src/main/resources/static/front
+          cp -r dist/index.html ../chat2db-server/chat2db-server-web-start/src/main/resources/thymeleaf/
 
       # 安装java
       - name: Install Java and Maven
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 3.1.18
+
+`2023-12-28`
+
+**Changelog**
+
+- 🐞【Fixed】 docker startup error
+
 ## 3.1.17
 
 `2023-12-27`
@@ -6,6 +14,7 @@
 
 - ⭐【New Features】Connection replicable
 - ⚡️【Optimize】Select the table to view the DDL of the table in Information on the right expansion bar
+- 🐞【Fixed】 Modifying table sorting does not generate sorting SQL problems
 - 🐞【Fixed】Home connection cannot switch pages
 - 🐞【Fixed】Columns cannot be viewed or edited in some tables of the Oracle database
 
diff --git a/CHANGELOG_CN.md b/CHANGELOG_CN.md
@@ -1,3 +1,11 @@
+## 3.1.18
+
+`2023-12-28`
+
+**更新日志**
+
+- 🐞【修复】docker启动报错问题
+
 ## 3.1.17
 
 `2023-12-27`
@@ -6,11 +14,11 @@
 
 - ⭐【新功能】连接可复制
 - ⚡️【优化】选中表可直接在右侧拓展栏的“信息”中查看表DDL
+- 🐞【修复】修改表排序无法生成排序SQL问题
 - 🐞【修复】Oracle数据库部分表无法查看列、无法编辑问题
 - 🐞【修复】团队管理归属连接无法切换分页
 
 
-
 ## 3.1.16
 
 `2023-12-25`
