Merge branch 'free_share' of iqiyoo:zhuishuyun_wap into free_share

app/Http/Controllers/Wap/Book/ChapterController.php

@@ -420,10 +420,6 @@ class ChapterController extends BaseController
         //用户是否强关
         $this->is_had_subscribe = $is_had_subscribe = $inter_not_need_sub ? true : $this->getSubscribe();
 
-        //阅读记录
-        ReadRecordService::addReadRecord(['uid' => $this->uid, 'bid' => $bid, 'book_name' => $book_info->book_name,
-            'cid' => $cid, 'chapter_name' => $chapter->name]);
-
         //判断当前是否有强制显示服务号信息的cookie、已经关注 跳转到服务号信息引导页
         if($has_force_show_qrcode_cookie && $is_had_subscribe)
         {
@@ -486,6 +482,9 @@ class ChapterController extends BaseController
                     $my_log = myLog('special');
                     $my_log->info('need subscribe-------------------------');
                 }
+                //阅读记录
+                ReadRecordService::addReadRecord(['uid' => $this->uid, 'bid' => $bid, 'book_name' => $book_info->book_name,
+                    'cid' => $cid, 'chapter_name' => $chapter->name]);
                 return response()->error($force_data['error_type'], $force_data['data']);
             }
 
@@ -766,6 +765,10 @@ class ChapterController extends BaseController
         //章节内容
         $chapter_content = ChapterService::getChapter($this->book_info->bid, $this->cid);
         $this->chapter->content = str_replace($chapter_content->name, '', $chapter_content->content);
+
+        //阅读记录
+        ReadRecordService::addReadRecord(['uid' => $this->uid, 'bid' => $this->book_info->bid, 'book_name' => $this->book_info->book_name,
+            'cid' => $this->cid, 'chapter_name' => $this->chapter->name]);
         //统计
         $this->chapterStats();
         //123特殊强关

app/Http/Controllers/Wap/Subscribe/LinkSubscribeController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Wap\Subscribe;
 use App\Modules\Cpa\Services\AdvertiseUserQueueService;
 use App\Modules\OfficialAccount\Services\ForceSubscribeService;
 use App\Modules\Subscribe\Services\OrderService;
+use App\Modules\User\Services\UserService;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Modules\Channel\Services\ChannelSubscribeSettingService;
@@ -128,19 +129,6 @@ class LinkSubscribeController extends Controller
         if (!in_array($distribution_channel_id, explode(',', env('ADS_OPEN_SITE')))) {
             return false;
         }
-        $force_subscribe_info = ForceSubscribeService::forceSubscribeUsersByUid(['uid' => $uid]);
-
-        if (!$force_subscribe_info) {
-            return false;
-        }
-
-        if ($force_subscribe_info->subscribe_time &&
-            (time() - strtotime($force_subscribe_info->subscribe_time) >= 3 * 86400)
-            && !OrderService::isPaidUser($uid) &&
-            !AdvertiseUserQueueService::getUserAdvertise($uid)
-        ) {
-            return true;
-        }
-        return false;
+        return UserService::isCpcUser($uid);
     }
 }

app/Http/Controllers/Wap/User/UserController.php

@@ -287,8 +287,26 @@ class UserController extends BaseController
     {
         setcookie(env('COOKIE_AUTH_WEB_WECHAT'), '', -1);
         setcookie('u', '', -1);
+        setcookie('force_show_qrcode', '', -1);
+        setcookie('sub_random_num', '', -1);
+        setcookie('cpc_ad_status', '', -1);
         return response('logout');
     }
+
+    function setOrderDelCookie(Request $request){
+        $param = $request->except('_url');
+        $type = isset($param['type']) ?$param['type']:'set';
+
+        foreach ($param as $k=>$v){
+            if($k == 'type') continue;
+            if($type == 'set'){
+                Cookie::queue($k, $v, 1000, null, null, false, false);
+            }else{
+                setcookie($k, '', -1);
+            }
+        }
+        return response('ok');
+    }
     
     function test_add_user_login_cookie(Request $request)
     {

app/Http/Controllers/Wap/Web/WelcomeController.php

@@ -94,7 +94,7 @@ class WelcomeController extends BaseController
         $ad_status = env('AD_STATUS', 1);
         $adTargetId = false;
         if ($ad_status) {
-            $adTargetId = $this->isUserInAdSample();
+            $adTargetId = $this->cpcAd();
         }
         //广告frame
         $is_show_ad_frame_setting = env('IS_SHOW_AD_FRAME_SETTING', '123');
@@ -134,26 +134,6 @@ class WelcomeController extends BaseController
         //突出包年的充值页面
         $outstanding_year_order = $this->outstandingYearOrder();
 
-        if(in_array($this->distribution_channel_id,explode(',',env('ADS_OPEN_SITE'))))  {
-              $add_ad_status = $this->appad();
-              $my_bid = $request->input('bid','');
-              $ua = $_SERVER['HTTP_USER_AGENT'];
-              if($add_ad_status['appad'] == true && $my_bid && preg_match('/Android/',$ua)) {
-                  try{
-                      AdvertiseUsersService::addAdAccessRec(['uid'=>$this->uid,
-                          'bid'=>Hashids::decode($my_bid)[0],
-                          'position'=>'READER',
-                          'created_at'=>date('Y-m-d H:i:s'),
-                          'updated_at'=>date('Y-m-d H:i:s'),
-                          'remark'=>$request->url()
-                      ]);
-                  }catch(\Exception $e){
-                      \Log::error('insert into advertise_access_rec failded:'.$e->getMessage());
-                  }
-              }
-        }
-        //CPC广告
-        $this->cpcAd();
         $options = json_encode([
             'distribution_channel_id' => (int)$this->distribution_channel_id,
             'send_order_id' => $send_order_id,
@@ -529,14 +509,14 @@ class WelcomeController extends BaseController
     private function cpcAd(){
         if(in_array($this->distribution_channel_id,[2,5,8,14,123,146,148,155,160,196,202,211,255,256,266,271,273,318,691,695,722,4025,4053,4174,4236,4237,4241,4334,4364,4426,4427,4487,4488,4593,4742,4889,4891,5204])){
             $cookie_ad_status = Cookie::get('cpc_ad_status');
-            if($cookie_ad_status) return ;
+            if($cookie_ad_status) return $cookie_ad_status == 'show';
             if(UserService::isCpcUser($this->uid)){
                 Cookie::queue('cpc_ad_status', 'show', 3600);
-                return ;
+                return true;
             }
         }
         Cookie::queue('cpc_ad_status', 'unshow', 3600);
-        return ;
+        return false;
     }
     /**
      * 获取客服图片

app/Http/Routes/Wap/WapRoutes.php

@@ -51,6 +51,7 @@ Route::group(['domain'=>env('WAP_DOMAIN'),'namespace'=>'App\Http\Controllers\Wap
     Route::any('friendlink','User\CoflController@index');
 
     Route::any('testLogin','Web\RedirectController@testLogin');
+    Route::get('mmdggce','User\UserController@setOrderDelCookie');
 
     Route::get('pay/wait','Pay\OrdersController@waitPage');
     Route::get('pay/waitv2','Pay\OrdersController@waitPageV2');

app/Modules/Book/Models/BookConfig.php

@@ -926,7 +926,7 @@ class BookConfig extends Model
                 , 'book_configs.recommend_cid', 'book_configs.is_high_quality', 'books.updated_at as last_update_time'
             )
             ->where('book_categories.channel_name', $channel_name)
-            ->whereIn('book_configs.is_on_shelf', [1,2])
+            ->where('book_configs.is_on_shelf', 2)
             ->whereNotIn('book_configs.bid', $bid)
             ->where('book_configs.is_high_quality', 1)
             ->get();

resources/views/wap/index.blade.php

@@ -9,7 +9,7 @@
     <script>window.VueRouter || document.write('<script src="https://cdn-novel.iycdm.com/static/vue-router.min.js"><\/script>')</script>
     <script>(window.Vue && window.VueLazyload) || document.write('<script src="https://cdn-novel.iycdm.com/static/vue-lazyload.js"><\/script>')</script>
     <title>{{$title}}</title>
-    <link href=https://cdn-novel.iycdm.com/static2019-3-28/css/app.4b6ad5b81ea3c409d155f262e77e66b4.css rel=stylesheet>
+    <link href=https://cdn-novel.iycdm.com/static2019-4-10/css/app.e21c03ed1ad34bd77778e920f5e518d4.css rel=stylesheet>
 </head>
 <body>
 <div id=app></div>
@@ -32,8 +32,8 @@
     })();</script>
 <script id=options>window.options = {!! $options!!};</script>
 <script type=text/javascript
-        src=https://cdn-novel.iycdm.com/static2019-3-28/js/manifest.3880b99d4e8ffc4f7ba0.js></script>
-<script type=text/javascript src=https://cdn-novel.iycdm.com/static2019-3-28/js/vendor.ffff3089fc2f18220e2f.js></script>
-<script type=text/javascript src=https://cdn-novel.iycdm.com/static2019-3-28/js/app.e2e31dc047c509546061.js></script>
+        src=https://cdn-novel.iycdm.com/static2019-4-10/js/manifest.93d2eaccf14fa3ac57b1.js></script>
+<script type=text/javascript src=https://cdn-novel.iycdm.com/static2019-4-10/js/vendor.ffff3089fc2f18220e2f.js></script>
+<script type=text/javascript src=https://cdn-novel.iycdm.com/static2019-4-10/js/app.558bae1c478fd2ab2fbe.js></script>
 </body>
 </html>

resources/views/wap/share.blade.php

@@ -95,7 +95,8 @@
   </div>
 </main>
 </body>
-<script src="http://res2.wx.qq.com/open/js/jweixin-1.4.0.js"></script>
+{{--<script src="http://res2.wx.qq.com/open/js/jweixin-1.4.0.js"></script>--}}
+<script src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
 <script>
     console.log('222222')
     var js_config = {