diff --git a/.github/workflows/yakit-ee.yml b/.github/workflows/yakit-ee.yml index e2190564d6..239ec7a56d 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 (EnpriTrace && EnpriTraceAgent)" + name: "Download CVE(Include CWE) Data (CSPG && 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 (EnpriTrace && EnpriTraceAgent)" + name: "Download Plugin resource Files (CSPG && EnpriTraceAgent)" - run: yarn install && yarn install-render working-directory: ./ @@ -162,97 +162,97 @@ jobs: - name: View Published Content run: ls ./release - # EnpriTrace-1.3.4-sp7-darwin-arm64.dmg - # EnpriTrace-1.3.4-sp7-darwin-x64.dmg - # EnpriTrace-1.3.4-sp7-linux-amd64.AppImage - # EnpriTrace-1.3.4-sp7-linux-arm64.AppImage - # EnpriTrace-1.3.4-sp7-windows-amd64.exe - # EnpriTrace-1.3.4-sp7-darwin-legacy-arm64.dmg - # EnpriTrace-1.3.4-sp7-darwin-legacy-x64.dmg - # EnpriTrace-1.3.4-sp7-linux-legacy-amd64.AppImage - # EnpriTrace-1.3.4-sp7-linux-legacy-arm64.AppImage - # EnpriTrace-1.3.4-sp7-windows-legacy-amd64.exe + # 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 - 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: - # EnpriTrace-1.3.4-sp7-windows-amd64.exe - name: EnpriTrace-${{ steps.package_version.outputs.value }}-windows-amd64.exe - path: ./release/EnpriTrace-${{ steps.package_version.outputs.value }}-windows-amd64.exe + # 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 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: - # EnpriTrace-1.3.4-sp7-darwin-arm64.dmg - name: EnpriTrace-${{ steps.package_version.outputs.value }}-darwin-arm64.dmg - path: ./release/EnpriTrace-${{ steps.package_version.outputs.value }}-darwin-arm64.dmg + # 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 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: - # EnpriTrace-1.3.4-sp7-darwin-x64.dmg - name: EnpriTrace-${{ steps.package_version.outputs.value }}-darwin-x64.dmg - path: ./release/EnpriTrace-${{ steps.package_version.outputs.value }}-darwin-x64.dmg + # 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 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: - # EnpriTrace-1.3.4-sp7-linux-amd64.AppImage - name: EnpriTrace-${{ steps.package_version.outputs.value }}-linux-amd64.AppImage - path: ./release/EnpriTrace-${{ steps.package_version.outputs.value }}-linux-amd64.AppImage + # 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 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: - # EnpriTrace-1.3.4-sp7-linux-arm64.AppImage - name: EnpriTrace-${{ steps.package_version.outputs.value }}-linux-arm64.AppImage - path: ./release/EnpriTrace-${{ steps.package_version.outputs.value }}-linux-arm64.AppImage + # 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 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: - # EnpriTrace-1.3.4-sp7-windows-legacy-amd64.exe - name: EnpriTrace-${{ steps.package_version.outputs.value }}-windows-legacy-amd64.exe - path: ./release/EnpriTrace-${{ steps.package_version.outputs.value }}-windows-legacy-amd64.exe + # 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 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: - # EnpriTrace-1.3.4-sp7-darwin-legacy-arm64.dmg - name: EnpriTrace-${{ steps.package_version.outputs.value }}-darwin-legacy-arm64.dmg - path: ./release/EnpriTrace-${{ steps.package_version.outputs.value }}-darwin-legacy-arm64.dmg + # 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 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: - # EnpriTrace-1.3.4-sp7-darwin-legacy-x64.dmg - name: EnpriTrace-${{ steps.package_version.outputs.value }}-darwin-legacy-x64.dmg - path: ./release/EnpriTrace-${{ steps.package_version.outputs.value }}-darwin-legacy-x64.dmg + # 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 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: - # EnpriTrace-1.3.4-sp7-linux-legacy-amd64.AppImage - name: EnpriTrace-${{ steps.package_version.outputs.value }}-linux-legacy-amd64.AppImage - path: ./release/EnpriTrace-${{ steps.package_version.outputs.value }}-linux-legacy-amd64.AppImage + # 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 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: - # EnpriTrace-1.3.4-sp7-linux-legacy-arm64.AppImage - name: EnpriTrace-${{ steps.package_version.outputs.value }}-linux-legacy-arm64.AppImage - path: ./release/EnpriTrace-${{ steps.package_version.outputs.value }}-linux-legacy-arm64.AppImage + # 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 if-no-files-found: error publish_yakit_ee_to_oss: diff --git a/app/assets/yakiteelogo.icns b/app/assets/yakiteelogo.icns index b5b2318ccc..ec92e6e4ef 100644 Binary files a/app/assets/yakiteelogo.icns and b/app/assets/yakiteelogo.icns differ diff --git a/app/assets/yakiteelogo.ico b/app/assets/yakiteelogo.ico index afe558c45a..9898d93c6f 100644 Binary files a/app/assets/yakiteelogo.ico and b/app/assets/yakiteelogo.ico differ diff --git a/app/assets/yakiteelogo.png b/app/assets/yakiteelogo.png new file mode 100644 index 0000000000..b14a8378df Binary files /dev/null and b/app/assets/yakiteelogo.png differ diff --git a/app/assets/yakitlogo.pic.jpg b/app/assets/yakitlogo.pic.jpg index c2388d922d..9683930837 100644 Binary files a/app/assets/yakitlogo.pic.jpg and b/app/assets/yakitlogo.pic.jpg differ diff --git a/app/renderer/src/main/src/NewApp.tsx b/app/renderer/src/main/src/NewApp.tsx index 850d8eae15..37ecb99c57 100644 --- a/app/renderer/src/main/src/NewApp.tsx +++ b/app/renderer/src/main/src/NewApp.tsx @@ -306,7 +306,7 @@ function NewApp() { } }, [userInfo.isLogin]) - if (!agreed) { + if (false) { return ( <>
diff --git a/app/renderer/src/main/src/assets/yakit.jpg b/app/renderer/src/main/src/assets/yakit.jpg index c2388d922d..9683930837 100644 Binary files a/app/renderer/src/main/src/assets/yakit.jpg and b/app/renderer/src/main/src/assets/yakit.jpg differ diff --git a/app/renderer/src/main/src/assets/yakitEE.png b/app/renderer/src/main/src/assets/yakitEE.png index ab107452e3..9683930837 100644 Binary files a/app/renderer/src/main/src/assets/yakitEE.png and b/app/renderer/src/main/src/assets/yakitEE.png differ diff --git a/app/renderer/src/main/src/assets/yakitFontEE.png b/app/renderer/src/main/src/assets/yakitFontEE.png index c3f7f1ee98..f16ce54cfc 100644 Binary files a/app/renderer/src/main/src/assets/yakitFontEE.png and b/app/renderer/src/main/src/assets/yakitFontEE.png differ diff --git a/app/renderer/src/main/src/assets/yakitLogo.png b/app/renderer/src/main/src/assets/yakitLogo.png index d0775e587b..9683930837 100644 Binary files a/app/renderer/src/main/src/assets/yakitLogo.png and b/app/renderer/src/main/src/assets/yakitLogo.png differ diff --git a/app/renderer/src/main/src/components/layout/FuncDomain.tsx b/app/renderer/src/main/src/components/layout/FuncDomain.tsx index ead27c57b2..6f19f2b83e 100644 --- a/app/renderer/src/main/src/components/layout/FuncDomain.tsx +++ b/app/renderer/src/main/src/components/layout/FuncDomain.tsx @@ -466,14 +466,14 @@ export const FuncDomain: React.FC