更新

liujiqiang
1 parent 239bd679
Showing 5 changed files with 7 additions and 6 deletions
commons/api/doLogin.py
commons/clientSession.py
commons/scripts/pwdCry.py
config/marketConfig/test_config_hg
report/test.log
@@ -12,12 +12,13 @@
 import requests
 import json
 from commons.scripts.readConf import readConfig
+from commons.scripts.pwdCry import pwdCry
  
 class doLogin():
     def __init__(self):
         rC = readConfig()
         self.userName = rC.returnOptionsItems("loginInfo","userName")
-        self.password = rC.returnOptionsItems("loginInfo","password")
+        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.webHeaders = {"X-Requested-With":"XMLHttpRequest",
@@ -12,6 +12,7 @@
 import requests
 import json
 from commons.scripts.readConf import readConfig
+from commons.scripts.pwdCry import pwdCry
  
 class cliSession(object):
     def __init__(self):
@@ -20,7 +21,7 @@ class cliSession(object):
     def __init__(self):
         rC = readConfig()
         self.userName = rC.returnOptionsItems("loginInfo","userName")
-        self.password = rC.returnOptionsItems("loginInfo","password")
+        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.webHeaders = {"X-Requested-With":"XMLHttpRequest",
@@ -17,7 +17,6 @@ def pwdCry(string):
     public_key = 'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCgN7kda5L4ztOUquoHjubQIEyqBpjpaYeq+DBKXA3JNOZsMjGwLGVqfCwQg3HHAGTaWnxsp5gjmh0tSziJFgQf2u45TqA2UObOvklRhbWr56QoTNsjm72wZoSOlUzW3xHi/6PocHdy/7bMOiDf6fmYhFBZdRleX6tCAp7w6DsdbQIDAQAB'
     key = '-----BEGIN PUBLIC KEY-----\n' + public_key + '\n-----END PUBLIC KEY-----'
     rsakey = RSA.importKey(key)
-    print(rsakey)
     cipher = Cipher_pksc1_v1_5.new(rsakey)
     encrypt_text = cipher.encrypt(string.encode("utf-8"))
     cipher_text = base64.b64encode(encrypt_text)
 #沈阳市场信息
 [loginInfo]
 userName=scgy
-password=DYdgRcAyx2bPboAmu0tgIYBM1kMxFAuDty7IQk4162Zh+8KKa8jtu6xIjG9W4yauTfPiuP1sqxDatskXFqCOz76ea14AqRCYEBz53xVr+vLfcz9zOB2d1T3aIlJbEk8yi2c21pd/MFkBw+Fhd0tky/6eN8kJA8mtsj3uDwSb9qo=
+password=123123
  
 [testInfo]
 #已添加的身份证号
-[2021-07-20 13:19:50] [INFO] : 发送邮件
-[2021-07-20 13:19:53] [INFO] : 邮件发送完毕
+[2021-07-20 13:56:07] [INFO] : 发送邮件
+[2021-07-20 13:56:11] [INFO] : 邮件发送完毕