Merge branch 'master' into 2.1-merge

# Conflicts:
#	README.md
#	src/amqp/src/Message/ConsumerMessageInterface.php
#	src/utils/src/Coroutine/Concurrent.php
#	src/websocket-server/src/Server.php

src/Listener/PageResolverListener.php

@@ -54,5 +54,24 @@ public function process(object $event)
 
             return 1;
         });
+
+        Paginator::currentPathResolver(function () {
+            $default = '/';
+            if (! ApplicationContext::hasContainer() ||
+                ! interface_exists(RequestInterface::class) ||
+                ! Context::has(ServerRequestInterface::class)
+            ) {
+                return $default;
+            }
+
+            $container = ApplicationContext::getContainer();
+            $url = $container->get(RequestInterface::class)->url();
+
+            if (filter_var($url, FILTER_VALIDATE_URL) !== false) {
+                return $url;
+            }
+
+            return $url;
+        });
     }
 }

tests/PageResolverListenerTest.php

@@ -17,6 +17,7 @@
 use Hyperf\HttpServer\Request;
 use Hyperf\Paginator\LengthAwarePaginator;
 use Hyperf\Paginator\Listener\PageResolverListener;
+use Hyperf\Paginator\Paginator;
 use Hyperf\Utils\ApplicationContext;
 use Hyperf\Utils\Context;
 use Mockery;
@@ -33,6 +34,9 @@ protected function setUp(): void
     {
         Context::set(PsrServerRequestInterface::class, null);
         Context::set('http.request.parsedData', null);
+        Paginator::currentPathResolver(function () {
+            return '/';
+        });
     }
 
     protected function tearDown(): void
@@ -47,19 +51,22 @@ public function testPageResolve()
         $this->getContainer();
         $paginator = new LengthAwarePaginator([1, 2], 10, 2, null);
         $this->assertSame('/?page=2', $paginator->nextPageUrl());
+        $this->assertSame('/', Paginator::resolveCurrentPath());
 
         $listener = new PageResolverListener();
         $listener->process(new BootApplication());
 
         $paginator = new LengthAwarePaginator([1, 2], 10, 2, null);
         $this->assertSame('/?page=2', $paginator->nextPageUrl());
+        $this->assertSame('/', Paginator::resolveCurrentPath());
 
         Context::set(PsrServerRequestInterface::class, value(function () {
             $request = new \Hyperf\HttpMessage\Server\Request('GET', '/index');
             return $request->withQueryParams(['page' => 2]);
         }));
         $paginator = new LengthAwarePaginator([1, 2], 10, 2, null);
         $this->assertSame('/?page=3', $paginator->nextPageUrl());
+        $this->assertSame('/index', Paginator::resolveCurrentPath());
     }
 
     protected function getContainer()