更新进门称重的方法

lixi
1 parent 4242e002
Showing 6 changed files with 11 additions and 18 deletions
commons/ConfigDB.py
commons/Logging.py
commons/MySession.py
commons/SendEmail.py
commons/common.py
testcase/weightBizBill/test_weighingServiceSave.py
@@ -2,11 +2,9 @@
 # -*- coding: UTF-8 -*-
 import pymysql
 import time
-import commons.common as ca
 import json
-from commons.Logging import Logger
-# import chardet
-log=Logger()
+import commons.common as ca
+from commons.Logging import log
 dbhost=ca.get_global_config('global_data','Database','dbhost')
@@ -55,3 +55,6 @@ class Logger():
     def critical(self,message):
         self.logger.critical(message)
+
+
+log=Logger()
 \ No newline at end of file
@@ -2,10 +2,10 @@
 # -*- coding: UTF-8 -*-
 import requests
 from commons import common as com
-from commons.Logging import Logger
+from commons.Logging import log
 from commons.clientSession import cliSession
 from commons.scripts.pwdCry import pwdCry
-log=Logger()
+
 class mysession(requests.Session):
     "封装了requests的基类，以供后期统一使用"
@@ -127,7 +127,7 @@ class mysession(requests.Session):
                                       com.get_global_config("global_data", "account", account).split("&")[0])
         self.body = self.body.replace("111111", com.get_global_config("global_data", "account", account).split("&")[1])
         # POST请求，
-        re = self.se.post(url=self.url, headers=self.header, data=self.body, proxies=self.proxies,
+        re = super().post(url=self.url, headers=self.header, data=self.body,
                           allow_redirects=False, **kwargs)
         # 判断请求
         assert "UAP_accessToken" in re.headers["Set-Cookie"]
@@ -178,9 +178,6 @@ class mysession(requests.Session):
         :param \*\*kwargs: Optional arguments that ``request`` takes.
         :rtype: requests.Response
         """
-        # 记录日志
-        log.info("{0:=^86}".format(''))
-        log.info("{}\n{}\n".format(url, kwargs))
         # 进行请求
         re = super().get(url, **kwargs)
         return re
@@ -194,9 +191,6 @@ class mysession(requests.Session):
         :param \*\*kwargs: Optional arguments that ``request`` takes.
         :rtype: requests.Response
         """
-        # 记录日志
-        log.info("{0:=^86}".format(''))
-        log.info("{}\n{}\n{}\n{}".format(url, data, json, kwargs))
         # 进行请求
         re = super().post(url, data=data, json=json, **kwargs)
         return re
@@ -7,8 +7,7 @@ from email.header import Header
 from email.mime.text import MIMEText  
 from email.mime.image import MIMEImage
 from email.mime.application import MIMEApplication
-from commons.Logging import Logger
-log=Logger()
+from commons.Logging import log
 def send_email_text():
     # 1. 编写邮件内容（Email邮件需要专门的MIME格式）
@@ -4,8 +4,7 @@ import os
 import configparser
 import unittest
 from discover import DiscoveringTestLoader
-from commons.Logging import Logger
-log=Logger()
+from commons.Logging import log
 def get_global_config(file,section, key):
@@ -23,7 +23,7 @@ class test_weighingServiceSave(unittest.TestCase):
     def setUp(self) :
         pass
-    @com.mylog
+    # @com.mylog
     @unittest.case_mark(my.mark())
     def test_weighingServiceSave_01(self):
         "称重服务：成功新增一条称重服务单"