2 년 전 · ad6fabfe03
--- a/apps/background/tools.js
+++ b/apps/background/tools.js
@@ -102,6 +102,14 @@ let toolMap = {
 
				             text: '简易Postman'
			
 
				         }]
			
 
				     },
			
 
				+    'websocket': {
			
 
				+        name: 'Websocket工具',
			
 
				+        tips: '支持对Websocket接口的抓包测试，包括ws服务的连接测试、消息发送测试、结果分析等',
			
 
				+        menuConfig: [{
			
 
				+            icon: 'ⓦ',
			
 
				+            text: 'Websocket工具'
			
 
				+        }]
			
 
				+    },
			
 
				     'regexp': {
			
 
				         name: 'JS正则表达式',
			
 
				         tips: '正则校验工具，默认提供一些工作中常用的正则表达式，支持内容实时匹配并高亮显示结果',
			
--- a/apps/naotu/index.html
+++ b/apps/naotu/index.html
@@ -70,6 +70,7 @@
 
				 
			
 
				 <!-- bower:js -->
			
 
				 <script type="text/javascript" src="../static/vendor/evalCore.min.js"></script>
			
 
				+<script type="text/javascript" src="kityminder/eval.proxy.js"></script>
			
 
				 <script src="kityminder/jquery/jquery.js"></script>
			
 
				 <script src="kityminder/bootstrap/bootstrap.js"></script>
			
 
				 <script src="kityminder/angular/angular.js"></script>
			
--- a/apps/naotu/kityminder/eval.proxy.js
+++ b/apps/naotu/kityminder/eval.proxy.js
@@ -0,0 +1,3 @@
 
				+window.eval = function(code) {
			
 
				+    evalCore.getEvalInstance(window)(code)
			
 
				+};
			
--- a/apps/popup/index.css
+++ b/apps/popup/index.css
@@ -43,7 +43,7 @@ ul.fe-function-list li {
 
				     display: block;

			
 
				     height: 20px;

			
 
				     line-height: 20px;

			
 
				-    width: 116px;

			
 
				+    width: 120px;

			
 
				     border-bottom: 1px dashed #e5e5e5;

			
 
				     overflow: hidden;

			
 
				 }

			
@@ -139,4 +139,4 @@ svg:not(:root) {
 
				 .fe-feedback .x-settings

			
 
				 {

			
 
				     float: right;

			
 
				-}
			
 
				+}

			
--- a/apps/websocket/index.css
+++ b/apps/websocket/index.css
@@ -17,6 +17,6 @@ html,body {
 
				     border-radius: 6px;
			
 
				     border: 1px solid #eee;
			
 
				 }
			
 
				-
			
 
				-
			
 
				-
			
 
				+.x-res-item {
			
 
				+    margin: 5px 0;
			
 
				+}
			
--- a/apps/websocket/index.html
+++ b/apps/websocket/index.html
@@ -1,13 +1,12 @@
 
				 <!DOCTYPE HTML>
			
 
				 <html lang="zh-CN">
			
 
				 <head>
			
 
				-    <title>WebSocket测试</title>
			
 
				+    <title>WebSocket工具</title>
			
 
				     <meta charset="UTF-8">
			
 
				     <link rel="stylesheet" href="../static/vendor/jquery/jquery-ui.min.css">
			
 
				     <link rel="stylesheet" href="index.css"/>
			
 
				     <script type="text/javascript" src="../static/vendor/evalCore.min.js"></script>
			
 
				     <script type="text/javascript" src="../static/vendor/vue/vue.js"></script>
			
 
				-    <script src="../static/vendor/require/require.js"></script>
			
 
				 </head>
			
 
				 <body>
			
 
				 
			
@@ -23,7 +22,7 @@
 
				         <div class="row mod-inputs">
			
 
				             <div class="ui-mt-10">
			
 
				                 <input type="text" id="url" ref="url" v-model="url" class="form-control"
			
 
				-                       placeholder="请输入ws地址，例如ws(s)://localhost:8080/ws/single_multi/test/1">
			
 
				+                       placeholder="请输入ws地址，例如 ws://121.40.165.18:8800">
			
 
				             </div>
			
 
				             <div class="ui-mt-10">
			
 
				                 <input class="btn btn-sm btn-primary" type="button" :disabled="connBtn" value=" 连  接 "
			
@@ -41,7 +40,7 @@
 
				         </div>
			
 
				         <div class="row mod-inputs" style="margin-top: 10px;">
			
 
				             <div class="row" v-for="result in results">
			
 
				-                {{result}}<br/>
			
 
				+                <div class="x-res-item" v-html="result"></div>
			
 
				             </div>
			
 
				         </div>
			
 
				     </div>
			
--- a/apps/websocket/index.js
+++ b/apps/websocket/index.js
@@ -4,7 +4,7 @@
 
				 new Vue({
			
 
				     el: '#pageContainer',
			
 
				     data: {
			
 
				-        url: 'ws://localhost:6765/ws/single/test/1',
			
 
				+        url: 'ws://121.40.165.18:8800',
			
 
				         msg: '',
			
 
				         connBtn: false,
			
 
				         closeBtn: true,