diff --git a/agent/all-agent-hosts.txt b/agent/all-agent-hosts.txt index 9124c5e..46f8bd1 100644 --- a/agent/all-agent-hosts.txt +++ b/agent/all-agent-hosts.txt @@ -24,6 +24,8 @@ --------------------------------------------- +198.74.113.249 LosAngles-amd64-01 los-1 los1 + 129.146.171.163 Phoenix-amd64-02 phoenix-2 p2 129.146.65.80 Phoenix-arm64-01 phoenix-3 p3 diff --git a/server/src/main/java/io/wdd/func/xray/persisit/RealXrayPathConfig.json b/server/src/main/java/io/wdd/func/xray/persisit/RealXrayPathConfig.json new file mode 100644 index 0000000..0ef4dd6 --- /dev/null +++ b/server/src/main/java/io/wdd/func/xray/persisit/RealXrayPathConfig.json @@ -0,0 +1,1247 @@ +{ + "code": 1000, + "msg": "success", + "data": [ + { + "xrayConfigFileName": "5-Phoenix-amd64-02-2023-03-04-16-32-13.json", + "xrayConfigFile": "/octopus-server/xray/5-Phoenix-amd64-02-2023-03-04-16-32-13.json", + "xrayConfig": { + "log": { + "access": "/var/log/xray/access.log", + "error": "/var/log/xray/error.log", + "loglevel": "warning" + }, + "inbounds": [ + { + "protocol": "vmess", + "listen": "0.0.0.0", + "port": 19995, + "streamSettings": { + "tcpSettings": { + "header": { + "type": "http", + "response": { + "version": "1.1", + "status": "200", + "reason": "Accept", + "headers": { + "Content-Type": [ + "application/octet-stream", + "video/mpeg" + ], + "Transfer-Encoding": [ + "chunked" + ], + "Connection": [ + "keep-alive" + ], + "Pragma": "no-cache" + } + } + } + } + }, + "tag": "Shanghai-amd64-01->Seoul-amd64-04->Phoenix-amd64-02", + "settings": { + "clients": [ + { + "id": "d2b314c1-8cbc-47d0-91f7-f172c8aa148f", + "email": "Shanghai-amd64-01->Seoul-amd64-04->Phoenix-amd64-02@octopus.io", + "level": 0, + "alterId": 0 + } + ], + "disableInsecureEncryption": false + } + } + ], + "outbounds": [ + { + "protocol": "freedom" + }, + { + "protocol": "blackhole", + "tag": "block" + } + ], + "routing": { + "domainStrategy": "IPIfNonMatch", + "rules": [ + { + "type": "field", + "inboundTag": [ + "Shanghai-amd64-01->Seoul-amd64-04->Phoenix-amd64-02" + ], + "outboundTag": "Shanghai-amd64-01->Seoul-amd64-04->Phoenix-amd64-02" + } + ] + } + }, + "objectSummary": { + "bucketName": "tokyo-oracle-10gb", + "key": "5-Phoenix-amd64-02-2023-03-04-16-32-13.json", + "size": 1458, + "lastModified": "2023-03-04", + "contentType": "application/json", + "access": { + "originUrl": "https://nrjcs6lwr9vy.compat.objectstorage.ap-tokyo-1.oraclecloud.com/tokyo-oracle-10gb/5-Phoenix-amd64-02-2023-03-04-16-32-13.json" + }, + "etag": "2acf2546e097b217a7b2e288433d060b" + } + }, + { + "xrayConfigFileName": "2-Tokyo-amd64-03-2023-03-04-16-32-13.json", + "xrayConfigFile": "/octopus-server/xray/2-Tokyo-amd64-03-2023-03-04-16-32-13.json", + "xrayConfig": { + "log": { + "access": "/var/log/xray/access.log", + "error": "/var/log/xray/error.log", + "loglevel": "warning" + }, + "inbounds": [ + { + "protocol": "vmess", + "listen": "0.0.0.0", + "port": 19998, + "streamSettings": { + "tcpSettings": { + "header": { + "type": "http", + "response": { + "version": "1.1", + "status": "200", + "reason": "Accept", + "headers": { + "Content-Type": [ + "application/octet-stream", + "video/mpeg" + ], + "Transfer-Encoding": [ + "chunked" + ], + "Connection": [ + "keep-alive" + ], + "Pragma": "no-cache" + } + } + } + } + }, + "tag": "Tokyo-amd64-03", + "settings": { + "clients": [ + { + "id": "24e51a3a-ebfb-4c74-81d9-68feae8dc6c2", + "email": "Tokyo-amd64-03@octopus.io", + "level": 0, + "alterId": 0 + } + ], + "disableInsecureEncryption": false + } + }, + { + "protocol": "vmess", + "listen": "0.0.0.0", + "port": 19996, + "streamSettings": { + "tcpSettings": { + "header": { + "type": "http", + "response": { + "version": "1.1", + "status": "200", + "reason": "Accept", + "headers": { + "Content-Type": [ + "application/octet-stream", + "video/mpeg" + ], + "Transfer-Encoding": [ + "chunked" + ], + "Connection": [ + "keep-alive" + ], + "Pragma": "no-cache" + } + } + } + } + }, + "tag": "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-03", + "settings": { + "clients": [ + { + "id": "a7171db5-9836-4135-acc6-845b68927182", + "email": "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-03@octopus.io", + "level": 0, + "alterId": 0 + } + ], + "disableInsecureEncryption": false + } + } + ], + "outbounds": [ + { + "protocol": "freedom" + }, + { + "protocol": "blackhole", + "tag": "block" + } + ], + "routing": { + "domainStrategy": "IPIfNonMatch", + "rules": [ + { + "type": "field", + "inboundTag": [ + "Tokyo-amd64-03" + ], + "outboundTag": "Tokyo-amd64-03" + }, + { + "type": "field", + "inboundTag": [ + "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-03" + ], + "outboundTag": "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-03" + } + ] + } + }, + "objectSummary": { + "bucketName": "tokyo-oracle-10gb", + "key": "2-Tokyo-amd64-03-2023-03-04-16-32-13.json", + "size": 2423, + "lastModified": "2023-03-04", + "contentType": "application/json", + "access": { + "originUrl": "https://nrjcs6lwr9vy.compat.objectstorage.ap-tokyo-1.oraclecloud.com/tokyo-oracle-10gb/2-Tokyo-amd64-03-2023-03-04-16-32-13.json" + }, + "etag": "c0801eb53972bd1de2647831f69e8ad5" + } + }, + { + "xrayConfigFileName": "0-Shanghai-amd64-01-2023-03-04-16-32-13.json", + "xrayConfigFile": "/octopus-server/xray/0-Shanghai-amd64-01-2023-03-04-16-32-13.json", + "xrayConfig": { + "log": { + "access": "/var/log/xray/access.log", + "error": "/var/log/xray/error.log", + "loglevel": "warning" + }, + "inbounds": [ + { + "protocol": "vmess", + "listen": "0.0.0.0", + "port": 19997, + "streamSettings": { + "tcpSettings": { + "header": { + "type": "http", + "response": { + "version": "1.1", + "status": "200", + "reason": "Accept", + "headers": { + "Content-Type": [ + "application/octet-stream", + "video/mpeg" + ], + "Transfer-Encoding": [ + "chunked" + ], + "Connection": [ + "keep-alive" + ], + "Pragma": "no-cache" + } + } + } + } + }, + "tag": "Shanghai-amd64-01->Seoul-amd64-04", + "settings": { + "clients": [ + { + "id": "e26a72a5-3177-4a44-8f1b-196a74198d6e", + "email": "Shanghai-amd64-01->Seoul-amd64-04@octopus.io", + "level": 0, + "alterId": 0 + } + ], + "disableInsecureEncryption": false + } + }, + { + "protocol": "vmess", + "listen": "0.0.0.0", + "port": 19996, + "streamSettings": { + "tcpSettings": { + "header": { + "type": "http", + "response": { + "version": "1.1", + "status": "200", + "reason": "Accept", + "headers": { + "Content-Type": [ + "application/octet-stream", + "video/mpeg" + ], + "Transfer-Encoding": [ + "chunked" + ], + "Connection": [ + "keep-alive" + ], + "Pragma": "no-cache" + } + } + } + } + }, + "tag": "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-03", + "settings": { + "clients": [ + { + "id": "a7171db5-9836-4135-acc6-845b68927182", + "email": "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-03@octopus.io", + "level": 0, + "alterId": 0 + } + ], + "disableInsecureEncryption": false + } + }, + { + "protocol": "vmess", + "listen": "0.0.0.0", + "port": 19995, + "streamSettings": { + "tcpSettings": { + "header": { + "type": "http", + "response": { + "version": "1.1", + "status": "200", + "reason": "Accept", + "headers": { + "Content-Type": [ + "application/octet-stream", + "video/mpeg" + ], + "Transfer-Encoding": [ + "chunked" + ], + "Connection": [ + "keep-alive" + ], + "Pragma": "no-cache" + } + } + } + } + }, + "tag": "Shanghai-amd64-01->Seoul-amd64-04->Phoenix-amd64-02", + "settings": { + "clients": [ + { + "id": "d2b314c1-8cbc-47d0-91f7-f172c8aa148f", + "email": "Shanghai-amd64-01->Seoul-amd64-04->Phoenix-amd64-02@octopus.io", + "level": 0, + "alterId": 0 + } + ], + "disableInsecureEncryption": false + } + }, + { + "protocol": "vmess", + "listen": "0.0.0.0", + "port": 19994, + "streamSettings": { + "tcpSettings": { + "header": { + "type": "http", + "response": { + "version": "1.1", + "status": "200", + "reason": "Accept", + "headers": { + "Content-Type": [ + "application/octet-stream", + "video/mpeg" + ], + "Transfer-Encoding": [ + "chunked" + ], + "Connection": [ + "keep-alive" + ], + "Pragma": "no-cache" + } + } + } + } + }, + "tag": "Shanghai-amd64-01->Seoul-amd64-04->London-amd64-01", + "settings": { + "clients": [ + { + "id": "3705712f-72a8-400b-a6aa-8ad4eaab7da8", + "email": "Shanghai-amd64-01->Seoul-amd64-04->London-amd64-01@octopus.io", + "level": 0, + "alterId": 0 + } + ], + "disableInsecureEncryption": false + } + } + ], + "outbounds": [ + { + "protocol": "vmess", + "settings": { + "vnext": [ + { + "address": "140.238.14.103", + "port": 19997, + "users": [ + { + "id": "e26a72a5-3177-4a44-8f1b-196a74198d6e", + "email": "Shanghai-amd64-01->Seoul-amd64-04@octopus.io", + "level": 0, + "alterId": 0 + } + ] + } + ] + }, + "tag": "Shanghai-amd64-01->Seoul-amd64-04", + "streamSettings": { + "tcpSettings": { + "header": { + "type": "http", + "request": { + "version": "1.1", + "method": "GET", + "path": [ + "/" + ], + "headers": { + "Host": [ + "www.baidu.com", + "www.google.com", + "www.bing.com", + "www.github.com" + ], + "User-Agent": [ + "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/53.0.2785.143 Safari/537.36", + "Mozilla/5.0 (iPhone; CPU iPhone OS 10_0_2 like Mac OS X) AppleWebKit/601.1 (KHTML, like Gecko) CriOS/53.0.2785.109 Mobile/14A456 Safari/601.1.46" + ], + "Accept-Encoding": [ + "gzip", + "deflate" + ], + "Connection": [ + "keep-alive" + ], + "Pragma": "no-cache" + } + } + } + } + }, + "mux": { + "enabled": false, + "concurrency": -1 + } + }, + { + "protocol": "vmess", + "settings": { + "vnext": [ + { + "address": "140.238.14.103", + "port": 19996, + "users": [ + { + "id": "a7171db5-9836-4135-acc6-845b68927182", + "email": "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-03@octopus.io", + "level": 0, + "alterId": 0 + } + ] + } + ] + }, + "tag": "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-03", + "streamSettings": { + "tcpSettings": { + "header": { + "type": "http", + "request": { + "version": "1.1", + "method": "GET", + "path": [ + "/" + ], + "headers": { + "Host": [ + "www.baidu.com", + "www.google.com", + "www.bing.com", + "www.github.com" + ], + "User-Agent": [ + "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/53.0.2785.143 Safari/537.36", + "Mozilla/5.0 (iPhone; CPU iPhone OS 10_0_2 like Mac OS X) AppleWebKit/601.1 (KHTML, like Gecko) CriOS/53.0.2785.109 Mobile/14A456 Safari/601.1.46" + ], + "Accept-Encoding": [ + "gzip", + "deflate" + ], + "Connection": [ + "keep-alive" + ], + "Pragma": "no-cache" + } + } + } + } + }, + "mux": { + "enabled": false, + "concurrency": -1 + } + }, + { + "protocol": "vmess", + "settings": { + "vnext": [ + { + "address": "140.238.14.103", + "port": 19995, + "users": [ + { + "id": "d2b314c1-8cbc-47d0-91f7-f172c8aa148f", + "email": "Shanghai-amd64-01->Seoul-amd64-04->Phoenix-amd64-02@octopus.io", + "level": 0, + "alterId": 0 + } + ] + } + ] + }, + "tag": "Shanghai-amd64-01->Seoul-amd64-04->Phoenix-amd64-02", + "streamSettings": { + "tcpSettings": { + "header": { + "type": "http", + "request": { + "version": "1.1", + "method": "GET", + "path": [ + "/" + ], + "headers": { + "Host": [ + "www.baidu.com", + "www.google.com", + "www.bing.com", + "www.github.com" + ], + "User-Agent": [ + "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/53.0.2785.143 Safari/537.36", + "Mozilla/5.0 (iPhone; CPU iPhone OS 10_0_2 like Mac OS X) AppleWebKit/601.1 (KHTML, like Gecko) CriOS/53.0.2785.109 Mobile/14A456 Safari/601.1.46" + ], + "Accept-Encoding": [ + "gzip", + "deflate" + ], + "Connection": [ + "keep-alive" + ], + "Pragma": "no-cache" + } + } + } + } + }, + "mux": { + "enabled": false, + "concurrency": -1 + } + }, + { + "protocol": "vmess", + "settings": { + "vnext": [ + { + "address": "140.238.14.103", + "port": 19994, + "users": [ + { + "id": "3705712f-72a8-400b-a6aa-8ad4eaab7da8", + "email": "Shanghai-amd64-01->Seoul-amd64-04->London-amd64-01@octopus.io", + "level": 0, + "alterId": 0 + } + ] + } + ] + }, + "tag": "Shanghai-amd64-01->Seoul-amd64-04->London-amd64-01", + "streamSettings": { + "tcpSettings": { + "header": { + "type": "http", + "request": { + "version": "1.1", + "method": "GET", + "path": [ + "/" + ], + "headers": { + "Host": [ + "www.baidu.com", + "www.google.com", + "www.bing.com", + "www.github.com" + ], + "User-Agent": [ + "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/53.0.2785.143 Safari/537.36", + "Mozilla/5.0 (iPhone; CPU iPhone OS 10_0_2 like Mac OS X) AppleWebKit/601.1 (KHTML, like Gecko) CriOS/53.0.2785.109 Mobile/14A456 Safari/601.1.46" + ], + "Accept-Encoding": [ + "gzip", + "deflate" + ], + "Connection": [ + "keep-alive" + ], + "Pragma": "no-cache" + } + } + } + } + }, + "mux": { + "enabled": false, + "concurrency": -1 + } + } + ], + "routing": { + "domainStrategy": "IPIfNonMatch", + "rules": [ + { + "type": "field", + "inboundTag": [ + "Shanghai-amd64-01->Seoul-amd64-04" + ], + "outboundTag": "Shanghai-amd64-01->Seoul-amd64-04" + }, + { + "type": "field", + "inboundTag": [ + "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-03" + ], + "outboundTag": "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-03" + }, + { + "type": "field", + "inboundTag": [ + "Shanghai-amd64-01->Seoul-amd64-04->Phoenix-amd64-02" + ], + "outboundTag": "Shanghai-amd64-01->Seoul-amd64-04->Phoenix-amd64-02" + }, + { + "type": "field", + "inboundTag": [ + "Shanghai-amd64-01->Seoul-amd64-04->London-amd64-01" + ], + "outboundTag": "Shanghai-amd64-01->Seoul-amd64-04->London-amd64-01" + } + ] + } + }, + "objectSummary": { + "bucketName": "tokyo-oracle-10gb", + "key": "0-Shanghai-amd64-01-2023-03-04-16-32-13.json", + "size": 9932, + "lastModified": "2023-03-04", + "contentType": "application/json", + "access": { + "originUrl": "https://nrjcs6lwr9vy.compat.objectstorage.ap-tokyo-1.oraclecloud.com/tokyo-oracle-10gb/0-Shanghai-amd64-01-2023-03-04-16-32-13.json" + }, + "etag": "d0116839afa4481260a3b5859efd54f8" + } + }, + { + "xrayConfigFileName": "99-subscribe-octopus-latest.txt", + "xrayConfigFile": "/octopus-server/xray/99-subscribe-octopus-latest.txt", + "objectSummary": { + "bucketName": "seoul", + "key": "99-subscribe-octopus-latest.txt", + "size": 2930, + "lastModified": "2023-03-04", + "contentType": "text/plain", + "access": { + "originUrl": "https://cnk8d6fazu16.compat.objectstorage.ap-seoul-1.oraclecloud.com/seoul/99-subscribe-octopus-latest.txt" + }, + "etag": "af0c916c1a76bcea122909b7d1438a6b" + } + }, + { + "xrayConfigFileName": "1-Seoul-amd64-04-2023-03-04-16-32-13.json", + "xrayConfigFile": "/octopus-server/xray/1-Seoul-amd64-04-2023-03-04-16-32-13.json", + "xrayConfig": { + "log": { + "access": "/var/log/xray/access.log", + "error": "/var/log/xray/error.log", + "loglevel": "warning" + }, + "inbounds": [ + { + "protocol": "vmess", + "listen": "0.0.0.0", + "port": 19999, + "streamSettings": { + "tcpSettings": { + "header": { + "type": "http", + "response": { + "version": "1.1", + "status": "200", + "reason": "Accept", + "headers": { + "Content-Type": [ + "application/octet-stream", + "video/mpeg" + ], + "Transfer-Encoding": [ + "chunked" + ], + "Connection": [ + "keep-alive" + ], + "Pragma": "no-cache" + } + } + } + } + }, + "tag": "Seoul-amd64-04", + "settings": { + "clients": [ + { + "id": "27e31d44-4395-4cc5-9ca2-d5d96be26b64", + "email": "Seoul-amd64-04@octopus.io", + "level": 0, + "alterId": 0 + } + ], + "disableInsecureEncryption": false + } + }, + { + "protocol": "vmess", + "listen": "0.0.0.0", + "port": 19997, + "streamSettings": { + "tcpSettings": { + "header": { + "type": "http", + "response": { + "version": "1.1", + "status": "200", + "reason": "Accept", + "headers": { + "Content-Type": [ + "application/octet-stream", + "video/mpeg" + ], + "Transfer-Encoding": [ + "chunked" + ], + "Connection": [ + "keep-alive" + ], + "Pragma": "no-cache" + } + } + } + } + }, + "tag": "Shanghai-amd64-01->Seoul-amd64-04", + "settings": { + "clients": [ + { + "id": "e26a72a5-3177-4a44-8f1b-196a74198d6e", + "email": "Shanghai-amd64-01->Seoul-amd64-04@octopus.io", + "level": 0, + "alterId": 0 + } + ], + "disableInsecureEncryption": false + } + }, + { + "protocol": "vmess", + "listen": "0.0.0.0", + "port": 19996, + "streamSettings": { + "tcpSettings": { + "header": { + "type": "http", + "response": { + "version": "1.1", + "status": "200", + "reason": "Accept", + "headers": { + "Content-Type": [ + "application/octet-stream", + "video/mpeg" + ], + "Transfer-Encoding": [ + "chunked" + ], + "Connection": [ + "keep-alive" + ], + "Pragma": "no-cache" + } + } + } + } + }, + "tag": "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-03", + "settings": { + "clients": [ + { + "id": "a7171db5-9836-4135-acc6-845b68927182", + "email": "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-03@octopus.io", + "level": 0, + "alterId": 0 + } + ], + "disableInsecureEncryption": false + } + }, + { + "protocol": "vmess", + "listen": "0.0.0.0", + "port": 19995, + "streamSettings": { + "tcpSettings": { + "header": { + "type": "http", + "response": { + "version": "1.1", + "status": "200", + "reason": "Accept", + "headers": { + "Content-Type": [ + "application/octet-stream", + "video/mpeg" + ], + "Transfer-Encoding": [ + "chunked" + ], + "Connection": [ + "keep-alive" + ], + "Pragma": "no-cache" + } + } + } + } + }, + "tag": "Shanghai-amd64-01->Seoul-amd64-04->Phoenix-amd64-02", + "settings": { + "clients": [ + { + "id": "d2b314c1-8cbc-47d0-91f7-f172c8aa148f", + "email": "Shanghai-amd64-01->Seoul-amd64-04->Phoenix-amd64-02@octopus.io", + "level": 0, + "alterId": 0 + } + ], + "disableInsecureEncryption": false + } + }, + { + "protocol": "vmess", + "listen": "0.0.0.0", + "port": 19994, + "streamSettings": { + "tcpSettings": { + "header": { + "type": "http", + "response": { + "version": "1.1", + "status": "200", + "reason": "Accept", + "headers": { + "Content-Type": [ + "application/octet-stream", + "video/mpeg" + ], + "Transfer-Encoding": [ + "chunked" + ], + "Connection": [ + "keep-alive" + ], + "Pragma": "no-cache" + } + } + } + } + }, + "tag": "Shanghai-amd64-01->Seoul-amd64-04->London-amd64-01", + "settings": { + "clients": [ + { + "id": "3705712f-72a8-400b-a6aa-8ad4eaab7da8", + "email": "Shanghai-amd64-01->Seoul-amd64-04->London-amd64-01@octopus.io", + "level": 0, + "alterId": 0 + } + ], + "disableInsecureEncryption": false + } + } + ], + "outbounds": [ + { + "protocol": "freedom" + }, + { + "protocol": "blackhole", + "tag": "block" + }, + { + "protocol": "vmess", + "settings": { + "vnext": [ + { + "address": "18.181.77.246", + "port": 19996, + "users": [ + { + "id": "a7171db5-9836-4135-acc6-845b68927182", + "email": "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-03@octopus.io", + "level": 0, + "alterId": 0 + } + ] + } + ] + }, + "tag": "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-03", + "streamSettings": { + "tcpSettings": { + "header": { + "type": "http", + "request": { + "version": "1.1", + "method": "GET", + "path": [ + "/" + ], + "headers": { + "Host": [ + "www.baidu.com", + "www.google.com", + "www.bing.com", + "www.github.com" + ], + "User-Agent": [ + "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/53.0.2785.143 Safari/537.36", + "Mozilla/5.0 (iPhone; CPU iPhone OS 10_0_2 like Mac OS X) AppleWebKit/601.1 (KHTML, like Gecko) CriOS/53.0.2785.109 Mobile/14A456 Safari/601.1.46" + ], + "Accept-Encoding": [ + "gzip", + "deflate" + ], + "Connection": [ + "keep-alive" + ], + "Pragma": "no-cache" + } + } + } + } + }, + "mux": { + "enabled": false, + "concurrency": -1 + } + }, + { + "protocol": "vmess", + "settings": { + "vnext": [ + { + "address": "129.146.171.163", + "port": 19995, + "users": [ + { + "id": "d2b314c1-8cbc-47d0-91f7-f172c8aa148f", + "email": "Shanghai-amd64-01->Seoul-amd64-04->Phoenix-amd64-02@octopus.io", + "level": 0, + "alterId": 0 + } + ] + } + ] + }, + "tag": "Shanghai-amd64-01->Seoul-amd64-04->Phoenix-amd64-02", + "streamSettings": { + "tcpSettings": { + "header": { + "type": "http", + "request": { + "version": "1.1", + "method": "GET", + "path": [ + "/" + ], + "headers": { + "Host": [ + "www.baidu.com", + "www.google.com", + "www.bing.com", + "www.github.com" + ], + "User-Agent": [ + "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/53.0.2785.143 Safari/537.36", + "Mozilla/5.0 (iPhone; CPU iPhone OS 10_0_2 like Mac OS X) AppleWebKit/601.1 (KHTML, like Gecko) CriOS/53.0.2785.109 Mobile/14A456 Safari/601.1.46" + ], + "Accept-Encoding": [ + "gzip", + "deflate" + ], + "Connection": [ + "keep-alive" + ], + "Pragma": "no-cache" + } + } + } + } + }, + "mux": { + "enabled": false, + "concurrency": -1 + } + }, + { + "protocol": "vmess", + "settings": { + "vnext": [ + { + "address": "141.147.99.91", + "port": 19994, + "users": [ + { + "id": "3705712f-72a8-400b-a6aa-8ad4eaab7da8", + "email": "Shanghai-amd64-01->Seoul-amd64-04->London-amd64-01@octopus.io", + "level": 0, + "alterId": 0 + } + ] + } + ] + }, + "tag": "Shanghai-amd64-01->Seoul-amd64-04->London-amd64-01", + "streamSettings": { + "tcpSettings": { + "header": { + "type": "http", + "request": { + "version": "1.1", + "method": "GET", + "path": [ + "/" + ], + "headers": { + "Host": [ + "www.baidu.com", + "www.google.com", + "www.bing.com", + "www.github.com" + ], + "User-Agent": [ + "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/53.0.2785.143 Safari/537.36", + "Mozilla/5.0 (iPhone; CPU iPhone OS 10_0_2 like Mac OS X) AppleWebKit/601.1 (KHTML, like Gecko) CriOS/53.0.2785.109 Mobile/14A456 Safari/601.1.46" + ], + "Accept-Encoding": [ + "gzip", + "deflate" + ], + "Connection": [ + "keep-alive" + ], + "Pragma": "no-cache" + } + } + } + } + }, + "mux": { + "enabled": false, + "concurrency": -1 + } + } + ], + "routing": { + "domainStrategy": "IPIfNonMatch", + "rules": [ + { + "type": "field", + "inboundTag": [ + "Seoul-amd64-04" + ], + "outboundTag": "Seoul-amd64-04" + }, + { + "type": "field", + "inboundTag": [ + "Shanghai-amd64-01->Seoul-amd64-04" + ], + "outboundTag": "Shanghai-amd64-01->Seoul-amd64-04" + }, + { + "type": "field", + "inboundTag": [ + "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-03" + ], + "outboundTag": "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-03" + }, + { + "type": "field", + "inboundTag": [ + "Shanghai-amd64-01->Seoul-amd64-04->Phoenix-amd64-02" + ], + "outboundTag": "Shanghai-amd64-01->Seoul-amd64-04->Phoenix-amd64-02" + }, + { + "type": "field", + "inboundTag": [ + "Shanghai-amd64-01->Seoul-amd64-04->London-amd64-01" + ], + "outboundTag": "Shanghai-amd64-01->Seoul-amd64-04->London-amd64-01" + } + ] + } + }, + "objectSummary": { + "bucketName": "tokyo-oracle-10gb", + "key": "1-Seoul-amd64-04-2023-03-04-16-32-13.json", + "size": 9699, + "lastModified": "2023-03-04", + "contentType": "application/json", + "access": { + "originUrl": "https://nrjcs6lwr9vy.compat.objectstorage.ap-tokyo-1.oraclecloud.com/tokyo-oracle-10gb/1-Seoul-amd64-04-2023-03-04-16-32-13.json" + }, + "etag": "1757de9d237091dcb75886700129e012" + } + }, + { + "xrayConfigFileName": "7-London-amd64-01-2023-03-04-16-32-13.json", + "xrayConfigFile": "/octopus-server/xray/7-London-amd64-01-2023-03-04-16-32-13.json", + "xrayConfig": { + "log": { + "access": "/var/log/xray/access.log", + "error": "/var/log/xray/error.log", + "loglevel": "warning" + }, + "inbounds": [ + { + "protocol": "vmess", + "listen": "0.0.0.0", + "port": 19994, + "streamSettings": { + "tcpSettings": { + "header": { + "type": "http", + "response": { + "version": "1.1", + "status": "200", + "reason": "Accept", + "headers": { + "Content-Type": [ + "application/octet-stream", + "video/mpeg" + ], + "Transfer-Encoding": [ + "chunked" + ], + "Connection": [ + "keep-alive" + ], + "Pragma": "no-cache" + } + } + } + } + }, + "tag": "Shanghai-amd64-01->Seoul-amd64-04->London-amd64-01", + "settings": { + "clients": [ + { + "id": "3705712f-72a8-400b-a6aa-8ad4eaab7da8", + "email": "Shanghai-amd64-01->Seoul-amd64-04->London-amd64-01@octopus.io", + "level": 0, + "alterId": 0 + } + ], + "disableInsecureEncryption": false + } + } + ], + "outbounds": [ + { + "protocol": "freedom" + }, + { + "protocol": "blackhole", + "tag": "block" + } + ], + "routing": { + "domainStrategy": "IPIfNonMatch", + "rules": [ + { + "type": "field", + "inboundTag": [ + "Shanghai-amd64-01->Seoul-amd64-04->London-amd64-01" + ], + "outboundTag": "Shanghai-amd64-01->Seoul-amd64-04->London-amd64-01" + } + ] + } + }, + "objectSummary": { + "bucketName": "tokyo-oracle-10gb", + "key": "7-London-amd64-01-2023-03-04-16-32-13.json", + "size": 1454, + "lastModified": "2023-03-04", + "contentType": "application/json", + "access": { + "originUrl": "https://nrjcs6lwr9vy.compat.objectstorage.ap-tokyo-1.oraclecloud.com/tokyo-oracle-10gb/7-London-amd64-01-2023-03-04-16-32-13.json" + }, + "etag": "79839cdc5456155f3944c5e613ca1c7f" + } + } + ] +} diff --git a/server/src/main/java/io/wdd/func/xray/persisit/RealXrayPathConfig.txt b/server/src/main/java/io/wdd/func/xray/persisit/RealXrayPathConfig.txt index 3027fc4..201cbb5 100644 --- a/server/src/main/java/io/wdd/func/xray/persisit/RealXrayPathConfig.txt +++ b/server/src/main/java/io/wdd/func/xray/persisit/RealXrayPathConfig.txt @@ -1,5 +1,11 @@ -Shanghai-amd64-01-259df5->Seoul-amd64-04-f301ac -Shanghai-amd64-01-259df5->Seoul-amd64-04-f301ac->Tokyo-amd64-03-99907c +Seoul-amd64-04-f301ac, +Tokyo-amd64-03-99907c, +Shanghai-amd64-01-259df5->Seoul-amd64-04-f301ac, +Shanghai-amd64-01-259df5->Seoul-amd64-04-f301ac->Tokyo-amd64-03-99907c, +Shanghai-amd64-01-259df5->Seoul-amd64-04-f301ac->Phoenix-amd64-02-2a45bb, +Shanghai-amd64-01-259df5->Seoul-amd64-04-f301ac->London-amd64-01-0b219f + + diff --git a/server/src/main/java/io/wdd/rpc/init/AcceptAgentInitInfo.java b/server/src/main/java/io/wdd/rpc/init/AcceptAgentInitInfo.java index aa20bd0..26fabf3 100644 --- a/server/src/main/java/io/wdd/rpc/init/AcceptAgentInitInfo.java +++ b/server/src/main/java/io/wdd/rpc/init/AcceptAgentInitInfo.java @@ -48,6 +48,8 @@ public class AcceptAgentInitInfo { "Phoenix", 6, "London", + 7, + "LosAngeles", 7 ) ); diff --git a/source/src/main/java/io/wdd/source/octopus/nginx-reverse.sh b/source/src/main/java/io/wdd/source/octopus/nginx-reverse.sh index 87999d0..266aa32 100644 --- a/source/src/main/java/io/wdd/source/octopus/nginx-reverse.sh +++ b/source/src/main/java/io/wdd/source/octopus/nginx-reverse.sh @@ -21,31 +21,31 @@ stream { # mysql server { listen 21306; - proxy_pass 150.230.198.103:21306; + proxy_pass 140.238.14.103:21306; } # nacos server { listen 21060; - proxy_pass 150.230.198.103:21060; + proxy_pass 140.238.14.103:21060; } #rabbitmq server { listen 20672; - proxy_pass 150.230.198.103:20672; + proxy_pass 140.238.14.103:20672; } # dashboard server { listen 20678; - proxy_pass 150.230.198.103:20678; + proxy_pass 140.238.14.103:20678; } # redis server { listen 21370; - proxy_pass 150.230.198.103:21370; + proxy_pass 140.238.14.103:21370; } } EOF diff --git a/source/src/main/java/io/wdd/source/shell/env/hosts.conf b/source/src/main/java/io/wdd/source/shell/env/hosts.conf index 38f0a13..8eb9e63 100644 --- a/source/src/main/java/io/wdd/source/shell/env/hosts.conf +++ b/source/src/main/java/io/wdd/source/shell/env/hosts.conf @@ -37,6 +37,8 @@ ff02::3 ip6-allhosts 43.136.177.228 Chengdu-amd64-01 tc-cd tc +198.74.113.249 LosAngles-amd64-01 los-1 los1 + 129.146.171.163 Phoenix-amd64-02 phoenix-2 p2 129.146.65.80 Phoenix-arm64-01 phoenix-3 p3 diff --git a/source/src/main/java/io/wdd/source/shell/install-nginx.sh b/source/src/main/java/io/wdd/source/shell/install-nginx.sh index 045c460..60ea027 100644 --- a/source/src/main/java/io/wdd/source/shell/install-nginx.sh +++ b/source/src/main/java/io/wdd/source/shell/install-nginx.sh @@ -32,3 +32,25 @@ sudo apt update sudo apt install nginx sudo apt upgrade nginx + +allTable=(app_appdomain_relation + app_info + appdomain_info + domain_info + execution_log + manage_info + provider_info + script_scheduler + server_app_relation + server_domain_relation + server_info + server_manage_relation) + +for table in {$allTable[*]}; do + #echo "table is $table" + + # echo "create table ${table} (id tinyint);" + # echo "ALTER TABLE $table DISCARD TABLESPACE;" + echo "ALTER TABLE $table IMPORT TABLESPACE;" + +done diff --git a/source/src/main/java/io/wdd/source/shell/lib/wdd-lib-os.sh b/source/src/main/java/io/wdd/source/shell/lib/wdd-lib-os.sh index 8ccf8c0..cbed083 100644 --- a/source/src/main/java/io/wdd/source/shell/lib/wdd-lib-os.sh +++ b/source/src/main/java/io/wdd/source/shell/lib/wdd-lib-os.sh @@ -25,7 +25,7 @@ CheckAndDownloadLatestVersion() { cd /octopus-agent log "start to download the latest version !" - wget "$OctopusAgentUrl$latestVersion" + wget -q "$OctopusAgentUrl$latestVersion" cp "$latestVersion" agent.jar log "" log "" diff --git a/source/src/main/java/io/wdd/source/shell/lib/wdd-lib-sys.sh b/source/src/main/java/io/wdd/source/shell/lib/wdd-lib-sys.sh index fcc6fb4..5406a85 100644 --- a/source/src/main/java/io/wdd/source/shell/lib/wdd-lib-sys.sh +++ b/source/src/main/java/io/wdd/source/shell/lib/wdd-lib-sys.sh @@ -160,8 +160,16 @@ tmp() { echo "当前主机为： ${host}" - ssh -p 22333 root@"$host" "systemctl restart octopus-agent" + ssh -p 22333 root@"$host" "rm -rf /root/agent-bootup* - done + rm -rf /root/logs -} \ No newline at end of file + rm -rf /root/nacos + + wget https://happybirthday.107421.xyz/shell/agent-bootup.sh -O /root/agent-bootup.sh + + chmod +x /root/agent-bootup.sh + + /root/agent-bootup.sh" + +done} \ No newline at end of file