Compare commits

...

2 Commits

Author SHA1 Message Date
sepakeloudest 91185a593a Revert "feat: 修改win的配置"
Build Windows / 编译 libcore (Windows) (20.15.1) (push) Successful in 20m11s
Build Windows / build (push) Has been cancelled
This reverts commit d99f588a5b.
2025-11-20 19:22:45 -08:00
sepakeloudest d6386ecfa9 Revert "feat: ai修改win 名称信息"
This reverts commit bcb4d17236.
2025-11-20 19:21:17 -08:00
14 changed files with 46 additions and 46 deletions
+5 -5
View File
@@ -4,12 +4,12 @@ echo 📋 复制 libcore 文件...
:: 创建目标目录 :: 创建目标目录
mkdir libcore\bin >nul 2>&1 mkdir libcore\bin >nul 2>&1
:: 查找并复制 HiddifyCli.exe,重命名为 CLI 可执行文件 :: 查找并复制 HiddifyCli.exe,重命名为 BearVPNCli.exe
for /r %%f in (HiddifyCli.exe) do ( for /r %%f in (HiddifyCli.exe) do (
if exist "%%f" ( if exist "%%f" (
echo ✅ 找到 HiddifyCli.exe: %%f echo ✅ 找到 HiddifyCli.exe: %%f
echo 📝 复制并重命名为 HiFastVPNCli.exe echo 📝 复制并重命名为 BearVPNCli.exe
copy "%%f" libcore\bin\HiFastVPNCli.exe copy "%%f" libcore\bin\BearVPNCli.exe
echo ✅ 重命名完成 echo ✅ 重命名完成
goto :dll goto :dll
) )
@@ -32,7 +32,7 @@ echo.
echo 📄 验证文件: echo 📄 验证文件:
if exist libcore\bin ( if exist libcore\bin (
dir libcore\bin dir libcore\bin
if exist libcore\bin\HiFastVPNCli.exe ( if exist libcore\bin\BearVPNCli.exe (
if exist libcore\bin\libcore.dll ( if exist libcore\bin\libcore.dll (
echo ✅ 验证成功:所有文件已正确复制 echo ✅ 验证成功:所有文件已正确复制
exit /b 0 exit /b 0
@@ -41,7 +41,7 @@ if exist libcore\bin (
exit /b 1 exit /b 1
) )
) else ( ) else (
echo ❌ 验证失败:HiFastVPNCli.exe 不存在 echo ❌ 验证失败:BearVPNCli.exe 不存在
exit /b 1 exit /b 1
) )
) else ( ) else (
+2 -2
View File
@@ -1,5 +1,5 @@
name: HiFastVPN name: BearVPN
app_name: HiFastVPN app_name: BearVPN
version: 1.0.0 version: 1.0.0
build_number: 1 build_number: 1
targets: targets:
+1 -1
View File
@@ -45,7 +45,7 @@ class KRWindowManager with WindowListener, TrayListener {
// 确保在 Windows 下正确设置窗口属性 // 确保在 Windows 下正确设置窗口属性
if (Platform.isWindows) { if (Platform.isWindows) {
await windowManager.setTitleBarStyle(TitleBarStyle.normal); await windowManager.setTitleBarStyle(TitleBarStyle.normal);
await windowManager.setTitle('Hi快VPN'); await windowManager.setTitle('BearVPN');
await windowManager.setSize(const Size(800, 668)); await windowManager.setSize(const Size(800, 668));
await windowManager.setMinimumSize(const Size(800, 668)); await windowManager.setMinimumSize(const Size(800, 668));
await windowManager.center(); await windowManager.center();
+1 -1
View File
@@ -114,7 +114,7 @@ install(FILES "../libcore/bin/lib/libcore.so" DESTINATION "${INSTALL_BUNDLE_LIB_
install( install(
FILES "../libcore/bin/HiddifyCli" FILES "../libcore/bin/HiddifyCli"
DESTINATION "${CMAKE_INSTALL_PREFIX}" DESTINATION "${CMAKE_INSTALL_PREFIX}"
COMPONENT Runtime RENAME HiFastVPNCli COMPONENT Runtime RENAME BearVPNCli
) )
install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}"
+3 -3
View File
@@ -7,7 +7,7 @@ export LD_LIBRARY_PATH=usr/lib
show_help() { show_help() {
cat << EOF cat << EOF
Usage: ${0##*/} ... Usage: ${0##*/} ...
start Hiddify or HiFastVPNCli, when no parameter is given, Hiddify is executed. start Hiddify or BearVPNCli, when no parameter is given, Hiddify is executed.
-v show version -v show version
EOF EOF
} }
@@ -30,8 +30,8 @@ else
# processing arguments # processing arguments
case $1 in case $1 in
HiFastVPNCli) BearVPNCli)
exec ./HiFastVPNCli ${@:3} exec ./BearVPNCli ${@:3}
exit 0 exit 0
;; ;;
h) h)
+1 -1
View File
@@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# HiFastVPN macOS 公证脚本 # BearVPN macOS 公证脚本
# 作者: AI Assistant # 作者: AI Assistant
set -e set -e
+1 -1
View File
@@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# HiFastVPN macOS 签名、公证和打包脚本 # BearVPN macOS 签名、公证和打包脚本
# 作者: AI Assistant # 作者: AI Assistant
# 日期: $(date) # 日期: $(date)
+1 -1
View File
@@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# HiFastVPN macOS 签名和打包脚本 # BearVPN macOS 签名和打包脚本
# 作者: AI Assistant # 作者: AI Assistant
# 日期: $(date) # 日期: $(date)
+8 -8
View File
@@ -1,6 +1,6 @@
# Project-level configuration. # Project-level configuration.
cmake_minimum_required(VERSION 3.14) cmake_minimum_required(VERSION 3.14)
project(HiFastVPN LANGUAGES CXX) project(BearVPN LANGUAGES CXX)
# 设置 CMake 策略以兼容旧版本插件 # 设置 CMake 策略以兼容旧版本插件
# CMP0175: add_custom_command() 拒绝无效参数(用于兼容 flutter_inappwebview_windows 插件) # CMP0175: add_custom_command() 拒绝无效参数(用于兼容 flutter_inappwebview_windows 插件)
@@ -22,7 +22,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /FS")
# The name of the executable created for the application. Change this to change # The name of the executable created for the application. Change this to change
# the on-disk name of your application. # the on-disk name of your application.
set(BINARY_NAME "HiFastVPN") set(BINARY_NAME "BearVPN")
# Explicitly opt in to modern CMake behaviors to avoid warnings with recent # Explicitly opt in to modern CMake behaviors to avoid warnings with recent
# versions of CMake. # versions of CMake.
@@ -100,7 +100,7 @@ endif()
set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data")
set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}") set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}")
# CLI 工具目录(用于存放 HiFastVPNCli.exe # CLI 工具目录(用于存放 BearVPNCli.exe
set(INSTALL_BUNDLE_CLI_DIR "${CMAKE_INSTALL_PREFIX}/cli") set(INSTALL_BUNDLE_CLI_DIR "${CMAKE_INSTALL_PREFIX}/cli")
install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}"
@@ -112,16 +112,16 @@ install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}
install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
COMPONENT Runtime) COMPONENT Runtime)
# 安装 libcore.dll 到可执行文件目录(与 HiFastVPN.exe 同级) # 安装 libcore.dll 到可执行文件目录(与 BearVPN.exe 同级)
install(FILES "../libcore/bin/libcore.dll" install(FILES "../libcore/bin/libcore.dll"
DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
COMPONENT Runtime COMPONENT Runtime
OPTIONAL) OPTIONAL)
# 安装 HiFastVPNCli.exe(从 libcore/bin 复制并重命名) # 安装 BearVPNCli.exe(从 libcore/bin 复制并重命名)
# 注意:libcore 编译的是 HiddifyCli.exe,打包脚本会重命名为HiFastVPNCli.exe # 注意:libcore 编译的是 HiddifyCli.exe,打包脚本会自动重命名为 BearVPNCli.exe
# 这里需要安装 HiFastVPNCli.exe,因为它已经被重命名了 # 这里需要安装 BearVPNCli.exe,因为它已经被重命名了
install(FILES "../libcore/bin/HiFastVPNCli.exe" install(FILES "../libcore/bin/BearVPNCli.exe"
DESTINATION "${CMAKE_INSTALL_PREFIX}" DESTINATION "${CMAKE_INSTALL_PREFIX}"
COMPONENT Runtime COMPONENT Runtime
OPTIONAL) OPTIONAL)
+3 -3
View File
@@ -68,8 +68,8 @@ function InitializeSetup(): Boolean;
var var
ResultCode: Integer; ResultCode: Integer;
begin begin
Exec('taskkill', '/F /IM HiFastVPN.exe', '', SW_HIDE, ewWaitUntilTerminated, ResultCode) Exec('taskkill', '/F /IM BearVPN.exe', '', SW_HIDE, ewWaitUntilTerminated, ResultCode)
Exec('net', 'stop "HiFastVPNTunnelService"', '', SW_HIDE, ewWaitUntilTerminated, ResultCode) Exec('net', 'stop "BearVPNTunnelService"', '', SW_HIDE, ewWaitUntilTerminated, ResultCode)
Exec('sc.exe', 'delete "HiFastVPNTunnelService"', '', SW_HIDE, ewWaitUntilTerminated, ResultCode) Exec('sc.exe', 'delete "BearVPNTunnelService"', '', SW_HIDE, ewWaitUntilTerminated, ResultCode)
Result := True; Result := True;
end; end;
+5 -5
View File
@@ -1,11 +1,11 @@
app_id: 6L903538-42B1-4596-G479-BJ779F21A65E app_id: 6L903538-42B1-4596-G479-BJ779F21A65E
publisher: HiFastVPN publisher: BearVPN
publisher_url: https://github.com/hiddify/hiddify-next publisher_url: https://github.com/hiddify/hiddify-next
display_name: Hi快VPN display_name: BearVPN
executable_name: HiFastVPN.exe executable_name: BearVPN.exe
output_base_file_name: HiFastVPN.exe output_base_file_name: BearVPN.exe
create_desktop_icon: true create_desktop_icon: true
install_dir_name: "{autopf64}\\HiFastVPN" install_dir_name: "{autopf64}\\BearVPN"
setup_icon_file: ..\..\windows\runner\resources\app_icon.ico setup_icon_file: ..\..\windows\runner\resources\app_icon.ico
locales: locales:
- ar - ar
+6 -6
View File
@@ -89,13 +89,13 @@ BEGIN
BEGIN BEGIN
BLOCK "040904e4" BLOCK "040904e4"
BEGIN BEGIN
VALUE "CompanyName", "HiFastVPN" "\0" VALUE "CompanyName", "BearVPN" "\0"
VALUE "FileDescription", "HiFastVPN" "\0" VALUE "FileDescription", "BearVPN" "\0"
VALUE "FileVersion", VERSION_AS_STRING "\0" VALUE "FileVersion", VERSION_AS_STRING "\0"
VALUE "InternalName", "HiFastVPN" "\0" VALUE "InternalName", "app.baer.com" "\0"
VALUE "LegalCopyright", "Copyright (C) 2024 HiFastVPN. All rights reserved." "\0" VALUE "LegalCopyright", "Copyright (C) 2024 BearVPN. All rights reserved." "\0"
VALUE "OriginalFilename", "HiFastVPN.exe" "\0" VALUE "OriginalFilename", "BearVPN.exe" "\0"
VALUE "ProductName", "HiFastVPN" "\0" VALUE "ProductName", "BearVPN" "\0"
VALUE "ProductVersion", VERSION_AS_STRING "\0" VALUE "ProductVersion", VERSION_AS_STRING "\0"
END END
END END
+4 -4
View File
@@ -9,15 +9,15 @@
int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev,
_In_ wchar_t *command_line, _In_ int show_command) { _In_ wchar_t *command_line, _In_ int show_command) {
HANDLE hMutexInstance = CreateMutex(NULL, TRUE, L"HiFastVPNMutex"); HANDLE hMutexInstance = CreateMutex(NULL, TRUE, L"BearVPNMutex");
HWND handle = FindWindowA(NULL, "HiFastVPN"); HWND handle = FindWindowA(NULL, "BearVPN");
if (GetLastError() == ERROR_ALREADY_EXISTS) { if (GetLastError() == ERROR_ALREADY_EXISTS) {
flutter::DartProject project(L"data"); flutter::DartProject project(L"data");
std::vector<std::string> command_line_arguments = GetCommandLineArguments(); std::vector<std::string> command_line_arguments = GetCommandLineArguments();
project.set_dart_entrypoint_arguments(std::move(command_line_arguments)); project.set_dart_entrypoint_arguments(std::move(command_line_arguments));
FlutterWindow window(project); FlutterWindow window(project);
if (window.SendAppLinkToInstance(L"HiFastVPN")) { if (window.SendAppLinkToInstance(L"BearVPN")) {
return false; return false;
} }
@@ -47,7 +47,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev,
FlutterWindow window(project); FlutterWindow window(project);
Win32Window::Point origin(10, 10); Win32Window::Point origin(10, 10);
Win32Window::Size size(1280, 720); Win32Window::Size size(1280, 720);
if (!window.Create(L"HiFastVPN", origin, size)) { if (!window.Create(L"BearVPN", origin, size)) {
return EXIT_FAILURE; return EXIT_FAILURE;
} }
window.SetQuitOnClose(true); window.SetQuitOnClose(true);
+4 -4
View File
@@ -1,7 +1,7 @@
#define MyAppName "Hi快VPN" #define MyAppName "Kaer VPN"
#define MyAppVersion "1.0.0" #define MyAppVersion "1.0.0"
#define MyAppPublisher "HiFastVPN" #define MyAppPublisher "Kaer"
#define MyAppExeName "HiFastVPN.exe" #define MyAppExeName "kaer_vpn.exe"
[Setup] [Setup]
AppId={{YOUR-APP-ID-HERE} AppId={{YOUR-APP-ID-HERE}
@@ -11,7 +11,7 @@ AppPublisher={#MyAppPublisher}
DefaultDirName={autopf}\{#MyAppName} DefaultDirName={autopf}\{#MyAppName}
DefaultGroupName={#MyAppName} DefaultGroupName={#MyAppName}
OutputDir=installer OutputDir=installer
OutputBaseFilename=HiFastVPN_Setup OutputBaseFilename=BearVPN_Setup
Compression=lzma Compression=lzma
SolidCompression=yes SolidCompression=yes
WizardStyle=modern WizardStyle=modern