eoss-ui 0.5.10 → 0.5.12

package/lib/upload.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 34);
+/******/ 	return __webpack_require__(__webpack_require__.s = 35);
 /******/ })
 /************************************************************************/
 /******/ ([
@@ -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,7 +3627,6 @@ window.__store = store;
 /* harmony default export */ __webpack_exports__["a"] = (store);
 
 /***/ }),
-/* 11 */,
 /* 12 */,
 /* 13 */,
 /* 14 */,
@@ -3564,13 +3639,13 @@ window.__store = store;
 /* 21 */,
 /* 22 */,
 /* 23 */,
-/* 24 */
+/* 24 */,
+/* 25 */
 /***/ (function(module, exports) {
 
 module.exports = require("js-base64");
 
 /***/ }),
-/* 25 */,
 /* 26 */,
 /* 27 */,
 /* 28 */,
@@ -3579,7 +3654,8 @@ module.exports = require("js-base64");
 /* 31 */,
 /* 32 */,
 /* 33 */,
-/* 34 */
+/* 34 */,
+/* 35 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -3995,10 +4071,10 @@ var util = __webpack_require__(0);
   pdf: 'data:image/png;base64,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'
 });
 // EXTERNAL MODULE: ./src/utils/store.js
-var store = __webpack_require__(10);
+var store = __webpack_require__(11);
 
 // EXTERNAL MODULE: external "js-base64"
-var external_js_base64_ = __webpack_require__(24);
+var external_js_base64_ = __webpack_require__(25);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/main.vue?vue&type=script&lang=js&
 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; };

package/lib/utils/util.js

@@ -1,7 +1,5 @@
 exports.__esModule = true;
 
-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; };
-
 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; };
 
 var _api = require('../config/api');
@@ -18,13 +16,9 @@ var _jsonBigint = require('json-bigint');
 
 var _jsonBigint2 = _interopRequireDefault(_jsonBigint);
 
-var _sockjsClient = require('sockjs-client');
-
-var _sockjsClient2 = _interopRequireDefault(_sockjsClient);
+var _webSocket = require('./webSocket');
 
-var _stompjs = require('stompjs');
-
-var _stompjs2 = _interopRequireDefault(_stompjs);
+var _webSocket2 = _interopRequireDefault(_webSocket);
 
 var _eossElement = require('eoss-element');
 
@@ -663,6 +657,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) {
@@ -1863,7 +1858,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;
@@ -1871,24 +1865,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')) {
@@ -1912,37 +1906,22 @@ 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:
               _eossElement.MessageBox.alert(results.msg ? results.msg : '账号未绑定，账号密码登录后自动绑定！', '提示', {
@@ -2461,63 +2440,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] - 重连间隔时间
- **/
-function socket(options) {
-  var nextDate = 0;
-  var connect = 1;
-  return new Promise(function (resolve, reject) {
-    var wshost = getStorage('wshost') || '';
-    var option = {
-      url: wshost + _api.wss,
-      take: _api.topic,
-      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 _sockjsClient2.default(option.url) };
-      win.websocket = websocket;
-    }
-
-    var client = websocket[key] ? websocket[key].client : null;
-    if (!client) {
-      client = websocket[key].client = _stompjs2.default.over(websocket[key].socket);
-      !option.debug && (client.debug = null);
+ * @param {Function} [success] - 调试
+ * @param {Function} [error] - 重连间隔时间
+ **/
+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 _webSocket2.default();
+  socket.init(options, vm);
+  return socket;
 }
 /**
  * sum