Skip to content

Commit 14cd00f

Browse files
Muska-AmiMuska-Ami
committed
修复数据提交，更新依赖
1 parent 52a70e3 commit 14cd00f

File tree

22 files changed

+232
-171
lines changed

22 files changed

+232
-171
lines changed

Diff for: ‎RELEASE_CHANGELOG.md

+6-9
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,23 @@
44

55
### GUI
66

7-
- 修复系统托盘问题 #189
8-
- 自动移除不存在的自动启动项目 #179
7+
-/-
98

109
### CLI
1110

12-
- 修复一个错误的 verbose 输出
13-
- 修复一个错误的启动逻辑
14-
- 优化下载返回
11+
-/-
1512

1613
### 其他
1714

18-
#### NyaLCF Env
15+
#### NyaLCF Core
1916

20-
- 禁止输出未找到 `.env` 文件的日志
17+
- 修复 POST 请求数据提交
2118

2219
## 版本信息
2320

2421
- nyalcf_gui: 0.2.3
2522
- nyalcf_cli: 0.0.3
26-
- nyalcf_env: 1.0.1
27-
- nyalcf_core,nyalcf_inject: 1.2.2
23+
- nyalcf_env: 1.0.2
24+
- nyalcf_core,nyalcf_inject: 1.2.3
2825

2926
<!-- Some change log here -->

Diff for: ‎nyalcf_cli/lib/commands/download.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import 'dart:io';
33

44
// Package imports:
55
import 'package:dio/dio.dart';
6-
import 'package:nyalcf/utils/state.dart';
76
import 'package:nyalcf_core/network/dio/frpc/download_frpc.dart';
87
import 'package:nyalcf_core/utils/cpu_arch.dart';
98
import 'package:nyalcf_core/utils/frpc/arch.dart';
@@ -12,6 +11,7 @@ import 'package:nyalcf_core/utils/logger.dart';
1211

1312
// Project imports:
1413
import 'package:nyalcf/templates/command_implement.dart';
14+
import 'package:nyalcf/utils/state.dart';
1515

1616
class Download implements CommandImplement {
1717
List<Map<String, String>> arch = [];

Diff for: ‎nyalcf_cli/pubspec.lock

+33-33
Original file line numberDiff line numberDiff line change
@@ -34,58 +34,58 @@ packages:
3434
dependency: "direct main"
3535
description:
3636
name: args
37-
sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a"
37+
sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6
3838
url: "https://pub.dev"
3939
source: hosted
40-
version: "2.5.0"
40+
version: "2.6.0"
4141
async:
4242
dependency: transitive
4343
description:
4444
name: async
45-
sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
45+
sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
4646
url: "https://pub.dev"
4747
source: hosted
48-
version: "2.11.0"
48+
version: "2.12.0"
4949
boolean_selector:
5050
dependency: transitive
5151
description:
5252
name: boolean_selector
53-
sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
53+
sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea"
5454
url: "https://pub.dev"
5555
source: hosted
56-
version: "2.1.1"
56+
version: "2.1.2"
5757
collection:
5858
dependency: transitive
5959
description:
6060
name: collection
61-
sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
61+
sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
6262
url: "https://pub.dev"
6363
source: hosted
64-
version: "1.19.0"
64+
version: "1.19.1"
6565
convert:
6666
dependency: transitive
6767
description:
6868
name: convert
69-
sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592"
69+
sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68
7070
url: "https://pub.dev"
7171
source: hosted
72-
version: "3.1.1"
72+
version: "3.1.2"
7373
coverage:
7474
dependency: transitive
7575
description:
7676
name: coverage
77-
sha256: c1fb2dce3c0085f39dc72668e85f8e0210ec7de05345821ff58530567df345a5
77+
sha256: "88b0fddbe4c92910fefc09cc0248f5e7f0cd23e450ded4c28f16ab8ee8f83268"
7878
url: "https://pub.dev"
7979
source: hosted
80-
version: "1.9.2"
80+
version: "1.10.0"
8181
crypto:
8282
dependency: transitive
8383
description:
8484
name: crypto
85-
sha256: ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27
85+
sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855"
8686
url: "https://pub.dev"
8787
source: hosted
88-
version: "3.0.5"
88+
version: "3.0.6"
8989
dio:
9090
dependency: "direct main"
9191
description:
@@ -122,10 +122,10 @@ packages:
122122
dependency: transitive
123123
description:
124124
name: file
125-
sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
125+
sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
126126
url: "https://pub.dev"
127127
source: hosted
128-
version: "7.0.0"
128+
version: "7.0.1"
129129
frontend_server_client:
130130
dependency: transitive
131131
description:
@@ -154,10 +154,10 @@ packages:
154154
dependency: transitive
155155
description:
156156
name: http_parser
157-
sha256: "40f592dd352890c3b60fec1b68e786cefb9603e05ff303dbc4dda49b304ecdf4"
157+
sha256: "76d306a1c3afb33fe82e2bbacad62a61f409b5634c915fceb0d799de1a913360"
158158
url: "https://pub.dev"
159159
source: hosted
160-
version: "4.1.0"
160+
version: "4.1.1"
161161
import_sorter:
162162
dependency: "direct dev"
163163
description:
@@ -186,10 +186,10 @@ packages:
186186
dependency: "direct dev"
187187
description:
188188
name: lints
189-
sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290
189+
sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413"
190190
url: "https://pub.dev"
191191
source: hosted
192-
version: "3.0.0"
192+
version: "5.0.0"
193193
logger:
194194
dependency: transitive
195195
description:
@@ -202,10 +202,10 @@ packages:
202202
dependency: transitive
203203
description:
204204
name: logging
205-
sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340"
205+
sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61
206206
url: "https://pub.dev"
207207
source: hosted
208-
version: "1.2.0"
208+
version: "1.3.0"
209209
macros:
210210
dependency: transitive
211211
description:
@@ -259,7 +259,7 @@ packages:
259259
path: "../nyalcf_env"
260260
relative: true
261261
source: path
262-
version: "1.0.0"
262+
version: "1.0.1"
263263
nyalcf_inject:
264264
dependency: "direct main"
265265
description:
@@ -279,10 +279,10 @@ packages:
279279
dependency: transitive
280280
description:
281281
name: path
282-
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
282+
sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
283283
url: "https://pub.dev"
284284
source: hosted
285-
version: "1.9.0"
285+
version: "1.9.1"
286286
pool:
287287
dependency: transitive
288288
description:
@@ -375,10 +375,10 @@ packages:
375375
dependency: transitive
376376
description:
377377
name: string_scanner
378-
sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
378+
sha256: "0bd04f5bb74fcd6ff0606a888a30e917af9bd52820b178eaa464beb11dca84b6"
379379
url: "https://pub.dev"
380380
source: hosted
381-
version: "1.3.0"
381+
version: "1.4.0"
382382
term_glyph:
383383
dependency: transitive
384384
description:
@@ -423,18 +423,18 @@ packages:
423423
dependency: transitive
424424
description:
425425
name: typed_data
426-
sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
426+
sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
427427
url: "https://pub.dev"
428428
source: hosted
429-
version: "1.3.2"
429+
version: "1.4.0"
430430
vm_service:
431431
dependency: transitive
432432
description:
433433
name: vm_service
434-
sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
434+
sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
435435
url: "https://pub.dev"
436436
source: hosted
437-
version: "14.3.0"
437+
version: "14.3.1"
438438
watcher:
439439
dependency: transitive
440440
description:
@@ -479,10 +479,10 @@ packages:
479479
dependency: transitive
480480
description:
481481
name: win32
482-
sha256: "4d45dc9069dba4619dc0ebd93c7cec5e66d8482cb625a370ac806dcc8165f2ec"
482+
sha256: "10169d3934549017f0ae278ccb07f828f9d6ea21573bab0fb77b0e1ef0fce454"
483483
url: "https://pub.dev"
484484
source: hosted
485-
version: "5.5.5"
485+
version: "5.7.2"
486486
win32_registry:
487487
dependency: transitive
488488
description:

Diff for: ‎nyalcf_cli/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ dependencies:
2020
args: ^2.4.2
2121

2222
dev_dependencies:
23-
lints: ^3.0.0
23+
lints: ^5.0.0
2424
test: ^1.24.0
2525
import_sorter: ^4.6.0

Diff for: ‎nyalcf_core/lib/network/dio/auth/login_auth.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ class LoginAuth {
1818
Logger.debug('Post login: $user');
1919
final response = await _instance.post(
2020
'$apiV2Url/auth/login',
21-
queryParameters: {
21+
data: dio.FormData.fromMap({
2222
'username': user,
2323
'password': password,
24-
},
24+
}),
2525
options: dio.Options(
2626
validateStatus: (status) => [200, 403, 404, 500].contains(status),
2727
),

Diff for: ‎nyalcf_core/lib/network/dio/auth/register_auth.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ class RegisterAuth {
2626
Logger.debug('Post register: $user - $email / $verifyCode');
2727
final response = await _instance.post(
2828
'$apiV2Url/auth/register',
29-
queryParameters: {
29+
data: dio.FormData.fromMap({
3030
'username': user,
3131
'password': password,
3232
'email': email,
3333
'verify_code': verifyCode,
3434
'qq_code': qqCode,
35-
},
35+
}),
3636
options: dio.Options(
3737
validateStatus: (status) => [200, 403, 500].contains(status),
3838
),

Diff for: ‎nyalcf_core/lib/network/dio/other/sign_other.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ class OtherSign {
6666
try {
6767
final response = await instance.post(
6868
'$apiV2Url/sign',
69-
queryParameters: {
69+
data: dio.FormData.fromMap({
7070
'username': username,
71-
},
71+
}),
7272
options: dio.Options(
7373
validateStatus: (status) => [200, 403, 500].contains(status),
7474
),

Diff for: ‎nyalcf_core/pubspec.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: nyalcf_core
22
description: 'Nya LoCyanFrp! core module.'
3-
version: 1.2.2
3+
version: 1.2.3
44
homepage: https://nyalcf.1l1.icu
55
publish_to: none
66
# repository: https://github.com/my_org/my_repo
@@ -22,6 +22,6 @@ dependencies:
2222
# path: ^1.8.0
2323

2424
dev_dependencies:
25-
lints: ^3.0.0
25+
lints: ^5.0.0
2626
test: ^1.24.0
2727
import_sorter: ^4.6.0

Diff for: ‎nyalcf_env/pubspec.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: nyalcf_env
22
description: "Nya LoCyanFrp! env module."
3-
version: 1.0.1
3+
version: 1.0.2
44
homepage: https://nyalcf.1l1.icu
55
publish_to: 'none'
66

@@ -13,6 +13,6 @@ dependencies:
1313
# path: ^1.8.0
1414

1515
dev_dependencies:
16-
lints: ^4.0.0
16+
lints: ^5.0.0
1717
test: ^1.24.0
1818
import_sorter: ^4.6.0

Diff for: ‎nyalcf_gui/linux/flutter/generated_plugin_registrant.cc

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
#include <bitsdojo_window_linux/bitsdojo_window_plugin.h>
1010
#include <gtk/gtk_plugin.h>
11-
#include <screen_retriever/screen_retriever_plugin.h>
11+
#include <screen_retriever_linux/screen_retriever_linux_plugin.h>
1212
#include <system_tray/system_tray_plugin.h>
1313
#include <url_launcher_linux/url_launcher_plugin.h>
1414
#include <window_manager/window_manager_plugin.h>
@@ -20,9 +20,9 @@ void fl_register_plugins(FlPluginRegistry* registry) {
2020
g_autoptr(FlPluginRegistrar) gtk_registrar =
2121
fl_plugin_registry_get_registrar_for_plugin(registry, "GtkPlugin");
2222
gtk_plugin_register_with_registrar(gtk_registrar);
23-
g_autoptr(FlPluginRegistrar) screen_retriever_registrar =
24-
fl_plugin_registry_get_registrar_for_plugin(registry, "ScreenRetrieverPlugin");
25-
screen_retriever_plugin_register_with_registrar(screen_retriever_registrar);
23+
g_autoptr(FlPluginRegistrar) screen_retriever_linux_registrar =
24+
fl_plugin_registry_get_registrar_for_plugin(registry, "ScreenRetrieverLinuxPlugin");
25+
screen_retriever_linux_plugin_register_with_registrar(screen_retriever_linux_registrar);
2626
g_autoptr(FlPluginRegistrar) system_tray_registrar =
2727
fl_plugin_registry_get_registrar_for_plugin(registry, "SystemTrayPlugin");
2828
system_tray_plugin_register_with_registrar(system_tray_registrar);

Diff for: ‎nyalcf_gui/linux/flutter/generated_plugins.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
list(APPEND FLUTTER_PLUGIN_LIST
66
bitsdojo_window_linux
77
gtk
8-
screen_retriever
8+
screen_retriever_linux
99
system_tray
1010
url_launcher_linux
1111
window_manager

Diff for: ‎nyalcf_gui/macos/Flutter/GeneratedPluginRegistrant.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import app_links
99
import bitsdojo_window_macos
1010
import package_info_plus
1111
import path_provider_foundation
12-
import screen_retriever
12+
import screen_retriever_macos
1313
import shared_preferences_foundation
1414
import system_tray
1515
import url_launcher_macos
@@ -20,7 +20,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
2020
BitsdojoWindowPlugin.register(with: registry.registrar(forPlugin: "BitsdojoWindowPlugin"))
2121
FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
2222
PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
23-
ScreenRetrieverPlugin.register(with: registry.registrar(forPlugin: "ScreenRetrieverPlugin"))
23+
ScreenRetrieverMacosPlugin.register(with: registry.registrar(forPlugin: "ScreenRetrieverMacosPlugin"))
2424
SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
2525
SystemTrayPlugin.register(with: registry.registrar(forPlugin: "SystemTrayPlugin"))
2626
UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))

0 commit comments

Comments
 (0)