改进 websocket

polaris1119 · polaris1119 · commit 292a756b6114 · 2016-06-02T11:26:05.000+08:00
diff --git a/websites/code2/studygolang/src/http/controller/websocket.go b/websites/code2/studygolang/src/http/controller/websocket.go
@@ -24,8 +24,8 @@ type WebsocketController struct {
 	mutex    sync.Mutex
 }
 
-func (this *WebsocketController) RegisterRoute(e *echo.Group) {
-	e.Get("/ws", standard.WrapHandler(websocket.Handler(this.Ws)))
+func (this *WebsocketController) RegisterRoute(g *echo.Group) {
+	g.Get("/ws", standard.WrapHandler(websocket.Handler(this.Ws)))
 }
 
 // websocket，统计在线用户数
diff --git a/websites/code2/studygolang/src/vendor/manifest b/websites/code2/studygolang/src/vendor/manifest
@@ -203,7 +203,7 @@
 		{
 			"importpath": "github.com/polaris1119/goutils",
 			"repository": "https://github.com/polaris1119/goutils",
-			"revision": "15c2eed5ef7632c6807c5b46eaf4cfc3c201d629",
+			"revision": "582c98b3184b83e1600833fb042b3ecc3070dcda",
 			"branch": "master"
 		},
 		{
diff --git a/websites/code2/studygolang/static/js/common.js b/websites/code2/studygolang/static/js/common.js
@@ -403,12 +403,14 @@ window.WebSocket = window.WebSocket || window.MozWebSocket;
 if (window.WebSocket) {
 	var websocket = new WebSocket(wsUrl);
 
-	websocket.onopen = function(){
+	websocket.onopen = function(evt){
 		// console.log("open");
+		// console.log(evt);
 	}
 
-	websocket.onclose = function(){
+	websocket.onclose = function(evt){
 		// console.log("close");
+		// console.log(evt);
 	}
 
 	websocket.onmessage = function(msgEvent){
@@ -433,7 +435,9 @@ if (window.WebSocket) {
 		}
 	}
 	
-	// websocket.onerror = onError;
+	websocket.onerror = function(evt) {
+		// console.log(evt);
+	}
 }
 
 $(function(){

Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,8 @@ type WebsocketController struct {`
`24`	`24`	`mutex sync.Mutex`
`25`	`25`	`}`
`26`	`26`
`27`		`-func (this WebsocketController) RegisterRoute(e echo.Group) {`
`28`		`- e.Get("/ws", standard.WrapHandler(websocket.Handler(this.Ws)))`
	`27`	`+func (this WebsocketController) RegisterRoute(g echo.Group) {`
	`28`	`+ g.Get("/ws", standard.WrapHandler(websocket.Handler(this.Ws)))`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`// websocket，统计在线用户数`
Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@`
`203`	`203`	`{`
`204`	`204`	`"importpath": "github.com/polaris1119/goutils",`
`205`	`205`	`"repository": "https://github.com/polaris1119/goutils",`
`206`		`- "revision": "15c2eed5ef7632c6807c5b46eaf4cfc3c201d629",`
	`206`	`+ "revision": "582c98b3184b83e1600833fb042b3ecc3070dcda",`
`207`	`207`	`"branch": "master"`
`208`	`208`	`},`
`209`	`209`	`{`
Original file line number	Diff line number	Diff line change
`@@ -403,12 +403,14 @@ window.WebSocket = window.WebSocket \|\| window.MozWebSocket;`
`403`	`403`	`if (window.WebSocket) {`
`404`	`404`	`var websocket = new WebSocket(wsUrl);`
`405`	`405`
`406`		`- websocket.onopen = function(){`
	`406`	`+ websocket.onopen = function(evt){`
`407`	`407`	`// console.log("open");`
	`408`	`+ // console.log(evt);`
`408`	`409`	`}`
`409`	`410`
`410`		`- websocket.onclose = function(){`
	`411`	`+ websocket.onclose = function(evt){`
`411`	`412`	`// console.log("close");`
	`413`	`+ // console.log(evt);`
`412`	`414`	`}`
`413`	`415`
`414`	`416`	`websocket.onmessage = function(msgEvent){`
`@@ -433,7 +435,9 @@ if (window.WebSocket) {`
`433`	`435`	`}`
`434`	`436`	`}`
`435`	`437`
`436`		`- // websocket.onerror = onError;`
	`438`	`+ websocket.onerror = function(evt) {`
	`439`	`+ // console.log(evt);`
	`440`	`+ }`
`437`	`441`	`}`
`438`	`442`
`439`	`443`	`$(function(){`