Merge branch 'master' of github.com:hainatravel/information-system

application/third_party/wwwlog/controllers/index.php

@@ -169,13 +169,13 @@ class Index extends CI_Controller
         // echo $client_id;
 
         $query_string = "
-			* | select time_local,http_referer,request_uri,http_user_agent,http_x_forwarded_for
-			 remote_addr,request_method,request_time,status,body_bytes_sent,upstream_response_time from log where
+			* | select time_local,http_referer,request_uri,http_user_agent,http_x_forwarded_for,
+            remote_addr,request_method,request_time,status,body_bytes_sent,upstream_response_time from log where
                 request_uri like '/io/?event=pageview%'
                 and (remote_addr='$ip' OR  http_x_forwarded_for like '%$ip%' OR request_uri like '%$client_id%')
                 ORDER BY __time__ DESC
 			"; // 同时使用IP和用户ID
-        $from = time() - 604800 * 4; //往前 604800(7天), 1296000(15天)
+        $from = time() - 604800 * 2; //往前 604800(7天), 1296000(15天)
         $to = time();
         $request = new Aliyun_Log_Models_GetLogsRequest('globalhoghlights', $this->logstore[$sitecode], $from, $to, '', $query_string, 100, $offset, true);
         try {