switch path/pattern in routing

vaizard · Sep 7, 2023 · 9916745 · 9916745
1 parent 58b7d04
commit 9916745
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/glued/Config/Nginx/conf.d/main.conf b/glued/Config/Nginx/conf.d/main.conf
@@ -5,3 +5,7 @@ port_in_redirect off;
 fastcgi_read_timeout 600;
 fastcgi_send_timeout 600;
 fastcgi_connect_timeout 600;
+
+proxy_connect_timeout 600s;
+proxy_send_timeout 600s;
+proxy_read_timeout 600s;
diff --git a/glued/container.php b/glued/container.php
@@ -209,15 +209,12 @@
     }
 
     $e = new Enforcer($s['casbin']['modelconf'], $adapter);
-
     $e->addNamedMatchingFunc('g', 'keyMatch2', function (string $key1, string $key2) {
         return BuiltinOperations::keyMatch2($key1, $key2);
     });
     $e->addNamedDomainMatchingFunc('g', 'keyMatch2', function (string $key1, string $key2) {
         return BuiltinOperations::keyMatch2($key1, $key2);
     });
-
-
     return $e;
 });
 

diff --git a/glued/routes.php b/glued/routes.php
@@ -17,7 +17,7 @@
 foreach ($settings['routes'] as $name => $leaf) {
     if (isset($leaf['methods'])) {
         foreach ($leaf['methods'] as $request => $method) {
-              $route = $app->$request($leaf['path'], $method);
+              $route = $app->$request($leaf['pattern'], $method);
               $route = $route->setName($name);
         }    
     }