Merge branch 'tk_branch'

# Conflicts:
#	config.py
#	service/login.py

config.py

@@ -7,15 +7,17 @@ class BaseConfig():
     # 当前运行的产品名
     # 当前运行的产品名
     current_product = "bmc"
     current_product = "bmc"
     default_test_case_dir = "test_case/bmc/"
     default_test_case_dir = "test_case/bmc/"
-    salt = 'hikcreate_xj'                       # SSO的登录用的
+    salt = 'hikcreate_xj'       # SSO 登录的东西
 
 
 class BMCConfig(BaseConfig):
 class BMCConfig(BaseConfig):
     """斑马信用app的配置类"""
     """斑马信用app的配置类"""
     # 测试用例目录
     # 测试用例目录
     name = "bmc"
     name = "bmc"
-    print("a")
     test_case_dir = "test_case/bmc/"
     test_case_dir = "test_case/bmc/"
     test_case_data_dir = "test_case_data/bmc/"
     test_case_data_dir = "test_case_data/bmc/"
     webhook = ''
     webhook = ''
 
 
+class BmyConfig(BaseConfig):
+    """企业云的配置类"""
+    name = "bmy"
 
 

service/login.py

@@ -70,6 +70,7 @@ class BMY():
         imageinfo = BMY().get_imageCode(payload['username'], payload['password'])
         imageinfo = BMY().get_imageCode(payload['username'], payload['password'])
         payload['imageId'] = imageinfo[0]
         payload['imageId'] = imageinfo[0]
         payload['imageCode'] = imageinfo[1]
         payload['imageCode'] = imageinfo[1]
+        # print(payload)
 
 
         resp = requests.post("http://testyun.banmago.com/api/auth/login", data=payload, headers=header)
         resp = requests.post("http://testyun.banmago.com/api/auth/login", data=payload, headers=header)
         if getToken:
         if getToken:
@@ -87,7 +88,6 @@ if __name__ == '__main__':
     #           headers=getattr(BaseConfig, 'headers'),
     #           headers=getattr(BaseConfig, 'headers'),
     #           method='post',
     #           method='post',
     #           data=None)
     #           data=None)
-
     indata= {"username":"15150000000","password":"A123456"}
     indata= {"username":"15150000000","password":"A123456"}
     token= BMY().bmy_login(indata,getToken=True)
     token= BMY().bmy_login(indata,getToken=True)
     print(token)
     print(token)