diff --git a/README.md b/README.md index af7f307..6edfa75 100644 --- a/README.md +++ b/README.md @@ -31,16 +31,16 @@ ShadowsocksR多用户管理脚本（基于官方mujson版本） ## 替换安装法 正在使用原地址下载的脚本又不想丢失数据？ -`cd /usr/local/ && rm -rf SSR-Bash-Python && git clone https://github.com/ImAnyOne/SSR-Bash-Python.git && cp SSR-Bash-Python/ssr /usr/local/bin/ssr` +`cd /usr/local/ && rm -rf SSR-Bash-Python && git clone https://github.com/wbdy95/SSR-Bash-Python.git &&rm -f /usr/local/bin/ssr && cp SSR-Bash-Python/ssr /usr/local/bin/ssr &&chmod a+x /usr/local/bin/ssr` ## 安装 ## - wget -N --no-check-certificate https://raw.githubusercontent.com/ImAnyOne/SSR-Bash-Python/master/install.sh && bash install.sh +    wget -N --no-check-certificate https://raw.githubusercontent.com/wbdy95/SSR-Bash-Python/master/install.sh && bash install.sh ## 卸载 ## - wget -N --no-check-certificate https://raw.githubusercontent.com/ImAnyOne/SSR-Bash-Python/master/uninstall.sh && bash uninstall.sh +    wget -N --no-check-certificate https://raw.githubusercontent.com/wbdy95/SSR-Bash-Python/master/uninstall.sh && bash uninstall.sh ## 自检 ## - wget -N --no-check-certificate https://raw.githubusercontent.com/ImAnyOne/SSR-Bash-Python/master/self-check.sh && bash self-check.sh +    wget -N --no-check-certificate https://raw.githubusercontent.com/wbdy95/SSR-Bash-Python/master/self-check.sh && bash self-check.sh ## 截图 ## ![https://raw.githubusercontent.com/ImAnyOne/SSR-Bash-Python/master/1.png](1.png) diff --git a/install.sh b/install.sh index 75d2ada..14490f6 100644 --- a/install.sh +++ b/install.sh @@ -60,8 +60,8 @@ fi #Install SSR and SSR-Bash cd /usr/local -git clone https://github.com/shadowsocksr/shadowsocksr.git -git clone https://github.com/${GH_REPO}.git +git clone https://github.com/wbdy95/shadowsocksr.git +git clone https://github.com/wbdy95/SSR-Bash-Python.git cd /usr/local/shadowsocksr bash initcfg.sh @@ -140,7 +140,7 @@ systemctl enable iptables.service fi #Install SSR-Bash Background -wget -N --no-check-certificate -O /usr/local/bin/ssr https://raw.githubusercontent.com/${GH_REPO}/master/ssr +wget -N --no-check-certificate -O /usr/local/bin/ssr https://raw.githubusercontent.com/wbdy95/SSR-Bash-Python/master/ssr chmod +x /usr/local/bin/ssr #Modify ShadowsocksR API diff --git a/www/cgi-bin/check_flow.py b/www/cgi-bin/check_flow.py index 0666415..227df3b 100755 --- a/www/cgi-bin/check_flow.py +++ b/www/cgi-bin/check_flow.py @@ -21,17 +21,20 @@ if(str(x[u"port"]) == str(getport)): portexist=1 transfer_enable_int = int(x[u"transfer_enable"])/1024/1024; - d_int = int(x[u"d"])/1024/1024; + d_int = float(x[u"d"])/1024/1024; transfer_unit = "MB" d_unit = "MB" - #流量单位转换 if(transfer_enable_int > 1024): transfer_enable_int = transfer_enable_int/1024 transfer_unit = "GB" - if(transfer_enable_int > 1024): + if(d_int > 1024): d_int = d_int/1024 + d_int= ("%.3f" %d_int) d_unit = "GB" + if(d_int < 1024): + d_int= ("%.3f" %d_int) + d_unit = "MB" break if(portexist==0): @@ -123,8 +126,8 @@ ''' -print formhtml % (getport,d_int,d_unit,transfer_enable_int,transfer_unit) +print formhtml % (getport,d_int,d_unit,transfer_enable_int,transfer_unit) print footer f.close(); diff --git a/www/d.html b/www/d.html new file mode 100755 index 0000000..8958396 --- /dev/null +++ b/www/d.html @@ -0,0 +1,64 @@ + + + + + + + + SSR 客户端下载 + + + + + + + + + + + + + + + +
+
+
+

  SSR 客户端下载

+
+
+
+
+
+
+ + +
+
+
+
+
+ + + + + + + + + diff --git a/www/index.html b/www/index.html index e023451..9997e1a 100755 --- a/www/index.html +++ b/www/index.html @@ -5,7 +5,7 @@ - SSR-Bash-Python 用户面板 + SSR 用户面板 @@ -27,7 +27,7 @@
-

  SSR-Bash-Python 用户面板

+

  SSR 用户面板

@@ -38,6 +38,7 @@

功能列表

diff --git a/www/ssr/ShadowsocksR-4.6.1-win.zip b/www/ssr/ShadowsocksR-4.6.1-win.zip new file mode 100755 index 0000000..6544e12 Binary files /dev/null and b/www/ssr/ShadowsocksR-4.6.1-win.zip differ diff --git a/www/ssr/ShadowsocksR-v3.4.0.5.apk b/www/ssr/ShadowsocksR-v3.4.0.5.apk new file mode 100755 index 0000000..fc023bb Binary files /dev/null and b/www/ssr/ShadowsocksR-v3.4.0.5.apk differ diff --git a/www/ssr/ShadowsocksX-R-v1.3.9.zip b/www/ssr/ShadowsocksX-R-v1.3.9.zip new file mode 100755 index 0000000..5ae40f1 Binary files /dev/null and b/www/ssr/ShadowsocksX-R-v1.3.9.zip differ diff --git a/www/ssr/electron-ssr_0.1.2-21_amd64.deb b/www/ssr/electron-ssr_0.1.2-21_amd64.deb new file mode 100755 index 0000000..03a0fba Binary files /dev/null and b/www/ssr/electron-ssr_0.1.2-21_amd64.deb differ diff --git a/www/ssr/shadowsocks-nightly-2.10.8.apk b/www/ssr/shadowsocks-nightly-2.10.8.apk new file mode 100755 index 0000000..d622e44 Binary files /dev/null and b/www/ssr/shadowsocks-nightly-2.10.8.apk differ