update

extend/.gitignore

@@ -1,2 +1 @@
-*
 !.gitignore

extend/queue.logic.php

@@ -29,7 +29,7 @@ class queue_logic
     public function OpenBox($params) {
         $postData['cabinet_code']       = $params['cabinet_code'];
         $postData['box_position_list']  = $params['box_position_list'];
-        $postData['delay_time']         = 0;
+        $postData['delay_time']         = $params['delay_time'];
 
         $token = $this->login($params['req_url'],$params['key']);
         if(empty($token)) {
@@ -39,7 +39,7 @@ class queue_logic
         }
         $resp = $this->reqest($params['req_url'] ,'/open_box', $postData,$token);
         if(empty($resp)) {
-            $ret = ['state'=> 1,'msg' => 'openbox fail.'];
+            $ret = ['code'=> 1,'msg' => 'openbox fail.'];
             $this->sync_return($params['ret_queue'],$params['method'],$ret);
             return $ret;
         }
@@ -48,15 +48,23 @@ class queue_logic
     }
 
     public function LockCabinet($params) {
-        $box_list[] = $params['box_number'];
-        $postData['cabinet_code']       = $params['cabinet_number'];
-        $postData['box_position_list']  = $box_list;
-        $postData['delay_time']         = 0;
+        $postData['cabinet_code']       = $params['cabinet_code'];
+        $postData['delay_time']         = $params['delay_time'];
 
         $token = $this->login($params['req_url'],$params['key']);
-        $resp = $this->reqest($params['req_url'] ,'/open_box', $postData,$token);
-
-        $this->sync_return($params['ret_queue'],$params['method'],$resp);
+        if(empty($token)) {
+            $ret = ['code'=> 1,'msg' => '柜体服务器错误'];
+            $this->sync_return($params['ret_queue'],$params['method'],$ret);
+            return $ret;
+        }
+        $resp = $this->reqest($params['req_url'] ,'/lock_cabinet', $postData,$token);
+        if(empty($resp)) {
+            $ret = ['code'=> 1,'msg' => 'lockCabinet fail.'];
+            $this->sync_return($params['ret_queue'],$params['method'],$ret);
+            return $ret;
+        }
+        $resp = $this->sync_return($params['ret_queue'],$params['method'],$resp);
+        return $resp;
     }
 
 
@@ -66,7 +74,8 @@ class queue_logic
         $host = $config['net_queue']['host'];
         $port = $config['net_queue']['port'];
         try {
-            QueueClient::push($queue_name,$host ,$port ,$key,$params);
+            $queuedb = new QueueDB($queue_name,$host,$port);
+            $queuedb->push(serialize([$key=>$params]));
             return ['code'=>0 , 'msg' => 'ok'];
         } catch (Exception $ex) {
             return ['code'=>1 , 'msg' => 'cabinet redis connect error'];

queue/.gitignore

@@ -0,0 +1 @@
+config.ini.php

queue/config.mac.php

@@ -1,6 +1,7 @@
 <?php
 
 $config['net_queue']['name'] = 'net_access_queue';
-$config['net_queue']['host'] = 'host.docker.internal';
+//$config['net_queue']['host'] = 'host.docker.internal';
+$config['net_queue']['host'] = '192.168.1.195';
 $config['net_queue']['port'] = 6380;
 

queue/config.windows.php

@@ -1,5 +1,6 @@
 <?php
 
 $config['net_queue']['name'] = 'net_access_queue';
-$config['net_queue']['host'] = 'host.docker.internal';
+//$config['net_queue']['host'] = 'host.docker.internal';
+$config['net_queue']['host'] = '192.168.1.200';
 $config['net_queue']['port'] = 6380;

queue/index.php

@@ -15,4 +15,13 @@ require_once(BASE_PATH . '/queuehandler.php');
 
 Log::record('xxxxxx',Log::DEBUG);
 $handler = new queuehandler();
-$handler->run();
+
+while (true) {
+    try {
+        $handler->run();
+    }
+    catch (Exception $ex) {
+        Log::record('queue is connecting.....',Log::DEBUG);
+    }
+    sleep(1);
+}