prepare for v0.1.4

p4gefau1t · Apr 17, 2020 · 06a8fde · 06a8fde
1 parent 3db02fb
commit 06a8fde
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -8,9 +8,12 @@
 
 支持使用ACME协议从Let's Encrypt[自动申请和更新](#证书申请)HTTPS证书，只需提供域名和邮箱。
 
+[Telegram交流反馈群](https://t.me/trojan_go_chat)
+
 **完整配置教程参见[这里](https://p4gefau1t.github.io/trojan-go)。**
 
-[English](#English)
+
+[English Version](#English)
 
 ## 使用方法
 
@@ -284,6 +287,8 @@ Supports CDN traffic transferring, based on WebSocket over TLS/SSL
 
 Uses the ACME protocol to automatically request and renew HTTPS certificates from Let's Encrypt.
 
+[Telegram Group](https://t.me/trojan_go_chat)
+
 ## Usage
 
 To request a certificate automatically:

diff --git a/build-all.sh b/build-all.sh
@@ -44,7 +44,7 @@ wget https://github.com/v2ray/domain-list-community/raw/release/dlc.dat -O geosi
 wget https://raw.githubusercontent.com/v2ray/geoip/release/geoip.dat -O geoip.dat
 cp ../data/* ./
 
-for name in trojan-go*;do
+for name in trojan-go-*;do
   zip $name.zip client.json server.json trojan-go.service geoip.dat geosite.dat $name
   sha1sum $name.zip > $name.zip.sha1
   rm $name

diff --git a/common/common.go b/common/common.go
@@ -11,7 +11,7 @@ import (
 )
 
 const (
-	Version = "v0.1.3"
+	Version = "v0.1.4"
 )
 
 type Runnable interface {

diff --git a/conf/conf.go b/conf/conf.go
@@ -127,11 +127,5 @@ type GlobalConfig struct {
 	LocalAddress  *common.Address
 	RemoteAddress *common.Address
 	TargetAddress *common.Address
-	/*
-		LocalAddr  net.Addr
-		LocalIP    net.IP
-		RemoteAddr net.Addr
-		RemoteIP   net.IP
-	*/
-	Hash map[string]string
+	Hash          map[string]string
 }
diff --git a/docs/config.toml b/docs/config.toml
@@ -17,7 +17,7 @@ enableMissingTranslationPlaceholders = false
     # Source Code repository section
     description = "An unidentifiable mechanism that helps you bypass GFW. "
     github_repository = "https://github.com/p4gefau1t/trojan-go"
-    version = "0.1.3"
+    version = "0.1.4"
 
     # Documentation repository section
     # documentation repository (set edit link to documentation repository)

diff --git a/docs/content/_index.md b/docs/content/_index.md
@@ -37,3 +37,5 @@ Trojan-Go支持并且兼容原版Trojan的绝大多数功能，包括但不限
 - Websocket，用于支持CDN流量中转(基于WebSocket over TLS/SSL)和对抗GFW中间人攻击
 
 - 自动化HTTPS证书申请，使用ACME协议从Let's Encrypt自动申请和更新HTTPS证书
+
+[Telegram交流反馈群](https://t.me/trojan_go_chat)
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,7 @@ import ( @@
     )
     const (
-    	Version = "v0.1.3"
+    	Version = "v0.1.4"
     )
     type Runnable interface {
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -37,3 +37,5 @@ Trojan-Go支持并且兼容原版Trojan的绝大多数功能，包括但不限
		- Websocket，用于支持CDN流量中转(基于WebSocket over TLS/SSL)和对抗GFW中间人攻击

		- 自动化HTTPS证书申请，使用ACME协议从Let's Encrypt自动申请和更新HTTPS证书

		[Telegram交流反馈群](https://t.me/trojan_go_chat)