修改爬虫reward正则表达式

service/beacon.py

@@ -180,24 +180,24 @@ class BeaconChaService:
         tree = etree.HTML(html)
         total_rewards_re = tree.xpath('/html/body/main/div[1]/div[2]/div[2]/div/table/tbody/tr[1]/td/span')[0]
         total_rewards_title = total_rewards_re.get("title")
-        total_list = re.findall(r'<span>(.\d+\.?\d*) ETH</span>', total_rewards_title)
+        total_list = re.findall(r'<span>(.?\d+\.?\d*) ETH</span>', total_rewards_title)
         total_total_rewards_text = tree.xpath('/html/body/main/div[1]/div[2]/div[2]/div/table/tbody/tr[1]/td/span/b')[0].text
-        total_total_rewards = re.findall(r".\d+\.?\d*", total_total_rewards_text)[0]
+        total_total_rewards = re.findall(r".?\d+\.?\d*", total_total_rewards_text)[0]
         # income_today
         income_today_xpath = "/html/body/main/div[1]/div[2]/div[2]/div/table/tbody/tr[2]/td/span"
         income_today_total_path = "/html/body/main/div[1]/div[2]/div[2]/div/table/tbody/tr[2]/td/span/span/b"
         income_today_re, total_income_today = tree.xpath(income_today_xpath)[0], tree.xpath(income_today_total_path)[0].text
-        income_today_list = re.findall(r"(.\d+\.?\d*) ETH", income_today_re.get("title"))
-        total_income_today = re.findall(r".\d+\.?\d*", total_income_today)[0]
+        income_today_list = re.findall(r"(.?\d+\.?\d*) ETH", income_today_re.get("title"))
+        total_income_today = re.findall(r".?\d+\.?\d*", total_income_today)[0]
         # income
         total_income1d_xpath = "/html/body/main/div[1]/div[2]/div[2]/div/table/tbody/tr[3]/td/span/span[1]/b"
         total_income7d_xpath = "/html/body/main/div[1]/div[2]/div[2]/div/table/tbody/tr[3]/td/span/span[2]/b"
         total_income365d_xpath = "/html/body/main/div[1]/div[2]/div[2]/div/table/tbody/tr[3]/td/span/span[3]/b"
-        total_income1d = re.findall(r".\d+\.?\d*", tree.xpath(total_income1d_xpath)[0].text)[0]
-        total_income7d = re.findall(r".\d+\.?\d*", tree.xpath(total_income7d_xpath)[0].text)[0]
-        total_income31d = re.findall(r".\d+\.?\d*", tree.xpath(total_income365d_xpath)[0].text)[0]
+        total_income1d = re.findall(r".?\d+\.?\d*", tree.xpath(total_income1d_xpath)[0].text)[0]
+        total_income7d = re.findall(r".?\d+\.?\d*", tree.xpath(total_income7d_xpath)[0].text)[0]
+        total_income31d = re.findall(r".?\d+\.?\d*", tree.xpath(total_income365d_xpath)[0].text)[0]
         income_xpath = "/html/body/main/div[1]/div[2]/div[2]/div/table/tbody/tr[3]/td/span"
-        income_list = re.findall(r".\d+\.?\d*", tree.xpath(income_xpath)[0].get("title"))
+        income_list = re.findall(r".?\d+\.?\d*", tree.xpath(income_xpath)[0].get("title"))
         result = Rewards(
             total_rewards=NodeGeneral(cl=float(total_list[0]), el=float(total_list[1]), total=float(total_total_rewards)),
             income_today=NodeGeneral(cl=float(income_today_list[0]), el=float(income_today_list[1]), total=float(total_income_today)),