diff --git a/library/think/Request.php b/library/think/Request.php
index f7aff0db..50c8707d 100644
--- a/library/think/Request.php
+++ b/library/think/Request.php
@@ -216,10 +216,8 @@ class Request
         } elseif ($this->baseUrl) {
             return $this->baseUrl;
         } else {
-            $url = $this->scheme() . '://' . $this->host();
-            $url .= $_SERVER['PHP_SELF'];
-            $this->baseUrl = $url;
-            return $url;
+            $this->baseUrl = rtrim($this->url(), '?' . $this->query());
+            return $this->baseUrl;
         }
     }