更新接口封装的方法

lixi
1 parent a82f9e0e
Showing 5 changed files with 29 additions and 24 deletions
commons/MySession.py
commons/api/weighingServiceSave.py
commons/basic/duplicateToken.py
commons/basic/listCarType.py
testcase/weightBizBill/test_weighingServiceSave.py
@@ -53,7 +53,7 @@ class mysession():
         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.user={}
     def cliLogin(self):
         self.webHeaders, self.clientHeaders, self.userInfo = cliSession().loginUser()
@@ -106,6 +106,8 @@ class mysession():
         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)
+        #获取user信息供其他接口使用
+        self.user[account]=self.re.json()["data"]["user"]
         #组装请求的cookie
         co = requests.cookies.RequestsCookieJar()
         co.set("UAP_firmId", str(self.re.json()["data"]["user"]["firmId"]),domain=".diligrp.com")
@@ -288,4 +290,3 @@ sy2 = my.get_session_client(&quot;sy_user02&quot;)
 # gy1=my.get_session_client("gy_user01")
 # sg1=my.get_session_client("sg_user01")
 # hs1=my.get_session_client("hs_user01")
-
@@ -2,10 +2,10 @@
 # -*- coding: UTF-8 -*-
 import urllib3
 from commons import common as com
-from commons.MySession import sy1
+from commons.MySession import my,sy1
 from commons.basic.duplicateToken import duplicateToken
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
-du=duplicateToken()
+
 class weighingServiceSave():
     url = "http://test.gateway.diligrp.com:8285/jmsf-web/api/entrace/weighingServiceSave"
@@ -42,18 +42,19 @@ class weighingServiceSave():
             "accountId": 0,
             "protocolId": None}
-    def __init__(self):
+    def __init__(self,market):
+        self.market=market
         self.url = weighingServiceSave.url.replace("http://test.", com.get_global_config("global_data", "environment", "en"))
         self.header = weighingServiceSave.header
-        self.header["jmsf_duplicate_commit_token"] = du.jmsf_duplicate_commit_token()
-        self.header["UAP_accessToken"] = sy1.cookies["UAP_accessToken"]
-        self.header["UAP_refreshToken"] = sy1.cookies["UAP_refreshToken"]
-        self.header["UAP_firmId"] = sy1.cookies["UAP_firmId"]
+        self.header["jmsf_duplicate_commit_token"] = duplicateToken(market).jmsf_duplicate_commit_token()
+        self.header["UAP_accessToken"] = self.market.cookies["UAP_accessToken"]
+        self.header["UAP_refreshToken"] = self.market.cookies["UAP_refreshToken"]
+        self.header["UAP_firmId"] = self.market.cookies["UAP_firmId"]
         self.header["Host"] = com.get_global_config("global_data", "host", "gateway")
-# tt=weighingServiceSave()
+# tt=weighingServiceSave(sy1)
 # re=sy1.post(url=tt.url,headers=tt.header,json=tt.body,proxies=my.myproxies)
 # print(re.json())
 \ No newline at end of file
@@ -16,18 +16,20 @@ class duplicateToken():
             "Host": "test.gateway.diligrp.com:8285",
             "Connection":"Keep-Alive"}
-    def __init__(self):
+    def __init__(self,market):
+        self.market=market
         self.url = duplicateToken.url.replace("http://test.", com.get_global_config("global_data", "environment", "en"))
         self.header = duplicateToken.header
-        self.header["UAP_accessToken"] = sy1.cookies["UAP_accessToken"]
-        self.header["UAP_refreshToken"] = sy1.cookies["UAP_refreshToken"]
-        self.header["UAP_firmId"] = sy1.cookies["UAP_firmId"]
+        self.header["UAP_accessToken"] = self.market.cookies["UAP_accessToken"]
+        self.header["UAP_refreshToken"] = self.market.cookies["UAP_refreshToken"]
+        self.header["UAP_firmId"] = self.market.cookies["UAP_firmId"]
         self.header["Host"] = com.get_global_config("global_data", "host", "gateway")
     def jmsf_duplicate_commit_token(self):
-        re = sy1.get(url=self.url, headers=self.header)
+        re = self.market.get(url=self.url, headers=self.header)
         return re.json()["data"]
-# du=duplicateToken()
+# print(duplicateToken(sy1).jmsf_duplicate_commit_token())
+# du=duplicateToken(sy1)
 # print(du.jmsf_duplicate_commit_token())
@@ -18,17 +18,18 @@ class listCarType():
             "Content-Length": "23"}
     body = {"businessCode":"jmsf"}
-    def __init__(self):
+    def __init__(self,market):
+        self.market=market
         self.url = listCarType.url.replace("http://test.", com.get_global_config("global_data", "environment", "en"))
         self.header = listCarType.header
-        self.header["UAP_accessToken"] = sy1.cookies["UAP_accessToken"]
-        self.header["UAP_refreshToken"] = sy1.cookies["UAP_refreshToken"]
-        self.header["UAP_firmId"] = sy1.cookies["UAP_firmId"]
+        self.header["UAP_accessToken"] = self.market .cookies["UAP_accessToken"]
+        self.header["UAP_refreshToken"] = self.market .cookies["UAP_refreshToken"]
+        self.header["UAP_firmId"] = self.market .cookies["UAP_firmId"]
         self.header["Host"] = com.get_global_config("global_data", "host", "gateway")
     def car_list(self):
-        re = sy1.post(url=self.url, headers=self.header,json=self.body)
+        re = self.market .post(url=self.url, headers=self.header,json=self.body)
         return re.json()
-# tt=listCarType()
+# tt=listCarType(sy1)
 # print(tt.car_list())
 \ No newline at end of file
@@ -6,8 +6,8 @@ from commons.MySession import my,sy1
 from commons.api.weighingServiceSave import weighingServiceSave
 from commons.basic.listCarType import listCarType
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
-we=weighingServiceSave()
-li=listCarType()
+we=weighingServiceSave(sy1)
+li=listCarType(sy1)