diff --git a/bin/imserver/imserver.cluster.json b/bin/imserver/imserver.cluster.json deleted file mode 100644 index 2e4f0dcd..00000000 --- a/bin/imserver/imserver.cluster.json +++ /dev/null @@ -1,5 +0,0 @@ -[ - { - "listen_port": 8888 - } -] diff --git a/bin/imserver/robot.bat b/bin/imserver/robot.bat deleted file mode 100644 index 1390a562..00000000 --- a/bin/imserver/robot.bat +++ /dev/null @@ -1 +0,0 @@ -node ../../tools/robot/app.js -hws://192.168.100.45:7801 -utest134345 -d../../server/imserver/ diff --git a/bin/imserver/robot.sh b/bin/imserver/robot.sh deleted file mode 100644 index 1390a562..00000000 --- a/bin/imserver/robot.sh +++ /dev/null @@ -1 +0,0 @@ -node ../../tools/robot/app.js -hws://192.168.100.45:7801 -utest134345 -d../../server/imserver/ diff --git a/server/imserver/WSPListener.go b/server/imserver/WSPListener.go index 56662153..f00bf034 100644 --- a/server/imserver/WSPListener.go +++ b/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非法数据包") } } diff --git a/server/imserver/makefile b/server/imserver/makefile index 6f0e75ea..de9cf459 100644 --- a/server/imserver/makefile +++ b/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" diff --git a/server/imserver/mt/table.go b/server/imserver/mt/export.go similarity index 100% rename from server/imserver/mt/table.go rename to server/imserver/mt/export.go diff --git a/third_party/f5 b/third_party/f5 index c6e4546c..1db50532 160000 --- a/third_party/f5 +++ b/third_party/f5 @@ -1 +1 @@ -Subproject commit c6e4546c133727b954c0f6745e70dadbeab50f1a +Subproject commit 1db5053277eab004bd09af83ddbe1569e9492b53