init

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

@@ -546,27 +546,27 @@ class BookController extends BaseController
         $res = BookConfigService::getRecommendBooks($bid,$book_info->channel_name);
         return response()->collection(new BookTransformer(),$res);
     }
-    
+
     /**
      * h5智能推荐图书
      * @param Request $request
      */
     public function H5SmartRecommendBooks(Request $request){
 //     	$this->uid=666;
-    	if(!$this->checkUid()){
-    		return response()->error('NOT_LOGIN');
-    	}
-    	$pos = $request->input('pos');
-    	if(empty($pos)){
-    		return response()->error('PARAM_ERROR');
-    	}
-    	// 最近阅读轮播图
-    	if($pos == 'h5RecentReadLoop'){
-    		$book_num = 6;
-    	}
-
-    	$res = BookConfigService::getH5RecommendBooks($this->uid,$pos,$book_num);
-    	return response()->collection(new BookTransformer(),$res);
+        if(!$this->checkUid()){
+            return response()->error('NOT_LOGIN');
+        }
+        $pos = $request->input('pos');
+        if(empty($pos)){
+            return response()->error('PARAM_ERROR');
+        }
+        // 最近阅读轮播图
+        if($pos == 'h5RecentReadLoop'){
+            $book_num = 6;
+        }
+
+        $res = BookConfigService::getH5RecommendBooks($this->uid,$pos,$book_num);
+        return response()->collection(new BookTransformer(),$res);
     }
 
     /**
@@ -639,7 +639,7 @@ class BookController extends BaseController
      *                   last_chapter:第254章 婚礼（大结局）,
      *               },
      *           ],
-     *            female:[{},{}] 
+     *            female:[{},{}]
      *           }
      *       }
      */
@@ -686,7 +686,7 @@ class BookController extends BaseController
             }else{
                 $midstr = env('WORD_RANK_MALE_TOTAL','638,677,694,635,612,693,634,642,775,780');
                 $fidstr = env('WORD_RANK_FEMALE_TOTAL','57,636,614,1,10,48,58,324,354,99');
-            }    
+            }
             $female = collectionTransform(new BookTransformer,BookConfigService::getBooksByIds(explode(',',$fidstr)));
             $male = collectionTransform(new BookTransformer,BookConfigService::getBooksByIds(explode(',',$midstr)));
         }
@@ -709,7 +709,7 @@ class BookController extends BaseController
         }else{
             return response()->error('PARAM_ERROR');
         }
-        
+
         $data = ['male'=>$male,'female'=>$female];
         Cache::put($cache_key, json_encode($data), 60*24);
         return response()->success($data);

app/Http/Controllers/Wap/Book/Transformers/ChapterTransformer.php

@@ -32,6 +32,7 @@ class ChapterTransformer
             'is_show_share_button'=>$chapter->is_show_share_button,
             'share_url'=>isset($chapter->share_url)?$chapter->share_url:'',
             'js_config'=>isset($chapter->js_config)?$chapter->js_config:'',
+            'is_show_ad'=>isset($chapter->is_show_ad)?$chapter->is_show_ad:'',
             //'is_had_subscribe'=>0
             //'is_need_subscirbe'   =>  $chapter->is_need_subscirbe,
         ];

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

@@ -132,7 +132,7 @@ class UsersController extends Controller
 
     private function joinUrl($url){
         if(strpos($url,'?') !== false){
-          $result =   $url.'&auth=v2';
+            $result =   $url.'&auth=v2';
         }else{
             $result = $url.'?auth=v2';
         }

app/Http/Middleware/ReadOauth.php

@@ -56,7 +56,7 @@ class ReadOauth
         if($not_allow_access_site){
             $not_allow_access_site_arr = explode(',',$not_allow_access_site);
             if(in_array($distribution_channel_id,$not_allow_access_site_arr)){
-               return response($this->notAccessPage())->header('Content-Type', 'text/html');
+                return response($this->notAccessPage())->header('Content-Type', 'text/html');
             }
         }
         if (!$uid_cookie && $test == 0) {
@@ -108,9 +108,9 @@ class ReadOauth
             $uri = $request->input('_url');
             $openid = $request->get('openid')  ;
             $appid = $request->get('appid') ;
-           /* $user_info = ForceSubscribeService::getUserInfo($appid,$openid);
-            Log::info('appid user id to userinfo');
-            Log::info($user_info);*/
+            /* $user_info = ForceSubscribeService::getUserInfo($appid,$openid);
+             Log::info('appid user id to userinfo');
+             Log::info($user_info);*/
             $back = $request->get('back','');
             if($openid && $appid && $distribution_channel_id && $uid_cookie){
                 $this->apidAndOpenId($distribution_channel_id,$appid,$openid,$uid_cookie);
@@ -149,17 +149,17 @@ class ReadOauth
         $stats = $request->get('stats',0);
         if ($request->has('fromtype') && $request->input('fromtype')) {
             try {
-                    $from = $request->input('fromtype', 'main');
-                    Cookie::queue('from', $from, env('U_COOKIE_EXPIRE'), null, null, false, false);
-                    if(!$stats){
-                        Redis::sadd('push:distribution_channel_id:' . $distribution_channel_id . 'from:' . $from . ':date:' . date('Y-m-d'), $uid_cookie);
-                        Redis::sadd('push:distribution_channel_id:alluv:from:' . $from  , $uid_cookie);
+                $from = $request->input('fromtype', 'main');
+                Cookie::queue('from', $from, env('U_COOKIE_EXPIRE'), null, null, false, false);
+                if(!$stats){
+                    Redis::sadd('push:distribution_channel_id:' . $distribution_channel_id . 'from:' . $from . ':date:' . date('Y-m-d'), $uid_cookie);
+                    Redis::sadd('push:distribution_channel_id:alluv:from:' . $from  , $uid_cookie);
 
-                        Redis::hincrby('push:distribution_channel_id:allpv' ,$from, 1);
+                    Redis::hincrby('push:distribution_channel_id:allpv' ,$from, 1);
 
-                        Redis::hincrby('customer:push:click:distribution_channel_id:' . $distribution_channel_id . 'from:' . $from, date('Y-m-d'), 1);
-                        Redis::sadd('wap_from_stats'.date('Y-m-d'),$distribution_channel_id.'-'.$from);
-                    }
+                    Redis::hincrby('customer:push:click:distribution_channel_id:' . $distribution_channel_id . 'from:' . $from, date('Y-m-d'), 1);
+                    Redis::sadd('wap_from_stats'.date('Y-m-d'),$distribution_channel_id.'-'.$from);
+                }
             } catch (\Exception $e) {
                 Log::info($e);
             }

app/Libs/Helpers.php

@@ -6,7 +6,7 @@
  */
 function _domain()
 {
-	return str_replace('https://','',str_replace('http://','',url('/')));
+    return str_replace('https://','',str_replace('http://','',url('/')));
 }
 
 /**
@@ -25,15 +25,15 @@ function arrayToXml($array){
  * 签名生成
  */
 function _sign($params, $key) {
-	$signPars = "";
-	ksort($params);
-	foreach($params as $k => $v) {
-		if("" != $v && "sign" != $k) {
-			$signPars .= $k . "=" . $v . "&";
-		}
-	}
-	$signPars .= "key=".$key;
-	return md5($signPars);
+    $signPars = "";
+    ksort($params);
+    foreach($params as $k => $v) {
+        if("" != $v && "sign" != $k) {
+            $signPars .= $k . "=" . $v . "&";
+        }
+    }
+    $signPars .= "key=".$key;
+    return md5($signPars);
 }
 
 /**
@@ -46,23 +46,23 @@ function get_sign($params) {
     $sign = md5($url);
     return $sign;
 }
-    
+
 function arr_to_url($array,$has_sign=false){
     ksort($array);
-    reset($array);          
+    reset($array);
     $arg  = "";
     while (list ($name, $val) = each ($array)) {
         if($name == 'sign' && !$has_sign) continue;
         if(strpos($name, "_") === 0)
-            continue;           
+            continue;
         if(is_array($val))
             $val =join(',',$val);
         if($val==="")
             continue;
         $arg.=$name."=". $val ."&";
     }
-    $arg = substr($arg,0,count($arg)-2);    
-    
+    $arg = substr($arg,0,count($arg)-2);
+
     return $arg;
 }
 
@@ -73,16 +73,16 @@ function _getIp() {
     if(getenv('HTTP_X_FORWARDED_FOR')){
         $ip = getenv('HTTP_X_FORWARDED_FOR');
     }else if(getenv("HTTP_CLIENT_IP") && strcasecmp(getenv("HTTP_CLIENT_IP"), "unknown"))
-		$ip = getenv("HTTP_CLIENT_IP");
-	else if (getenv("HTTP_X_FORWARD_FOR") && strcasecmp(getenv("HTTP_X_FORWARD_FOR"), "unknown"))
-		$ip = getenv("HTTP_X_FORWARD_FOR");
-	else if (getenv("REMOTE_ADDR") && strcasecmp(getenv("REMOTE_ADDR"), "unknown"))
-		$ip = getenv("REMOTE_ADDR");
-	else if (isset($_SERVER['REMOTE_ADDR']) && $_SERVER['REMOTE_ADDR'] && strcasecmp($_SERVER['REMOTE_ADDR'], "unknown"))
-		$ip = $_SERVER['REMOTE_ADDR'];
-	else
-		$ip = "unknown";
-	return($ip);
+        $ip = getenv("HTTP_CLIENT_IP");
+    else if (getenv("HTTP_X_FORWARD_FOR") && strcasecmp(getenv("HTTP_X_FORWARD_FOR"), "unknown"))
+        $ip = getenv("HTTP_X_FORWARD_FOR");
+    else if (getenv("REMOTE_ADDR") && strcasecmp(getenv("REMOTE_ADDR"), "unknown"))
+        $ip = getenv("REMOTE_ADDR");
+    else if (isset($_SERVER['REMOTE_ADDR']) && $_SERVER['REMOTE_ADDR'] && strcasecmp($_SERVER['REMOTE_ADDR'], "unknown"))
+        $ip = $_SERVER['REMOTE_ADDR'];
+    else
+        $ip = "unknown";
+    return($ip);
 }
 
 /**
@@ -90,7 +90,7 @@ function _getIp() {
  * @param array $arr 数组
  * @return object
  */
-function array_to_object($arr) 
+function array_to_object($arr)
 {
     if (gettype($arr) != 'array') {
         return;
@@ -102,13 +102,13 @@ function array_to_object($arr)
     }
     return (object)$arr;
 }
- 
+
 /**
  * 对象 转 数组
  * @param object $obj 对象
  * @return array
  */
-function object_to_array($obj) 
+function object_to_array($obj)
 {
     $obj = (array)$obj;
     foreach ($obj as $k => $v) {
@@ -204,19 +204,19 @@ function collectionTransform($trans, $data){
 
 
 function ImageNewsToArray($datas){
-	if(empty($datas)) return null;
-	if(!is_array($datas)){
-		$datas = json_decode($datas);
-	}
-	$send_data = array();
-	foreach($datas  as $no=> $data){
-		foreach($data  as $_data){
-			foreach($_data as $key=>$one_data){
-				$send_data[$no][$key] = $one_data;
-			}
-		}
-	}
-	return $send_data;
+    if(empty($datas)) return null;
+    if(!is_array($datas)){
+        $datas = json_decode($datas);
+    }
+    $send_data = array();
+    foreach($datas  as $no=> $data){
+        foreach($data  as $_data){
+            foreach($_data as $key=>$one_data){
+                $send_data[$no][$key] = $one_data;
+            }
+        }
+    }
+    return $send_data;
 }
 
 /**