Merge branch 'dev/ver/cloud_1.0.0' of http://119.23.72.7/q578953158/php_frq_api…

Merge branch 'dev/ver/cloud_1.0.0' of http://119.23.72.7/q578953158/php_frq_api into dev/ver/cloud_1.0.0

app/Http/Queue/RabbitQueueModel.php

@@ -11,7 +11,7 @@ class RabbitQueueModel
 
 
     private $connection;
     private $connection;
 
 
-    public function __construct(string $connect_name = '')
+    public function __construct($connect_name = '')
     {
     {
         if ($connect_name) {
         if ($connect_name) {
             $config = Config('rabbitmq.connections.' . $connect_name);
             $config = Config('rabbitmq.connections.' . $connect_name);

app/Model/CommonModel.php

@@ -141,7 +141,7 @@ class CommonModel extends Model
     //模糊搜索sku型号
     //模糊搜索sku型号
     public function SkuList($k,$types = 1)
     public function SkuList($k,$types = 1)
     {
     {
-        $url = "http://so12.ichunt.com/search/spu/think?spu_name=".$k;
+        $url = Config('website.search_url') . "/search/spu/think?spu_name=".$k;
         $res = post_curl($url,[]);
         $res = post_curl($url,[]);
         $resArr = \GuzzleHttp\json_decode($res,true);
         $resArr = \GuzzleHttp\json_decode($res,true);
         $temp = [];
         $temp = [];

app/Model/SearchModel.php

@@ -15,7 +15,7 @@ class SearchModel
     private $SERVICE_URL;
     private $SERVICE_URL;
     public function __construct()
     public function __construct()
     {
     {
-       $this->SERVICE_URL = "http://so12.ichunt.com/";
+       $this->SERVICE_URL =  Config('website.search_url');
     }
     }
 
 
     /*
     /*

config/website.php

@@ -46,6 +46,8 @@ return [
 
 
     'frq_url'          => $domain_config['domain']['frq_url'],
     'frq_url'          => $domain_config['domain']['frq_url'],
 
 
+    'search_url'          => $domain_config['domain']['search_url'],
+
     // 权限系统
     // 权限系统
     'perm_url'         => $domain_config['domain']['perm_url'],
     'perm_url'         => $domain_config['domain']['perm_url'],
     // 获取用户权限接口
     // 获取用户权限接口