Merge pull request #5 from fatedier/dev

Release version 0.1.0
fatedier · Feb 28, 2016 · d0a5400 · d0a5400
2 parents 7030d16 + c7b0687
commit d0a5400
Show file tree

Hide file tree

Showing 26 changed files with 985 additions and 447 deletions.
diff --git a/.gitignore b/.gitignore
@@ -26,3 +26,6 @@ _testmain.go
 # Self
 bin/
 
+# Cache
+*.swp
+*.swo
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,12 @@
+sudo: false
+language: go
+
+go:
+    - 1.4.2
+    - 1.5.1
+
+install:
+    - make
+
+script:
+    - make test
diff --git a/Makefile b/Makefile
@@ -1,15 +1,22 @@
 export PATH := $(GOPATH)/bin:$(PATH)
+export NEW_GOPATH := $(shell pwd)
 
 all: build
 
-build: godep frps frpc
+build: godep fmt frps frpc
 
 godep:
 	@go get github.com/tools/godep
 	godep restore
 
+fmt:
+	@GOPATH=$(NEW_GOPATH) godep go fmt ./...
+
 frps:
-	godep go build -o bin/frps ./cmd/frps
+	GOPATH=$(NEW_GOPATH) godep go build -o bin/frps ./src/frp/cmd/frps
 
 frpc:
-	godep go build -o bin/frpc ./cmd/frpc
+	GOPATH=$(NEW_GOPATH) godep go build -o bin/frpc ./src/frp/cmd/frpc
+
+test:
+	@GOPATH=$(NEW_GOPATH) godep go test ./...
diff --git a/README.md b/README.md
@@ -1,2 +1,5 @@
 # frp
+
+[![Build Status](https://travis-ci.org/fatedier/frp.svg)](https://travis-ci.org/fatedier/frp)
+
 A fast reverse proxy.
diff --git a/cmd/frpc/control.go b/cmd/frpc/control.go
diff --git a/cmd/frps/control.go b/cmd/frps/control.go
diff --git a/conf/frpc.ini b/conf/frpc.ini
@@ -1,12 +1,12 @@
 # common是必须的section
 [common]
 server_addr = 127.0.0.1
-bind_port = 7000
+server_port = 7000
 log_file = ./frpc.log
 # debug, info, warn, error
-log_level = info
+log_level = debug
 # file, console
-log_way = file
+log_way = console
 
 # test1即为name
 [test1]

diff --git a/conf/frps.ini b/conf/frps.ini
@@ -4,9 +4,9 @@ bind_addr = 0.0.0.0
 bind_port = 7000
 log_file = ./frps.log
 # debug, info, warn, error
-log_level = info
+log_level = debug
 # file, console
-log_way = file
+log_way = console 
 
 # test1即为name
 [test1]

diff --git a/pkg/models/msg.go b/pkg/models/msg.go