Merge branch 'master' of http://git.hikcreate.com/TestAuto/InterfaceAutoTest

common/utils/encryption.py

@@ -37,37 +37,13 @@ class Encryption:
         return encrypted_text_str
         return encrypted_text_str
 
 
     def aes_token(self,token):
     def aes_token(self,token):
-        """bmc"""
+        """斑马信用token加密"""
         key = "HIKEDL@#"
         key = "HIKEDL@#"
         m5dkey = self.get_md5(key)
         m5dkey = self.get_md5(key)
         token_plus_timestamp = token + str(int(round(time.time() * 1000)))
         token_plus_timestamp = token + str(int(round(time.time() * 1000)))
         encrypted_token = self.aes_cipher(m5dkey, token_plus_timestamp)
         encrypted_token = self.aes_cipher(m5dkey, token_plus_timestamp)
         return encrypted_token
         return encrypted_token
 
 
-    def get_token(self, indata):
-        """bmc"""
-        url = "http://testbmcapp.hikcreate.com/v1/user/login/gesture"
-        header = {"Content-Type": "application/json; charset=utf-8",
-                  "device-type": "Android",
-                  "device-name": "vivo+X20",
-                  "device-model": "vivo vivo X20",
-                  "city-code": "520100",
-                  "Version": "2.2.0",
-                  "Device-Code": "000000001e167ed7000000001e167ed7"}
-
-        res = requests.post(url, json=indata, headers=header)
-        print(res.json())
-        encrypted_token = self.aes_token(res.json()["data"]["token"])
-        print(encrypted_token)
-        # 获取专网token
-        header1 = header.copy()
-        header1["Token"] = encrypted_token
-        resp = requests.get("http://testbmcapp.hikcreate.com/token", headers=header1)
-        print(resp.json())
-        pvt_token = resp.json()["data"]["token"]
-        print(pvt_token)
-        return encrypted_token,pvt_token
-
 
 
 
 
 if __name__ == '__main__':
 if __name__ == '__main__':

requirements.txt

@@ -31,5 +31,5 @@ six==1.15.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3
 toml==0.10.2; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'
 toml==0.10.2; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'
 typing-extensions==3.10.0.0; python_version < '3.8'
 typing-extensions==3.10.0.0; python_version < '3.8'
 urllib3==1.25.11; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'
 urllib3==1.25.11; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'
-xlrd==2.0.0
+xlrd==1.2.0
 zipp==3.4.1; python_version >= '3.6'
 zipp==3.4.1; python_version >= '3.6'

service/login.py

@@ -80,6 +80,32 @@ class BMY():
         else:
         else:
             return resp.json()
             return resp.json()
 
 
+
+    def get_token(self, indata):
+        """斑马信用登录获取token"""
+        url = "http://testbmcapp.hikcreate.com/v1/user/login/gesture"
+        header = {"Content-Type": "application/json; charset=utf-8",
+                  "device-type": "Android",
+                  "device-name": "vivo+X20",
+                  "device-model": "vivo vivo X20",
+                  "city-code": "520100",
+                  "Version": "2.2.0",
+                  "Device-Code": "000000001e167ed7000000001e167ed7"}
+
+        res = requests.post(url, json=indata, headers=header)
+        print(res.json())
+        encrypted_token = Encryption().aes_token(res.json()["data"]["token"])
+        print(encrypted_token)
+        # 获取专网token
+        header1 = header.copy()
+        header1["Token"] = encrypted_token
+        resp = requests.get("http://testbmcapp.hikcreate.com/token", headers=header1)
+        print(resp.json())
+        pvt_token = resp.json()["data"]["token"]
+        print(pvt_token)
+        return encrypted_token,pvt_token
+
+
 if __name__ == '__main__':
 if __name__ == '__main__':
     # login = request_main(url=r'http://testtbdzj.hikcreate.com/web/auth/users/login',
     # login = request_main(url=r'http://testtbdzj.hikcreate.com/web/auth/users/login',
     #                      method='post',
     #                      method='post',