From 065fc5f76012b2f0f95f7d59de21482b1c7e54d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=80=86=E5=A4=A9=E7=9A=84=E8=9D=88=E8=9D=88?= <632522043@qq.com> Date: Wed, 7 Sep 2022 01:38:54 +0000 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=98=80=20=E4=BC=98=E5=8C=96URL?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 逆天的蝈蝈 <632522043@qq.com> --- app/functions.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/functions.php b/app/functions.php index 0cdd7ae..9f532f3 100644 --- a/app/functions.php +++ b/app/functions.php @@ -84,6 +84,8 @@ if (!function_exists('url')) { if (!Str::startsWith($url, '/')) { $url = DIRECTORY_SEPARATOR . $url; + }else{ + return $url . $vars; } return $app == 'index' ? $url . $vars : '/' . $app . $url . $vars; From a8d2309d1f6cc4d5adb89072c671bd13ce36af4b Mon Sep 17 00:00:00 2001 From: meystack Date: Wed, 7 Sep 2022 02:49:41 +0000 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E5=9B=9E=E9=80=80URL=E5=87=BD?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: meystack --- app/functions.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/functions.php b/app/functions.php index 9f532f3..0cdd7ae 100644 --- a/app/functions.php +++ b/app/functions.php @@ -84,8 +84,6 @@ if (!function_exists('url')) { if (!Str::startsWith($url, '/')) { $url = DIRECTORY_SEPARATOR . $url; - }else{ - return $url . $vars; } return $app == 'index' ? $url . $vars : '/' . $app . $url . $vars; From 6d5b64bfb7f12e796aab52a89bb348c5ab663ac6 Mon Sep 17 00:00:00 2001 From: tingfeng-key <1770963469@qq.com> Date: Mon, 14 Nov 2022 07:59:54 +0000 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=AF=86=E7=A0=81bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tingfeng-key <1770963469@qq.com> --- app/admin/controller/system/Admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/admin/controller/system/Admin.php b/app/admin/controller/system/Admin.php index 3947f22..19e8e5e 100644 --- a/app/admin/controller/system/Admin.php +++ b/app/admin/controller/system/Admin.php @@ -459,7 +459,7 @@ class Admin extends AdminController } // 查找数据 - $where[] = ['id', '=', $request->admin_id]; + $where[] = ['id', '=', $request->adminId]; $where[] = ['pwd', '=', encryptPwd($pwd)]; $result = $this->model->where($where)->find();