From 1c22e50074c507c80d100fea7ef7cbf1d5de37e8 Mon Sep 17 00:00:00 2001 From: weigang Date: Wed, 9 Sep 2020 15:27:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E5=B1=80=E9=BB=98=E8=AE=A4=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Commons/LanzuRequest.php | 61 ------------------- app/Middleware/Auth/ApiMiddleware.php | 15 ++++- app/Middleware/CorsMiddleware.php | 54 ++++++++-------- .../v3/Implementations/CouponRecService.php | 5 ++ .../Implementations/GoodsActivityService.php | 5 -- 5 files changed, 46 insertions(+), 94 deletions(-) delete mode 100644 app/Commons/LanzuRequest.php diff --git a/app/Commons/LanzuRequest.php b/app/Commons/LanzuRequest.php deleted file mode 100644 index 38e4ce0..0000000 --- a/app/Commons/LanzuRequest.php +++ /dev/null @@ -1,61 +0,0 @@ -storeParsedData(function () { - // $request = $this->getRequest(); - // if (is_array($request->getParsedBody())) { - // $data = $request->getParsedBody(); - // } else { - // $data = []; - // } - - // return array_merge($data, $request->getQueryParams()); - // }); - // } - - protected function storeParsedData(callable $callback) - { - if (! Context::has($this->contextkeys['parsedData'])) { - return Context::set($this->contextkeys['parsedData'], call($callback)); - } - - // var_dump(Context::get($this->contextkeys['parsedData'])); - - $preDatas = Context::get($this->contextkeys['parsedData']); - - if(isset($preDatas['market_id'])){ - if($preDatas['market_id']==-1){ - $preDatas['market_id'] = 0; - unset($preDatas['sign']); - $sign = $this->signature($preDatas); - $preDatas['sign'] = $sign; - Context::set($this->contextkeys['parsedData'],$preDatas); - } - } - - return Context::get($this->contextkeys['parsedData']); - } - - private function signature($params) - { - 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')); - } -} diff --git a/app/Middleware/Auth/ApiMiddleware.php b/app/Middleware/Auth/ApiMiddleware.php index 826203c..271d20c 100644 --- a/app/Middleware/Auth/ApiMiddleware.php +++ b/app/Middleware/Auth/ApiMiddleware.php @@ -85,10 +85,23 @@ class ApiMiddleware implements MiddlewareInterface if ($exists) { $hashIds = ApplicationContext::getContainer()->get(Hashids::class); $user = $hashIds->decode($userToken); - $this->request->user = User::query()->find($user[0]); + $userModel = User::query()->find($user[0]); + $userModel->userToken = $userToken; + $this->request->user = $userModel; } } + // 处理全局默认值 + $request = \Hyperf\Utils\Context::override(ServerRequestInterface::class, function (ServerRequestInterface $request) + { + $preDatas = $request->getParsedBody(); + if (isset($preDatas['market_id']) && $preDatas['market_id'] == -1) { + $preDatas['market_id'] = 1; + } + + return $request->withParsedBody($preDatas); + }); + return $handler->handle($request); } diff --git a/app/Middleware/CorsMiddleware.php b/app/Middleware/CorsMiddleware.php index 45479a6..71c5530 100644 --- a/app/Middleware/CorsMiddleware.php +++ b/app/Middleware/CorsMiddleware.php @@ -29,35 +29,35 @@ class CorsMiddleware implements MiddlewareInterface return $response; } - $request = \Hyperf\Utils\Context::override(ServerRequestInterface::class, function (ServerRequestInterface $request) - { - $preDatas = $request->getParsedBody(); - if(isset($preDatas['market_id'])){ - if($preDatas['market_id']==-1){ - $preDatas['market_id'] = 0; - - if (env('APP_ENV') == 'prod') { - unset($preDatas['sign']); - $sign = $this->signature($preDatas); - $preDatas['sign'] = $sign; - } - } - } - return $request->withParsedBody($preDatas); - }); + // $request = \Hyperf\Utils\Context::override(ServerRequestInterface::class, function (ServerRequestInterface $request) + // { + // $preDatas = $request->getParsedBody(); + // if(isset($preDatas['market_id'])){ + // if($preDatas['market_id']==-1){ + // $preDatas['market_id'] = 0; + // + // if (env('APP_ENV') == 'prod') { + // unset($preDatas['sign']); + // $sign = $this->signature($preDatas); + // $preDatas['sign'] = $sign; + // } + // } + // } + // return $request->withParsedBody($preDatas); + // }); return $handler->handle($request); } - private function signature($params) - { - 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')); - } + // private function signature($params) + // { + // 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 diff --git a/app/Service/v3/Implementations/CouponRecService.php b/app/Service/v3/Implementations/CouponRecService.php index f61a37c..c1870fa 100644 --- a/app/Service/v3/Implementations/CouponRecService.php +++ b/app/Service/v3/Implementations/CouponRecService.php @@ -79,6 +79,11 @@ class CouponRecService implements CouponRecServiceInterface /** * 用户优惠券列表 + * @param $userId + * @param $type + * @param int $page + * @param int $pagesize + * @return array */ public function getListByUser($userId,$type,$page = 1,$pagesize = 5) { diff --git a/app/Service/v3/Implementations/GoodsActivityService.php b/app/Service/v3/Implementations/GoodsActivityService.php index 798497d..7f1cf60 100644 --- a/app/Service/v3/Implementations/GoodsActivityService.php +++ b/app/Service/v3/Implementations/GoodsActivityService.php @@ -91,10 +91,8 @@ class GoodsActivityService implements GoodsActivityServiceInterface $expireTime = 0; if ($goods->time_limit_days >= 1) { $expireTime += strtotime(date('Y-m-d 23:59:59')) - time(); - var_dump('ex1', $expireTime); } $expireTime += ($goods->time_limit_days-1) * 86400; - var_dump('ex2', $expireTime); $ssdb = ApplicationContext::getContainer()->get(SSDBTask::class); @@ -112,19 +110,16 @@ class GoodsActivityService implements GoodsActivityServiceInterface $goods = GoodsActivity::query() ->where('id', $goodsId) ->first(); - var_dump('$goods', $goods, $goodsId); if (empty($goods)) { return true; } $ssdbKey = SsdbKeys::ACTIVITY_GOODS_BUY_RECORD.$userId.'_'.$goods->type.'_'.$goodsId; - var_dump('ssdbkey', $ssdbKey); $ssdb = ApplicationContext::getContainer()->get(SSDBTask::class); if (!$ssdb->exec('exists', $ssdbKey)) { } else { $res = $ssdb->exec('incr', $ssdbKey, -1*$num); - var_dump('res', $res, -1*$num); } }