fix

app/Console/Commands/Push/PushTest.php

@@ -20,7 +20,7 @@ class PushTest extends Command
      *
      * @var string
      */
-    protected $signature = 'push:test {uid} {url}';
+    protected $signature = 'push:test {uid}';
 
     /**
      * The console command description.
@@ -36,7 +36,6 @@ class PushTest extends Command
     {
         // 用户Uid
         $uid = $this->argument('uid');
-        $url = $this->argument('url');
 
         // 获取用户push信息
         $pushUser  = QappPushUser::getPushUserByUid($uid);
@@ -63,15 +62,13 @@ class PushTest extends Command
         var_dump('app_key:' . $appKey);
         var_dump('master_secret:' . $masterSecret);
 
-        $title   = '这是' . $name . '标题';
-        $content = '这是' . $name . '内容，创建于' . date('Y-m-d H:i:s');
-        $url     = $url ?: '/views/Reader';
-        $params  = ['send_order_id' => 1643289, 'bid' => 'vdqY7p15xnZQzK4VzzgmMD6wG2yr8BNX', 'chapter_id' => 4774851];
+        $title   = 'this title';
+        $content = 'this content ' . date('Y-m-d H:i:s');
+        $url     = '/views/Reader?send_order_id=1643289&bid=vdqY7p15xnZQzK4VzzgmMD6wG2yr8BNX&chapter_id=4774851';
         var_dump('uid:' . $uid);
         var_dump('title:' . $title);
         var_dump('content:' . $content);
         var_dump('url:' . $url);
-        var_dump('params:' . json_encode($params));
         var_dump('reg id:' . $regId);
 
         $result = [];
@@ -84,7 +81,8 @@ class PushTest extends Command
 
                     // 循环推送
                     $client->setToken($regIdList);
-                    $result = $client->sendPushMessage($title, $content, $url, $params);
+                    $client->setFastAppTarget(1);
+                    $result = $client->sendPushMessage($title, $content, $url);
                     break;
                 // 小米
                 case PushConst::PROVIDER_MI:
@@ -99,7 +97,7 @@ class PushTest extends Command
                 case PushConst::PROVIDER_OPPO:
                     // 初始化oppo推送
                     $client    = new OPPOPushCommon($appKey, $masterSecret);
-                    $messageId = $client->getMessageId($title, $content, $url, $params);
+                    $messageId = $client->getMessageId($title, $content, $url);
 
                     // 循环推送
                     $client->setRegArr($regIdList);

app/Console/Kernel.php

@@ -55,6 +55,6 @@ class Kernel extends ConsoleKernel
         });
 
         // 推送任务每分钟执行
-        // $schedule->command('push:task')->everyMinute()->sendOutputTo(storage_path('pushCommand-' . date('Y-m-d')));
+        $schedule->command('push:task')->everyMinute()->sendOutputTo(storage_path('pushCommand-' . date('Y-m-d')));
     }
 }

app/Consts/ErrorConst.php

@@ -36,4 +36,7 @@ class ErrorConst
     const PUSH_TASK_LOGS_NOT_FOUND          = '10006:无有效子任务';
     const PUSH_APP_NOT_SET                  = '10007:未设置推送应用';
     const PUSH_FAIELD                       = '10008:推送失败，请联系管理员';
+
+    // 业务相关
+    const QAPP_LOGIN_FREQUENTLY              = '10028:并发登录限制';
 }

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

@@ -46,6 +46,7 @@ class UsersController extends Controller
      */
     public function index(Request $request)
     {
+        $codeVersion = $request->header('x-codeversion', '');
         $package = $request->input('package', '');
         $send_order_id = $request->input('send_order_id', 0);
         $device_no = $request->input('device_no', '');
@@ -54,7 +55,7 @@ class UsersController extends Controller
         $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'));
+            $data = (new QappUserService)->login(compact('package', 'send_order_id', 'device_no', 'androidid', 'mac', 'device_info', 'imei', 'codeVersion'));
             return response()->success($data);
         } else {
             return response()->error('PARAM_ERROR');

app/Http/Routes/QuickApp/QuickAppRoutes.php

@@ -15,23 +15,33 @@ Route::group(['domain' => env('QUICKAPP_DOMAIN'), 'namespace' => 'App\Http\Contr
         Route::post('login', 'Oauth\UsersController@index');
     });
 
-    // 全局配置
-    Route::get('api/options', 'WelcomeController@getOptions');
+    // 无需登录的接口
+    Route::group(['prefix' => 'api'], function () {
+        // 全局配置
+        Route::get('options', 'WelcomeController@getOptions');
 
-    Route::group(['prefix' => 'api', 'middleware' => 'jwttoken'], function () {
-        //首页
+        // 首页
         Route::get('books/{sex}/index', 'Book\BookController@getBookLists');
-        //书库
-        Route::get('books/recommen', 'Book\BookController@recommen');
+
+        // 书库
         Route::get('books/library', 'Book\BookController@library');
-        //相似推荐
+
+        // 分类列表
+        Route::get('books/getCategory', 'Book\BookCategoryController@getCategory');
+
+        // 相似推荐
         Route::get('books/similar', 'Book\BookController@similarRecom');
+    });
+
+    Route::group(['prefix' => 'api', 'middleware' => 'jwttoken'], function () {
+        // 客服相关
+        Route::get('customer_img', 'WelcomeController@getCustomerServiceImg');
+        //书库
+        Route::get('books/recommen', 'Book\BookController@recommen');
         //阅读完后的推荐
         Route::get('books/readOverRecommend', 'Book\BookController@readOverRecommend');
         //排行榜
         Route::get('books/rank', 'Book\BookController@rank');
-        //分类列表
-        Route::get('books/getCategory', 'Book\BookCategoryController@getCategory');
         //图书详情
         Route::get('book/{bid}', 'Book\BookController@index');
         //目录不分页
@@ -93,7 +103,6 @@ Route::group(['domain' => env('QUICKAPP_DOMAIN'), 'namespace' => 'App\Http\Contr
         //删除快捷方式
         Route::get('shortcut/delete', 'User\ShortcutController@delete');
 
-        Route::get('customer_img', 'WelcomeController@getCustomerServiceImg');
     });
 
     // 推送

app/Libs/Pay/Merchants/AliPay.php

@@ -79,7 +79,7 @@ class AliPay implements PayMerchantInterface
 
     public function notify(array $data)
     {
-        if (isset($data['sign'])) {
+        if (isset($data['sign']) && isset($data['trade_status'])  && $data['trade_status'] == 'TRADE_SUCCESS') {
             return $this->aop->rsaCheckV1($data, $this->rsaPublicKeyFilePath, self::SIGN_TYPE);
         } else {
             return false;

app/Libs/Push/HuaWei/Admin/Application.php

@@ -88,7 +88,7 @@ class Application
     private function logPush($className, $message, $data = [])
     {
         var_dump('[' . $className . '] ' . $message, $data);
-        myLog('push')->info('[HuaWei] [' . $className . '] ' . $message, $data);
+        myLog('push')->info('[HuaWei] [' . $className . '] ' . $message, compact('data'));
     }
 
     private function is_token_expired()

app/Libs/Push/HuaWei/Admin/PushLogConfig.php

@@ -24,19 +24,19 @@ class PushLogConfig
 
     private function __construct()
     {
-        $this->LogFile = @fopen(Constants::HW_PUSH_LOG_FILE_NAME, 'a+');
-        if (! is_resource($this->LogFile)) {
-            throw new Exception(Constants::HW_PUSH_LOG_FILE_NAME . 'invalid file Stream');
-        }
+//        $this->LogFile = @fopen(Constants::HW_PUSH_LOG_FILE_NAME, 'a+');
+//        if (!is_resource($this->LogFile)) {
+//            throw new Exception(Constants::HW_PUSH_LOG_FILE_NAME . 'invalid file Stream');
+//        }
 
-        fwrite($this->LogFile, $this->logBanner);
+//        fwrite($this->LogFile, $this->logBanner);
 
         $pushConfig = PushConfig::getSingleInstance();
 
-        $this->default_log_level = $pushConfig->HW_DEFAULT_LOG_LEVEL;
-        if (empty($this->default_log_level)){
-            $this->default_log_level = Constants::HW_PUSH_LOG_INFO_LEVEL;
-        }
+//        $this->default_log_level = $pushConfig->HW_DEFAULT_LOG_LEVEL;
+//        if (empty($this->default_log_level)) {
+//            $this->default_log_level = Constants::HW_PUSH_LOG_INFO_LEVEL;
+//        }
     }
 
     /**
@@ -45,7 +45,7 @@ class PushLogConfig
     public static function getSingleInstance()
     {
         static $obj;
-        if (! isset($obj)) {
+        if (!isset($obj)) {
             $obj = new PushLogConfig();
         }
         return $obj;
@@ -56,6 +56,7 @@ class PushLogConfig
      */
     public function LogMessage($msg, $logLevel = Constants::HW_PUSH_LOG_INFO_LEVEL, $module = null, $timeZone = 'Asia/shanghai', $timeFormat = "%Y-%m-%d %H:%M:%S")
     {
+        return;
         if (empty($logLevel)) {
             $logLevel = Constants::HW_PUSH_LOG_INFO_LEVEL;
         }
@@ -64,12 +65,12 @@ class PushLogConfig
             return;
         }
         date_default_timezone_set($timeZone);
-        $time = strftime($timeFormat, time());
-        $msg = str_replace("\t", '', $msg);
-        $msg = str_replace("\n", '', $msg);
+        $time        = strftime($timeFormat, time());
+        $msg         = str_replace("\t", '', $msg);
+        $msg         = str_replace("\n", '', $msg);
         $strLogLevel = $this->levelToString($logLevel);
         if (isset($module)) {
-            $module = '[' . str_pad(str_replace(array(
+            $module  = '[' . str_pad(str_replace(array(
                     "\n",
                     "\t"
                 ), array(

app/Libs/Push/HuaWei/HwPushCommon.php

@@ -185,7 +185,7 @@ class HwPushCommon
         $instanceAppPushBody->title($title);
         $instanceAppPushBody->description($desc);
         $instanceAppPushBody->page($pageUrl);
-        $instanceAppPushBody->params($params);
+        $instanceAppPushBody->params((object)[]);
 
         // 设置是否震动和显示呼吸灯
         $instanceAppRingTone = new InstanceAppRingTone();
@@ -208,9 +208,9 @@ class HwPushCommon
     private function createAndroidConfig(): AndroidConfig
     {
         $android_config = new AndroidConfig();
-        $android_config->collapse_key(-1);
-        $android_config->urgency(AndroidConfigDeliveryPriority::PRIORITY_HIGH);
-        $android_config->bi_tag('app');
+//        $android_config->collapse_key(-1);
+//        $android_config->urgency(AndroidConfigDeliveryPriority::PRIORITY_HIGH);
+//        $android_config->bi_tag('app');
         $android_config->fast_app_target($this->_fast_app_target);
         $android_config->buildFields();
         return $android_config;

app/Libs/Push/OPPOPush/OPPOPushCommon.php

@@ -65,11 +65,10 @@ class OPPOPushCommon
      * @param       $title
      * @param       $content
      * @param       $url
-     * @param array $params
      * @return mixed|string
      * @throws GuzzleException
      */
-    public function getMessageId($title, $content, $url, $params = [])
+    public function getMessageId($title, $content, $url)
     {
         // 组装数据
         $pushMessage = new PushMessage();
@@ -291,7 +290,7 @@ class OPPOPushCommon
 
         // reg_id 批量
         if ((int)$targetType === 2 && $this->_reg_arr) {
-            $param['target_value'] = implode(',', $this->_reg_arr);
+            $param['target_value'] = implode(';', $this->_reg_arr);
         }
 
         // 请求数据

app/Libs/Push/OPPOPush/PushMessage.php

@@ -197,6 +197,7 @@ class PushMessage
             'content',
             'click_action_type',
             'click_action_activity',
+            'action_parameters',
             'channel_id',
             'auth_token'
         ];

app/Libs/Push/XMPush/MiPushCommon.php

@@ -4,6 +4,11 @@
 namespace App\Libs\Push\XMPush;
 
 
+/**
+ * 文档地址：https://dev.mi.com/console/doc/detail?pId=1783
+ * Class MiPushCommon
+ * @package App\Libs\Push\XMPush
+ */
 class MiPushCommon
 {
     private $_reg_arr = [];
@@ -29,14 +34,14 @@ class MiPushCommon
      * 发送消息
      * @param $title
      * @param $desc
-     * @param $url
+     * @param $url  // 参考 /views/Reader?send_order_id=1643289&bid=vdqY7p15xnZQzK4VzzgmMD6wG2yr8BNX&chapter_id=4774851
      * @return mixed
      */
     public function sendMessage($title, $desc, $url)
     {
         $sender  = new Sender();
         $message = $this->buildMessage($title, $desc, $url);
-        $result  = $sender->sendToIds($message, $this->_reg_arr)->getRaw();
+        $result  = $sender->sendHybridMessageByRegId($message, $this->_reg_arr)->getRaw();
 
         $this->logPush(__FUNCTION__, 'result', compact('result'));
         return $result;
@@ -73,10 +78,10 @@ class MiPushCommon
         $message->title($title);  // 通知栏的title
         $message->description($desc); // 通知栏的descption
         $message->passThrough($pusType);  // 这是一条通知栏消息，如果需要透传，把这个参数设置成1,同时去掉title和descption两个参数
-        $message->payload($payload); // 携带的数据，点击后将会通过客户端的receiver中的onReceiveMessage方法传入。
-        $message->extra(Builder::intentUri, $url); // 此处设置预定义点击行为，1为打开app
-        $message->extra(Builder::notifyEffect, 2); // 此处设置预定义点击行为，1为打开app 2通知栏点击后打开app的任一Activity
-        $message->extra(Builder::notifyForeground, 1); // 应用在前台是否展示通知，如果不希望应用在前台时候弹出通知，则设置这个参数为0
+        $message->notifyType(1);
+        $message->extra(Builder::HYBRID_PATH, $url); // 此处设置预定义点击行为，1为打开app
+//        $message->extra(Builder::notifyEffect, 2); // 此处设置预定义点击行为，1为打开app 2通知栏点击后打开app的任一Activity
+//        $message->extra(Builder::notifyForeground, 1); // 应用在前台是否展示通知，如果不希望应用在前台时候弹出通知，则设置这个参数为0
         $message->extra(Builder::flowControl, 3000); // 设置平滑推送, 推送速度3000每秒(qps=3000)
         $message->notifyId(2); // 通知类型。最多支持0-4 5个取值范围，同样的类型的通知会互相覆盖，不同类型可以在通知栏并存
         $message->build();

app/Modules/Push/Services/PushMessageService.php

@@ -23,11 +23,11 @@ class PushMessageService
      * @param $title
      * @param $content
      * @param $url
-     * @return bool
+     * @return array|bool|mixed|string|null
      * @throws ApiException
      * @throws GuzzleException
      */
-    public static function pushMessageToUser($uid, $title, $content, $url): bool
+    public static function pushMessageToUser($uid, $title, $content, $url)
     {
         // 获取用户push信息
         $pushUser  = QappPushUser::getPushUserByUid($uid);

app/Modules/Push/Services/PushService.php

@@ -4,6 +4,7 @@
 namespace App\Modules\Push\Services;
 
 
+use App\Cache\Lock\LockCache;
 use Exception;
 use App\Cache\PushCache;
 use App\Consts\PushConst;
@@ -31,8 +32,9 @@ class PushService
     public static function setUserRegId($uid, string $regId, string $provider, string $package): bool
     {
         // push服务商（转小写）
-        $provider = strtolower($provider);
-        if (empty($uid) || empty($regId) || empty($package) || empty($provider) || $package !== 'com.app.kyy.xnyd') {
+        $provider      = strtolower($provider);
+        $validPackages = ['com.app.kyy.xnyd', 'com.beidao.kuaiying.zsy'];
+        if (empty($uid) || empty($regId) || empty($package) || empty($provider) || !in_array($package, $validPackages, true)) {
             return false;
         }
 
@@ -44,6 +46,15 @@ class PushService
             return true;
         }
 
+        // 加锁
+        $token = md5($provider . ':' . $regId);
+        $lock  = LockCache::getLock($token, 3);
+        if (!$lock) {
+            return false;
+        }
+
+        myLog('push')->info('setUserRegId', compact('uid', 'regId', 'provider', 'token', 'lock'));
+
         // 获取包信息
         $packageInfo = QappPackage::getPackageByPackage($package);
         $packageId   = getProp($packageInfo, 'id');
@@ -90,6 +101,9 @@ class PushService
             PushCache::setUserPushRegId($uid, $regId);
         }
 
+        // 释放锁
+//        LockCache::releaseLock($token);
+
         return $result;
     }
 

app/Modules/User/Services/QappUserService.php

@@ -3,8 +3,11 @@
 
 namespace App\Modules\User\Services;
 
+use App\Cache\Lock\LockCache;
+use App\Consts\ErrorConst;
 use App\Consts\QuickConst;
 use App\Jobs\QappTikTokUser;
+use App\Libs\Utils;
 use App\Modules\User\Models\QappPackage;
 use App\Modules\User\Models\QappUser;
 use App\Modules\User\Models\User;
@@ -24,24 +27,45 @@ class QappUserService
      */
     public function login(array $data)
     {
+        $codeVersion   = getProp($data, 'codeVersion');
+        $lockToken     = '';
         $isNewRegister = false;
-        $device_no = $data['device_no'];
-        $channel_id = $this->findChannelId($data['package']);
-        $qapp_user = $this->getQAppUserByDeviceNo($device_no, $channel_id);
+        $device_no     = $data['device_no'];
+        $channel_id    = $this->findChannelId($data['package']);
+        $qapp_user     = $this->getQAppUserByDeviceNo($device_no, $channel_id);
         if (!$qapp_user) {
+            // 判断版本号，大于等于1.0.0才做处理
+            if (version_compare($codeVersion, '1.0.0', '>=')) {
+                // 加锁3秒，否则报错
+                $lockToken = md5($device_no . ':' . $channel_id);
+                $lock      = LockCache::getLock($lockToken, 3);
+                if (!$lock) {
+                    Utils::throwError(ErrorConst::QAPP_LOGIN_FREQUENTLY);
+                }
+            }
+
+            myLog('login')->info('register', compact('codeVersion', 'device_no', 'channel_id', 'lockToken'));
+
+            // 初始化新用户
             $isNewRegister = true;
             $qapp_user     = $this->createQuickAppUser($data);
         }
-        $user = $qapp_user->user;
-        $uid = $user->id;
-        $time = strtotime("+1 month");
+        $user  = $qapp_user->user;
+        $uid   = $user->id;
+        $time  = strtotime("+1 month");
         $token = JWTAuth::fromUser($user);
         if ($data['send_order_id']) {
             UserService::setUserSendOrder($uid, $data['send_order_id']);
         }
         // 新注册统计
         if ($isNewRegister && $qapp_user) {
+            // 注册统计
             QappAddDeskTopService::incrAddDeskTop($uid, QuickConst::FIELD_REGISTER);
+
+            // 释放锁
+//            if ($lockToken) {
+//                LockCache::releaseLock($lockToken);
+//            }
         }
         return compact('token', 'time', 'uid');
     }
@@ -69,7 +93,7 @@ class QappUserService
                     if ($version == "1.0") {
                         User::where('id', $uid)->update(
                             [
-                                'balance' => DB::raw('balance+' . $reward),
+                                'balance'        => DB::raw('balance+' . $reward),
                                 'reward_balance' => DB::raw('reward_balance+' . $reward)
                             ]
                         );
@@ -89,17 +113,17 @@ class QappUserService
 
     public function setGolableUser(int $uid)
     {
-        $user_info = $this->getQAppUserByUid($uid);
-        $qapp_user = app()->make('qapp_user');
-        $qapp_user->id = $user_info->id;
-        $qapp_user->uid = $user_info->uid;
-        $qapp_user->send_order_id = $user_info->send_order_id;
-        $qapp_user->device_no = $user_info->device_no;
-        $qapp_user->device_info = $user_info->device_info;
-        $qapp_user->phone = $user_info->phone;
-        $qapp_user->user = $user_info->user;
+        $user_info                     = $this->getQAppUserByUid($uid);
+        $qapp_user                     = app()->make('qapp_user');
+        $qapp_user->id                 = $user_info->id;
+        $qapp_user->uid                = $user_info->uid;
+        $qapp_user->send_order_id      = $user_info->send_order_id;
+        $qapp_user->device_no          = $user_info->device_no;
+        $qapp_user->device_info        = $user_info->device_info;
+        $qapp_user->phone              = $user_info->phone;
+        $qapp_user->user               = $user_info->user;
         $qapp_user->app_pay_merchat_id = $user_info->app_pay_merchat_id;
-        $qapp_user->h5_pay_merchat_id = $user_info->h5_pay_merchat_id;
+        $qapp_user->h5_pay_merchat_id  = $user_info->h5_pay_merchat_id;
         $qapp_user->ali_pay_merchat_id = $user_info->ali_pay_merchat_id;
     }
 
@@ -110,7 +134,7 @@ class QappUserService
     {
         $qapp_user = QappUser::where('device_no', $device_no)->where('channel_id', $channel_id)->first();
         if ($qapp_user) {
-            $user = User::find($qapp_user->uid);
+            $user            = User::find($qapp_user->uid);
             $qapp_user->user = $user;
         }
         return $qapp_user;
@@ -123,12 +147,12 @@ class QappUserService
     {
         $qapp_user = QappUser::where('uid', $uid)->first();
         if ($qapp_user) {
-            $user = User::find($uid);
-            $qapp_user->user = $user;
-            $qapp_user->send_order_id = UserService::getUserSendOrder($uid);
-            $package_info = QappPackage::where('channel_id', $user->distribution_channel_id)->first();
+            $user                          = User::find($uid);
+            $qapp_user->user               = $user;
+            $qapp_user->send_order_id      = UserService::getUserSendOrder($uid);
+            $package_info                  = QappPackage::where('channel_id', $user->distribution_channel_id)->first();
             $qapp_user->app_pay_merchat_id = $package_info->app_pay_merchat_id;
-            $qapp_user->h5_pay_merchat_id = $package_info->h5_pay_merchat_id;
+            $qapp_user->h5_pay_merchat_id  = $package_info->h5_pay_merchat_id;
             $qapp_user->ali_pay_merchat_id = $package_info->ali_pay_merchat_id;
         }
         return $qapp_user;
@@ -142,16 +166,16 @@ class QappUserService
     {
         try {
             DB::beginTransaction();
-            $user = $this->createUser($data);
-            $channel_id = $user->distribution_channel_id;
-            $qapp_user = QappUser::firstOrCreate([
-                'device_no' => $data['device_no'],
+            $user            = $this->createUser($data);
+            $channel_id      = $user->distribution_channel_id;
+            $qapp_user       = QappUser::firstOrCreate([
+                'device_no'  => $data['device_no'],
                 'channel_id' => $channel_id,
             ], [
-                'imei' => $data['imei'],
-                'androidid' => $data['androidid'],
-                'mac' => $data['mac'],
-                'uid' => $user->id,
+                'imei'        => $data['imei'],
+                'androidid'   => $data['androidid'],
+                'mac'         => $data['mac'],
+                'uid'         => $user->id,
                 'device_info' => $data['device_info'],
             ]);
             $qapp_user->user = $user;
@@ -170,7 +194,7 @@ class QappUserService
         $channel_id = env('QUICKAPP_SITE');
         if ($package) {
             $package_info = QappPackage::where('package', $package)->first();
-            $channel_id = $package_info ? $package_info->channel_id : $channel_id;
+            $channel_id   = $package_info ? $package_info->channel_id : $channel_id;
         }
         return $channel_id;
     }
@@ -180,13 +204,13 @@ class QappUserService
      */
     private function createUser(array $data)
     {
-        $openid = $data['device_no'];
-        $unionid = $data['device_no'];
-        $register_ip = _getIp();
+        $openid                  = $data['device_no'];
+        $unionid                 = $data['device_no'];
+        $register_ip             = _getIp();
         $distribution_channel_id = $this->findChannelId($data['package']);
-        $send_order_id = $data['send_order_id'];
-        $unique_key = compact('unionid', 'distribution_channel_id');
-        $data = compact('openid', 'register_ip', 'send_order_id');
+        $send_order_id           = $data['send_order_id'];
+        $unique_key              = compact('unionid', 'distribution_channel_id');
+        $data                    = compact('openid', 'register_ip', 'send_order_id');
         return User::firstOrCreate($unique_key, $data);
     }
 }

app/Modules/UserTask/Services/BaseTask.php

@@ -135,6 +135,7 @@ abstract class BaseTask
                 DB::commit();
                 return 1;
             } catch (Exception $e) {
+                myLog('user_task')->error($e->getMessage());
                 DB::rollback();
                 return -1;
             }

app/Modules/UserTask/Services/SingleTask.php

@@ -3,6 +3,7 @@
 namespace App\Modules\UserTask\Services;
 
 use App\Modules\UserTask\Models\UserTask;
+use Exception;
 
 /**
  * 单次任务
@@ -16,13 +17,17 @@ class SingleTask extends BaseTask
 
     public function addUserTask()
     {
-        UserTask::create([
-            'uid' => $this->uid,
-            'task_id' => $this->task->id,
-            'status' => self::up_status,
-            'type' => $this->task->reward_type,
-            'value' => $this->task->value,
-        ]);
+        try {
+            UserTask::create([
+                'uid' => $this->uid,
+                'task_id' => $this->task->id,
+                'status' => self::up_status,
+                'type' => $this->task->reward_type,
+                'value' => $this->task->value,
+            ]);
+        } catch (Exception $e) {
+            myLog('add_task')->error($e->getMessage());
+        }
     }
 
     public function findUserTask(int $status)

config/error.php

@@ -216,4 +216,5 @@ return [
         'APP_CREATE_WECHAT_ORDER_FAIL' => ['code' => 10025, 'msg' => '微信订单创建失败'],
         'NO_REWARD' => ['code' => 10026, 'msg' => '不符合领取条件！'],
         'REWARD_GOTTEN_ERROR' => ['code' => 10027, 'msg' => '获取奖励失败！'],
+        'QAPP_LOGIN_FREQUENTLY_ERROR' => ['code' => 10028, 'msg' => '并发登录限制！'],
 ];