isdata-customer-sdk 0.2.48 → 0.2.49

package/dist/index.common.js

@@ -29583,7 +29583,6 @@ __webpack_require__.d(__webpack_exports__, {
   getIntegrateAppInfoByID: function() { return /* reexport */ getIntegrateAppInfoByID; },
   getLanguages: function() { return /* reexport */ getLanguages; },
   getLoginPageNotices: function() { return /* reexport */ getLoginPageNotices; },
-  getLoginPortalAccountKey: function() { return /* reexport */ getLoginPortalAccountKey; },
   getMappingAppInfoByID: function() { return /* reexport */ getMappingAppInfoByID; },
   getMenuDatasByGroupID: function() { return /* reexport */ getMenuDatasByGroupID; },
   getMenuMappingDatasByRoleIDs: function() { return /* reexport */ getMenuMappingDatasByRoleIDs; },
@@ -30030,18 +30029,22 @@ const getPortalDocmentInfo = async kb_doc_id => {
   let docInfo = result.data.docInfo;
   return docInfo;
 };
-const getLoginPortalAccountKey = async (loginName, groupID) => {
-  let queryData = {
-    param: {
-      loginData: {
-        account: loginName,
-        group_id: groupID
-      }
-    }
-  };
-  let result = await request.post(`/dataservice/rest/orchestration/getLoginPortalAccountKey`, queryData);
-  return result;
-};
+
+// export const getLoginPortalAccountKey = async (loginName,groupID) => {
+//   let queryData = {
+//     param: {
+//       loginData: {
+//         account: loginName,
+//         group_id: groupID,
+//       },
+//     },
+//   };
+//   let result = await request.post(
+//       `/dataservice/rest/orchestration/getLoginPortalAccountKey`,
+//       queryData
+//     );
+//   return result;
+// };
 
 /**
  * 获取该平台菜单同祖先（直至根节点）得其他兄弟菜单
@@ -33671,7 +33674,6 @@ const getAllI18nTypes = async () => {
 
 
 
-
 /**
  * 
  * @returns 获取登录验证码图片
@@ -33791,62 +33793,56 @@ const isSecurityAccount = async (acccountName, group_id) => {
  * @returns
  */
 const loginAccount = async (data, appid) => {
-  let result = await getLoginPortalAccountKey(data.account_view, data.groupid);
-  let code = result.data.code;
-  //获取key成功
-  if (code == 10001) {
-    //保存的真正一级密码
-    let pwd_code = result.data.codeData.key;
-    //缓存一级密码
-    let old_key = pwd_code;
-    //保存的正则2级密码
-    let key_code = result.data.codeData.code;
-    //反向解析一级密码
-    pwd_code = await viewDecrypt(pwd_code);
-    //反向解析2级密码
+  let home_page = `http://${window.location.hostname}:8280`;
+  // let home_page = `http://127.0.0.1:8280`;
+  let questUrl = `${home_page}/portal/loginAccount`;
+  let password = await viewEncrypt(data.password);
+  let queryData = {
+    param: {
+      account_view: data.account_view,
+      groupid: data.groupid,
+      password: password,
+      account: data.account,
+      appid: appid
+    }
+  };
+  //保存的正则2级密码
+  let resultData = await request.post(questUrl, JSON.stringify(queryData));
+  let code = resultData.data.code;
+  let key_code = resultData.data.key_code;
+  let old_code = resultData.data.old_code;
+  let login_account_id = resultData.data.id;
+  //登录平台成功
+  if (code == 10110004) {
     key_code = await viewDecrypt(key_code);
-    //密码匹配
-    if (pwd_code == data.password) {
-      //平台正向加密2级密码
-      pwd_code = window.appSdk.Encrypt(key_code);
-      data.password = pwd_code;
-      result = await request.post(`/system/authority/loginAccount4Application?authPicCode=${data.imageCode}&dataappId=${appid}&mobileOrWeb=web`, data);
-      let response = JSON.parse(result.request.response);
-      code = response.code;
-      //登录平台成功
-      if (code == 10110004) {
-        let id = await getUserID(data.account_view, old_key, data.groupid);
-        // 初始化解析器
-        const parser = new UAParser();
-        // 获取浏览器信息
-        const browser = parser.getBrowser();
-        let timestamp = new Date().getTime();
-        let clientID = browser.name + "_" + browser.version + "_" + timestamp;
-        window.sessionStorage.setItem("iportal_login_user_id", id);
-        window.sessionStorage.setItem("iportal_group_id", data.groupid);
-        window.sessionStorage.setItem("iportal_login_user_key", old_key);
-        window.sessionStorage.setItem("iportal_client_id", clientID);
-        window.sessionStorage.setItem("iportal_app_id", appid);
-        return {
-          code: code
-        };
-      } else {
-        return {
-          code: code,
-          message: i18nText(response.message)
-        };
-      }
-    } else {
+    key_code = window.appSdk.Encrypt(key_code);
+    queryData.param.password = key_code;
+    resultData = await request.post(`/system/authority/loginAccount4Application?authPicCode=${data.imageCode}&dataappId=${appid}&mobileOrWeb=web`, queryData.param);
+    let response = JSON.parse(resultData.request.response);
+    code = response.code;
+    if (code == 10110004) {
+      let id = login_account_id;
+      // 初始化解析器
+      const parser = new UAParser();
+      // 获取浏览器信息
+      const browser = parser.getBrowser();
+      let timestamp = new Date().getTime();
+      let clientID = browser.name + "_" + browser.version + "_" + timestamp;
+      window.sessionStorage.setItem("iportal_login_user_id", id);
+      window.sessionStorage.setItem("iportal_group_id", data.groupid);
+      window.sessionStorage.setItem("iportal_login_user_key", old_code);
+      window.sessionStorage.setItem("iportal_client_id", clientID);
+      window.sessionStorage.setItem("iportal_app_id", appid);
       return {
-        code: code,
-        message: i18nText("账户密码错误")
+        code: code
       };
     }
+  } else {
+    return {
+      code: code,
+      message: i18nText(response.message)
+    };
   }
-  return {
-    code: code,
-    message: i18nText(result.data.message)
-  };
 };
 
 /**