zz 6 years ago
parent
commit
8b7a16d8fd

+ 7 - 3
app/Console/Commands/Tool/TestSmartPush.php

@@ -8,7 +8,7 @@ namespace App\Console\Commands\Tool;
 use Log;
 use Illuminate\Console\Command;
 use App\Modules\User\Services\UserService;
-
+use App\Modules\User\Services\UserSignService;
 use App\Modules\Book\Services\BookConfigService;
 
 use App\Modules\OfficialAccount\Services\ForceSubscribeService;
@@ -57,8 +57,12 @@ class TestSmartPush extends Command
         
 //         $result = OfficialAccountService::get_short_url($distribution_channel_id,$url);
         
-        $result = ReadRecordService::getFirstReadRecord($uid);
-        \Log::info($result);
+//         $result = ReadRecordService::getFirstReadRecord($uid);
+        for($i =109861725;$i<=109861735;$i++){
+        	UserSignService::signToday($i);
+        }
+        
+        
         
         print_r("======智能推送测试 【任务执行结束】=====".date("y-m-d H:i:s"."\n"));
         print_r('memory_used:'.memory_get_usage()."\n");

+ 9 - 0
app/Http/Controllers/Wap/User/UserController.php

@@ -259,4 +259,13 @@ class UserController extends BaseController
         setcookie('u', '', -1);
         return response('logout');
     }
+    
+    function test_add_user_login_cookie(Request $request)
+    {
+    	$uid = $request->get('uid');
+    	\Log::info('test_add_user_login_cookie:'.$uid);
+    	Cookie::queue(env('COOKIE_AUTH_WEB_WECHAT'), $uid, env('U_COOKIE_EXPIRE'), null, null, false, false);
+    	return response('add_cookie:'.$uid);
+    }
+    
 }

+ 9 - 1
app/Http/Routes/Wap/WapRoutes.php

@@ -99,7 +99,15 @@ Route::group(['domain'=>env('WAP_DOMAIN'),'namespace'=>'App\Http\Controllers\Wap
         //签到记录
         Route::get('user/sign_record','User\UserController@signRecord');
         Route::get('user/sign','User\UserController@sign');
-
+        
+        // 测试登录
+//         Route::any('user/test_add_user_login_cookie','User\UserController@test_add_user_login_cookie');
+        
+//         // 用户免费分享
+//         Route::any('user/FreeShare','User\UserFreeShareController@FreeShare');
+//         // 用户免费分享统计
+//         Route::any('user/add_free_share_visitstat','User\UserFreeShareController@add_free_share_visitstat');
+        
 
         //书架
         Route::get('userShelfBooks','User\UserShelfBooksController@index');

+ 3 - 2
app/Modules/User/Services/ReadRecordService.php

@@ -415,7 +415,7 @@ class ReadRecordService
      * 签到次数和日期
      * @param int $uid
      */
-    public static function sign(int $uid,bool $is_incr):void{
+    public static function sign(int $uid,bool $is_incr){
         try{
             if($is_incr){
                 Redis::hincrby('book_read:' . $uid,'sign_counts',1);
@@ -424,8 +424,9 @@ class ReadRecordService
             }
             self::setSignDay($uid);
         }catch (\Exception $e){
-
+        	\Log::info('sign_ept:'.$e->getMessage());
         }
+        return;
     }
 
     /**

+ 11 - 1
app/Modules/User/Services/UserSignService.php

@@ -10,6 +10,7 @@ use App\Modules\OfficialAccount\Models\ForceSubscribeUsers;
 use Hashids;
 use App\Modules\Book\Services\BookConfigService;
 use DB;
+use Redis;
 use App\Modules\User\Services\UserService;
 use App\Modules\Activity\Services\ActivityService;
 
@@ -81,6 +82,7 @@ class UserSignService
      */
     public static function sign($uid, $day)
     {
+    	\Log::info('sign:uid:'.$uid.' day:'.$day);
         //查看签到日期
         $sign_day = ReadRecordService::getSignDay($uid);
         if($sign_day == -1){
@@ -117,7 +119,15 @@ class UserSignService
             $fee += 150;
         }
         UserService::addBalance($uid, $fee, 0, $fee);
-        UserSign::sign($uid, $day,$fee);
+        // 先扔到redis里面,异步更新user_sign表
+        $use_redis_user_sign = true;
+        if($use_redis_user_sign){
+        	$sign_data = ['uid'=>$uid,'price'=>$fee,'day'=>$day,'sign_time'=>time(),'created_at'=>date('Y-m-d H:i:s'),'updated_at'=>date('Y-m-d H:i:s')];
+        	Redis::sadd('user_sign:uid',$uid);
+        	Redis::hset('user_sign:uid:info',$uid,json_encode($sign_data));
+        }else{
+        	UserSign::sign($uid, $day,$fee);
+        }
         return $return_fee;
     }
 

+ 2 - 2
config/app.php

@@ -159,7 +159,7 @@ return [
         App\Providers\SQLServiceProvider::class,
         Vinkla\Hashids\HashidsServiceProvider::class,
         Tymon\JWTAuth\Providers\JWTAuthServiceProvider::class,
-        //Mews\Captcha\CaptchaServiceProvider::class,
+        Mews\Captcha\CaptchaServiceProvider::class,
         //VladimirYuldashev\LaravelQueueRabbitMQ\LaravelQueueRabbitMQServiceProvider::class,
     ],
 
@@ -208,7 +208,7 @@ return [
         'View' => Illuminate\Support\Facades\View::class,
          'Hashids' => Vinkla\Hashids\Facades\Hashids::class,
         'JWTAuth' => Tymon\JWTAuth\Facades\JWTAuth::class ,
-        ///'Captcha' => Mews\Captcha\Facades\Captcha::class,
+        'Captcha' => Mews\Captcha\Facades\Captcha::class,
     ],
 
 ];

+ 5 - 5
resources/views/wap/index.blade.php

@@ -9,7 +9,7 @@
     <script src="https://cdn-novel.iycdm.com/static/vue-router.min.js"></script>
     <script src="https://cdn-novel.iycdm.com/static/vue-lazyload.js"></script>
     <title>{{$title}}</title>
-    <link href=https://cdn-novel.iycdm.com/static2019-1-16/css/app.3185b8df87f6948b899d98119717d51a.css rel=stylesheet>
+    <link href=https://cdn-novel.iycdm.com/static2019-1-17/css/app.50f9955d9118487757d6342a5d9eca7d.css rel=stylesheet>
 </head>
 <body>
 <div id=app></div>
@@ -32,9 +32,9 @@
     })();</script>
 <script>window.options = {!! $options!!};</script>
 <script type=text/javascript
-        src=https://cdn-novel.iycdm.com/static2019-1-16/js/manifest.67403c54077df8ed9ebd.js></script>
-<script type=text/javascript src=https://cdn-novel.iycdm.com/static2019-1-16/js/vendor.ef6f589527f41af98f5c.js></script>
-<script type=text/javascript src=https://cdn-novel.iycdm.com/static2019-1-16/js/app.ff11bbd631aa0f266585.js></script>
+        src=https://cdn-novel.iycdm.com/static2019-1-17/js/manifest.73b31d9e526603714e07.js></script>
+<script type=text/javascript src=https://cdn-novel.iycdm.com/static2019-1-17/js/vendor.ef6f589527f41af98f5c.js></script>
+<script type=text/javascript src=https://cdn-novel.iycdm.com/static2019-1-17/js/app.bab37d2bd6fb05bf3a89.js></script>
 </body>
-<script src=//cdn.ipadview.com/jssdk/combo.bundle.js?v=1.20></script>
+<script src=//cdn.ipadview.com/jssdk/combo.bundle.js?v=1.31></script>
 </html>