APPLE 3 éve
szülő
commit
a1dc831b81

+ 3 - 0
vendor/topthink/framework/src/think/cache/driver/Redis.php

@@ -52,6 +52,9 @@ class Redis extends Driver
     {
         if (!empty($options)) {
             $this->options = array_merge($this->options, $options);
+        }else{
+           $options = config('cache.stores.redis');
+           $this->options = array_merge($this->options, $options);
         }
 
         if (extension_loaded('redis')) {

+ 6 - 4
vendor/topthink/think-multi-app/src/Url.php

@@ -42,15 +42,17 @@ class Url extends UrlBuild
             // 解析到控制器
             $url = substr($url, 1);
         } elseif ('' === $url) {
-            $url = $this->getAppName() . '/' . $request->controller() . '/' . $request->action();
+            $url = $request->controller() . '/' . $request->action();
+            if (!$this->app->http->isBind()) {
+                $url = $this->getAppName() . '/' . $url;
+            }
         } else {
             // 解析到 应用/控制器/操作
             $controller = $request->controller();
-            $app        = $this->getAppName();
             $path       = explode('/', $url);
             $action     = array_pop($path);
             $controller = empty($path) ? $controller : array_pop($path);
-            $app        = empty($path) ? $app : array_pop($path);
+            $app        = empty($path) ? $this->getAppName() : array_pop($path);
             $url        = $controller . '/' . $action;
             $bind       = $this->app->config->get('app.domain_bind', []);
 
@@ -58,7 +60,7 @@ class Url extends UrlBuild
                 isset($bind[$_SERVER['SERVER_NAME']]) && $domain = $_SERVER['SERVER_NAME'];
 
                 $domain = is_bool($domain) ? $key : $domain;
-            } else {
+            } elseif (!$this->app->http->isBind()) {
                 $url = $app . '/' . $url;
             }
         }

+ 0 - 0
vendor/topthink/think-multi-app/src/command/Build.php


+ 0 - 0
vendor/topthink/think-multi-app/src/command/Clear.php


+ 0 - 0
vendor/topthink/think-multi-app/src/command/stubs/controller.stub