baidu-tuiguang 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f7cfd9e817799bddadf9fc3a85c0f777e091b5e
-  data.tar.gz: dfcb1d19776ae3245cdd277c26b2d4b2a08bde59
+  metadata.gz: e1bba111b8f42fce134bfaa3e300adbf2f7bcd83
+  data.tar.gz: ac32dce0e9e443f8555f60d3aa94ddd5ca8b73f7
 SHA512:
-  metadata.gz: 828310e8a8303e2a4ef6f63fb68218939dc7844221367020912e63a0a30fecef30d5bb5e7ad7addcbf6308daaebc112363122494fd100245f6382416e5bb9f17
-  data.tar.gz: a38160ed804790fce2e22f6414fa9138d1d1ab4741f10ac9564f0914032cf7ecd6cb760f595a53b3a5cd516afbb73990cae16d7e80dbc386f50967496daa3ce5
+  metadata.gz: 994309ebbabebd92160d2c27f017fad60e2678070d359f94a969967bd56ea6f0233376e27d030a6304fc5104ef3cd4aec75e19e8b4c083bca5030c1141ec4d30
+  data.tar.gz: 51717efce5ff0d376706ba2e38219e42815f0035e611f89a25a22807daecfb8fe46e903b7d2e435bc713b7a9e486ab95328ebb7444046c60eb1641ab97e0df5f

data/baidu-tuiguang.gemspec

@@ -33,4 +33,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.14"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency "json", "~> 2.0", ">= 2.0.2"
+  spec.add_development_dependency "openssl", "~> 2.0", ">= 2.0.2"
 end

data/lib/baidu/tuiguang.rb

@@ -1,10 +1,11 @@
 require "baidu/tuiguang/version"
 require 'uri'
 require 'net/http'
-require 'json'
 require 'zlib'
 require 'stringio'
 require 'date'
+require 'json'
+require 'openssl'
 
 module Baidu
   module Tuiguang
@@ -18,13 +19,13 @@ module Baidu
       end
 
       def basic_info
-        data = request("path": 'GET/authInfo', "params": {})
+        data = request('https://tuiguang.baidu.com/request.ajax', "path": 'GET/authInfo', "params": {})
         {'username' => data['username']}
       end
 
       def plans(page = 1, page_size = 20)
         today = Time.now.to_date
-        data = request(path: 'vega/GET/mtllist/plan', params: {"fields": ["planid", "pausestat", "planname", "shows", "clks", "paysum", "trans", "avgprice", "plandynamicideastat", "acctdynamicideastat", "mPriceFactor", "planstat", "remarketingstat", "deviceprefer", "wregion", "qrstat1", "phonetrans", "allipblackcnt", "clkrate", "wbudget", "plancyc", "showprob", "allnegativecnt", "showpay", "adtype", "acctdynamictagsublinkstat", "acctdynamictitlestat", "acctdynamichotredirectstat", "plandynamictagsublinkstat", "plandynamictitlestat", "plandynamichotredirectstat", "plandynamictitlelist", "plandynamictitleabstract", "acctdynamictitlelist", "acctdynamictitleabstract", "acctscenarizedstatus", "planscenarizedphrasestatus", "atstatus", "atbid", "atbudget", "bidprefer", "pcpricefactor", "inpeople", "remarketingPauseStat", "robotAPlanState"], "levelCond": {"userid": cookies_params['__cas__id__3']}, "pageNo": page, "pageSize": page_size, "startTime": today, "endTime": today})
+        data = request('http://fengchao.baidu.com/nirvana/request.ajax', path: 'vega/GET/mtllist/plan', params: {"fields": ["planid", "pausestat", "planname", "shows", "clks", "paysum", "trans", "avgprice", "plandynamicideastat", "acctdynamicideastat", "mPriceFactor", "planstat", "remarketingstat", "deviceprefer", "wregion", "qrstat1", "phonetrans", "allipblackcnt", "clkrate", "wbudget", "plancyc", "showprob", "allnegativecnt", "showpay", "adtype", "acctdynamictagsublinkstat", "acctdynamictitlestat", "acctdynamichotredirectstat", "plandynamictagsublinkstat", "plandynamictitlestat", "plandynamichotredirectstat", "plandynamictitlelist", "plandynamictitleabstract", "acctdynamictitlelist", "acctdynamictitleabstract", "acctscenarizedstatus", "planscenarizedphrasestatus", "atstatus", "atbid", "atbudget", "bidprefer", "pcpricefactor", "inpeople", "remarketingPauseStat", "robotAPlanState"], "levelCond": {"userid": cookies_params['__cas__id__3']}, "pageNo": page, "pageSize": page_size, "startTime": today, "endTime": today})
         result = {'data' => [], 'count' => data['totalCount']}
         data['listData'].each do |item|
           result['data'] << {
@@ -41,7 +42,7 @@ module Baidu
 
       def groups(plan_id, page = 1, page_size = 20)
         today = Time.now.to_date
-        data = request("path": 'vega/GET/mtllist/unit', "params": {"fields": ["unitid", "planid", "pausestat", "unitname", "planname", "unitbid", "unitMPriceFactor", "shows", "clks", "paysum", "trans", "avgprice", "unitstat", "matchPriceFactor", "matchPriceStatus", "phonetrans", "clkrate", "extbind", "allnegativecnt", "showpay", "deviceprefer", "mPriceFactor", "adtype", "finebidstatus", "atstatus", "atbid", "planatbid", "bidprefer", "pcpricefactor", "planPcpricefactor"], "pageNo": page, "pageSize": page_size, "startTime": today, "endTime": today, "levelCond": {"planid": plan_id}})
+        data = request('http://fengchao.baidu.com/nirvana/request.ajax', "path": 'vega/GET/mtllist/unit', "params": {"fields": ["unitid", "planid", "pausestat", "unitname", "planname", "unitbid", "unitMPriceFactor", "shows", "clks", "paysum", "trans", "avgprice", "unitstat", "matchPriceFactor", "matchPriceStatus", "phonetrans", "clkrate", "extbind", "allnegativecnt", "showpay", "deviceprefer", "mPriceFactor", "adtype", "finebidstatus", "atstatus", "atbid", "planatbid", "bidprefer", "pcpricefactor", "planPcpricefactor"], "pageNo": page, "pageSize": page_size, "startTime": today, "endTime": today, "levelCond": {"planid": plan_id}})
         result = {'data' => [], 'count' => data['totalCount']}
         data['listData'].each do |item|
           result['data'] << {
@@ -56,7 +57,7 @@ module Baidu
 
       def keywords(plan_id, group_id, page = 1, page_size = 20)
         today = Time.now.to_date
-        data = request("path": 'vega/GET/mtllist/word', "params": {"fields": ["winfoid", "unitid", "planid", "wordid", "pausestat", "showword", "unitname", "planname", "wordstat", "bid", "unitbid", "pcqscore", "mqscore", "trans", "paysum", "shows", "clks", "avgprice", "wmatch", "shadow_wurl", "shadow_mwurl", "activestat", "wctrl", "wurl", "pageexp", "mwurl", "showqscore", "blockreason", "confidence", "pcblockreason", "pcconfidence", "matchPriceEnableStatus", "clkrate", "showpay", "adtype", "bidprefer", "mPriceGuide", "leftPriceGuide", "left3PriceGuide", "marker", "mconfidence", "mblockreason", "pcqscorecon", "mqscorecon", "pcrelativity", "mrelativity", "pclandpage", "mlandpage", "pclandpagereason", "mlandpagereason", "addfrom", "modfrom"], "pageNo": page, "pageSize": page_size, "startTime": today, "endTime": today, "levelCond": {"unitid": group_id}})
+        data = request('http://fengchao.baidu.com/nirvana/request.ajax', "path": 'vega/GET/mtllist/word', "params": {"fields": ["winfoid", "unitid", "planid", "wordid", "pausestat", "showword", "unitname", "planname", "wordstat", "bid", "unitbid", "pcqscore", "mqscore", "trans", "paysum", "shows", "clks", "avgprice", "wmatch", "shadow_wurl", "shadow_mwurl", "activestat", "wctrl", "wurl", "pageexp", "mwurl", "showqscore", "blockreason", "confidence", "pcblockreason", "pcconfidence", "matchPriceEnableStatus", "clkrate", "showpay", "adtype", "bidprefer", "mPriceGuide", "leftPriceGuide", "left3PriceGuide", "marker", "mconfidence", "mblockreason", "pcqscorecon", "mqscorecon", "pcrelativity", "mrelativity", "pclandpage", "mlandpage", "pclandpagereason", "mlandpagereason", "addfrom", "modfrom"], "pageNo": page, "pageSize": page_size, "startTime": today, "endTime": today, "levelCond": {"unitid": group_id}})
         result = {'data' => [], 'count' => data['totalCount']}
         data['listData'].each do |item|
           match = ''
@@ -112,25 +113,29 @@ module Baidu
       end
 
       def keyword_pause_and_enable(keyword_id, pause = true)
-        request("path": 'vega/MOD/keyword', "params": {"winfoid": [keyword_id.to_i], "items": {"pausestat": pause ? 1 : 0}})
+        request('http://fengchao.baidu.com/nirvana/request.ajax', "path": 'vega/MOD/keyword', "params": {"winfoid": [keyword_id.to_i], "items": {"pausestat": pause ? 1 : 0}})
       end
 
       def keywords_pause_and_enable(keyword_ids = [], pause = true)
-        request("path": 'vega/MOD/adkeyword', "params": {"checkAll": false, "mtlCond": {"levelCond": {"userid": cookies_params['__cas__id__3']}}, "mtlIds": keyword_ids.map {|keyword_id| keyword_id.to_s}, "items": {"pausestat": pause}})
+        request('http://fengchao.baidu.com/nirvana/request.ajax', "path": 'vega/MOD/adkeyword', "params": {"checkAll": false, "mtlCond": {"levelCond": {"userid": cookies_params['__cas__id__3']}}, "mtlIds": keyword_ids.map {|keyword_id| keyword_id.to_s}, "items": {"pausestat": pause}})
       end
 
-      def request(params = {})
+      def request(url, params = {})
         params.merge!(
             "userid": cookies_params['__cas__id__3'],
             "token": cookies_params['__cas__st__3']
         )
         @params = params
         params[:"params"] = params[:"params"].to_json
-        url = URI('http://fengchao.baidu.com/nirvana/request.ajax')
-        url.query = URI.encode_www_form(path: params[:"path"])
-        @url = url.to_s
-        http = Net::HTTP.new(url.host, url.port)
-        request = Net::HTTP::Post.new(url)
+        uri = URI(url)
+        uri.query = URI.encode_www_form(path: params[:"path"])
+        @url = uri.to_s
+        http = Net::HTTP.new(uri.host, uri.port)
+        if uri.scheme == 'https'
+          http.use_ssl = true
+          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        end
+        request = Net::HTTP::Post.new(uri)
         request["accept"] = '*/*'
         request["accept-encoding"] = 'gzip, deflate'
         request["accept-language"] = 'zh-CN,zh;q=0.8'
@@ -138,8 +143,8 @@ module Baidu
         request["connection"] = 'keep-alive'
         request["content-type"] = 'application/x-www-form-urlencoded'
         request["cookie"] = @cookies
-        request["host"] = 'fengchao.baidu.com'
-        request["origin"] = 'http://fengchao.baidu.com'
+        request["host"] = uri.host
+        request["origin"] = "#{uri.scheme}://#{uri.host}"
         request["pragma"] = 'no-cache'
         request["referer"] = "http://fengchao.baidu.com/nirvana/main.html?userid=#{cookies_params['__cas__id__3']}"
         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'

data/lib/baidu/tuiguang/version.rb

@@ -1,5 +1,5 @@
 module Baidu
   module Tuiguang
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: baidu-tuiguang
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Xiao Jie
@@ -52,6 +52,46 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+- !ruby/object:Gem::Dependency
+  name: openssl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.2
 description: ''
 email:
 - iefsou@163.com