From 06a8fde15309ec68f3e7bfee3dd1b1bf7bf2cf07 Mon Sep 17 00:00:00 2001 From: p4gefau1t Date: Fri, 17 Apr 2020 04:33:43 -0400 Subject: [PATCH] prepare for v0.1.4 --- README.md | 7 ++++++- build-all.sh | 2 +- common/common.go | 2 +- conf/conf.go | 8 +------- docs/config.toml | 2 +- docs/content/_index.md | 2 ++ 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index a0cda863c..8e1f02df3 100644 --- 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 index ea07e93c0..777194bb5 100755 --- 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 index 2bd34edb1..0561d962f 100644 --- 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 index 832f5e291..772c504f5 100644 --- 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 index 309de7d8b..5d513346c 100755 --- 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 index eb4b4cecb..dde54737f 100644 --- 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)