Merge remote-tracking branch 'refs/remotes/origin/main'

CodePhiliaX · Oct 31, 2024 · 2d1fe2c · 2d1fe2c
2 parents 1aa3b57 + d383444
commit 2d1fe2c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -62,6 +62,7 @@ jobs:
           java-version: "17"
           distribution: "temurin"
           java-package: "jre"
+          architecture: "x64"
 
       # Install jre MacOS arm64
       - name: Install Jre MacOS arm64
@@ -86,7 +87,11 @@ jobs:
       - name: Enable tls1
         if: ${{ runner.os == 'Windows' }}
         run: |
-          sed -i '' "s/\(^jdk.tls.disabledAlgorithms=\)\(.*\)\( TLSv1, TLSv1.1,\)\(.*\)/\1\2\4/" "${{ env.JAVA_HOME }}/conf/security/java.security"
+          # sed -i '' "s/\(^jdk.tls.disabledAlgorithms=\)\(.*\)\( TLSv1, TLSv1.1,\)\(.*\)/\1\2\4/" "${{ env.JAVA_HOME }}\conf\security\java.security"
+          $filePath = "${{ env.JAVA_HOME }}\conf\security\java.security"
+          $content = Get-Content $filePath -Raw
+          $updatedContent = $content -replace '^(jdk.tls.disabledAlgorithms=)(.*)( TLSv1, TLSv1.1,)(.*)', '$1$2$4'
+          $updatedContent | Set-Content $filePath
         shell: pwsh
 
       # java.security open tls1 macOS
@@ -206,7 +211,7 @@ jobs:
         run: |
           xcrun notarytool store-credentials "Chat2DB" --apple-id "${{secrets.MAC_APPLE_ID}}" --password "${{secrets.MAC_APPLE_PASSWORD}}" --team-id "${{secrets.MAC_TEAM_ID}}"
           xcrun notarytool submit chat2db-client/release/Chat2DB-${{ steps.chat2db_version.outputs.substring }}.dmg --keychain-profile "Chat2DB"
-      
+
       # macos arm64
       - name: Build/release Electron app for MacOS arm64
         if: ${{ runner.os == 'macOS' && matrix.arch == 'arm64' }}
@@ -342,4 +347,4 @@ jobs:
             {
               "title": "Linux-test-打包完成通知",
               "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)"
-            }
+            }
diff --git a/.../chat2db-server-domain-repository/src/main/resources/db/migration/V2_1_10__REMOVEdEMO.sql b/.../chat2db-server-domain-repository/src/main/resources/db/migration/V2_1_10__REMOVEdEMO.sql
@@ -0,0 +1,7 @@
+delete from DATA_SOURCE where ALIAS ='DEMO@db.sqlgpt.cn';
+
+delete from DASHBOARD where id =ID;
+
+delete from CHART where id<=3;
+
+delete  from DASHBOARD_CHART_RELATION where CHART_ID<=3;