ayHaru 4 years ago
parent
commit
e4273ba1c6
2 changed files with 6 additions and 7 deletions
  1. 2 4
      application/index/controller/Base.php
  2. 4 3
      application/index/controller/Cabinet.php

+ 2 - 4
application/index/controller/Base.php

@@ -7,13 +7,11 @@ use app\index\model\RoleModel;
 class Base extends Controller{
 
     private $noCheck = ['cabinet/check_fcode' , 'cabinet/record_store' , 'cabinet/record_fetch' , 'cabinet/add_cabinet' , 'order/order_bind_code'];
-    const redis_host = 'logic-redis';
-    const redis_port = 6380;
+    const redis_host = 'lredis';
+    const redis_port = 6379;
     const queue_name = 'net_access_queue';
 
     public function initialize(){
-
-
         $control = lcfirst(request()->controller());
         $action = lcfirst(request()->action());
         $checkUrl = $control . '/' . $action;

+ 4 - 3
application/index/controller/Cabinet.php

@@ -10,6 +10,7 @@ use app\index\model\BoxActionModel;
 use app\index\model\CabinetModel;
 use app\index\model\BoxModel;
 use app\index\model\OrderModel;
+use think\facade\Log;
 use think\Session;
 use QueueClient;
 use QueueServer;
@@ -112,8 +113,8 @@ class Cabinet extends Base
      * queue推送
     */
     private function push_queue($queue_name,$key,$params){
-        QueueClient::push($queue_name,self::redis_host , self::redis_port ,$key,$params);
-        return $this->wait_ret($params['ret_queue'] , self::redis_host , self::redis_port);
+        return QueueClient::push($queue_name,self::redis_host , self::redis_port ,$key,$params);
+//        return $this->wait_ret($params['ret_queue'] , self::redis_host , self::redis_port);
     }
 
     /**
@@ -203,7 +204,7 @@ class Cabinet extends Base
         }
         $cabinet = $cabinet->toArray();
         $params['req_url']      = $cabinet['req_url'];
-        $params['req_queue']    = $sid;
+        $params['ret_queue']    = $sid;
         return $params;
     }
 }