mirror of https://github.com/wulabing/Xray_onekey
Multiple Modifications (#363)
Xray-1.3.7 * Multiple Modifications [fix] Delete the step of "install wget" (wget is required to be installed when executing the script); [fix] Increase the requirements for the provider of the server in the Issue template; [fix] README.md Chinese language correctness optimization. Co-authored-by: wulabing <wulabing@gmail.com> Co-authored-by: Eason Tang <tangyisheng2@sina.com>pull/379/head
parent
8092a701f2
commit
ecbe920c70
|
@ -1,6 +1,6 @@
|
|||
---
|
||||
name: Bug report
|
||||
about: 使用这个脚本来反馈BUG
|
||||
name: Bug Report
|
||||
about: 使用这个模板来反馈 BUG
|
||||
title: "[BUG]"
|
||||
labels: ''
|
||||
assignees: ''
|
||||
|
@ -17,11 +17,11 @@ assignees: ''
|
|||
在提交之前,请确认:
|
||||
|
||||
- [ ] 如果你可以自己 debug 并解决的话,提交 PR 吧!
|
||||
- [ ] 我已经在Issue中找过我要提出的问题
|
||||
- [ ] 我已经使用最新版本的脚本测试过,问题依旧存在
|
||||
- [ ] 我已经仔细看过脚本报错提示并无法自行解决问题
|
||||
- [ ] 我已经在 [issues](https://github.com/wulabing/Xray_onekey/issues) 中找过我要提出的问题;
|
||||
- [ ] 我已经使用最新版本的脚本测试过,问题依旧存在;
|
||||
- [ ] 我已经仔细看过脚本报错提示并无法自行解决问题。
|
||||
|
||||
请注意,如果你并没有遵照这个 issue template 填写内容,我们将看心情关闭这个 issue。
|
||||
请注意,如果你没有遵照此 Issue Template 填写内容,我们将看心情关闭这个 issue。
|
||||
|
||||
------------------------------------------------------------------
|
||||
|
||||
|
@ -31,21 +31,21 @@ assignees: ''
|
|||
|
||||
### 服务运行情况
|
||||
|
||||
请运行命令 service xray status 并粘贴输出:
|
||||
请运行命令 `service xray status` 并粘贴输出:
|
||||
|
||||
```
|
||||
将输出粘贴在这里
|
||||
在此处粘贴输出内容
|
||||
```
|
||||
请运行命令 service nginx status 并粘贴输出:
|
||||
请运行命令 `service nginx status` 并粘贴输出:
|
||||
```
|
||||
将输出粘贴在这里
|
||||
在此处粘贴输出内容
|
||||
```
|
||||
|
||||
|
||||
|
||||
### 环境 Environment
|
||||
|
||||
* 操作系统
|
||||
* 服务器提供商及服务器操作系统
|
||||
……
|
||||
* 是否全新安装
|
||||
……
|
||||
|
@ -59,6 +59,9 @@ assignees: ''
|
|||
<!--
|
||||
请详细、清晰地表达你要提出的论述,例如这个问题如何影响到你?你想实现什么功能?
|
||||
-->
|
||||
```
|
||||
在此处粘贴说明内容
|
||||
```
|
||||
|
||||
### 重现问题的具体步骤
|
||||
|
||||
|
|
12
README.MD
12
README.MD
|
@ -13,12 +13,12 @@
|
|||
|
||||
### 准备工作
|
||||
* 准备一个域名,并将 A 记录添加好;
|
||||
* 安装好 wget。
|
||||
* 安装好 `wget`。
|
||||
|
||||
### 导入链接规范
|
||||
https://github.com/XTLS/Xray-core/issues/91
|
||||
|
||||
> 截止 2021-2-24 仅有 V2RayN 4.12+ 及 V2RayNG 1.5.8+ 支持链接及二维码导入
|
||||
> 截至 2021-2-24 仅有 V2RayN 4.12+ 及 V2RayNG 1.5.8+ 支持链接及二维码导入,其他客户端请手动填入配置信息。
|
||||
|
||||
|
||||
### 安装/更新方式(Nginx 前置)
|
||||
|
@ -57,7 +57,7 @@ wget -N --no-check-certificate -q -O install.sh "https://raw.githubusercontent.c
|
|||
* 本脚本中 锐速 4 合 1 脚本原项目引用 https://www.94ish.me/1635.html 在此感谢;
|
||||
* 本脚本中 锐速 4 合 1 脚本修改版项目引用 https://github.com/ylx2016/Linux-NetSpeed 在此感谢 ylx2016;
|
||||
* 本脚本中 配置文件及部分逻辑参考 https://github.com/jiuqi9997/xray-yes 在此感谢 玖柒;
|
||||
* 本脚本中 二维码 API 部分参考 https://github.com/mack-a/v2ray-agent 在此感谢 mack-a;
|
||||
* 本脚本中 二维码 API 部分参考 https://github.com/mack-a/v2ray-agent 在此感谢 mack-a。
|
||||
|
||||
### 启动方式
|
||||
|
||||
|
@ -85,7 +85,11 @@ Nginx 目录: `/etc/nginx`
|
|||
|
||||
https://bandwagonhost.com/aff.php?aff=63939
|
||||
|
||||
您可以使用我的 justmysocks AFF 购买搬瓦工提供的代理
|
||||
您可以使用我的 JustMySocks AFF 购买搬瓦工提供的代理
|
||||
|
||||
https://justmysocks.net/members/aff.php?aff=17621
|
||||
|
||||
## Stargazers over time
|
||||
|
||||
[](https://starchart.cc/wulabing/Xray_onekey)
|
||||
|
||||
|
|
50
install.sh
50
install.sh
|
@ -143,8 +143,8 @@ function nginx_install() {
|
|||
mkdir -p /etc/nginx/conf.d >/dev/null 2>&1
|
||||
}
|
||||
function dependency_install() {
|
||||
${INS} wget lsof tar
|
||||
judge "安装 wget lsof tar"
|
||||
${INS} lsof tar
|
||||
judge "安装 lsof tar"
|
||||
|
||||
if [[ "${ID}" == "centos" || "${ID}" == "ol" ]]; then
|
||||
${INS} crontabs
|
||||
|
@ -185,7 +185,7 @@ function dependency_install() {
|
|||
${INS} pcre pcre-devel zlib-devel epel-release openssl openssl-devel
|
||||
elif [[ "${ID}" == "ol" ]]; then
|
||||
${INS} pcre pcre-devel zlib-devel openssl openssl-devel
|
||||
# Oracle Linux 不同日期版本的 VERSION_ID 比较乱 直接暴力处理
|
||||
# Oracle Linux 不同日期版本的 VERSION_ID 比较乱 直接暴力处理。如出现问题或有更好的方案,请提交 Issue。
|
||||
yum-config-manager --enable ol7_developer_EPEL >/dev/null 2>&1
|
||||
yum-config-manager --enable ol8_developer_EPEL >/dev/null 2>&1
|
||||
else
|
||||
|
@ -210,7 +210,7 @@ function basic_optimization() {
|
|||
echo '* soft nofile 65536' >>/etc/security/limits.conf
|
||||
echo '* hard nofile 65536' >>/etc/security/limits.conf
|
||||
|
||||
# 关闭 Selinux
|
||||
# RedHat 系发行版关闭 SELinux
|
||||
if [[ "${ID}" == "centos" || "${ID}" == "ol" ]]; then
|
||||
sed -i 's/^SELINUX=.*/SELINUX=disabled/' /etc/selinux/config
|
||||
setenforce 0
|
||||
|
@ -314,7 +314,7 @@ function configure_nginx() {
|
|||
nginx_conf="/etc/nginx/conf.d/${domain}.conf"
|
||||
cd /etc/nginx/conf.d/ && rm -f ${domain}.conf && wget -O ${domain}.conf https://raw.githubusercontent.com/wulabing/Xray_onekey/${github_branch}/config/web.conf
|
||||
sed -i "s/xxx/${domain}/g" ${nginx_conf}
|
||||
judge "Nginx config modify"
|
||||
judge "Nginx 配置 修改"
|
||||
|
||||
systemctl restart nginx
|
||||
}
|
||||
|
@ -416,7 +416,7 @@ function ssl_judge_and_install() {
|
|||
elif [[ -f "$HOME/.acme.sh/${domain}_ecc/${domain}.key" && -f "$HOME/.acme.sh/${domain}_ecc/${domain}.cer" ]]; then
|
||||
echo "证书文件已存在"
|
||||
"$HOME"/.acme.sh/acme.sh --installcert -d "${domain}" --fullchainpath /ssl/xray.crt --keypath /ssl/xray.key --ecc
|
||||
judge "证书应用"
|
||||
judge "证书启用"
|
||||
else
|
||||
mkdir /ssl
|
||||
cp -a $cert_dir/self_signed_cert.pem /ssl/xray.crt
|
||||
|
@ -467,7 +467,7 @@ function xray_uninstall() {
|
|||
read -r uninstall_acme
|
||||
case $uninstall_acme in
|
||||
[yY][eE][sS] | [yY])
|
||||
/root/.acme.sh/acme.sh --uninstall
|
||||
"$HOME"/.acme.sh/acme.sh --uninstall
|
||||
rm -rf /root/.acme.sh
|
||||
rm -rf /ssl/
|
||||
;;
|
||||
|
@ -490,16 +490,16 @@ function vless_xtls-rprx-direct_link() {
|
|||
FLOW=$(cat ${xray_conf_dir}/config.json | jq .inbounds[0].settings.clients[0].flow | tr -d '"')
|
||||
DOMAIN=$(cat ${domain_tmp_dir}/domain)
|
||||
|
||||
print_ok "URL 链接(VLESS + TCP + TLS)"
|
||||
print_ok "URL 链接 (VLESS + TCP + TLS)"
|
||||
print_ok "vless://$UUID@$DOMAIN:$PORT?security=tls&flow=$FLOW#TLS_wulabing-$DOMAIN"
|
||||
|
||||
print_ok "URL 链接(VLESS + TCP + XTLS)"
|
||||
print_ok "URL 链接 (VLESS + TCP + XTLS)"
|
||||
print_ok "vless://$UUID@$DOMAIN:$PORT?security=xtls&flow=$FLOW#XTLS_wulabing-$DOMAIN"
|
||||
print_ok "-------------------------------------------------"
|
||||
print_ok "URL 二维码(VLESS + TCP + TLS)(请在浏览器中访问)"
|
||||
print_ok "URL 二维码 (VLESS + TCP + TLS) (请在浏览器中访问)"
|
||||
print_ok "https://api.qrserver.com/v1/create-qr-code/?size=400x400&data=vless://$UUID@$DOMAIN:$PORT?security=tls%26flow=$FLOW%23TLS_wulabing-$DOMAIN"
|
||||
|
||||
print_ok "URL 二维码(VLESS + TCP + XTLS)(请在浏览器中访问)"
|
||||
print_ok "URL 二维码 (VLESS + TCP + XTLS) (请在浏览器中访问)"
|
||||
print_ok "https://api.qrserver.com/v1/create-qr-code/?size=400x400&data=vless://$UUID@$DOMAIN:$PORT?security=xtls%26flow=$FLOW%23XTLS_wulabing-$DOMAIN"
|
||||
}
|
||||
|
||||
|
@ -546,22 +546,22 @@ function ws_link() {
|
|||
WS_PATH_WITHOUT_SLASH=$(echo $WS_PATH | tr -d '/')
|
||||
DOMAIN=$(cat ${domain_tmp_dir}/domain)
|
||||
|
||||
print_ok "URL 链接(VLESS + TCP + TLS)"
|
||||
print_ok "URL 链接 (VLESS + TCP + TLS)"
|
||||
print_ok "vless://$UUID@$DOMAIN:$PORT?security=tls#TLS_wulabing-$DOMAIN"
|
||||
|
||||
print_ok "URL 链接(VLESS + TCP + XTLS)"
|
||||
print_ok "URL 链接 (VLESS + TCP + XTLS)"
|
||||
print_ok "vless://$UUID@$DOMAIN:$PORT?security=xtls&flow=$FLOW#XTLS_wulabing-$DOMAIN"
|
||||
|
||||
print_ok "URL 链接(VLESS + WebSocket + TLS)"
|
||||
print_ok "URL 链接 (VLESS + WebSocket + TLS)"
|
||||
print_ok "vless://$UUID@$DOMAIN:$PORT?type=ws&security=tls&path=%2f${WS_PATH_WITHOUT_SLASH}%2f#WS_TLS_wulabing-$DOMAIN"
|
||||
print_ok "-------------------------------------------------"
|
||||
print_ok "URL 二维码(VLESS + TCP + TLS)(请在浏览器中访问)"
|
||||
print_ok "URL 二维码 (VLESS + TCP + TLS) (请在浏览器中访问)"
|
||||
print_ok "https://api.qrserver.com/v1/create-qr-code/?size=400x400&data=vless://$UUID@$DOMAIN:$PORT?security=tls%23TLS_wulabing-$DOMAIN"
|
||||
|
||||
print_ok "URL 二维码(VLESS + TCP + XTLS)(请在浏览器中访问)"
|
||||
print_ok "URL 二维码 (VLESS + TCP + XTLS) (请在浏览器中访问)"
|
||||
print_ok "https://api.qrserver.com/v1/create-qr-code/?size=400x400&data=vless://$UUID@$DOMAIN:$PORT?security=xtls%26flow=$FLOW%23XTLS_wulabing-$DOMAIN"
|
||||
|
||||
print_ok "URL 二维码(VLESS + WebSocket + TLS)(请在浏览器中访问)"
|
||||
print_ok "URL 二维码 (VLESS + WebSocket + TLS) (请在浏览器中访问)"
|
||||
print_ok "https://api.qrserver.com/v1/create-qr-code/?size=400x400&data=vless://$UUID@$DOMAIN:$PORT?type=ws%26security=tls%26path=%2f${WS_PATH_WITHOUT_SLASH}%2f%23WS_TLS_wulabing-$DOMAIN"
|
||||
}
|
||||
|
||||
|
@ -580,11 +580,11 @@ function basic_ws_information() {
|
|||
}
|
||||
|
||||
function show_access_log() {
|
||||
[ -f ${xray_access_log} ] && tail -f ${xray_access_log} || echo -e "${RedBG}log文件不存在${Font}"
|
||||
[ -f ${xray_access_log} ] && tail -f ${xray_access_log} || echo -e "${RedBG}log 文件不存在${Font}"
|
||||
}
|
||||
|
||||
function show_error_log() {
|
||||
[ -f ${xray_error_log} ] && tail -f ${xray_error_log} || echo -e "${RedBG}log文件不存在${Font}"
|
||||
[ -f ${xray_error_log} ] && tail -f ${xray_error_log} || echo -e "${RedBG}log 文件不存在${Font}"
|
||||
}
|
||||
|
||||
function bbr_boost_sh() {
|
||||
|
@ -653,11 +653,11 @@ menu() {
|
|||
# echo -e "${Green}23.${Font} 查看 V2Ray 配置信息"
|
||||
echo -e "—————————————— 其他选项 ——————————————"
|
||||
echo -e "${Green}31.${Font} 安装 4 合 1 BBR、锐速安装脚本"
|
||||
echo -e "${Yellow}32.${Font} 安装 MTproxy(不推荐使用,请相关用户关闭或卸载)"
|
||||
echo -e "${Yellow}32.${Font} 安装 MTproxy (不推荐使用,请相关用户关闭或卸载)"
|
||||
echo -e "${Green}33.${Font} 卸载 Xray"
|
||||
echo -e "${Green}34.${Font} 更新 Xray-core"
|
||||
echo -e "${Green}35.${Font} 安装 Xray-core 测试版(Pre)"
|
||||
echo -e "${Green}36.${Font} 手动更新SSL证书"
|
||||
echo -e "${Green}35.${Font} 安装 Xray-core 测试版 (Pre)"
|
||||
echo -e "${Green}36.${Font} 手动更新 SSL 证书"
|
||||
echo -e "${Green}40.${Font} 退出"
|
||||
read -rp "请输入数字:" menu_num
|
||||
case $menu_num in
|
||||
|
@ -671,7 +671,7 @@ menu() {
|
|||
install_xray_ws
|
||||
;;
|
||||
11)
|
||||
read -rp "请输入UUID:" UUID
|
||||
read -rp "请输入 UUID:" UUID
|
||||
if [[ ${shell_mode} == "tcp" ]]; then
|
||||
modify_UUID
|
||||
elif [[ ${shell_mode} == "ws" ]]; then
|
||||
|
@ -686,12 +686,12 @@ menu() {
|
|||
;;
|
||||
14)
|
||||
if [[ ${shell_mode} == "ws" ]]; then
|
||||
read -rp "请输入路径(示例:/wulabing/ 要求两侧都包含/):" WS_PATH
|
||||
read -rp "请输入路径(示例:/wulabing/ 要求两侧都包含 /):" WS_PATH
|
||||
modify_fallback_ws
|
||||
modify_ws
|
||||
restart_all
|
||||
else
|
||||
print_error "当前模式不是Websocket模式"
|
||||
print_error "当前模式不是 Websocket 模式"
|
||||
fi
|
||||
;;
|
||||
21)
|
||||
|
|
Loading…
Reference in New Issue