Merge branch 'kuaiyingyong' into kuaiyingyong_push

app/Console/Commands/CodeDemo.php

@@ -0,0 +1,10 @@
+<?php
+
+
+namespace App\Console\Commands;
+
+
+class CodeDemo
+{
+
+}

app/Http/Controllers/QuickApp/Oauth/UsersController.php

@@ -46,14 +46,14 @@ class UsersController extends Controller
      */
     public function index(Request $request)
     {
-        $codeVersion = $request->header('x-codeversion', '');
-        $package = $request->input('package', '');
+        $codeVersion   = $request->header('x-codeversion', '');
+        $package       = $request->input('package', '');
         $send_order_id = $request->input('send_order_id', 0);
-        $device_no = $request->input('device_no', '');
-        $androidid = $request->input('androidid', '');
-        $imei = $request->input('imei', '');
-        $mac = $request->input('mac', '');
-        $device_info = $request->input('device_info', '');
+        $device_no     = $request->input('device_no', '');
+        $androidid     = $request->input('androidid', '');
+        $imei          = $request->input('imei', '');
+        $mac           = $request->input('mac', '');
+        $device_info   = $request->input('device_info', '');
         if ($device_no) {
             $data = (new QappUserService)->login(compact('package', 'send_order_id', 'device_no', 'androidid', 'mac', 'device_info', 'imei', 'codeVersion'));
             return response()->success($data);
@@ -90,8 +90,8 @@ class UsersController extends Controller
     {
         try {
             $old_token = JWTAuth::getToken();
-            $token = JWTAuth::refresh($old_token);
-            $time = strtotime("+1 month");
+            $token     = JWTAuth::refresh($old_token);
+            $time      = strtotime("+1 month");
             return response()->success(compact('token', 'time'));
         } catch (JWTException $e) {
             return response()->error('QAPP_NOT_LOGIN');

app/Http/Controllers/QuickApp/Order/OrdersController.php

@@ -5,8 +5,10 @@ namespace App\Http\Controllers\QuickApp\Order;
 use App\Consts\ErrorConst;
 use App\Libs\Utils;
 use App\Modules\Activity\Models\Activity;
+use App\Modules\SendOrder\Models\QappSendOrder;
 use App\Modules\Statistic\Services\AdVisitStatService;
 use App\Http\Controllers\QuickApp\BaseController;
+use App\Modules\User\Models\User;
 use Illuminate\Http\Request;
 use App\Modules\Subscribe\Services\BookOrderService;
 use App\Modules\Subscribe\Services\ChapterOrderService;
@@ -121,6 +123,18 @@ class OrdersController extends BaseController
         $bid         = $request->input('bid', '');
         $temp        = $bid;
         $template_id = PayTemplateService::getPayTemplate($this->distribution_channel_id);
+
+        // 获取派单id
+        $user        = User::getUser($this->uid);
+        $sendOrderId = getProp($user, 'send_order_id');
+        if ($sendOrderId) {
+            // 方夏青的派单使用，男频充值模板
+            $qappSendOrder = QappSendOrder::getSendOrderById($sendOrderId);
+            if (getProp($qappSendOrder, 'account') === 'fangxq') {
+                $template_id = 10666;
+            }
+        }
+
         $book_config = null;
         if ($bid) {
             $bid         = Hashids::decode($bid)[0];
@@ -183,7 +197,7 @@ class OrdersController extends BaseController
                     continue;
                 }
                 $save_text = '年费vip会员';
-                $text      = '每天1元，全年免费看';
+                $text      = '全年免费看';
                 $temp      = [
                     'price'          => (int)$v->price . '元',
                     'is_year_order'  => 1,

app/Http/Middleware/CheckSign.php

@@ -10,17 +10,16 @@ class CheckSign
     /**
      * Handle an incoming request.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
+     * @param \Illuminate\Http\Request $request
+     * @param \Closure                 $next
      * @return mixed
      */
     public function handle($request, Closure $next)
     {
-        $version = $request->header('X-Version','');
-        $sign = $request->post('sign', '');
+        $sign      = $request->post('sign', '');
         $timestamp = $request->post('timestamp', 0);
-        $key = 'a!A&AFRWT65Nb3NlklezUiqHyQAA@Z8M';
-        $params = $request->except('_url');
+        $key       = 'a!A&AFRWT65Nb3NlklezUiqHyQAA@Z8M';
+        $params    = $request->except('_url');
         if ($timestamp && time() - $timestamp <= (SysConsts::ONE_HOUR_SECONDS * 10) && $sign == _sign($params, $key)) {
             return $next($request);
         } else {

app/Jobs/QappTikTok/QappTikTokUser.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace App\Jobs\QappTikTok;
+
+use App\Consts\SysConsts;
+use GuzzleHttp\Client;
+use Illuminate\Bus\Queueable;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+
+/**
+ * 快应用抖音推广用户
+ */
+class QappTikTokUser implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    private $reportParams;
+
+    /**
+     * QappTikTokUser constructor.
+     * @param QappTikTokUserRequest $reportParams
+     */
+    public function __construct(QappTikTokUserRequest $reportParams)
+    {
+        $this->reportParams = $reportParams;
+    }
+
+    /**
+     * Execute the job.
+     * @throws \GuzzleHttp\Exception\GuzzleException
+     */
+    public function handle()
+    {
+        $client         = new Client();
+        $params         = [
+            'ip'            => $this->reportParams->ip,
+            'device_no'     => $this->reportParams->device_no,
+            'mac'           => $this->reportParams->mac ?? '',
+            'channel_id'    => (int)$this->reportParams->channel_id,
+            'uid'           => (int)$this->reportParams->uid,
+            'register_time' => $this->reportParams->register_time,
+            'is_report'     => (string)$this->reportParams->is_report,
+            'source'        => 'zsy',
+            'send_order_id' => $this->reportParams->send_order_id,
+        ];
+        $params['sign'] = _sign($params, SysConsts::TIKTOK_KEY);
+        $url            = 'https://newtrackapi.zhuishuyun.com/api/qappuser/register';
+        $response       = $client->request('post', $url, ['form_params' => $params])->getBody()->getContents();
+        myLog('qapp_user_register')->info($response);
+        $result = json_decode($response);
+        if ($result) {
+            if ($result->code != 0) {
+                myLog('qapp_user_register')->info($response);
+            }
+        }
+    }
+}

app/Jobs/QappTikTok/QappTikTokUserCharge.php

@@ -0,0 +1,75 @@
+<?php
+
+namespace App\Jobs\QappTikTok;
+
+use App\Consts\SysConsts;
+use GuzzleHttp\Client;
+use Illuminate\Bus\Queueable;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+
+/**
+ * 抖音用户充值
+ */
+class QappTikTokUserCharge implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    private $reportParams;
+
+    protected $url = 'https://newtrackapi.zhuishuyun.com/api/qappuser/charge';
+
+    /**
+     * 一般情况都上传
+     */
+    const COMMON = 'common';
+    /**
+     * 只有当天注册当天充值用户才上传
+     */
+    const CURRENT_DAY_REGISTER = 'current_day_register';
+    /**
+     * 注册24小时之内充值
+     */
+    const REGISTER_24_CHARGE = 'register_24_charge';
+
+    /**
+     * QappTikTokUserCharge constructor.
+     * @param QappTikTokUserChargeRequest $reportParams
+     */
+    public function __construct(QappTikTokUserChargeRequest $reportParams)
+    {
+        $this->reportParams = $reportParams;
+    }
+
+    /**
+     * Execute the job.
+     * @throws \GuzzleHttp\Exception\GuzzleException
+     */
+    public function handle()
+    {
+        $client         = new Client();
+        $params         = [
+            'uid'           => (int)$this->reportParams->uid,
+            'amount'        => (float)$this->reportParams->amount,
+            'pay_time'      => (string)$this->reportParams->pay_time,
+            'type'          => (string)$this->reportParams->type,
+            'book_id'       => (string)$this->reportParams->book_id,
+            'book_name'     => (string)$this->reportParams->book_name,
+            'molecule'      => (int)$this->reportParams->molecule,
+            'denominator'   => (int)$this->reportParams->denominator,
+            'source'        => 'zsy',
+            'send_order_id' => $this->reportParams->send_order_id,
+        ];
+        $params['sign'] = _sign($params, SysConsts::TIKTOK_KEY);
+        $response       = $client->request('post', $this->url, ['form_params' => $params])->getBody()->getContents();
+        myLog('qapp_user_charge')->info($response);
+        $result = json_decode($response);
+        if ($result) {
+            if ($result->code != 0) {
+                myLog('qapp_user_charge')->info($response);
+            }
+        }
+    }
+}

app/Jobs/QappTikTok/QappTikTokUserChargeRequest.php

@@ -0,0 +1,42 @@
+<?php
+
+
+namespace App\Jobs\QappTikTok;
+
+
+class QappTikTokUserChargeRequest
+{
+    // 用户Uid
+    public $uid;
+
+    // 充值金额
+    public $amount;
+
+    // 支付时间
+    public $pay_time;
+
+    // 上报类型
+    public $type;
+
+    // 书籍id
+    public $book_id;
+
+    // 书名
+    public $book_name;
+
+    // 回传类型
+    public $report_type;
+
+    // 回传比例
+    public $report_rate;
+
+    // 派单id
+    public $send_order_id;
+
+    // 分子
+    public $molecule;
+
+    // 分母
+    public $denominator = 100;
+
+}

app/Jobs/QappTikTok/QappTikTokUserRequest.php

@@ -0,0 +1,38 @@
+<?php
+
+
+namespace App\Jobs\QappTikTok;
+
+
+class QappTikTokUserRequest
+{
+    // 用户注册ip地址
+    public $ip;
+
+    // 设备号
+    public $device_no;
+
+    // 设备mac地址
+    public $mac;
+
+    // 渠道号
+    public $channel_id;
+
+    // 用户Uid
+    public $uid;
+
+    // 用户注册时间
+    public $register_time;
+
+    // 回传类型
+    public $report_type;
+
+    // 回传比例
+    public $report_rate;
+
+    // 派单id
+    public $send_order_id;
+
+    // 是否上报
+    public $is_report = true;
+}

app/Jobs/QappTikTokUser.php

@@ -1,73 +0,0 @@
-<?php
-
-namespace App\Jobs;
-
-use App\Consts\SysConsts;
-use GuzzleHttp\Client;
-use Illuminate\Bus\Queueable;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-
-/**
- * 快应用抖音推广用户
- */
-class QappTikTokUser implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    private $ip;
-    private $device_no;
-    private $mac;
-    private $channel_id;
-    private $uid;
-    private $register_time;
-    private $is_report;
-
-    /**
-     * Create a new job instance.
-     *
-     * @return void
-     */
-    public function __construct(string $ip, string $device_no, string $mac, int $channel_id, int $uid, string $register_time, bool $is_report = false)
-    {
-        $this->ip = $ip;
-        $this->device_no = $device_no;
-        $this->mac = $mac;
-        $this->channel_id = $channel_id;
-        $this->uid = $uid;
-        $this->register_time = $register_time;
-        $this->is_report = $is_report;
-    }
-
-    /**
-     * Execute the job.
-     *
-     * @return void
-     */
-    public function handle()
-    {
-        $client = new Client();
-        $params = [
-            'ip' => $this->ip,
-            'device_no' => $this->device_no,
-            'mac' => $this->mac ?? '',
-            'channel_id' => $this->channel_id,
-            'uid' => $this->uid,
-            'register_time' => $this->register_time,
-            'is_report' => (string) $this->is_report,
-            'source' => 'zsy'
-        ];
-        $params['sign'] = _sign($params, SysConsts::TIKTOK_KEY);
-        $url = 'https://newtrackapi.zhuishuyun.com/api/qappuser/register';
-        $response =  $client->request('post', $url, ['form_params' => $params])->getBody()->getContents();
-        myLog('qapp_user_register')->info($response);
-        $result =  json_decode($response);
-        if ($result) {
-            if ($result->code != 0) {
-                myLog('qapp_user_register')->info($response);
-            }
-        }
-    }
-}

app/Jobs/QappTikTokUserCharge.php

@@ -1,96 +0,0 @@
-<?php
-
-namespace App\Jobs;
-
-use App\Consts\SysConsts;
-use GuzzleHttp\Client;
-use Illuminate\Bus\Queueable;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-
-/**
- * 抖音用户充值
- */
-class QappTikTokUserCharge implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    private $uid;
-    private $amount;
-    private $pay_time;
-    private $type;
-    private $book_id;
-    private $book_name;
-    /**
-     * 分子
-     */
-    private $molecule;
-    /**
-     * 分母
-     */
-    private $denominator;
-
-    protected $url = 'https://newtrackapi.zhuishuyun.com/api/qappuser/charge';
-
-    /**
-     * 一般情况都上传
-     */
-    const COMMON = 'common';
-    /**
-     * 只有当天注册当天充值用户才上传
-     */
-    const CURRENT_DAY_REGISTER = 'current_day_register';
-    /**
-     * 注册24小时之内充值
-     */
-    const REGISTER_24_CHARGE = 'register_24_charge';
-
-    /**
-     * Create a new job instance.
-     *
-     * @return void
-     */
-    public function __construct(int $uid, float $amount, string $pay_time, string $type, string $book_id, string $book_name, int $molecule = 1, int $denominator = 1)
-    {
-        $this->uid = $uid;
-        $this->amount = $amount;
-        $this->pay_time = $pay_time;
-        $this->type = $type;
-        $this->book_id = $book_id;
-        $this->book_name = $book_name;
-        $this->molecule = $molecule;
-        $this->denominator = $denominator;
-    }
-
-    /**
-     * Execute the job.
-     *
-     * @return void
-     */
-    public function handle()
-    {
-        $client = new Client();
-        $params = [
-            'uid' => $this->uid,
-            'amount' => $this->amount,
-            'pay_time' => $this->pay_time,
-            'type' => $this->type,
-            'book_id' => $this->book_id,
-            'book_name' => $this->book_name,
-            'molecule' => $this->molecule,
-            'denominator' => $this->denominator,
-            'source' => 'zsy'
-        ];
-        $params['sign'] = _sign($params,  SysConsts::TIKTOK_KEY);
-        $response =  $client->request('post', $this->url, ['form_params' => $params])->getBody()->getContents();
-        myLog('qapp_user_charge')->info($response);
-        $result =  json_decode($response);
-        if ($result) {
-            if ($result->code != 0) {
-                myLog('qapp_user_charge')->info($response);
-            }
-        }
-    }
-}

app/Libs/Helpers.php

@@ -727,6 +727,42 @@ function getProp($param, $key, $default = '')
 }
 
 /**
+ * 求最大公约数 Greatest Common Divisor(GCD)
+ * @param $a
+ * @param $b
+ * @return int
+ */
+function gcd($a, $b)
+{
+    // 防止因除数为0而崩溃
+    if ($a === 0 || $b === 0) {
+        return 1;
+    }
+
+    if ($a % $b === 0) {
+        return $b;
+    }
+
+    return gcd($b, $a % $b);
+}
+
+/**
+ * 格式化比例值
+ * @param $value1
+ * @param $value2
+ * @param $gcd
+ * @return array|float[]|int[]
+ */
+function proportion($value1, $value2, $gcd)
+{
+    if ($gcd === 0) {
+        return [$value1, $value2];
+    }
+
+    return [$value1 / $gcd, $value2 / $gcd];
+}
+
+/**
  * 钉钉通知异常
  * @param $message
  */

app/Modules/SendOrder/Models/QappSendOrder.php

@@ -12,6 +12,8 @@ class QappSendOrder extends Model
         'account',
         'channel_user_id',
         'distribution_channel_id',
+        'report_type',
+        'report_rate',
     ];
 
     /**

app/Modules/Trade/Pay/PaySuccessAbstract.php

@@ -2,9 +2,12 @@
 
 namespace App\Modules\Trade\Pay;
 
-use App\Jobs\QappTikTokUserCharge;
+use App\Jobs\QappTikTok\QappTikTokUserChargeRequest;
+use App\Jobs\QappTikTok\QappTikTokUserCharge;
 use App\Modules\Book\Models\BookConfig;
+use App\Modules\SendOrder\Models\QappSendOrder;
 use App\Modules\Subscribe\Models\Order;
+use App\Modules\User\Models\User;
 use App\Modules\User\Services\ReadRecordService;
 use App\Modules\UserTask\Services\BaseTask;
 use App\Modules\UserTask\Services\UserTaskService;
@@ -14,77 +17,103 @@ use Illuminate\Support\Facades\Log;
 use Redis;
 
 /**
- * 
+ *
  * @property \App\Modules\Subscribe\Models\Order $order
  */
 abstract class PaySuccessAbstract
 {
-   protected $order;
+    protected $order;
 
-   /**
-    * 处理支付成功的逻辑
-    */
-   abstract protected function handlePayProcess();
+    /**
+     * 处理支付成功的逻辑
+     */
+    abstract protected function handlePayProcess();
 
-   public function __construct(Order $order)
-   {
-      $this->order = $order;
-   }
+    public function __construct(Order $order)
+    {
+        $this->order = $order;
+    }
 
-   /**
-    * 支付成功入口
-    */
-   public function success()
-   {
-      try {
-         DB::beginTransaction();
-         $this->setOrderSuccess();
-         $this->handlePayProcess();
-         DB::commit();
-         $this->addQueue();
-         return true;
-      } catch (Exception $e) {
-         DB::rollback();
-         Log::error('pay.success: ' . $e->getMessage() . ' ' . $e->getTraceAsString());
-      }
-   }
+    /**
+     * 支付成功入口
+     */
+    public function success()
+    {
+        try {
+            DB::beginTransaction();
+            $this->setOrderSuccess();
+            $this->handlePayProcess();
+            DB::commit();
+            $this->addQueue();
+            return true;
+        } catch (Exception $e) {
+            DB::rollback();
+            Log::error('pay.success: ' . $e->getMessage() . ' ' . $e->getTraceAsString());
+        }
+    }
 
-   /**
-    * 设置order成功
-    */
-   protected function setOrderSuccess()
-   {
-      $this->order->pay_type = $this->getChargeTimes();
-      $this->order->status = 'PAID';
-      $this->order->pay_end_at = date('Y-m-d H:i:s');
-      $this->order->save();
-   }
+    /**
+     * 设置order成功
+     */
+    protected function setOrderSuccess()
+    {
+        $this->order->pay_type   = $this->getChargeTimes();
+        $this->order->status     = 'PAID';
+        $this->order->pay_end_at = date('Y-m-d H:i:s');
+        $this->order->save();
+    }
 
-   /**
-    * 获取用户第几次充值
-    * @param $uid
-    * @return int
-    */
-   private function getChargeTimes()
-   {
-      $count = Order::where('uid', $this->order->uid)->where('status', 'PAID')->count('id');
-      return $count + 1;
-   }
+    /**
+     * 获取用户第几次充值
+     * @param $uid
+     * @return int
+     */
+    private function getChargeTimes()
+    {
+        $count = Order::where('uid', $this->order->uid)->where('status', 'PAID')->count('id');
+        return $count + 1;
+    }
 
-   private function getReportType(int $channel_id)
-   {
-      return Redis::hGet('channel:setting:' . $channel_id, 'tiktok_report_type') ??  QappTikTokUserCharge::CURRENT_DAY_REGISTER;
-   }
+    private function getReportType(int $channel_id)
+    {
+        return Redis::hGet('channel:setting:' . $channel_id, 'tiktok_report_type') ?? QappTikTokUserCharge::CURRENT_DAY_REGISTER;
+    }
 
 
-   protected function addQueue()
-   {
-      UserTaskService::addUserTaskQueue($this->order->uid, BaseTask::charge, UserTaskService::judge_trigger);
-      $bid = ReadRecordService::getSimpleFirstReadRecord($this->order->uid);
-      $book_id = book_hash_encode($bid);
-      $book = BookConfig::where('bid', $bid)->select('book_name')->first();
-      $book_name = $book ? $book->book_name : '';
-      $job = new QappTikTokUserCharge($this->order->uid, $this->order->price, $this->order->created_at, $this->getReportType($this->order->distribution_channel_id), $book_id, $book_name);
-      dispatch($job->onConnection('rabbitmq')->onQueue('qapp_tiktok_user_charge_queue'));
-   }
+    protected function addQueue()
+    {
+        UserTaskService::addUserTaskQueue($this->order->uid, BaseTask::charge, UserTaskService::judge_trigger);
+        $bid       = ReadRecordService::getSimpleFirstReadRecord($this->order->uid);
+        $book_id   = book_hash_encode($bid);
+        $book      = BookConfig::where('bid', $bid)->select('book_name')->first();
+        $book_name = $book ? $book->book_name : '';
+
+        // 取用户注册的派单id，派单信息
+        $user           = User::getUser($this->order->uid);
+        $sendOrderId    = getProp($user, 'send_order_id');
+        $quickSendOrder = QappSendOrder::getSendOrderById($sendOrderId);
+        $reportType     = getProp($quickSendOrder, 'report_type');
+        $reportRate     = (int)getProp($quickSendOrder, 'report_rate', 100);
+
+        // 队列处理回传业务
+        $tikTokChargeRequest                = new QappTikTokUserChargeRequest();
+        $tikTokChargeRequest->uid           = $this->order->uid;
+        $tikTokChargeRequest->amount        = $this->order->price;
+        $tikTokChargeRequest->pay_time      = $this->order->created_at;
+        $tikTokChargeRequest->type          = $reportType ?: $this->getReportType($this->order->distribution_channel_id);
+        $tikTokChargeRequest->book_id       = $book_id;
+        $tikTokChargeRequest->book_name     = $book_name;
+        $tikTokChargeRequest->send_order_id = $sendOrderId;
+        $tikTokChargeRequest->molecule      = $reportRate;
+
+        // 求最大公约数、格式化比例值
+        $molecule    = $reportRate;
+        $denominator = $tikTokChargeRequest->denominator;
+        $gcd         = gcd($molecule, $denominator);
+        [$tikTokChargeRequest->molecule, $tikTokChargeRequest->denominator] = proportion($molecule, $denominator, $gcd);
+
+        // 需要跟派单设置的回传类型一致才上报
+        $job = new QappTikTokUserCharge($tikTokChargeRequest);
+        dispatch($job->onConnection('rabbitmq')->onQueue('qapp_tiktok_user_charge_queue'));
+    }
 }

app/Modules/User/Services/QappUserService.php

@@ -6,7 +6,8 @@ namespace App\Modules\User\Services;
 use App\Cache\Lock\LockCache;
 use App\Consts\ErrorConst;
 use App\Consts\QuickConst;
-use App\Jobs\QappTikTokUser;
+use App\Jobs\QappTikTok\QappTikTokUserRequest;
+use App\Jobs\QappTikTok\QappTikTokUser;
 use App\Libs\Utils;
 use App\Modules\User\Models\QappPackage;
 use App\Modules\User\Models\QappUser;
@@ -191,8 +192,22 @@ class QappUserService
             ]);
             $qapp_user->user = $user;
             DB::commit();
-            $job = new QappTikTokUser($user->register_ip, $data['device_no'], $data['mac'], $channel_id, $user->id, $user->created_at, true);
+
+            // 队列处理回传业务
+            $tikTokRegisterRequest                = new QappTikTokUserRequest();
+            $tikTokRegisterRequest->ip            = $user->register_ip;
+            $tikTokRegisterRequest->device_no     = $data['device_no'];
+            $tikTokRegisterRequest->mac           = $data['mac'];
+            $tikTokRegisterRequest->channel_id    = $channel_id;
+            $tikTokRegisterRequest->uid           = $user->id;
+            $tikTokRegisterRequest->register_time = $user->created_at->format('Y-m-d H:i:s');
+            $tikTokRegisterRequest->send_order_id = $data['send_order_id'];
+            myLog('qapp_register')->info('', compact('tikTokRegisterRequest'));
+
+            // 回传业务
+            $job = new QappTikTokUser($tikTokRegisterRequest);
             dispatch($job->onConnection('rabbitmq')->onQueue('qapp_tiktok_user_register_queue'));
+
             UserTaskService::addUserTaskQueue($user->id, BaseTask::register, UserTaskService::add_trigger);
             return $qapp_user;
         } catch (Exception $e) {

config/audit.php

@@ -8,4 +8,12 @@ return [
         'brand'       => 'huawei',
         'codeVersion' => '0.0.2'
     ],
+    'com.app.kyy.jdqyy' => [
+        'brand'       => 'huawei',
+        'codeVersion' => '0.0.2'
+    ],
+    'com.app.kyy.qnxs' => [
+        'brand'       => 'huawei',
+        'codeVersion' => '0.0.2'
+    ],
 ];

resources/views/qapp/start.blade.php

@@ -8,7 +8,7 @@
     <meta name="viewport"
           content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0,viewport-fit=cover" />
     <script src="//cdn-novel.iycdm.com/static/jquery-3.4.1.min.js" type="text/javascript"></script>
-	<script type="text/javascript" src="//statres.quickapp.cn/quickapp/js/routerinline.min.js"></script>
+    <script type="text/javascript" src="//statres.quickapp.cn/quickapp/js/routerinline.min.js"></script>
 </head>
 
 <body>
@@ -313,6 +313,13 @@
     //显示公众号落地页
     function showH5Page() {
         var time = QYY.isIos ? 0 : 5000;
+        //2S后自动刷新
+        setTimeout(function () {
+            if(!getQueryString('isResh')){
+                location.href= window.location.href + '?isResh=1'
+            }
+        },1700)
+        //5秒显示失败页面
         setTimeout(function () {
             $(".content-wrap").show();
             showPop(false);
@@ -335,10 +342,11 @@
         };
         try {
             if(QYY.isWx){
-			  appRouter(QYY.packName, "/" + QYY.entry, parmas);
-			}else{
-			  routerAHap(parmas); 
-			}
+                appRouter(QYY.packName, "/" + QYY.entry, parmas);
+            }else{
+                routerAHap(parmas);
+                appRouter(QYY.packName, "/" + QYY.entry, parmas);
+            }
             //尝试直接拉起
         } catch (e) {
             //唤醒失败 尝试url sheme唤醒
@@ -360,7 +368,7 @@
         );
         document.body.appendChild(ohapa);
         ohapa.click();
-		
+
     }
     //初始化
     function startDeep() {
@@ -388,14 +396,14 @@
         $(".open-conetent").height($(".open-conetent").width() * 0.75);
         //华为手机显示提示页
         // if (glob.isHuaWei) {
-            // setTimeout(function () {
-                // hwPage.init();
-                // showPop(false);
-            // }, 3000);
+        // setTimeout(function () {
+        // hwPage.init();
+        // showPop(false);
+        // }, 3000);
         // } else {}
-		setTimeout(function(){
-			startDeep();
-		},400)
+        setTimeout(function(){
+            startDeep();
+        },400)
     });
 </script>
 </body>