diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php index 2c040d2e..222cb601 100644 --- a/app/Http/Controllers/AuthController.php +++ b/app/Http/Controllers/AuthController.php @@ -214,7 +214,6 @@ class AuthController extends Controller { // 退出 - public function logout(): RedirectResponse { Auth::logout(); @@ -613,7 +612,7 @@ class AuthController extends Controller { $verify->status = 1; $verify->save(); - return Redirect::back()->with('successMsg', trans('auth.reset_password_new')); + return Redirect::to('login')->with('successMsg', trans('auth.reset_password_new')); } $verify = Verify::type(1)->whereToken($token)->first(); diff --git a/resources/views/admin/node/nodeInfo.blade.php b/resources/views/admin/node/nodeInfo.blade.php index a070ab77..67ffc4e1 100644 --- a/resources/views/admin/node/nodeInfo.blade.php +++ b/resources/views/admin/node/nodeInfo.blade.php @@ -3,9 +3,9 @@ @endsection @section('content') @@ -478,6 +478,20 @@ // ajax同步提交 function Submit() { + const type = $("input[name='type']:checked").val(); + let port; + switch (type) { + case '2': + port = $("#v2ray_port").val(); + break; + case '3': + port = $("#trojan_port").val(); + break; + case '1': + case '4': + default: + port = $("#single_port").val(); + } $.ajax({ type: "POST", url: @isset($node) "/node/edit" @else "/node/add" @endisset, @@ -501,7 +515,7 @@ sort: $('#sort').val(), is_udp: document.getElementById("is_udp").checked ? 1 : 0, status: document.getElementById("status").checked ? 1 : 0, - type: $("input[name='type']:checked").val(), + type: type, method: $('#method').val(), protocol: $('#protocol').val(), protocol_param: $('#protocol_param').val(), @@ -511,7 +525,7 @@ is_subscribe: document.getElementById("is_subscribe").checked ? 1 : 0, detection_type: $("input[name='detection_type']:checked").val(), single: document.getElementById("single").checked ? 1 : 0, - port: $("input[name='port']").val(), + port: port, passwd: $('#passwd').val(), v2_alter_id: $('#v2_alter_id').val(), v2_port: $('#v2_port').val(), diff --git a/resources/views/auth/reset.blade.php b/resources/views/auth/reset.blade.php index 75e4d114..005c02d4 100644 --- a/resources/views/auth/reset.blade.php +++ b/resources/views/auth/reset.blade.php @@ -27,7 +27,7 @@
- +
@endif