优化vps部署

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
-        keys=$(/usr/local/bin/xray x25519 2>&1)
-        XRAY_PRIVATE_KEY=$(echo "$keys" | grep -i 'private' | awk -F': ' '{print $2}' | tr -d '[:space:]')
-        XRAY_PUBLIC_KEY=$(echo "$keys" | grep -i 'public' | awk -F': ' '{print $2}' | tr -d '[:space:]')
-        XRAY_SHORT_ID=$(openssl rand -hex 8)
+        if [ -z "${XRAY_PRIVATE_KEY:-}" ] || [ -z "${XRAY_PUBLIC_KEY:-}" ]; then
+            local keys
+            keys=$(/usr/local/bin/xray x25519 2>&1)
+            XRAY_PRIVATE_KEY=$(echo "$keys" | grep -i 'private' | awk -F': ' '{print $2}' | tr -d '[:space:]')
+            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
 }