更新文件

lixi
1 parent 4493a993
Showing 1 changed file with 19 additions and 7 deletions
commons/MySession.py
@@ -93,12 +93,14 @@ class mysession(requests.Session):
         # url = url.replace(" ", "")
         if host!=None:
             if "http:" in url:
-                d1 = re.match(r"http://(.+?)/", url).group(1).split(":")[0]
-                url = re.sub(r"http://(.+?)/", r"http://" + host[d1] + "/", url)
+                d1=re.match(r"http://(.+?)/", url).group(1)
+                d2 = d1.split(":")[0]
+                url = re.sub(r"http://(.+?)/", r"http://" + host[d2] + "/", url)
             elif "https:" in url:
-                d1 = re.match(r"https://(.+?)/", url).group(1).split(":")[0]
-                url = re.sub(r"https://(.+?)/", r"https://" + host[d1] + "/", url)
-        return url
+                d1=re.match(r"https://(.+?)/", url).group(1)
+                d2 = d1.split(":")[0]
+                url = re.sub(r"https://(.+?)/", r"https://" + host[d2] + "/", url)
+        return url,d1
     def get_session_client(self, account, **kwargs):
         "get_session和get_session_client的方法只能用一个"
@@ -166,7 +168,17 @@ class mysession(requests.Session):
         # 记录日志
         log.info("{0:=^86}".format(''))
         log.info(url)
-        url=self.url_pro(url,self.host)
+        #处理url
+        url,host=self.url_pro(url,self.host)
+        #处理header
+        if "UAP_accessToken" in kwargs["headers"].keys():
+            kwargs["headers"]["UAP_accessToken"] = self.re.json()["data"]["accessToken"]
+        elif "UAP_refreshToken" in kwargs["headers"].keys():
+            kwargs["headers"]["UAP_refreshToken"] = self.re.json()["data"]["refreshToken"]
+        elif "UAP_firmId" in kwargs["headers"].keys():
+            kwargs["headers"]["UAP_firmId"] = self.re.json()["data"]["user"]["firmId"]
+        elif "Host" in kwargs["headers"].keys():
+            kwargs["headers"]["Host"]=host
         log.info("{}\n{}\n".format(url, kwargs))
         # 进行请求
         re = super().request(method , url, **kwargs,timeout=self.timeout)
@@ -283,7 +295,7 @@ my.set_mark()
 # 哈尔滨客户端session
 # sessionHeb = mysession().cliLogin("hd_userName_01")
 #获取对应市场session
-# sy1=mysession("host1").get_session_client("sy_user01")
+sy1=mysession("host1").get_session_client("sy_user01")
 # heb=mysession("host1").get_session_client("heb_user01")
 hg=mysession("host2").get_session_client("hg_user01")
 # 检测登录接口