Merge remote-tracking branch 'origin/master'

# Conflicts: # report/test.log

Merge remote-tracking branch 'origin/master'
# Conflicts: # report/test.log
lixi
2 parents a6d68e45 24a11893
Showing 35 changed files with 605 additions and 563 deletions
commons/MySession.py
commons/api/entranceFeeBillList/apiDemo.py
commons/api/entranceFeeBillList/entranceFeeBillList.py
commons/api/entranceFeeBillList/operationDoAmend.py
commons/api/entranceFeeBillList/operationDoCorrect.py
commons/api/entranceFeeBillList/operationDoFreeze.py
commons/api/entranceFeeBillList/operationDoInvalid.py
commons/api/entranceFeeBillList/operationDoUndo.py
commons/api/entranceFeeBillList/operationDoUpdate.py
commons/api/entranceFeeBillList/operationUnfreeze.py
commons/api/hpApi.py
commons/api/sjApi.py
commons/api/zcApi.py
commons/basic/getLookupList.py
commons/clientSession.py
commons/scripts/readConf.py
config/marketConfig/conf_pre.conf
config/marketConfig/conf_test.conf
config/marketConfig/test_config_heb.conf
config/marketConfig/test_config_sy.conf
@@ -56,8 +56,9 @@ class mysession(requests.Session):
         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()
+    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"
@@ -260,7 +261,14 @@ class mysession(requests.Session):
 my = mysession()
 my.set_mark()
-my.cliLogin()
+
+# 沈阳客户端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")
@@ -11,24 +11,27 @@
 import json,time,random
 from commons.scripts import dealContentType as dct
-from commons.MySession import my
+from commons.MySession import my,sessionHeb
 from commons.basic import getLookupList as gLL
-def get_carType(session=None,host="",**kwargs):
+global mk_sign
+mk_sign = "haaab"
+
+def get_carType(host="",**kwargs):
     """车型获取"""
     url = host + "/jmsf-web/api/jmsf/query/listCarType"
     data = {"businessCode":"jmsf"}
     headers = dct.jsonCode()
     data = dict(data, **kwargs)
-    res = session.useHeadersRequests(method="POST", url=url, data=json.dumps(data), headers=headers)
+    res = my.useHeadersRequests(method="POST", url=url, data=json.dumps(data), headers=headers)
     return res
-def get_listCategoryByCondition(session=None,host="",**kwargs):
+def get_listCategoryByCondition(host="",**kwargs):
     """商品获取"""
     url = host + "/assets-service/api/cusCategory/getTree"
     # marketId = my.userInfo()[]
     data = {"marketId":9,"state":1,"keyword":"蔬菜"}
     headers = dct.jsonCode()
     data = dict(data, **kwargs)
-    res = session.useHeadersRequests(method="POST", url=url, data=json.dumps(data), headers=headers)
+    res = my.useHeadersRequests(method="POST", url=url, data=json.dumps(data), headers=headers)
     return res
 \ No newline at end of file
@@ -12,11 +12,11 @@
 import json,time,random,re
 from commons.scripts import dealContentType as dct
 from commons.scripts import jsonToUrlcode
-from commons.MySession import my
+# from commons.MySession import my
 from bs4 import BeautifulSoup
 import urllib.parse
-def listPage(host="",attrName="收费单号",attrValue=None,**kwargs):
+def listPage(session=None,host="",attrName="收费单号",attrValue=None,**kwargs):
     """
     进门单列表查询接口
     :param kwargs:
@@ -67,45 +67,45 @@ def listPage(host=&quot;&quot;,attrName=&quot;收费单号&quot;,attrValue=None,**kwargs):
     data["metadata[status]"] = json.dumps(data["metadata[status]"])
     # 请求接口
-    res = my.useHeadersRequests(method="POST", url=url, data=data, headers=headers)
+    res = session.useHeadersRequests(method="POST", url=url, data=data, headers=headers)
     return res
-def get_OrderDetails(host="",orderId=None):
+def get_OrderDetails(session=None,host="",orderId=None):
     """获取订单详情"""
     headers = dct.urlCode()
     url = host + f"/entranceFeeBill/pay/{orderId}.action"
-    res = my.useHeadersRequests("get", url=url, headers=headers)
+    res = session.useHeadersRequests("get", url=url, headers=headers)
     return res
-def get_orderUnfreeze(host="",orderId=None):
+def get_orderUnfreeze(session=None,host="",orderId=None):
     """获取订单详情"""
     headers = dct.urlCode()
     url = host + f"/entranceFeeBill/unfreeze/{orderId}.action"
-    res = my.useHeadersRequests("get", url=url, headers=headers)
+    res = session.useHeadersRequests("get", url=url, headers=headers)
     return res
-def get_orderView(host="",orderId=None):
+def get_orderView(session=None,host="",orderId=None):
     """获取订单详情"""
     headers = dct.urlCode()
     url = host + f"/entranceFeeBill/view/{orderId}.action"
-    res = my.useHeadersRequests("get", url=url, headers=headers)
+    res = session.useHeadersRequests("get", url=url, headers=headers)
     return res
-def get_icCheck(host="",ic=None):
+def get_icCheck(session=None,host="",ic=None):
     """进门缴费单详情页面刷卡刷卡"""
     headers = dct.urlCode()
     url = host + f"/api/jmsf/ajax/icCheck?ic={ic}"
-    res = my.useHeadersRequests("get", url=url,headers=headers)
+    res = session.useHeadersRequests("get", url=url,headers=headers)
     return res
-def get_city(host="",name=None):
+def get_city(session=None,host="",name=None):
     """进门缴费单缴费金额计算"""
     headers = dct.urlCode()
     url = host + f"/api/jmsf/ajax/city/?name={name}&query={name}"
-    res = my.useHeadersRequests("get", url=url,headers=headers)
+    res = session.useHeadersRequests("get", url=url,headers=headers)
     return res
-def get_calculateRes(host="",autocompletecartype=None,**kwargs):
+def get_calculateRes(session=None,host="",autocompletecartype=None,**kwargs):
     """缴费金额获取
     :params kwargs:
                 protocolId:
@@ -216,10 +216,10 @@ def get_calculateRes(host=&quot;&quot;,autocompletecartype=None,**kwargs):
     data["autocomplete-cartype"]=autocompletecartype
     data = dict(data,**kwargs)
     print("get_calculateRes",data)
-    res = my.useHeadersRequests("post", url=url,data=data,headers=headers)
+    res = session.useHeadersRequests("post", url=url,data=data,headers=headers)
     return res
-def do_doPay(host="",autocompletecartype=None,fee_str="",**kwargs):
+def do_doPay(session=None,host="",autocompletecartype=None,fee_str="",**kwargs):
     """进门单缴费"""
     url = host + "/entranceTrade/doPay.action"
     headers = dct.urlCode()
@@ -260,14 +260,14 @@ def do_doPay(host=&quot;&quot;,autocompletecartype=None,fee_str=&quot;&quot;,**kwargs):
     data_uc = jsonToUrlcode.jsonToUrlcode(data_json=data)+fee_str
     print("================开始请求================")
-    res = my.useHeadersRequests("post", url=url, data=data_uc, headers=headers)
+    res = session.useHeadersRequests("post", url=url, data=data_uc, headers=headers)
     return res
-def do_payOrder(host="http://test.jmsf.diligrp.com:8385",attrName="收费单号",attrValue="202108060900032",pwd="111111",
+def do_payOrder(session=None,host="http://test.jmsf.diligrp.com:8385",attrName="收费单号",attrValue="202108060900032",pwd="111111",
                 ic=888810032426):
-    a = listPage(host=host, attrName=attrName, attrValue=attrValue)
+    a = listPage(session=session,host=host, attrName=attrName, attrValue=attrValue)
     print("listPage", a.json())
     orderId = a.json()["rows"][0]["id"]
     number = a.json()["rows"][0]["number"]
@@ -275,7 +275,7 @@ def do_payOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;收费单号&quot;
     print(orderId)
     # # 订单详情获取
-    resOrderDetails = get_OrderDetails(host=host, orderId=orderId)
+    resOrderDetails = get_OrderDetails(session=session,host=host, orderId=orderId)
     # 正则取值
     regionId = re.findall('<option value="(.*?)" bind-name="', resOrderDetails.text)[0]
@@ -330,7 +330,7 @@ def do_payOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;收费单号&quot;
     # 用户信息获取
-    res = get_icCheck(host=host, ic=ic)
+    res = get_icCheck(session=session,host=host, ic=ic)
     print(res.text)
     customerId = res.json()["data"]["aInfo"]["customerId"]
     customerName = res.json()["data"]["aInfo"]["customerName"]
@@ -338,7 +338,7 @@ def do_payOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;收费单号&quot;
     mobile = res.json()["data"]["aInfo"]["mobile"]
     # 省市区获取
-    res = get_city(host=host, name="万州")
+    res = get_city(session=session,host=host, name="万州")
     print('res.json()["suggestions"]',res.json()["suggestions"])
     originId = res.json()["suggestions"][0]["id"]
     parentId = res.json()["suggestions"][0]["parentId"]
@@ -352,7 +352,7 @@ def do_payOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;收费单号&quot;
     print("categoryId",categoryId)
     # 获取缴费金额
-    res = get_calculateRes(host=host, autocompletecartype=autocompletecartype, optType=optType, correctInfo=correctInfo,
+    res = get_calculateRes(session=session,host=host, autocompletecartype=autocompletecartype, optType=optType, correctInfo=correctInfo,
                            weightType=weightType, id=orderId, goodsId=goodsId, number=number, modified=modified,
                            status=status,
                            source=source, correctDiscount=correctDiscount, plate=plate, carTypeName=carTypeName,
@@ -399,13 +399,13 @@ def do_payOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;收费单号&quot;
     freezeMoneySymbol = fee_int
     comparisonFreezeAmount = fee_int
     modified = created
-    firmCode = my.userInfo["data"]["user"]["firmCode"]
+    firmCode = session.userInfo["data"]["user"]["firmCode"]
     marketFlag = firmCode
     itemReceivableAmount = receivable
     receivableAmount = receivable
     tareWeightDate = tareWeightDate
-    aa = do_doPay(host=host, autocompletecartype=autocompletecartype, fee_str=fee_str, pwd=pwd, optType=optType,
+    aa = do_doPay(session=session,host=host, autocompletecartype=autocompletecartype, fee_str=fee_str, pwd=pwd, optType=optType,
                   weightType=weightType, id=id, goodsId=goodsId, number=number, created=created, status=status,
                   source=source,
                   correctDiscount=correctDiscount, totalAmount=totalAmount, customerId=customerId,
@@ -12,21 +12,20 @@
 import json,time,random,re
 from commons.scripts import dealContentType as dct
 from commons.scripts import jsonToUrlcode
-from commons.MySession import my
 from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL
 from bs4 import BeautifulSoup
 import urllib.parse
-def get_orderAmend(host="",orderId=None):
+def get_orderAmend(session=None,host="",orderId=None):
     """èŽ·å–è®¢å•è¯¦æƒ…"""
     headers = dct.urlCode()
     url = host + f"/entranceFeeBill/amend/{orderId}.action"
-    res = my.useHeadersRequests("get", url=url, headers=headers)
+    res = session.useHeadersRequests("get", url=url, headers=headers)
     return res
-def get_calculateRes(host="",autocompletecartype=None,**kwargs):
+def get_calculateRes(session=None,host="",autocompletecartype=None,**kwargs):
     """ç¼´è´¹é‡‘é¢èŽ·å–
     :params kwargs:
                 protocolId:
@@ -136,10 +135,10 @@ def get_calculateRes(host=&quot;&quot;,autocompletecartype=None,**kwargs):
     data["autocomplete-cartype"]=autocompletecartype
     data = dict(data,**kwargs)
     print("get_calculateRes",data)
-    res = my.useHeadersRequests("post", url=url,data=data,headers=headers)
+    res = session.useHeadersRequests("post", url=url,data=data,headers=headers)
     return res
-def do_doAmend(host="",autocompletecartype=None,fee_str="",**kwargs):
+def do_doAmend(session=None,host="",autocompletecartype=None,fee_str="",**kwargs):
     """è¿›é—¨å•ç¼´è´¹"""
     url = host + "/entranceFeeBill/doAmend.action"
     headers = dct.urlCode()
@@ -174,12 +173,12 @@ def do_doAmend(host=&quot;&quot;,autocompletecartype=None,fee_str=&quot;&quot;,**kwargs):
     data_uc = jsonToUrlcode.jsonToUrlcode(data_json=data)+fee_str
     print("================å¼€å§‹è¯·æ±‚================")
-    res = my.useHeadersRequests("post", url=url, data=data_uc, headers=headers)
+    res = session.useHeadersRequests("post", url=url, data=data_uc, headers=headers)
     return res
-def do_amendOrder(host="http://test.jmsf.diligrp.com:8385",attrName="æ”¶è´¹å•å·",attrValue="202108060900032",pwd="111111",
+def do_amendOrder(session=None,host="http://test.jmsf.diligrp.com:8385",attrName="æ”¶è´¹å•å·",attrValue="202108060900032",pwd="111111",
                 ic=888810032426):
-    a = eFBL.listPage(host=host, attrName=attrName, attrValue=attrValue)
+    a = eFBL.listPage(session=session,host=host, attrName=attrName, attrValue=attrValue)
     print("listPage", a.json())
     orderId = a.json()["rows"][0]["id"]
     number = a.json()["rows"][0]["number"]
@@ -187,7 +186,7 @@ def do_amendOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;æ”¶è´¹å•å
     print(orderId)
     # # è®¢å•è¯¦æƒ…èŽ·å–
-    resOrderDetails = get_orderAmend(host=host, orderId=orderId)
+    resOrderDetails = get_orderAmend(session=session,host=host, orderId=orderId)
     # print(resOrderDetails.text)
     # bså–å€¼
@@ -259,7 +258,7 @@ def do_amendOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;æ”¶è´¹å•å
     ic = orderDetailsDict["ic"]
     # çœå¸‚åŒºèŽ·å–
-    res = eFBL.get_city(host=host, name="ä¸‡å·ž")
+    res = eFBL.get_city(session=session,host=host, name="ä¸‡å·ž")
     # print(res.text)
     originId = res.json()["suggestions"][0]["id"]
@@ -269,7 +268,7 @@ def do_amendOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;æ”¶è´¹å•å
     modified = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
     # èŽ·å–ç¼´è´¹é‡‘é¢
-    res = get_calculateRes(host=host, autocompletecartype=autocompletecartype, optType=optType, correctInfo=correctInfo,
+    res = get_calculateRes(session=session,host=host, autocompletecartype=autocompletecartype, optType=optType, correctInfo=correctInfo,
                            weightType=weightType, id=orderId, goodsId=goodsId, number=number, modified=modified,
                            status=status,
                            source=source, correctDiscount=correctDiscount, plate=plate, carTypeName=carTypeName,
@@ -315,13 +314,13 @@ def do_amendOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;æ”¶è´¹å•å
     freezeMoneySymbol = fee_int
     comparisonFreezeAmount = fee_int
     modified = created
-    firmCode = my.userInfo["data"]["user"]["firmCode"]
+    firmCode = session.userInfo["data"]["user"]["firmCode"]
     marketFlag = firmCode
     itemReceivableAmount = receivable
     receivableAmount = receivable
     tareWeightDate = tareWeightDate
-    aa = do_doAmend(host=host, autocompletecartype=autocompletecartype, fee_str=fee_str, pwd=pwd, optType=optType,
+    aa = do_doAmend(session=session,host=host, autocompletecartype=autocompletecartype, fee_str=fee_str, pwd=pwd, optType=optType,
                   weightType=weightType, id=id, goodsId=goodsId, number=number, created=created, status=status,
                   source=source,
                   correctDiscount=correctDiscount, totalAmount=totalAmount, customerId=customerId,
@@ -12,21 +12,20 @@
 import json,time,random,re
 from commons.scripts import dealContentType as dct
 from commons.scripts import jsonToUrlcode
-from commons.MySession import my
 from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL
 from bs4 import BeautifulSoup
 import urllib.parse
-def get_orderCorrect(host="",orderId=None):
+def get_orderCorrect(session=None,host="",orderId=None):
     """获取订单详情"""
     headers = dct.urlCode()
     url = host + f"/entranceFeeBill/correct/{orderId}.action"
-    res = my.useHeadersRequests("get", url=url, headers=headers)
+    res = session.useHeadersRequests("get", url=url, headers=headers)
     return res
-def get_calculateRes(host="",autocompletecartype=None,**kwargs):
+def get_calculateRes(session=None,host="",autocompletecartype=None,**kwargs):
     """缴费金额获取
     :params kwargs:
                 protocolId:
@@ -136,10 +135,10 @@ def get_calculateRes(host=&quot;&quot;,autocompletecartype=None,**kwargs):
     data["autocomplete-cartype"]=autocompletecartype
     data = dict(data,**kwargs)
     print("get_calculateRes",data)
-    res = my.useHeadersRequests("post", url=url,data=data,headers=headers)
+    res = session.useHeadersRequests("post", url=url,data=data,headers=headers)
     return res
-def do_doCorrect(host="",autocompletecartype=None,fee_str="",**kwargs):
+def do_doCorrect(session=None,host="",autocompletecartype=None,fee_str="",**kwargs):
     """进门单缴费"""
     url = host + "/entranceFeeBill/doCorrect.action"
     headers = dct.urlCode()
@@ -176,11 +175,11 @@ def do_doCorrect(host=&quot;&quot;,autocompletecartype=None,fee_str=&quot;&quot;,**kwargs):
     data_uc = jsonToUrlcode.jsonToUrlcode(data_json=data)+fee_str
     print("================开始请求================")
-    res = my.useHeadersRequests("post", url=url, data=data_uc, headers=headers)
+    res = session.useHeadersRequests("post", url=url, data=data_uc, headers=headers)
     return res
-def do_correctOrder(host="http://test.jmsf.diligrp.com:8385",attrName="收费单号",attrValue="202108060900032",pwd="111111"):
-    a = eFBL.listPage(host=host, attrName=attrName, attrValue=attrValue)
+def do_correctOrder(session=None,host="http://test.jmsf.diligrp.com:8385",attrName="收费单号",attrValue="202108060900032",pwd="111111"):
+    a = eFBL.listPage(session=session,host=host, attrName=attrName, attrValue=attrValue)
     print("listPage", a.json())
     orderId = a.json()["rows"][0]["id"]
     number = a.json()["rows"][0]["number"]
@@ -188,7 +187,7 @@ def do_correctOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;收费单
     print(orderId)
     # # 订单详情获取
-    resOrderDetails = get_orderCorrect(host=host, orderId=orderId)
+    resOrderDetails = get_orderCorrect(session=session,host=host, orderId=orderId)
     # print(resOrderDetails.text)
     # bs取值
@@ -252,7 +251,7 @@ def do_correctOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;收费单
     # 用户信息获取
-    # res = eFBL.get_icCheck(host=host, ic=ic)
+    # res = eFBL.get_icCheck(session=session,host=host, ic=ic)
     # print(res.text)
     # customerId = res.json()["data"]["aInfo"]["customerId"]
     # customerName = res.json()["data"]["aInfo"]["customerName"]
@@ -265,7 +264,7 @@ def do_correctOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;收费单
     ic = orderDetailsDict["ic"]
     # 省市区获取
-    res = eFBL.get_city(host=host, name="万州")
+    res = eFBL.get_city(session=session,host=host, name="万州")
     print(res.text)
     originId = res.json()["suggestions"][0]["id"]
@@ -275,7 +274,7 @@ def do_correctOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;收费单
     modified = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
     # 获取缴费金额
-    res = get_calculateRes(host=host, autocompletecartype=autocompletecartype, optType=optType, correctInfo=correctInfo,
+    res = get_calculateRes(session=session,host=host, autocompletecartype=autocompletecartype, optType=optType, correctInfo=correctInfo,
                            weightType=weightType, id=orderId, goodsId=goodsId, number=number, modified=modified,
                            status=status,
                            source=source, correctDiscount=correctDiscount, plate=plate, carTypeName=carTypeName,
@@ -335,13 +334,13 @@ def do_correctOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;收费单
     freezeMoneySymbol = fee_int
     comparisonFreezeAmount = fee_int
     modified = created
-    firmCode = my.userInfo["data"]["user"]["firmCode"]
+    firmCode = session.userInfo["data"]["user"]["firmCode"]
     marketFlag = firmCode
     itemReceivableAmount = receivable
     receivableAmount = receivable
     tareWeightDate = tareWeightDate
-    res = do_doCorrect(host=host, autocompletecartype=autocompletecartype, fee_str=fee_str, pwd=pwd, optType=optType,
+    res = do_doCorrect(session=session,host=host, autocompletecartype=autocompletecartype, fee_str=fee_str, pwd=pwd, optType=optType,
                   weightType=weightType, id=id, goodsId=goodsId, number=number, created=created, status=status,
                   source=source,
                   correctDiscount=correctDiscount, totalAmount=totalAmount, customerId=customerId,
@@ -12,12 +12,11 @@
 import json,time,random,re
 from commons.scripts import dealContentType as dct
 from commons.scripts import jsonToUrlcode
-from commons.MySession import my
 from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL
 from bs4 import BeautifulSoup
 import urllib.parse
-def do_doFreeze(host="",autocompletecartype=None,fee_str="",**kwargs):
+def do_doFreeze(session=None,host="",autocompletecartype=None,fee_str="",**kwargs):
     """è¿›é—¨å•ç¼´è´¹"""
     url = host + "/entranceTrade/doFreeze.action"
     headers = dct.urlCode()
@@ -57,12 +56,12 @@ def do_doFreeze(host=&quot;&quot;,autocompletecartype=None,fee_str=&quot;&quot;,**kwargs):
     data_uc = jsonToUrlcode.jsonToUrlcode(data_json=data)+fee_str
     print("================å¼€å§‹è¯·æ±‚================")
-    res = my.useHeadersRequests("post", url=url, data=data_uc, headers=headers)
+    res = session.useHeadersRequests("post", url=url, data=data_uc, headers=headers)
     return res
-def do_freezeOrder(host="http://test.jmsf.diligrp.com:8385",attrName="æ”¶è´¹å•å·",attrValue="202108060900032",pwd="111111",
+def do_freezeOrder(session=None,host="http://test.jmsf.diligrp.com:8385",attrName="æ”¶è´¹å•å·",attrValue="202108060900032",pwd="111111",
                 ic=888810032426):
-    a = eFBL.listPage(host=host, attrName=attrName, attrValue=attrValue)
+    a = eFBL.listPage(session=session,host=host, attrName=attrName, attrValue=attrValue)
     print("listPage", a.json())
     orderId = a.json()["rows"][0]["id"]
     number = a.json()["rows"][0]["number"]
@@ -70,7 +69,7 @@ def do_freezeOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;æ”¶è´¹å•å
     print(orderId)
     # # è®¢å•è¯¦æƒ…èŽ·å–
-    resOrderDetails = eFBL.get_OrderDetails(host=host, orderId=orderId)
+    resOrderDetails = eFBL.get_OrderDetails(session=session,host=host, orderId=orderId)
     # æ£åˆ™å–å€¼
     regionId = re.findall('<option value="(.*?)" bind-name="', resOrderDetails.text)[0]
@@ -125,7 +124,7 @@ def do_freezeOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;æ”¶è´¹å•å
     # ç”¨æˆ·ä¿¡æ¯èŽ·å–
-    res = eFBL.get_icCheck(host=host, ic=ic)
+    res = eFBL.get_icCheck(session=session,host=host, ic=ic)
     print(res.text)
     customerId = res.json()["data"]["aInfo"]["customerId"]
     customerName = res.json()["data"]["aInfo"]["customerName"]
@@ -133,7 +132,7 @@ def do_freezeOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;æ”¶è´¹å•å
     mobile = res.json()["data"]["aInfo"]["mobile"]
     # çœå¸‚åŒºèŽ·å–
-    res = eFBL.get_city(host=host, name="ä¸‡å·ž")
+    res = eFBL.get_city(session=session,host=host, name="ä¸‡å·ž")
     print(res.text)
     originId = res.json()["suggestions"][0]["id"]
     parentId = res.json()["suggestions"][0]["parentId"]
@@ -145,7 +144,7 @@ def do_freezeOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;æ”¶è´¹å•å
     modified = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
     # èŽ·å–ç¼´è´¹é‡‘é¢
-    res = eFBL.get_calculateRes(host=host, autocompletecartype=autocompletecartype, optType=optType, correctInfo=correctInfo,
+    res = eFBL.get_calculateRes(session=session,host=host, autocompletecartype=autocompletecartype, optType=optType, correctInfo=correctInfo,
                            weightType=weightType, id=orderId, goodsId=goodsId, number=number, modified=modified,
                            status=status,
                            source=source, correctDiscount=correctDiscount, plate=plate, carTypeName=carTypeName,
@@ -192,13 +191,13 @@ def do_freezeOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;æ”¶è´¹å•å
     freezeMoneySymbol = fee_int
     comparisonFreezeAmount = fee_int
     modified = created
-    firmCode = my.userInfo["data"]["user"]["firmCode"]
+    firmCode = session.userInfo["data"]["user"]["firmCode"]
     marketFlag = firmCode
     itemReceivableAmount = receivable
     receivableAmount = receivable
     tareWeightDate = tareWeightDate
-    aa = do_doFreeze(host=host, autocompletecartype=autocompletecartype, fee_str=fee_str, pwd=pwd, optType=optType,
+    aa = do_doFreeze(session=session,host=host, autocompletecartype=autocompletecartype, fee_str=fee_str, pwd=pwd, optType=optType,
                   weightType=weightType, id=id, goodsId=goodsId, number=number, created=created, status=status,
                   source=source,
                   correctDiscount=correctDiscount, totalAmount=totalAmount, customerId=customerId,
@@ -18,15 +18,15 @@ from bs4 import BeautifulSoup
 import urllib.parse
-def get_orderInvalid(host="",orderId=None):
+def get_orderInvalid(session=None,host="",orderId=None):
     """获取订单详情"""
     headers = dct.urlCode()
     url = host + f"/entranceFeeBill/invalid/{orderId}.action"
-    res = my.useHeadersRequests("get", url=url, headers=headers)
+    res = session.useHeadersRequests("get", url=url, headers=headers)
     return res
-def get_calculateRes(host="",autocompletecartype=None,**kwargs):
+def get_calculateRes(session=None,host="",autocompletecartype=None,**kwargs):
     """缴费金额获取
     :params kwargs:
                 protocolId:
@@ -136,10 +136,10 @@ def get_calculateRes(host=&quot;&quot;,autocompletecartype=None,**kwargs):
     data["autocomplete-cartype"]=autocompletecartype
     data = dict(data,**kwargs)
     print("get_calculateRes",data)
-    res = my.useHeadersRequests("post", url=url,data=data,headers=headers)
+    res = session.useHeadersRequests("post", url=url,data=data,headers=headers)
     return res
-def do_doInvalid(host="",autocompletecartype=None,fee_str="",**kwargs):
+def do_doInvalid(session=None,host="",autocompletecartype=None,fee_str="",**kwargs):
     """进门单缴费"""
     url = host + "/entranceFeeBill/doInvalid.action"
     headers = dct.urlCode()
@@ -169,12 +169,12 @@ def do_doInvalid(host=&quot;&quot;,autocompletecartype=None,fee_str=&quot;&quot;,**kwargs):
     data = dict(data, **kwargs)
     data_uc = jsonToUrlcode.jsonToUrlcode(data_json=data)+fee_str
     print("================开始请求================")
-    res = my.useHeadersRequests("post", url=url, data=data_uc, headers=headers)
+    res = session.useHeadersRequests("post", url=url, data=data_uc, headers=headers)
     return res
-def do_invalidOrder(host="http://test.jmsf.diligrp.com:8385",attrName="收费单号",attrValue="202108060900032",pwd="111111",
+def do_invalidOrder(session=None,host="http://test.jmsf.diligrp.com:8385",attrName="收费单号",attrValue="202108060900032",pwd="111111",
                 ic=888810032426):
-    a = eFBL.listPage(host=host, attrName=attrName, attrValue=attrValue)
+    a = eFBL.listPage(session=session,host=host, attrName=attrName, attrValue=attrValue)
     print("listPage", a.json())
     orderId = a.json()["rows"][0]["id"]
     number = a.json()["rows"][0]["number"]
@@ -182,7 +182,7 @@ def do_invalidOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;收费单
     print(orderId)
     # # 订单详情获取
-    resOrderDetails = get_orderInvalid(host=host, orderId=orderId)
+    resOrderDetails = get_orderInvalid(session=session,host=host, orderId=orderId)
     # bs取值
     orderDetailsList = BeautifulSoup(resOrderDetails.text, "html.parser").findAll("input")
@@ -232,7 +232,7 @@ def do_invalidOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;收费单
     # # 用户信息获取
-    # res = eFBL.get_icCheck(host=host, ic=ic)
+    # res = eFBL.get_icCheck(session=session,host=host, ic=ic)
     # print(res.text)
     # customerId = res.json()["data"]["aInfo"]["customerId"]
     # customerName = res.json()["data"]["aInfo"]["customerName"]
@@ -245,7 +245,7 @@ def do_invalidOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;收费单
     ic = orderDetailsDict["ic"]
     # 省市区获取
-    res = eFBL.get_city(host=host, name="万州")
+    res = eFBL.get_city(session=session,host=host, name="万州")
     print(res.text)
     originId = res.json()["suggestions"][0]["id"]
@@ -255,7 +255,7 @@ def do_invalidOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;收费单
     modified = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
     # 获取缴费金额
-    res = get_calculateRes(host=host, autocompletecartype=autocompletecartype, optType=optType, correctInfo=correctInfo,
+    res = get_calculateRes(session=session,host=host, autocompletecartype=autocompletecartype, optType=optType, correctInfo=correctInfo,
                            weightType=weightType, id=orderId, goodsId=goodsId, number=number, modified=modified,
                            status=status,
                            source=source, correctDiscount=correctDiscount, plate=plate, carTypeName=carTypeName,
@@ -301,13 +301,13 @@ def do_invalidOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;收费单
     freezeMoneySymbol = fee_int
     comparisonFreezeAmount = fee_int
     modified = created
-    firmCode = my.userInfo["data"]["user"]["firmCode"]
+    firmCode = session.userInfo["data"]["user"]["firmCode"]
     marketFlag = firmCode
     itemReceivableAmount = receivable
     receivableAmount = receivable
     tareWeightDate = tareWeightDate
-    aa = do_doInvalid(host=host, autocompletecartype=autocompletecartype, fee_str=fee_str, pwd=pwd, optType=optType,
+    aa = do_doInvalid(session=session,host=host, autocompletecartype=autocompletecartype, fee_str=fee_str, pwd=pwd, optType=optType,
                   weightType=weightType, id=id, goodsId=goodsId, number=number, created=created, status=status,
                   source=source,
                   correctDiscount=correctDiscount, totalAmount=totalAmount, customerId=customerId,
@@ -17,14 +17,14 @@ from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL
 from bs4 import BeautifulSoup
 import urllib.parse
-def get_orderRefund(host="",orderId=None):
+def get_orderRefund(session=None,host="",orderId=None):
     """获取订单详情"""
     headers = dct.urlCode()
     url = host + f"/entranceFeeBill/refund/{orderId}.action"
-    res = my.useHeadersRequests("get", url=url, headers=headers)
+    res = session.useHeadersRequests("get", url=url, headers=headers)
     return res
-def get_calculateRes(host="",autocompletecartype=None,**kwargs):
+def get_calculateRes(session=None,host="",autocompletecartype=None,**kwargs):
     """缴费金额获取"""
     url = host + "/calculate/index.action"
     headers = dct.urlCode()
@@ -52,11 +52,11 @@ def get_calculateRes(host=&quot;&quot;,autocompletecartype=None,**kwargs):
     data["autocomplete-cartype"]=autocompletecartype
     data = dict(data,**kwargs)
     print("get_calculateRes",data)
-    res = my.useHeadersRequests("post", url=url,data=data,headers=headers)
+    res = session.useHeadersRequests("post", url=url,data=data,headers=headers)
     return res
-def do_doUndo(host="",autocompletecartype=None,fee_str="",**kwargs):
+def do_doUndo(session=None,host="",autocompletecartype=None,fee_str="",**kwargs):
     """进门单缴费"""
     url = host + "/entranceTrade/doUndo.action"
     headers = dct.urlCode()
@@ -85,14 +85,14 @@ def do_doUndo(host=&quot;&quot;,autocompletecartype=None,fee_str=&quot;&quot;,**kwargs):
     data = dict(data, **kwargs)
     data_uc = jsonToUrlcode.jsonToUrlcode(data_json=data)+fee_str
     print("================开始请求================")
-    res = my.useHeadersRequests("post", url=url, data=data_uc, headers=headers)
+    res = session.useHeadersRequests("post", url=url, data=data_uc, headers=headers)
     return res
-def do_undoOrder(host="http://test.jmsf.diligrp.com:8385",attrName="收费单号",attrValue="202108060900032",pwd="",
+def do_undoOrder(session=None,host="http://test.jmsf.diligrp.com:8385",attrName="收费单号",attrValue="202108060900032",pwd="",
                 ic=888810032426):
-    a = eFBL.listPage(host=host, attrName=attrName, attrValue=attrValue)
+    a = eFBL.listPage(session=session,host=host, attrName=attrName, attrValue=attrValue)
     print("listPage", a.json())
     orderId = a.json()["rows"][0]["id"]
     number = a.json()["rows"][0]["number"]
@@ -100,7 +100,7 @@ def do_undoOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;收费单号
     print(orderId)
     # # 订单详情获取
-    resOrderDetails = get_orderRefund(host=host, orderId=orderId)
+    resOrderDetails = get_orderRefund(session=session,host=host, orderId=orderId)
     # 正则取值
     # regionId = re.findall('<option value="(.*?)" bind-name="', resOrderDetails.text)[0]
@@ -170,7 +170,7 @@ def do_undoOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;收费单号
     ic = orderDetailsDict["ic"]
     # 省市区获取
-    res = eFBL.get_city(host=host, name="万州")
+    res = eFBL.get_city(session=session,host=host, name="万州")
     print(res.text)
     originId = res.json()["suggestions"][0]["id"]
     # parentId = res.json()["suggestions"][0]["parentId"]
@@ -182,7 +182,7 @@ def do_undoOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;收费单号
     # modified = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
     # 获取缴费金额
-    res = get_calculateRes(host=host, autocompletecartype=autocompletecartype, optType=optType, correctInfo=correctInfo,
+    res = get_calculateRes(session=session,host=host, autocompletecartype=autocompletecartype, optType=optType, correctInfo=correctInfo,
                            weightType=weightType, id=orderId, goodsId=goodsId, number=number, modified=modified,
                            status=status,
                            source=source, correctDiscount=correctDiscount, plate=plate, carTypeName=carTypeName,
@@ -229,14 +229,14 @@ def do_undoOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;收费单号
     chargeTotalAmountYuan = fee_int - int(discount_amount)
     freezeMoneySymbol = fee_int
     comparisonFreezeAmount = fee_int
-    firmCode = my.userInfo["data"]["user"]["firmCode"]
+    firmCode = session.userInfo["data"]["user"]["firmCode"]
     marketFlag = firmCode
     itemReceivableAmount = receivable
     receivableAmount = receivable
     tareWeightDate = tareWeightDate
     print("categoryId2",categoryId)
-    aa = do_doUndo(host=host, autocompletecartype=autocompletecartype, fee_str=fee_str, pwd=pwd, optType=optType,
+    aa = do_doUndo(session=session,host=host, autocompletecartype=autocompletecartype, fee_str=fee_str, pwd=pwd, optType=optType,
                   weightType=weightType, id=id, goodsId=goodsId, number=number, created=created, status=status,
                   source=source,
                   correctDiscount=correctDiscount, totalAmount=totalAmount, customerId=customerId,
@@ -12,21 +12,21 @@
 import json,time,random,re
 from commons.scripts import dealContentType as dct
 from commons.scripts import jsonToUrlcode
-from commons.MySession import my
+# from commons.MySession import my
 from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL
 from bs4 import BeautifulSoup
 import urllib.parse
-def get_orderUpdate(host="",orderId=None):
+def get_orderUpdate(session=None,host="",orderId=None):
     """恥祕"""
     headers = dct.urlCode()
     url = host + f"/entranceFeeBill/update/{orderId}.action"
-    res = my.useHeadersRequests("get", url=url, headers=headers)
+    res = session.useHeadersRequests("get", url=url, headers=headers)
     return res
-def get_calculateRes(host="",autocompletecartype=None,**kwargs):
+def get_calculateRes(session=None,host="",autocompletecartype=None,**kwargs):
     """蝻渲晶
     :params kwargs:
                 protocolId:
@@ -136,10 +136,10 @@ def get_calculateRes(host=&quot;&quot;,autocompletecartype=None,**kwargs):
     data["autocomplete-cartype"]=autocompletecartype
     data = dict(data,**kwargs)
     print("get_calculateRes",data)
-    res = my.useHeadersRequests("post", url=url,data=data,headers=headers)
+    res = session.useHeadersRequests("post", url=url,data=data,headers=headers)
     return res
-def do_doUpdate(host="",autocompletecartype=None,fee_str="",**kwargs):
+def do_doUpdate(session=None,host="",autocompletecartype=None,fee_str="",**kwargs):
     """餈撈韐"""
     url = host + "/entranceFeeBill/doUpdate.action"
     headers = dct.urlCode()
@@ -195,12 +195,12 @@ def do_doUpdate(host=&quot;&quot;,autocompletecartype=None,fee_str=&quot;&quot;,**kwargs):
     data_uc = jsonToUrlcode.jsonToUrlcode(data_json=data)+fee_str
     print("================撘憪窈瘙================")
-    res = my.useHeadersRequests("post", url=url, data=data_uc, headers=headers)
+    res = session.useHeadersRequests("post", url=url, data=data_uc, headers=headers)
     return res
-def do_updateOrder(host="http://test.jmsf.diligrp.com:8385",attrName="韐孵",attrValue="202108060900032",pwd="111111",
+def do_updateOrder(session=None,host="http://test.jmsf.diligrp.com:8385",attrName="韐孵",attrValue="202108060900032",pwd="111111",
                 ic=888810032426):
-    a = eFBL.listPage(host=host, attrName=attrName, attrValue=attrValue)
+    a = eFBL.listPage(session=session,host=host, attrName=attrName, attrValue=attrValue)
     print("listPage", a.json())
     orderId = a.json()["rows"][0]["id"]
     number = a.json()["rows"][0]["number"]
@@ -208,7 +208,7 @@ def do_updateOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;韐孵
     print(orderId)
     # # 霈Ｗ祕
-    resOrderDetails = get_orderUpdate(host=host, orderId=orderId)
+    resOrderDetails = get_orderUpdate(session=session,host=host, orderId=orderId)
     # 甇
     regionId = re.findall('<option value="(.*?)" bind-name="', resOrderDetails.text)[0]
@@ -269,7 +269,7 @@ def do_updateOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;韐孵
     # # 靽⊥
-    # res = eFBL.get_icCheck(host=host, ic=ic)
+    # res = eFBL.get_icCheck(session=session,host=host, ic=ic)
     # print(res.text)
     # customerId = res.json()["data"]["aInfo"]["customerId"]
     # customerName = res.json()["data"]["aInfo"]["customerName"]
@@ -282,7 +282,7 @@ def do_updateOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;韐孵
     ic = orderDetailsDict["ic"]
     # 
-    res = eFBL.get_city(host=host, name="銝")
+    res = eFBL.get_city(session=session,host=host, name="銝")
     print('res.json()["suggestions"]',res.json()["suggestions"])
     originId = res.json()["suggestions"][0]["id"]
     parentId = res.json()["suggestions"][0]["parentId"]
@@ -294,7 +294,7 @@ def do_updateOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;韐孵
     modified = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
     # 撈韐寥
-    res = get_calculateRes(host=host, autocompletecartype=autocompletecartype, optType=optType, correctInfo=correctInfo,
+    res = get_calculateRes(session=session,host=host, autocompletecartype=autocompletecartype, optType=optType, correctInfo=correctInfo,
                            weightType=weightType, id=orderId, goodsId=goodsId, number=number, modified=modified,
                            status=status,
                            source=source, correctDiscount=correctDiscount, plate=plate, carTypeName=carTypeName,
@@ -340,13 +340,13 @@ def do_updateOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;韐孵
     freezeMoneySymbol = fee_int
     comparisonFreezeAmount = fee_int
     modified = created
-    firmCode = my.userInfo["data"]["user"]["firmCode"]
+    firmCode = session.userInfo["data"]["user"]["firmCode"]
     marketFlag = firmCode
     itemReceivableAmount = receivable
     receivableAmount = receivable
     tareWeightDate = tareWeightDate
-    aa = do_doUpdate(host=host, autocompletecartype=autocompletecartype, fee_str=fee_str, pwd=pwd, optType=optType,
+    aa = do_doUpdate(session=session,host=host, autocompletecartype=autocompletecartype, fee_str=fee_str, pwd=pwd, optType=optType,
                   weightType=weightType, id=id, goodsId=goodsId, number=number, created=created, status=status,
                   source=source,
                   correctDiscount=correctDiscount, totalAmount=totalAmount, customerId=customerId,
@@ -18,7 +18,7 @@ from bs4 import BeautifulSoup
 import urllib.parse
-def get_calculateRes(host="",autocompletecartype=None,**kwargs):
+def get_calculateRes(session=None,host="",autocompletecartype=None,**kwargs):
     """ç¼´è´¹é‡‘é¢èŽ·å–
     :params kwargs:
                 protocolId:
@@ -128,10 +128,10 @@ def get_calculateRes(host=&quot;&quot;,autocompletecartype=None,**kwargs):
     data["autocomplete-cartype"]=autocompletecartype
     data = dict(data,**kwargs)
     print("get_calculateRes",data)
-    res = my.useHeadersRequests("post", url=url,data=data,headers=headers)
+    res = session.useHeadersRequests("post", url=url,data=data,headers=headers)
     return res
-def do_doUnfreeze(host="",autocompletecartype=None,fee_str="",**kwargs):
+def do_doUnfreeze(session=None,host="",autocompletecartype=None,fee_str="",**kwargs):
     """è¿›é—¨å•ç¼´è´¹"""
     url = host + "/entranceTrade/doUnfreeze.action"
     headers = dct.urlCode()
@@ -160,12 +160,12 @@ def do_doUnfreeze(host=&quot;&quot;,autocompletecartype=None,fee_str=&quot;&quot;,**kwargs):
     data = dict(data, **kwargs)
     data_uc = jsonToUrlcode.jsonToUrlcode(data_json=data)+fee_str
     print("================å¼€å§‹è¯·æ±‚================")
-    res = my.useHeadersRequests("post", url=url, data=data_uc, headers=headers)
+    res = session.useHeadersRequests("post", url=url, data=data_uc, headers=headers)
     return res
-def do_unfreezeOrder(host="http://test.jmsf.diligrp.com:8385",attrName="æ”¶è´¹å•å·",attrValue="202108060900032",pwd="111111",
+def do_unfreezeOrder(session=None,host="http://test.jmsf.diligrp.com:8385",attrName="æ”¶è´¹å•å·",attrValue="202108060900032",pwd="111111",
                 ic=888810032426):
-    a = eFBL.listPage(host=host, attrName=attrName, attrValue=attrValue)
+    a = eFBL.listPage(session=session,host=host, attrName=attrName, attrValue=attrValue)
     print("listPage", a.json())
     orderId = a.json()["rows"][0]["id"]
     number = a.json()["rows"][0]["number"]
@@ -173,7 +173,7 @@ def do_unfreezeOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;æ”¶è´¹å
     print(orderId)
     # # è®¢å•è¯¦æƒ…èŽ·å–
-    resOrderDetails = eFBL.get_orderUnfreeze(host=host, orderId=orderId)
+    resOrderDetails = eFBL.get_orderUnfreeze(session=session,host=host, orderId=orderId)
     # bså–å€¼
     orderDetailsList = BeautifulSoup(resOrderDetails.text, "html.parser").findAll("input")
@@ -236,7 +236,7 @@ def do_unfreezeOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;æ”¶è´¹å
     ic = orderDetailsDict["ic"]
     # çœå¸‚åŒºèŽ·å–
-    res = eFBL.get_city(host=host, name="ä¸‡å·ž")
+    res = eFBL.get_city(session=session,host=host, name="ä¸‡å·ž")
     print(res.text)
     originId = res.json()["suggestions"][0]["id"]
@@ -246,7 +246,7 @@ def do_unfreezeOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;æ”¶è´¹å
     modified = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
     # èŽ·å–ç¼´è´¹é‡‘é¢
-    res = get_calculateRes(host=host, autocompletecartype=autocompletecartype, optType=optType, correctInfo=correctInfo,
+    res = get_calculateRes(session=session,host=host, autocompletecartype=autocompletecartype, optType=optType, correctInfo=correctInfo,
                            weightType=weightType, id=orderId, goodsId=goodsId, number=number, modified=modified,
                            status=status,
                            source=source, correctDiscount=correctDiscount, plate=plate, carTypeName=carTypeName,
@@ -292,13 +292,13 @@ def do_unfreezeOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;æ”¶è´¹å
     freezeMoneySymbol = fee_int
     comparisonFreezeAmount = fee_int
     modified = created
-    firmCode = my.userInfo["data"]["user"]["firmCode"]
+    firmCode = session.userInfo["data"]["user"]["firmCode"]
     marketFlag = firmCode
     itemReceivableAmount = receivable
     receivableAmount = receivable
     tareWeightDate = tareWeightDate
-    aa = do_doUnfreeze(host=host, autocompletecartype=autocompletecartype, fee_str=fee_str, pwd=pwd, optType=optType,
+    aa = do_doUnfreeze(session=session,host=host, autocompletecartype=autocompletecartype, fee_str=fee_str, pwd=pwd, optType=optType,
                   weightType=weightType, id=id, goodsId=goodsId, number=number, created=created, status=status,
                   source=source,
                   correctDiscount=correctDiscount, totalAmount=totalAmount, customerId=customerId,
@@ -17,16 +17,16 @@ from commons.api import entranceFeeBillList as eFBL
 host = "http://test.gateway.diligrp.com:8285"
-def get_listBackSkinTrucks(host="",**kwargs):
+def get_listBackSkinTrucks(session=None,host="",**kwargs):
     """获取接车员信息"""
     url = host + "/jmsf-web/api/jmsf/query/listBackSkinTrucks"
     data = {"plate":"","number":"","customerName":""}
     headers = dct.jsonCode()
     data = dict(data, **kwargs)
-    res = my.useHeadersRequests(method="POST", url=url, data=json.dumps(data), headers=headers)
+    res = session.useHeadersRequests(method="POST", url=url, data=json.dumps(data), headers=headers)
     return res
-def backSkinWeighSave(host="",**kwargs):
+def backSkinWeighSave(session=None,host="",**kwargs):
     """获取接车员信息"""
     url = host + "/jmsf-web/api/entrace/backSkinWeighSave"
     data = {"hasStoreTruck": 1, "number": "202108120900052", "outGreeterId": 223, "outGreeterName": "测试沈阳",
@@ -36,11 +36,11 @@ def backSkinWeighSave(host=&quot;&quot;,**kwargs):
             "carTypeCode": "003", "carTypeId": 53, "carTypeName": "板车"}
     headers = dct.jsonCode()
     data = dict(data, **kwargs)
-    res = my.useHeadersRequests(method="POST", url=url, data=json.dumps(data), headers=headers)
+    res = session.useHeadersRequests(method="POST", url=url, data=json.dumps(data), headers=headers)
     return res
-def do_backSkinWeighSave(host="",number=None,userName=None):
-    orderInfo = get_listBackSkinTrucks(host=host,number=number).json()["data"][0]
+def do_backSkinWeighSave(session=None,host="",number=None,userName=None):
+    orderInfo = get_listBackSkinTrucks(session=session,host=host,number=number).json()["data"][0]
     print(orderInfo)
     # 参数
     number=number
@@ -55,7 +55,7 @@ def do_backSkinWeighSave(host=&quot;&quot;,number=None,userName=None):
     tareWeightDate=time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
     # 获取接车员信息
-    listByExample = zcApi.get_listByExample(host=host)
+    listByExample = zcApi.get_listByExample(session=session,host=host)
     print(listByExample.json())
     if userName == None:
         listByExampleIndex = 0
@@ -65,7 +65,7 @@ def do_backSkinWeighSave(host=&quot;&quot;,number=None,userName=None):
     outGreeterId = listByExample.json()["data"][listByExampleIndex]["id"]
     outGreeterName = listByExample.json()["data"][listByExampleIndex]["realName"]
-    res_HP = backSkinWeighSave(host=host,number=number,tareWeight=tareWeight,carTypeWeight=carTypeWeight,
+    res_HP = backSkinWeighSave(session=session,host=host,number=number,tareWeight=tareWeight,carTypeWeight=carTypeWeight,
                               plate=plate,trailerNumber=trailerNumber,carTypeCode=carTypeCode,
                               carTypeId=carTypeId,carTypeName=carTypeName,tareWeightDate=tareWeightDate,
                               outGreeterId=outGreeterId,outGreeterName=outGreeterName)
@@ -17,7 +17,7 @@ from commons.api import entranceFeeBillList as eFBL
 from commons.basic import getLookupList as gLL
-def create_sparePartsWeighSave(host="",duplicateToken=None,**kwargs):
+def create_sparePartsWeighSave(session=None,host="",duplicateToken=None,**kwargs):
     """查询证明类型
     :param host:
     :param **kwargs:
@@ -92,21 +92,21 @@ def create_sparePartsWeighSave(host=&quot;&quot;,duplicateToken=None,**kwargs):
     headers = dct.jsonCode()
     headers["jmsf_duplicate_commit_token"] = duplicateToken
     data = dict(data, **kwargs)
-    res = my.useHeadersRequests(method="POST", url=url, data=json.dumps(data), headers=headers)
+    res = session.useHeadersRequests(method="POST", url=url, data=json.dumps(data), headers=headers)
     return res
-def create_sj(host=None,carTypeName=None,keyword="蔬菜",userName=None,transactionName=None,
+def create_sj(session=None,host=None,carTypeName=None,keyword="蔬菜",userName=None,transactionName=None,
                 plate="川A12345",goodsTagName=None,depName=None,proveName=None,itemWeight="10",qty="22"):
     """
     """
     # 模板获取
-    templateAttr_list = gLL.get_templateAttr(host=host,moduleCode="SJ")
+    templateAttr_list = gLL.get_templateAttr(session=session,host=host,moduleCode="SJ")
     print(templateAttr_list)
     # 获取车型
     if "车型" in templateAttr_list:
-        carType = zcApi.get_carType(host=host)
+        carType = zcApi.get_carType(session=session,host=host)
         print(carType.text)
         if carTypeName == None:
             carTypeIndex = 0
@@ -126,7 +126,7 @@ def create_sj(host=None,carTypeName=None,keyword=&quot;蔬菜&quot;,userName=None,transact
     # 获取商品
     if "商品" in templateAttr_list or "商品(末级)" in templateAttr_list:
-        categoryByCondition = zcApi.get_listCategoryByCondition(host=host, keyword=keyword)
+        categoryByCondition = zcApi.get_listCategoryByCondition(session=session,host=host, keyword=keyword)
         cateId = categoryByCondition.json()["data"][0]["id"]
         productId = categoryByCondition.json()["data"][0]["id"]
         productName = categoryByCondition.json()["data"][0]["name"]
@@ -139,20 +139,20 @@ def create_sj(host=None,carTypeName=None,keyword=&quot;蔬菜&quot;,userName=None,transact
     # 获取接车员信息
     if "进门接车员" in templateAttr_list:
-        firmCode = my.userInfo["data"]["user"]["firmCode"]
-        firmId = my.userInfo["data"]["user"]["firmId"]
+        firmCode = session.userInfo["data"]["user"]["firmCode"]
+        firmId = session.userInfo["data"]["user"]["firmId"]
         try:
-            res_config = gLL.get_config(host=host, marketId=firmId)
+            res_config = gLL.get_config(session=session,host=host, marketId=firmId)
             departmentId = [i["value"] for i in res_config.json()["rows"] if i["name"] == "DepartmentId"][0]
         except:
             departmentId = None
         # print("==========1============")
-        # print(my.userInfo["data"]["user"])
+        # print(session.userInfo["data"]["user"])
         # print(firmCode)
         # print(departmentId)
         # print("==========1============")
-        listByExample =  zcApi.get_listByExample(host=host,firmCode=firmCode,departmentId=departmentId)
+        listByExample =  zcApi.get_listByExample(session=session,host=host,firmCode=firmCode,departmentId=departmentId)
         print("listByExample",listByExample.json())
         if userName == None:
             listByExampleIndex = 0
@@ -181,7 +181,7 @@ def create_sj(host=None,carTypeName=None,keyword=&quot;蔬菜&quot;,userName=None,transact
     # 获取交易类型
     if "交易类型" in templateAttr_list:
-        transactionType = zcApi.query_transactionType(host=host)
+        transactionType = zcApi.query_transactionType(session=session,host=host)
         print(transactionType.json())
         print("交易类型")
         if transactionName == None:
@@ -199,7 +199,7 @@ def create_sj(host=None,carTypeName=None,keyword=&quot;蔬菜&quot;,userName=None,transact
     # 获取货物标签
     if "货物标签" in templateAttr_list:
-        goodsTag = zcApi.get_goodsTag(host=host)
+        goodsTag = zcApi.get_goodsTag(session=session,host=host)
         print(goodsTag.json())
         if goodsTagName == None:
             transactionTypeIndex = 0
@@ -212,7 +212,7 @@ def create_sj(host=None,carTypeName=None,keyword=&quot;蔬菜&quot;,userName=None,transact
     # 产地信息获取
     if "产地" in templateAttr_list:
-        address = zcApi.get_address(host=host)
+        address = zcApi.get_address(session=session,host=host)
         print(address.json())
         originId = address.json()["data"][0]["id"]
         origin = address.json()["data"][0]["name"]
@@ -225,7 +225,7 @@ def create_sj(host=None,carTypeName=None,keyword=&quot;蔬菜&quot;,userName=None,transact
     # 查询部门信息
     # 查询部门信息
     if "接车部门" in templateAttr_list or "收费部门" in templateAttr_list:
-        depRes = zcApi.get_dep(host=host)
+        depRes = zcApi.get_dep(session=session,host=host)
         print(depRes.json())
         if depName == None:
             depResIndex = 0
@@ -240,7 +240,7 @@ def create_sj(host=None,carTypeName=None,keyword=&quot;蔬菜&quot;,userName=None,transact
     # 获取证明类型
     if "证明类型" in templateAttr_list:
-        proveType = zcApi.get_proveType(host=host)
+        proveType = zcApi.get_proveType(session=session,host=host)
         print(proveType.json())
         # print("proveName",proveName)
         if proveName == None:
@@ -257,7 +257,7 @@ def create_sj(host=None,carTypeName=None,keyword=&quot;蔬菜&quot;,userName=None,transact
     print("proveTypeName", proveTypeName)
     # 获取防重token
-    duplicateTokenRes = zcApi.get_duplicateToken(host=host)
+    duplicateTokenRes = zcApi.get_duplicateToken(session=session,host=host)
     print(duplicateTokenRes.json())
     duplicateToken = duplicateTokenRes.json()["data"]
@@ -270,7 +270,7 @@ def create_sj(host=None,carTypeName=None,keyword=&quot;蔬菜&quot;,userName=None,transact
     weight = int(itemWeight)*int(qty)
     # 创建进门单
-    cre_res = create_sparePartsWeighSave(host=host, duplicateToken=duplicateToken,
+    cre_res = create_sparePartsWeighSave(session=session,host=host, duplicateToken=duplicateToken,
                                            carTypeCode=carTypeCode, carTypeId=carTypeId,
                                            carTypeName=carTypeName, plate=plate,weight=weight,
                                            productId=productId, productName=productName, proveTypeCode=proveTypeCode,
@@ -13,94 +13,94 @@
 import json,time,random
 from commons.scripts import dealContentType as dct
-from commons.MySession import my
+# from commons.MySession import my
 from commons.basic import getLookupList as gLL
-def get_carType(host="",**kwargs):
+def get_carType(session=None,host="",**kwargs):
     """车型获取"""
     url = host + "/jmsf-web/api/jmsf/query/listCarType"
     data = {"businessCode":"jmsf"}
     headers = dct.jsonCode()
     data = dict(data, **kwargs)
-    res = my.useHeadersRequests(method="POST", url=url, data=json.dumps(data), headers=headers)
+    res = session.useHeadersRequests(method="POST", url=url, data=json.dumps(data), headers=headers)
     return res
-def get_listCategoryByCondition(host="",**kwargs):
+def get_listCategoryByCondition(session=None,host="",**kwargs):
     """商品获取"""
     url = host + "/assets-service/api/cusCategory/getTree"
-    # marketId = my.userInfo()[]
+    # marketId = session.userInfo()[]
     data = {"marketId":9,"state":1,"keyword":"蔬菜"}
     headers = dct.jsonCode()
     data = dict(data, **kwargs)
-    res = my.useHeadersRequests(method="POST", url=url, data=json.dumps(data), headers=headers)
+    res = session.useHeadersRequests(method="POST", url=url, data=json.dumps(data), headers=headers)
     return res
-def get_listByExample(host="",**kwargs):
+def get_listByExample(session=None,host="",**kwargs):
     """获取接车员信息"""
     url = host + "/dili-uap/userApi/listByExample.api"
     data = {"firmCode":"sy","departmentId":58,"keyword":""}
     headers = dct.jsonCode()
     data = dict(data, **kwargs)
-    res = my.useHeadersRequests(method="POST", url=url, data=json.dumps(data), headers=headers)
+    res = session.useHeadersRequests(method="POST", url=url, data=json.dumps(data), headers=headers)
     return res
-def get_proveType(host="",**kwargs):
+def get_proveType(session=None,host="",**kwargs):
     """查询证明类型"""
     url = host + "/jmsf-web/api/jmsf/query/listCodeByPid"
     data = {"pid":"prove_type"}
     headers = dct.jsonCode()
     data = dict(data, **kwargs)
-    res = my.useHeadersRequests(method="get", url=url, params=json.loads(json.dumps(data)), headers=headers)
+    res = session.useHeadersRequests(method="get", url=url, params=json.loads(json.dumps(data)), headers=headers)
     return res
-def query_transactionType(host="",**kwargs):
+def query_transactionType(session=None,host="",**kwargs):
     """查交易类型"""
     url = host + "/assets-service/api/tradeType/query"
     data = {"pageNum":100,"pageSize":100,"marketId":9}
     headers = dct.jsonCode()
     data = dict(data, **kwargs)
-    res = my.useHeadersRequests(method="POST", url=url, data=json.dumps(data), headers=headers)
+    res = session.useHeadersRequests(method="POST", url=url, data=json.dumps(data), headers=headers)
     return res
-def get_goodsTag(host="",**kwargs):
+def get_goodsTag(session=None,host="",**kwargs):
     """获取货物标签"""
     url = host + "/jmsf-web/api/jmsf/query/listCodeByPid"
     data = {"pid":"goods_tag"}
     headers = dct.jsonCode()
     data = dict(data, **kwargs)
-    res = my.useHeadersRequests(method="get", url=url, params=json.loads(json.dumps(data)), headers=headers)
+    res = session.useHeadersRequests(method="get", url=url, params=json.loads(json.dumps(data)), headers=headers)
     return res
-def get_address(host="",**kwargs):
+def get_address(session=None,host="",**kwargs):
     """产地获取"""
     url = host + "/jmsf-web/api/jmsf/query/address"
     data = {"province":"C","city":None,"area":None}
     headers = dct.jsonCode()
     data = dict(data, **kwargs)
-    res = my.useHeadersRequests(method="POST", url=url, data=json.dumps(data), headers=headers)
+    res = session.useHeadersRequests(method="POST", url=url, data=json.dumps(data), headers=headers)
     return res
-def get_dep(host="",**kwargs):
+def get_dep(session=None,host="",**kwargs):
     """获取部门信息"""
     url = host + "/jmsf-web/api/jmsf/query/dep"
     data = {"keyword":""}
     headers = dct.jsonCode()
     data = dict(data, **kwargs)
-    res = my.useHeadersRequests(method="get", url=url, params=data, headers=headers)
+    res = session.useHeadersRequests(method="get", url=url, params=data, headers=headers)
     return res
-def get_duplicateToken(host=""):
+def get_duplicateToken(session=None,host=""):
     """进门防重接口"""
     url = host + "/jmsf-web/appCommon/duplicateToken.action"
     headers = dct.jsonCode()
-    res = my.useHeadersRequests(method="get", url=url, headers=headers)
+    res = session.useHeadersRequests(method="get", url=url, headers=headers)
     return res
-def create_wholeCarWeighSave(host="",duplicateToken=None,**kwargs):
+def create_wholeCarWeighSave(session=None,host="",duplicateToken=None,**kwargs):
     """查询证明类型
     :param host:
     :param **kwargs:
@@ -190,19 +190,19 @@ def create_wholeCarWeighSave(host=&quot;&quot;,duplicateToken=None,**kwargs):
     headers = dct.jsonCode()
     headers["jmsf_duplicate_commit_token"] = duplicateToken
     data = dict(data, **kwargs)
-    res = my.useHeadersRequests(method="POST", url=url, data=json.dumps(data), headers=headers)
+    res = session.useHeadersRequests(method="POST", url=url, data=json.dumps(data), headers=headers)
     return res
-def create_jmsf(host=None,carTypeName=None,keyword="蔬菜",userName=None,transactionName=None,
+def create_jmsf(session=None,host=None,carTypeName=None,keyword="蔬菜",userName=None,transactionName=None,
                 newWeight=99,plate="川A12345",goodsTagName=None,depName=None,proveName=None):
     """
     """
-    templateAttr_list = gLL.get_templateAttr(host=host)
+    templateAttr_list = gLL.get_templateAttr(session=session,host=host)
     print(templateAttr_list)
     # 获取车型
     if "车型" in templateAttr_list:
-        carType = get_carType(host=host)
+        carType = get_carType(session=session,host=host)
         if carTypeName == None:
             carTypeIndex = 0
         else:
@@ -220,7 +220,7 @@ def create_jmsf(host=None,carTypeName=None,keyword=&quot;蔬菜&quot;,userName=None,transa
     # 获取商品
     if "商品" in templateAttr_list or "商品(末级)" in templateAttr_list:
-        categoryByCondition = get_listCategoryByCondition(host=host, keyword=keyword)
+        categoryByCondition = get_listCategoryByCondition(session=session,host=host, keyword=keyword)
         cateId = categoryByCondition.json()["data"][0]["id"]
         productId = categoryByCondition.json()["data"][0]["id"]
         productName = categoryByCondition.json()["data"][0]["name"]
@@ -233,8 +233,8 @@ def create_jmsf(host=None,carTypeName=None,keyword=&quot;蔬菜&quot;,userName=None,transa
     # 获取接车员信息
     if "进门接车员" in templateAttr_list:
-        firmCode = my.userInfo["data"]["user"]["firmCode"]
-        firmId = my.userInfo["data"]["user"]["firmId"]
+        firmCode = session.userInfo["data"]["user"]["firmCode"]
+        firmId = session.userInfo["data"]["user"]["firmId"]
         try:
             res_config = gLL.get_config(host=host, marketId=firmId)
@@ -242,11 +242,11 @@ def create_jmsf(host=None,carTypeName=None,keyword=&quot;蔬菜&quot;,userName=None,transa
         except:
             departmentId = None
         # print("==========1============")
-        # print(my.userInfo["data"]["user"])
+        # print(session.userInfo["data"]["user"])
         # print(firmCode)
         # print(departmentId)
         # print("==========1============")
-        listByExample = get_listByExample(host=host,firmCode=firmCode,departmentId=departmentId)
+        listByExample = get_listByExample(session=session,host=host,firmCode=firmCode,departmentId=departmentId)
         print("listByExample",listByExample.json())
         if userName == None:
             listByExampleIndex = 0
@@ -261,7 +261,7 @@ def create_jmsf(host=None,carTypeName=None,keyword=&quot;蔬菜&quot;,userName=None,transa
     # 获取交易类型
     if "交易类型" in templateAttr_list:
-        transactionType = query_transactionType(host=host)
+        transactionType = query_transactionType(session=session,host=host)
         if transactionName == None:
             transactionTypeIndex = 0
         else:
@@ -277,7 +277,7 @@ def create_jmsf(host=None,carTypeName=None,keyword=&quot;蔬菜&quot;,userName=None,transa
     # 获取货物标签
     if "货物标签" in templateAttr_list:
-        goodsTag = get_goodsTag(host=host)
+        goodsTag = get_goodsTag(session=session,host=host)
         if goodsTagName == None:
             transactionTypeIndex = 0
         else:
@@ -289,7 +289,7 @@ def create_jmsf(host=None,carTypeName=None,keyword=&quot;蔬菜&quot;,userName=None,transa
     # 产地信息获取
     if "产地" in templateAttr_list:
-        address = get_address(host=host)
+        address = get_address(session=session,host=host)
         originId = address.json()["data"][0]["id"]
         origin = address.json()["data"][0]["name"]
         originCode = address.json()["data"][0]["cityCode"]
@@ -300,7 +300,7 @@ def create_jmsf(host=None,carTypeName=None,keyword=&quot;蔬菜&quot;,userName=None,transa
     # 查询部门信息
     if "接车部门" in templateAttr_list or "收费部门" in templateAttr_list:
-        depRes = get_dep(host=host)
+        depRes = get_dep(session=session,host=host)
         print("depRes",depRes.json())
         if depName == None:
             depResIndex = 0
@@ -315,7 +315,7 @@ def create_jmsf(host=None,carTypeName=None,keyword=&quot;蔬菜&quot;,userName=None,transa
     # 获取证明类型
     if "证明类型" in templateAttr_list:
-        proveType = get_proveType(host=host)
+        proveType = get_proveType(session=session,host=host)
         print(proveType.json())
         # print("proveName",proveName)
         if proveName == None:
@@ -330,7 +330,7 @@ def create_jmsf(host=None,carTypeName=None,keyword=&quot;蔬菜&quot;,userName=None,transa
         proveTypeName = ""
     # 获取防重token
-    duplicateTokenRes = get_duplicateToken(host=host)
+    duplicateTokenRes = get_duplicateToken(session=session,host=host)
     print(duplicateTokenRes.json())
     duplicateToken = duplicateTokenRes.json()["data"]
@@ -351,7 +351,7 @@ def create_jmsf(host=None,carTypeName=None,keyword=&quot;蔬菜&quot;,userName=None,transa
     weighmanRecord["grossWeightDate"] = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
     # 创建进门单
-    cre_res = create_wholeCarWeighSave(host=host, duplicateToken=duplicateToken,
+    cre_res = create_wholeCarWeighSave(session=session,host=host, duplicateToken=duplicateToken,
                                            carTypeCode=carTypeCode, carTypeId=carTypeId,
                                            carTypeName=carTypeName, carTypeWeight=carTypeWeight, plate=plate,
                                            productId=productId, productName=productName, proveTypeCode=proveTypeCode,
@@ -14,7 +14,7 @@ from commons.scripts import dealContentType as dct
 from commons.scripts import jsonToUrlcode
 from commons.MySession import my
-def get_LookupList(host="",providerName="车型"):
+def get_LookupList(session=None,host="",providerName="车型"):
     """基础数据获取接口
     :param  providerName:
     :return:
@@ -27,44 +27,44 @@ def get_LookupList(host=&quot;&quot;,providerName=&quot;车型&quot;):
     # print(providerName)
     data = {"provider":providerDict[providerName]}
     headers = dct.urlCode()
-    res = my.useHeadersRequests(method="POST", url=url, data=data, headers=headers)
+    res = session.useHeadersRequests(method="POST", url=url, data=data, headers=headers)
     return res
-def get_reach(host="",depId="56"):
+def get_reach(session=None,host="",depId="56"):
     """通过部门编号获取区域"""
     url = host + "/api/jmsf/ajax/district/search.action"
     data = {"depId":depId}
     headers = dct.urlCode()
-    res = my.useHeadersRequests(method="POST", url=url, data=data, headers=headers)
+    res = session.useHeadersRequests(method="POST", url=url, data=data, headers=headers)
     return res
-def get_product(host="",productName="蔬菜"):
+def get_product(session=None,host="",productName="蔬菜"):
     """通过部门编号获取区域"""
     url = host + f"/category/search.action?name={productName}"
     data = {"name":productName,"keyword":productName}
     headers = dct.urlCode()
-    res = my.useHeadersRequests(method="get", url=url, params=data, headers=headers)
+    res = session.useHeadersRequests(method="get", url=url, params=data, headers=headers)
     return res
-def get_templateUnit(host="",moduleCode="ZC"):
+def get_templateUnit(session=None,host="",moduleCode="ZC"):
     """通过部门编号获取区域"""
-    print(my.userInfo["data"]["user"]["firmId"])
-    marketCode = my.userInfo["data"]["user"]["firmId"]
+    print(session.userInfo["data"]["user"]["firmId"])
+    marketCode = session.userInfo["data"]["user"]["firmId"]
     url = host + f"/jmsf-web/api/template/getTemplateUnit?marketCode={marketCode}&moduleCode={moduleCode}"
     headers = dct.urlCode()
-    res = my.useHeadersRequests(method="get", url=url, headers=headers)
+    res = session.useHeadersRequests(method="get", url=url, headers=headers)
     return res
-def get_templateAttr(host="http://test.gateway.diligrp.com:8285",moduleCode="ZC"):
-    attr_list = [i["unitName"] for i in get_templateUnit(host=host,moduleCode=moduleCode).json()["data"]]
+def get_templateAttr(session=None,host="http://test.gateway.diligrp.com:8285",moduleCode="ZC"):
+    attr_list = [i["unitName"] for i in get_templateUnit(session=session,host=host,moduleCode=moduleCode).json()["data"]]
     return attr_list
-def get_config(host="",marketId="9"):
+def get_config(session=None,host="",marketId="9"):
     """通过部门编号获取区域"""
     url = host + "/assets-service/api/config/query"
     data = {"marketId":marketId,"pageNum":100,"pageSize":100}
     headers = dct.jsonCode()
-    res = my.useHeadersRequests(method="POST", url=url, data=json.dumps(data), headers=headers)
+    res = session.useHeadersRequests(method="POST", url=url, data=json.dumps(data), headers=headers)
     return res
 # # host="http://test.jmsf.diligrp.com:8385"
@@ -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
@@ -19,7 +19,7 @@ class readConfig(object):
         # 按市场读取配置文件数据
         self.conf = configparser.ConfigParser()
         self.evn_name = os.name
-        self.file_name = r'test_config_heb.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
+#登录信息
+[loginInfo]
+sy_userName_01=scgy,123123
+hd_userName_01=哈尔滨田太子,a123456
+
+# 测试依赖信息
+[testInfo]
+#sy
+sy_cardNumRe_01=888810033081
+#hd
+hd_cardNumRe_01=210823173732
+
+
+[host]
+cardHost=http://test.card.diligrp.com:8386
+uapHost=http://test.uap.diligrp.com
+gatewayHost=http://test.gateway.diligrp.com:8285
+jmsfHost=http://test.jmsf.diligrp.com:8385
 \ No newline at end of file
+#登录信息
+[loginInfo]
+sy_userName_01=scgy,123123
+hd_userName_01=哈尔滨田太子,a123456
+
+# 测试依赖信息
+[testInfo]
+#sy
+sy_cardNumRe_01=888810033081
+#hd
+hd_cardNumRe_01=210823173732
+
+
+[host]
+cardHost=http://test.card.diligrp.com:8386
+uapHost=http://test.uap.diligrp.com
+gatewayHost=http://test.gateway.diligrp.com:8285
+jmsfHost=http://test.jmsf.diligrp.com:8385
 \ No newline at end of file
-#沈阳市场信息
-[loginInfo]
-userName=哈尔滨田太子
-password=a123456
-
-[testInfo]
-#已添加的身份证号
-cCNum=11010119990307865X
-cCNumB=110101199903077593
-#入库未开卡的卡号
-cardNum=210607113166
-#已开卡的卡号
-cardNumRe=210823173732
-#密码设置
-loginPwd=111111
-
-[host]
-cardHost=http://test.card.diligrp.com:8386
-uapHost=http://test.uap.diligrp.com
-gatewayHost=http://test.gateway.diligrp.com:8285
-jmsfHost=http://test.jmsf.diligrp.com:8385
 \ No newline at end of file
-#沈阳市场信息
-[loginInfo]
-userName=scgy
-password=123123
-
-[testInfo]
-#已添加的身份证号
-cCNum=11010119990307865X
-cCNumB=110101199903077593
-#入库未开卡的卡号
-cardNum=210607113166
-#已开卡的卡号
-cardNumRe=888810033081
-#密码设置
-loginPwd=111111
-
-[host]
-cardHost=http://test.card.diligrp.com:8386
-uapHost=http://test.uap.diligrp.com
-gatewayHost=http://test.gateway.diligrp.com:8285
-jmsfHost=http://test.jmsf.diligrp.com:8385
 \ No newline at end of file
@@ -18,6 +18,9 @@ from commons.api.entranceFeeBillList import operationDoFreeze as oDF
 from commons.api import hpApi
 import time,random
+from commons.MySession import sessionHeb
+session = sessionHeb
+
 class test_HPCreate(unittest.TestCase):
     """哈尔滨市场-整车-车辆回皮"""
     def setUp(self) -> None:
@@ -31,7 +34,7 @@ class test_HPCreate(unittest.TestCase):
     def setUpClass(cls) -> None:
         cls.gatewayHost = rC.returnOptionsItems("host", "gatewayHost")
         cls.jmsfHost = rC.returnOptionsItems("host", "jmsfHost")
-        cls.ic = rC.returnOptionsItems("testInfo", "cardNumRe")
+        cls.ic = rC.returnOptionsItems("testInfo", "hd_cardNumRe_01")
     @classmethod
     def tearDownClass(cls) -> None:
@@ -41,11 +44,11 @@ class test_HPCreate(unittest.TestCase):
         """整车-车辆回皮：创建回皮进门单"""
         plate = f"川B{random.randint(10000,99999)}"
         goods = "雪莲果"
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,plate=plate,keyword=goods)
         print(cre_res.json())
         number = cre_res.json()["data"]["number"]
-        aa = oDF.do_freezeOrder(host=self.jmsfHost,attrValue=number,ic=self.ic)
-        res,tareWeight = hpApi.do_backSkinWeighSave(host=self.gatewayHost,number=number)
+        aa = oDF.do_freezeOrder(session=session,host=self.jmsfHost,attrValue=number,ic=self.ic)
+        res,tareWeight = hpApi.do_backSkinWeighSave(session=session,host=self.gatewayHost,number=number)
         assert res.json()["code"]=="200","回皮失败"
         assert "data" in res.text,"回皮失败"
@@ -53,11 +56,11 @@ class test_HPCreate(unittest.TestCase):
         """整车-车辆回皮：根据车牌号查询"""
         plate = f"川B{random.randint(10000,99999)}"
         goods="火龙果"
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,plate=plate,keyword=goods)
         print(cre_res.json())
         number = cre_res.json()["data"]["number"]
-        aa = oDF.do_freezeOrder(host=self.jmsfHost,attrValue=number,ic=self.ic)
-        res = hpApi.get_listBackSkinTrucks(host=self.gatewayHost,plate=plate)
+        aa = oDF.do_freezeOrder(session=session,host=self.jmsfHost,attrValue=number,ic=self.ic)
+        res = hpApi.get_listBackSkinTrucks(session=session,host=self.gatewayHost,plate=plate)
         print(res.json())
         assert res.json()["code"]=="200","车号查询失败"
         assert res.json()["data"][-1]["number"]==number,"车号查询失败"
@@ -66,11 +69,11 @@ class test_HPCreate(unittest.TestCase):
         """整车-车辆回皮：根据收费单号查询"""
         plate = f"川B{random.randint(10000,99999)}"
         goods="火龙果"
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,plate=plate,keyword=goods)
         print(cre_res.json())
         number = cre_res.json()["data"]["number"]
-        aa = oDF.do_freezeOrder(host=self.jmsfHost,attrValue=number,ic=self.ic)
-        res = hpApi.get_listBackSkinTrucks(host=self.gatewayHost,number=number)
+        aa = oDF.do_freezeOrder(session=session,host=self.jmsfHost,attrValue=number,ic=self.ic)
+        res = hpApi.get_listBackSkinTrucks(session=session,host=self.gatewayHost,number=number)
         print(res.json())
         assert res.json()["code"]=="200","车号查询失败"
         assert res.json()["data"][-1]["number"]==number,"车号查询失败"
@@ -80,13 +83,13 @@ class test_HPCreate(unittest.TestCase):
         plate = f"川B{random.randint(10000,99999)}"
         goods="雪莲果"
         ic = self.ic
-        customerName= eFBL.get_icCheck(host=self.jmsfHost,ic=ic).json()["data"]["aInfo"]["customerName"]
+        customerName= eFBL.get_icCheck(session=session,host=self.jmsfHost,ic=ic).json()["data"]["aInfo"]["customerName"]
         print(customerName)
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,plate=plate,keyword=goods)
         print(cre_res.json())
         number = cre_res.json()["data"]["number"]
-        aa = oDF.do_freezeOrder(host=self.jmsfHost,attrValue=number,ic=self.ic)
-        res = hpApi.get_listBackSkinTrucks(host=self.gatewayHost,customerName=customerName)
+        aa = oDF.do_freezeOrder(session=session,host=self.jmsfHost,attrValue=number,ic=self.ic)
+        res = hpApi.get_listBackSkinTrucks(session=session,host=self.gatewayHost,customerName=customerName)
         print(res.json())
         assert res.json()["code"]=="200","车号查询失败"
         assert res.json()["data"][-1]["number"]==number,"车号查询失败"
 \ No newline at end of file
@@ -16,6 +16,8 @@ from commons.api import zcApi as zcA
 from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL
 from commons.api import sjApi
 import time,random
+from commons.MySession import sessionHeb
+session = sessionHeb
 class test_SJCreate(unittest.TestCase):
     """哈尔滨市场-散件-创建整车进门单"""
@@ -46,7 +48,7 @@ class test_SJCreate(unittest.TestCase):
         # 获取车型
-        carType = zcA.get_carType(host=self.gatewayHost)
+        carType = zcA.get_carType(session=session,host=self.gatewayHost)
         print(carType.text)
         print(carType.json()["data"][0])
         carTypeCode = carType.json()["data"][0]["code"]
@@ -54,51 +56,51 @@ class test_SJCreate(unittest.TestCase):
         carTypeName = carType.json()["data"][0]["carTypeName"]
         # 获取商品
-        categoryByCondition = zcA.get_listCategoryByCondition(host=self.gatewayHost)
+        categoryByCondition = zcA.get_listCategoryByCondition(session=session,host=self.gatewayHost)
         print(categoryByCondition.json())
         cateId = categoryByCondition.json()["data"][0]["id"]
         productId = categoryByCondition.json()["data"][0]["id"]
         productName = categoryByCondition.json()["data"][0]["name"]
         # 获取接车员
-        listByExample = zcA.get_listByExample(host=self.gatewayHost)
+        listByExample = zcA.get_listByExample(session=session,host=self.gatewayHost)
         print(listByExample.json())
         inGreeterId = listByExample.json()["data"][0]["id"]
         inGreeterName = listByExample.json()["data"][0]["realName"]
         # 获取交易类型
-        transactionType = zcA.query_transactionType(host=self.gatewayHost)
+        transactionType = zcA.query_transactionType(session=session,host=self.gatewayHost)
         print(transactionType.json())
         tradeType = transactionType.json()["rows"][0]["code"]
         tradeTypeId = transactionType.json()["rows"][0]["id"]
         tradeTypeName = transactionType.json()["rows"][0]["name"]
         # 获取货物标签
-        goodsTag = zcA.get_goodsTag(host=self.gatewayHost)
+        goodsTag = zcA.get_goodsTag(session=session,host=self.gatewayHost)
         print(goodsTag.json())
         # goodsTagId = goodsTag.json()["data"][0]["id"]
         # 产地信息获取
-        address = zcA.get_address(host=self.gatewayHost)
+        address = zcA.get_address(session=session,host=self.gatewayHost)
         print(address.json())
         originId = address.json()["data"][0]["id"]
         origin = address.json()["data"][0]["name"]
         originCode = address.json()["data"][0]["cityCode"]
         # 查询部门信息
-        depRes = zcA.get_dep(host=self.gatewayHost)
+        depRes = zcA.get_dep(session=session,host=self.gatewayHost)
         print(depRes.json())
         feeDepId = depRes.json()["data"][0]["id"]
         feeDepName = depRes.json()["data"][0]["name"]
         # 获取证明类型
-        proveType = zcA.get_proveType(host=self.gatewayHost)
+        proveType = zcA.get_proveType(session=session,host=self.gatewayHost)
         print(proveType.json())
         proveTypeCode = proveType.json()["data"][0]["id"]
         proveTypeName = proveType.json()["data"][0]["name"]
         # 获取防重token
-        duplicateTokenRes = zcA.get_duplicateToken(host=self.gatewayHost)
+        duplicateTokenRes = zcA.get_duplicateToken(session=session,host=self.gatewayHost)
         print(duplicateTokenRes.json())
         duplicateToken = duplicateTokenRes.json()["data"]
@@ -106,7 +108,7 @@ class test_SJCreate(unittest.TestCase):
         weight = int(itemWeight) * int(qty)
         # 创建进门单
-        cre_res = sjApi.create_sparePartsWeighSave(host=self.gatewayHost, duplicateToken=duplicateToken,
+        cre_res = sjApi.create_sparePartsWeighSave(session=session,host=self.gatewayHost, duplicateToken=duplicateToken,
                                              carTypeCode=carTypeCode, carTypeId=carTypeId,
                                              carTypeName=carTypeName, plate=plate, weight=weight,
                                              productId=productId, productName=productName, proveTypeCode=proveTypeCode,
@@ -13,9 +13,9 @@ import json
 import unittest
 from commons.scripts.readConf import rC
 from commons.api import zcApi as zcA
-from commons.MySession import my
-from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL
-import time,random
+from commons.basic import getLookupList as gLL
+from commons.MySession import sessionHeb
+session = sessionHeb
 class test_ZCBasic(unittest.TestCase):
     """哈尔滨市场-整车-创建整车进门单基础信息接口测试"""
@@ -38,7 +38,7 @@ class test_ZCBasic(unittest.TestCase):
     def test_getCar(self):
         """整车-整车创建:获取车型接口调用测试"""
         # 获取车型
-        carType = zcA.get_carType(host=self.gatewayHost)
+        carType = zcA.get_carType(session=session,host=self.gatewayHost)
         print(carType.text)
         assert carType.json()["code"] == "200"
         assert carType.json()["data"] != []
@@ -46,9 +46,9 @@ class test_ZCBasic(unittest.TestCase):
     def test_getAllCategory(self):
         """整车-整车创建:获取测试商品信息测试"""
         # 获取
-        # print(my.userInfo["data"]["user"]["firmCode"])
-        marketId = my.userInfo["data"]["user"]["firmId"]
-        resCategory = zcA.get_listCategoryByCondition(host=self.gatewayHost,marketId=marketId,keyword="")
+        # print(session.userInfo["data"]["user"]["firmCode"])
+        marketId = session.userInfo["data"]["user"]["firmId"]
+        resCategory = zcA.get_listCategoryByCondition(session=session,host=self.gatewayHost,marketId=marketId,keyword="")
         print(resCategory.text)
         assert resCategory.json()["code"] == "200","全商品查询失败"
         assert resCategory.json()["data"] != [],"全商品查询失败，查询结果不应该为空"
@@ -56,8 +56,8 @@ class test_ZCBasic(unittest.TestCase):
     def test_getOneCategory(self):
         """整车-整车创建:获取测试商品信息测试"""
         # 获取
-        marketId = my.userInfo["data"]["user"]["firmId"]
-        resCategory = zcA.get_listCategoryByCondition(host=self.gatewayHost,marketId=marketId,keyword="火龙果")
+        marketId = session.userInfo["data"]["user"]["firmId"]
+        resCategory = zcA.get_listCategoryByCondition(session=session,host=self.gatewayHost,marketId=marketId,keyword="火龙果")
         print(resCategory.text)
         nameList = [i["name"] for i in resCategory.json()["data"]]
         assert resCategory.json()["code"] == "200"
@@ -66,29 +66,29 @@ class test_ZCBasic(unittest.TestCase):
     def test_getAllExample(self):
         """整车-整车创建:接车员信息获取测试"""
-        # print(my.userInfo["data"]["user"]["departmentId"])
-        firmCode = my.userInfo["data"]["user"]["firmCode"]
-        departmentId = my.userInfo["data"]["user"]["departmentId"]
-        listByExample = zcA.get_listByExample(host=self.gatewayHost,firmCode=firmCode,departmentId=departmentId)
+        # print(session.userInfo["data"]["user"]["departmentId"])
+        firmCode = session.userInfo["data"]["user"]["firmCode"]
+        departmentId = session.userInfo["data"]["user"]["departmentId"]
+        listByExample = zcA.get_listByExample(session=session,host=self.gatewayHost,firmCode=firmCode,departmentId=departmentId)
         print(listByExample.json())
         assert listByExample.json()["code"]=="200","接车员信息获取测试失败"
         assert listByExample.json()["data"]!=[],"接车员信息获取测试失败"
     def test_getOneExample(self):
         """整车-整车创建:按接车员名称信息查询接车员"""
-        # print(my.userInfo["data"]["user"]["departmentId"])
-        # firmCode = my.userInfo["data"]["user"]["firmCode"]
-        # departmentId = my.userInfo["data"]["user"]["departmentId"]
+        # print(session.userInfo["data"]["user"]["departmentId"])
+        # firmCode = session.userInfo["data"]["user"]["firmCode"]
+        # departmentId = session.userInfo["data"]["user"]["departmentId"]
-        firmCode = my.userInfo["data"]["user"]["firmCode"]
-        firmId = my.userInfo["data"]["user"]["firmId"]
+        firmCode = session.userInfo["data"]["user"]["firmCode"]
+        firmId = session.userInfo["data"]["user"]["firmId"]
         try:
-            res_config = gLL.get_config(host=host, marketId=firmId)
+            res_config = gLL.get_config(session=session,host=self.gatewayHost, marketId=firmId)
             departmentId = [i["value"] for i in res_config.json()["rows"] if i["name"] == "DepartmentId"][0]
         except:
             departmentId = None
         keyword="哈达测试"
-        listByExample = zcA.get_listByExample(host=self.gatewayHost,firmCode=firmCode,departmentId=departmentId,
+        listByExample = zcA.get_listByExample(session=session,host=self.gatewayHost,firmCode=firmCode,departmentId=departmentId,
                                               keyword=keyword)
         print(listByExample.json())
         assert listByExample.json()["code"]=="200","按接车员名称信息查询接车员测试失败"
@@ -96,7 +96,7 @@ class test_ZCBasic(unittest.TestCase):
     def test_transactionType(self):
         """整车-整车创建:交易类型获取测试"""
-        transactionType = zcA.query_transactionType(host=self.gatewayHost)
+        transactionType = zcA.query_transactionType(session=session,host=self.gatewayHost)
         print(transactionType.json())
         assert transactionType.status_code==200,"交易类型信息获取测试失败"
         assert transactionType.json()["rows"]!=[],"交易类型信息获取测试失败"
@@ -104,7 +104,7 @@ class test_ZCBasic(unittest.TestCase):
     @unittest.skip
     def test_getGoodsTag(self):
         """整车-整车创建:货物标签获取测试"""
-        goodsTag = zcA.get_goodsTag(host=self.gatewayHost)
+        goodsTag = zcA.get_goodsTag(session=session,host=self.gatewayHost)
         print(goodsTag.json())
         assert goodsTag.status_code==200,"货物标签信息获取测试失败"
         assert goodsTag.json()["data"]!=[],"货物标签信息获取测试失败"
@@ -112,7 +112,7 @@ class test_ZCBasic(unittest.TestCase):
     def test_getAllAddress(self):
         """整车-整车创建:按照省份查询产地"""
         province = "四川省"
-        address = zcA.get_address(host=self.gatewayHost,province=province)
+        address = zcA.get_address(session=session,host=self.gatewayHost,province=province)
         print(address.json())
         assert address.json()["code"] == "200","按照省份查询产地信息获取测试失败"
         mergerNameList = [i["mergerName"] for i in address.json()["data"] if province not in i["mergerName"]]
@@ -123,7 +123,7 @@ class test_ZCBasic(unittest.TestCase):
         province = "四川省"
         city = "成都市"
         area = "锦江区"
-        address = zcA.get_address(host=self.gatewayHost,province=province,city=city,area=area)
+        address = zcA.get_address(session=session,host=self.gatewayHost,province=province,city=city,area=area)
         print(address.json())
         assert address.json()["code"]=="200","详细产地信息查询失败"
         assert len(address.json()["data"])==1,"详细产地信息查询只能查询出一个结果，查询结果超过一个测试失败"
@@ -131,7 +131,7 @@ class test_ZCBasic(unittest.TestCase):
     def test_getAllDep(self):
         """整车-整车创建:接车部门信息获取"""
-        depRes = zcA.get_dep(host=self.gatewayHost)
+        depRes = zcA.get_dep(session=session,host=self.gatewayHost)
         print(depRes.json())
         assert depRes.json()["code"]=="200","接车部门信息获取测试失败"
         assert depRes.json()["data"] != [], "接车部门信息获取测试失败"
@@ -140,7 +140,7 @@ class test_ZCBasic(unittest.TestCase):
     def test_getOneDep(self):
         """整车-整车创建:查询指定接车部门信息"""
         keyword="哈达测试部"
-        depRes = zcA.get_dep(host=self.gatewayHost,keyword=keyword)
+        depRes = zcA.get_dep(session=session,host=self.gatewayHost,keyword=keyword)
         print(depRes.json())
         assert depRes.json()["code"]=="200","查询指定接车部门信息获取测试失败"
         assert len(depRes.json()["data"]) == 1, "查询指定接车部门信息获取测试失败"
@@ -148,14 +148,14 @@ class test_ZCBasic(unittest.TestCase):
     def test_getProveType(self):
         """整车-整车创建:证明类型信息获取"""
-        proveType = zcA.get_proveType(host=self.gatewayHost)
+        proveType = zcA.get_proveType(session=session,host=self.gatewayHost)
         print(proveType.json())
         assert proveType.json()["code"]=="200","证明类型信息获取测试失败"
         assert proveType.json()["data"] != [], "证明类型信息获取测试失败"
     def test_getDuplicateToken(self):
         """整车-整车创建:获取防重复token"""
-        duplicateTokenRes = zcA.get_duplicateToken(host=self.gatewayHost)
+        duplicateTokenRes = zcA.get_duplicateToken(session=session,host=self.gatewayHost)
         print(duplicateTokenRes.json())
         assert duplicateTokenRes.json()["code"]=="200","获取防重复token测试失败"
         assert duplicateTokenRes.json()["data"].isalnum(), "获取防重复token测试失败"
@@ -13,8 +13,11 @@ import json
 import unittest
 from commons.scripts.readConf import rC
 from commons.api import zcApi as zcA
+from commons.MySession import sessionHeb
 from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL
 import time,random
+from commons.MySession import sessionHeb
+session = sessionHeb
 class test_ZCCreate(unittest.TestCase):
     """哈尔滨市场-整车-创建整车进门单"""
@@ -43,7 +46,7 @@ class test_ZCCreate(unittest.TestCase):
         trailerNumber = plate
         # 获取车型
-        carType = zcA.get_carType(host=self.gatewayHost)
+        carType = zcA.get_carType(session=sessionHeb,host=self.gatewayHost)
         print(carType.text)
         print(carType.json()["data"][0])
         carTypeCode = carType.json()["data"][0]["code"]
@@ -52,7 +55,7 @@ class test_ZCCreate(unittest.TestCase):
         carTypeWeight = carType.json()["data"][0]["weight"]
         # 获取商品
-        categoryByCondition = zcA.get_listCategoryByCondition(host=self.gatewayHost)
+        categoryByCondition = zcA.get_listCategoryByCondition(session=sessionHeb,host=self.gatewayHost)
         print(categoryByCondition.json())
         cateId = categoryByCondition.json()["data"][0]["id"]
         productId = categoryByCondition.json()["data"][0]["id"]
@@ -60,45 +63,45 @@ class test_ZCCreate(unittest.TestCase):
         productCode = categoryByCondition.json()["data"][0]["keycode"]
         # 获取接车员
-        listByExample = zcA.get_listByExample(host=self.gatewayHost)
+        listByExample = zcA.get_listByExample(session=sessionHeb,host=self.gatewayHost)
         print(listByExample.json())
         inGreeterId = listByExample.json()["data"][0]["id"]
         inGreeterName = listByExample.json()["data"][0]["realName"]
         # 获取交易类型
-        transactionType = zcA.query_transactionType(host=self.gatewayHost)
+        transactionType = zcA.query_transactionType(session=sessionHeb,host=self.gatewayHost)
         print(transactionType.json())
         tradeType = transactionType.json()["rows"][0]["code"]
         tradeTypeId = transactionType.json()["rows"][0]["id"]
         tradeTypeName = transactionType.json()["rows"][0]["name"]
         # 获取货物标签
-        # goodsTag = zcA.get_goodsTag(host=self.gatewayHost)
+        goodsTag = zcA.get_goodsTag(session=session,host=self.gatewayHost)
         # print(goodsTag.json())
         # goodsTagId = goodsTag.json()["data"][0]["id"]
         goodsTagId = ""
         # 产地信息获取
-        address = zcA.get_address(host=self.gatewayHost)
+        address = zcA.get_address(session=sessionHeb,host=self.gatewayHost)
         print(address.json())
         originId = address.json()["data"][0]["id"]
         origin = address.json()["data"][0]["name"]
         originCode = address.json()["data"][0]["cityCode"]
         # 查询部门信息
-        depRes = zcA.get_dep(host=self.gatewayHost)
+        depRes = zcA.get_dep(session=sessionHeb,host=self.gatewayHost)
         print(depRes.json())
         feeDepId = depRes.json()["data"][0]["id"]
         feeDepName = depRes.json()["data"][0]["name"]
         # 获取证明类型
-        proveType = zcA.get_proveType(host=self.gatewayHost)
+        proveType = zcA.get_proveType(session=sessionHeb,host=self.gatewayHost)
         print(proveType.json())
         proveTypeCode = proveType.json()["data"][0]["id"]
         proveTypeName = proveType.json()["data"][0]["name"]
         # 获取防重token
-        duplicateTokenRes = zcA.get_duplicateToken(host=self.gatewayHost)
+        duplicateTokenRes = zcA.get_duplicateToken(session=sessionHeb,host=self.gatewayHost)
         print(duplicateTokenRes.json())
         duplicateToken = duplicateTokenRes.json()["data"]
@@ -113,7 +116,7 @@ class test_ZCCreate(unittest.TestCase):
         weighmanRecord["grossWeightDate"] = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
         # 创建进门单
-        cre_res = zcA.create_wholeCarWeighSave(host=self.gatewayHost, duplicateToken=duplicateToken,
+        cre_res = zcA.create_wholeCarWeighSave(session=sessionHeb,host=self.gatewayHost, duplicateToken=duplicateToken,
                                                carTypeCode=carTypeCode, carTypeId=carTypeId,
                                                carTypeName=carTypeName, carTypeWeight=carTypeWeight, plate=plate,
                                                productId=productId, productName=productName,
@@ -24,6 +24,9 @@ from commons.api.entranceFeeBillList import operationDoUpdate as oDUp
 from commons.api.entranceFeeBillList import operationDoFreeze as oDF
 import random
+from commons.MySession import sessionHeb
+session = sessionHeb
+
 class test_listPage(unittest.TestCase):
     """哈尔滨市场-进门单列表：进门但操作测试测试"""
     def setUp(self) -> None:
@@ -36,7 +39,7 @@ class test_listPage(unittest.TestCase):
     def setUpClass(cls) -> None:
         cls.gatewayHost = rC.returnOptionsItems("host", "gatewayHost")
         cls.jmsfHost = rC.returnOptionsItems("host", "jmsfHost")
-        cls.ic = rC.returnOptionsItems("testInfo", "cardNumRe")
+        cls.ic = rC.returnOptionsItems("testInfo", "hd_cardNumRe_01")
     @classmethod
     def tearDownClass(cls) -> None:
@@ -44,20 +47,20 @@ class test_listPage(unittest.TestCase):
     def test_viewOrder(self):
         """进门单列表-操作：查看进门单详情测试"""
-        res = zcA.create_jmsf(host=self.gatewayHost)
+        res = zcA.create_jmsf(session=session,host=self.gatewayHost)
         orderId = res.json()["data"]["id"]
         number = res.json()["data"]["number"]
-        res = eFBL.get_orderView(host=self.jmsfHost,orderId=orderId)
+        res = eFBL.get_orderView(session=session,host=self.jmsfHost,orderId=orderId)
         assert str(number) in res.text,"获取订单详情查询失败"
     def test_doPayZC(self):
         """进门单列表-操作：整车进门交费测试"""
         plate = f"川A{random.randint(10000,99999)}"
         goods = "雪莲果"
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,plate=plate,keyword=goods)
         print(cre_res.json())
         number = cre_res.json()["data"]["number"]
-        res_pay = eFBL.do_payOrder(host=self.jmsfHost,attrValue=number,ic=self.ic)
+        res_pay = eFBL.do_payOrder(session=session,host=self.jmsfHost,attrValue=number,ic=self.ic)
         assert res_pay.json()["code"]=="200","缴费失败"
         assert res_pay.json()["message"] == "OK", "缴费失败"
@@ -65,10 +68,10 @@ class test_listPage(unittest.TestCase):
         """进门单列表-操作：修改进门单测试"""
         plate = f"川A{random.randint(10000,99999)}"
         goods = "雪莲果"
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,plate=plate,keyword=goods)
         print(cre_res.json())
         number = cre_res.json()["data"]["number"]
-        res_pay = oDUp.do_updateOrder(host=self.jmsfHost,attrValue=number)
+        res_pay = oDUp.do_updateOrder(session=session,host=self.jmsfHost,attrValue=number)
         assert res_pay.json()["success"]==True,"修改进门单失败"
         assert res_pay.json()["message"] == "修改保存成功", "修改进门单失败"
@@ -76,10 +79,10 @@ class test_listPage(unittest.TestCase):
         """进门单列表-操作：散件进门交费测试"""
         plate = f"川A{random.randint(10000,99999)}"
         goods = "雪莲果"
-        cre_res = sjApi.create_sj(host=self.gatewayHost,plate=plate,keyword=goods)
+        cre_res = sjApi.create_sj(session=session,host=self.gatewayHost,plate=plate,keyword=goods)
         print(cre_res.json())
         number = cre_res.json()["data"]["number"]
-        res_pay = eFBL.do_payOrder(host=self.jmsfHost,attrValue=number,ic=self.ic)
+        res_pay = eFBL.do_payOrder(session=session,host=self.jmsfHost,attrValue=number,ic=self.ic)
         assert res_pay.json()["code"]=="200","缴费失败"
         assert res_pay.json()["message"] == "OK", "缴费失败"
@@ -87,16 +90,16 @@ class test_listPage(unittest.TestCase):
         """进门单列表-操作：散件进门交费测试"""
         plate = f"川A{random.randint(10000,99999)}"
         goods = "雪莲果"
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,plate=plate,keyword=goods)
         print(cre_res.json())
         number = cre_res.json()["data"]["number"]
-        res_pay = oDF.do_freezeOrder(host=self.jmsfHost,attrValue=number,ic=self.ic)
+        res_pay = oDF.do_freezeOrder(session=session,host=self.jmsfHost,attrValue=number,ic=self.ic)
         assert res_pay.json()["code"]=="200","缴费失败"
         assert res_pay.json()["message"] == "OK", "缴费失败"
-        res,tareWeight = hpApi.do_backSkinWeighSave(host=self.gatewayHost,number=number)
+        res,tareWeight = hpApi.do_backSkinWeighSave(session=session,host=self.gatewayHost,number=number)
         assert res.json()["code"]=="200","回皮失败"
         assert "data" in res.text,"回皮失败"
-        resListPage = eFBL.listPage(host=self.jmsfHost,attrValue=number)
+        resListPage = eFBL.listPage(session=session,host=self.jmsfHost,attrValue=number)
         print(resListPage.json())
         assert resListPage.json()["rows"][0]["number"] == number,"按照收费单号查询失败"
         assert resListPage.json()["rows"][0]["tareWeight"] == tareWeight,"按照收费单号查询失败"
@@ -106,10 +109,10 @@ class test_listPage(unittest.TestCase):
         """进门单列表-操作：整车进门冻结测试"""
         plate = f"川A{random.randint(10000,99999)}"
         goods = "雪莲果"
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,plate=plate,keyword=goods)
         print(cre_res.json())
         number = cre_res.json()["data"]["number"]
-        res_pay = oDF.do_freezeOrder(host=self.jmsfHost,attrValue=number,ic=self.ic)
+        res_pay = oDF.do_freezeOrder(session=session,host=self.jmsfHost,attrValue=number,ic=self.ic)
         assert res_pay.json()["code"]=="200","冻结失败"
         assert res_pay.json()["message"] == "OK", "冻结失败"
@@ -117,34 +120,34 @@ class test_listPage(unittest.TestCase):
         """进门单列表-操作：整车进门解冻测试"""
         plate = f"川A{random.randint(10000,99999)}"
         goods = "雪莲果"
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,plate=plate,keyword=goods)
         print(cre_res.json())
         number = cre_res.json()["data"]["number"]
-        oDF.do_freezeOrder(host=self.jmsfHost,attrValue=number,ic=self.ic)
-        res_unfreezeOrder = eOp.do_unfreezeOrder(host=self.jmsfHost,attrValue=number)
+        oDF.do_freezeOrder(session=session,host=self.jmsfHost,attrValue=number,ic=self.ic)
+        res_unfreezeOrder = eOp.do_unfreezeOrder(session=session,host=self.jmsfHost,attrValue=number)
         assert res_unfreezeOrder.json()["code"]=="200","解冻失败"
         assert res_unfreezeOrder.json()["message"] == "OK", "解冻失败"
     def test_invalidOrder(self):
         """进门单列表-操作：整车进门作废测试"""
         plate = f"川A{random.randint(10000,99999)}"
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,plate=plate)
         print(cre_res.json())
         number = cre_res.json()["data"]["number"]
-        res_unfreezeOrder = oDI.do_invalidOrder(host=self.jmsfHost,attrValue=number)
+        res_unfreezeOrder = oDI.do_invalidOrder(session=session,host=self.jmsfHost,attrValue=number)
         assert res_unfreezeOrder.json()["number"]==number,"作废测试失败"
         assert res_unfreezeOrder.json()["message"] == "作废成功!", "作废测试失败"
     def test_correctOrder(self):
         """进门单列表-操作：整车进门更正测试"""
         plate = f"川A{random.randint(10000,99999)}"
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,plate=plate)
         print(cre_res.json())
         number = cre_res.json()["data"]["number"]
-        res_unfreezeOrder,totalAmount = oDC.do_correctOrder(host=self.jmsfHost,attrValue=number)
+        res_unfreezeOrder,totalAmount = oDC.do_correctOrder(session=session,host=self.jmsfHost,attrValue=number)
         assert res_unfreezeOrder.json()["success"]==True,"更正测试失败"
         assert res_unfreezeOrder.json()["msg"] == "操作成功", "更正测试失败"
-        resListPage = eFBL.listPage(host=self.jmsfHost,attrValue=number)
+        resListPage = eFBL.listPage(session=session,host=self.jmsfHost,attrValue=number)
         print(resListPage.json())
         assert resListPage.json()["rows"][0]["number"] == number,"按照收费单号查询失败"
         assert resListPage.json()["rows"][0]["$_totalPrice"] == totalAmount,"更正后订单界错误与预期金额不一致"
@@ -152,10 +155,10 @@ class test_listPage(unittest.TestCase):
     def test_amendOrder(self):
         """进门单列表-操作：整车进门修正测试"""
         plate = f"川A{random.randint(10000,99999)}"
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,plate=plate)
         print(cre_res.json())
         number = cre_res.json()["data"]["number"]
-        res_unfreezeOrder = oDA.do_amendOrder(host=self.jmsfHost,attrValue=number)
+        res_unfreezeOrder = oDA.do_amendOrder(session=session,host=self.jmsfHost,attrValue=number)
         assert res_unfreezeOrder.json()["success"]==True,"修正操作失败"
         assert res_unfreezeOrder.json()["message"] == "操作成功", "修正操作失败"
@@ -163,9 +166,9 @@ class test_listPage(unittest.TestCase):
         """进门单列表-操作：整车进门退款测试"""
         plate = f"川A{random.randint(10000,99999)}"
         goods = "雪莲果"
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,plate=plate,keyword=goods)
         number = cre_res.json()["data"]["number"]
-        res_pay = eFBL.do_payOrder(host=self.jmsfHost,attrValue=number,ic=self.ic)
-        res_undo = oDU.do_undoOrder(host=self.jmsfHost,attrValue=number)
+        res_pay = eFBL.do_payOrder(session=session,host=self.jmsfHost,attrValue=number,ic=self.ic)
+        res_undo = oDU.do_undoOrder(session=session,host=self.jmsfHost,attrValue=number)
         assert res_undo.json()["code"] == "200","退款失败"
         assert res_undo.json()["message"] == "OK","退款失败"
 \ No newline at end of file
@@ -18,6 +18,8 @@ from commons import ConfigDB as CoDB
 from commons.MySession import my
 from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL
 import time,random
+from commons.MySession import sessionHeb
+session = sessionHeb
 class test_listPage(unittest.TestCase):
     """哈尔滨市场-进门单列表：attr进门单属性查询测试"""
@@ -32,7 +34,7 @@ class test_listPage(unittest.TestCase):
     def setUpClass(cls) -> None:
         cls.gatewayHost = rC.returnOptionsItems("host", "gatewayHost")
         cls.jmsfHost = rC.returnOptionsItems("host", "jmsfHost")
-        cls.ic = rC.returnOptionsItems("testInfo", "cardNumRe")
+        cls.ic = rC.returnOptionsItems("testInfo", "hd_cardNumRe_01")
     @classmethod
     def tearDownClass(cls) -> None:
@@ -42,9 +44,9 @@ class test_listPage(unittest.TestCase):
         """进门单列表-查询：收费单号查询测试"""
         plate = f"川A{random.randint(10000, 99999)}"
         goods = "树番茄"
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,plate=plate,keyword=goods)
         number = cre_res.json()["data"]["number"]
-        resListPage = eFBL.listPage(host=self.jmsfHost,attrValue=number)
+        resListPage = eFBL.listPage(session=session,host=self.jmsfHost,attrValue=number)
         print(resListPage.json())
         assert resListPage.json()["rows"][0]["number"] == number,"按照收费单号查询失败"
         assert len(resListPage.json()["rows"]) == 1,"按照收费单号查询失败"
@@ -53,30 +55,32 @@ class test_listPage(unittest.TestCase):
         """进门单列表-查询：车牌号查询测试"""
         plate = f"川A{random.randint(10000, 99999)}"
         goods = "雪莲果"
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
-        resListPage = eFBL.listPage(host=self.jmsfHost,attrName="车号",attrValue=plate)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,plate=plate,keyword=goods)
+        resListPage = eFBL.listPage(session=session,host=self.jmsfHost,attrName="车号",attrValue=plate)
         print(resListPage.json())
         assert resListPage.json()["rows"][0]["plate"] == plate,"按照车牌号查询失败"
     def test_searchByGoods(self):
         """进门单列表-查询：商品查询测试"""
         goods = "树番茄"
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,keyword=goods)
-        resListPage = eFBL.listPage(host=self.jmsfHost,attrName="商品",attrValue=goods)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,keyword=goods)
+        resListPage = eFBL.listPage(session=session,host=self.jmsfHost,attrName="商品",attrValue=goods)
         print(resListPage.json())
         assert resListPage.json()["rows"][0]["productName"] == goods,"按照商品查询失败"
+    @unittest.skip
     def test_searchByTollman(self):
         """进门单列表-查询：收费员查询测试"""
         plate = f"川A{random.randint(10000, 99999)}"
         goods = "雪莲果"
         userName = "hd_test"
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods,userName=userName)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,plate=plate,keyword=goods,userName=userName)
         number = cre_res.json()["data"]["number"]
         # 进门单缴费
-        eFBL.do_payOrder(host=self.jmsfHost,attrValue=number,ic=self.ic)
+        eFBL.do_payOrder(session=session,host=self.jmsfHost,attrValue=number,ic=self.ic)
         payUser = my.userInfo["data"]["user"]["realName"]
-        resListPage = eFBL.listPage(host=self.jmsfHost,attrName="收费员",attrValue=payUser)
+        resListPage = eFBL.listPage(session=session,host=self.jmsfHost,attrName="收费员",attrValue=payUser)
+        print(resListPage.json())
         numberList = [i["number"] for i in resListPage.json()["rows"]]
         numberStr = ",".join(numberList)
         # 缴费状态验证
@@ -89,15 +93,15 @@ class test_listPage(unittest.TestCase):
     def test_searchByCname(self):
         """进门单列表-查询：客户名称查询测试"""
         ic = self.ic
-        cName = eFBL.get_icCheck(host=self.jmsfHost,ic=ic).json()["data"]["aInfo"]["customerName"]
+        cName = eFBL.get_icCheck(session=session,host=self.jmsfHost,ic=ic).json()["data"]["aInfo"]["customerName"]
         # 创建进门单
         plate = f"川A{random.randint(10000, 99999)}"
         goods = "雪莲果"
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,plate=plate,keyword=goods)
         number = cre_res.json()["data"]["number"]
         # 进门单缴费
-        eFBL.do_payOrder(host=self.jmsfHost,attrValue=number,ic=ic)
-        resListPage = eFBL.listPage(host=self.jmsfHost,attrName="客户姓名",attrValue=cName)
+        eFBL.do_payOrder(session=session,host=self.jmsfHost,attrValue=number,ic=ic)
+        resListPage = eFBL.listPage(session=session,host=self.jmsfHost,attrName="客户姓名",attrValue=cName)
         print(resListPage.json())
         cNameList = list(set([i["customerName"] for i in resListPage.json()["rows"]]))
         print(cNameList)
@@ -112,10 +116,10 @@ class test_listPage(unittest.TestCase):
         # 创建进门单
         plate = f"川A{random.randint(10000, 99999)}"
         goods = "雪莲果"
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,plate=plate,keyword=goods)
         number = cre_res.json()["data"]["number"]
-        eFBL.do_payOrder(host=self.jmsfHost,attrValue=number,ic=ic)
-        resListPage = eFBL.listPage(host=self.jmsfHost,attrName="客户卡号",attrValue=ic)
+        eFBL.do_payOrder(session=session,host=self.jmsfHost,attrValue=number,ic=ic)
+        resListPage = eFBL.listPage(session=session,host=self.jmsfHost,attrName="客户卡号",attrValue=ic)
         print(resListPage.json())
         icList = list(set([i["ic"] for i in resListPage.json()["rows"]]))
         print(icList)
@@ -127,15 +131,15 @@ class test_listPage(unittest.TestCase):
     def test_searchByPhone(self):
         """进门单列表-查询：手机号码询测试"""
         ic = self.ic
-        cPhone = eFBL.get_icCheck(host=self.jmsfHost,ic=ic).json()["data"]["aInfo"]["customerContactsPhone"]
+        cPhone = eFBL.get_icCheck(session=session,host=self.jmsfHost,ic=ic).json()["data"]["aInfo"]["customerContactsPhone"]
         # 创建进门单并缴费
         plate = f"川A{random.randint(10000, 99999)}"
         goods = "雪莲果"
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,plate=plate,keyword=goods)
         number = cre_res.json()["data"]["number"]
-        eFBL.do_payOrder(host=self.jmsfHost,attrValue=number,ic=ic)
+        eFBL.do_payOrder(session=session,host=self.jmsfHost,attrValue=number,ic=ic)
         # 查询进门单
-        resListPage = eFBL.listPage(host=self.jmsfHost,attrName="手机号码",attrValue=cPhone)
+        resListPage = eFBL.listPage(session=session,host=self.jmsfHost,attrName="手机号码",attrValue=cPhone)
         numberList = [i["number"] for i in resListPage.json()["rows"]]
         numberStr = ",".join(numberList)
         cPhoneFromDb = CoDB.mysql_selectAll(f'SELECT customer_phone FROM entrance_fee_bill WHERE number in ({numberStr});')
@@ -20,6 +20,8 @@ from commons.api.entranceFeeBillList import operationDoUndo as oDU
 from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL
 from commons.api.entranceFeeBillList import operationDoUpdate as oDUp
 import time,random
+from commons.MySession import sessionHeb
+session = sessionHeb
 class test_listPage(unittest.TestCase):
     """哈尔滨市场-进门单列表：attr进门单属性查询测试"""
@@ -34,13 +36,13 @@ class test_listPage(unittest.TestCase):
     def setUpClass(cls) -> None:
         cls.gatewayHost = rC.returnOptionsItems("host", "gatewayHost")
         cls.jmsfHost = rC.returnOptionsItems("host", "jmsfHost")
-        cls.ic = rC.returnOptionsItems("testInfo", "cardNumRe")
-        carTypeList = gLL.get_LookupList(host=cls.jmsfHost,providerName="车型").json()[1:]
-        categoryList = gLL.get_LookupList(host=cls.jmsfHost, providerName="货物品类").json()[1:]
-        authDepartmentList = zcA.get_dep(cls.gatewayHost).json()["data"]
-        entranceFeeBillTypeList = gLL.get_LookupList(host=cls.jmsfHost, providerName="称重类型").json()[1:]
-        entranceFeeBillStateList = gLL.get_LookupList(host=cls.jmsfHost, providerName="状态").json()[1:]
-        tradeTypeList = gLL.get_LookupList(host=cls.jmsfHost, providerName="交易类型").json()[1:]
+        cls.ic = rC.returnOptionsItems("testInfo", "hd_cardNumRe_01")
+        carTypeList = gLL.get_LookupList(session=session,host=cls.jmsfHost,providerName="车型").json()[1:]
+        categoryList = gLL.get_LookupList(session=session,host=cls.jmsfHost, providerName="货物品类").json()[1:]
+        authDepartmentList = zcA.get_dep(session=session,host=cls.gatewayHost).json()["data"]
+        entranceFeeBillTypeList = gLL.get_LookupList(session=session,host=cls.jmsfHost, providerName="称重类型").json()[1:]
+        entranceFeeBillStateList = gLL.get_LookupList(session=session,host=cls.jmsfHost, providerName="状态").json()[1:]
+        tradeTypeList = gLL.get_LookupList(session=session,host=cls.jmsfHost, providerName="交易类型").json()[1:]
         cls.carType = random.sample(carTypeList, 1)[0]
         cls.category = random.sample(categoryList, 1)[0]
         cls.authDepartment = random.sample(authDepartmentList, 1)[0]
@@ -55,9 +57,9 @@ class test_listPage(unittest.TestCase):
     def test_searchByCardTepy(self):
         """进门单列表-查询：车型查询测试"""
         print(self.carType)
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,carTypeName=self.carType["text"])
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,carTypeName=self.carType["text"])
         number = cre_res.json()["data"]["number"]
-        resListPage = eFBL.listPage(host=self.jmsfHost,carTypeId=self.carType["value"])
+        resListPage = eFBL.listPage(session=session,host=self.jmsfHost,carTypeId=self.carType["value"])
         print(resListPage.json())
         carTypeList=list(set([i["carTypeName"] for i in resListPage.json()["rows"]]))
         assert resListPage.json()["rows"][0]["number"] == number,"车型查询失败查询失败"
@@ -68,22 +70,22 @@ class test_listPage(unittest.TestCase):
         """进门单列表-查询：货物品类查询测试"""
         goods="雪莲果"
         categoryName = "水果"
-        res = gLL.get_LookupList(self.jmsfHost,providerName="货物品类")
+        res = gLL.get_LookupList(session=session,host=self.jmsfHost,providerName="货物品类")
         categoryId = [i["value"] for i in res.json() if i["text"]==categoryName]
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,keyword=goods)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,keyword=goods)
         number = cre_res.json()["data"]["number"]
-        resListPage = eFBL.listPage(host=self.jmsfHost,categoryId=categoryId)
+        resListPage = eFBL.listPage(session=session,host=self.jmsfHost,categoryId=categoryId)
         print(resListPage.json())
         assert resListPage.json()["rows"][0]["number"] == number,"货物品类查询失败"
     def test_searchByProductName(self):
         """进门单列表-查询：商品查询测试"""
         productName = "水生蔬菜"
-        productId = gLL.get_product(self.jmsfHost,productName=productName).json()["data"][0]["id"]
+        productId = gLL.get_product(session=session,host=self.jmsfHost,productName=productName).json()["data"][0]["id"]
         print(productId)
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,keyword=productName)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,keyword=productName)
         number = cre_res.json()["data"]["number"]
-        resListPage = eFBL.listPage(host=self.jmsfHost,productName=productName,productId=productId)
+        resListPage = eFBL.listPage(session=session,host=self.jmsfHost,productName=productName,productId=productId)
         print(resListPage.json())
         productNameList=list(set([i["productName"] for i in resListPage.json()["rows"]]))
         assert resListPage.json()["rows"][0]["number"] == number,"商品查询测试失败"
@@ -94,9 +96,9 @@ class test_listPage(unittest.TestCase):
         """进门单列表-查询：部门查询查询测试"""
         print(self.authDepartment)
         print(self.authDepartment["name"])
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,depName=self.authDepartment["name"])
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,depName=self.authDepartment["name"])
         number = cre_res.json()["data"]["number"]
-        resListPage = eFBL.listPage(host=self.jmsfHost,dep=self.authDepartment["id"])
+        resListPage = eFBL.listPage(session=session,host=self.jmsfHost,dep=self.authDepartment["id"])
         # print(resListPage.json())
         depNameList=list(set([i["depName"] for i in resListPage.json()["rows"]]))
         assert resListPage.json()["rows"][0]["number"] == number,"部门查询查询测试失败"
@@ -107,18 +109,18 @@ class test_listPage(unittest.TestCase):
         """进门单列表-查询：部门查询查询测试"""
         depName = "哈达测试部"
         goods = "水生蔬菜"
-        res = gLL.get_LookupList(self.jmsfHost,providerName="接车部门")
+        res = gLL.get_LookupList(session=session,host=self.jmsfHost,providerName="接车部门")
         dep = [i["value"] for i in res.json() if i["text"] == depName]
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,depName=depName,keyword=goods)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,depName=depName,keyword=goods)
         number = cre_res.json()["data"]["number"]
         print(number)
         orderId = cre_res.json()["data"]["id"]
-        oDUp.do_updateOrder(host=self.jmsfHost,attrValue=number)
-        res = eFBL.get_orderView(host=self.jmsfHost,orderId=orderId)
+        oDUp.do_updateOrder(session=session,host=self.jmsfHost,attrValue=number)
+        res = eFBL.get_orderView(session=session,host=self.jmsfHost,orderId=orderId)
         # bs取值
         orderDetailsList = BeautifulSoup(res.text, "html.parser").findAll("input")
         orderDetailsDict = {i.get("name"): i.get("value") for i in orderDetailsList}
-        resListPage = eFBL.listPage(host=self.jmsfHost,dep=dep,regionId=orderDetailsDict["regionId"])
+        resListPage = eFBL.listPage(session=session,host=self.jmsfHost,dep=dep,regionId=orderDetailsDict["regionId"])
         depNameList=list(set([i["depName"] for i in resListPage.json()["rows"]]))
         print(depNameList)
         assert resListPage.json()["rows"][0]["number"] == number,"部门查询查询测试失败"
@@ -127,7 +129,7 @@ class test_listPage(unittest.TestCase):
     def test_searchByBillType(self):
         """进门单列表-查询：称重类型查询测试"""
-        resListPage = eFBL.listPage(host=self.jmsfHost,type="1")
+        resListPage = eFBL.listPage(session=session,host=self.jmsfHost,type="1")
         print(resListPage.json())
         resList=list(set([i["type"] for i in resListPage.json()["rows"]]))
         assert len(resList) == 1,"称重类型查询测试失败"
@@ -136,9 +138,9 @@ class test_listPage(unittest.TestCase):
     def test_searchByStatus(self):
         """进门单列表-查询：交易状态查询测试"""
         status = "4"
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,carTypeName=self.carType["text"])
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,carTypeName=self.carType["text"])
         number = cre_res.json()["data"]["number"]
-        resListPage = eFBL.listPage(host=self.jmsfHost,status=status)
+        resListPage = eFBL.listPage(session=session,host=self.jmsfHost,status=status)
         print(resListPage.json())
         statusList=list(set([i["status"] for i in resListPage.json()["rows"]]))
         assert resListPage.json()["rows"][0]["number"] != number,"交易状态查询测试失败"
@@ -149,9 +151,9 @@ class test_listPage(unittest.TestCase):
     def test_searchByTradeType(self):
         """进门单列表-查询：交易类型查询测试"""
         print(self.tradeType)
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,transactionName=self.tradeType["text"])
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,transactionName=self.tradeType["text"])
         number = cre_res.json()["data"]["number"]
-        resListPage = eFBL.listPage(host=self.jmsfHost,tradeTypeId=self.tradeType["value"])
+        resListPage = eFBL.listPage(session=session,host=self.jmsfHost,tradeTypeId=self.tradeType["value"])
         print(resListPage.json())
         carTypeList=list(set([i["tradeTypeName"] for i in resListPage.json()["rows"]]))
         assert resListPage.json()["rows"][0]["number"] == number,"交易类型查询测试失败"
@@ -163,11 +165,11 @@ class test_listPage(unittest.TestCase):
         ic = self.ic
         plate = f"川A{random.randint(10000, 99999)}"
         goods = "雪莲果"
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,plate=plate,keyword=goods)
         number = cre_res.json()["data"]["number"]
-        eFBL.do_payOrder(host=self.jmsfHost,attrValue=number,ic=ic)
-        createdTime = eFBL.listPage(host=self.jmsfHost,attrValue=number).json()["rows"][0]["created"]
-        resListPage = eFBL.listPage(host=self.jmsfHost,startTime=createdTime,endTime=createdTime)
+        eFBL.do_payOrder(session=session,host=self.jmsfHost,attrValue=number,ic=ic)
+        createdTime = eFBL.listPage(session=session,host=self.jmsfHost,attrValue=number).json()["rows"][0]["created"]
+        resListPage = eFBL.listPage(session=session,host=self.jmsfHost,startTime=createdTime,endTime=createdTime)
         print(resListPage.json())
         createdTimeList = list(set([i["created"] for i in resListPage.json()["rows"]]))
         assert len(createdTimeList) == 1,"进场时间查询测试失败"
@@ -178,11 +180,11 @@ class test_listPage(unittest.TestCase):
         ic = self.ic
         plate = f"川A{random.randint(10000, 99999)}"
         goods = "雪莲果"
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,plate=plate,keyword=goods)
         number = cre_res.json()["data"]["number"]
-        eFBL.do_payOrder(host=self.jmsfHost,attrValue=number,ic=ic)
-        createdTime = eFBL.listPage(host=self.jmsfHost,attrValue=number).json()["rows"][0]["paymentTime"]
-        resListPage = eFBL.listPage(host=self.jmsfHost,startPayTime=createdTime,endPayTime=createdTime)
+        eFBL.do_payOrder(session=session,host=self.jmsfHost,attrValue=number,ic=ic)
+        createdTime = eFBL.listPage(session=session,host=self.jmsfHost,attrValue=number).json()["rows"][0]["paymentTime"]
+        resListPage = eFBL.listPage(session=session,host=self.jmsfHost,startPayTime=createdTime,endPayTime=createdTime)
         print(resListPage.json())
         createdTimeList = list(set([i["paymentTime"] for i in resListPage.json()["rows"]]))
         assert len(createdTimeList) == 1,"缴费时间查询测试失败"
@@ -192,13 +194,13 @@ class test_listPage(unittest.TestCase):
         """进门单列表-操作：退款时间查询"""
         plate = f"川A{random.randint(10000,99999)}"
         goods = "雪莲果"
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,plate=plate,keyword=goods)
         number = cre_res.json()["data"]["number"]
-        res_pay = eFBL.do_payOrder(host=self.jmsfHost,attrValue=number,ic=self.ic)
+        res_pay = eFBL.do_payOrder(session=session,host=self.jmsfHost,attrValue=number,ic=self.ic)
         time.sleep(3)
-        res_undo = oDU.do_undoOrder(host=self.jmsfHost,attrValue=number,ic=self.ic)
+        res_undo = oDU.do_undoOrder(session=session,host=self.jmsfHost,attrValue=number,ic=self.ic)
         refundTime = msa(f'SELECT efbd.operator_time FROM entrance_fee_bill efb JOIN entrance_fee_bill_detail efbd ON efb.id=efbd.bill_id WHERE efb.number="{number}";')[0][0]
-        resListPage = eFBL.listPage(host=self.jmsfHost, startRefundTime=refundTime, endRefundTime=refundTime)
+        resListPage = eFBL.listPage(session=session,host=self.jmsfHost, startRefundTime=refundTime, endRefundTime=refundTime)
         assert resListPage.json()["rows"][0]["number"]==number,"退款时间查询失败"
         refundNumberList = list(set([i["number"] for i in resListPage.json()["rows"]]))
         res_msa = [i[0] for i in msa(f'SELECT efb.number FROM entrance_fee_bill efb JOIN entrance_fee_bill_detail efbd ON efb.id=efbd.bill_id WHERE efbd.operator_time="{refundTime}";')]
@@ -18,6 +18,9 @@ from commons.api.entranceFeeBillList import operationDoFreeze as oDF
 from commons.api import hpApi
 import time,random
+from commons.MySession import sessionSy
+session = sessionSy
+
 class test_HPCreate(unittest.TestCase):
     """沈阳市场-整车-车辆回皮"""
     def setUp(self) -> None:
@@ -31,7 +34,7 @@ class test_HPCreate(unittest.TestCase):
     def setUpClass(cls) -> None:
         cls.gatewayHost = rC.returnOptionsItems("host", "gatewayHost")
         cls.jmsfHost = rC.returnOptionsItems("host", "jmsfHost")
-        cls.ic = rC.returnOptionsItems("testInfo", "cardNumRe")
+        cls.ic = rC.returnOptionsItems("testInfo", "sy_cardNumRe_01")
     @classmethod
     def tearDownClass(cls) -> None:
@@ -41,11 +44,11 @@ class test_HPCreate(unittest.TestCase):
         """整车-车辆回皮：创建回皮进门单"""
         plate = f"川B{random.randint(10000,99999)}"
         goods = "雪莲果"
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,plate=plate,keyword=goods)
         print(cre_res.json())
         number = cre_res.json()["data"]["number"]
-        aa = oDF.do_freezeOrder(host=self.jmsfHost,attrValue=number,ic=self.ic)
-        res,tareWeight = hpApi.do_backSkinWeighSave(host=self.gatewayHost,number=number)
+        aa = oDF.do_freezeOrder(session=session,host=self.jmsfHost,attrValue=number,ic=self.ic)
+        res,tareWeight = hpApi.do_backSkinWeighSave(session=session,host=self.gatewayHost,number=number)
         assert res.json()["code"]=="200","回皮失败"
         assert "data" in res.text,"回皮失败"
@@ -53,11 +56,11 @@ class test_HPCreate(unittest.TestCase):
         """整车-车辆回皮：根据车牌号查询"""
         plate = f"川B{random.randint(10000,99999)}"
         goods="火龙果"
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,plate=plate,keyword=goods)
         print(cre_res.json())
         number = cre_res.json()["data"]["number"]
-        aa = oDF.do_freezeOrder(host=self.jmsfHost,attrValue=number,ic=self.ic)
-        res = hpApi.get_listBackSkinTrucks(host=self.gatewayHost,plate=plate)
+        aa = oDF.do_freezeOrder(session=session,host=self.jmsfHost,attrValue=number,ic=self.ic)
+        res = hpApi.get_listBackSkinTrucks(session=session,host=self.gatewayHost,plate=plate)
         print(res.json())
         assert res.json()["code"]=="200","车号查询失败"
         assert res.json()["data"][-1]["number"]==number,"车号查询失败"
@@ -66,11 +69,11 @@ class test_HPCreate(unittest.TestCase):
         """整车-车辆回皮：根据收费单号查询"""
         plate = f"川B{random.randint(10000,99999)}"
         goods="火龙果"
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,plate=plate,keyword=goods)
         print(cre_res.json())
         number = cre_res.json()["data"]["number"]
-        aa = oDF.do_freezeOrder(host=self.jmsfHost,attrValue=number,ic=self.ic)
-        res = hpApi.get_listBackSkinTrucks(host=self.gatewayHost,number=number)
+        aa = oDF.do_freezeOrder(session=session,host=self.jmsfHost,attrValue=number,ic=self.ic)
+        res = hpApi.get_listBackSkinTrucks(session=session,host=self.gatewayHost,number=number)
         print(res.json())
         assert res.json()["code"]=="200","车号查询失败"
         assert res.json()["data"][-1]["number"]==number,"车号查询失败"
@@ -80,13 +83,13 @@ class test_HPCreate(unittest.TestCase):
         plate = f"川B{random.randint(10000,99999)}"
         goods="雪莲果"
         ic = self.ic
-        customerName= eFBL.get_icCheck(host=self.jmsfHost,ic=ic).json()["data"]["aInfo"]["customerName"]
+        customerName= eFBL.get_icCheck(session=session,host=self.jmsfHost,ic=ic).json()["data"]["aInfo"]["customerName"]
         print(customerName)
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,plate=plate,keyword=goods)
         print(cre_res.json())
         number = cre_res.json()["data"]["number"]
-        aa = oDF.do_freezeOrder(host=self.jmsfHost,attrValue=number,ic=self.ic)
-        res = hpApi.get_listBackSkinTrucks(host=self.gatewayHost,customerName=customerName)
+        aa = oDF.do_freezeOrder(session=session,host=self.jmsfHost,attrValue=number,ic=self.ic)
+        res = hpApi.get_listBackSkinTrucks(session=session,host=self.gatewayHost,customerName=customerName)
         print(res.json())
         assert res.json()["code"]=="200","车号查询失败"
         assert res.json()["data"][-1]["number"]==number,"车号查询失败"
 \ No newline at end of file
@@ -17,6 +17,9 @@ from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL
 from commons.api import sjApi
 import time,random
+from commons.MySession import sessionSy
+session = sessionSy
+
 class test_ZCCreate(unittest.TestCase):
     """沈阳市场-整车-创建整车进门单"""
     def setUp(self) -> None:
@@ -46,7 +49,7 @@ class test_ZCCreate(unittest.TestCase):
         # 获取车型
-        carType = zcA.get_carType(host=self.gatewayHost)
+        carType = zcA.get_carType(session=session,host=self.gatewayHost)
         print(carType.text)
         print(carType.json()["data"][0])
         carTypeCode = carType.json()["data"][0]["code"]
@@ -54,51 +57,51 @@ class test_ZCCreate(unittest.TestCase):
         carTypeName = carType.json()["data"][0]["carTypeName"]
         # 获取商品
-        categoryByCondition = zcA.get_listCategoryByCondition(host=self.gatewayHost)
+        categoryByCondition = zcA.get_listCategoryByCondition(session=session,host=self.gatewayHost)
         print(categoryByCondition.json())
         cateId = categoryByCondition.json()["data"][0]["id"]
         productId = categoryByCondition.json()["data"][0]["id"]
         productName = categoryByCondition.json()["data"][0]["name"]
         # 获取接车员
-        listByExample = zcA.get_listByExample(host=self.gatewayHost)
+        listByExample = zcA.get_listByExample(session=session,host=self.gatewayHost)
         print(listByExample.json())
         inGreeterId = listByExample.json()["data"][0]["id"]
         inGreeterName = listByExample.json()["data"][0]["realName"]
         # 获取交易类型
-        transactionType = zcA.query_transactionType(host=self.gatewayHost)
+        transactionType = zcA.query_transactionType(session=session,host=self.gatewayHost)
         print(transactionType.json())
         tradeType = transactionType.json()["rows"][0]["code"]
         tradeTypeId = transactionType.json()["rows"][0]["id"]
         tradeTypeName = transactionType.json()["rows"][0]["name"]
         # 获取货物标签
-        goodsTag = zcA.get_goodsTag(host=self.gatewayHost)
+        goodsTag = zcA.get_goodsTag(session=session,host=self.gatewayHost)
         print(goodsTag.json())
         goodsTagId = goodsTag.json()["data"][0]["id"]
         # 产地信息获取
-        address = zcA.get_address(host=self.gatewayHost)
+        address = zcA.get_address(session=session,host=self.gatewayHost)
         print(address.json())
         originId = address.json()["data"][0]["id"]
         origin = address.json()["data"][0]["name"]
         originCode = address.json()["data"][0]["cityCode"]
         # 查询部门信息
-        depRes = zcA.get_dep(host=self.gatewayHost)
+        depRes = zcA.get_dep(session=session,host=self.gatewayHost)
         print(depRes.json())
         feeDepId = depRes.json()["data"][0]["id"]
         feeDepName = depRes.json()["data"][0]["name"]
         # 获取证明类型
-        proveType = zcA.get_proveType(host=self.gatewayHost)
+        proveType = zcA.get_proveType(session=session,host=self.gatewayHost)
         print(proveType.json())
         proveTypeCode = proveType.json()["data"][0]["id"]
         proveTypeName = proveType.json()["data"][0]["name"]
         # 获取防重token
-        duplicateTokenRes = zcA.get_duplicateToken(host=self.gatewayHost)
+        duplicateTokenRes = zcA.get_duplicateToken(session=session,host=self.gatewayHost)
         print(duplicateTokenRes.json())
         duplicateToken = duplicateTokenRes.json()["data"]
@@ -106,7 +109,7 @@ class test_ZCCreate(unittest.TestCase):
         weight = int(itemWeight) * int(qty)
         # 创建进门单
-        cre_res = sjApi.create_sparePartsWeighSave(host=self.gatewayHost, duplicateToken=duplicateToken,
+        cre_res = sjApi.create_sparePartsWeighSave(session=session,host=self.gatewayHost, duplicateToken=duplicateToken,
                                              carTypeCode=carTypeCode, carTypeId=carTypeId,
                                              carTypeName=carTypeName, plate=plate, weight=weight,
                                              productId=productId, productName=productName, proveTypeCode=proveTypeCode,
@@ -17,10 +17,14 @@ from commons.api.entranceFeeBillList import apiDemo
 import time,random
 from commons.MySession import mysession
-session = mysession()
-session.cliLogin()
+session = mysession().cliLogin()
+
+global mk_sign
+mk_sign = "hb"
 class test_ZCCreate(unittest.TestCase):
+
+
     """沈阳市场-整车-创建整车进门单"""
     def setUp(self) -> None:
         pass
@@ -47,10 +51,13 @@ class test_ZCCreate(unittest.TestCase):
         trailerNumber = plate
         # 获取车型
-        carType = apiDemo.get_carType(session=session,host=self.gatewayHost)
+        carType = apiDemo.get_carType(host=self.gatewayHost)
         print(carType.text)
         print(carType.json()["data"][0])
         # 获取商品
-        categoryByCondition = apiDemo.get_listCategoryByCondition(session=session,host=self.gatewayHost)
-        print(categoryByCondition.json())
 \ No newline at end of file
+        categoryByCondition = apiDemo.get_listCategoryByCondition(host=self.gatewayHost)
+        print(categoryByCondition.json())
+
+print("mk_sign",mk_sign)
+print("apiDemo.mk_sign",apiDemo.mk_sign)
 \ No newline at end of file
@@ -13,9 +13,9 @@ import json
 import unittest
 from commons.scripts.readConf import rC
 from commons.api import zcApi as zcA
-from commons.MySession import my
-from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL
-import time,random
+from commons.basic import getLookupList as gLL
+from commons.MySession import sessionSy
+session = sessionSy
 class test_ZCBasic(unittest.TestCase):
     """沈阳市场-整车-创建整车进门单基础信息接口测试"""
@@ -38,7 +38,7 @@ class test_ZCBasic(unittest.TestCase):
     def test_getCar(self):
         """整车-整车创建:获取车型接口调用测试"""
         # 获取车型
-        carType = zcA.get_carType(host=self.gatewayHost)
+        carType = zcA.get_carType(session=session,host=self.gatewayHost)
         print(carType.text)
         assert carType.json()["code"] == "200"
         assert carType.json()["data"] != []
@@ -46,9 +46,9 @@ class test_ZCBasic(unittest.TestCase):
     def test_getAllCategory(self):
         """整车-整车创建:获取测试商品信息测试"""
         # 获取
-        # print(my.userInfo["data"]["user"]["firmCode"])
-        marketId = my.userInfo["data"]["user"]["firmId"]
-        resCategory = zcA.get_listCategoryByCondition(host=self.gatewayHost,marketId=marketId,keyword="")
+        # print(session.userInfo["data"]["user"]["firmCode"])
+        marketId = session.userInfo["data"]["user"]["firmId"]
+        resCategory = zcA.get_listCategoryByCondition(session=session,host=self.gatewayHost,marketId=marketId,keyword="")
         print(resCategory.text)
         assert resCategory.json()["code"] == "200","全商品查询失败"
         assert resCategory.json()["data"] != [],"全商品查询失败，查询结果不应该为空"
@@ -56,8 +56,8 @@ class test_ZCBasic(unittest.TestCase):
     def test_getOneCategory(self):
         """整车-整车创建:获取测试商品信息测试"""
         # 获取
-        marketId = my.userInfo["data"]["user"]["firmId"]
-        resCategory = zcA.get_listCategoryByCondition(host=self.gatewayHost,marketId=marketId,keyword="火龙果")
+        marketId = session.userInfo["data"]["user"]["firmId"]
+        resCategory = zcA.get_listCategoryByCondition(session=session,host=self.gatewayHost,marketId=marketId,keyword="火龙果")
         print(resCategory.text)
         nameList = [i["name"] for i in resCategory.json()["data"]]
         assert resCategory.json()["code"] == "200"
@@ -66,29 +66,29 @@ class test_ZCBasic(unittest.TestCase):
     def test_getAllExample(self):
         """整车-整车创建:接车员信息获取测试"""
-        # print(my.userInfo["data"]["user"]["departmentId"])
-        firmCode = my.userInfo["data"]["user"]["firmCode"]
-        departmentId = my.userInfo["data"]["user"]["departmentId"]
-        listByExample = zcA.get_listByExample(host=self.gatewayHost,firmCode=firmCode,departmentId=departmentId)
+        # print(session.userInfo["data"]["user"]["departmentId"])
+        firmCode = session.userInfo["data"]["user"]["firmCode"]
+        departmentId = session.userInfo["data"]["user"]["departmentId"]
+        listByExample = zcA.get_listByExample(session=session,host=self.gatewayHost,firmCode=firmCode,departmentId=departmentId)
         print(listByExample.json())
         assert listByExample.json()["code"]=="200","接车员信息获取测试失败"
         assert listByExample.json()["data"]!=[],"接车员信息获取测试失败"
     def test_getOneExample(self):
         """整车-整车创建:按接车员名称信息查询接车员"""
-        # print(my.userInfo["data"]["user"]["departmentId"])
-        # firmCode = my.userInfo["data"]["user"]["firmCode"]
-        # departmentId = my.userInfo["data"]["user"]["departmentId"]
+        # print(session.userInfo["data"]["user"]["departmentId"])
+        # firmCode = session.userInfo["data"]["user"]["firmCode"]
+        # departmentId = session.userInfo["data"]["user"]["departmentId"]
-        firmCode = my.userInfo["data"]["user"]["firmCode"]
-        firmId = my.userInfo["data"]["user"]["firmId"]
+        firmCode = session.userInfo["data"]["user"]["firmCode"]
+        firmId = session.userInfo["data"]["user"]["firmId"]
         try:
-            res_config = gLL.get_config(host=host, marketId=firmId)
+            res_config = gLL.get_config(session=session,host=self.gatewayHost, marketId=firmId)
             departmentId = [i["value"] for i in res_config.json()["rows"] if i["name"] == "DepartmentId"][0]
         except:
             departmentId = None
         keyword="测试"
-        listByExample = zcA.get_listByExample(host=self.gatewayHost,firmCode=firmCode,departmentId=departmentId,
+        listByExample = zcA.get_listByExample(session=session,host=self.gatewayHost,firmCode=firmCode,departmentId=departmentId,
                                               keyword=keyword)
         print(listByExample.json())
         assert listByExample.json()["code"]=="200","按接车员名称信息查询接车员测试失败"
@@ -96,14 +96,14 @@ class test_ZCBasic(unittest.TestCase):
     def test_transactionType(self):
         """整车-整车创建:交易类型获取测试"""
-        transactionType = zcA.query_transactionType(host=self.gatewayHost)
+        transactionType = zcA.query_transactionType(session=session,host=self.gatewayHost)
         print(transactionType.json())
         assert transactionType.status_code==200,"交易类型信息获取测试失败"
         assert transactionType.json()["rows"]!=[],"交易类型信息获取测试失败"
     def test_getGoodsTag(self):
         """整车-整车创建:货物标签获取测试"""
-        goodsTag = zcA.get_goodsTag(host=self.gatewayHost)
+        goodsTag = zcA.get_goodsTag(session=session,host=self.gatewayHost)
         print(goodsTag.json())
         assert goodsTag.status_code==200,"货物标签信息获取测试失败"
         assert goodsTag.json()["data"]!=[],"货物标签信息获取测试失败"
@@ -111,7 +111,7 @@ class test_ZCBasic(unittest.TestCase):
     def test_getAllAddress(self):
         """整车-整车创建:按照省份查询产地"""
         province = "四川省"
-        address = zcA.get_address(host=self.gatewayHost,province=province)
+        address = zcA.get_address(session=session,host=self.gatewayHost,province=province)
         print(address.json())
         assert address.json()["code"] == "200","按照省份查询产地信息获取测试失败"
         mergerNameList = [i["mergerName"] for i in address.json()["data"] if province not in i["mergerName"]]
@@ -122,7 +122,7 @@ class test_ZCBasic(unittest.TestCase):
         province = "四川省"
         city = "成都市"
         area = "锦江区"
-        address = zcA.get_address(host=self.gatewayHost,province=province,city=city,area=area)
+        address = zcA.get_address(session=session,host=self.gatewayHost,province=province,city=city,area=area)
         print(address.json())
         assert address.json()["code"]=="200","详细产地信息查询失败"
         assert len(address.json()["data"])==1,"详细产地信息查询只能查询出一个结果，查询结果超过一个测试失败"
@@ -130,7 +130,7 @@ class test_ZCBasic(unittest.TestCase):
     def test_getAllDep(self):
         """整车-整车创建:接车部门信息获取"""
-        depRes = zcA.get_dep(host=self.gatewayHost)
+        depRes = zcA.get_dep(session=session,host=self.gatewayHost)
         print(depRes.json())
         assert depRes.json()["code"]=="200","接车部门信息获取测试失败"
         assert depRes.json()["data"] != [], "接车部门信息获取测试失败"
@@ -139,7 +139,7 @@ class test_ZCBasic(unittest.TestCase):
     def test_getOneDep(self):
         """整车-整车创建:查询指定接车部门信息"""
         keyword="水果部"
-        depRes = zcA.get_dep(host=self.gatewayHost,keyword=keyword)
+        depRes = zcA.get_dep(session=session,host=self.gatewayHost,keyword=keyword)
         print(depRes.json())
         assert depRes.json()["code"]=="200","查询指定接车部门信息获取测试失败"
         assert len(depRes.json()["data"]) == 1, "查询指定接车部门信息获取测试失败"
@@ -147,14 +147,14 @@ class test_ZCBasic(unittest.TestCase):
     def test_getProveType(self):
         """整车-整车创建:证明类型信息获取"""
-        proveType = zcA.get_proveType(host=self.gatewayHost)
+        proveType = zcA.get_proveType(session=session,host=self.gatewayHost)
         print(proveType.json())
         assert proveType.json()["code"]=="200","证明类型信息获取测试失败"
         assert proveType.json()["data"] != [], "证明类型信息获取测试失败"
     def test_getDuplicateToken(self):
         """整车-整车创建:获取防重复token"""
-        duplicateTokenRes = zcA.get_duplicateToken(host=self.gatewayHost)
+        duplicateTokenRes = zcA.get_duplicateToken(session=session,host=self.gatewayHost)
         print(duplicateTokenRes.json())
         assert duplicateTokenRes.json()["code"]=="200","获取防重复token测试失败"
         assert duplicateTokenRes.json()["data"].isalnum(), "获取防重复token测试失败"
@@ -15,6 +15,8 @@ from commons.scripts.readConf import rC
 from commons.api import zcApi as zcA
 from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL
 import time,random
+from commons.MySession import sessionSy
+session = sessionSy
 class test_ZCCreate(unittest.TestCase):
     """沈阳市场-整车-创建整车进门单"""
@@ -43,7 +45,7 @@ class test_ZCCreate(unittest.TestCase):
         trailerNumber = plate
         # 获取车型
-        carType = zcA.get_carType(host=self.gatewayHost)
+        carType = zcA.get_carType(session=session,host=self.gatewayHost)
         print(carType.text)
         print(carType.json()["data"][0])
         carTypeCode = carType.json()["data"][0]["code"]
@@ -52,7 +54,7 @@ class test_ZCCreate(unittest.TestCase):
         carTypeWeight = carType.json()["data"][0]["weight"]
         # 获取商品
-        categoryByCondition = zcA.get_listCategoryByCondition(host=self.gatewayHost)
+        categoryByCondition = zcA.get_listCategoryByCondition(session=session,host=self.gatewayHost)
         print(categoryByCondition.json())
         cateId = categoryByCondition.json()["data"][0]["id"]
         productId = categoryByCondition.json()["data"][0]["id"]
@@ -60,44 +62,44 @@ class test_ZCCreate(unittest.TestCase):
         productCode = categoryByCondition.json()["data"][0]["keycode"]
         # 获取接车员
-        listByExample = zcA.get_listByExample(host=self.gatewayHost)
+        listByExample = zcA.get_listByExample(session=session,host=self.gatewayHost)
         print(listByExample.json())
         inGreeterId = listByExample.json()["data"][0]["id"]
         inGreeterName = listByExample.json()["data"][0]["realName"]
         # 获取交易类型
-        transactionType = zcA.query_transactionType(host=self.gatewayHost)
+        transactionType = zcA.query_transactionType(session=session,host=self.gatewayHost)
         print(transactionType.json())
         tradeType = transactionType.json()["rows"][0]["code"]
         tradeTypeId = transactionType.json()["rows"][0]["id"]
         tradeTypeName = transactionType.json()["rows"][0]["name"]
         # 获取货物标签
-        goodsTag = zcA.get_goodsTag(host=self.gatewayHost)
+        goodsTag = zcA.get_goodsTag(session=session,host=self.gatewayHost)
         print(goodsTag.json())
         goodsTagId = goodsTag.json()["data"][0]["id"]
         # 产地信息获取
-        address = zcA.get_address(host=self.gatewayHost)
+        address = zcA.get_address(session=session,host=self.gatewayHost)
         print(address.json())
         originId = address.json()["data"][0]["id"]
         origin = address.json()["data"][0]["name"]
         originCode = address.json()["data"][0]["cityCode"]
         # 查询部门信息
-        depRes = zcA.get_dep(host=self.gatewayHost)
+        depRes = zcA.get_dep(session=session,host=self.gatewayHost)
         print(depRes.json())
         feeDepId = depRes.json()["data"][0]["id"]
         feeDepName = depRes.json()["data"][0]["name"]
         # 获取证明类型
-        proveType = zcA.get_proveType(host=self.gatewayHost)
+        proveType = zcA.get_proveType(session=session,host=self.gatewayHost)
         print(proveType.json())
         proveTypeCode = proveType.json()["data"][0]["id"]
         proveTypeName = proveType.json()["data"][0]["name"]
         # 获取防重token
-        duplicateTokenRes = zcA.get_duplicateToken(host=self.gatewayHost)
+        duplicateTokenRes = zcA.get_duplicateToken(session=session,host=self.gatewayHost)
         print(duplicateTokenRes.json())
         duplicateToken = duplicateTokenRes.json()["data"]
@@ -112,7 +114,7 @@ class test_ZCCreate(unittest.TestCase):
         weighmanRecord["grossWeightDate"] = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
         # 创建进门单
-        cre_res = zcA.create_wholeCarWeighSave(host=self.gatewayHost, duplicateToken=duplicateToken,
+        cre_res = zcA.create_wholeCarWeighSave(session=session,host=self.gatewayHost, duplicateToken=duplicateToken,
                                                carTypeCode=carTypeCode, carTypeId=carTypeId,
                                                carTypeName=carTypeName, carTypeWeight=carTypeWeight, plate=plate,
                                                productId=productId, productName=productName,
@@ -24,6 +24,9 @@ from commons.api.entranceFeeBillList import operationDoUpdate as oDUp
 from commons.api.entranceFeeBillList import operationDoFreeze as oDF
 import random
+from commons.MySession import sessionSy
+session = sessionSy
+
 class test_listPage(unittest.TestCase):
     """沈阳市场-进门单列表：进门但操作测试测试"""
     def setUp(self) -> None:
@@ -36,7 +39,7 @@ class test_listPage(unittest.TestCase):
     def setUpClass(cls) -> None:
         cls.gatewayHost = rC.returnOptionsItems("host", "gatewayHost")
         cls.jmsfHost = rC.returnOptionsItems("host", "jmsfHost")
-        cls.ic = rC.returnOptionsItems("testInfo", "cardNumRe")
+        cls.ic = rC.returnOptionsItems("testInfo", "sy_cardNumRe_01")
     @classmethod
     def tearDownClass(cls) -> None:
@@ -44,20 +47,20 @@ class test_listPage(unittest.TestCase):
     def test_viewOrder(self):
         """进门单列表-操作：查看进门单详情测试"""
-        res = zcA.create_jmsf(host=self.gatewayHost)
+        res = zcA.create_jmsf(session=session,host=self.gatewayHost)
         orderId = res.json()["data"]["id"]
         number = res.json()["data"]["number"]
-        res = eFBL.get_orderView(host=self.jmsfHost,orderId=orderId)
+        res = eFBL.get_orderView(session=session,host=self.jmsfHost,orderId=orderId)
         assert str(number) in res.text,"获取订单详情查询失败"
     def test_doPayZC(self):
         """进门单列表-操作：整车进门交费测试"""
         plate = f"川A{random.randint(10000,99999)}"
         goods = "雪莲果"
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,plate=plate,keyword=goods)
         print(cre_res.json())
         number = cre_res.json()["data"]["number"]
-        res_pay = eFBL.do_payOrder(host=self.jmsfHost,attrValue=number,ic=self.ic)
+        res_pay = eFBL.do_payOrder(session=session,host=self.jmsfHost,attrValue=number,ic=self.ic)
         assert res_pay.json()["code"]=="200","缴费失败"
         assert res_pay.json()["message"] == "OK", "缴费失败"
@@ -65,11 +68,11 @@ class test_listPage(unittest.TestCase):
         """进门单列表-操作：修改进门单测试"""
         plate = f"川A{random.randint(10000,99999)}"
         goods = "雪莲果"
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,plate=plate,keyword=goods)
         print(cre_res.json())
         number = cre_res.json()["data"]["number"]
         print(number)
-        res_pay = oDUp.do_updateOrder(host=self.jmsfHost,attrValue=number)
+        res_pay = oDUp.do_updateOrder(session=session,host=self.jmsfHost,attrValue=number)
         assert res_pay.json()["success"]==True,"修改进门单失败"
         assert res_pay.json()["message"] == "修改保存成功", "修改进门单失败"
@@ -77,10 +80,10 @@ class test_listPage(unittest.TestCase):
         """进门单列表-操作：散件进门交费测试"""
         plate = f"川A{random.randint(10000,99999)}"
         goods = "雪莲果"
-        cre_res = sjApi.create_sj(host=self.gatewayHost,plate=plate,keyword=goods)
+        cre_res = sjApi.create_sj(session=session,host=self.gatewayHost,plate=plate,keyword=goods)
         print(cre_res.json())
         number = cre_res.json()["data"]["number"]
-        res_pay = eFBL.do_payOrder(host=self.jmsfHost,attrValue=number,ic=self.ic)
+        res_pay = eFBL.do_payOrder(session=session,host=self.jmsfHost,attrValue=number,ic=self.ic)
         assert res_pay.json()["code"]=="200","缴费失败"
         assert res_pay.json()["message"] == "OK", "缴费失败"
@@ -88,16 +91,16 @@ class test_listPage(unittest.TestCase):
         """进门单列表-操作：散件进门交费测试"""
         plate = f"川A{random.randint(10000,99999)}"
         goods = "雪莲果"
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,plate=plate,keyword=goods)
         print(cre_res.json())
         number = cre_res.json()["data"]["number"]
-        res_pay = oDF.do_freezeOrder(host=self.jmsfHost,attrValue=number,ic=self.ic)
+        res_pay = oDF.do_freezeOrder(session=session,host=self.jmsfHost,attrValue=number,ic=self.ic)
         assert res_pay.json()["code"]=="200","缴费失败"
         assert res_pay.json()["message"] == "OK", "缴费失败"
-        res,tareWeight = hpApi.do_backSkinWeighSave(host=self.gatewayHost,number=number)
+        res,tareWeight = hpApi.do_backSkinWeighSave(session=session,host=self.gatewayHost,number=number)
         assert res.json()["code"]=="200","回皮失败"
         assert "data" in res.text,"回皮失败"
-        resListPage = eFBL.listPage(host=self.jmsfHost,attrValue=number)
+        resListPage = eFBL.listPage(session=session,host=self.jmsfHost,attrValue=number)
         print(resListPage.json())
         assert resListPage.json()["rows"][0]["number"] == number,"按照收费单号查询失败"
         assert resListPage.json()["rows"][0]["tareWeight"] == tareWeight,"按照收费单号查询失败"
@@ -107,10 +110,10 @@ class test_listPage(unittest.TestCase):
         """进门单列表-操作：整车进门冻结测试"""
         plate = f"川A{random.randint(10000,99999)}"
         goods = "雪莲果"
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,plate=plate,keyword=goods)
         print(cre_res.json())
         number = cre_res.json()["data"]["number"]
-        res_pay = oDF.do_freezeOrder(host=self.jmsfHost,attrValue=number,ic=self.ic)
+        res_pay = oDF.do_freezeOrder(session=session,host=self.jmsfHost,attrValue=number,ic=self.ic)
         assert res_pay.json()["code"]=="200","冻结失败"
         assert res_pay.json()["message"] == "OK", "冻结失败"
@@ -118,34 +121,34 @@ class test_listPage(unittest.TestCase):
         """进门单列表-操作：整车进门解冻测试"""
         plate = f"川A{random.randint(10000,99999)}"
         goods = "雪莲果"
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,plate=plate,keyword=goods)
         print(cre_res.json())
         number = cre_res.json()["data"]["number"]
-        oDF.do_freezeOrder(host=self.jmsfHost,attrValue=number,ic=self.ic)
-        res_unfreezeOrder = eOp.do_unfreezeOrder(host=self.jmsfHost,attrValue=number)
+        oDF.do_freezeOrder(session=session,host=self.jmsfHost,attrValue=number,ic=self.ic)
+        res_unfreezeOrder = eOp.do_unfreezeOrder(session=session,host=self.jmsfHost,attrValue=number)
         assert res_unfreezeOrder.json()["code"]=="200","解冻失败"
         assert res_unfreezeOrder.json()["message"] == "OK", "解冻失败"
     def test_invalidOrder(self):
         """进门单列表-操作：整车进门作废测试"""
         plate = f"川A{random.randint(10000,99999)}"
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,plate=plate)
         print(cre_res.json())
         number = cre_res.json()["data"]["number"]
-        res_unfreezeOrder = oDI.do_invalidOrder(host=self.jmsfHost,attrValue=number)
+        res_unfreezeOrder = oDI.do_invalidOrder(session=session,host=self.jmsfHost,attrValue=number)
         assert res_unfreezeOrder.json()["number"]==number,"作废测试失败"
         assert res_unfreezeOrder.json()["message"] == "作废成功!", "作废测试失败"
     def test_correctOrder(self):
         """进门单列表-操作：整车进门更正测试"""
         plate = f"川A{random.randint(10000,99999)}"
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,plate=plate)
         print(cre_res.json())
         number = cre_res.json()["data"]["number"]
-        res_unfreezeOrder,totalAmount = oDC.do_correctOrder(host=self.jmsfHost,attrValue=number)
+        res_unfreezeOrder,totalAmount = oDC.do_correctOrder(session=session,host=self.jmsfHost,attrValue=number)
         assert res_unfreezeOrder.json()["success"]==True,"更正测试失败"
         assert res_unfreezeOrder.json()["msg"] == "操作成功", "更正测试失败"
-        resListPage = eFBL.listPage(host=self.jmsfHost,attrValue=number)
+        resListPage = eFBL.listPage(session=session,host=self.jmsfHost,attrValue=number)
         print(resListPage.json())
         assert resListPage.json()["rows"][0]["number"] == number,"按照收费单号查询失败"
         assert resListPage.json()["rows"][0]["$_totalPrice"] == totalAmount,"更正后订单界错误与预期金额不一致"
@@ -153,10 +156,10 @@ class test_listPage(unittest.TestCase):
     def test_amendOrder(self):
         """进门单列表-操作：整车进门修正测试"""
         plate = f"川A{random.randint(10000,99999)}"
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,plate=plate)
         print(cre_res.json())
         number = cre_res.json()["data"]["number"]
-        res_unfreezeOrder = oDA.do_amendOrder(host=self.jmsfHost,attrValue=number)
+        res_unfreezeOrder = oDA.do_amendOrder(session=session,host=self.jmsfHost,attrValue=number)
         assert res_unfreezeOrder.json()["success"]==True,"修正操作失败"
         assert res_unfreezeOrder.json()["message"] == "操作成功", "修正操作失败"
@@ -164,9 +167,9 @@ class test_listPage(unittest.TestCase):
         """进门单列表-操作：整车进门退款测试"""
         plate = f"川A{random.randint(10000,99999)}"
         goods = "雪莲果"
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,plate=plate,keyword=goods)
         number = cre_res.json()["data"]["number"]
-        res_pay = eFBL.do_payOrder(host=self.jmsfHost,attrValue=number)
-        res_undo = oDU.do_undoOrder(host=self.jmsfHost,attrValue=number)
+        res_pay = eFBL.do_payOrder(session=session,host=self.jmsfHost,attrValue=number)
+        res_undo = oDU.do_undoOrder(session=session,host=self.jmsfHost,attrValue=number)
         assert res_undo.json()["code"] == "200","退款失败"
         assert res_undo.json()["message"] == "OK","退款失败"
 \ No newline at end of file
@@ -18,6 +18,8 @@ from commons import ConfigDB as CoDB
 from commons.MySession import my
 from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL
 import time,random
+from commons.MySession import sessionSy
+session = sessionSy
 class test_listPage(unittest.TestCase):
     """沈阳市场-进门单列表：attr进门单属性查询测试"""
@@ -32,7 +34,7 @@ class test_listPage(unittest.TestCase):
     def setUpClass(cls) -> None:
         cls.gatewayHost = rC.returnOptionsItems("host", "gatewayHost")
         cls.jmsfHost = rC.returnOptionsItems("host", "jmsfHost")
-        cls.ic = rC.returnOptionsItems("testInfo", "cardNumRe")
+        cls.ic = rC.returnOptionsItems("testInfo", "sy_cardNumRe_01")
     @classmethod
     def tearDownClass(cls) -> None:
@@ -42,9 +44,9 @@ class test_listPage(unittest.TestCase):
         """进门单列表-查询：收费单号查询测试"""
         plate = f"川A{random.randint(10000, 99999)}"
         goods = "雪莲果"
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,plate=plate,keyword=goods)
         number = cre_res.json()["data"]["number"]
-        resListPage = eFBL.listPage(host=self.jmsfHost,attrValue=number)
+        resListPage = eFBL.listPage(session=session,host=self.jmsfHost,attrValue=number)
         print(resListPage.json())
         assert resListPage.json()["rows"][0]["number"] == number,"按照收费单号查询失败"
         assert len(resListPage.json()["rows"]) == 1,"按照收费单号查询失败"
@@ -53,16 +55,16 @@ class test_listPage(unittest.TestCase):
         """进门单列表-查询：车牌号查询测试"""
         plate = f"川A{random.randint(10000, 99999)}"
         goods = "雪莲果"
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
-        resListPage = eFBL.listPage(host=self.jmsfHost,attrName="车号",attrValue=plate)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,plate=plate,keyword=goods)
+        resListPage = eFBL.listPage(session=session,host=self.jmsfHost,attrName="车号",attrValue=plate)
         print(resListPage.json())
         assert resListPage.json()["rows"][0]["plate"] == plate,"按照车牌号查询失败"
     def test_searchByGoods(self):
         """进门单列表-查询：商品查询测试"""
         goods = "圣女果"
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,keyword=goods)
-        resListPage = eFBL.listPage(host=self.jmsfHost,attrName="商品",attrValue=goods)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,keyword=goods)
+        resListPage = eFBL.listPage(session=session,host=self.jmsfHost,attrName="商品",attrValue=goods)
         print(resListPage.json())
         assert resListPage.json()["rows"][0]["productName"] == goods,"按照商品查询失败"
@@ -71,12 +73,12 @@ class test_listPage(unittest.TestCase):
         plate = f"川A{random.randint(10000, 99999)}"
         goods = "雪莲果"
         userName = "ty_test"
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods,userName=userName)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,plate=plate,keyword=goods,userName=userName)
         number = cre_res.json()["data"]["number"]
         # 进门单缴费
-        eFBL.do_payOrder(host=self.jmsfHost,attrValue=number)
-        payUser = my.userInfo["data"]["user"]["realName"]
-        resListPage = eFBL.listPage(host=self.jmsfHost,attrName="收费员",attrValue=payUser)
+        eFBL.do_payOrder(session=session,host=self.jmsfHost,attrValue=number)
+        payUser = session.userInfo["data"]["user"]["realName"]
+        resListPage = eFBL.listPage(session=session,host=self.jmsfHost,attrName="收费员",attrValue=payUser)
         numberList = [i["number"] for i in resListPage.json()["rows"]]
         numberStr = ",".join(numberList)
         # 缴费状态验证
@@ -89,15 +91,15 @@ class test_listPage(unittest.TestCase):
     def test_searchByCname(self):
         """进门单列表-查询：客户名称查询测试"""
         ic = self.ic
-        cName = eFBL.get_icCheck(host=self.jmsfHost,ic=ic).json()["data"]["aInfo"]["customerName"]
+        cName = eFBL.get_icCheck(session=session,host=self.jmsfHost,ic=ic).json()["data"]["aInfo"]["customerName"]
         # 创建进门单
         plate = f"川A{random.randint(10000, 99999)}"
         goods = "雪莲果"
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,plate=plate,keyword=goods)
         number = cre_res.json()["data"]["number"]
         # 进门单缴费
-        eFBL.do_payOrder(host=self.jmsfHost,attrValue=number,ic=ic)
-        resListPage = eFBL.listPage(host=self.jmsfHost,attrName="客户姓名",attrValue=cName)
+        eFBL.do_payOrder(session=session,host=self.jmsfHost,attrValue=number,ic=ic)
+        resListPage = eFBL.listPage(session=session,host=self.jmsfHost,attrName="客户姓名",attrValue=cName)
         print(resListPage.json())
         cNameList = list(set([i["customerName"] for i in resListPage.json()["rows"]]))
         print(cNameList)
@@ -112,10 +114,10 @@ class test_listPage(unittest.TestCase):
         # 创建进门单
         plate = f"川A{random.randint(10000, 99999)}"
         goods = "雪莲果"
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,plate=plate,keyword=goods)
         number = cre_res.json()["data"]["number"]
-        eFBL.do_payOrder(host=self.jmsfHost,attrValue=number,ic=ic)
-        resListPage = eFBL.listPage(host=self.jmsfHost,attrName="客户卡号",attrValue=ic)
+        eFBL.do_payOrder(session=session,host=self.jmsfHost,attrValue=number,ic=ic)
+        resListPage = eFBL.listPage(session=session,host=self.jmsfHost,attrName="客户卡号",attrValue=ic)
         print(resListPage.json())
         icList = list(set([i["ic"] for i in resListPage.json()["rows"]]))
         print(icList)
@@ -127,15 +129,15 @@ class test_listPage(unittest.TestCase):
     def test_searchByPhone(self):
         """进门单列表-查询：手机号码询测试"""
         ic = self.ic
-        cPhone = eFBL.get_icCheck(host=self.jmsfHost,ic=ic).json()["data"]["aInfo"]["customerContactsPhone"]
+        cPhone = eFBL.get_icCheck(session=session,host=self.jmsfHost,ic=ic).json()["data"]["aInfo"]["customerContactsPhone"]
         # 创建进门单并缴费
         plate = f"川A{random.randint(10000, 99999)}"
         goods = "雪莲果"
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,plate=plate,keyword=goods)
         number = cre_res.json()["data"]["number"]
-        eFBL.do_payOrder(host=self.jmsfHost,attrValue=number,ic=ic)
+        eFBL.do_payOrder(session=session,host=self.jmsfHost,attrValue=number,ic=ic)
         # 查询进门单
-        resListPage = eFBL.listPage(host=self.jmsfHost,attrName="手机号码",attrValue=cPhone)
+        resListPage = eFBL.listPage(session=session,host=self.jmsfHost,attrName="手机号码",attrValue=cPhone)
         numberList = [i["number"] for i in resListPage.json()["rows"]]
         numberStr = ",".join(numberList)
         cPhoneFromDb = CoDB.mysql_selectAll(f'SELECT customer_phone FROM entrance_fee_bill WHERE number in ({numberStr});')
@@ -20,6 +20,8 @@ from commons.api.entranceFeeBillList import operationDoUndo as oDU
 from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL
 from commons.api.entranceFeeBillList import operationDoUpdate as oDUp
 import time,random
+from commons.MySession import sessionSy
+session = sessionSy
 class test_listPage(unittest.TestCase):
     """沈阳市场-进门单列表：attr进门单属性查询测试"""
@@ -34,13 +36,13 @@ class test_listPage(unittest.TestCase):
     def setUpClass(cls) -> None:
         cls.gatewayHost = rC.returnOptionsItems("host", "gatewayHost")
         cls.jmsfHost = rC.returnOptionsItems("host", "jmsfHost")
-        cls.ic = rC.returnOptionsItems("testInfo", "cardNumRe")
-        carTypeList = gLL.get_LookupList(host=cls.jmsfHost,providerName="车型").json()[1:]
-        categoryList = gLL.get_LookupList(host=cls.jmsfHost, providerName="货物品类").json()[1:]
-        authDepartmentList = zcA.get_dep(cls.gatewayHost).json()["data"]
-        entranceFeeBillTypeList = gLL.get_LookupList(host=cls.jmsfHost, providerName="称重类型").json()[1:]
-        entranceFeeBillStateList = gLL.get_LookupList(host=cls.jmsfHost, providerName="状态").json()[1:]
-        tradeTypeList = gLL.get_LookupList(host=cls.jmsfHost, providerName="交易类型").json()[1:]
+        cls.ic = rC.returnOptionsItems("testInfo", "sy_cardNumRe_01")
+        carTypeList = gLL.get_LookupList(session=session,host=cls.jmsfHost,providerName="车型").json()[1:]
+        categoryList = gLL.get_LookupList(session=session,host=cls.jmsfHost, providerName="货物品类").json()[1:]
+        authDepartmentList = zcA.get_dep(session=session,host=cls.gatewayHost).json()["data"]
+        entranceFeeBillTypeList = gLL.get_LookupList(session=session,host=cls.jmsfHost, providerName="称重类型").json()[1:]
+        entranceFeeBillStateList = gLL.get_LookupList(session=session,host=cls.jmsfHost, providerName="状态").json()[1:]
+        tradeTypeList = gLL.get_LookupList(session=session,host=cls.jmsfHost, providerName="交易类型").json()[1:]
         cls.carType = random.sample(carTypeList, 1)[0]
         cls.category = random.sample(categoryList, 1)[0]
         cls.authDepartment = random.sample(authDepartmentList, 1)[0]
@@ -55,9 +57,9 @@ class test_listPage(unittest.TestCase):
     def test_searchByCardTepy(self):
         """进门单列表-查询：车型查询测试"""
         print(self.carType)
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,carTypeName=self.carType["text"])
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,carTypeName=self.carType["text"])
         number = cre_res.json()["data"]["number"]
-        resListPage = eFBL.listPage(host=self.jmsfHost,carTypeId=self.carType["value"])
+        resListPage = eFBL.listPage(session=session,host=self.jmsfHost,carTypeId=self.carType["value"])
         print(resListPage.json())
         carTypeList=list(set([i["carTypeName"] for i in resListPage.json()["rows"]]))
         assert resListPage.json()["rows"][0]["number"] == number,"车型查询失败查询失败"
@@ -68,22 +70,22 @@ class test_listPage(unittest.TestCase):
         """进门单列表-查询：货物品类查询测试"""
         goods="雪莲果"
         categoryName = "水果"
-        res = gLL.get_LookupList(self.jmsfHost,providerName="货物品类")
+        res = gLL.get_LookupList(session=session,host=self.jmsfHost,providerName="货物品类")
         categoryId = [i["value"] for i in res.json() if i["text"]==categoryName]
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,keyword=goods)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,keyword=goods)
         number = cre_res.json()["data"]["number"]
-        resListPage = eFBL.listPage(host=self.jmsfHost,categoryId=categoryId)
+        resListPage = eFBL.listPage(session=session,host=self.jmsfHost,categoryId=categoryId)
         print(resListPage.json())
         assert resListPage.json()["rows"][0]["number"] == number,"货物品类查询失败"
     def test_searchByProductName(self):
         """进门单列表-查询：商品查询测试"""
         productName = "蔬菜"
-        productId = gLL.get_product(self.jmsfHost,productName=productName).json()["data"][0]["id"]
+        productId = gLL.get_product(session=session,host=self.jmsfHost,productName=productName).json()["data"][0]["id"]
         print(productId)
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,keyword=productName)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,keyword=productName)
         number = cre_res.json()["data"]["number"]
-        resListPage = eFBL.listPage(host=self.jmsfHost,productName=productName,productId=productId)
+        resListPage = eFBL.listPage(session=session,host=self.jmsfHost,productName=productName,productId=productId)
         print(resListPage.json())
         productNameList=list(set([i["productName"] for i in resListPage.json()["rows"]]))
         assert resListPage.json()["rows"][0]["number"] == number,"商品查询测试失败"
@@ -94,9 +96,9 @@ class test_listPage(unittest.TestCase):
         """进门单列表-查询：部门查询查询测试"""
         print(self.authDepartment)
         print(self.authDepartment["name"])
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,depName=self.authDepartment["name"])
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,depName=self.authDepartment["name"])
         number = cre_res.json()["data"]["number"]
-        resListPage = eFBL.listPage(host=self.jmsfHost,dep=self.authDepartment["id"])
+        resListPage = eFBL.listPage(session=session,host=self.jmsfHost,dep=self.authDepartment["id"])
         # print(resListPage.json())
         depNameList=list(set([i["depName"] for i in resListPage.json()["rows"]]))
         assert resListPage.json()["rows"][0]["number"] == number,"部门查询查询测试失败"
@@ -106,18 +108,18 @@ class test_listPage(unittest.TestCase):
     def test_searchByRegionId(self):
         """进门单列表-查询：部门查询查询测试"""
         depName = "水果部"
-        res = gLL.get_LookupList(self.jmsfHost,providerName="接车部门")
+        res = gLL.get_LookupList(session=session,host=self.jmsfHost,providerName="接车部门")
         dep = [i["value"] for i in res.json() if i["text"] == depName]
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,depName=depName)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,depName=depName)
         number = cre_res.json()["data"]["number"]
         print("number",number)
         orderId = cre_res.json()["data"]["id"]
-        oDUp.do_updateOrder(host=self.jmsfHost,attrValue=number)
-        res = eFBL.get_orderView(host=self.jmsfHost,orderId=orderId)
+        oDUp.do_updateOrder(session=session,host=self.jmsfHost,attrValue=number)
+        res = eFBL.get_orderView(session=session,host=self.jmsfHost,orderId=orderId)
         # bs取值
         orderDetailsList = BeautifulSoup(res.text, "html.parser").findAll("input")
         orderDetailsDict = {i.get("name"): i.get("value") for i in orderDetailsList}
-        resListPage = eFBL.listPage(host=self.jmsfHost,dep=dep,regionId=orderDetailsDict["regionId"])
+        resListPage = eFBL.listPage(session=session,host=self.jmsfHost,dep=dep,regionId=orderDetailsDict["regionId"])
         depNameList=list(set([i["depName"] for i in resListPage.json()["rows"]]))
         assert resListPage.json()["rows"][0]["number"] == number,"部门查询查询测试失败"
         assert len(depNameList) == 1,"部门查询查询测试失败"
@@ -125,7 +127,7 @@ class test_listPage(unittest.TestCase):
     def test_searchByBillType(self):
         """进门单列表-查询：称重类型查询测试"""
-        resListPage = eFBL.listPage(host=self.jmsfHost,type="1")
+        resListPage = eFBL.listPage(session=session,host=self.jmsfHost,type="1")
         print(resListPage.json())
         resList=list(set([i["type"] for i in resListPage.json()["rows"]]))
         assert len(resList) == 1,"称重类型查询测试失败"
@@ -134,9 +136,9 @@ class test_listPage(unittest.TestCase):
     def test_searchByStatus(self):
         """进门单列表-查询：交易状态查询测试"""
         status = "4"
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,carTypeName=self.carType["text"])
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,carTypeName=self.carType["text"])
         number = cre_res.json()["data"]["number"]
-        resListPage = eFBL.listPage(host=self.jmsfHost,status=status)
+        resListPage = eFBL.listPage(session=session,host=self.jmsfHost,status=status)
         print(resListPage.json())
         statusList=list(set([i["status"] for i in resListPage.json()["rows"]]))
         assert resListPage.json()["rows"][0]["number"] != number,"交易状态查询测试失败"
@@ -146,9 +148,9 @@ class test_listPage(unittest.TestCase):
     def test_searchByTradeType(self):
         """进门单列表-查询：交易类型查询测试"""
         print(self.tradeType)
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,transactionName=self.tradeType["text"])
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,transactionName=self.tradeType["text"])
         number = cre_res.json()["data"]["number"]
-        resListPage = eFBL.listPage(host=self.jmsfHost,tradeTypeId=self.tradeType["value"])
+        resListPage = eFBL.listPage(session=session,host=self.jmsfHost,tradeTypeId=self.tradeType["value"])
         print(resListPage.json())
         carTypeList=list(set([i["tradeTypeName"] for i in resListPage.json()["rows"]]))
         assert resListPage.json()["rows"][0]["number"] == number,"交易类型查询测试失败"
@@ -160,11 +162,11 @@ class test_listPage(unittest.TestCase):
         ic = self.ic
         plate = f"川A{random.randint(10000, 99999)}"
         goods = "雪莲果"
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,plate=plate,keyword=goods)
         number = cre_res.json()["data"]["number"]
-        eFBL.do_payOrder(host=self.jmsfHost,attrValue=number,ic=ic)
-        createdTime = eFBL.listPage(host=self.jmsfHost,attrValue=number).json()["rows"][0]["created"]
-        resListPage = eFBL.listPage(host=self.jmsfHost,startTime=createdTime,endTime=createdTime)
+        eFBL.do_payOrder(session=session,host=self.jmsfHost,attrValue=number,ic=ic)
+        createdTime = eFBL.listPage(session=session,host=self.jmsfHost,attrValue=number).json()["rows"][0]["created"]
+        resListPage = eFBL.listPage(session=session,host=self.jmsfHost,startTime=createdTime,endTime=createdTime)
         print(resListPage.json())
         createdTimeList = list(set([i["created"] for i in resListPage.json()["rows"]]))
         assert len(createdTimeList) == 1,"进场时间查询测试失败"
@@ -175,11 +177,11 @@ class test_listPage(unittest.TestCase):
         ic = self.ic
         plate = f"川A{random.randint(10000, 99999)}"
         goods = "雪莲果"
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,plate=plate,keyword=goods)
         number = cre_res.json()["data"]["number"]
-        eFBL.do_payOrder(host=self.jmsfHost,attrValue=number,ic=ic)
-        createdTime = eFBL.listPage(host=self.jmsfHost,attrValue=number).json()["rows"][0]["paymentTime"]
-        resListPage = eFBL.listPage(host=self.jmsfHost,startPayTime=createdTime,endPayTime=createdTime)
+        eFBL.do_payOrder(session=session,host=self.jmsfHost,attrValue=number,ic=ic)
+        createdTime = eFBL.listPage(session=session,host=self.jmsfHost,attrValue=number).json()["rows"][0]["paymentTime"]
+        resListPage = eFBL.listPage(session=session,host=self.jmsfHost,startPayTime=createdTime,endPayTime=createdTime)
         print(resListPage.json())
         createdTimeList = list(set([i["paymentTime"] for i in resListPage.json()["rows"]]))
         assert len(createdTimeList) == 1,"缴费时间查询测试失败"
@@ -189,13 +191,13 @@ class test_listPage(unittest.TestCase):
         """进门单列表-操作：退款时间查询"""
         plate = f"川A{random.randint(10000,99999)}"
         goods = "雪莲果"
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
+        cre_res = zcA.create_jmsf(session=session,host=self.gatewayHost,plate=plate,keyword=goods)
         number = cre_res.json()["data"]["number"]
-        res_pay = eFBL.do_payOrder(host=self.jmsfHost,attrValue=number)
+        res_pay = eFBL.do_payOrder(session=session,host=self.jmsfHost,attrValue=number)
         time.sleep(3)
-        res_undo = oDU.do_undoOrder(host=self.jmsfHost,attrValue=number)
+        res_undo = oDU.do_undoOrder(session=session,host=self.jmsfHost,attrValue=number)
         refundTime = msa(f'SELECT efbd.operator_time FROM entrance_fee_bill efb JOIN entrance_fee_bill_detail efbd ON efb.id=efbd.bill_id WHERE efb.number="{number}";')[0][0]
-        resListPage = eFBL.listPage(host=self.jmsfHost, startRefundTime=refundTime, endRefundTime=refundTime)
+        resListPage = eFBL.listPage(session=session,host=self.jmsfHost, startRefundTime=refundTime, endRefundTime=refundTime)
         assert resListPage.json()["rows"][0]["number"]==number,"退款时间查询失败"
         refundNumberList = list(set([i["number"] for i in resListPage.json()["rows"]]))
         res_msa = [i[0] for i in msa(f'SELECT efb.number FROM entrance_fee_bill efb JOIN entrance_fee_bill_detail efbd ON efb.id=efbd.bill_id WHERE efbd.operator_time="{refundTime}";')]