MySession.py新增客户端登录方法get_session_client

lixi
1 parent bb70b111
Showing 2 changed files with 40 additions and 16 deletions
commons/MySession.py
report/test.log
@@ -5,12 +5,15 @@ import json
 from commons import common as com
 from commons.Logging import Logger
 from commons.clientSession import cliSession
+from commons.scripts.pwdCry import pwdCry
 log=Logger()
  
 class mysession():
     "封装了requests的基类，以供后期统一使用"
  
     url = "http://test.uap.diligrp.com/login/login.action"
+    url_client = "http://test.uap.diligrp.com/api/authenticationApi/loginWeb"
+
     header = {
         "Host": "test.uap.diligrp.com",
         "Connection": "keep-alive",
@@ -25,19 +28,29 @@ class mysession():
         "Accept-Encoding": "gzip,deflate",
         "Accept-Language": "zh-CN,zh-TW;q=0.9,zh;q=0.8,en;q=0.7",
         "Cookie": "UAP_accessToken=;UAP_refreshToken=;UAP_loginPath="}
+    header_client = {
+        "Content-Type": "text/plain;charset\u003dutf-8",
+        "Host": "test.uap.diligrp.com",
+        "Content-Length": "209",
+        "Expect": "100-continue"}
+
     body = "userName=sg_wenze&password=111111"
+    body_client= {"userName":"sg_wenze","password":"key"}
  
     def __init__(self):
         "如下代码，可以通过配置文件来控制测试环境和灰度环境，http和https"
         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.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.allow_redirects = False
         self.firmid={"group":"1","hd":"2","cd":"3","qqhe":"4","mdj":"5","gy":"6","cc":"7","sg":"8","sy":"9"}
  
@@ -46,11 +59,11 @@ class mysession():
         self.webHeaders, self.clientHeaders, self.userInfo = cliSession().loginUser()
  
     def get_session(self, account, **kwargs):
-        # print("get_session")
         "如下代码，可以通过配置文件来控制登录的账户session"
         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])
+        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()
@@ -64,9 +77,30 @@ class mysession():
         #获取关键信息供其他接口header使用
         self.UAP_accessToken=self.se.cookies["UAP_accessToken"]
         self.UAP_refreshToken=self.se.cookies["UAP_refreshToken"]
+        print(self.UAP_accessToken)
+        print(self.UAP_refreshToken)
         # 返回session对象，供其他接口使用
         return self.se
  
+    def get_session_client(self, account, **kwargs):
+        "get_session和get_session_client的方法只能用一个"
+        "如下代码，可以通过配置文件来控制登录的账户session"
+        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等
+        re = self.se.post(url=self.url_client, headers=self.header_client, json=self.body_client, proxies=self.proxies, **kwargs)
+        #获取关键信息供其他接口header使用
+        self.UAP_accessToken=re.json()["data"]["accessToken"]
+        self.UAP_refreshToken=re.json()["data"]["refreshToken"]
+        print(self.UAP_accessToken)
+        print(self.UAP_refreshToken)
+        # 返回session对象，供其他接口使用
+        return self.se
+
+
     def close_session(self):
         "关闭session"
         self.se.close()
@@ -222,5 +256,7 @@ my.set_mark()
 my.cliLogin()
 s1 = my.get_session("sg_user01")
 s2 = my.get_session("sg_user02")
+s3 = my.get_session_client("sg_user01")
 # sg1=my.get_session("sg_user01")
 # sy1=my.get_session("sy_user01")
+
-[2021-07-21 10:40:56] [INFO] : ======================================================================================
-[2021-07-21 10:40:56] [INFO] : http://test.trace.diligrp.com:8393/fieldConfig/doUpdate.action
-None
-{'moduleType': '1', 'marketId': '8', 'fieldConfigDetailList': [{'fieldName': 'unitPrice', 'jsonPath': '$.unitPrice', 'defaultId': '3', 'displayed': '1', 'required': '0'}, {'fieldName': 'arrivalTallynos', 'jsonPath': '$.arrivalTallynos', 'defaultId': '10', 'displayed': '1', 'required': '0'}, {'fieldName': 'brandName', 'jsonPath': '$.brandName', 'defaultId': '5', 'displayed': '1', 'required': '0'}, {'fieldName': 'truckTareWeight', 'jsonPath': '$.truckTareWeight', 'defaultId': '1', 'displayed': '1', 'required': '0'}, {'fieldName': 'originId', 'jsonPath': '$.originId', 'defaultId': '7', 'displayed': '1', 'required': '0'}, {'fieldName': 'specName', 'jsonPath': '$.specName', 'defaultId': '4', 'displayed': '1', 'required': '0'}, {'fieldName': 'truckType', 'jsonPath': '$.truckType', 'defaultId': '2', 'displayed': '1', 'required': '1', 'availableValueList': ['10', '20']}, {'fieldName': 'imageCertList', 'jsonPath': '$.imageCertList[*]certType', 'defaultId': '11', 'displayed': '1', 'required': '0', 'availableValueList': ['2', '3']}, {'fieldName': 'arrivalDatetime', 'jsonPath': '$.arrivalDatetime', 'defaultId': '9', 'displayed': '1', 'required': '0'}, {'fieldName': 'remark', 'jsonPath': '$.remark', 'defaultId': '8', 'displayed': '1', 'required': '0'}, {'fieldName': 'remark', 'jsonPath': '$.remark', 'defaultId': '6', 'displayed': '1', 'required': '0'}, {'fieldName': 'measureType', 'jsonPath': '$.measureType', 'defaultId': '12', 'displayed': '1', 'required': '1', 'availableValueList': ['10', '20']}]}
-{'headers': {'Host': 'test.trace.diligrp.com:8393', 'Connection': 'keep-alive', 'Content-Length': '1378', 'Accept': 'application/json,text/javascript,*/*;q=0.01', 'X-Requested-With': 'XMLHttpRequest', 'User-Agent': 'Mozilla/5.0(WindowsNT10.0;Win64;x64)AppleWebKit/537.36(KHTML,likeGecko)Chrome/91.0.4472.77Safari/537.36', 'Content-Type': 'application/json', 'Origin': 'http://test.trace.diligrp.com:8393', 'Referer': 'http://test.trace.diligrp.com:8393/fieldConfig/bill.html', 'Accept-Encoding': 'gzip,deflate', 'Accept-Language': 'zh-CN,zh-TW;q=0.9,zh;q=0.8,en;q=0.7'}}
-[2021-07-21 10:40:57] [INFO] : ======================================================================================
-[2021-07-21 10:40:57] [INFO] : http://test.trace.diligrp.com:8393/newRegisterBill/doAdd.action
-{"registerHeadWeight": "0", "registerHeadRemainWeight": "0", "imageCertList": [], "measureType": 20, "registType": 10, "userId": 516, "arrivalTallynos": [], "arrivalDatetime": "", "truckType": 10, "weight": "111", "weightUnit": 1, "productName": "\u5927\u767d\u83dc", "productId": 2190, "originName": "", "originId": "", "unitPrice": "", "truckTareWeight": "", "remark": "", "specName": "", "brandName": "", "plate": "\u5dddA123456"}
-{}
-
-[2021-07-21 10:40:59] [INFO] : 发送邮件
-[2021-07-21 10:41:03] [INFO] : 邮件发送完毕