dlt-for-react 1.0.19 → 1.0.20

package/README.md

@@ -8,7 +8,7 @@ npm publish
 
 ## 前端 dlt-for-react 依赖包版本更新记录
 
-##### 当前最新版本：1.0.19
+##### 当前最新版本：1.0.20
 
 ##### 安装依赖
 
@@ -16,6 +16,10 @@ npm publish
 
 ##### 版本修改记录
 
+#### V1.0.20—2023 年 11 月 2 日
+
+1. 修改登录接口传参bug
+
 #### V1.0.19—2023 年 11 月 1 日
 
 1. 补充 KyTextArea 组件

package/lib/layouts/Login/index.js

@@ -100,8 +100,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * @Description: 新版设计规范学工-登录页面
  * @Author: lisenlin
  * @Date: 2020-12-03 20:59:35
- * @LastEditors: lisenlin
- * @LastEditTime: 2021-12-14 14:31:40
+ * @LastEditors: jiangzhongxin
+ * @LastEditTime: 2023-11-02 14:08:53
  */
 var pubKey = 'MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJ8DUCb0CEFATRWU8BtBL42RvsdFBcpxYNfsg0P1f7Rd1qKLtqLSBBVGrJu148CdCAkxwKOsjvj5D4eMeDQCd18CAwEAAQ==';
 //网关密码加密
@@ -227,7 +227,7 @@ var LoginPage = function (_React$Component) {
               encryptTransfer: true,
               timestamp: timestamp,
               digest: digest,
-              systemId: 'ly-dlt'
+              systemId: 'ly-hq'
             };
             if (_this.state.lytype) {
               params.lytype = _this.state.lytype;

package/lib/layouts/Login/login.js

@@ -77,8 +77,8 @@ var userLogin = exports.userLogin = function userLogin(allMenu, params, func) {
       headers: {
         'Content-Type': 'application/x-www-form-urlencoded',
         'X-Requested-With': 'XMLHttpRequest',
-        logAppId: 'ly-sm',
-        gatewayAppId: 'ly-sm',
+        logAppId: 'ly-hq',
+        gatewayAppId: 'ly-hq',
         logServiceId: window.logServiceId
       },
       body: querystring.stringify(params)
@@ -276,7 +276,7 @@ var getDifferDate = exports.getDifferDate = function getDifferDate(firstDate, se
  * 获取已经登录的用户信息
  * @param func
  */
-var tryLoginUserInfo = exports.tryLoginUserInfo = function tryLoginUserInfo(allMenu, fullPageUrl, func, Authorization) {
+var tryLoginUserInfo = exports.tryLoginUserInfo = function tryLoginUserInfo(allMenu, fullPageUrl, func, Authorization, notConf) {
   //第一步，清空缓存
   ////console.info("tryLoginUserInfo执行1");
   if (window.gateway_version === '2') {
@@ -295,15 +295,15 @@ var tryLoginUserInfo = exports.tryLoginUserInfo = function tryLoginUserInfo(allM
       'Content-Type': 'application/x-www-form-urlencoded',
       'X-Requested-With': 'XMLHttpRequest',
       Authorization: Authorization || '',
-      logAppId: 'ly-sm',
-      gatewayAppId: 'ly-sm',
+      logAppId: 'ly-hq',
+      gatewayAppId: 'ly-hq',
       logServiceId: window.logServiceId
     },
     redirect: 'manual'
   }).then(function (response) {
     return response.json();
   }).then(function (res) {
-    ////console.info("tryLoginUserInfo执行5");
+    //console.info("tryLoginUserInfo执行5");
     if (window.gateway_version === '2') {
       if (res.meta && res.meta.statusCode === 200) {
         if (res.data) {
@@ -350,7 +350,7 @@ var tryLoginUserInfo = exports.tryLoginUserInfo = function tryLoginUserInfo(allM
         return res;
       }
     } else {
-      ////console.info("tryLoginUserInfo执行5");
+      //console.info("tryLoginUserInfo执行5");
       if (res.meta && res.meta.statusCode === 200) {
         //console.info("tryLoginUserInfo执行3");
         if (res.data) {
@@ -363,7 +363,7 @@ var tryLoginUserInfo = exports.tryLoginUserInfo = function tryLoginUserInfo(allM
         sessionStorage.setItem('statusCode', res.meta.statusCode);
       }
       //console.info("tryLoginUserInfo执行4");
-      sso(func);
+      sso(func, undefined, notConf);
       return res;
     }
   }).catch(function (error) {
@@ -450,18 +450,18 @@ var tryAllConfigInfo = exports.tryAllConfigInfo = function tryAllConfigInfo(func
 };
 
 //单点登录验证
-var sso = function sso(func, allMenu) {
+var sso = function sso(func, allMenu, notConf) {
   //console.info("sso执行1");
   var userLogin = sessionStorage.getItem('userLogin');
 
   if (userLogin) {
     //如果已经登录，此时需要获取配置信息
     //console.info("sso执行2");
-    tryAllConfigInfo(function () {
-      if (func) {
-        func();
-      }
-    });
+    if (!notConf) {
+      tryAllConfigInfo(func);
+      return;
+    }
+    func && func();
   } else {
     //是否启用单点登录
     if (window.casStatus) {
@@ -558,9 +558,7 @@ var sso = function sso(func, allMenu) {
         window.location = window.location.origin + window.location.pathname + 'auth?service=' + urlencode(window.location.origin + window.location.pathname);
       }
     } else {
-      if (func) {
-        func();
-      }
+      func && func();
     }
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dlt-for-react",
-  "version": "1.0.19",
+  "version": "1.0.20",
   "description": "dlt for react",
   "main": "lib/index.js",
   "scripts": {