Merge remote-tracking branch 'origin/master' into master

liujiqiang
2 parents 2b289d16 f640deaf
Showing 2 changed files with 7 additions and 5 deletions
commons/api/feedback_customer_query.py
testcase/FeedbackCustomerController/test_feedback_customer_query.py
@@ -45,6 +45,6 @@ class feedback_customer_query():
 # feedback_customer_query = urllib.parse.urlencode(feedback_customer_query())
  
 # fcq = feedback_customer_query
-# # print(fcq.body)
+# # # print(fcq.body)
 # re = sy1.post(url = fcq.url, data = fcq.body.replace('\n',"").encode('utf-8'),headers = fcq.header,proxies = my.proxies)
 # print(re.text)
 \ No newline at end of file
@@ -17,13 +17,15 @@ class test_feedback_customer_query(unittest.TestCase):
         WHERE market_id = ''' + str(sy1.user["sy_user01"]["firmId"]) + ''' ORDER BY `id` DESC LIMIT 1''')[0]
     def test_feedback_customer_query_01(self):
         print(fcq.url)
-        body = fcq.body.replace("潘婷婷", str(self.name1)).\
-            replace("2021-07-02 00:00:00",(datetime.datetime.now() - datetime.timedelta(days = 30)).strftime("%Y-%m-%d %H:%M:%S")).\
-            replace("2021-08-03 23:59:59",datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"))
+        body = fcq.body\
+            .replace("潘婷婷", str(self.name1))\
+            .replace("2021-08-11 00:00:00",(datetime.datetime.now() - datetime.timedelta(days = 30)).strftime("%Y-%m-%d %H:%M:%S")).\
+            replace("2021-08-11 23:59:59",datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"))
         # print(body)
-        re = sy1.post(url = fcq.url, data = body.replace("\n","").encode('utf-8'),headers = fcq.header,proxies = my.proxies)
+        re = sy1.post(url = fcq.url, data = body.replace("\n","").encode('utf-8'),headers = fcq.header)
         # print(re.headers)
         # print(re.text)
+        # print("士大夫十",str(self.name1))
         self.assertTrue(str(self.name1) in str(re.text))
  
     @classmethod