Merge remote-tracking branch 'origin/master'

wenleiming
2 parents 0a5e141a 3c0853f3
Showing 3 changed files with 22 additions and 36 deletions
commons/MySession.py
commons/api/duplicateToken.py
commons/api/weighingServiceSave.py
@@ -108,9 +108,9 @@ class mysession():
         self.re = self.se.post(url=self.url_client, headers=self.header_client, json=self.body_client, proxies=self.proxies, **kwargs)
         #组装请求的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"])
+        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.se.cookies.update(co)
         # 返回session对象，供其他接口使用
         return self.se
@@ -282,12 +282,10 @@ class mysession():
 my = mysession()
 my.set_mark()
 my.cliLogin()
-# s1 = my.get_session_client("sy_user01")
-s1 = my.get_session("sy_user01")
-s2 = my.get_session_client("sy_user01")
-# s3 = my.get_session_client("sy_user03")
-# 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")
+sy1 = my.get_session_client("sy_user01")
+sy2 = my.get_session_client("sy_user02")
+# heb1 = my.get_session_client("heb_user01")
+# gy1=my.get_session_client("gy_user01")
+# sg1=my.get_session_client("sg_user01")
+# hs1=my.get_session_client("hs_user01")
@@ -2,10 +2,7 @@
 # -*- coding: UTF-8 -*-
 import urllib3
 from commons import common as com
-from commons.MySession import my,s1,s2
-import requests
-from  requests.cookies import remove_cookie_by_name
-
+from commons.MySession import my,sy1,sy2
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
@@ -21,25 +18,16 @@ class duplicateToken():
     def __init__(self):
         self.url = duplicateToken.url.replace("http://test.", com.get_global_config("global_data", "environment", "en"))
         self.header = duplicateToken.header
-        self.header["UAP_accessToken"] = s2.cookies["UAP_accessToken"]
-        self.header["UAP_refreshToken"] = s2.cookies["UAP_refreshToken"]
-        self.header["UAP_firmId"] = s2.cookies["UAP_firmId"]
+        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["Host"] = com.get_global_config("global_data", "host", "gateway")
     def jmsf_duplicate_commit_token(self):
-        re = s2.get(url=self.url, headers=self.header)
-        print(s2.cookies)
-        print(s2.cookies.list_domains())
-        print(s2.cookies.list_paths())
-        # remove_cookie_by_name(s2.cookies,domain="",name="UAP_accessToken")
-        # remove_cookie_by_name(s2.cookies,domain="",name="UAP_refreshToken")
-        # print(s2.cookies)
+        re = sy1.get(url=self.url, headers=self.header,proxies=my.myproxies)
         return re.json()["data"]
-# print(s1.headers)
-du=duplicateToken()
-du.jmsf_duplicate_commit_token()
+# du=duplicateToken()
+# du.jmsf_duplicate_commit_token()
 # print(du.jmsf_duplicate_commit_token())
-# print(re.json())
-# print(re.headers)
 \ No newline at end of file
@@ -2,7 +2,7 @@
 # -*- coding: UTF-8 -*-
 import urllib3
 from commons import common as com
-from commons.MySession import my,s1
+from commons.MySession import my,sy1,sy2
 from commons.api.duplicateToken import duplicateToken
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 du=duplicateToken()
@@ -46,13 +46,13 @@ class weighingServiceSave():
         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"] = s1.cookies["UAP_accessToken"]
-        self.header["UAP_refreshToken"] = s1.cookies["UAP_refreshToken"]
-        self.header["UAP_firmId"] = s1.cookies["UAP_firmId"]
+        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["Host"] = com.get_global_config("global_data", "host", "gateway")
 # tt=weighingServiceSave()
-# re=s1.post(url=tt.url,headers=tt.header,json=tt.body,proxies=my.myproxies)
-# print(re.json())
 \ No newline at end of file
+# re=sy1.post(url=tt.url,headers=tt.header,json=tt.body,proxies=my.myproxies)
+# # print(re.json())
 \ No newline at end of file