dlt-for-react 1.0.19 → 1.0.21

package/README.md

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

package/lib/components/KyInputPicker/render.js

@@ -491,7 +491,7 @@ var _initialiseProps = function _initialiseProps() {
               }
 
               _context.next = 5;
-              return NHFetch('/openapi/getCsszByCsbz', 'GET', { csbz: 'XTGL_TSZF' });
+              return NHFetch('/outer/getCsszByCsbz', 'GET', { csbz: 'XTGL_TSZF' });
 
             case 5:
               res = _context.sent;

package/lib/layouts/Login/index.js

@@ -1,94 +1,94 @@
-'use strict';
+"use strict";
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
-var _tooltip = require('antd/lib/tooltip');
+var _tooltip = require("antd/lib/tooltip");
 
 var _tooltip2 = _interopRequireDefault(_tooltip);
 
-var _checkbox = require('antd/lib/checkbox');
+var _checkbox = require("antd/lib/checkbox");
 
 var _checkbox2 = _interopRequireDefault(_checkbox);
 
-var _button = require('antd/lib/button');
+var _button = require("antd/lib/button");
 
 var _button2 = _interopRequireDefault(_button);
 
-var _input = require('antd/lib/input');
+var _input = require("antd/lib/input");
 
 var _input2 = _interopRequireDefault(_input);
 
-var _icon = require('antd/lib/icon');
+var _icon = require("antd/lib/icon");
 
 var _icon2 = _interopRequireDefault(_icon);
 
-var _modal = require('antd/lib/modal');
+var _modal = require("antd/lib/modal");
 
 var _modal2 = _interopRequireDefault(_modal);
 
-var _NHFetch2 = require('xgui-for-react/lib/utils/NHFetch');
+var _NHFetch2 = require("xgui-for-react/lib/utils/NHFetch");
 
 var _NHFetch3 = _interopRequireDefault(_NHFetch2);
 
-var _extends2 = require('babel-runtime/helpers/extends');
+var _extends2 = require("babel-runtime/helpers/extends");
 
 var _extends3 = _interopRequireDefault(_extends2);
 
-var _getPrototypeOf = require('babel-runtime/core-js/object/get-prototype-of');
+var _getPrototypeOf = require("babel-runtime/core-js/object/get-prototype-of");
 
 var _getPrototypeOf2 = _interopRequireDefault(_getPrototypeOf);
 
-var _classCallCheck2 = require('babel-runtime/helpers/classCallCheck');
+var _classCallCheck2 = require("babel-runtime/helpers/classCallCheck");
 
 var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
 
-var _createClass2 = require('babel-runtime/helpers/createClass');
+var _createClass2 = require("babel-runtime/helpers/createClass");
 
 var _createClass3 = _interopRequireDefault(_createClass2);
 
-var _possibleConstructorReturn2 = require('babel-runtime/helpers/possibleConstructorReturn');
+var _possibleConstructorReturn2 = require("babel-runtime/helpers/possibleConstructorReturn");
 
 var _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2);
 
-var _inherits2 = require('babel-runtime/helpers/inherits');
+var _inherits2 = require("babel-runtime/helpers/inherits");
 
 var _inherits3 = _interopRequireDefault(_inherits2);
 
-var _form = require('antd/lib/form');
+var _form = require("antd/lib/form");
 
 var _form2 = _interopRequireDefault(_form);
 
-require('antd/lib/tooltip/style');
+require("antd/lib/tooltip/style");
 
-require('antd/lib/checkbox/style');
+require("antd/lib/checkbox/style");
 
-require('antd/lib/button/style');
+require("antd/lib/button/style");
 
-require('antd/lib/input/style');
+require("antd/lib/input/style");
 
-require('antd/lib/icon/style');
+require("antd/lib/icon/style");
 
-require('antd/lib/modal/style');
+require("antd/lib/modal/style");
 
-require('antd/lib/form/style');
+require("antd/lib/form/style");
 
-require('isomorphic-fetch');
+require("isomorphic-fetch");
 
-var _react = require('react');
+var _react = require("react");
 
 var _react2 = _interopRequireDefault(_react);
 
-require('../../../assets/login/index.less');
+require("../../../assets/login/index.less");
 
-var _login = require('./login.js');
+var _login = require("./login.js");
 
-var _hexSha = require('hex-sha1');
+var _hexSha = require("hex-sha1");
 
 var _hexSha2 = _interopRequireDefault(_hexSha);
 
-var _jsencrypt = require('jsencrypt');
+var _jsencrypt = require("jsencrypt");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -100,33 +100,35 @@ 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-03 09:44:09
  */
-var pubKey = 'MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJ8DUCb0CEFATRWU8BtBL42RvsdFBcpxYNfsg0P1f7Rd1qKLtqLSBBVGrJu148CdCAkxwKOsjvj5D4eMeDQCd18CAwEAAQ==';
+var pubKey = "MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJ8DUCb0CEFATRWU8BtBL42RvsdFBcpxYNfsg0P1f7Rd1qKLtqLSBBVGrJu148CdCAkxwKOsjvj5D4eMeDQCd18CAwEAAQ==";
 //网关密码加密
 
-var URL_PREFIX = ''; //统一前缀
-var reqGetCaptcha = URL_PREFIX + 'captchaServlet?v='; //验证码下载路径
+var URL_PREFIX = ""; //统一前缀
+var reqGetCaptcha = URL_PREFIX + "captchaServlet?v="; //验证码下载路径
 var FormItem = _form2.default.Item;
 
-var defaultLogo = require('../../../assets/login/images/defaultLogo.png');
+var defaultLogo = require("../../../assets/login/images/defaultLogo.png");
 // const unValidatedPic = require('../../../assets/login/images/yz.png')
 // const validatedPic = require('../../../assets/login/images/yz_success.png')
 
-var GetCsz = function GetCsz(csbz, callback) {
-  fetch('front/zhxg-unauth/openapi/getCssz?csbz=' + csbz, {
-    method: 'GET',
-    credentials: 'include',
+var baseUrl = window.xtglUrl || "api/hq-xtgl";
+
+var getLoginConfig = function getLoginConfig(csbz, callback) {
+  fetch(baseUrl + "/outer/logo", {
+    method: "GET",
+    credentials: "include",
     headers: {
-      'Content-Type': 'application/x-www-form-urlencoded',
-      'X-Requested-With': 'XMLHttpRequest',
-      appId: 'ly-hq'
+      "Content-Type": "application/x-www-form-urlencoded",
+      "X-Requested-With": "XMLHttpRequest",
+      appId: "ly-hq"
     }
   }).then(function (response) {
     return response.json();
   }).then(function (res) {
-    if (callback && typeof callback === 'function') {
+    if (callback && typeof callback === "function") {
       callback(res);
     }
     return res;
@@ -141,11 +143,21 @@ var LoginPage = function (_React$Component) {
 
     var _this = (0, _possibleConstructorReturn3.default)(this, (LoginPage.__proto__ || (0, _getPrototypeOf2.default)(LoginPage)).call(this, props));
 
-    _this.getLytype = function () {
+    _this.getLoginConfig = function () {
       try {
-        GetCsz('XTGL_LYTYPE', function (res) {
+        getLoginConfig("", function (res) {
           if (res && res.code === 200 && res.data) {
-            _this.setState({ lytype: res.data });
+            var title = res.data["XTGL_LOGIN_TITLE"];
+            var welcome = res.data["XTGL_LOGIN_WELCOME"];
+            var type = res.data["XTGL_LYTYPE"];
+            var titleContent = title ? title : _this.state.titleContent;
+            var welcomeMsg = welcome ? welcome : _this.state.welcomeMsg;
+            var lytype = type ? type : _this.state.lytype;
+            _this.setState({
+              lytype: lytype,
+              titleContent: titleContent,
+              welcomeMsg: welcomeMsg
+            });
           }
         });
       } catch (err) {}
@@ -178,11 +190,11 @@ var LoginPage = function (_React$Component) {
     };
 
     _this.getCookiePwd = function () {
-      var uupd = _this.getCookie('dlt-uupd');
-      if (uupd && uupd !== '') {
-        var userNameFromCookie = uupd.split('///')[0];
-        var passwordFromCookie = uupd.split('///')[1];
-        var privateKey = window.localStorage.getItem('privateKey');
+      var uupd = _this.getCookie("dlt-uupd");
+      if (uupd && uupd !== "") {
+        var userNameFromCookie = uupd.split("///")[0];
+        var passwordFromCookie = uupd.split("///")[1];
+        var privateKey = window.localStorage.getItem("privateKey");
         var password = undefined;
         if (privateKey) {
           var decrypt = new _jsencrypt.JSEncrypt();
@@ -198,7 +210,7 @@ var LoginPage = function (_React$Component) {
 
     _this.handleAccountSubmit = function (e) {
       e.preventDefault();
-      if (_this.state.type === 'tab1') {
+      if (_this.state.type === "tab1") {
         _this.props.form.validateFields(function (err, values) {
           if (!err) {
             // if(!this.state.validation) {
@@ -211,15 +223,15 @@ var LoginPage = function (_React$Component) {
             var encryptPassword = encrypt.encrypt(password); //password为需要加密的字段
             var timestamp = new Date().getTime();
             var arr = [];
-            arr.push('username=' + values.username, 'password=' + encryptPassword, 'timestamp=' + timestamp);
-            var digest = (0, _hexSha2.default)(arr.join(','));
+            arr.push("username=" + values.username, "password=" + encryptPassword, "timestamp=" + timestamp);
+            var digest = (0, _hexSha2.default)(arr.join(","));
             //若记住密码 则保存在cookie中，默认保存7天
             if (_this.state.rememberPW) {
               var JsEncrypt = new _jsencrypt.JSEncrypt();
               var privateKey = JsEncrypt.getPrivateKey();
-              window.localStorage.setItem('privateKey', privateKey);
+              window.localStorage.setItem("privateKey", privateKey);
               var encryptPwd = JsEncrypt.encrypt(password); //password为需要加密的字段
-              _this.setCookie('dlt-uupd', values.username + '///' + encryptPwd);
+              _this.setCookie("dlt-uupd", values.username + "///" + encryptPwd);
             }
             var params = {
               username: values.username,
@@ -227,7 +239,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;
@@ -254,23 +266,23 @@ var LoginPage = function (_React$Component) {
 
     _this.isNotIE = function () {
       var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
-      var isIE = userAgent.indexOf('compatible') > -1 && userAgent.indexOf('MSIE') > -1; //判断是否IE<11浏览器
-      var isIE11 = userAgent.indexOf('Trident') > -1 && userAgent.indexOf('rv:11.0') > -1;
+      var isIE = userAgent.indexOf("compatible") > -1 && userAgent.indexOf("MSIE") > -1; //判断是否IE<11浏览器
+      var isIE11 = userAgent.indexOf("Trident") > -1 && userAgent.indexOf("rv:11.0") > -1;
       if (isIE || isIE11) {
         return false;
       } else return true;
     };
 
     _this.getCookie = function (key) {
-      var name = key + '=';
-      var ca = document.cookie.split(';');
+      var name = key + "=";
+      var ca = document.cookie.split(";");
       for (var i = 0; i < ca.length; i++) {
         var c = ca[i].trim();
         if (c.indexOf(name) === 0) {
           return c.substring(name.length, c.length);
         }
       }
-      return '';
+      return "";
     };
 
     _this.setCookie = function (key, value) {
@@ -278,8 +290,8 @@ var LoginPage = function (_React$Component) {
 
       var d = new Date();
       d.setTime(d.getTime() + day * 24 * 60 * 60 * 1000);
-      var expires = 'expires=' + d.toGMTString();
-      document.cookie = key + '=' + value + '; ' + expires;
+      var expires = "expires=" + d.toGMTString();
+      document.cookie = key + "=" + value + "; " + expires;
     };
 
     _this.handelSuccess = function () {
@@ -293,7 +305,7 @@ var LoginPage = function (_React$Component) {
         validation: false
       });
       _this.VerifyRef && _this.VerifyRef.reset();
-      _this.setCookie('dlt-uupd', '');
+      _this.setCookie("dlt-uupd", "");
     };
 
     _this.checkChange = function (checked) {
@@ -303,63 +315,66 @@ var LoginPage = function (_React$Component) {
     };
 
     _this.state = {
-      type: 'tab1',
+      type: "tab1",
       count: 0,
       loading: false,
-      copyright: '', //'Copyright © 2014-2018 LIANYI TECHNOLOGY CO.,LTD. All Rights Reserved. 联奕科技有限公司（V2.0.20170512-31058）',
-      loginLogoUrl: 'front/zhxg-unauth/xtglSchoolMng/downloadSchoolPictureByType?type=dlylogo',
-      defaultLoginLogo: 'zhxg',
-      validateUrl: '',
+      copyrightUrl: "",
+      copyright: "", //'Copyright © 2014-2018 LIANYI TECHNOLOGY CO.,LTD. All Rights Reserved. 联奕科技有限公司（V2.0.20170512-31058）',
+      loginLogoUrl: "front/zhxg-unauth/xtglSchoolMng/downloadSchoolPictureByType?type=dlylogo",
+      defaultLoginLogo: "zhxg",
+      validateUrl: "",
       captchaVisible: false, //验证码是否可见
-      background: require('../../../assets/login/images/bgNew.jpg'), //登录页背景
+      background: require("../../../assets/login/images/bgNew.jpg"), //登录页背景
       browserList: [{
-        key: '1',
-        type: 'chrome',
-        title: '谷歌浏览器',
-        imgSrc: require('../../../assets/login/images/chrome.png')
+        key: "1",
+        type: "chrome",
+        title: "谷歌浏览器",
+        imgSrc: require("../../../assets/login/images/chrome.png")
       }, {
-        key: '2',
-        type: 'firefox',
-        title: '火狐浏览器',
-        imgSrc: require('../../../assets/login/images/firefox.png')
+        key: "2",
+        type: "firefox",
+        title: "火狐浏览器",
+        imgSrc: require("../../../assets/login/images/firefox.png")
       }, {
-        key: '3',
-        type: 'edge',
-        title: 'Microsoft Edge浏览器',
-        imgSrc: require('../../../assets/login/images/edge.png')
+        key: "3",
+        type: "edge",
+        title: "Microsoft Edge浏览器",
+        imgSrc: require("../../../assets/login/images/edge.png")
       }, {
-        key: '4',
-        type: '360',
-        title: '360浏览器',
-        imgSrc: require('../../../assets/login/images/360.png')
+        key: "4",
+        type: "360",
+        title: "360浏览器",
+        imgSrc: require("../../../assets/login/images/360.png")
       }, {
-        key: '5',
-        type: 'safari',
-        title: 'Safari浏览器',
-        imgSrc: require('../../../assets/login/images/safari.png')
+        key: "5",
+        type: "safari",
+        title: "Safari浏览器",
+        imgSrc: require("../../../assets/login/images/safari.png")
       }],
       success: false, //滚动验证
-      sologanTitle: '联奕愿景',
-      sologan: '让校园服务更智慧',
+      sologanTitle: "联奕愿景",
+      sologan: "让校园服务更智慧",
       rememberPW: true, //是否记住密码
       userNameFromCookie: undefined, //cookie缓存的登录者
       passwordFromCookie: undefined, //cookie缓存的登录密码 - 不加密
       validation: false, //验证状态
       smallScreen: false, //是否屏幕宽度较小  <700为true
       shortScreen: false, //是否屏幕高度较矮  <750为true
-      lytype: '' // 登录接口处理
+      lytype: "", // 登录接口处理
+      titleContent: "学生工作管理系统",
+      welcomeMsg: "欢迎使用"
     };
     return _this;
   }
 
   (0, _createClass3.default)(LoginPage, [{
-    key: 'UNSAFE_componentWillMount',
+    key: "UNSAFE_componentWillMount",
     value: function UNSAFE_componentWillMount() {
       var _this2 = this;
 
       //获取版权信息
-      if (this.props.config.copyright && this.props.config.copyright.startsWith('front/')) {
-        (0, _NHFetch3.default)(this.props.config.copyright, 'GET').then(function (res) {
+      if (this.props.config.copyright && this.props.config.copyright.startsWith("api/")) {
+        (0, _NHFetch3.default)(this.props.config.copyright, "GET").then(function (res) {
           if (res) {
             _this2.setState({
               copyright: res.data,
@@ -375,33 +390,33 @@ var LoginPage = function (_React$Component) {
       }
       this.getSetting(); //获取配置，是否开启验证码
       this.getCookiePwd(); //获取cookie的账密
-      this.getLytype(); //获取登录类型
-      window.addEventListener('resize', this.handelWindowResize);
+      this.getLoginConfig(); //获取登录类型
+      window.addEventListener("resize", this.handelWindowResize);
     }
   }, {
-    key: 'componentWillUnmount',
+    key: "componentWillUnmount",
     value: function componentWillUnmount() {
-      window.removeEventListener('resize', this.handelWindowResize);
+      window.removeEventListener("resize", this.handelWindowResize);
     }
     /**获取lytype值 */
 
     /** 监听屏幕宽度 */
 
   }, {
-    key: 'getSetting',
+    key: "getSetting",
 
 
     //获取配置，是否开启验证码
     value: function getSetting() {
       var _this3 = this;
 
-      fetch(URL_PREFIX + 'ng/captcha/status', {
-        method: 'GET',
-        credentials: 'include',
+      fetch(URL_PREFIX + "ng/captcha/status", {
+        method: "GET",
+        credentials: "include",
         headers: {
-          'Content-Type': 'application/x-www-form-urlencoded',
-          'X-Requested-With': 'XMLHttpRequest',
-          appId: 'ly-hq'
+          "Content-Type": "application/x-www-form-urlencoded",
+          "X-Requested-With": "XMLHttpRequest",
+          appId: "ly-hq"
         }
       }).then(function (response) {
         return response.json();
@@ -422,12 +437,15 @@ var LoginPage = function (_React$Component) {
         return res;
       }).catch(function (error) {
         // 网络请求失败返回执行该回调函数，得到错误信息
-        _modal2.default.error({ title: '错误提示', content: '网络请求异常,请联系管理员' });
+        _modal2.default.error({
+          title: "错误提示",
+          content: "网络请求异常,请联系管理员"
+        });
         return error;
       });
     }
   }, {
-    key: 'changeCaptcha',
+    key: "changeCaptcha",
     value: function changeCaptcha() {
       this.setState({
         validateUrl: reqGetCaptcha + new Date().getMilliseconds()
@@ -446,7 +464,7 @@ var LoginPage = function (_React$Component) {
     /** 登录失败重置滑动认证器 并清除cookie的登录缓存 */
 
   }, {
-    key: 'render',
+    key: "render",
     value: function render() {
       var _this4 = this;
 
@@ -463,62 +481,64 @@ var LoginPage = function (_React$Component) {
           userNameFromCookie = _state.userNameFromCookie,
           passwordFromCookie = _state.passwordFromCookie,
           smallScreen = _state.smallScreen,
-          rememberPW = _state.rememberPW;
+          rememberPW = _state.rememberPW,
+          titleContent = _state.titleContent,
+          welcomeMsg = _state.welcomeMsg;
 
-      var styleObj = smallScreen ? {} : { paddingLeft: '195px' };
+      var styleObj = smallScreen ? {} : { paddingLeft: "195px" };
       return _react2.default.createElement(
-        'div',
+        "div",
         {
-          className: 'xgui-newLogin',
-          style: { backgroundImage: 'url(' + background + ')' }
+          className: "xgui-newLogin",
+          style: { backgroundImage: "url(" + background + ")" }
         },
         _react2.default.createElement(
-          'div',
-          { className: 'xgui-newlogin-content' },
+          "div",
+          { className: "xgui-newlogin-content" },
           _react2.default.createElement(
-            'div',
-            { className: 'xgui-login-title', style: styleObj },
-            _react2.default.createElement('img', {
-              className: 'logo',
+            "div",
+            { className: "xgui-login-title", style: styleObj },
+            _react2.default.createElement("img", {
+              className: "logo",
               src: config.loginLogoUrl,
               onError: function onError(e) {
                 e.target.value === defaultLogo;
               }
             }),
-            _react2.default.createElement('span', { className: 'split' }),
+            _react2.default.createElement("span", { className: "split" }),
             _react2.default.createElement(
-              'span',
-              { className: 'titleContnet' },
-              '学生工作管理系统'
+              "span",
+              { className: "titleContnet" },
+              titleContent
             )
           ),
           _react2.default.createElement(
-            'div',
-            { className: 'xgui-loginMain' },
+            "div",
+            { className: "xgui-loginMain" },
             !smallScreen && _react2.default.createElement(
-              'div',
+              "div",
               {
-                className: 'xgui-login-slogan',
-                style: { visibility: 'hidden' }
+                className: "xgui-login-slogan",
+                style: { visibility: "hidden" }
               },
               _react2.default.createElement(
-                'div',
-                { className: 'sloganTitle' },
+                "div",
+                { className: "sloganTitle" },
                 sologanTitle
               ),
               _react2.default.createElement(
-                'div',
-                { className: 'slogan' },
+                "div",
+                { className: "slogan" },
                 sologan
               )
             ),
             _react2.default.createElement(
-              'div',
-              { className: 'xgui-login-loginWarp' },
+              "div",
+              { className: "xgui-login-loginWarp" },
               _react2.default.createElement(
-                'p',
-                { className: 'welcomeMsg' },
-                '\u6B22\u8FCE\u4F7F\u7528'
+                "p",
+                { className: "welcomeMsg" },
+                welcomeMsg
               ),
               _react2.default.createElement(
                 _form2.default,
@@ -526,31 +546,31 @@ var LoginPage = function (_React$Component) {
                 _react2.default.createElement(
                   FormItem,
                   null,
-                  getFieldDecorator('username', {
+                  getFieldDecorator("username", {
                     initialValue: userNameFromCookie,
-                    rules: [{ required: true, message: '请输入您的账号！' }]
+                    rules: [{ required: true, message: "请输入您的账号！" }]
                   })(_react2.default.createElement(_input2.default, {
-                    size: 'large',
+                    size: "large",
                     prefix: _react2.default.createElement(_icon2.default, {
-                      type: 'user',
-                      style: { color: 'rgba(0,0,0,.25)' }
+                      type: "user",
+                      style: { color: "rgba(0,0,0,.25)" }
                     }),
-                    placeholder: '\u8BF7\u8F93\u5165\u7528\u6237\u540D'
+                    placeholder: "\u8BF7\u8F93\u5165\u7528\u6237\u540D"
                   }))
                 ),
                 _react2.default.createElement(
                   FormItem,
                   null,
-                  getFieldDecorator('password', {
+                  getFieldDecorator("password", {
                     initialValue: passwordFromCookie,
-                    rules: [{ required: true, message: '请输入密码！' }]
+                    rules: [{ required: true, message: "请输入密码！" }]
                   })(_react2.default.createElement(_input2.default.Password, {
-                    size: 'large',
+                    size: "large",
                     prefix: _react2.default.createElement(_icon2.default, {
-                      type: 'lock',
-                      style: { color: 'rgba(0,0,0,.25)' }
+                      type: "lock",
+                      style: { color: "rgba(0,0,0,.25)" }
                     }),
-                    placeholder: '\u8BF7\u8F93\u5165\u5BC6\u7801'
+                    placeholder: "\u8BF7\u8F93\u5165\u5BC6\u7801"
                   })
                   // <LyPassword
                   //   encryptMark='*'
@@ -564,27 +584,27 @@ var LoginPage = function (_React$Component) {
                 this.state.captchaVisible ? _react2.default.createElement(
                   FormItem,
                   null,
-                  getFieldDecorator('captcha', {
-                    rules: [{ required: true, message: '请输入验证码！' }]
+                  getFieldDecorator("captcha", {
+                    rules: [{ required: true, message: "请输入验证码！" }]
                   })(_react2.default.createElement(
-                    'div',
-                    { className: 'captchaItem' },
+                    "div",
+                    { className: "captchaItem" },
                     _react2.default.createElement(_input2.default, {
-                      className: 'captcha_input',
-                      size: 'large',
-                      type: 'text',
-                      placeholder: '\u8BF7\u8F93\u5165\u9A8C\u8BC1\u7801'
+                      className: "captcha_input",
+                      size: "large",
+                      type: "text",
+                      placeholder: "\u8BF7\u8F93\u5165\u9A8C\u8BC1\u7801"
                     }),
                     _react2.default.createElement(
-                      'div',
+                      "div",
                       null,
                       _react2.default.createElement(
-                        'span',
+                        "span",
                         { onClick: function onClick() {
                             return _this4.changeCaptcha();
                           } },
-                        _react2.default.createElement('img', {
-                          className: 'captcha_value',
+                        _react2.default.createElement("img", {
+                          className: "captcha_value",
                           src: this.state.validateUrl
                         })
                       )
@@ -597,47 +617,47 @@ var LoginPage = function (_React$Component) {
                   _react2.default.createElement(
                     _button2.default,
                     {
-                      className: 'xgui-nwelogin-submit',
-                      type: 'primary',
-                      size: 'large',
-                      htmlType: 'submit',
+                      className: "xgui-nwelogin-submit",
+                      type: "primary",
+                      size: "large",
+                      htmlType: "submit",
                       loading: this.state.loading
                     },
-                    '\u767B\u5F55'
+                    "\u767B\u5F55"
                   )
                 ),
                 _react2.default.createElement(
                   FormItem,
-                  { style: { marginTop: '-20px' } },
-                  getFieldDecorator('remember', {
-                    valuePropName: 'checked',
+                  { style: { marginTop: "-20px" } },
+                  getFieldDecorator("remember", {
+                    valuePropName: "checked",
                     initialValue: rememberPW
                   })(_react2.default.createElement(
                     _checkbox2.default,
                     {
-                      style: { float: 'left' },
+                      style: { float: "left" },
                       onChange: function onChange(e) {
                         return _this4.checkChange(e.target.checked);
                       }
                     },
-                    '\u8BB0\u4F4F\u767B\u5F55'
+                    "\u8BB0\u4F4F\u767B\u5F55"
                   ))
                 ),
-                _react2.default.createElement('div', null)
+                _react2.default.createElement("div", null)
               ),
               _react2.default.createElement(
-                'div',
-                { className: 'xgui-nwelogin-recomment' },
+                "div",
+                { className: "xgui-nwelogin-recomment" },
                 _react2.default.createElement(
-                  'span',
+                  "span",
                   null,
-                  '\u5EFA\u8BAE\u4F7F\u7528\u6D4F\u89C8\u5668\uFF1A'
+                  "\u5EFA\u8BAE\u4F7F\u7528\u6D4F\u89C8\u5668\uFF1A"
                 ),
                 browserList.map(function (item) {
                   return _react2.default.createElement(
                     _tooltip2.default,
                     { title: item.title },
-                    _react2.default.createElement('img', { src: item.imgSrc, width: 24 })
+                    _react2.default.createElement("img", { src: item.imgSrc, width: 24 })
                   );
                 })
               )
@@ -645,8 +665,8 @@ var LoginPage = function (_React$Component) {
           )
         ),
         _react2.default.createElement(
-          'div',
-          { className: 'xgui-nwelogin-copyright' },
+          "div",
+          { className: "xgui-nwelogin-copyright" },
           copyright
         )
       );

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/lib/layouts/Top/index.js

@@ -201,7 +201,7 @@ var Home = function (_React$Component) {
 
         //修改密码
         var baseUrl = window.xtglUrl || 'api/hq-xtgl';
-        (0, _NHFetch3.default)(baseUrl + '/openapi/users/password/update?oldPassword=' + oldPwd + '&newPassword=' + newPwd, 'post', {}).then(function (res) {
+        (0, _NHFetch3.default)(baseUrl + '/outer/users/password/update?oldPassword=' + oldPwd + '&newPassword=' + newPwd, 'post', {}).then(function (res) {
           if (res && res.data.meta['success']) {
             _this.passWordForm.resetFields();
             _this.nhEditPassWordModal.close();

package/lib/layouts/layout/index.js

@@ -129,7 +129,7 @@ var NHLayout = function (_React$Component) {
     _this.getLayoutSetting = function () {
       _this.setState({ layoutShow: false });
       var baseUrl = window.xtglUrl || 'api/hq-xtgl';
-      (0, _NHFetch3.default)(baseUrl + '/openapi/getCsszByCsbz', 'GET', {
+      (0, _NHFetch3.default)(baseUrl + '/outer/getCsszByCsbz', 'GET', {
         csbz: 'XTGL_LAYOUT_SETTING'
       }).then(function (res) {
         if (res && res.code === 200 && res.data) {

package/lib/layouts/mixTop/index.js

@@ -192,7 +192,7 @@ var MixTop = function (_React$Component) {
         var oldPwd = (0, _rsa.encryptedString)(key, oldPassWord);
         var baseUrl = window.xtglUrl || 'api/hq-xtgl';
         //修改密码
-        (0, _NHFetch3.default)(baseUrl + '/openapi/users/password/update?oldPassword=' + oldPwd + '&newPassword=' + newPwd, 'post', {}).then(function (res) {
+        (0, _NHFetch3.default)(baseUrl + '/outer/users/password/update?oldPassword=' + oldPwd + '&newPassword=' + newPwd, 'post', {}).then(function (res) {
           if (res && res.data.meta['success']) {
             _this.passWordForm.resetFields();
             _this.nhEditPassWordModal.close();

package/lib/utils/NHCore.js

@@ -224,7 +224,7 @@ var validateCode = exports.validateCode = function () {
 
             baseUrl = window.xtglUrl || 'api/hq-xtgl';
             _context.next = 6;
-            return NHFetch(baseUrl + '/openapi/getCsszByCsbz', 'GET', {
+            return NHFetch(baseUrl + '/outer/getCsszByCsbz', 'GET', {
               csbz: 'XTGL_TSZF'
             });
 

package/lib/utils/NHFetch.js

@@ -451,7 +451,9 @@ var NHFetch = function NHFetch(pUrl, pMethod, params, errorFunc) {
     //在此处统一对后台抛出来的异常进行处理
     return undefined;
   }).catch(function (error) {
-    return error;
+    console.log('请求异常:', error.message);
+    _message3.default.error('系统出现异常，请联系管理员！');
+    return;
   });
 };
 

package/package.json

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