From fa627e55bd8cf8670ee9952045e27c871e14d938 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=94=E5=A7=AC=E6=A1=91?= <monkeyblacktech97@gmail.com>
Date: Thu, 6 Aug 2020 03:40:38 +0800
Subject: [PATCH] =?UTF-8?q?fixed=20=E8=8A=82=E7=82=B9=E7=BC=96=E8=BE=91por?=
 =?UTF-8?q?t=E5=80=BC=E6=9C=AA=E8=A2=AB=E8=AF=BB=E5=8F=96=EF=BC=8C?=
 =?UTF-8?q?=E9=87=8D=E7=BD=AE=E5=AF=86=E7=A0=81=E9=A1=B5=E9=9D=A2=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=9A=84=E5=B0=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/AuthController.php       |  3 +--
 resources/views/admin/node/nodeInfo.blade.php | 24 +++++++++++++++----
 resources/views/auth/reset.blade.php          |  2 +-
 3 files changed, 21 insertions(+), 8 deletions(-)

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 @@
 	<link href="/assets/global/vendor/bootstrap-select/bootstrap-select.min.css" type="text/css" rel="stylesheet">
 	<link href="/assets/global/vendor/switchery/switchery.min.css" type="text/css" rel="stylesheet">
 	<style type="text/css">
-		.hidden {
-			display: none
-		}
+        .hidden {
+            display: none
+        }
 	</style>
 @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 @@
 			</div>
 			<div class="form-group form-material floating" data-plugin="formMaterial">
 				<input class="form-control" type="password" autocomplete="off" name="confirmPassword" required/>
-				<label class="floating-label" for="confirmPassword">{{trans('auth.confirm_Password')}}</label>
+				<label class="floating-label" for="confirmPassword">{{trans('auth.confirm_password')}}</label>
 			</div>
 		@endif
 		<a href="/login"