Skip to content

Commit

Permalink
feat:
Browse files Browse the repository at this point in the history
1、图标替换&删除部分Yak&Yakit文字
2、屏蔽更新通知小铃铛
3、项目名居中
4、ci企业版Enterprise->CSPG
5、屏蔽License验证
6、屏蔽用户协议
7、屏蔽部分更新提示
  • Loading branch information
song-xiao-lin committed Dec 9, 2024
1 parent 5cbd9f0 commit 93a80b0
Show file tree
Hide file tree
Showing 27 changed files with 73 additions and 72 deletions.
84 changes: 42 additions & 42 deletions .github/workflows/yakit-ee.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: ./
Expand Down Expand Up @@ -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:
Expand Down
Binary file modified app/assets/yakiteelogo.icns
Binary file not shown.
Binary file modified app/assets/yakiteelogo.ico
Binary file not shown.
Binary file added app/assets/yakiteelogo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/assets/yakitlogo.pic.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion app/renderer/src/main/src/NewApp.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ function NewApp() {
}
}, [userInfo.isLogin])

if (!agreed) {
if (false) {
return (
<>
<div className={styles["yakit-mask-drag-wrapper"]}></div>
Expand Down
Binary file modified app/renderer/src/main/src/assets/yakit.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/renderer/src/main/src/assets/yakitEE.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/renderer/src/main/src/assets/yakitFontEE.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/renderer/src/main/src/assets/yakitLogo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions app/renderer/src/main/src/components/layout/FuncDomain.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -466,14 +466,14 @@ export const FuncDomain: React.FC<FuncDomainProp> = React.memo((props) => {
</div>
<div className={styles["state-setting-wrapper"]}>
{!showProjectManage && <UIOpRisk isEngineLink={isEngineLink} />}
{!isEnpriTraceAgent() && (
{/* {!isEnpriTraceAgent() && (
<UIOpNotice
isEngineLink={isEngineLink}
isRemoteMode={isRemoteMode}
onYakEngineVersionList={onYakEngineVersionList}
onLogin={()=>setLoginShow(true)}
/>
)}
)} */}
{!showProjectManage && (
<UIOpSetting
engineMode={engineMode}
Expand Down
4 changes: 2 additions & 2 deletions app/renderer/src/main/src/components/layout/GlobalState.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ export const GlobalState: React.FC<GlobalReverseStateProp> = React.memo((props)
updatePcap(),
updateChromePath(),
updateMITMCert(),
getCurrentYak()
// getCurrentYak()
]
: [
updateSystemProxy(),
Expand All @@ -365,7 +365,7 @@ export const GlobalState: React.FC<GlobalReverseStateProp> = React.memo((props)
updatePluginTotal(),
updateChromePath(),
updateMITMCert(),
getCurrentYak()
// getCurrentYak()
]
)
.then((values) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {LocalGVS} from "@/enums/localGlobal"
import {getLocalValue} from "@/utils/kv"
import {useMemoizedFn} from "ahooks"
import {getRandomLocalEnginePort} from "../WelcomeConsoleUtil"
import {isEnpriTraceAgent} from "@/utils/envfile"
import {isEnpriTrace, isEnpriTraceAgent} from "@/utils/envfile"
import {failed, info, yakitNotify} from "@/utils/notification"
import {YakitHint} from "@/components/yakitUI/YakitHint/YakitHint"
import {UpdateYakitAndYaklang} from "../update/UpdateYakitAndYaklang"
Expand Down Expand Up @@ -106,7 +106,7 @@ export const LocalEngine: React.FC<LocalEngineProps> = memo(
// 开发环境不做版本检测和 hash 检测
handleFetchYakitAndYaklangLocalVersion(
isDevRef.current ? undefined : handleFetchYakitAndYaklangLatestVersion,
!isDevRef.current
false
)
}, 500)
})
Expand Down Expand Up @@ -265,8 +265,8 @@ export const LocalEngine: React.FC<LocalEngineProps> = memo(
}, [])

const handleFetchYakitAndYaklangLatestVersion = useMemoizedFn(() => {
if (isEnpriTraceAgent()) {
// SE版本不检查更新
if (isEnpriTraceAgent() || isEnpriTrace()) {
// SE、EE版本不检查更新
preventUpdateHint.current = true
return
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ const UIEngineList: React.FC<UIEngineListProp> = React.memo((props) => {
<div ref={listRef} className={styles["ui-engine-list-wrapper"]}>
<div className={styles["ui-engine-list-body"]}>
<div className={styles["engine-list-header"]}>
本地 Yak 进程管理
本地 进程管理
<YakitPopconfirm
title={"重置引擎版本会恢复最初引擎出厂版本,同时强制重启"}
onConfirm={async () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ export const RemoteEngine: React.FC<RemoteEngineProps> = React.memo((props) => {
<div className={styles["rmeote-divider"]}></div>
<div className={styles["remote-info"]}>
<Form colon={false} labelAlign='right' labelCol={{span: 8}}>
<Form.Item label='Yak gRPC 主机地址:' required={true}>
<Form.Item label='gRPC 主机地址:' required={true}>
<YakitInput
className={classNames(styles["input-style"], {
[styles["error-border"]]: isCheck && !remote.host
Expand All @@ -166,7 +166,7 @@ export const RemoteEngine: React.FC<RemoteEngineProps> = React.memo((props) => {
onChange={(e) => setRemote({...remote, host: e.target.value})}
/>
</Form.Item>
<Form.Item label='Yak gRPC 端口:' required={true}>
<Form.Item label='gRPC 端口:' required={true}>
<YakitInput
className={classNames(styles["input-style"], {
[styles["error-border"]]: isCheck && !remote.port
Expand Down
3 changes: 2 additions & 1 deletion app/renderer/src/main/src/components/layout/UILayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -886,6 +886,7 @@ const UILayout: React.FC<UILayoutProp> = (props) => {
const [currentVersion, setCurrentVersion] = useState<string>("")

const showCheckVersion = useMemo(() => {
return false
if (isDev.current) return false
if (!builtInVersion) return false
if (!currentVersion) return false
Expand Down Expand Up @@ -1005,7 +1006,7 @@ const UILayout: React.FC<UILayoutProp> = (props) => {

/** ---------- EE版-license Start ---------- */
// 企业版-连接引擎后验证license=>展示企业登录
const [isJudgeLicense, setJudgeLicense] = useState<boolean>(isEnterpriseEdition())
const [isJudgeLicense, setJudgeLicense] = useState<boolean>(false)
useEffect(() => {
// 用户退出 - 验证license=>展示企业登录
ipcRenderer.on("again-judge-license-login", () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
position: absolute;
top: 0;
left: 50%;
transform: translate(-30px, 0);
transform: translate(-50%, 0);
line-height: 36px;
font-weight: 600;
color: var(--yakit-header-color);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -711,7 +711,7 @@ export const QuestionModal: React.FC<AgrAndQSModalProps> = React.memo((props) =>
</div>
)}
</div>
<span>Yak 核心引擎下载链接</span>
<span>核心引擎下载链接</span>
</div>
) : (
<div
Expand All @@ -722,7 +722,7 @@ export const QuestionModal: React.FC<AgrAndQSModalProps> = React.memo((props) =>
onMouseOut={() => setDisabled(true)}
onMouseDown={() => setIsTop(2)}
>
<span className={styles["header-title"]}>Yak 核心引擎下载链接</span>
<span className={styles["header-title"]}>核心引擎下载链接</span>
<div className={styles["close-wrapper"]} onClick={() => setVisible(false)}>
<WinUIOpCloseSvgIcon className={styles["icon-style"]} />
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
overflow: hidden;

.navbar-logo {
width: 101px;
width: 106px;
height: 32px;
svg {
width: 101px;
width: 106px;
height: 32px;
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/renderer/src/main/src/utils/ConfigEngineProxy.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export const ConfigEngineProxy: React.FC<ConfigEngineProxyProp> = (props) => {
<Button type={"link"} icon={<ReloadOutlined/>} onClick={update}/>
</Space>
<div>
本配置将会对绝大部分 Yak 插件自动生效,如果在扫描模块中配置代理,一般来说,配置的代理将会自动覆盖这个配置。
本配置将会对绝大部分插件自动生效,如果在扫描模块中配置代理,一般来说,配置的代理将会自动覆盖这个配置。
</div>
</Space>
</>}
Expand Down
2 changes: 1 addition & 1 deletion app/renderer/src/main/src/utils/basic.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ export const ConfigGlobalReverse = React.memo(() => {
}}
icon={<RefreshIcon />}
>
更新 yak 引擎本地 IP
更新引擎本地 IP
</YakitButton>
</div>
}
Expand Down
Binary file modified bins/staticEE/yakit.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified bins/staticEE/yakitEE.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified bins/staticEE/yakitFontEE.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 93a80b0

Please sign in to comment.