Преглед на файлове

nginx-conf update and route update

ayHaru преди 4 години
родител
ревизия
dce9a7b03d
променени са 3 файла, в които са добавени 4 реда и са изтрити 8 реда
  1. 1 1
      application/index/controller/Cabinet.php
  2. 2 6
      conf/nginx/nginx-debug-http.conf
  3. 1 1
      route/route.php

+ 1 - 1
application/index/controller/Cabinet.php

@@ -180,10 +180,10 @@ class Cabinet extends Base
         return $BoxModel->editData($where,$update);
     }
     public function test(){
+        pre(1);
         $cabinet_number     = input('param.cabinet_number');
         $box_number         = input('param.box_number');
         $order_sn           = input('param.order_sn');
-        $result = $this->box_bind_order($cabinet_number , $box_number , $order_sn);
     }
 
     /**

+ 2 - 6
conf/nginx/nginx-debug-http.conf

@@ -54,12 +54,8 @@ http
         location / {
             index  index.html index.htm index.php;
         }
-
-        location /mshop {
-            root $folder_name;
-            autoindex on;
-            index  index.html index.htm index.php;
-	        try_files $uri $uri/ /mshop/index.html;
+         if (!-e $request_filename) {
+            rewrite  ^(.*)$  /index.php?s=/$1  last;
         }
 
         location ~ \.php {

+ 1 - 1
route/route.php

@@ -1,5 +1,5 @@
 <?php
-    Route::group('api',array(
+    Route::group('/',array(
         '/'                         => 'index/index/index',
         'userAdd'                   => 'index/user/userAdd',
         'roleList'                  => 'index/user/roleList',