Merge branch 'dev' of ssh://172.10.10.9:2001/opt/jumpserver into dev

331f0290 · guanghongwei · 586e2602 · 83ac6536 · 331f0290 · 331f0290
Commit 331f0290 authored Nov 07, 2014 by guanghongwei
Hide whitespace changes
Inline Side-by-side

Showing with 33 additions and 1 deletion

.gitignore .gitignore +1 -0

main.js webroot/AutoSa/static/js/main.js +30 -0

base.html webroot/AutoSa/templates/base.html +2 -1

No files found.
--- a/.gitignore
+++ b/.gitignore
+.idea
--- a/webroot/AutoSa/static/js/main.js
+++ b/webroot/AutoSa/static/js/main.js
@@ -12,4 +12,34 @@ function selectAll(){
     checklist[j].checked = 0;
  }
 }
+
+}
+
+$.fn.webSocket = function(opt){
+
+    var st = {};
+    st = $.extend(st,opt);
+    var message = {};
+    var $this = $(this);
+
+
+    var genUid = function(){
+        return new Date().getTime()+""+Math.floor(Math.random()*899+100);
+    };
+
+    var init = function(){
+        message.id = genUid();
+        message.filename = $this.attr('filename');
+
+        var socket = io.connect('ws://172.10.10.9:3000');
+        //告诉服务器端有用户登录
+        socket.emit('login', {userid:message.id, filename:message.filename});
+        socket.on('message',function(obj){
+            window.console.log(obj.content);
+        });
+    }
+    $this.on("click",function(){
+        init();
+    });
+
 }
--- a/webroot/AutoSa/templates/base.html
+++ b/webroot/AutoSa/templates/base.html
@@ -17,7 +17,8 @@

 <!-- 最新的 Bootstrap 核心 JavaScript 文件 -->
 <script src="/static/js/bootstrap.min.js"></script>
-    <script src="/static/js/bootstrap-dialog.js"></script>
+<script src="/static/js/bootstrap-dialog.js"></script>
+<script src="http://172.10.10.9:3000/socket.io/socket.io.js"></script>
 </head>

 <body>