From 5938908abbd66013f0017048850d9dc01083adcc Mon Sep 17 00:00:00 2001
From: NewName <newemail@example.com>
Date: Mon, 12 Aug 2024 01:02:44 +0800
Subject: [PATCH] 1

---
 README.md                            | 13 -------------
 tmp/README.md                        | 13 +++++++++++++
 shadowsocks.sh => tmp/shadowsocks.sh |  5 +++--
 x.sh => tmp/vmess.sh                 | 14 +++++++++++---
 4 files changed, 27 insertions(+), 18 deletions(-)
 create mode 100644 tmp/README.md
 rename shadowsocks.sh => tmp/shadowsocks.sh (94%)
 rename x.sh => tmp/vmess.sh (77%)

diff --git a/README.md b/README.md
index ab4829f..117ee13 100644
--- a/README.md
+++ b/README.md
@@ -36,19 +36,6 @@ bash <(wget -qO- -o- https://github.com/admin8800/sing-box/raw/main/install.sh)
 bash <(wget -qO- https://github.com/sky22333/shell/raw/main/xray.sh)
 ```
 
-### 批量搭建vmess节点并把节点信息传输到另一台机器
-
-一：先把`x.sh`文件中的第88行填入你目的主机的密码和IP
-
-二：目的主机需在`home`目录下创建`xray.txt`文件
-```
-touch /home/xray.txt
-```
-三：然后再执行此脚本
-
-```
-bash <(wget -qO- https://github.com/sky22333/shell/raw/main/x.sh)
-```
 
 
 ###  端口限速脚本
diff --git a/tmp/README.md b/tmp/README.md
new file mode 100644
index 0000000..41aa8c7
--- /dev/null
+++ b/tmp/README.md
@@ -0,0 +1,13 @@
+### 批量搭建节点并把节点信息传输到另一台机器
+
+一：先在脚本变量中填入目标服务器信息
+
+二：目的主机需在`home`目录下创建`xray.txt`文件
+```
+touch /home/xray.txt
+```
+三：然后再执行此脚本
+
+```
+bash <(wget -qO- https://github.com/sky22333/shell/raw/main/tmp/shadowsocks.sh)
+```
\ No newline at end of file
diff --git a/shadowsocks.sh b/tmp/shadowsocks.sh
similarity index 94%
rename from shadowsocks.sh
rename to tmp/shadowsocks.sh
index ded57bd..edff320 100644
--- a/shadowsocks.sh
+++ b/tmp/shadowsocks.sh
@@ -50,8 +50,8 @@ configure_and_transfer() {
     ]
 }
 EOF
-
-    local config="ss://$(echo -n "aes-256-gcm:$PASSWORD" | base64 -w 0)@$SERVER_IP:9527#$NODE_NAME"
+    local ip=$(curl -s http://ipinfo.io/ip)
+    local config="ss://$(echo -n "aes-256-gcm:$PASSWORD" | base64 -w 0)@$ip:9527#$NODE_NAME"
     echo -e "${green}Shadowsocks 节点配置信息:${none}"
     echo $config
     echo $config > /tmp/xray_config.txt
@@ -62,4 +62,5 @@ EOF
 install_dependencies
 configure_and_transfer
 systemctl restart xray
+systemctl enable xray
 echo -e "${green}Xray 服务已经重新启动。${none}"
diff --git a/x.sh b/tmp/vmess.sh
similarity index 77%
rename from x.sh
rename to tmp/vmess.sh
index 8f00fc4..c4da9a8 100644
--- a/x.sh
+++ b/tmp/vmess.sh
@@ -1,5 +1,11 @@
 #!/bin/bash
 
+# 定义变量
+SERVER_IP="目标服务器IP"
+SERVER_PASSWORD="目标服务器密码"
+NODE_NAME="节点名称"
+TARGET_DIR="/home/xray.txt"
+
 green='\e[32m'
 none='\e[0m'
 config_file="/usr/local/etc/xray/config.json"
@@ -74,15 +80,17 @@ configure_and_transfer() {
 EOF
 
     local ip=$(curl -s http://ipinfo.io/ip)
-    local config="vmess://$(echo -n "{\"v\":\"2\",\"ps\":\"TK节点定制\",\"add\":\"$ip\",\"port\":$PORT,\"id\":\"$UUID\",\"aid\":\"0\",\"net\":\"ws\",\"path\":\"/$RANDOM_PATH\",\"type\":\"none\",\"host\":\"\",\"tls\":\"\"}" | base64 -w 0)"
+    local config="vmess://$(echo -n "{\"v\":\"2\",\"ps\":\"$NODE_NAME\",\"add\":\"$ip\",\"port\":$PORT,\"id\":\"$UUID\",\"aid\":\"0\",\"net\":\"ws\",\"path\":\"/$RANDOM_PATH\",\"type\":\"none\",\"host\":\"\",\"tls\":\"\"}" | base64 -w 0)"
     echo -e "${green}Vmess 节点配置信息:${none}"
     echo $config
 
     echo $config > /tmp/xray_config.txt
-    sshpass -p '密码' ssh -o StrictHostKeyChecking=no root@服务器IP "cat >> /home/xray.txt" < /tmp/xray_config.txt
+    sshpass -p "$SERVER_PASSWORD" ssh -o StrictHostKeyChecking=no root@$SERVER_IP "cat >> $TARGET_DIR" < /tmp/xray_config.txt
 }
+
 # 主执行逻辑
 install_dependencies
 configure_and_transfer
 systemctl restart xray
-echo -e "${green}Xray 服务已经重新启动。${none}"
+systemctl enable xray
+echo -e "${green}Xray 服务已经重新启动。${none}"
\ No newline at end of file