Merge branch 'v2.2.2-t' of http://git.huaperfect.com/without_auth/meibuyu-micro into v2.1.191-t (7651af98) · Commits · without_auth / meibuyu-micro

src/Handler/LogTrace/LogTraceHandler.php

+1 −1

Original line number	Diff line number	Diff line
		@@ -106,7 +106,7 @@ class LogTraceHandler
		}else if (is_string($track)\|\|is_numeric($track)) {
		$logInfo = $track;
		}else{
		$logInfo = print_r($track, true);
		$logInfo = json_encode($track,JSON_PRETTY_PRINT); ;//print_r($track, true);
		}
		$logInfo .= "\n\n";

src/Handler/RedisQueueBatchHandler.php

+4 −4

Original line number	Diff line number	Diff line
		@@ -72,8 +72,6 @@ abstract class RedisQueueBatchHandler
		//每次从列表取100
		$arr = $this->redis->lRange($this->queue_name,0,self::BATCH_DEAL_NUM-1);

		//取完从队列删掉
		$this->redis->lTrim($this->queue_name,count($arr),-1);
		//数据格式化
		$formatArr = array_map(function ($item){
		return json_decode($item,true);
		@@ -81,15 +79,17 @@ abstract class RedisQueueBatchHandler
		try {
		//具体批处理逻辑
		$this->batchDeal($formatArr);

		//取完从队列删掉
		$this->redis->lTrim($this->queue_name,count($arr),-1);
		}catch (\Throwable $exception){

		//错误码为100 重新推到队列
		if($exception->getCode()==self::ERROR_RETRY_CODE){
		if($this->retry<self::MAX_RETRY_TIMES){ //重试次数不超过3次
		$this->backToQueue($arr);
		//$this->backToQueue($arr);
		$this->retry++;
		}else{
		$this->redis->lTrim($this->queue_name,count($arr),-1);
		$this->retry = 0; //重置当前次数
		$this->errorWriteToFile($formatArr,$exception);
		}

src/Middleware/AuthorizeMiddleware.php

0 → 100644

+97 −0

Original line number	Diff line number	Diff line
		<?php

		namespace Meibuyu\Micro\Middleware;

		use FastRoute\Dispatcher;
		use Hyperf\HttpServer\Router\DispatcherFactory;
		use Hyperf\Utils\ApplicationContext;
		use Meibuyu\Micro\Model\Auth;
		use Meibuyu\Micro\Service\Interfaces\User\AuthenticationServiceInterface;
		use Psr\Http\Message\ResponseInterface;
		use Psr\Http\Message\ServerRequestInterface;
		use Psr\Http\Server\MiddlewareInterface;
		use Psr\Http\Server\RequestHandlerInterface;
		use Hyperf\Di\Annotation\Inject;

		class AuthorizeMiddleware implements MiddlewareInterface
		{

		/**
		* @Inject()
		* @var AuthenticationServiceInterface
		*/
		private $authorizationService;

		public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
		{
		$path = $request->getUri()->getPath();
		$token = token();
		$applicationName = env('APP_NAME');
		$method = $request->getMethod();

		if (empty($path)) return $handler->handle($request);
		//获取对应的 path 对应的权限，如果 path 是不需要登录鉴权，直接返回
		$passed = $this->authRouter($applicationName, $path, $method, $token);
		if ($passed) {
		return $handler->handle($request);
		}

		return response()->withStatus(403)->json(
		[
		'code' => 403,
		'msg' => "您没有访问接口的权限，请检查后再操作"
		]); //鉴权失败，错误码 403 forbidden
		//path 是需要登录鉴权的，判断当前用户是佛有对应 path 的权限

		}


		/**
		* 获取对应路由的权限，调用 RPC 服务
		* @param $applicationName
		* @param $route
		* @param $token
		* @return bool
		*/
		protected function authRouter($applicationName, $path, $method, $token): bool
		{
		$userId = $this->getUserIdByToken($token);
		$route = $this->getRouterByPath($path, $method);
		if (empty($route)) return true; //说明没有匹配到路由，直接 pass，后续执行一定会返回 404，这里也可以直接返回 404

		return $this->authorizationService->authByRouter($applicationName, $route, $method, $userId);
		}

		/**
		* 根据 path 和 method 获取对应的 router
		* @param string $path
		* @param string $method
		* @return array\|string
		*/
		private function getRouterByPath(string $path, string $method) : string
		{
		$factory = ApplicationContext::getContainer()->get(DispatcherFactory::class);
		$dispatcher = $factory->getDispatcher('http');
		$routerMatched = $dispatcher->dispatch($method, $path);
		$founded = $routerMatched[0];
		if ( $founded != Dispatcher::FOUND) return ''; //说明没有匹配上路由，可以直接 return 404 not found

		$handler = $routerMatched[1];
		return $handler->route;
		}

		/**
		* 根据 token 获取对应的 user_id
		* @param $token
		* @return int\|mixed
		*/
		protected function getUserIdByToken($token)
		{
		if (empty($token)) return 0;
		$user = redis()->get($token);
		if ( ! $user) return 0;

		$userArr = \json_decode($user, true);
		return !empty($userArr['id']) ? $userArr['id'] : 0;
		}
		}
		No newline at end of file

src/Service/BaseService.php

+3 −0

Original line number	Diff line number	Diff line
		@@ -12,6 +12,9 @@ use Exception;
		use Hyperf\DbConnection\Model\Model;
		use Meibuyu\Micro\Helper;

		/**
		* @deprecated 此类废弃,在之后的版本会被删除
		*/
		class BaseService
		{
		/**

src/Service/Interfaces/AppServiceInterface.php

+4 −0

Original line number	Diff line number	Diff line
		@@ -8,6 +8,10 @@

		namespace Meibuyu\Micro\Service\Interfaces;

		/**
		* @deprecated 此接口废弃,在之后的版本会被删除
		* 请引入meibuyu/rpc组件,使用Meibuyu\Rpc\Service\Interfaces\App\AppServiceInterface
		*/
		interface AppServiceInterface
		{