eoss-ui 0.5.10 → 0.5.12

package/lib/main.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 29);
+/******/ 	return __webpack_require__(__webpack_require__.s = 30);
 /******/ })
 /************************************************************************/
 /******/ ([
@@ -97,14 +97,9 @@ module.exports =
 /* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(qs__WEBPACK_IMPORTED_MODULE_2__);
 /* harmony import */ var json_bigint__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(6);
 /* harmony import */ var json_bigint__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(json_bigint__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var sockjs_client__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(7);
-/* harmony import */ var sockjs_client__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(sockjs_client__WEBPACK_IMPORTED_MODULE_4__);
-/* harmony import */ var stompjs__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(8);
-/* harmony import */ var stompjs__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(stompjs__WEBPACK_IMPORTED_MODULE_5__);
-/* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(2);
-/* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(eoss_element__WEBPACK_IMPORTED_MODULE_6__);
-var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
-
+/* harmony import */ var _webSocket__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(7);
+/* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(2);
+/* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(eoss_element__WEBPACK_IMPORTED_MODULE_5__);
 var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
 
 /**
@@ -115,8 +110,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
  **/
 
 /* eslint-disable indent */
-var sm2 = __webpack_require__(9).sm2;
-
+var sm2 = __webpack_require__(10).sm2;
 
 
 
@@ -264,7 +258,7 @@ var ajax = function ajax(_ref) {
             clearTimeout(loginMsg);
             loginMsg = setTimeout(function () {
               sessionStorage.setItem('remind', 1);
-              eoss_element__WEBPACK_IMPORTED_MODULE_6__["MessageBox"].confirm(response.data.rCode === 69 ? '该账号在其他地方已登陆!' : '登录已过期，请重新登录!', '提示', response.data.rCode === 69 ? {
+              eoss_element__WEBPACK_IMPORTED_MODULE_5__["MessageBox"].confirm(response.data.rCode === 69 ? '该账号在其他地方已登陆!' : '登录已过期，请重新登录!', '提示', response.data.rCode === 69 ? {
                 confirmButtonText: '确定',
                 closeOnClickModal: false,
                 type: 'warning'
@@ -311,7 +305,7 @@ var ajax = function ajax(_ref) {
       } else if (response.data.rCode === 61) {
         clearTimeout(initAuth);
         initAuth = setTimeout(function () {
-          Object(eoss_element__WEBPACK_IMPORTED_MODULE_6__["MessageBox"])({
+          Object(eoss_element__WEBPACK_IMPORTED_MODULE_5__["MessageBox"])({
             title: '请进行二次鉴权',
             closeOnClickModal: false,
             closeOnPressEscape: false,
@@ -745,6 +739,7 @@ var delUrlParam = function delUrlParam(_ref2) {
       key.forEach(function (item) {
         if (param.hasOwnProperty(item)) {
           var reg = item + '=' + param[item];
+          console.log(reg);
           if (src.indexOf(reg + '&') > -1) {
             src = src.replace(reg + '&', '');
           } else if (src.indexOf('&' + reg) > -1) {
@@ -1945,7 +1940,6 @@ var isLogined = function isLogined(_ref8) {
       next = _ref8.next,
       _ref8$exclude = _ref8.exclude,
       exclude = _ref8$exclude === undefined ? [] : _ref8$exclude,
-      open = _ref8.open,
       cookie = _ref8.cookie,
       loginPage = _ref8.loginPage,
       redirect = _ref8.redirect;
@@ -1953,24 +1947,24 @@ var isLogined = function isLogined(_ref8) {
   if (cookie === undefined) {
     cookie = getParams({ name: 'cookie' });
   }
+  var pathname = win.top.location.pathname;
   if (loginPage) {
     sessionStorage.setItem('loginPage', loginPage);
     if (!startWith(loginPage, ['http', '/'], true)) {
-      var pathname = win.top.location.pathname;
       if (pathname !== '/') {
-        pathname = pathname.split('/');
-        pathname.splice(pathname.length - 1);
-        pathname = pathname.join('/');
-        loginPage = pathname + '/' + loginPage.replace('./', '');
+        var path = pathname.split('/');
+        path.splice(pathname.length - 1);
+        path = path.join('/');
+        loginPage = path + '/' + loginPage.replace('./', '');
       } else {
         loginPage = pathname + loginPage.replace('./', '');
       }
     }
   }
   var token = getStorage('token') || getStorage('Authorization');
-  var logined = getStorage('logined');
+  // const logined = getStorage('logined');
   // eslint-disable-next-line eqeqeq
-  if (token || logined || cookie == true || cookie == 1) {
+  if (token || cookie == true || cookie == 1) {
     next && next();
   } else {
     if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
@@ -1994,40 +1988,25 @@ var isLogined = function isLogined(_ref8) {
                   deviceUnique: results.deviceUnique
                 }
               });
-              next();
+              var url = delUrlParam({
+                url: win.top.location.href,
+                key: ['serverId', 'authType', 'code', 'sessionId']
+              });
+              win.top.location.href = url;
+              setTimeout(function () {
+                win.top.location.reload();
+              }, 200);
               break;
             case 1:
               break;
             case 2:
               break;
             case 3:
-              var url = win.top.location.href;
-              var href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(url));
-              if (to.query.openType) {
-                switch (to.query.openType) {
-                  case 'self':
-                    win.location.href = href;
-                    break;
-                  case 'blank':
-                    win.open(href);
-                    break;
-                  case 'top':
-                    win.top.location.href = href;
-                    break;
-                  case 'parent':
-                    win.parent.location.href = href;
-                    break;
-                }
-              } else {
-                if (open) {
-                  win.open(href);
-                } else {
-                  win.top.location.href = href;
-                }
-              }
+              var href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(win.top.location.href));
+              win.top.location.href = href;
               break;
             case 4:
-              eoss_element__WEBPACK_IMPORTED_MODULE_6__["MessageBox"].alert(results.msg ? results.msg : '账号未绑定，账号密码登录后自动绑定！', '提示', {
+              eoss_element__WEBPACK_IMPORTED_MODULE_5__["MessageBox"].alert(results.msg ? results.msg : '账号未绑定，账号密码登录后自动绑定！', '提示', {
                 confirmButtonText: '确定',
                 type: 'error',
                 callback: function callback() {
@@ -2047,7 +2026,7 @@ var isLogined = function isLogined(_ref8) {
             default:
           }
         } else {
-          eoss_element__WEBPACK_IMPORTED_MODULE_6__["MessageBox"].alert(res.msg, '提示', {
+          eoss_element__WEBPACK_IMPORTED_MODULE_5__["MessageBox"].alert(res.msg, '提示', {
             confirmButtonText: '确定',
             type: 'error',
             callback: function callback() {
@@ -2178,7 +2157,7 @@ var loadJs = function loadJs(_ref10) {
  **/
 var loading = function loading($loading, res) {
   if (!$loading) {
-    $loading = eoss_element__WEBPACK_IMPORTED_MODULE_6__["Loading"].service;
+    $loading = eoss_element__WEBPACK_IMPORTED_MODULE_5__["Loading"].service;
   }
   if (isObject(res)) {
     var config = extend({}, {
@@ -2543,63 +2522,25 @@ var setStorage = function setStorage(_ref14) {
  * @author huangbo
  * @date 2022年5月7日
  * @param {String} [url] - 连接地址
+ * @param {String} [send] - 是否发送消息
  * @param {String} [take] - 订阅地址
  * @param {String} [debug] - 调试
  * @param {String} [interval] - 重连间隔时间
+ * @param {Function} [success] - 调试
+ * @param {Function} [error] - 重连间隔时间
  **/
-function socket(options) {
-  var nextDate = 0;
-  var connect = 1;
-  return new Promise(function (resolve, reject) {
-    var wshost = getStorage('wshost') || '';
-    var option = {
-      url: wshost + _config_api__WEBPACK_IMPORTED_MODULE_0__[/* wss */ "Zb"],
-      take: _config_api__WEBPACK_IMPORTED_MODULE_0__[/* topic */ "Qb"],
-      debug: true,
-      interval: 20
-    };
-    var websocket = win.websocket || {};
-    if (options && isObject(options)) {
-      option = _extends({}, option, options);
-    }
-    var key = window.btoa(option.url);
-    if (!websocket[key]) {
-      websocket[key] = { socket: new sockjs_client__WEBPACK_IMPORTED_MODULE_4___default.a(option.url) };
-      win.websocket = websocket;
-    }
-
-    var client = websocket[key] ? websocket[key].client : null;
-    if (!client) {
-      client = websocket[key].client = stompjs__WEBPACK_IMPORTED_MODULE_5___default.a.over(websocket[key].socket);
-      !option.debug && (client.debug = null);
+function socket(option, vm) {
+  var options = {};
+  for (var i in option) {
+    if (i === 'send') {
+      options['isSend'] = option[i];
+    } else {
+      options[i] = option[i];
     }
-    client.connect({}, function () {
-      client.subscribe(option.take, function (response) {
-        var res = JSON.parse(response.body);
-        resolve(res, function () {
-          client.disconnect();
-          win.top.websocket && win.top.websocket[key] && delete win.top.websocket[key];
-        }, client, websocket[key]);
-      });
-    }, function (error) {
-      var diffSecond = parseInt((new Date() - nextDate) / 1000, 10);
-      if (connect > 5 && diffSecond < option.interval) {
-        client.disconnect();
-        if (win.top.websocket) {
-          if (Object.keys(win.top.websocket).length > 1) {
-            delete win.top.websocket[key];
-          } else {
-            delete win.top.websocket;
-          }
-        }
-      } else {
-        win.top.websocket && win.top.websocket[key] && setTimeout(function () {
-          socket(options);
-        }, 5000);
-      }
-      reject(error);
-    });
-  });
+  }
+  var socket = new _webSocket__WEBPACK_IMPORTED_MODULE_4__[/* default */ "a"]();
+  socket.init(options, vm);
+  return socket;
 }
 /**
  * sum
@@ -3507,24 +3448,159 @@ module.exports = require("json-bigint");
 
 /***/ }),
 /* 7 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony import */ var sockjs_client__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8);
+/* harmony import */ var sockjs_client__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(sockjs_client__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var stompjs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(9);
+/* harmony import */ var stompjs__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(stompjs__WEBPACK_IMPORTED_MODULE_1__);
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+
+
+
+var WebSocket = function () {
+  // 构造函数
+  function WebSocket() {
+    _classCallCheck(this, WebSocket);
+
+    this.host = sessionStorage.getItem('wshost') || '';
+    this.tryTimes = 1; // 重连次数
+    this.callback = null; // 回调函数
+    this.client = null; // stomp对象
+    this.reconTimeout = null; // 重连延时器
+    this.debug = true; // 调试
+    this.interval = 20; // 重连间隔时间
+    this.vm = null;
+    this.nextDate = 0;
+    this.connects = 1;
+    this.recon = false;
+    this.sendTimeout = null;
+    this.isSend = false;
+  }
+
+  /** socket连接 */
+
+
+  WebSocket.prototype.connect = function connect() {
+    var _this = this;
+
+    if (!this.client) {
+      // 连接SockJS
+      var socket = new sockjs_client__WEBPACK_IMPORTED_MODULE_0___default.a(this.host + this.url);
+      // 获取STOMP子协议的客户端对象
+      this.client = stompjs__WEBPACK_IMPORTED_MODULE_1___default.a.over(socket);
+    }
+
+    // 日志不打印
+    if (!this.debug) {
+      console.log(111);
+      this.client.debug = function () {};
+    }
+
+    // 向服务器发起websocket连接
+    this.client.connect({}, function () {
+      _this.recon = true;
+      // tryTimes定义重置
+      _this.connects = 1;
+      // 订阅消息
+      // if (!this.isSend) {
+      _this.subscribe();
+      // }
+    }, function (error) {
+      var diffSecond = parseInt((new Date() - _this.nextDate) / 1000, 10);
+      if (_this.connects > 5 && diffSecond < _this.interval) {
+        _this.client.disconnect();
+        _this.error && _this.error(error);
+      } else {
+        _this.reconTimeout = setTimeout(function () {
+          _this.connect();
+          _this.connects++;
+        }, 5000);
+      }
+    });
+  };
+  /** 订阅服务端 */
+
+
+  WebSocket.prototype.subscribe = function subscribe() {
+    var _this2 = this;
+
+    // 订阅服务端提供的某个topic
+    this.client.subscribe(this.take, function (response) {
+      if (response && (_this2.callback || _this2.success)) {
+        var callback = _this2.callback || _this2.success;
+        callback(JSON.parse(response.body));
+      }
+    });
+  };
+
+  /** 赋值、初始化socket */
+
+
+  WebSocket.prototype.init = function init(option, vm) {
+    for (var i in option) {
+      this[i] = option[i];
+    }
+    this.vm = vm;
+    // 初始化连接
+    this.connect();
+  };
+
+  /** 发送消息 */
+
+
+  WebSocket.prototype.send = function send(data) {
+    var _this3 = this;
+
+    if (this.recon) {
+      clearTimeout(this.sendTimeout);
+      this.client.send(this.take, {}, typeof data === 'string' ? data : JSON.stringify(data));
+    } else {
+      this.sendTimeout = setTimeout(function () {
+        _this3.send(data);
+      }, 1000);
+    }
+  };
+
+  /** 销毁 */
+
+
+  WebSocket.prototype.destroy = function destroy() {
+    // 断开连接,清除定时器
+    if (this.client) {
+      this.client.disconnect();
+    };
+    this.reconTimeout && clearTimeout(this.reconTimeout);
+    this.sendTimeout && clearTimeout(this.sendTimeout);
+  };
+
+  return WebSocket;
+}();
+
+/* harmony default export */ __webpack_exports__["a"] = (WebSocket);
+
+/***/ }),
+/* 8 */
 /***/ (function(module, exports) {
 
 module.exports = require("sockjs-client");
 
 /***/ }),
-/* 8 */
+/* 9 */
 /***/ (function(module, exports) {
 
 module.exports = require("stompjs");
 
 /***/ }),
-/* 9 */
+/* 10 */
 /***/ (function(module, exports) {
 
 module.exports = require("sm-crypto");
 
 /***/ }),
-/* 10 */
+/* 11 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -3551,13 +3627,12 @@ window.__store = store;
 /* harmony default export */ __webpack_exports__["a"] = (store);
 
 /***/ }),
-/* 11 */
+/* 12 */
 /***/ (function(module, exports) {
 
 module.exports = require("babel-runtime/regenerator");
 
 /***/ }),
-/* 12 */,
 /* 13 */,
 /* 14 */,
 /* 15 */,
@@ -3565,13 +3640,13 @@ module.exports = require("babel-runtime/regenerator");
 /* 17 */,
 /* 18 */,
 /* 19 */,
-/* 20 */
+/* 20 */,
+/* 21 */
 /***/ (function(module, exports) {
 
 module.exports = require("runtime-import");
 
 /***/ }),
-/* 21 */,
 /* 22 */,
 /* 23 */,
 /* 24 */,
@@ -3579,14 +3654,15 @@ module.exports = require("runtime-import");
 /* 26 */,
 /* 27 */,
 /* 28 */,
-/* 29 */
+/* 29 */,
+/* 30 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=template&id=cef5b378&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=template&id=6a19317b&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4016,11 +4092,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=cef5b378&
-
-// EXTERNAL MODULE: external "babel-runtime/regenerator"
-var regenerator_ = __webpack_require__(11);
-var regenerator_default = /*#__PURE__*/__webpack_require__.n(regenerator_);
+// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=6a19317b&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/userinfo.vue?vue&type=template&id=799780ee&
 var userinfovue_type_template_id_799780ee_render = function () {
@@ -4049,7 +4121,7 @@ userinfovue_type_template_id_799780ee_render._withStripped = true
 var api = __webpack_require__(1);
 
 // EXTERNAL MODULE: ./src/utils/store.js
-var store = __webpack_require__(10);
+var store = __webpack_require__(11);
 
 // EXTERNAL MODULE: ./src/utils/util.js
 var util = __webpack_require__(0);
@@ -5665,8 +5737,12 @@ async_componentvue_type_template_id_51f0233c_scoped_true_render._withStripped =
 
 // CONCATENATED MODULE: ./packages/main/src/async-component/index.vue?vue&type=template&id=51f0233c&scoped=true&
 
+// EXTERNAL MODULE: external "babel-runtime/regenerator"
+var regenerator_ = __webpack_require__(12);
+var regenerator_default = /*#__PURE__*/__webpack_require__.n(regenerator_);
+
 // EXTERNAL MODULE: external "runtime-import"
-var external_runtime_import_ = __webpack_require__(20);
+var external_runtime_import_ = __webpack_require__(21);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/async-component/index.vue?vue&type=script&lang=js&
 
@@ -5818,12 +5894,8 @@ var async_component_component = Object(componentNormalizer["a" /* default */])(
 
 /* harmony default export */ var async_component = (async_component_component.exports);
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=script&lang=js&
-
-
 var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
-function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; }
-
 //
 //
 //
@@ -6354,8 +6426,6 @@ var log = util["a" /* default */].getParams('console');
         copyright: { comp: '', data: {} }
       },
       pageLoading: false,
-      close: null,
-      connect: 0,
       wjName: 'singlespa',
       menus: '',
       //头部导航
@@ -6432,7 +6502,8 @@ var log = util["a" /* default */].getParams('console');
       navIds: null,
       timer: null,
       pid: null,
-      showPage: false
+      showPage: false,
+      webSocket: null
     };
   },
   created: function created() {
@@ -6441,7 +6512,7 @@ var log = util["a" /* default */].getParams('console');
     this.isHeader = params.header;
     var sysLogoIco = sessionStorage.getItem('sysLogoIco');
     sysLogoIco && util["a" /* default */].setFavicon(sysLogoIco);
-    this.isLogin(params);
+    this.getConfig(params);
   },
   mounted: function mounted() {
     util["a" /* default */].win.reLogin = this.handleReLogin;
@@ -6457,156 +6528,6 @@ var log = util["a" /* default */].getParams('console');
   },
 
   methods: {
-    isLogin: function isLogin(query) {
-      var _this = this;
-
-      return mainvue_type_script_lang_js_asyncToGenerator( /*#__PURE__*/regenerator_default.a.mark(function _callee() {
-        var token, loginPage, pathname;
-        return regenerator_default.a.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                token = util["a" /* default */].getStorage('token') || util["a" /* default */].getStorage('Authorization');
-                loginPage = util["a" /* default */].getStorage('login') || util["a" /* default */].getStorage('loginPage');
-
-                if (loginPage) {
-                  if (!util["a" /* default */].startWith(loginPage, ['http', '/'], true)) {
-                    pathname = util["a" /* default */].win.top.location.pathname;
-
-                    if (pathname !== '/') {
-                      pathname = pathname.split('/');
-                      pathname.splice(pathname.length - 1);
-                      pathname = pathname.join('/');
-                      loginPage = pathname + '/' + loginPage.replace('./', '');
-                    } else {
-                      loginPage = pathname + loginPage.replace('./', '');
-                    }
-                  }
-                }
-
-                if (!(!token && query && Object.prototype.hasOwnProperty.call(query, 'serverId') && Object.prototype.hasOwnProperty.call(query, 'authType'))) {
-                  _context.next = 8;
-                  break;
-                }
-
-                _context.next = 6;
-                return util["a" /* default */].ajax({
-                  method: 'post',
-                  url: api["b" /* authCenter */],
-                  data: query
-                }).then(function (res) {
-                  if (res.rCode === 0) {
-                    var results = res.results;
-
-                    switch (results.statusCode) {
-                      case 0:
-                        util["a" /* default */].setStorage({
-                          type: _this.storage,
-                          key: {
-                            ssId: results.ssId,
-                            token: results.token,
-                            Authorization: results.token,
-                            deviceUnique: results.deviceUnique
-                          }
-                        });
-                        if (query.openType) {
-                          var _url2 = util["a" /* default */].win.top.location.href;
-                          var newUrl = util["a" /* default */].delUrlParam({
-                            url: _url2,
-                            key: ['serverId', 'authType', 'openType']
-                          });
-                          switch (query.openType) {
-                            case 'self':
-                              util["a" /* default */].win.location.href = newUrl;
-                              break;
-                            case 'blank':
-                              util["a" /* default */].win.open(newUrl);
-                              break;
-                            case 'parent':
-                              util["a" /* default */].win.parent.location.href = _href;
-                              break;
-                            default:
-                              util["a" /* default */].win.top.location.href = _href;
-                          }
-                        } else {
-                          _this.getConfig();
-                        }
-                        break;
-                      case 1:
-                        break;
-                      case 2:
-                        break;
-                      case 3:
-                        var _href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(url));
-                        switch (query.openType) {
-                          case 'self':
-                            util["a" /* default */].win.location.href = _href;
-                            break;
-                          case 'blank':
-                            util["a" /* default */].win.open(_href);
-                            break;
-                          case 'parent':
-                            util["a" /* default */].win.parent.location.href = _href;
-                            break;
-                          default:
-                            util["a" /* default */].win.top.location.href = _href;
-                        }
-                        break;
-                      case 4:
-                        _this.$alert(results.msg ? results.msg : '账号未绑定，账号密码登录后自动绑定！', '提示', {
-                          confirmButtonText: '确定',
-                          type: 'error',
-                          callback: function callback() {
-                            sessionStorage.setItem('extUserBindHandleId', results.extUserBindHandleId);
-                            //window.location.href = delUrlParam({ key: 'code' });
-                            if (loginPage) {
-                              util["a" /* default */].win.top.location.replace(loginPage);
-                            } else if (document.referrer) {
-                              util["a" /* default */].win.top.location.replace(document.referrer);
-                            } else if (util["a" /* default */].win.top.location.href.indexOf('main.html') > -1) {
-                              util["a" /* default */].win.top.location.href = './login.html';
-                            } else {
-                              _this.$router.replace('/login');
-                            }
-                          }
-                        });
-                        break;
-                      default:
-                    }
-                  } else {
-                    _this.$alert(res.msg, '提示', {
-                      confirmButtonText: '确定',
-                      type: 'error',
-                      callback: function callback() {
-                        if (loginPage) {
-                          util["a" /* default */].win.top.location.replace(loginPage);
-                        } else if (document.referrer) {
-                          util["a" /* default */].win.top.location.replace(document.referrer);
-                        } else if (util["a" /* default */].win.top.location.href.indexOf('main.html') > -1) {
-                          util["a" /* default */].win.top.location.href = './login.html';
-                        } else {
-                          _this.$router.replace('/login');
-                        }
-                      }
-                    });
-                  }
-                }).catch(function (e) {});
-
-              case 6:
-                _context.next = 9;
-                break;
-
-              case 8:
-                _this.getConfig();
-
-              case 9:
-              case 'end':
-                return _context.stop();
-            }
-          }
-        }, _callee, _this);
-      }))();
-    },
     menuSuccess: function menuSuccess(res) {
       // this.menus
       this.menuType = 'custom';
@@ -6618,14 +6539,14 @@ var log = util["a" /* default */].getParams('console');
 
     //获取主题模板JSON
     getMainDetail: function getMainDetail(id) {
-      var _this2 = this;
+      var _this = this;
 
       var params = {
         url: api["cb" /* mainDetail */],
         params: { id: id }
       };
       util["a" /* default */].ajax(params).then(function (res) {
-        var _that = _this2;
+        var _that = _this;
         if (!res.results) {
           _that.showDefault = true;
         }
@@ -6661,7 +6582,7 @@ var log = util["a" /* default */].getParams('console');
         }
       }).catch(function (err) {
         if (err.message && err.message !== 'canceled') {
-          _this2.$message.error(err.message);
+          _this.$message.error(err.message);
         }
       });
     },
@@ -6737,7 +6658,7 @@ var log = util["a" /* default */].getParams('console');
 
     //设置主题颜色
     setTheme: function setTheme(color) {
-      var _this3 = this;
+      var _this2 = this;
 
       if (!color) {
         return;
@@ -6748,24 +6669,24 @@ var log = util["a" /* default */].getParams('console');
         data: { color: escape(color.toLowerCase()) }
       }).then(function (res) {
         if (res.rCode === 0) {
-          _this3.color = color;
+          _this2.color = color;
           localStorage.setItem('theme', color);
           var _mainConfig = JSON.parse(util["a" /* default */].getStorage('mainConfig'));
-          _mainConfig.userStyle.color = _this3.color;
+          _mainConfig.userStyle.color = _this2.color;
           sessionStorage.setItem('mainConfig', JSON.stringify(_mainConfig));
-          _this3.$emit('setting', 'theme', _this3.color);
-          _this3.$message({
+          _this2.$emit('setting', 'theme', _this2.color);
+          _this2.$message({
             message: res.msg,
             type: 'success',
             duration: 2000
           });
         } else {
           var msg = res.msg || '系统错误，请联系管理员！';
-          _this3.$message.error(msg);
+          _this2.$message.error(msg);
         }
       }).catch(function (err) {
         if (err.message && err.message !== 'canceled') {
-          _this3.$message.error(err.message);
+          _this2.$message.error(err.message);
         }
       });
     },
@@ -6852,9 +6773,13 @@ var log = util["a" /* default */].getParams('console');
     },
 
     //获取用户配置及信息
-    getConfig: function getConfig() {
-      var _this4 = this;
+    getConfig: function getConfig(query) {
+      var _this3 = this;
 
+      var token = util["a" /* default */].getStorage('token') || util["a" /* default */].getStorage('Authorization');
+      if (!token && Object.prototype.hasOwnProperty.call(query, 'serverId') && Object.prototype.hasOwnProperty.call(query, 'authType')) {
+        return false;
+      }
       if (util["a" /* default */].getStorage('mainConfig')) {
         var results = JSON.parse(util["a" /* default */].getStorage('mainConfig'));
         this.setConfig(results);
@@ -6867,39 +6792,39 @@ var log = util["a" /* default */].getParams('console');
       }
       util["a" /* default */].ajax({ url: this.mainConfig }).then(function (res) {
         if (res && res.rCode === 0) {
-          _this4.setConfig(res.results, 1);
-          if (_this4.socket) {
-            _this4.initWebSocket();
+          _this3.setConfig(res.results, 1);
+          if (_this3.socket) {
+            _this3.initWebSocket();
           }
-          if (_this4.remote) {
-            _this4.getMenu();
+          if (_this3.remote) {
+            _this3.getMenu();
           } else {
-            _this4.renderMenu();
+            _this3.renderMenu();
           }
         } else {
           var msg = res.msg || '系统错误，请联系管理员！';
-          _this4.$message.error(msg);
+          _this3.$message.error(msg);
         }
       }).catch(function (err) {
         if (err.message && err.message !== 'canceled') {
-          _this4.$message.error(err.message);
+          _this3.$message.error(err.message);
         }
       });
     },
     reGetConfig: function reGetConfig() {
-      var _this5 = this;
+      var _this4 = this;
 
       util["a" /* default */].ajax({ url: this.mainConfig }).then(function (res) {
         if (res && res.rCode === 0) {
           var results = JSON.parse(JSON.stringify(res.results));
-          _this5.setConfig(results, 1);
+          _this4.setConfig(results, 1);
         } else {
           var msg = res.msg || '系统错误，请联系管理员！';
-          _this5.$message.error(msg);
+          _this4.$message.error(msg);
         }
       }).catch(function (err) {
         if (err.message && err.message !== 'canceled') {
-          _this5.$message.error(err.message);
+          _this4.$message.error(err.message);
         }
       });
     },
@@ -6960,8 +6885,8 @@ var log = util["a" /* default */].getParams('console');
           return item.id;
         } else {
           if (path && item.url) {
-            var _url3 = new URL(item.url, window.location.origin);
-            if (_url3.hash == res) {
+            var url = new URL(item.url, window.location.origin);
+            if (url.hash == res) {
               return item.id;
             }
           }
@@ -6972,24 +6897,24 @@ var log = util["a" /* default */].getParams('console');
 
     //获取应用导航菜单
     getMenu: function getMenu() {
-      var _this6 = this;
+      var _this5 = this;
 
       util["a" /* default */].ajax({ url: this.action, params: this.param ? this.param : {} }).then(function (res) {
         if (res.rCode === 0) {
           if (res.results && res.results.length) {
-            _this6.menus = JSON.parse(JSON.stringify(res.results));
+            _this5.menus = JSON.parse(JSON.stringify(res.results));
             var applicationid = util["a" /* default */].getParams('applicationid') || util["a" /* default */].getParams('applicationId');
             if (applicationid) {
-              var ids = _this6.getId(_this6.menus, applicationid);
+              var ids = _this5.getId(_this5.menus, applicationid);
               if (ids) {
-                _this6.defaultActive = ids;
+                _this5.defaultActive = ids;
               }
-            } else if (sessionStorage.getItem('jump') && _this6.isHistory) {
-              var _ids4 = _this6.getId(_this6.menus, sessionStorage.getItem('jump'), true);
+            } else if (sessionStorage.getItem('jump') && _this5.isHistory) {
+              var _ids4 = _this5.getId(_this5.menus, sessionStorage.getItem('jump'), true);
               if (_ids4) {
-                _this6.defaultActive = _ids4;
-                _this6.navIds = _ids4;
-                _this6.setTitle(_ids4[0]);
+                _this5.defaultActive = _ids4;
+                _this5.navIds = _ids4;
+                _this5.setTitle(_ids4[0]);
               }
             } else if (util["a" /* default */].win.location.hash) {
               var hash = util["a" /* default */].win.location.hash;
@@ -6997,34 +6922,34 @@ var log = util["a" /* default */].getParams('console');
                 hash = hash.split('?')[0];
               }
               if (hash !== '#/' && hash !== '#/main') {
-                var _ids5 = _this6.getId(_this6.menus, util["a" /* default */].win.location.hash, true);
+                var _ids5 = _this5.getId(_this5.menus, util["a" /* default */].win.location.hash, true);
                 if (_ids5) {
-                  _this6.defaultActive = _ids5;
-                  _this6.navIds = _ids5;
-                  _this6.setTitle(_ids5[0]);
+                  _this5.defaultActive = _ids5;
+                  _this5.navIds = _ids5;
+                  _this5.setTitle(_ids5[0]);
                 }
-              } else if (sessionStorage.getItem('jump') && _this6.isHistory) {
-                var _ids6 = _this6.getId(_this6.menus, sessionStorage.getItem('jump'), true);
+              } else if (sessionStorage.getItem('jump') && _this5.isHistory) {
+                var _ids6 = _this5.getId(_this5.menus, sessionStorage.getItem('jump'), true);
                 if (_ids6) {
-                  _this6.defaultActive = _ids6;
-                  _this6.navIds = _ids6;
-                  _this6.setTitle(_ids6[0]);
+                  _this5.defaultActive = _ids6;
+                  _this5.navIds = _ids6;
+                  _this5.setTitle(_ids6[0]);
                 }
               }
             }
-            _this6.setTips(_this6.menus);
-            store["a" /* default */].set('nav', _this6.menus);
-            _this6.setMenu(_this6.menus);
+            _this5.setTips(_this5.menus);
+            store["a" /* default */].set('nav', _this5.menus);
+            _this5.setMenu(_this5.menus);
           } else {
-            _this6.$message.error('未分配菜单权限，请联系管理员！');
+            _this5.$message.error('未分配菜单权限，请联系管理员！');
           }
         } else {
           var msg = res.msg || '系统错误，请联系管理员！';
-          _this6.$message.error(msg);
+          _this5.$message.error(msg);
         }
       }).catch(function (err) {
         if (err.message && err.message !== 'canceled') {
-          _this6.$message.error(err.message);
+          _this5.$message.error(err.message);
         }
       });
     },
@@ -7146,11 +7071,11 @@ var log = util["a" /* default */].getParams('console');
 
     //遍历设置菜单气泡提醒
     setTips: function setTips(obj) {
-      var _this7 = this;
+      var _this6 = this;
 
       if (Array.isArray(obj)) {
         obj.forEach(function (item) {
-          _this7.setTips(item);
+          _this6.setTips(item);
         });
       } else {
         if (obj && Object.prototype.hasOwnProperty.call(obj, 'tips') && obj.tips) {
@@ -7160,7 +7085,7 @@ var log = util["a" /* default */].getParams('console');
         var flag = false;
         if (obj.children && obj.children.length) {
           obj.children.forEach(function (item) {
-            if (_this7.setTips(item)) {
+            if (_this6.setTips(item)) {
               flag = true;
             }
           });
@@ -7170,7 +7095,7 @@ var log = util["a" /* default */].getParams('console');
           }
         } else if (obj.fourthTabs && obj.fourthTabs.length) {
           obj.fourthTabs.forEach(function (item) {
-            if (_this7.setTips(item)) {
+            if (_this6.setTips(item)) {
               flag = true;
             }
           });
@@ -7254,19 +7179,19 @@ var log = util["a" /* default */].getParams('console');
           } else {
             if (item.children && item.children.length) {
               index++;
-              var _url4 = this.getUrl(item.children, active, index, param);
-              if (_url4 && index === active.length - 1) {
+              var url = this.getUrl(item.children, active, index, param);
+              if (url && index === active.length - 1) {
                 this.tabs = '';
               }
-              return _url4;
+              return url;
             }
             if (item.fourthTabs && item.fourthTabs.length) {
               index++;
-              var _url5 = this.getUrl(item.fourthTabs, active, index, param);
-              if (_url5) {
+              var _url2 = this.getUrl(item.fourthTabs, active, index, param);
+              if (_url2) {
                 this.$set(this, 'tabs', item.fourthTabs);
               }
-              return _url5;
+              return _url2;
             }
           }
         } else if (item.children && item.children.length) {
@@ -7464,7 +7389,7 @@ var log = util["a" /* default */].getParams('console');
 
     //头部工具交互事件
     handleClick: function handleClick(res) {
-      var _this8 = this;
+      var _this7 = this;
 
       var type = res.type;
 
@@ -7485,7 +7410,7 @@ var log = util["a" /* default */].getParams('console');
             this.setMenu(this.menus);
           }
           this.$nextTick(function () {
-            _this8.reset = true;
+            _this7.reset = true;
           });
           break;
         case 'user':
@@ -7513,21 +7438,21 @@ var log = util["a" /* default */].getParams('console');
 
     //刷新子页面、子路由
     handleRefresh: function handleRefresh() {
-      var _this9 = this;
+      var _this8 = this;
 
       if (this.method === 'iframe') {
         this.page = util["a" /* default */].handlerUrl(this.page);
       } else {
         this.refresh = false;
         this.$nextTick(function () {
-          _this9.refresh = true;
+          _this8.refresh = true;
         });
       }
     },
 
     //跳转页面
     handleJump: function handleJump(page, type, res, param) {
-      var _this10 = this;
+      var _this9 = this;
 
       console.log(page);
       var prevPage = sessionStorage.getItem('jump');
@@ -7558,7 +7483,7 @@ var log = util["a" /* default */].getParams('console');
           this.wjName = 'singlespa';
           this.page = this.host + page;
           this.$nextTick(function () {
-            _this10.refresh = true;
+            _this9.refresh = true;
           });
         } else if (urls[0].indexOf('.dhtml') > 0 || urls[0].indexOf('.html') > 0 && urls[0].indexOf('.html#') === -1) {
           this.method = 'iframe';
@@ -7590,7 +7515,7 @@ var log = util["a" /* default */].getParams('console');
                   query: params
                 });
                 this.$nextTick(function () {
-                  _this10.refresh = true;
+                  _this9.refresh = true;
                 });
               } else {
                 var urlopenmode = util["a" /* default */].getParams({
@@ -7606,7 +7531,7 @@ var log = util["a" /* default */].getParams('console');
                   this.wjName = res && res.appCode ? res.appCode : 'application';
                   this.page = this.host + page;
                   this.$nextTick(function () {
-                    _this10.refresh = true;
+                    _this9.refresh = true;
                   });
                 }
               }
@@ -7618,7 +7543,7 @@ var log = util["a" /* default */].getParams('console');
         }
       }
       this.$nextTick(function () {
-        _this10.showPage = true;
+        _this9.showPage = true;
       });
     },
 
@@ -7730,7 +7655,7 @@ var log = util["a" /* default */].getParams('console');
 
     //监听改变菜单
     handleListener: function handleListener() {
-      var _this11 = this;
+      var _this10 = this;
 
       util["a" /* default */].win.addEventListener('message', function (e) {
         var msg = e.data;
@@ -7739,61 +7664,62 @@ var log = util["a" /* default */].getParams('console');
           if (typeof res === 'string') {
             res = res.split(',');
           }
-          _this11.setDefault(_this11.menus, res);
+          _this10.setDefault(_this10.menus, res);
         }
       }, false);
     },
 
     //开启weosocket
     initWebSocket: function initWebSocket() {
-      var _this12 = this;
+      var _this11 = this;
 
-      util["a" /* default */].socket().then(function (res, close) {
-        _this12.close = close;
-        var data = res.data;
-        for (var i in data) {
-          if (data[i] !== null && data[i] !== undefined) {
-            if (i === 'onlineUserNums' && data[i] > 0) {
-              _this12.online = data[i];
-            }
-            if (i === 'sysMsgNums') {
-              _this12.notice = data[i];
-              if (_this12.showMsg) {
-                _this12.$refs.message.getMsg(true);
+      this.webSocket = util["a" /* default */].socket({
+        url: api["Zb" /* wss */],
+        take: api["Qb" /* topic */],
+        success: function success(res) {
+          var data = res.data || {};
+          for (var i in data) {
+            if (data[i] !== null && data[i] !== undefined) {
+              if (i === 'onlineUserNums' && data[i] > 0) {
+                _this11.online = data[i];
+              }
+              if (i === 'sysMsgNums') {
+                _this11.notice = data[i];
+                if (_this11.showMsg) {
+                  _this11.$refs.message.getMsg(true);
+                }
+              }
+              if (i === 'menuTipsMap') {
+                _this11.menuTips = data[i];
+              }
+              if (i === 'sysMsgList') {
+                _this11.sysMsg = data[i];
+              }
+              if (i === 'extraData') {
+                _this11.extraData = data[i];
               }
-            }
-            if (i === 'menuTipsMap') {
-              _this12.menuTips = data[i];
-            }
-            if (i === 'sysMsgList') {
-              _this12.sysMsg = data[i];
-            }
-            if (i === 'extraData') {
-              _this12.extraData = data[i];
             }
           }
+          if (_this11.$store) {
+            _this11.$store.commit('websocket', data);
+          }
+          if (_this11.$eventBus) {
+            _this11.$eventBus.$emit('websocket', data);
+          }
+          if (util["a" /* default */].win.eventBus) {
+            util["a" /* default */].win.eventBus.$emit('websocket', data);
+          }
         }
-        if (_this12.$store) {
-          _this12.$store.commit('websocket', data);
-        }
-        if (_this12.$eventBus) {
-          _this12.$eventBus.$emit('websocket', data);
-        }
-        if (util["a" /* default */].win.eventBus) {
-          util["a" /* default */].win.eventBus.$emit('websocket', data);
-        }
-      }).catch(function (err) {
-        console.log(err);
       });
     },
     handleOpened: function handleOpened(res) {
-      var _this13 = this;
+      var _this12 = this;
 
       if (res === undefined) {
         this.sysMsg = [];
       } else if (res == false && this.sysMsg.length) {
         this.sysMsgOut = setTimeout(function () {
-          _this13.sysMsg = [];
+          _this12.sysMsg = [];
         }, 3000);
       } else if (this.sysMsgOut) {
         clearTimeout(this.sysMsgOut);
@@ -7814,7 +7740,7 @@ var log = util["a" /* default */].getParams('console');
       }
     },
     handleReLogin: function handleReLogin(res) {
-      var _this14 = this;
+      var _this13 = this;
 
       if (res && typeof res == 'string') {
         res = JSON.parse(res);
@@ -7845,7 +7771,7 @@ var log = util["a" /* default */].getParams('console');
         this.timer = setTimeout(function () {
           console.log('handleReLogin');
           sessionStorage.setItem('remind', 1);
-          _this14.$confirm(msg, btn).then(function () {
+          _this13.$confirm(msg, btn).then(function () {
             util["a" /* default */].removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'auth', 'deviceUnique', 'menus', 'useCaseCodes', 'mainConfig', 'jump']);
             var loginPage = util["a" /* default */].getStorage('login') || util["a" /* default */].getStorage('loginPage');
             if (loginPage) {
@@ -7903,8 +7829,8 @@ var log = util["a" /* default */].getParams('console');
   },
   beforeDestroy: function beforeDestroy() {
     this.timer = null;
-    if (this.close) {
-      this.close();
+    if (this.webSocket) {
+      this.webSocket.destroy();
     }
   }
 });