更新demo

lixi
1 parent e2cd7368
Showing 10 changed files with 215 additions and 199 deletions
commons/ConfigDB.py
commons/Faker.py
commons/Logging.py
commons/MySession.py
commons/SendEmail.py
commons/clientSession.py
commons/common.py
commons/scripts/dealContentType.py
commons/scripts/readConf.py
config/global_data.conf
@@ -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')
-#!/usr/bin/python
-# -*- coding: UTF-8 -*-
-import random
-from faker import Factory
-
-class random_data():
-    
-        def __init__(self, type='zh_CN'):
-            self.type = type
-            self.fake = Factory().create(self.type)
-   
-        def date(self):
-            "随机时间"
-            return self.fake.date(pattern="%Y-%m-%d")
-            
-        def name(self):
-            "随机姓名"
-            return self.fake.name()
-        
-        def identity_card(self):
-            "随机姓名"
-            return self.fake.ssn(min_age=18, max_age=90)
-
-        def plate(self):
-            "随机车牌号"
-            return self.fake.license_plate()
-        
-        def plate_cn(self,plate_len=6):
-            char0='京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽赣粤青藏川宁琼'
-            char1='ABCDEFGHJKLMNPQRSTUVWXYZ'#车牌号中没有I和O，可自行百度
-            char2='1234567890'
-            len0=len(char0)-1
-            len1 = len(char1) - 1
-            len2 = len(char2) - 1
-            ########
-            code = ''
-            index0 = random.randint(0,len0 )
-            index1 = random.randint(0,len1)
-            code += char0[index0]
-            code += char1[index1]
-            for i in range(0, plate_len-1):
-                index2 = random.randint(1, len2)
-                code += char2[index2]
-            return(code)
-    
-        def country(self):
-            "随机国家代码"
-            return self.fake.country()
-
-        def province(self):
-            "随机省份"
-            return self.fake.province()
-        
-        def city(self):
-            "随机城市"
-            return self.fake.city_suffix()
-
-        def district(self):
-            "随机街道"
-            return self.fake.district()
-
-        def address(self):
-            "随机地址全称"
-            return self.fake.address()
-
-        def phone_number(self):
-            "随机手机号"
-            return self.fake.phone_number()
-
-        def email(self):
-            "随机邮件"
-            return self.fake.email()
-        
-        def longitude(self):
-            "随机经度"
-            return self.fake.longitude()   
-        
-        def latitude (self):
-            "随机维度"
-            return self.fake.latitude ()       
-
-        def credit_card_number (self):
-            "随机卡号"
-            return self.fake.credit_card_number ()
-
-
-
-a=random_data()
-print(a.date())
-print(a.name()) 
-print(a.identity_card()) 
-print(a.plate()) 
-print(a.plate_cn(6)) 
-print(a.country()) 
-print(a.province()) 
-print(a.city()) 
-print(a.district()) 
-print(a.address())
-print(a.phone_number())
-print(a.email())
-print(a.longitude())
-print(a.latitude())
-print(a.credit_card_number())
-
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+import random
+from faker import Factory
+
+class random_data():
+    
+        def __init__(self, type='zh_CN'):
+            self.type = type
+            self.fake = Factory().create(self.type)
+   
+        def date(self):
+            "随机时间"
+            return self.fake.date(pattern="%Y-%m-%d")
+            
+        def name(self):
+            "随机姓名"
+            return self.fake.name()
+        
+        def identity_card(self):
+            "随机证件"
+            return self.fake.ssn(min_age=18, max_age=90)
+
+        def plate(self):
+            "随机车牌号"
+            return self.fake.license_plate()
+        
+        def plate_cn(self,plate_len=6):
+            "随机车牌号"
+            char0='京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽赣粤青藏川宁琼'
+            char1='ABCDEFGHJKLMNPQRSTUVWXYZ'#车牌号中没有I和O，可自行百度
+            char2='1234567890'
+            len0=len(char0)-1
+            len1 = len(char1) - 1
+            len2 = len(char2) - 1
+            ########
+            code = ''
+            index0 = random.randint(0,len0 )
+            index1 = random.randint(0,len1)
+            code += char0[index0]
+            code += char1[index1]
+            for i in range(0, plate_len-1):
+                index2 = random.randint(1, len2)
+                code += char2[index2]
+            return(code)
+    
+        def country(self):
+            "随机国家代码"
+            return self.fake.country()
+
+        def province(self):
+            "随机省份"
+            return self.fake.province()
+        
+        def city(self):
+            "随机城市"
+            return self.fake.city_suffix()
+
+        def district(self):
+            "随机街道"
+            return self.fake.district()
+
+        def address(self):
+            "随机地址全称"
+            return self.fake.address()
+
+        def phone_number(self):
+            "随机手机号"
+            return self.fake.phone_number()
+
+        def email(self):
+            "随机邮件"
+            return self.fake.email()
+        
+        def longitude(self):
+            "随机经度"
+            return self.fake.longitude()   
+        
+        def latitude (self):
+            "随机维度"
+            return self.fake.latitude ()       
+
+        def credit_card_number (self):
+            "随机卡号"
+            return self.fake.credit_card_number ()
+
+
+
+# a=random_data()
+# print(a.date())
+# print(a.name())
+# print(a.identity_card())
+# print(a.plate())
+# print(a.plate_cn(6))
+# print(a.country())
+# print(a.province())
+# print(a.city())
+# print(a.district())
+# print(a.address())
+# print(a.phone_number())
+# print(a.email())
+# print(a.longitude())
+# print(a.latitude())
+# print(a.credit_card_number())
+
 #!/usr/bin/python
 # -*- coding: UTF-8 -*-
 import logging,os
+# from mylog import mylogger,logg
+
 class Logger():
     def __init__(self, path=__name__,clevel = logging.ERROR,Flevel = logging.DEBUG,test = 'w'):
         current_path=os.path.dirname(os.path.dirname(__file__))
         path=current_path+"/report"+"/test.log"
+        # setattr(mylogger, "logpath", path)
+        # logg.setting()
         self.logger = logging.getLogger(path)
@@ -55,3 +59,6 @@ class Logger():
     def critical(self,message):
         self.logger.critical(message)
+
+
+log=Logger()
 \ No newline at end of file
@@ -2,12 +2,12 @@
 # -*- 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():
+
+class mysession(requests.Session):
     "封装了requests的基类，以供后期统一使用"
     url = "http://test.uap.diligrp.com/login/login.action"
@@ -38,24 +38,28 @@ class mysession():
     def __init__(self):
         "如下代码，可以通过配置文件来控制测试环境和灰度环境，http和https"
+        super().__init__()
         self.url = mysession.url.replace("http://test.", com.get_global_config("global_data", "environment", "en"))
         self.header = mysession.header
         self.body = mysession.body
         self.url_client = mysession.url_client.replace("http://test.", com.get_global_config("global_data", "environment", "en"))
         self.header_client = mysession.header_client
         self.body_client = mysession.body_client
-        self.timeout = (5, 5)
+        self.timeout = (6,6)
         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.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"}
+        self.market={"sy":"沈阳","heb":"哈尔滨","sg":"寿光","gy":"贵阳","cc":"长春","hs":"杭水","hg":"杭果"}
+        self.user={}
-
-    def cliLogin(self):
-        self.webHeaders, self.clientHeaders, self.userInfo = cliSession().loginUser()
+    def cliLogin(self,user="sy_userName_01"):
+        self.webHeaders, self.clientHeaders, self.userInfo = cliSession().loginUser(user=user)
+        return self
     def get_session(self, account, **kwargs):
         "如下代码，可以通过配置文件来控制登录的账户session"
@@ -63,69 +67,53 @@ class mysession():
                                       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])
-        # requests.session()会话保持,比如使用session成功的登录了某个网站，
-        # 则在再次使用该session对象求求该网站的其他网页都会默认使用该session之前使用的cookie等参数
         self.se = requests.session()
-        #更新cookie加入UAP_firmId
         co = requests.cookies.RequestsCookieJar()
-        #backup:通过提前配置的方法更新市场id
+        #加入UAP_firmId属性
         firm=account.split("_")[0]
         co.set("UAP_firmId", self.firmid[firm])
-        #通过客户端登录的方法更新市场id
-        # co.set("UAP_firmId", str(self.get_login_info(account).json()["data"]["user"]["firmId"]))
         self.se.cookies.update(co)
-        # 使用session对象的方法POST/GET等
+        # 进行登录请求
         re = self.se.post(url=self.url, headers=self.header, data=self.body, proxies=self.proxies, **kwargs)
-        #获取关键信息供其他接口header使用
         self.UAP_accessToken=self.se.cookies["UAP_accessToken"]
         self.UAP_refreshToken=self.se.cookies["UAP_refreshToken"]
-        # 返回session对象，供其他接口使用
         return self.se
     def get_login_info(self, account, **kwargs):
         "用于获取用户信息"
         self.body_client.update({"userName":com.get_global_config("global_data", "account", account).split("&")[0]})
         self.body_client.update({"password":pwdCry(com.get_global_config("global_data", "account", account).split("&")[1])})
-        # requests.session()会话保持,比如使用session成功的登录了某个网站，
-        # 则在再次使用该session对象求求该网站的其他网页都会默认使用该session之前使用的cookie等参数
         tmp = requests.post(url=self.url_client, headers=self.header_client, json=self.body_client, proxies=self.proxies, **kwargs)
-        # 使用session对象的方法POST/GET等
-        #获取关键信息供其他接口header使用
-        # self.UAP_accessToken=tmp.json()["data"]["accessToken"]
-        # self.UAP_refreshToken=tmp.json()["data"]["refreshToken"]
-        # 返回session对象，供其他接口使用
         return tmp
     def get_session_client(self, account, **kwargs):
         "get_session和get_session_client的方法只能用一个"
         self.body_client.update({"userName": com.get_global_config("global_data", "account", account).split("&")[0]})
         self.body_client.update( {"password": pwdCry(com.get_global_config("global_data", "account", account).split("&")[1])})
-        # requests.session()会话保持,比如使用session成功的登录了某个网站，
-        # 则在再次使用该session对象求求该网站的其他网页都会默认使用该session之前使用的cookie等参数
-        self.se = requests.session()
-        # 使用session对象的方法POST/GET等
-        self.re = self.se.post(url=self.url_client, headers=self.header_client, json=self.body_client, proxies=self.proxies, **kwargs)
-        #组装请求的cookie
+        # 登录请求
+        self.re = super().post(url=self.url_client, headers=self.header_client, json=self.body_client, **kwargs)
+        #冗余登录账户信息
+        self.user[account]=self.re.json()["data"]["user"]
+        #配置cookie
         co = requests.cookies.RequestsCookieJar()
-        co.set("UAP_firmId", str(self.re.json()["data"]["user"]["firmId"]))
-        co.set("UAP_accessToken", self.re.json()["data"]["accessToken"])
-        co.set("UAP_refreshToken", self.re.json()["data"]["refreshToken"])
-        self.se.cookies.update(co)
-        # 返回session对象，供其他接口使用
-        return self.se
-
+        co.set("UAP_firmId", str(self.re.json()["data"]["user"]["firmId"]),domain=".diligrp.com")
+        co.set("UAP_accessToken", self.re.json()["data"]["accessToken"],domain=".diligrp.com")
+        co.set("UAP_refreshToken", self.re.json()["data"]["refreshToken"],domain=".diligrp.com")
+        self.cookies.update(co)
+        return self
     def close_session(self):
         "关闭session"
-        self.se.close()
+        self.close()
     def check_login(self, account, **kwargs):
         "验证登录接口"
         self.body = self.body.replace("sg_wenze",
                                       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,
+        # POST请求
+        print(self.body)
+        re = super().post(url=self.url, headers=self.header, data=self.body.encode('utf-8'),
                           allow_redirects=False, **kwargs)
         # 判断请求
         assert "UAP_accessToken" in re.headers["Set-Cookie"]
@@ -165,7 +153,7 @@ class mysession():
         log.info("{0:=^86}".format(''))
         log.info("{}\n{}\n".format(url, kwargs))
         # 进行请求
-        re = self.se.request(method , url, **kwargs, proxies=self.proxies, timeout=self.timeout)
+        re = super().request(method , url, **kwargs,timeout=self.timeout)
         return re
@@ -176,11 +164,8 @@ class mysession():
         :param \*\*kwargs: Optional arguments that ``request`` takes.
         :rtype: requests.Response
         """
-        # 记录日志
-        log.info("{0:=^86}".format(''))
-        log.info("{}\n{}\n".format(url, kwargs))
         # 进行请求
-        re = self.se.get(url, **kwargs, proxies=self.proxies, timeout=self.timeout)
+        re = super().get(url, **kwargs)
         return re
     def post(self, url, data=None, json=None, **kwargs):
@@ -192,11 +177,8 @@ class mysession():
         :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 = self.se.post(url, data=data, json=json, proxies=self.proxies, **kwargs, timeout=self.timeout)
+        re = super().post(url, data=data, json=json, **kwargs)
         return re
     def options(self, url, **kwargs):
@@ -280,12 +262,15 @@ class mysession():
 my = mysession()
 my.set_mark()
-my.cliLogin()
-s1 = my.get_session_client("sg_user01")
-s2 = my.get_session_client("sg_user02")
-s3 = my.get_session_client("sg_user01")
-# s3= my.get_session_client("sg_user02")
-# sg01=my.get_session_client("sg_user01")
-# sg02=my.get_session_client("sg_user02")
-# sy=my.get_session_client("sy_user01")
+
+# 沈阳客户端session
+sessionSy = mysession().cliLogin("sy_userName_01")
+# 哈尔滨客户端session
+sessionHeb = mysession().cliLogin("hd_userName_01")
+# print(sessionSy.userInfo)
+# print(sessionHeb.userInfo)
+
+sy1=mysession().get_session_client("sy_user01")
+heb=mysession().get_session_client("heb_user01")
+# sg=mysession().get_session_client("sg_user01")
@@ -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格式）
@@ -26,14 +25,16 @@ def send_email_text():
     smtp.quit()
-def send_email(send_file,send_to=["lixi@diligrp.com"]):
+def send_email(send_file,send_to=["lixi@diligrp.com"],cc_to=["lixi@diligrp.com"]):
     log_path=os.path.dirname(os.path.dirname(__file__))
     log_path=log_path+"/report/test.log"
     send_msg=(",".join(str(i) for i in send_to))
+    cc_msg = (",".join(str(j) for j in cc_to))
     msg = MIMEMultipart()  # 混合MIME格式
     msg['From'] = 'autotest@diligrp.com'  # 发件人
     msg['To'] = send_msg  # 收件人
+    msg['cc'] = cc_msg  # 抄送人
     msg['Subject'] = Header('接口测试报告', 'utf-8')  # 中文邮件主题，指定utf-8编码
     text = MIMEText('this is a test email', 'plain', 'utf-8')
@@ -54,7 +55,7 @@ def send_email(send_file,send_to=[&quot;lixi@diligrp.com&quot;]):
     try:
         smtp = smtplib.SMTP_SSL('smtp.exmail.qq.com')  # smtp服务器地址 使用SSL模式
         re=smtp.login('autotest@diligrp.com', 'MvkuGGCfMtAdbJvE')  # 用户名和密码
-        smtp.sendmail("autotest@diligrp.com", send_to, msg.as_string())
+        smtp.sendmail("autotest@diligrp.com", send_to+cc_to, msg.as_string())
         print(re)
     except Exception as e:
         log.error(str(e))
@@ -16,29 +16,27 @@ from commons.scripts.pwdCry import pwdCry
 class cliSession(object):
     def __init__(self):
-        rConf = readConfig()
-
-    def __init__(self):
-        rC = readConfig()
-        self.userName = rC.returnOptionsItems("loginInfo","userName")
-        self.password = pwdCry(rC.returnOptionsItems("loginInfo","password"))
-        self.loginUrl = rC.returnOptionsItems("host","uapHost")+"/api/authenticationApi/loginWeb"
-        self.loginData = {"userName":self.userName,"password":self.password}
+        self.rC = readConfig()
         self.webHeaders = {"X-Requested-With":"XMLHttpRequest",
                            "Content-Type":"application/x-www-form-urlencoded",
                            "Cookie":"UAP_accessToken=${UAP_accessToken}; UAP_refreshToken=${UAP_refreshToken};UAP_firmId=${UAP_firmId}"}
-
         self.clientHeaders={"UAP_accessToken":"${UAP_accessToken}",
                             "UAP_refreshToken":"${UAP_refreshToken}",
                             "UAP_firmId":"${UAP_firmId}",
                             "Cookie":"UAP_accessToken=${UAP_accessToken}; UAP_refreshToken=${UAP_refreshToken}",
                             "Content-Type":"application/json"}
-    def loginUser(self):
-        """
+    def loginUser(self,user="sy_userName_01"):
+        """
         :return:
         """
+        # 登录信息准备
+        self.userName,self.password = self.rC.returnOptionsItems("loginInfo",user).split(",")
+        self.password = pwdCry(self.password)
+        self.loginUrl = self.rC.returnOptionsItems("host","uapHost")+"/api/authenticationApi/loginWeb"
+        self.loginData = {"userName":self.userName,"password":self.password}
+
         # 返回登录信息，以及可用headers，clientHeaders用户客户端操作header，webHeaders用于web页面使用headers
         res = requests.post(url=self.loginUrl,data=json.dumps(self.loginData))
         # print(res.json())
@@ -51,3 +49,6 @@ class cliSession(object):
         self.clientHeaders["UAP_firmId"] = str(UAP_firmId)
         self.clientHeaders["Cookie"] = clientHeadersCookie
         return self.webHeaders,self.clientHeaders,res.json()
+
+# a,b,c = cliSession().loginUser()
+# print(c)
 \ No newline at end of file
@@ -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):
@@ -83,11 +82,15 @@ def run_one(name):
     runner = unittest.TextTestRunner()
     runner.run(test_suite)
+
 def run_list(name):
     test_suite = unittest.TestSuite()
     test_suite.addTests(name)
     #显示运行用例
     print("运行用例为{}".format(test_suite))
+    # with open(file="E:\\PycharmWorkspace\\jmsf-re-local\\report\\test.log", mode="a", encoding="utf-8") as file:
+    #     runner = unittest.TextTestRunner(stream=file,verbosity=2)
+    #     runner.run(test_suite)
     runner = unittest.TextTestRunner()
     runner.run(test_suite)
@@ -112,4 +115,8 @@ def run_Name(name):
     runner = unittest.TextTestRunner()
     runner.run(test_cases)
-# print(get_market_config("test_config_hg2","loginInfo","userName"))
 \ No newline at end of file
+def mylog(func):
+    def RebackTest(self):
+        log.info("{}".format(func.__name__))
+        return func(self)
+    return  RebackTest
 \ No newline at end of file
@@ -9,10 +9,10 @@
     用于hearders中Content-Type格式处理
 """
-def jsonCT(headers=None):
+def jsonCode(headers={}):
     headers["Content-Type"] = "application/json; charset=UTF-8"
     return headers
-def urlCode(headers=None):
+def urlCode(headers={}):
     headers["Content-Type"] = "application/x-www-form-urlencoded"
     return headers
 \ No newline at end of file
@@ -19,7 +19,7 @@ class readConfig(object):
         # 按市场读取配置文件数据
         self.conf = configparser.ConfigParser()
         self.evn_name = os.name
-        self.file_name = r'test_config_hg.conf'
+        self.file_name = r'conf_test.conf'
         self.relative_path = r'/config/marketConfig/'
         self.file_path = os.path.abspath(
             os.path.join(os.path.dirname(__file__), "../../")) + self.relative_path + self.file_name
@@ -53,7 +53,7 @@ class readConfig(object):
         print(self.file_path)
         return self.file_path
-# rc = readConfig()
+rC = readConfig()
 # rc.returnSections()
 # rc.returnOptions("loginInfo")
 # rc.returnOptionsInfo("loginInfo")
 # -*- coding: UTF-8 -*-
+[market]
+#该字段存放市场的缩略名称，运行指定市场的用例,目前为着冗余配置
+#list为空时，默认运行所有市场用例，需要指定市场时，参考demo格式
+list=[]
+demo=["sy","heb"]
+
 [account]
 #取值字段根据市场拼音首字母缩写组合而成,尾号数字按照01-99叠加
 #账户和密码通过&符号隔开
+sy_user01=sy_chen&123456
+sy_user02=sygangda&111111
+heb_user01=哈尔滨田太子&a123456
+heb_user02=sy_wenze&111111
 sg_user01=sg_wenze&111111
-sg_user02=sgwanggang&111111
-sg_user03=hz_wenze&111111
-sy_user01=sy_wenze&111111
 [userId]
 #冗余配置字段,可不配置
@@ -16,21 +23,15 @@ user03=256
 [email]
 #为空时[]不发邮件,若要发邮件，参考demo
-list=["lixi@diligrp.com","175930106@qq.com"]
-demo=["tg@diligrp.com","175930106@qq.com"]
+to_list=["tianlichang@diligrp.com","liaokaihua@diligrp.com"]
+cc_list=["lixi@diligrp.com","liujiqiang@diligrp.com","wenleiming@diligrp.com"]
+demo=["lixi@diligrp.com","liujiqiang@diligrp.com","wenleiming@diligrp.com","tg@diligrp.com"]
 [mark]
 #为空时[]运行所有用例,若要运行指定用例，参考demo
 list=[]
-demo=["p1","P2",1,"test"]
+demo=["heb1","P3","v1.6","沈阳",None]
-[Database]
-dbhost=10.35.100.34
-dbport=3306
-dbname=dili_trace
-dbuser=root
-dbpassword=123456
-dbcharset=utf8
 [environment]
 #格式只能为一下几种
@@ -41,6 +42,21 @@ dbcharset=utf8
 en=http://test.
+[Database]
+dbhost=10.35.100.34
+dbport=3306
+dbname=dili_jmsf
+dbuser=root
+dbpassword=123456
+dbcharset=utf8
+
+
+[host]
+gateway=test.gateway.diligrp.com:8285
+
+
+
+