更新

hg3535/pipelines.py

@@ -1736,8 +1736,10 @@ class Roll_Wangqiupipeline(object):
         if total_number_dict:
             for key, value in total_number_dict.items():
                 if value:
+                    # for x, y in enumerate(value):
                     new_hash = hash_func(match_id=game_id, odds_code=key, sort=0, p_id=4)
                     odds_only = r_func(match_id=game_id, odds_code=key, sort=0, p_id=4,odd=value)
+                    # print(value)
                     sql1 = "insert into st_wq_odds(lg_id, odds_code, match_id, ctime, utime, odds, p_id, p_code, sort, source, sole,condition,odds_only,is_rollball) values (%s, %s, %s, %s, %s, %s,%s, %s, %s, %s, %s, %s,%s,%s) on conflict(sole) do update set utime = %s,odds = %s,odds_only=%s;"
                     self.cursor.execute(sql1, (
                     int(league_id), key, int(game_id), utime, utime,value, 4, "total_number", 0, "hg3535", new_hash,

hg3535/settings.py

@@ -141,18 +141,18 @@ SCHEDULER_FLUSH_ON_START = False
 # POST_PORT = '5433'
 # POST_PASSWORD = '123456'
 
-# POST_HOST = 'localhost'
-# POST_DATABASE = 'postgres'
-# POST_USER = 'postgres'
-# POST_PORT = '5433'
-# POST_PASSWORD = '123456'
+POST_HOST = 'localhost'
+POST_DATABASE = 'postgres'
+POST_USER = 'postgres'
+POST_PORT = '5433'
+POST_PASSWORD = '123456'
 
 #以后解开这个位置的注释
-POST_HOST = '172.17.0.4'
-POST_DATABASE = 'kaiyou'
-POST_USER = 'kaiyou'
-POST_PORT = '5432'
-POST_PASSWORD = 'yjkj8888'
+# POST_HOST = '172.17.0.4'
+# POST_DATABASE = 'kaiyou'
+# POST_USER = 'kaiyou'
+# POST_PORT = '5432'
+# POST_PASSWORD = 'yjkj8888'
 
 
 # POST_HOST = '192.168.2.200'

hg3535/spiders/roll_wangqiu.py

@@ -63,7 +63,6 @@ class WangqiuSpider(scrapy.Spider):
                 print(urls)
                 yield Request(url=urls, callback=self.parse_other)
 
-
     def parse_other(self,response):
         new_datas = json.loads(response.text).get('eg', "")
         try:
@@ -129,49 +128,34 @@ class WangqiuSpider(scrapy.Spider):
             try:
                 # 第一节让球
                 one_concedes = result['o']["ahs1"]["v"]
-                one_concede_home_rule,one_concede_home,one_concede_guest_rule,one_concede_guest= rangqiu_daxiao(inner=one_concedes)
-                concedes_dict_rule['one_dishes_home'] = ''.join(one_concede_home_rule)
-                concedes_dict['one_dishes_home'] = ''.join(one_concede_home)
-                concedes_dict_rule['one_dishes_guest'] = ''.join(one_concede_guest_rule)
-                concedes_dict['one_dishes_guest'] = ''.join(one_concede_guest)
+                concedes_dict_rule['one_dishes_home'] = one_concedes[1]
+                concedes_dict['one_dishes_home'] = one_concedes[5]
+                concedes_dict_rule['one_dishes_guest'] = one_concedes[3]
+                concedes_dict['one_dishes_guest'] = one_concedes[7]
             except:
-                one_concede_guest = ""
-                one_concede_guest_rule = ""
-                one_concede_home = ""
-                one_concede_home_rule = ""
-                concedes_dict_rule['one_dishes_home'] = one_concede_home_rule
-                concedes_dict['one_dishes_home'] = one_concede_home
-                concedes_dict_rule['one_dishes_guest'] = one_concede_guest_rule
-                concedes_dict['one_dishes_guest'] = one_concede_guest
+                concedes_dict_rule['one_dishes_home'] = ""
+                concedes_dict['one_dishes_home'] = ""
+                concedes_dict_rule['one_dishes_guest'] = ""
+                concedes_dict['one_dishes_guest'] = ""
 
-# ----------------------------------------第二节让球分割线---------------------------------------------------------------------------
+# ----------------------------------------第二节让球分割线-----------------------------------------------------------------
 
             #第二节让球
             # 第二节让球
             try:
                 two_concedes = result['o']["ahs2"]["v"]
-                two_concede_home_rule,two_concede_home,two_concede_guest_rule,two_concede_guest = rangqiu_daxiao(inner=two_concedes)
-                concedes_dict_rule['two_dishes_home'] = ''.join(two_concede_home_rule)
-                concedes_dict['two_dishes_home'] = ''.join(two_concede_home)
-                concedes_dict_rule['two_dishes_guest'] = ''.join(two_concede_guest_rule)
-                concedes_dict['two_dishes_guest'] = ''.join(two_concede_guest)
+                concedes_dict_rule['two_dishes_home'] = two_concedes[1]
+                concedes_dict['two_dishes_home'] = two_concedes[5]
+                concedes_dict_rule['two_dishes_guest'] = two_concedes[3]
+                concedes_dict['two_dishes_guest'] = two_concedes[7]
             except:
-                two_concede_guest = ""
-                two_concede_guest_rule = ""
-                two_concede_home = ""
-                two_concede_home_rule = ""
-                concedes_dict_rule['two_dishes_home'] = two_concede_home_rule
-                concedes_dict['two_dishes_home'] = two_concede_home
-                concedes_dict_rule['two_dishes_guest'] = two_concede_guest_rule
-                concedes_dict['two_dishes_guest'] = two_concede_guest
-
-
-
+                concedes_dict_rule['two_dishes_home'] = ""
+                concedes_dict['two_dishes_home'] = ""
+                concedes_dict_rule['two_dishes_guest'] = ""
+                concedes_dict['two_dishes_guest'] = ""
 
 
-
-
-# ---------------------------------------------------冠军  滚球是独赢----------------------------------------------------------------
+# ---------------------------------------------------冠军  滚球是独赢-----------------------------------------------------
             kemps_dict = {}
             try:
                 kemps = result['o']["ml"]["v"]
@@ -216,7 +200,7 @@ class WangqiuSpider(scrapy.Spider):
                 bureaus_dict_rule['concede_guest'] = ""
                 bureaus_dict['concede_guest'] = ""
 
-# -----------------------------------------------------总局数 第一盘:大/小------------------------------------------------------
+# -----------------------------------------------------总局数 第一盘:大/小------------------------------------------------
             total_number_dict = {}
             total_number_dict_rule = {}
             try:  #总局数 滚球大小
@@ -234,58 +218,42 @@ class WangqiuSpider(scrapy.Spider):
             # 第一节盘
             try:
                 one_total_sizes = result['o']["ous1"]["v"]
-                one_total_sizes_big_rule,one_total_sizes_big,one_total_sizes_small_rule,one_total_sizes_small = rangqiu_daxiao(inner=one_total_sizes)
-                total_number_dict_rule["one_total_sizes_big"] = ''.join(one_total_sizes_big_rule)
-                total_number_dict["one_total_sizes_big"] = ''.join(one_total_sizes_big)
-                total_number_dict_rule["one_total_sizes_small"] = ''.join(one_total_sizes_small_rule)
-                total_number_dict["one_total_sizes_small"] = ''.join(one_total_sizes_small)
+                total_number_dict_rule["one_total_sizes_big"] = one_total_sizes[1]
+                total_number_dict["one_total_sizes_big"] = one_total_sizes[5]
+                total_number_dict_rule["one_total_sizes_small"] = one_total_sizes[3]
+                total_number_dict["one_total_sizes_small"] = one_total_sizes[7]
             except:
-                one_total_sizes_big_rule = ""
-                one_total_sizes_big = ""
-                one_total_sizes_small_rule = ""
-                one_total_sizes_small = ""
-                total_number_dict_rule["one_total_sizes_big"] = ''.join(one_total_sizes_big_rule)
-                total_number_dict["one_total_sizes_big"] = ''.join(one_total_sizes_big)
-                total_number_dict_rule["one_total_sizes_small"] = ''.join(one_total_sizes_small_rule)
-                total_number_dict["one_total_sizes_small"] = ''.join(one_total_sizes_small)
+                total_number_dict_rule["one_total_sizes_big"] = ""
+                total_number_dict["one_total_sizes_big"] = ""
+                total_number_dict_rule["one_total_sizes_small"] = ""
+                total_number_dict["one_total_sizes_small"] = ""
 
             # 第二节盘
             try:
                 two_total_sizes = result['o']["ous2"]["v"]
-                two_total_sizes_big_rule,two_total_sizes_big,two_total_sizes_small_rule,two_total_sizes_small = rangqiu_daxiao(inner=two_total_sizes)
-                total_number_dict_rule["two_total_sizes_big"] = two_total_sizes_big_rule
-                total_number_dict["two_total_sizes_big"] = "".join(two_total_sizes_big)
-                total_number_dict_rule["two_total_sizes_small"] = "".join(two_total_sizes_small_rule)
-                total_number_dict["two_total_sizes_small"] = "".join(two_total_sizes_small)
+                total_number_dict_rule["two_total_sizes_big"] = two_total_sizes[1]
+                total_number_dict["two_total_sizes_big"] = two_total_sizes[5]
+                total_number_dict_rule["two_total_sizes_small"] = two_total_sizes[3]
+                total_number_dict["two_total_sizes_small"] = two_total_sizes[7]
             except:
-                two_total_sizes_big_rule = ""
-                two_total_sizes_big = ""
-                two_total_sizes_small_rule = ""
-                two_total_sizes_small = ""
-                total_number_dict_rule["two_total_sizes_big"] = two_total_sizes_big_rule
-                total_number_dict["two_total_sizes_big"] = ''.join(two_total_sizes_big)
-                total_number_dict_rule["two_total_sizes_small"] = ''.join(two_total_sizes_small_rule)
-                total_number_dict["two_total_sizes_small"] = ''.join(two_total_sizes_small)
+                total_number_dict_rule["two_total_sizes_big"] = ""
+                total_number_dict["two_total_sizes_big"] = ""
+                total_number_dict_rule["two_total_sizes_small"] = ""
+                total_number_dict["two_total_sizes_small"] = ""
 
 
             # 第三节盘
             try:
                 three_total_sizes = result['o']["ous3"]["v"]
-                three_total_sizes_big_rule,three_total_sizes_big,three_total_sizes_small_rule,three_total_sizes_small = rangqiu_daxiao(inner=three_total_sizes)
-                total_number_dict_rule["three_total_sizes_big"] = ''.join(three_total_sizes_big_rule)
-                total_number_dict["three_total_sizes_big"] = three_total_sizes_big
-                total_number_dict_rule["three_total_sizes_small"] = ''.join(three_total_sizes_small_rule)
-                total_number_dict["three_total_sizes_small"] = ''.join(three_total_sizes_small)
+                total_number_dict_rule["three_total_sizes_big"] = three_total_sizes[1]
+                total_number_dict["three_total_sizes_big"] = three_total_sizes[5]
+                total_number_dict_rule["three_total_sizes_small"] = three_total_sizes[3]
+                total_number_dict["three_total_sizes_small"] = three_total_sizes[7]
             except:
-                three_total_sizes_big_rule = ""
-                three_total_sizes_big = ""
-                three_total_sizes_small_rule = ""
-                three_total_sizes_small = ""
-                total_number_dict_rule["three_total_sizes_big"] = ''.join(three_total_sizes_big_rule)
-                total_number_dict["three_total_sizes_big"] = three_total_sizes_big
-                total_number_dict_rule["three_total_sizes_small"] = ''.join(three_total_sizes_small_rule)
-                total_number_dict["three_total_sizes_small"] = three_total_sizes_small
-
+                total_number_dict_rule["three_total_sizes_big"] = ""
+                total_number_dict["three_total_sizes_big"] = ""
+                total_number_dict_rule["three_total_sizes_small"] = ""
+                total_number_dict["three_total_sizes_small"] = ""
 
 
 # ------------------------------------------------------总局数:单/双-----------------------------------------------------