gbk编码转utf-8

trojan/README.md

@@ -1,41 +1,41 @@
-# Trojan傻瓜一键版，没有域名也可以测试学习
+# Trojan鍌荤摐涓€閿�増锛屾病鏈夊煙鍚嶄篃鍙�互娴嬭瘯瀛︿範
 
 	bash <(curl -L -s https://git.io/trojan.sh)
 
-### 下载 trojan windows 客户端
+### 涓嬭浇 trojan windows 瀹㈡埛绔�
 
 - https://github.com/trojan-gfw/trojan/releases/download/v1.13.0/trojan-1.13.0-win.zip
 
-- Windows版需要安装 vc_redist.x64.exe (Visual C++ Redistributable for VS 2015)
+- Windows鐗堥渶瑕佸畨瑁� vc_redist.x64.exe (Visual C++ Redistributable for VS 2015)
 
 - https://aka.ms/vs/16/release/vc_redist.x64.exe
 
-#### 编辑 本地客户端 config.json 文件
+#### 缂栬緫 鏈�湴瀹㈡埛绔� config.json 鏂囦欢
 
-- example.com 改成 ssl.srgb.work ; 再修改 trojan 验证密码
+- example.com 鏀规垚 ssl.srgb.work ; 鍐嶄慨鏀� trojan 楠岃瘉瀵嗙爜
 
-### Chrome 浏览器设置，使用SwitchyOmega插件，方法同SS和Brook
+### Chrome 娴忚�鍣ㄨ�缃�紝浣跨敤SwitchyOmega鎻掍欢锛屾柟娉曞悓SS鍜孊rook
 
-- 代理协议 SOCKS5 地理服务器 127.0.0.1 代理端口 1080
+- 浠ｇ悊鍗忚� SOCKS5 鍦扮悊鏈嶅姟鍣� 127.0.0.1 浠ｇ悊绔�彛 1080
 
 
-### 编辑本地域名管理文件
+### 缂栬緫鏈�湴鍩熷悕绠＄悊鏂囦欢
 
 - C:\Windows\System32\drivers\etc\hosts
 
-### 添加本地域名管理 (按实际IP修改)
+### 娣诲姞鏈�湴鍩熷悕绠＄悊 (鎸夊疄闄匢P淇�敼)
 
 	188.188.188.188  ssl.srgb.work
 
 ----------
 
-## 如果你有自己的域名证书，替换密钥后重启服务
-- 公钥: /var/certificate.crt
-- 私钥: /var/private.key
+## 濡傛灉浣犳湁鑷�繁鐨勫煙鍚嶈瘉涔︼紝鏇挎崲瀵嗛挜鍚庨噸鍚�湇鍔�
+- 鍏�挜: /var/certificate.crt
+- 绉侀挜: /var/private.key
 ```
-# 重启 trojan
+# 閲嶅惎 trojan
 systemctl restart trojan
 
-# 查看 trojan
+# 鏌ョ湅 trojan
 systemctl status trojan
 ```

trojan/trojan_install.sh

@@ -1,8 +1,12 @@
+#!/bin/bash
+# Trojan傻瓜一键版
+
+# bash <(curl -L -s https://git.io/trojan.sh)
 
 # Trojan Server Quickstart Script
 sudo bash -c "$(curl -fsSL https://raw.githubusercontent.com/trojan-gfw/trojan-quickstart/master/trojan-quickstart.sh)"
 
-# Ìî³äÓòÃûÖ¤Êé ¹«Ô¿
+# 填充域��书 公钥
 cat <<EOF > /var/certificate.crt
 
 -----BEGIN CERTIFICATE-----
@@ -68,7 +72,7 @@ rMKWaBFLmfK/AHNF4ZihwPGOc7w6UHczBZXH5RFzJNnww+WnKuTPI0HfnVH8lg==
 EOF
 
 
-# Ìî³äÓòÃûÖ¤Êé ˽Կ
+# 填充域��书 �钥
 cat <<EOF > /var/private.key
 
 -----BEGIN RSA PRIVATE KEY-----
@@ -102,20 +106,20 @@ GbtNmdbxUImyGHkLR/chUl5pnKI1kZMK9hSQbRuRHcTbqR9qmDH9CQ==
 EOF
 
 
-# É趨֤ÊéÎļþÃû
+# 设定�书文件�
 cd /usr/local/etc/trojan/
 sed -i "s/\/path\/to\/certificate.crt/\/var\/certificate.crt/g"  config.json
 sed -i "s/\/path\/to\/private.key/\/var\/private.key/g"  config.json
 
 change_passwd(){
-    read -p ":: 1. ÇëÊäÈë Trojan ÓÃÓÚÑéÖ¤µÄ 1ºÅÃÜÂë: " password1
-    read -p ":: 2. ÇëÊäÈë Trojan ÓÃÓÚÑéÖ¤µÄ 2ºÅÃÜÂë: " password2
+    read -p ":: 1. 请输入 Trojan 用于验�的 1�密�: " password1
+    read -p ":: 2. 请输入 Trojan 用于验�的 2�密�: " password2
     sed -i "s/password1/${password1}/g"  config.json
     sed -i "s/password2/${password2}/g"  config.json
-    echo -e ":: ÑéÖ¤µÄÃÜÂëÒѾ­ÐÞ¸Ä, 1ºÅÃÜÂë: ${password1}  2ºÅÃÜÂë: ${password2}"
+    echo -e ":: 验�的密�已�修改, 1�密�: ${password1}  2�密�: ${password2}"
 }
 
-echo -e ":: ÊÇ·ñÐÞ¸Ä Trojan ÓÃÓÚÑéÖ¤µÄÃÜÂë: \c"  passwd
+echo -e ":: 是�修改 Trojan 用于验�的密�: \c"  passwd
 read -p "(Y/n): " key
 case $key in
     Y)
@@ -126,7 +130,7 @@ case $key in
     ;;
 esac
 
-# Æô¶¯ trojan
+# �动 trojan
 systemctl enable trojan
 systemctl restart trojan
 
@@ -138,6 +142,6 @@ ssl_domain=ssl.srgb.work
 
 echo
 
-echo ":: ±à¼­ C:\Windows\System32\drivers\etc\hosts Îļþ£¬Ìí¼Ó : ${myip}  ${ssl_domain}"
+echo ":: 编辑 C:\Windows\System32\drivers\etc\hosts 文件，添加 : ${myip}  ${ssl_domain}"