Merge branch 'kuaiyingyong' of iqiyoo:zhuishuyun_wap into kuaiyingyong

app/Jobs/QappTikTok/NewQappTikTokUserCharge.php

@@ -19,7 +19,7 @@ class NewQappTikTokUserCharge implements ShouldQueue
 
     private $reportParams;
 
-    protected $url = 'https://newtrackapi.zhuishuyun.com/api/qappuser/new_charge';
+    protected $url;
 
     /**
      * QappTikTokUserCharge constructor.
@@ -28,6 +28,7 @@ class NewQappTikTokUserCharge implements ShouldQueue
     public function __construct(QappTikTokUserChargeRequest $reportParams)
     {
         $this->reportParams = $reportParams;
+        $this->url = env('TIKTOK_API_URL'). 'api/qappuser/new_charge';
     }
 
     /**

app/Jobs/QappTikTok/QappTikTokUser.php

@@ -47,7 +47,7 @@ class QappTikTokUser implements ShouldQueue
             'send_order_id' => $this->reportParams->send_order_id,
         ];
         $params['sign'] = _sign($params, SysConsts::TIKTOK_KEY);
-        $url            = 'https://newtrackapi.zhuishuyun.com/api/qappuser/register';
+        $url            = env('TIKTOK_API_URL').'api/qappuser/register';
         $response       = $client->request('post', $url, ['form_params' => $params])->getBody()->getContents();
         myLog('qapp_user_register')->info($response);
         $result = json_decode($response);

app/Jobs/QappTikTok/QappTikTokUserCharge.php

@@ -19,7 +19,7 @@ class QappTikTokUserCharge implements ShouldQueue
 
     private $reportParams;
 
-    protected $url = 'https://newtrackapi.zhuishuyun.com/api/qappuser/charge';
+    protected $url;
 
     /**
      * 一般情况都上传
@@ -41,6 +41,7 @@ class QappTikTokUserCharge implements ShouldQueue
     public function __construct(QappTikTokUserChargeRequest $reportParams)
     {
         $this->reportParams = $reportParams;
+        $this->url = env('TIKTOK_API_URL'). 'api/qappuser/charge';
     }
 
     /**

app/Jobs/UserAddDeskJob.php

@@ -48,7 +48,9 @@ class UserAddDeskJob implements ShouldQueue
             'source' => 'zsy'
         ];
         $params['sign'] = _sign($params, SysConsts::TIKTOK_KEY);
-        $url = 'https://newtrackapi.zhuishuyun.com/api/qappuser/addDesk';
+        $url = env('TIKTOK_API_URL').'api/qappuser/addDesk';
+        myLog('user_add_desk')->info(compact('url'));
+        myLog('user_add_desk')->info($params);
         $response =  $client->post($url, ['form_params' => $params])->getBody()->getContents();
         myLog('user_add_desk')->info($response);
         $result =  json_decode($response);

app/Jobs/UserRententionJob.php

@@ -52,7 +52,7 @@ class UserRententionJob implements ShouldQueue
             'source' => 'zsy'
         ];
         $params['sign'] = _sign($params, SysConsts::TIKTOK_KEY);
-        $url = 'https://newtrackapi.zhuishuyun.com/api/qappuser/rentention';
+        $url = env('TIKTOK_API_URL').'api/qappuser/rentention';
         $response =  $client->post($url, ['form_params' => $params])->getBody()->getContents();
         myLog('new_user_rentention')->info($response);
         $result =  json_decode($response);

app/Modules/User/Services/UserService.php

@@ -58,7 +58,7 @@ class UserService
     {
         myLog('incrAddDeskTop')->info('qappAddDesktop', compact('uid', 'status'));
         $log = QappUserAddDestop::where('uid', $uid)->orderBy('id', 'desc')->first();
-        
+
         if (!$log) {
             //第一次加桌 没有任何记录，加桌状态为1
             if($status == 1){