e360-tuiguang 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e004b90b8db1ae65a12702390a39b9b41e47394
-  data.tar.gz: c4ecb872ca79ec7cf054e50e29a162a60be57224
+  metadata.gz: 233bb3fe6592d3048f62604b4c5dc8cda3a04d1c
+  data.tar.gz: 7aaa4d32f36677a66f7848ecdae9e6288b7f990c
 SHA512:
-  metadata.gz: e53f80049296a91782fdca59f7ee994a7a9c1202d2d684fcbf1bf0d2db4008d18239f3e853960e90f2c59622b7cb490c87f5ec8c2ef7ecf936ffe0ea15345be7
-  data.tar.gz: f8856fd0c4e955fd8c841f0c59a6a6674d17c48b051f924a8e55f91255a6e7d999bfd1d2b1145edbab1e83c94b1869b00a4d8f18b5ba1a441583fa4db5e12803
+  metadata.gz: 8853bd0d1b73f4aad029fcdabcb954c314b6e085d7c23f21002807ddc79b3231f921abb4aea5b6ebe19c6e19d432402bc518d679f40a33d8e2e226110be7247b
+  data.tar.gz: 2ae170d8b2e538f5499516fa0c89d6b0765683b56ab6735a6982d0e0b2c6fa08dde9504b05413c1ab4fb4ff01e79207ef65ab594ce0eeb393dfd5a0b7b69338e

data/lib/e360/tuiguang.rb

@@ -131,7 +131,7 @@ module E360
       def request(url)
         url = URI(url)
         params = URI.decode_www_form(url.query)
-        params.unshift ['_', Time.now.strftime('%N%L')]
+        params.unshift ['_', Time.now.strftime('%s%L')]
         if @token && @expire_times
           params.unshift ['expireTimes', @expire_times]
           params.unshift ['token', @token]
@@ -139,29 +139,33 @@ module E360
         url.query = URI.encode_www_form(params)
         @req_url = url.to_s
         puts "Url: #{@req_url}"
-        http = Net::HTTP.new(url.host, url.port)
-        request = Net::HTTP::Get.new(url)
-        request["accept"] = 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8'
-        request["accept-encoding"] = 'gzip, deflate, sdch'
-        request["accept-language"] = 'zh-CN,zh;q=0.8'
-        request["cache-control"] = 'no-cache'
-        request["connection"] = 'keep-alive'
-        request["cookie"] = @cookies
-        request["host"] = 'dianjing.e.360.cn'
-        request["pragma"] = 'no-cache'
-        request["referer"] = "http://dianjing.e.360.cn/adrank?_=#{Time.now.strftime('%N%L')}"
-        request["upgrade-insecure-requests"] = '1'
-        request["user-agent"] = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/57.0.2987.133 Safari/537.36'
-        response = http.request(request)
-        puts "Redirection: #{response['location']}" if response.is_a?(Net::HTTPRedirection)
-        if response.is_a?(Net::HTTPRedirection)
-          if response['location'] == 'http://e.360.cn'
-            raise LoginExpired
-          elsif response['location'].include?('http://e.360.cn/home')
-            raise RedirectHome
+        begin
+          http = Net::HTTP.new(url.host, url.port)
+          request = Net::HTTP::Get.new(url)
+          request["accept"] = 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8'
+          request["accept-encoding"] = 'gzip, deflate, sdch'
+          request["accept-language"] = 'zh-CN,zh;q=0.8'
+          request["cache-control"] = 'no-cache'
+          request["connection"] = 'keep-alive'
+          request["cookie"] = @cookies
+          request["host"] = 'dianjing.e.360.cn'
+          request["pragma"] = 'no-cache'
+          request["referer"] = "http://dianjing.e.360.cn/adrank?_=#{Time.now.strftime('%s%L')}"
+          request["upgrade-insecure-requests"] = '1'
+          request["user-agent"] = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/57.0.2987.133 Safari/537.36'
+          response = http.request(request)
+          if response.is_a?(Net::HTTPRedirection)
+            p "Redirection: #{response['location']}"
+            if response['location'] == 'http://e.360.cn'
+              raise LoginExpired
+            end
           end
-        end
-        raise RequestError, "HTTP Response: #{response.code} #{response.message}" unless response.is_a?(Net::HTTPSuccess)
+          raise RequestError, "HTTP Response: #{response.code} #{response.message}" unless response.is_a?(Net::HTTPSuccess)
+          unless response.is_a?(Net::HTTPSuccess)
+            p 'Sleep 3s'
+            sleep 3
+          end
+        end until response.is_a?(Net::HTTPSuccess)
         @resp = response.read_body
         if response['Content-Encoding'] && response['Content-Encoding'].include?('gzip')
           @resp = Zlib::GzipReader.new(StringIO.new(@resp)).read
@@ -215,9 +219,6 @@ module E360
     class LoginExpired < StandardError;
     end
 
-    class RedirectHome < StandardError;
-    end
-
     class TokenExpired < StandardError;
     end
 

data/lib/e360/tuiguang/version.rb

@@ -1,5 +1,5 @@
 module E360
   module Tuiguang
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: e360-tuiguang
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Xiao Jie