Merge branch 'master' of ssh://git.joywaygames.cn:2222/joywaygamess/server-deploy

# Conflicts:
#	vps-xray/vps-xray-optimized-info.md   resolved by theirs version

vps-xray/deploy.sh

@@ -78,22 +78,24 @@ install_xray() {
 generate_keys() {
     step "2/5 生成密钥"
 
-    XRAY_UUID=$(cat /proc/sys/kernel/random/uuid)
+    XRAY_UUID="${XRAY_UUID:-$(cat /proc/sys/kernel/random/uuid)}"
     log "UUID: ${XRAY_UUID}"
 
     if [ "$MODE" = "reality" ]; then
-        local keys
+        if [ -z "${XRAY_PRIVATE_KEY:-}" ] || [ -z "${XRAY_PUBLIC_KEY:-}" ]; then
-        keys=$(/usr/local/bin/xray x25519 2>&1)
+            local keys
-        XRAY_PRIVATE_KEY=$(echo "$keys" | grep -i 'private' | awk -F': ' '{print $2}' | tr -d '[:space:]')
+            keys=$(/usr/local/bin/xray x25519 2>&1)
-        XRAY_PUBLIC_KEY=$(echo "$keys" | grep -i 'public' | awk -F': ' '{print $2}' | tr -d '[:space:]')
+            XRAY_PRIVATE_KEY=$(echo "$keys" | grep -i 'private' | awk -F': ' '{print $2}' | tr -d '[:space:]')
-        XRAY_SHORT_ID=$(openssl rand -hex 8)
+            XRAY_PUBLIC_KEY=$(echo "$keys" | grep -i 'public' | awk -F': ' '{print $2}' | tr -d '[:space:]')
+        fi
+        XRAY_SHORT_ID="${XRAY_SHORT_ID:-$(openssl rand -hex 8)}"
 
         if [ -z "$XRAY_PRIVATE_KEY" ] || [ -z "$XRAY_PUBLIC_KEY" ]; then
             error "密钥生成失败！xray x25519 输出:"
             echo "$keys"
             exit 1
         fi
-        log "x25519 密钥对已生成"
+        log "x25519 密钥对已生成或已加载"
         log "ShortId: ${XRAY_SHORT_ID}"
     fi
 }
@@ -438,7 +440,7 @@ print_result() {
         echo ""
         echo ">>> VLESS 分享链接（可直接导入客户端）:"
         echo ""
-        echo "vless://${XRAY_UUID}@${server_ip}:${XRAY_PORT}?encryption=none&flow=xtls-rprx-vision&security=reality&sni=${REALITY_SNI}&fp=chrome&pbk=${XRAY_PUBLIC_KEY}&sid=${XRAY_SHORT_ID}&type=tcp#VPS-Reality"
+        echo "vless://${XRAY_UUID}@${server_ip}:${XRAY_PORT}?encryption=none&flow=xtls-rprx-vision&security=reality&sni=${REALITY_SNI}&fp=chrome&pbk=${XRAY_PUBLIC_KEY}&sid=${XRAY_SHORT_ID}&type=tcp#vps-reality"
     else
         echo "    Xray VLESS TCP 部署完成 ✅"
         echo "=========================================================="

vps-xray/vpn-vps-xray-optimized.yaml

@@ -18,31 +18,57 @@ dns:
     geoip-code: CN
 
 proxies:
-  - name: "VPS-Reality"
+  - name: "vps-reality-1"
     type: vless
     server: 45.32.69.133
     port: 443
-    uuid: e02bfa4e-8c3c-4625-a0dc-207dd37bffd8
+    uuid: 5b05151b-a681-46db-a223-95dd45b13589
     network: tcp
     tls: true
     udp: true
     flow: xtls-rprx-vision
-    servername: www.microsoft.com
+    servername: www.apple.com
     client-fingerprint: chrome
     reality-opts:
-      public-key: J0Q5maB5UZVzgAH1V6nGMHKuaaT4mNQRKMS5ztROKnY
+      public-key: IgxAG9DOh7IFLkGi7Zrn3L00lYDYW9blDWRyzmxU6Bk
-      short-id: 0def0ee07b3e5f05
+      short-id: c6bdf22bcb510f78
+
+  - name: "vps-reality-2"
+    type: vless
+    server: 45.32.71.199
+    port: 443
+    uuid: cbf3836d-517d-4dfb-86d4-a636bca27713
+    network: tcp
+    tls: true
+    udp: true
+    flow: xtls-rprx-vision
+    servername: www.apple.com
+    client-fingerprint: chrome
+    reality-opts:
+      public-key: UXWjZU9YEIhZmvLJYgnvd4eKiddR4ewRS2xCnmFwfWc
+      short-id: ab115ca2444053d1
 
 proxy-groups:
   - name: "Proxy"
     type: select
     proxies:
-      - VPS-Reality
+      - Auto-Select
+      - vps-reality-1
+      - vps-reality-2
       - DIRECT
 
+  - name: "Auto-Select"
+    type: url-test
+    url: "http://www.gstatic.com/generate_204"
+    interval: 300
+    proxies:
+      - vps-reality-1
+      - vps-reality-1
+
 rules:
   # 国内直连
   - GEOIP,CN,DIRECT
   - GEOSITE,cn,DIRECT
   # 其余走代理
   - MATCH,Proxy
+  - MATCH,Proxy

vps-xray/vps-xray-optimized-info-2.md

@@ -0,0 +1,30 @@
+==========================================================
+    Xray VLESS-Reality 部署完成 ✅
+==========================================================
+
+  IP          : 45.32.71.199
+  端口        : 443
+  协议        : VLESS
+  UUID        : cbf3836d-517d-4dfb-86d4-a636bca27713
+  流控        : xtls-rprx-vision
+  传输        : tcp
+  安全        : reality
+  SNI         : www.apple.com
+  Fingerprint : chrome
+  PublicKey   : UXWjZU9YEIhZmvLJYgnvd4eKiddR4ewRS2xCnmFwfWc
+  ShortId     : ab115ca2444053d1
+
+==========================================================
+
+>>> VLESS 分享链接（可直接导入客户端）:
+
+vless://cbf3836d-517d-4dfb-86d4-a636bca27713@45.32.71.199:443?encryption=none&flow=xtls-rprx-vision&security=reality&sni=www.apple.com&fp=chrome&pbk=UXWjZU9YEIhZmvLJYgnvd4eKiddR4ewRS2xCnmFwfWc&sid=ab115ca2444053d1&type=tcp#vps-reality-2
+
+==========================================================
+
+⚠️  请妥善保存以上信息！
+    配置文件: /usr/local/etc/xray/config.json
+    凭据备份: /opt/vps-xray/.env
+    查看日志: journalctl -u xray -f
+    重启服务: systemctl restart xray
+==========================================================

vps-xray/vps-xray-optimized-info.md

@@ -1,55 +1,24 @@
 ==========================================================
-       Xray VLESS-Reality 部署完成  ✅ 运行中
+    Xray VLESS-Reality 部署完成 ✅
 ==========================================================
 
   IP          : 45.32.69.133
   端口        : 443
   协议        : VLESS
-  UUID        : e02bfa4e-8c3c-4625-a0dc-207dd37bffd8
+  UUID        : 5b05151b-a681-46db-a223-95dd45b13589
   流控        : xtls-rprx-vision
   传输        : tcp
   安全        : reality
-  SNI         : www.microsoft.com
+  SNI         : www.apple.com
   Fingerprint : chrome
-  PublicKey   : J0Q5maB5UZVzgAH1V6nGMHKuaaT4mNQRKMS5ztROKnY
+  PublicKey   : IgxAG9DOh7IFLkGi7Zrn3L00lYDYW9blDWRyzmxU6Bk
-  ShortId     : 0def0ee07b3e5f05
+  ShortId     : c6bdf22bcb510f78
 
 ==========================================================
 
 >>> VLESS 分享链接（可直接导入客户端）:
 
-vless://e02bfa4e-8c3c-4625-a0dc-207dd37bffd8@45.32.69.133:443?encryption=none&flow=xtls-rprx-vision&security=reality&sni=www.microsoft.com&fp=chrome&pbk=J0Q5maB5UZVzgAH1V6nGMHKuaaT4mNQRKMS5ztROKnY&sid=0def0ee07b3e5f05&type=tcp#VPS-Reality
+vless://5b05151b-a681-46db-a223-95dd45b13589@45.32.69.133:443?encryption=none&flow=xtls-rprx-vision&security=reality&sni=www.apple.com&fp=chrome&pbk=IgxAG9DOh7IFLkGi7Zrn3L00lYDYW9blDWRyzmxU6Bk&sid=c6bdf22bcb510f78&type=tcp#vps-reality-1
-
-==========================================================
-
-⚠️  请妥善保存以上信息！UUID 和密钥仅在此处显示一次。
-    配置文件位置: /usr/local/etc/xray/config.json
-    查看日志:     journalctl -u xray -f
-    重启服务:     systemctl restart xray
-==========================================================
-
-
-==========================================================
-    Xray VLESS-Reality 部署完成 ✅
-==========================================================
-
-  IP          : 45.32.71.199
-  端口        : 443
-  协议        : VLESS
-  UUID        : 8c0e7c6f-6dc0-4538-898b-c4326e2daa73
-  流控        : xtls-rprx-vision
-  传输        : tcp
-  安全        : reality
-  SNI         : www.microsoft.com
-  Fingerprint : chrome
-  PublicKey   : klmHphFi76lKdfAJX9V5hR8FhyP-FuojF01tFaWWWmE
-  ShortId     : 43c5fa74c179e32c
-
-==========================================================
-
->>> VLESS 分享链接（可直接导入客户端）:
-
-vless://8c0e7c6f-6dc0-4538-898b-c4326e2daa73@45.32.71.199:443?encryption=none&flow=xtls-rprx-vision&security=reality&sni=www.microsoft.com&fp=chrome&pbk=klmHphFi76lKdfAJX9V5hR8FhyP-FuojF01tFaWWWmE&sid=43c5fa74c179e32c&type=tcp#VPS-Reality
 
 ==========================================================
 
@@ -59,4 +28,3 @@ vless://8c0e7c6f-6dc0-4538-898b-c4326e2daa73@45.32.71.199:443?encryption=none&fl
     查看日志: journalctl -u xray -f
     重启服务: systemctl restart xray
 ==========================================================
-