inconshreveable · Nov 2, 2017
Showing with 120 additions and 23 deletions.

+2 −0 .gitignore

+3 −0 {docs → }/CHANGELOG.md

+12 −0 README.md

+37 −21 docs/{DEVELOPMENT.md → 开发文档.md}

+2 −2 docs/{SELFHOSTING.md → 自托管.md}

+32 −0 make-release.bat

+32 −0 make.bat
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,5 @@ src/launchpad.net
 src/gopkg.in
 src/ngrok/client/assets/
 src/ngrok/server/assets/
+*.log
+*.log.*
diff --git a/docs/CHANGELOG.md → CHANGELOG.md b/docs/CHANGELOG.md → CHANGELOG.md
@@ -1,4 +1,7 @@
 # Changelog
+
+## 
+
 ## 1.7 - 6/6/2014
 - IMPROVEMENT: Print a better help message when run without any arguments
 - IMPROVEMENT: Display useful help message and instructions when double-clicked from explorer on Windows

diff --git a/README.md b/README.md
@@ -1,3 +1,15 @@
+
+# 如何运行
+
+
+
+
+
+
+============================================
+
+
+
 [![Build
 status](https://travis-ci.org/inconshreveable/ngrok.svg)](https://travis-ci.org/inconshreveable/ngrok)
 

diff --git a/docs/DEVELOPMENT.md → docs/开发文档.md b/docs/DEVELOPMENT.md → docs/开发文档.md
@@ -1,25 +1,28 @@
-# Developer's guide to ngrok
+# ngrok 开发者指南
 
 
-## Components
+## 组件
 The ngrok project is composed of two components, the ngrok client (ngrok) and the ngrok server (ngrokd).
 The ngrok client is the more complicated piece because it has UIs for displaying saved requests and responses.
 
-## Compiling
+## 编译
 
-    git clone git@github.com:inconshreveable/ngrok.git
-    cd ngrok && make
-    bin/ngrok [LOCAL PORT]
+```bash
+git clone git@github.com:inconshreveable/ngrok.git
+cd ngrok && make
+bin/ngrok [LOCAL PORT]
+```
 
 There are Makefile targets for compiling just the client or server.
 
     make client
     make server
 
-**NB: You must compile with Go 1.1+! You must have Mercurial SCM Installed.**
+**注意: 必须使用Go 1.1以上进行编译！必须先安装 Mercurial SCM**
+
+### 编译发行版本
+不管是客户端还是服务端都包含有静态资源文件。
 
-### Compiling release versions
-Both the client and the server contain static asset files.
 These include TLS/SSL certificates and the html/css/js for the client's web interface.
 The release versions embed all of this data into the binaries themselves, whereas the debug versions read these files from the filesystem.
 
@@ -32,25 +35,38 @@ There are Makefile targets for compiling the client and server for releases:
     make release-all
 
 
-## Developing locally
-The strategy I use for developing on ngrok is to do the following:
+## 本地开发
+
+可以用以下策略进行本地开发：
+
+添加如下行到 `/etc/hosts`:
 
-Add the following lines to /etc/hosts:
+```
+127.0.0.1 ngrok.me
+127.0.0.1 test.ngrok.me
+```
+> 如果是Windows环境，则同样添加如上行到 `C:\Windows\System32\drivers\etc\hosts`
 
-    127.0.0.1 ngrok.me
-    127.0.0.1 test.ngrok.me
+使用如下参数运行 `ngrokd`:
 
-Run ngrokd with the following options:
+```
+./bin/ngrokd -domain ngrok.me 
+```
+> Windows下使用如下命令
 
-    ./bin/ngrokd -domain ngrok.me
+```
+ngrokd -domain ngrok.me
+```
 
 Create an ngrok configuration file, "debug.yml" with the following contents:
 
-    server_addr: ngrok.me:4443
-    tunnels:
-      test:
-        proto:
-          http: 8080
+```
+server_addr: ngrok.me:4443
+tunnels:
+  test:
+    proto:
+      http: 8000
+```
 
 
 Then run ngrok with either of these commands:

diff --git a/docs/SELFHOSTING.md → docs/自托管.md b/docs/SELFHOSTING.md → docs/自托管.md
@@ -1,6 +1,6 @@
-# How to run your own ngrokd server
+# 如何运行你自己的 `ngrokd` 服务
 
-Running your own ngrok server is really easy! The instructions below will guide you along your way!
+运行自己的ngrok服务器真的很容易！ 以下说明将引导您一路完成！
 
 ## 1. Get an SSL certificate
 ngrok provides secure tunnels via TLS, so you'll need an SSL certificate. Assuming you want to create

diff --git a/make-release.bat b/make-release.bat
@@ -0,0 +1,32 @@
+SET GOPATH=%__CD__%
+
+set BUILDTAGS=release
+
+go fmt ngrok/...
+
+echo "fmt ok"
+
+go get github.com/jteeuwen/go-bindata/go-bindata
+echo "bin/go-bindata ok"
+
+"bin\go-bindata.exe" -nomemcopy -pkg=assets -tags=%BUILDTAGS% -debug=false -o=src/ngrok/client/assets/assets_%BUILDTAGS%.go assets/client/...
+echo "client-assets ok"
+
+"bin\go-bindata.exe" -nomemcopy -pkg=assets -tags=%BUILDTAGS% -debug=false -o=src/ngrok/server/assets/assets_%BUILDTAGS%.go assets/server/...
+echo "server-assets ok"
+
+echo "assets ok"
+
+go get -tags '%BUILDTAGS%' -d -v ngrok/...
+
+echo "deps ok"
+
+go install -tags '%BUILDTAGS%' ngrok/main/ngrok
+
+echo "client ok"
+
+go install -tags '%BUILDTAGS%' ngrok/main/ngrokd
+
+echo "server ok"
+
+cmd
diff --git a/make.bat b/make.bat
@@ -0,0 +1,32 @@
+SET GOPATH=%__CD__%
+
+set BUILDTAGS=debug
+
+go fmt ngrok/...
+
+echo "fmt ok"
+
+go get github.com/jteeuwen/go-bindata/go-bindata
+echo "bin/go-bindata ok"
+
+"bin\go-bindata.exe" -nomemcopy -pkg=assets -tags=%BUILDTAGS% -debug=false -o=src/ngrok/client/assets/assets_%BUILDTAGS%.go assets/client/...
+echo "client-assets ok"
+
+"bin\go-bindata.exe" -nomemcopy -pkg=assets -tags=%BUILDTAGS% -debug=false -o=src/ngrok/server/assets/assets_%BUILDTAGS%.go assets/server/...
+echo "server-assets ok"
+
+echo "assets ok"
+
+go get -tags '%BUILDTAGS%' -d -v ngrok/...
+
+echo "deps ok"
+
+go install -tags '%BUILDTAGS%' ngrok/main/ngrok
+
+echo "client ok"
+
+go install -tags '%BUILDTAGS%' ngrok/main/ngrokd
+
+echo "server ok"
+
+cmd