add to local

application/index/controller/Index.php

@@ -1,72 +1,70 @@
 <?php
 namespace app\index\controller;
 
-
 class Index
 {
-//    const admin_url = 'host.docker.internal';
-    const admin_url = 'http://docker.hostip:8080';
-
-    protected function request($params)
+    private $mAdminUrl = '';
+    public function __construct()
     {
-
+//        $this->mAdminUrl = 'http://host.docker.internal:8080';
+        $this->mAdminUrl = 'http://docker.hostip:8080';
     }
 
     public function index()
     {
         echo 'index';
     }
+    //检查订单号码
     public function CheckOrder(){
         $order_sn = input('param.order_sn');
-        $result = http_get(self::admin_url . '/CheckOrder' ,['order_sn' => $order_sn]);
+        $result = http_get($this->mAdminUrl . '/CheckOrder' ,['order_sn' => $order_sn]);
         if($result == false){
             json_return(500,[],'网络错误');
         }
-        if($result['code'] != 0){
-            json_return($result['code'],[],$result['msg']);
-        }
-        json_success($result['data']);
-    }
 
-    public function _CheckOrder($order_sn){
-        $result = http_get(self::admin_url . '/CheckOrder' ,['order_sn' => $order_sn]);
-        if($result == false){
-            json_return(500,[],'网络错误');
-        }
-        if($result['code'] != 0){
+        if($result['code'] != 0) {
             json_return($result['code'],[],$result['msg']);
         }
-        json_success($result['data']);
+        else {
+            json_success($result['data']);
+        }
     }
 
     public function CheckFcode(){
         $code = input('param.code');
-        $result = http_get(self::admin_url . ':8080/CheckFcode' ,['code' => $code]);
+        $result = http_get($this->mAdminUrl . '/CheckFcode' ,['code' => $code]);
         if($result == false){
             json_return(500,[],'网络错误');
         }
         if($result['code'] != 0){
             json_return($result['code'],[],$result['msg']);
         }
-        json_success($result['data']);
+        else {
+            json_success($result['data']);
+        }
     }
-    public function RecordStore(){
+    //上报存柜
+    public function RecordStore()
+    {
         $order_sn = input('param.order_sn');
         $trunk = input('param.trunk');
         $cabinet = input('param.cabinet');
-        $result = http_get(self::admin_url . ':8080/RecordStore' ,['order_sn' => $order_sn , 'trunk' => $trunk , 'cabinet' => $cabinet]);
+        $result = http_get($this->mAdminUrl . '/RecordStore' ,['order_sn' => $order_sn , 'trunk' => $trunk , 'cabinet' => $cabinet]);
         if($result == false){
             json_return(500,[],'网络错误');
         }
         if($result['code'] != 0){
             json_return($result['code'],[],$result['msg']);
+        } else {
+            json_success($result['data']);
         }
-        json_success($result['data']);
     }
+
+    //检查订单号码
     public function RecordFetch(){
         $trunk = input('param.trunk');
         $cabinet = input('param.cabinet');
-        $result = http_get(self::admin_url . ':8080/RecordFetch' ,['trunk' => $trunk , 'cabinet' => $cabinet]);
+        $result = http_get($this->mAdminUrl . '/RecordFetch' ,['trunk' => $trunk , 'cabinet' => $cabinet]);
         if($result == false){
             json_return(500,[],'网络错误');
         }

extend/queue.logic.php

@@ -100,9 +100,9 @@ class queue_logic
     }
 
     private function sync_result($queue_name, $key, $params) {
-        global $config;
-        $host = $config['net_queue']['host'];
-        $port = $config['net_queue']['port'];
+        global $other_config;
+        $host = $other_config['net_queue']['host'];
+        $port = $other_config['net_queue']['port'];
         try {
             $queuedb = new QueueDB($queue_name,$host,$port);
             $queuedb->push(serialize([$key=>$params]));
@@ -114,8 +114,8 @@ class queue_logic
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     public function UpdateAllBoxState()
     {
-        global $config;
-        $admin_url = $config['admin_url'];
+        global $other_config;
+        $admin_url = $other_config['admin_url'];
 
         $result = $this->getCabinets("{$admin_url}/GetCabinetsBoxs");
         if(empty($result) || $result['code'] != 0) {

other/config.mac.php

@@ -1,8 +1,9 @@
 <?php
 
-$config['net_queue']['name'] = 'net_access_queue';
-$config['net_queue']['host'] = 'host.docker.internal';
-$config['net_queue']['port'] = 6380;
+$other_config['net_queue']['name'] = 'net_access_queue';
+$other_config['net_queue']['host'] = 'host.docker.internal';
+$other_config['net_queue']['port'] = 6380;
 
-$config['admin_url'] = 'http://39.97.239.116:8080';
+//$other_config['admin_url'] = 'http://39.97.239.116:8080';
+$other_config['admin_url'] = 'http://host.docker.internal:8080';
 

other/config.test.php

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

other/config.windows.php

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

queue/queuehandler.php

@@ -10,10 +10,10 @@ class queuehandler
 
     public function run()
     {
-        global $config;
-        $queue_name = $config['net_queue']['name'];
-        $host = $config['net_queue']['host'];
-        $port = $config['net_queue']['port'];
+        global $other_config;
+        $queue_name = $other_config['net_queue']['name'];
+        $host = $other_config['net_queue']['host'];
+        $port = $other_config['net_queue']['port'];
         if (ob_get_level()) ob_end_clean();
 
         pcntl_signal(SIGINT,  [$this,'sig_handler']);