Merge remote-tracking branch 'origin/master'

wenleiming
2 parents b7f43970 bf44a126
Showing 8 changed files with 23 additions and 30 deletions
commons/ConfigDB.py
commons/Logging.py
commons/MySession.py
commons/SendEmail.py
commons/common.py
config/api/sy/userApi.py
main.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的基类，以供后期统一使用"
@@ -49,8 +49,8 @@ class mysession(requests.Session):
         self.max_retries = 3
         self.keep_alive = False
         self.ssl_verify = False
-        # self.proxies = None
-        self.proxies={'http': 'http://localhost:8888', 'https': 'http://localhost:8888'}
+        self.proxies = None
+        # self.proxies={'http': 'http://localhost:8888', 'https': 'http://localhost:8888'}
         self.myproxies={'http': 'http://localhost:8888', 'https': 'http://localhost:8888'}
         self.allow_redirects = False
         self.firmid={"group":"1","hd":"2","cd":"3","qqhe":"4","mdj":"5","gy":"6","cc":"7","sg":"8","sy":"9"}
@@ -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):
@@ -118,8 +117,6 @@ def run_Name(name):
 def mylog(func):
     def RebackTest(self):
-        print(func.__name__)
-        print(dir(func))
-        # print(self)
+        log.info("{}".format(func.__name__))
         return func(self)
     return  RebackTest
 \ No newline at end of file
@@ -30,7 +30,7 @@ data={
             "email": "shenyangtangchuan@diligrp.com",
             "firmCode": "sy",
             "id": 228,
-            "lastLoginTime": "2021-08-04 15:50:24",
+            "lastLoginTime": "2021-08-05 16:23:14",
             "metadata": {},
             "modified": "2021-07-13 15:56:44",
             "password": "DABF2BB8F4A3D0AAE5",
@@ -67,7 +67,7 @@ data={
             "email": "shenyangdagang@diligrp.com",
             "firmCode": "sy",
             "id": 320,
-            "lastLoginTime": "2021-08-04 15:23:56",
+            "lastLoginTime": "2021-08-06 10:05:46",
             "metadata": {},
             "modified": "2021-07-13 15:56:44",
             "password": "18965EB72C92A549DD",
@@ -34,7 +34,7 @@ def Run_Testcase(testsuit):
     runner=HTMLTestRunner_cn.HTMLTestRunner(
         stream=fp,
-        title=u'重构项目接口测试报告',
+        title=u'进门收费系统--接口测试报告',
         description=u'用例简要执行情况如下：(注:报告详细信息需要下载report.html并用浏览器打开)',
         verbosity = 2)
     #执行用例
@@ -11,25 +11,27 @@ we=weighingServiceSave(sy1)
 li=listCarType(sy1)
-@com.mylog
+
 class test_weighingServiceSave(unittest.TestCase):
     "称重服务"
+
     @classmethod
     def setUpClass(cls):
         pass
-
     def setUp(self) :
         pass
+    # @com.mylog
     @unittest.case_mark(my.mark())
     def test_weighingServiceSave_01(self):
         "称重服务：成功新增一条称重服务单"
         body=we.body.copy()
-        body["carTypeId"]=li.car_list()["data"][0]["id"]
-        body["carTypeName"]=li.car_list()["data"][0]["carTypeName"]
-        body["carTypeCode"]=li.car_list()["data"][0]["code"]
+        car=li.car_list()["data"]
+        body["carTypeId"]=car[0]["id"]
+        body["carTypeName"]=car[0]["carTypeName"]
+        body["carTypeCode"]=car[0]["code"]
         re=sy1.post(url=we.url,headers=we.header,json=body)
         print(re.json())
         self.assertEqual(re.status_code, 200)