Merge pull request #233 from Muska-Ami/dev

Ver 1.0.1+4
Muska-Ami · Feb 27, 2025 · 5d154f8 · 5d154f8
2 parents 8bfb5b6 + 78ee8d8
commit 5d154f8
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 28 deletions.
diff --git a/RELEASE_CHANGELOG.md b/RELEASE_CHANGELOG.md
@@ -4,14 +4,17 @@
 
 ### GUI
 
-- 修复了无法自动登录的 BUG
-- 修复了访问令牌没有被刷新的 BUG
-- 修复了无法手动签到的 BUG
+-/-
 
 ### CLI
 
 -/-
 
+### Core
+
+- 规范 UA
+- 更新到 LoCyanFrp 0.51.3-9
+
 ## 版本信息
 
 - nyalcf_gui: 1.0.1

diff --git a/nyalcf_cli/bin/nyalcf_cli.dart b/nyalcf_cli/bin/nyalcf_cli.dart
@@ -19,7 +19,7 @@ import 'package:nyalcf/commands/logout.dart';
 import 'package:nyalcf/commands/start.dart';
 import 'package:nyalcf/state.dart';
 
-final version = '1.0.1+1';
+final version = '1.0.1+4';
 
 ArgParser buildParser() {
   return Arguments.all;
@@ -32,7 +32,8 @@ void printUsage(ArgParser argParser) {
 
 void main(List<String> arguments) async {
   /// 加载环境
-  setAppendInfo('CLI v$version an=${Platform.executable}');
+  setAppendInfo('CLI; Name ${Platform.executable}');
+  setVersion(version);
 
   /// 初始化配置文件等
   await PathProvider.loadPath();

diff --git a/nyalcf_cli/lib/commands/download.dart b/nyalcf_cli/lib/commands/download.dart
@@ -67,16 +67,16 @@ class Download implements Command {
           await FrpClient().download(
             architecture: _selectedArch,
             platform: platform,
-            version: '0.51.3-8',
-            name: 'LoCyanFrp-0.51.3-8 #2025020201',
+            version: '0.51.3-9',
+            name: 'LoCyanFrp-0.51.3-9 #2025022501',
             cancelToken: _cancelToken,
             onReceiveProgress: callback,
             onFailed: onFailed,
             useMirror: false,
           );
           Logger.write('Please wait, extracting frpc...');
           await FrpcArchive.extract(
-              platform: platform, arch: _selectedArch, version: '0.51.3-8');
+              platform: platform, arch: _selectedArch, version: '0.51.3-9');
           Logger.info('Success!');
         } else {
           Logger.error(

diff --git a/nyalcf_cli/pubspec.yaml b/nyalcf_cli/pubspec.yaml
@@ -1,6 +1,6 @@
 name: nyalcf
 description: "[CLI]The next generation of LoCyanFrp launcher."
-version: 1.0.1+2
+version: 1.0.1+4
 homepage: https://nyalcf.1l1.icu
 publish_to: none
 # repository: https://github.com/my_org/my_repo

diff --git a/nyalcf_core/lib/network/basic_config.dart b/nyalcf_core/lib/network/basic_config.dart
@@ -8,13 +8,9 @@ import 'package:nyalcf_inject/nyalcf_inject.dart';
 
 BaseOptions baseOptions = BaseOptions(
   headers: {
-    'User-Agent': 'Nya.LoCyanFrp'
-        '/'
-        '$appendInfo'
-        ' '
-        'host=${Platform.operatingSystem}'
-        '/'
-        '${Platform.operatingSystemVersion}',
+    'User-Agent': 'Nya LoCyanFrp/$version'
+        '$appendInfo; '
+        '${Platform.operatingSystem}',
   },
 );
 final apiV2Url = ENV_UNIVERSAL_API_URL ?? 'https://api.locyanfrp.cn/v2';

diff --git a/nyalcf_core/lib/storages/configurations/frpc_configuration_storage.dart b/nyalcf_core/lib/storages/configurations/frpc_configuration_storage.dart
@@ -14,7 +14,7 @@ class FrpcConfigurationStorage extends JsonConfiguration {
   @override
   Map<String, dynamic> get defConfig => {
         'settings': {
-          'frpc_version': '0.51.3-8',
+          'frpc_version': '0.51.3-9',
           'frpc_download_mirror': true,
           'frpc_download_mirror_id': 'muska-github-mirror',
         },

diff --git a/nyalcf_gui/lib/main.dart b/nyalcf_gui/lib/main.dart
@@ -49,7 +49,8 @@ void main() async {
 
   /// 设置 HTTP 请求附加信息
   setAppendInfo(
-      'v${Universe.appVersion}(+${Universe.appBuildNumber}) an=${Universe.appName}');
+      'GUI; Build ${Universe.appBuildNumber}; Name ${Universe.appName}');
+  setVersion(Universe.appVersion);
 
   /// 初始化配置文件等
   await PathProvider.loadSyncPath();
@@ -59,6 +60,7 @@ void main() async {
 
   /// 初始化 Logger
   await Logger.init();
+  Logger.debug(Platform.operatingSystem);
 
   /// 自动旧版迁移数据
   final appSupportParentPath = Directory(appSupportPath!).parent.parent.path;

diff --git a/nyalcf_gui/nyalcf_ui/lib/models/frpc_download_dialog.dart b/nyalcf_gui/nyalcf_ui/lib/models/frpc_download_dialog.dart
@@ -49,8 +49,8 @@ Widget frpcDownloadDialog(BuildContext context) {
                   architecture: _fsCtr.arch[_fsCtr.frpcDownloadArch.value]
                       ['arch'],
                   platform: _fsCtr.platform,
-                  version: '0.51.3-8',
-                  name: 'LoCyanFrp-0.51.3-8 #2025020201',
+                  version: '0.51.3-9',
+                  name: 'LoCyanFrp-0.51.3-9 #2025022501',
                   useMirror: _fcs.getSettingsFrpcDownloadMirror(),
                   mirrorId: mirror.isNotEmpty ? mirror : null,
                   cancelToken: FrpcSettingController.downloadCancelToken,
@@ -61,13 +61,13 @@ Widget frpcDownloadDialog(BuildContext context) {
                   final resExtract = FrpcArchive.extract(
                     platform: _fsCtr.platform,
                     arch: _fsCtr.arch[_fsCtr.frpcDownloadArch.value]['arch'],
-                    version: '0.51.3-8',
+                    version: '0.51.3-9',
                   );
                   if (await resExtract) {
                     Get.close(0);
                     Get.close(0);
-                    _fcs.setSettingsFrpcVersion('0.51.3-8');
-                    _fcs.addInstalledVersion('0.51.3-8');
+                    _fcs.setSettingsFrpcVersion('0.51.3-9');
+                    _fcs.addInstalledVersion('0.51.3-9');
                     _fcs.save();
                     _fsCtr.load();
                   }

diff --git a/nyalcf_gui/pubspec.yaml b/nyalcf_gui/pubspec.yaml
@@ -1,6 +1,6 @@
 name: nyalcf
 description: "[GUI]The next generation of LoCyanFrp launcher."
-version: 1.0.1+3
+version: 1.0.1+4
 homepage: https://nyalcf.1l1.icu
 publish_to: 'none'
 

diff --git a/nyalcf_inject/lib/src/app_info_provider.dart b/nyalcf_inject/lib/src/app_info_provider.dart
@@ -1,5 +1,5 @@
-String appendInfo = "Unknown";
+String appendInfo = "unknown";
+String version = "unknown";
 
-void setAppendInfo(value) {
-  appendInfo = value;
-}
+void setAppendInfo(String value) => appendInfo = value;
+void setVersion(String value) => version = value;