1

bin/imserver/imserver.cluster.json

@@ -1,5 +0,0 @@
-[
-  {
-    "listen_port": 8888
-  }
-]

bin/imserver/robot.bat

@@ -1 +0,0 @@
-node ../../tools/robot/app.js -hws://192.168.100.45:7801 -utest134345 -d../../server/imserver/

bin/imserver/robot.sh

@@ -1 +0,0 @@
-node ../../tools/robot/app.js -hws://192.168.100.45:7801 -utest134345 -d../../server/imserver/

server/imserver/WSPListener.go

@@ -122,7 +122,7 @@ func (this *WSPListener) decodePacket(conn net.Conn, buf []byte, offset *int, bu
 	}
 
 	if warning {
-		f5.SysLog().Warning("收到client非法数据包")
+		f5.GetSysLog().Warning("收到client非法数据包")
 	}
 }
 

server/imserver/makefile

@@ -6,16 +6,16 @@ compile:
 	protoc --proto_path=proto --go_out=./ss proto/ss_msgid.proto
 	protoc --proto_path=proto --go_out=./ss proto/ss_proto.proto
 	@export GOPROXY=https://goproxy.io
-	@go build -gcflags=all="-N -l" -o ../../bin/imserver/
+	@go build -gcflags=all="-N -l" -o ../../bin/imserver/bin
 	@echo "compile done"
 
 debug:
 	@. /etc/profile
 
 	@export GOPROXY=https://goproxy.io
-	@go build -gcflags=all="-N -l" -ldflags "-X q5.optDebug=1" -o ../../bin/imserver/
+	@go build -gcflags=all="-N -l" -ldflags "-X q5.optDebug=1" -o ../../bin/imserver/bin
 	@echo "compile done"
 
 clean:
-	@rm -f ../../bin/imserver/
+	@rm -f ../../bin/imserver/bin
 	@echo "clean done"

third_party/f5

@@ -1 +1 @@
-Subproject commit c6e4546c133727b954c0f6745e70dadbeab50f1a
+Subproject commit 1db5053277eab004bd09af83ddbe1569e9492b53