From 6098371bb50b82c4cf3f369d181c67906715f29c Mon Sep 17 00:00:00 2001 From: song_xiao_lin Date: Fri, 27 Dec 2024 15:02:41 +0800 Subject: [PATCH] feat: CSPG -> CSG --- .github/workflows/yakit-ee.yml | 84 ++++++++++---------- app/renderer/src/main/public/index.html | 4 +- build/yakit_build.nsh | 12 +-- multibuilder/electron-builder-ee-legacy.yaml | 6 +- multibuilder/electron-builder-ee.yaml | 6 +- 5 files changed, 56 insertions(+), 56 deletions(-) diff --git a/.github/workflows/yakit-ee.yml b/.github/workflows/yakit-ee.yml index 239ec7a56d..e6310aa7da 100644 --- a/.github/workflows/yakit-ee.yml +++ b/.github/workflows/yakit-ee.yml @@ -86,9 +86,9 @@ jobs: run: echo ${{ steps.package_version.outputs.value }} - run: wget -O bins/database/default-cve.db.gzip https://cve-db.oss-accelerate.aliyuncs.com/default-cve.db.gzip - name: "Download CVE(Include CWE) Data (CSPG && EnpriTraceAgent)" + name: "Download CVE(Include CWE) Data (CSG && EnpriTraceAgent)" - run: wget -O bins/resources/local-plugins-se.yakitresource.txt https://yaklang.oss-accelerate.aliyuncs.com/yakit-ee/local-plugins-se.yakitresource.txt - name: "Download Plugin resource Files (CSPG && EnpriTraceAgent)" + name: "Download Plugin resource Files (CSG && EnpriTraceAgent)" - run: yarn install && yarn install-render working-directory: ./ @@ -162,97 +162,97 @@ jobs: - name: View Published Content run: ls ./release - # CSPG-1.3.4-sp7-darwin-arm64.dmg - # CSPG-1.3.4-sp7-darwin-x64.dmg - # CSPG-1.3.4-sp7-linux-amd64.AppImage - # CSPG-1.3.4-sp7-linux-arm64.AppImage - # CSPG-1.3.4-sp7-windows-amd64.exe - # CSPG-1.3.4-sp7-darwin-legacy-arm64.dmg - # CSPG-1.3.4-sp7-darwin-legacy-x64.dmg - # CSPG-1.3.4-sp7-linux-legacy-amd64.AppImage - # CSPG-1.3.4-sp7-linux-legacy-arm64.AppImage - # CSPG-1.3.4-sp7-windows-legacy-amd64.exe + # CSG-1.3.4-sp7-darwin-arm64.dmg + # CSG-1.3.4-sp7-darwin-x64.dmg + # CSG-1.3.4-sp7-linux-amd64.AppImage + # CSG-1.3.4-sp7-linux-arm64.AppImage + # CSG-1.3.4-sp7-windows-amd64.exe + # CSG-1.3.4-sp7-darwin-legacy-arm64.dmg + # CSG-1.3.4-sp7-darwin-legacy-x64.dmg + # CSG-1.3.4-sp7-linux-legacy-amd64.AppImage + # CSG-1.3.4-sp7-linux-legacy-arm64.AppImage + # CSG-1.3.4-sp7-windows-legacy-amd64.exe - name: Upload Yakit(EE) Artifacts Windows uses: actions/upload-artifact@v4 if: ${{ env.IS_TAG_RELEASE == 'tag/v' || ((env.PACKAGING_PLATFORM == 'mwl' || env.PACKAGING_PLATFORM == 'win') && env.COMPATIBILITY_MODE == 'normal') }} with: - # CSPG-1.3.4-sp7-windows-amd64.exe - name: CSPG-${{ steps.package_version.outputs.value }}-windows-amd64.exe - path: ./release/CSPG-${{ steps.package_version.outputs.value }}-windows-amd64.exe + # CSG-1.3.4-sp7-windows-amd64.exe + name: CSG-${{ steps.package_version.outputs.value }}-windows-amd64.exe + path: ./release/CSG-${{ steps.package_version.outputs.value }}-windows-amd64.exe if-no-files-found: error - name: Upload Yakit(EE) Artifacts Mac(m1) uses: actions/upload-artifact@v4 if: ${{ env.IS_TAG_RELEASE == 'tag/v' || ((env.PACKAGING_PLATFORM == 'mwl' || env.PACKAGING_PLATFORM == 'mac') && env.COMPATIBILITY_MODE == 'normal') }} with: - # CSPG-1.3.4-sp7-darwin-arm64.dmg - name: CSPG-${{ steps.package_version.outputs.value }}-darwin-arm64.dmg - path: ./release/CSPG-${{ steps.package_version.outputs.value }}-darwin-arm64.dmg + # CSG-1.3.4-sp7-darwin-arm64.dmg + name: CSG-${{ steps.package_version.outputs.value }}-darwin-arm64.dmg + path: ./release/CSG-${{ steps.package_version.outputs.value }}-darwin-arm64.dmg if-no-files-found: error - name: Upload Yakit(EE) Artifacts Mac(intel) uses: actions/upload-artifact@v4 if: ${{ env.IS_TAG_RELEASE == 'tag/v' || ((env.PACKAGING_PLATFORM == 'mwl' || env.PACKAGING_PLATFORM == 'mac') && env.COMPATIBILITY_MODE == 'normal') }} with: - # CSPG-1.3.4-sp7-darwin-x64.dmg - name: CSPG-${{ steps.package_version.outputs.value }}-darwin-x64.dmg - path: ./release/CSPG-${{ steps.package_version.outputs.value }}-darwin-x64.dmg + # CSG-1.3.4-sp7-darwin-x64.dmg + name: CSG-${{ steps.package_version.outputs.value }}-darwin-x64.dmg + path: ./release/CSG-${{ steps.package_version.outputs.value }}-darwin-x64.dmg if-no-files-found: error - name: Upload Yakit(EE) Artifacts Linux(amd64) uses: actions/upload-artifact@v4 if: ${{ env.IS_TAG_RELEASE == 'tag/v' || ((env.PACKAGING_PLATFORM == 'mwl' || env.PACKAGING_PLATFORM == 'linux') && env.COMPATIBILITY_MODE == 'normal') }} with: - # CSPG-1.3.4-sp7-linux-amd64.AppImage - name: CSPG-${{ steps.package_version.outputs.value }}-linux-amd64.AppImage - path: ./release/CSPG-${{ steps.package_version.outputs.value }}-linux-amd64.AppImage + # CSG-1.3.4-sp7-linux-amd64.AppImage + name: CSG-${{ steps.package_version.outputs.value }}-linux-amd64.AppImage + path: ./release/CSG-${{ steps.package_version.outputs.value }}-linux-amd64.AppImage if-no-files-found: error - name: Upload Yakit(EE) Artifacts Linux(arm64) uses: actions/upload-artifact@v4 if: ${{ env.IS_TAG_RELEASE == 'tag/v' || ((env.PACKAGING_PLATFORM == 'mwl' || env.PACKAGING_PLATFORM == 'linux') && env.COMPATIBILITY_MODE == 'normal') }} with: - # CSPG-1.3.4-sp7-linux-arm64.AppImage - name: CSPG-${{ steps.package_version.outputs.value }}-linux-arm64.AppImage - path: ./release/CSPG-${{ steps.package_version.outputs.value }}-linux-arm64.AppImage + # CSG-1.3.4-sp7-linux-arm64.AppImage + name: CSG-${{ steps.package_version.outputs.value }}-linux-arm64.AppImage + path: ./release/CSG-${{ steps.package_version.outputs.value }}-linux-arm64.AppImage if-no-files-found: error - name: Upload Yakit(EE) Artifacts Legacy Windows uses: actions/upload-artifact@v4 if: ${{ env.IS_TAG_RELEASE == 'tag/v' || ((env.PACKAGING_PLATFORM == 'mwl' || env.PACKAGING_PLATFORM == 'win') && env.COMPATIBILITY_MODE == 'legacy') }} with: - # CSPG-1.3.4-sp7-windows-legacy-amd64.exe - name: CSPG-${{ steps.package_version.outputs.value }}-windows-legacy-amd64.exe - path: ./release/CSPG-${{ steps.package_version.outputs.value }}-windows-legacy-amd64.exe + # CSG-1.3.4-sp7-windows-legacy-amd64.exe + name: CSG-${{ steps.package_version.outputs.value }}-windows-legacy-amd64.exe + path: ./release/CSG-${{ steps.package_version.outputs.value }}-windows-legacy-amd64.exe if-no-files-found: error - name: Upload Yakit(EE) Artifacts Legacy Mac(m1) uses: actions/upload-artifact@v4 if: ${{ env.IS_TAG_RELEASE == 'tag/v' || ((env.PACKAGING_PLATFORM == 'mwl' || env.PACKAGING_PLATFORM == 'mac') && env.COMPATIBILITY_MODE == 'legacy') }} with: - # CSPG-1.3.4-sp7-darwin-legacy-arm64.dmg - name: CSPG-${{ steps.package_version.outputs.value }}-darwin-legacy-arm64.dmg - path: ./release/CSPG-${{ steps.package_version.outputs.value }}-darwin-legacy-arm64.dmg + # CSG-1.3.4-sp7-darwin-legacy-arm64.dmg + name: CSG-${{ steps.package_version.outputs.value }}-darwin-legacy-arm64.dmg + path: ./release/CSG-${{ steps.package_version.outputs.value }}-darwin-legacy-arm64.dmg if-no-files-found: error - name: Upload Yakit(EE) Artifacts Legacy Mac(intel) uses: actions/upload-artifact@v4 if: ${{ env.IS_TAG_RELEASE == 'tag/v' || ((env.PACKAGING_PLATFORM == 'mwl' || env.PACKAGING_PLATFORM == 'mac') && env.COMPATIBILITY_MODE == 'legacy') }} with: - # CSPG-1.3.4-sp7-darwin-legacy-x64.dmg - name: CSPG-${{ steps.package_version.outputs.value }}-darwin-legacy-x64.dmg - path: ./release/CSPG-${{ steps.package_version.outputs.value }}-darwin-legacy-x64.dmg + # CSG-1.3.4-sp7-darwin-legacy-x64.dmg + name: CSG-${{ steps.package_version.outputs.value }}-darwin-legacy-x64.dmg + path: ./release/CSG-${{ steps.package_version.outputs.value }}-darwin-legacy-x64.dmg if-no-files-found: error - name: Upload Yakit(EE) Artifacts Legacy Linux(amd64) uses: actions/upload-artifact@v4 if: ${{ env.IS_TAG_RELEASE == 'tag/v' || ((env.PACKAGING_PLATFORM == 'mwl' || env.PACKAGING_PLATFORM == 'linux') && env.COMPATIBILITY_MODE == 'legacy') }} with: - # CSPG-1.3.4-sp7-linux-legacy-amd64.AppImage - name: CSPG-${{ steps.package_version.outputs.value }}-linux-legacy-amd64.AppImage - path: ./release/CSPG-${{ steps.package_version.outputs.value }}-linux-legacy-amd64.AppImage + # CSG-1.3.4-sp7-linux-legacy-amd64.AppImage + name: CSG-${{ steps.package_version.outputs.value }}-linux-legacy-amd64.AppImage + path: ./release/CSG-${{ steps.package_version.outputs.value }}-linux-legacy-amd64.AppImage if-no-files-found: error - name: Upload Yakit(EE) Artifacts Legacy Linux(arm64) uses: actions/upload-artifact@v4 if: ${{ env.IS_TAG_RELEASE == 'tag/v' || ((env.PACKAGING_PLATFORM == 'mwl' || env.PACKAGING_PLATFORM == 'linux') && env.COMPATIBILITY_MODE == 'legacy') }} with: - # CSPG-1.3.4-sp7-linux-legacy-arm64.AppImage - name: CSPG-${{ steps.package_version.outputs.value }}-linux-legacy-arm64.AppImage - path: ./release/CSPG-${{ steps.package_version.outputs.value }}-linux-legacy-arm64.AppImage + # CSG-1.3.4-sp7-linux-legacy-arm64.AppImage + name: CSG-${{ steps.package_version.outputs.value }}-linux-legacy-arm64.AppImage + path: ./release/CSG-${{ steps.package_version.outputs.value }}-linux-legacy-arm64.AppImage if-no-files-found: error publish_yakit_ee_to_oss: diff --git a/app/renderer/src/main/public/index.html b/app/renderer/src/main/public/index.html index b86dab1cde..46d673caad 100644 --- a/app/renderer/src/main/public/index.html +++ b/app/renderer/src/main/public/index.html @@ -7,7 +7,7 @@ @@ -25,7 +25,7 @@ work correctly both with client-side routing and a non-root public URL. Learn how to configure a non-root public URL by running `npm run build`. --> - CSPG + CSG diff --git a/build/yakit_build.nsh b/build/yakit_build.nsh index fdc6e2b062..403b2020d9 100644 --- a/build/yakit_build.nsh +++ b/build/yakit_build.nsh @@ -109,10 +109,10 @@ FunctionEnd StrCpy $INSTALL_PATH_REG_KEY_NAME "EnpriTraceAgent_InstallPath" StrCpy $EXE_NAME "EnpriTraceAgent" ${Else} - ${StrStr} $0 $EXEFILE "CSPG" + ${StrStr} $0 $EXEFILE "CSG" ${If} $0 != "" ; ee - StrCpy $INSTALL_PATH_REG_KEY_NAME "CSPG_InstallPath" - StrCpy $EXE_NAME "CSPG" + StrCpy $INSTALL_PATH_REG_KEY_NAME "CSG_InstallPath" + StrCpy $EXE_NAME "CSG" ${EndIf} ${EndIf} @@ -131,9 +131,9 @@ FunctionEnd StrCpy $INSTALL_PATH_REG_KEY_NAME "EnpriTraceAgent_InstallPath" StrCpy $EXE_NAME "EnpriTraceAgent" ${Else} - ${If} ${FileExists} `$INSTDIR\CSPG.exe` ; ee - StrCpy $INSTALL_PATH_REG_KEY_NAME "CSPG_InstallPath" - StrCpy $EXE_NAME "CSPG" + ${If} ${FileExists} `$INSTDIR\CSG.exe` ; ee + StrCpy $INSTALL_PATH_REG_KEY_NAME "CSG_InstallPath" + StrCpy $EXE_NAME "CSG" ${EndIf} ${EndIf} diff --git a/multibuilder/electron-builder-ee-legacy.yaml b/multibuilder/electron-builder-ee-legacy.yaml index 0b33d058c6..07bb2ee30a 100644 --- a/multibuilder/electron-builder-ee-legacy.yaml +++ b/multibuilder/electron-builder-ee-legacy.yaml @@ -1,7 +1,7 @@ -appId: "io.yaklang.CSPG" +appId: "io.yaklang.CSG" extraMetadata: - name: cspg -productName: "CSPG" + name: CSG +productName: "CSG" copyright: Copyright © 2021 v1ll4n extraFiles: diff --git a/multibuilder/electron-builder-ee.yaml b/multibuilder/electron-builder-ee.yaml index 125271f441..6ea6fa64ac 100644 --- a/multibuilder/electron-builder-ee.yaml +++ b/multibuilder/electron-builder-ee.yaml @@ -1,7 +1,7 @@ -appId: "io.yaklang.CSPG" +appId: "io.yaklang.CSG" extraMetadata: - name: cspg -productName: "CSPG" + name: CSG +productName: "CSG" copyright: Copyright © 2021 v1ll4n extraFiles: