From 983f705cbfef7de29c558abb2aaf4bdc6eae9ebc Mon Sep 17 00:00:00 2001 From: weigang Date: Sun, 19 Jul 2020 12:05:24 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=9A=82=E6=97=B6=E5=8E=BB=E6=8E=89api=20d?= =?UTF-8?q?ev=E7=9A=84=E8=B7=B3=E8=BF=87=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Middleware/Auth/ApiMiddleware.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Middleware/Auth/ApiMiddleware.php b/app/Middleware/Auth/ApiMiddleware.php index de2a720..9e4b165 100644 --- a/app/Middleware/Auth/ApiMiddleware.php +++ b/app/Middleware/Auth/ApiMiddleware.php @@ -39,9 +39,9 @@ class ApiMiddleware implements MiddlewareInterface public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface { - if (env('APP_ENV') == 'dev') { - return $handler->handle($request); - } + // if (env('APP_ENV') == 'dev') { + // return $handler->handle($request); + // } // 签名校验 From aac8665f4b3f16986787c1d42551be2b79e28bc8 Mon Sep 17 00:00:00 2001 From: weigang Date: Sun, 19 Jul 2020 12:19:00 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Middleware/Auth/ApiMiddleware.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Middleware/Auth/ApiMiddleware.php b/app/Middleware/Auth/ApiMiddleware.php index 9e4b165..de2a720 100644 --- a/app/Middleware/Auth/ApiMiddleware.php +++ b/app/Middleware/Auth/ApiMiddleware.php @@ -39,9 +39,9 @@ class ApiMiddleware implements MiddlewareInterface public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface { - // if (env('APP_ENV') == 'dev') { - // return $handler->handle($request); - // } + if (env('APP_ENV') == 'dev') { + return $handler->handle($request); + } // 签名校验 From c673887a262d3f2eb9e12547f304b25d876d0a05 Mon Sep 17 00:00:00 2001 From: weigang Date: Sun, 19 Jul 2020 12:29:23 +0800 Subject: [PATCH 3/6] Dev --- app/Middleware/Auth/ApiMiddleware.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Middleware/Auth/ApiMiddleware.php b/app/Middleware/Auth/ApiMiddleware.php index de2a720..9e4b165 100644 --- a/app/Middleware/Auth/ApiMiddleware.php +++ b/app/Middleware/Auth/ApiMiddleware.php @@ -39,9 +39,9 @@ class ApiMiddleware implements MiddlewareInterface public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface { - if (env('APP_ENV') == 'dev') { - return $handler->handle($request); - } + // if (env('APP_ENV') == 'dev') { + // return $handler->handle($request); + // } // 签名校验 From 9dd085929cdc313996631f367e88936765626212 Mon Sep 17 00:00:00 2001 From: weigang Date: Sun, 19 Jul 2020 13:05:59 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Middleware/Auth/ApiMiddleware.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Middleware/Auth/ApiMiddleware.php b/app/Middleware/Auth/ApiMiddleware.php index 9e4b165..de2a720 100644 --- a/app/Middleware/Auth/ApiMiddleware.php +++ b/app/Middleware/Auth/ApiMiddleware.php @@ -39,9 +39,9 @@ class ApiMiddleware implements MiddlewareInterface public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface { - // if (env('APP_ENV') == 'dev') { - // return $handler->handle($request); - // } + if (env('APP_ENV') == 'dev') { + return $handler->handle($request); + } // 签名校验 From 7f7ac81628046f97a4df65823cb666b6eea491d3 Mon Sep 17 00:00:00 2001 From: weigang Date: Sun, 19 Jul 2020 13:48:10 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AD=BE=E5=90=8D?= =?UTF-8?q?=E7=AE=97=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Middleware/Auth/ApiMiddleware.php | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/app/Middleware/Auth/ApiMiddleware.php b/app/Middleware/Auth/ApiMiddleware.php index de2a720..80b70cb 100644 --- a/app/Middleware/Auth/ApiMiddleware.php +++ b/app/Middleware/Auth/ApiMiddleware.php @@ -39,9 +39,9 @@ class ApiMiddleware implements MiddlewareInterface public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface { - if (env('APP_ENV') == 'dev') { - return $handler->handle($request); - } + // if (env('APP_ENV') == 'dev') { + // return $handler->handle($request); + // } // 签名校验 @@ -82,18 +82,22 @@ class ApiMiddleware implements MiddlewareInterface unset($params['sign']); $timestamp = $params['timestamp']; - if (empty($sign) || ($timestamp+config('autoload.auth.api.sign.expire')) < time()) { + if (empty($sign) || ($timestamp+config('auth.api.sign.expire_time')) < time()) { return false; } - ksort($params); - $params = http_build_query($params); - return $sign == $this->signature($params); } - private function signature($http_query) + private function signature($params) { - return sha1(md5($http_query).config('autoload.auth.api.sign.secret_key')); + ksort($params); + + $http_query = []; + foreach ($params as $key => $value) { + $http_query[] = $key.'='.$value; + } + + return sha1(md5(implode('&', $http_query)).config('auth.api.sign.secret_key')); } } \ No newline at end of file From 27f5fa8962e248606d7e12a7f4568121746248b8 Mon Sep 17 00:00:00 2001 From: weigang Date: Sun, 19 Jul 2020 14:43:05 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=B8=8D=E5=8F=AF?= =?UTF-8?q?=E7=94=A8=E5=88=B8=E4=B8=AD=E9=87=8D=E5=A4=8D=E7=9A=84=E5=88=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Controller/CouponController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Controller/CouponController.php b/app/Controller/CouponController.php index 069c9a2..ea72379 100644 --- a/app/Controller/CouponController.php +++ b/app/Controller/CouponController.php @@ -241,7 +241,7 @@ class CouponController extends BaseController $notAvailable = []; foreach ($data as $key => &$item) { if (in_array($item->id, $couponIds)) { - $notAvailable[] = $item; + $notAvailable[$item->id] = $item; } else { $available[] = $item; } @@ -249,7 +249,7 @@ class CouponController extends BaseController return $this->success([ 'available' => $available, - 'not_available' => $notAvailable + 'not_available' => array_values($notAvailable) ]); }