Merge remote-tracking branch 'remotes/origin/dev' into test

Ansjer/formal_statistics_push_day_task.py

@@ -3,14 +3,12 @@ import json
 import requests
 
 
-base_url = 'http://test.dvema.com'
-# base_url = 'http://test.dvema.com/'
-# username='13800138001'
-# password='ansjer123456'
+base_url = 'http://dvema.com'
+username='13800138001'
+password='ansjer123456'
 
 login_url = base_url + 'account/login'
-username='13798991771'
-password='123456'
+
 data = {
     'userName': username,
     'userPwd': password

Ansjer/test_statistics_push_day_task.py

@@ -5,12 +5,10 @@ import requests
 
 # url = 'http://test.dvema.com'
 base_url = 'http://test.dvema.com/'
-# username='13800138001'
-# password='ansjer123456'
-
+username='13800138001'
+password='ansjer999999'
 login_url = base_url + 'account/login'
-username='13798991771'
-password='123456'
+
 data = {
     'userName': username,
     'userPwd': password