onfork · Feb 14, 2019 · Feb 14, 2019 · Feb 16, 2019 · Feb 16, 2019 · Feb 16, 2019
diff --git a/1.png b/1.png
diff --git a/2.png b/2.png
diff --git a/3.png b/3.png
diff --git a/README.md b/README.md
@@ -1,19 +1,53 @@
 # sprov-ui
- 一个v2ray Web面板
+ 一个支持多协议多用户的v2ray Web面板
 
+# 支持的功能
+ - 系统运行状态监控
+ - 多协议、多用户管理
+ - 禁用、启用单个账号
+ - 支持设置监听的 IP（多 IP 服务器下）
+ - 流量统计（支持所有协议）
+
+## 支持的 v2ray 协议
+ - vmess（v2ray 特色）
+ - shadowsocks（经典 ss）
+ - mtproto（Telegram 专用）
+ - dokodemo-door（端口转发）
+ - socks（socks 4、socks 4a、socks 5）
+ - http（http 代理）
+
+## 支持的 vmess 传输配置
+ - tcp
+ - kcp + 伪装
+ - ws + 伪装 + tls
+
+# 运行截图
 ![1.png](1.png)
 ![2.png](2.png)
 
 # 支持的系统
+>务必使用纯净版的系统，建议在 256MB 内存及以上的 vps 搭建，低内存情况下可能运作不良
  - CentOS 7（推荐）
  - Ubuntu 16
  - Ubuntu 18
  - Debian 8
  - Debian 9
 
-# 一键安装
+# 一键安装&升级面板
+>面板已内置升级功能（每30分钟从 Github 检测一次）
+
+以下两条命令皆可，两者是一样的，只需要运行一个，如果其中一个有错误，可以运行另外一个。
+```
+wget -O install.sh -N --no-check-certificate https://blog.sprov.xyz/sprov-ui.sh && bash install.sh
+```
 ```
 wget -O install.sh -N --no-check-certificate https://github.com/sprov065/sprov-ui/raw/master/install.sh && bash install.sh
 ```
 # 详细教程
 https://blog.sprov.xyz/2019/02/09/sprov-ui/
+
+# Telegram 群组
+https://t.me/sprov_blog
+
+# Telegram 频道
+https://t.me/sprov_channel
diff --git a/install.sh b/install.sh
@@ -8,9 +8,7 @@ plain='\033[0m'
 cur_dir=$(pwd)
 
 # check root
-[[ $EUID -ne 0 ]] && echo -e "${red}error:${plain} This script must be run as root!!！\n" && exit 1
-
-[[ -d "/proc/vz" ]] && echo -e "${yellow}warning:${plain} Your VPS is based on OpenVZ, which is not support bbr.\n"
+[[ $EUID -ne 0 ]] && echo -e "${red}错误：${plain} 必须使用root用户运行此脚本！\n" && exit 1
 
 # check os
 if [[ -f /etc/redhat-release ]]; then
@@ -28,7 +26,7 @@ elif cat /proc/version | grep -Eqi "ubuntu"; then
 elif cat /proc/version | grep -Eqi "centos|red hat|redhat"; then
     release="centos"
 else
-    echo -e "${red}OS is not supported, please contact the author!!!${plain}\n" && exit 1
+    echo -e "${red}未检测到系统版本，请联系脚本作者！${plain}\n" && exit 1
 fi
 
 os_version=""
@@ -43,28 +41,53 @@ fi
 
 if [[ x"${release}" == x"centos" ]]; then
     if [[ ${os_version} -le 6 ]]; then
-        echo -e "${red}OS is not supported, please use CentOS 7 or higher versions!!!${plain}" && exit 1
+        echo -e "${red}请使用 CentOS 7 或更高版本的系统！${plain}\n" && exit 1
     fi
 elif [[ x"${release}" == x"ubuntu" ]]; then
     if [[ ${os_version} -lt 16 ]]; then
-        echo -e "${red}OS is not supported, please use Ubuntu 16 or higher versions!!!${plain}\n" && exit 1
+        echo -e "${red}请使用 Ubuntu 16 或更高版本的系统！${plain}\n" && exit 1
     fi
 elif [[ x"${release}" == x"debian" ]]; then
     if [[ ${os_version} -lt 8 ]]; then
-        echo -e "${red}OS is not supported, please use Debian 8 or higher versions!!!${plain}\n" && exit 1
+        echo -e "${red}请使用 Debian 8 或更高版本的系统！${plain}\n" && exit 1
     fi
 fi
 
+install_bc() {
+    command -v bc >/dev/null 2>&1 || yum install bc -y || apt install bc -y
+}
+
 install_java() {
-    if [[ x"${release}" == x"centos" ]]; then
+    if [[ -f /usr/bin/java ]]; then
+        install_bc
+        java_version=`/usr/bin/java -version 2>&1 | awk -F '\"' 'NR==1{print $2}' | awk -F '.' '{OFS="."; print $1,$2;}'`
+        require_version=1.8
+        is_ok=`echo "$java_version>=$require_version" | bc`
+        if [[ is_ok -eq 1 ]]; then
+	    echo -e "${green}已检测到1.8及以上版本的java，无需重复安装${plain}"
+	else
+	    echo -e "错误：${green}/usr/bin/java${red}的版本低于1.8，请安装大于等于1.8版本的java${plain}"
+	    exit -1
+	fi
+    elif [[ x"${release}" == x"centos" ]]; then
         yum install java-1.8.0-openjdk curl -y
     elif [[ x"${release}" == x"debian" || x"${release}" == x"ubuntu" ]]; then
         apt install default-jre curl -y
     fi
+    if [[ $? -ne 0 ]]; then
+        echo -e "${red}Java环境安装失败，请检查错误信息${plain}"
+        exit 1
+    fi
 }
 
 install_v2ray() {
+    echo -e "${green}开始安装or升级v2ray${plain}"
     bash <(curl -L -s https://install.direct/go.sh) -f
+    if [[ $? -ne 0 ]]; then
+        echo -e "${red}v2ray安装或升级失败，请检查错误信息${plain}"
+        exit 1
+    fi
+    systemctl enable v2ray
     systemctl start v2ray
 }
 
@@ -82,23 +105,25 @@ close_firewall() {
     fi
 }
 
-install_sprov-ui() {
-    if [[ ! -f /usr/local/sprov-ui ]]; then
-        mkdir /usr/local/sprov-ui
-    fi
-    wget -O /usr/local/sprov-ui/sprov-ui.war https://github.com/sprov065/sprov-ui/releases/download/v1.0.0-beta/sprov-ui-1.0.0.war
-    read -p "请输入面板监听端口[默认80]：" port
-    read -p "请输入面板登录用户名[默认sprov]：" user
-    read -p "请输入面板登录密码[默认blog.sprov.xyz]：" pwd
-    if [[ -z "${port}" ]]; then
-        port=80
-    fi
-    if [[ -z "${user}" ]]; then
-        user="sprov"
-    fi
-    if [[ -z "${pwd}" ]]; then
-        pwd="blog.sprov.xyz"
+port=80
+user="sprov"
+pwd="blog.sprov.xyz"
+
+init_config() {
+    if [[ ! -e "/etc/sprov-ui" ]]; then
+        mkdir /etc/sprov-ui
     fi
+    echo "port=${port}" > /etc/sprov-ui/sprov-ui.conf
+    echo "username=${user}" >> /etc/sprov-ui/sprov-ui.conf
+    echo "password=${pwd}" >> /etc/sprov-ui/sprov-ui.conf
+
+    echo ""
+    echo -e "面板监听端口（不是v2ray端口）：${green}${port}${plain}"
+    echo -e "面板登录用户名：${green}${user}${plain}"
+    echo -e "面板登录密码：${green}${pwd}${plain}"
+}
+
+init_service() {
     echo "[Unit]" > /etc/systemd/system/sprov-ui.service
     echo "Description=sprov-ui Service" >> /etc/systemd/system/sprov-ui.service
     echo "After=network.target" >> /etc/systemd/system/sprov-ui.service
@@ -107,22 +132,76 @@ install_sprov-ui() {
     echo "[Service]" >> /etc/systemd/system/sprov-ui.service
     echo "Type=simple" >> /etc/systemd/system/sprov-ui.service
     java_cmd="/usr/bin/java"
-    echo "ExecStart=${java_cmd} -jar /usr/local/sprov-ui/sprov-ui.war --server.port=${port} --user.username=${user} --user.password=${pwd}" >> /etc/systemd/system/sprov-ui.service
+    echo "ExecStart=${java_cmd} -jar /usr/local/sprov-ui/sprov-ui.jar" >> /etc/systemd/system/sprov-ui.service
     echo "" >> /etc/systemd/system/sprov-ui.service
     echo "[Install]" >> /etc/systemd/system/sprov-ui.service
     echo "WantedBy=multi-user.target" >> /etc/systemd/system/sprov-ui.service
     systemctl daemon-reload
-    echo -e "${green}v2ray面板安装成功${plain}\n"
-    echo -e "面板监听端口（不是v2ray端口）：${green}${port}${plain}"
-    echo -e "面板登录用户名：${green}${user}${plain}"
-    echo -e "面板登录密码：${green}${pwd}${plain}"
+}
+
+set_systemd() {
+    init_service
+    reset="y"
+    first="y"
+    if [[ -f "/etc/sprov-ui/sprov-ui.conf" ]]; then
+        read -p "是否重新设置面板端口、用户名和密码[y/n]：" reset
+        first="n"
+    fi
+    if [[ x"$reset" == x"y" || x"$reset" == x"Y" ]]; then
+        read -p "请输入面板监听端口[默认80]：" port
+        read -p "请输入面板登录用户名[默认sprov]：" user
+        read -p "请输入面板登录密码[默认blog.sprov.xyz]：" pwd
+        if [[ -z "${port}" ]]; then
+            port=80
+        fi
+        if [[ -z "${user}" ]]; then
+            user="sprov"
+        fi
+        if [[ -z "${pwd}" ]]; then
+            pwd="blog.sprov.xyz"
+        fi
+        init_config
+        if [[ x"${first}" == x"n" ]]; then
+            echo ""
+            echo -e "${green}设置了新的端口、用户名和密码后记得重启面板${plain}"
+        fi
+    fi
+}
+
+install_sprov-ui() {
+    if [[ ! -e "/usr/local/sprov-ui" ]]; then
+        mkdir /usr/local/sprov-ui
+    fi
+    if [[ -f "/usr/local/sprov-ui/sprov-ui.war" ]]; then
+        rm /usr/local/sprov-ui/sprov-ui.war -f
+    fi
+    last_version=$(curl --silent "https://api.github.com/repos/sprov065/sprov-ui/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')
+    echo -e "检测到sprov-ui最新版本：${last_version}，开始下载核心文件"
+    wget -N --no-check-certificate -O /usr/local/sprov-ui/sprov-ui.jar https://github.com/sprov065/sprov-ui/releases/download/${last_version}/sprov-ui-${last_version}.jar
+    if [[ $? -ne 0 ]]; then
+        echo -e "${red}下载sprov-ui核心文件失败，请确保你的服务器能够下载Github的文件，如果多次安装失败，请参考手动安装教程${plain}"
+        exit 1
+    fi
+    set_systemd
+    echo ""
+    echo -e "${green}sprov-ui面板安装成功${plain}\n"
+    echo ""
     echo -e "开启面板：systemctl start sprov-ui"
     echo -e "关闭面板：systemctl stop sprov-ui"
     echo -e "重启面板：systemctl restart sprov-ui"
+    echo -e "运行状态：systemctl status sprov-ui"
+    echo -e "开机启动：systemctl enable sprov-ui"
+    echo -e "取消开机启动：systemctl disable sprov-ui"
+    echo ""
+    echo -e "若启动面板失败，请使用以下命令手动启动检查问题所在："
+    echo -e "/usr/bin/java -jar /usr/local/sprov-ui/sprov-ui.jar"
+    echo ""
+    echo -e "若未安装bbr等加速工具，推荐使用以下命令一键安装bbr："
+    echo -e "wget --no-check-certificate https://github.com/sprov065/blog/raw/master/bbr.sh && bash bbr.sh"
 }
 
 echo "开始安装"
 install_java
 install_v2ray
 close_firewall
-install_sprov-ui
+install_sprov-ui