shawenguan 1 жил өмнө
parent
commit
e1d73c5afd

+ 6 - 6
Scripts/telecom/cloud189Helper.js

@@ -218,7 +218,7 @@ function rsaEncode(j_rsakey, text) {
     let crypt = new JSEncrypt();
     crypt.setPublicKey(j_rsakey);
     let md5 = createWMd5();
-    return crypt.encrypt(md5.hex_md5_32Upper(text));
+    return b64tohex(crypt.encrypt(md5.hex_md5_32Upper(text)));
 }
 
 async function login(username, password){
@@ -237,12 +237,12 @@ async function login(username, password){
         password = rsaEncode(extData.j_rsakey, password);
         magicJS.logger.info(`username:${username}`);
         magicJS.logger.info(`password:${password}`);
-        let rsqData = {
+        let reqData = {
             appKey: "cloud",
             accountType: '01',
             dynamicCheck: false,
-            userName: `{{RSA}}${username}`,
-            epd: `{{RSA}}${password}`,
+            userName: `{RSA}${username}`,
+            epd: `{RSA}${password}`,
             validateCode: "",
             captchaToken: extData.captchaToken,
             returnUrl: extData.returnUrl,
@@ -252,7 +252,7 @@ async function login(username, password){
             REQID: 'c8d6f7fb3b204eeb',
             callbackMsg: '',
         };
-        let body = magicJS.objToQueryStr(rsqData);
+        let body = magicJS.objToQueryStr(reqData);
         let options = {
             url: `https://open.e.189.cn/api/logbox/oauth2/loginSubmit.do?${body}`,
             headers: {
@@ -277,7 +277,7 @@ async function login(username, password){
         }).catch(err => {
             const msg = `获取页面数据异常\n${JSON.stringify(err)}`;
             magicJS.logger.error(msg);
-            reject(false);
+            resolve(false);
         });
     });
 }