update

application/index/controller/Base.php

@@ -7,11 +7,16 @@ class Base extends Controller{
     const redis_host = 'lredis';
     const redis_port = 6379;
     const queue_name = 'net_access_queue';
+    private $no_check = ['order/checkorder' , 'order/recordstore' , 'order/checkfcode' , 'order/recordfetch'];
 
     public function initialize(){
-        if(empty(session('username')) || empty(session('id'))){
-            //登录超时
-            json(json_error_exception('1005'))->send();
+        $control = lcfirst(request()->controller());
+        $action = lcfirst(request()->action());
+        if(!in_array($control . '/' . $action , $this->no_check)){
+            if(empty(session('username')) || empty(session('id'))){
+                //登录超时
+                json(json_error_exception('1005'))->send();
+            }
         }
     }
 }

application/index/controller/Btoc.php

@@ -1,18 +0,0 @@
-<?php
-namespace app\index\controller;
-
-use think\App;
-use think\Controller;
-
-class Btoc extends Controller
-{
-    public function index()
-    {
-        $post['id'] = 1;
-        $data['url'] = 'http://hm.hemadj.com/dev/test';
-        $data['method'] = 'post';
-        $data['data'] =  $post;
-        $result = _curl($data);
-        pre($result);
-    }
-}

application/index/controller/Order.php

@@ -7,12 +7,12 @@ use app\index\model\BoxModel;
 use app\index\model\OrderModel;
 use think\Controller;
 
-class Order extends Controller
+class Order extends Base
 {
-    public function CheckRcode(){
+    public function CheckOrder(){
         $order_sn = input('param.order_sn');
         //商网接口
-        json_success([]);
+        json_success();
     }
 
     /**
@@ -23,11 +23,11 @@ class Order extends Controller
         $trunk      = input('param.trunk');
         $cabinet    = input('param.cabinet');
         $ret = $this->CreateOrderBindBox($order_sn , $trunk , $cabinet);
-        if($ret['code'] != 0){
+        if($ret['code'] != 1){
             json_error(1006);
         }else{
             $this->box_action_record($cabinet , $trunk , 1);
-            json_success([]);
+            json_success();
         }
     }
     public function CheckFcode(){
@@ -56,13 +56,13 @@ class Order extends Controller
             json_error(2004);
         }
         $ret = $BoxModel->editData(['cabinet_number' => $cabinet , 'box_number' => $trunk] , ['order_sn' => '' , 'box_status' => 1]);
-        if($ret['code'] != 0){
+        if($ret['code'] != 1){
             json_error(1006);
         }
         $OrderModel = new OrderModel();
         $OrderModel->editData(['order_sn' => $Box['order_sn']] , ['order_status' => 2 , 'out_time' => date("Y-m-d H:i:s")]);
         $this->box_action_record($cabinet , $trunk , 2);
-        json_success([]);
+        json_success();
     }
 
     public function OrderList(){

route/route.php

@@ -6,7 +6,6 @@
         'UserList'                  => 'index/user/UserList',
         'UserDel'                   => 'index/user/UserDel',
 
-        'CheckFcode'                => 'index/cabinet/CheckFcode',
         'AddCabinet'                => 'index/cabinet/AddCabinet',
 
         'OpenBox'                   => 'index/cabinet/OpenBox',
@@ -16,12 +15,14 @@
         'Reboot'                    => 'index/cabinet/Reboot',
         'QueryState'                => 'index/cabinet/QueryState',
 
-        'CheckRcode'                => 'index/order/CheckRcode',
+        'CheckOrder'                => 'index/order/CheckOrder',
         'RecordStore'               => 'index/order/RecordStore',
-        'OrderList'                 => 'index/order/OrderList',
+        'CheckFcode'                => 'index/order/CheckFcode',
+        'RecordFetch'               => 'index/order/RecordFetch',
 
 
         'CabinetList'               => 'index/cabinet/CabinetList',
         'BoxList'                   => 'index/cabinet/BoxList',
         'BoxActionList'             => 'index/cabinet/BoxActionList',
+        'OrderList'                 => 'index/order/OrderList',
     ));