Skip to content

Commit

Permalink
start refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
@fatedier
fatedier committed Mar 9, 2017
1 parent b006540 commit 88083d2
Show file tree
Hide file tree
Showing 115 changed files with 5,515 additions and 3,491 deletions.
6 changes: 3 additions & 3 deletions Dockerfile_alpine
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM alpine:3.4
FROM alpine:3.5

COPY bin/frpc /frpc
COPY bin/frps /frps
COPY tmp/frpc /frpc
COPY tmp/frps /frps
COPY conf/frpc_min.ini /frpc.ini
COPY conf/frps_min.ini /frps.ini

Expand Down
22 changes: 15 additions & 7 deletions Godeps/Godeps.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 12 additions & 7 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,26 @@ build_test: echo_server http_server
assets:
go get -d github.com/rakyll/statik
@go install github.com/rakyll/statik
@rm -rf ./src/assets/statik
go generate ./src/...
@rm -rf ./assets/statik
go generate ./assets/...

fmt:
go fmt ./src/...
@go fmt ./assets/...
@go fmt ./cmd/...
@go fmt ./client/...
@go fmt ./server/...
@go fmt ./models/...
@go fmt ./utils/...
@go fmt ./test/echo_server.go
@go fmt ./test/http_server.go
@go fmt ./test/func_test.go

frps:
go build -o bin/frps ./src/cmd/frps
@cp -rf ./src/assets/static ./bin
go build -o bin/frps ./cmd/frps
@cp -rf ./assets/static ./bin

frpc:
go build -o bin/frpc ./src/cmd/frpc
go build -o bin/frpc ./cmd/frpc

echo_server:
go build -o test/bin/echo_server ./test/echo_server.go
Expand All @@ -36,7 +41,7 @@ http_server:
test: gotest

gotest:
go test -v ./src/...
go test -v ./...

alltest:
cd ./test && ./run_test.sh && cd -
Expand Down
40 changes: 20 additions & 20 deletions Makefile.cross-compiles
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@ all: build
build: app

app:
env CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -o ./frpc_darwin_amd64 ./src/cmd/frpc
env CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -o ./frps_darwin_amd64 ./src/cmd/frps
env CGO_ENABLED=0 GOOS=linux GOARCH=386 go build -o ./frpc_linux_386 ./src/cmd/frpc
env CGO_ENABLED=0 GOOS=linux GOARCH=386 go build -o ./frps_linux_386 ./src/cmd/frps
env CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o ./frpc_linux_amd64 ./src/cmd/frpc
env CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o ./frps_linux_amd64 ./src/cmd/frps
env CGO_ENABLED=0 GOOS=linux GOARCH=arm go build -o ./frpc_linux_arm ./src/cmd/frpc
env CGO_ENABLED=0 GOOS=linux GOARCH=arm go build -o ./frps_linux_arm ./src/cmd/frps
env CGO_ENABLED=0 GOOS=windows GOARCH=386 go build -o ./frpc_windows_386.exe ./src/cmd/frpc
env CGO_ENABLED=0 GOOS=windows GOARCH=386 go build -o ./frps_windows_386.exe ./src/cmd/frps
env CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -o ./frpc_windows_amd64.exe ./src/cmd/frpc
env CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -o ./frps_windows_amd64.exe ./src/cmd/frps
env CGO_ENABLED=0 GOOS=linux GOARCH=mips64 go build -o ./frpc_linux_mips64 ./src/cmd/frpc
env CGO_ENABLED=0 GOOS=linux GOARCH=mips64 go build -o ./frps_linux_mips64 ./src/cmd/frps
env CGO_ENABLED=0 GOOS=linux GOARCH=mips64le go build -o ./frpc_linux_mips64le ./src/cmd/frpc
env CGO_ENABLED=0 GOOS=linux GOARCH=mips64le go build -o ./frps_linux_mips64le ./src/cmd/frps
env CGO_ENABLED=0 GOOS=linux GOARCH=mips go build -o ./frpc_linux_mips ./src/cmd/frpc
env CGO_ENABLED=0 GOOS=linux GOARCH=mips go build -o ./frps_linux_mips ./src/cmd/frps
env CGO_ENABLED=0 GOOS=linux GOARCH=mipsle go build -o ./frpc_linux_mipsle ./src/cmd/frpc
env CGO_ENABLED=0 GOOS=linux GOARCH=mipsle go build -o ./frps_linux_mipsle ./src/cmd/frps
env CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -o ./frpc_darwin_amd64 ./cmd/frpc
env CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -o ./frps_darwin_amd64 ./cmd/frps
env CGO_ENABLED=0 GOOS=linux GOARCH=386 go build -o ./frpc_linux_386 ./cmd/frpc
env CGO_ENABLED=0 GOOS=linux GOARCH=386 go build -o ./frps_linux_386 ./cmd/frps
env CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o ./frpc_linux_amd64 ./cmd/frpc
env CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o ./frps_linux_amd64 ./cmd/frps
env CGO_ENABLED=0 GOOS=linux GOARCH=arm go build -o ./frpc_linux_arm ./cmd/frpc
env CGO_ENABLED=0 GOOS=linux GOARCH=arm go build -o ./frps_linux_arm ./cmd/frps
env CGO_ENABLED=0 GOOS=windows GOARCH=386 go build -o ./frpc_windows_386.exe ./cmd/frpc
env CGO_ENABLED=0 GOOS=windows GOARCH=386 go build -o ./frps_windows_386.exe ./cmd/frps
env CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -o ./frpc_windows_amd64.exe ./cmd/frpc
env CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -o ./frps_windows_amd64.exe ./cmd/frps
env CGO_ENABLED=0 GOOS=linux GOARCH=mips64 go build -o ./frpc_linux_mips64 ./cmd/frpc
env CGO_ENABLED=0 GOOS=linux GOARCH=mips64 go build -o ./frps_linux_mips64 ./cmd/frps
env CGO_ENABLED=0 GOOS=linux GOARCH=mips64le go build -o ./frpc_linux_mips64le ./cmd/frpc
env CGO_ENABLED=0 GOOS=linux GOARCH=mips64le go build -o ./frps_linux_mips64le ./cmd/frps
env CGO_ENABLED=0 GOOS=linux GOARCH=mips go build -o ./frpc_linux_mips ./cmd/frpc
env CGO_ENABLED=0 GOOS=linux GOARCH=mips go build -o ./frps_linux_mips ./cmd/frps
env CGO_ENABLED=0 GOOS=linux GOARCH=mipsle go build -o ./frpc_linux_mipsle ./cmd/frpc
env CGO_ENABLED=0 GOOS=linux GOARCH=mipsle go build -o ./frps_linux_mipsle ./cmd/frps
2 changes: 1 addition & 1 deletion src/assets/assets.go → assets/assets.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (

"github.com/rakyll/statik/fs"

_ "github.com/fatedier/frp/src/assets/statik"
_ "github.com/fatedier/frp/assets/statik"
)

var (
Expand Down
0 src/assets/static/css/bootstrap.min.css → assets/static/css/bootstrap.min.css
View file
File renamed without changes.
0 src/assets/static/css/font-awesome.min.css → assets/static/css/font-awesome.min.css
View file
File renamed without changes.
0 src/assets/static/css/iconfont.css → assets/static/css/iconfont.css
View file
File renamed without changes.
0 src/assets/static/favicon.ico → assets/static/favicon.ico
View file
File renamed without changes.
0 src/assets/static/font/iconfont.eot → assets/static/font/iconfont.eot
View file
File renamed without changes.
0 src/assets/static/font/iconfont.svg → assets/static/font/iconfont.svg
View file
File renamed without changes
0 src/assets/static/font/iconfont.ttf → assets/static/font/iconfont.ttf
View file
File renamed without changes.
0 src/assets/static/font/iconfont.woff → assets/static/font/iconfont.woff
View file
File renamed without changes.
0 src/assets/static/index.html → assets/static/index.html
View file
File renamed without changes.
0 src/assets/static/js/angular.min.js → assets/static/js/angular.min.js
View file
File renamed without changes.
0 src/assets/static/js/bootstrap.min.js → assets/static/js/bootstrap.min.js
View file
File renamed without changes.
0 src/assets/static/js/echarts.min.js → assets/static/js/echarts.min.js
View file
File renamed without changes.
0 src/assets/static/js/jquery.min.js → assets/static/js/jquery.min.js
View file
File renamed without changes.
10 changes: 10 additions & 0 deletions assets/statik/statik.go
View file

Large diffs are not rendered by default.

Loading

0 comments on commit 88083d2

Please sign in to comment.