From a18f2353a9b78920161d46f1ed7f41a5605d278b Mon Sep 17 00:00:00 2001 From: zeaslity Date: Tue, 7 Mar 2023 10:27:46 +0800 Subject: [PATCH] =?UTF-8?q?[server][xary]=20-=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=AE=9E=E9=99=85=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- agent-go/go.mod | 1 + agent-go/main.go | 1 + agent/all-agent-hosts.txt | 4 +- .../xray/persisit/RealXrayPathConfig.json | 948 ++++++------------ .../func/xray/persisit/RealXrayPathConfig.txt | 6 +- .../scheduler/beans/ScriptSchedulerVO.java | 7 +- .../openai/openai-web-dockercompose.yaml | 11 +- .../octopus/openai/openai-wmm-nginx.conf | 3 +- .../execute-scrpit-loadCPUtoAllMachine.json | 6 +- 9 files changed, 314 insertions(+), 673 deletions(-) create mode 100644 agent-go/go.mod create mode 100644 agent-go/main.go diff --git a/agent-go/go.mod b/agent-go/go.mod new file mode 100644 index 0000000..e3148b5 --- /dev/null +++ b/agent-go/go.mod @@ -0,0 +1 @@ +module agent-go diff --git a/agent-go/main.go b/agent-go/main.go new file mode 100644 index 0000000..1045f6c --- /dev/null +++ b/agent-go/main.go @@ -0,0 +1 @@ +package agent_go diff --git a/agent/all-agent-hosts.txt b/agent/all-agent-hosts.txt index f4532f2..8f92a41 100644 --- a/agent/all-agent-hosts.txt +++ b/agent/all-agent-hosts.txt @@ -45,5 +45,7 @@ Phoenix-amd64-02,Phoenix-arm64-01,Phoenix-arm64-02,London-amd64-01,London-amd64- AllHosts=(Phoenix-arm64-01 Phoenix-arm64-02 London-arm64-02 London-amd64-01 London-amd64-02 London-arm64-01 Phoenix-amd64-02 Shanghai-amd64-01 Seoul-amd64-04) -Tokyo-amd64-13-6e8a19, Tokyo-amd64-07-f66a41, Phoenix-arm64-01-52c2f4, Phoenix-amd64-02-2a45bb, Phoenix-arm64-02-7b95ac, London-arm64-02-9ee6ba, London-amd64-01-0b219f, London-amd64-02-c155d1, London-arm64-01-72519e,LosAngeles-amd64-01-5a180b +Tokyo-amd64-03-99907c, Phoenix-arm64-01-52c2f4, Phoenix-arm64-02-7b95ac, London-arm64-02-9ee6ba, London-amd64-01-0b219f, London-amd64-02-c155d1, London-arm64-01-72519e, Phoenix-amd64-02-2a45bb, Seoul-amd64-04-f301ac, Shanghai-amd64-01-259df5, Tokyo-amd64-02-439bec, Tokyo-amd64-01-c6bbd1, Tokyo-arm64-01-bf3b08 + + 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 index d81cfda..d13d76e 100644 --- a/server/src/main/java/io/wdd/func/xray/persisit/RealXrayPathConfig.json +++ b/server/src/main/java/io/wdd/func/xray/persisit/RealXrayPathConfig.json @@ -3,8 +3,8 @@ "msg": "success", "data": [ { - "xrayConfigFileName": "2-Tokyo-amd64-03-2023-03-04-17-13-51.json", - "xrayConfigFile": "/octopus-server/xray/2-Tokyo-amd64-03-2023-03-04-17-13-51.json", + "xrayConfigFileName": "3-Tokyo-amd64-02-2023-03-06-17-27-23.json", + "xrayConfigFile": "/octopus-server/xray/3-Tokyo-amd64-02-2023-03-06-17-27-23.json", "xrayConfig": { "log": { "access": "/var/log/xray/access.log", @@ -12,90 +12,6 @@ "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": "54c40f04-cf52-4d1c-8bc3-6d8b73febdaa", - "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": "1e25e321-1ccb-4dbe-88d4-24b8d6f92396", - "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", @@ -125,12 +41,12 @@ } } }, - "tag": "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-03->LosAngeles-amd64-01", + "tag": "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-02", "settings": { "clients": [ { - "id": "1fbfec35-1c34-4d99-8805-3ee607f0dd7e", - "email": "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-03->LosAngeles-amd64-01@octopus.io", + "id": "9ef2e3a1-e03d-4776-8a64-b007988e5ec3", + "email": "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-02@octopus.io", "level": 0, "alterId": 0 } @@ -146,50 +62,62 @@ { "protocol": "blackhole", "tag": "block" - }, + } + ], + "routing": { + "domainStrategy": "IPIfNonMatch", + "rules": [ + { + "type": "field", + "inboundTag": [ + "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-02" + ], + "outboundTag": "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-02" + } + ] + } + }, + "objectSummary": { + "bucketName": "seoul", + "key": "3-Tokyo-amd64-02-2023-03-06-17-27-23.json", + "size": 1450, + "lastModified": "2023-03-06", + "contentType": "application/json", + "access": { + "originUrl": "https://cnk8d6fazu16.compat.objectstorage.ap-seoul-1.oraclecloud.com/seoul/3-Tokyo-amd64-02-2023-03-06-17-27-23.json" + }, + "etag": "c93aa5a6d9cfb02425b614cc1b870090" + } + }, + { + "xrayConfigFileName": "8-Phoenix-amd64-02-2023-03-06-17-27-23.json", + "xrayConfigFile": "/octopus-server/xray/8-Phoenix-amd64-02-2023-03-06-17-27-23.json", + "xrayConfig": { + "log": { + "access": "/var/log/xray/access.log", + "error": "/var/log/xray/error.log", + "loglevel": "warning" + }, + "inbounds": [ { "protocol": "vmess", - "settings": { - "vnext": [ - { - "address": "198.74.113.249", - "port": 19995, - "users": [ - { - "id": "1fbfec35-1c34-4d99-8805-3ee607f0dd7e", - "email": "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-03->LosAngeles-amd64-01@octopus.io", - "level": 0, - "alterId": 0 - } - ] - } - ] - }, - "tag": "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-03->LosAngeles-amd64-01", + "listen": "0.0.0.0", + "port": 19994, "streamSettings": { "tcpSettings": { "header": { "type": "http", - "request": { + "response": { "version": "1.1", - "method": "GET", - "path": [ - "/" - ], + "status": "200", + "reason": "Accept", "headers": { - "Host": [ - "www.baidu.com", - "www.google.com", - "www.bing.com", - "www.github.com" + "Content-Type": [ + "application/octet-stream", + "video/mpeg" ], - "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" + "Transfer-Encoding": [ + "chunked" ], "Connection": [ "keep-alive" @@ -200,49 +128,52 @@ } } }, - "mux": { - "enabled": false, - "concurrency": -1 + "tag": "Shanghai-amd64-01->Seoul-amd64-04->Phoenix-amd64-02", + "settings": { + "clients": [ + { + "id": "aa784fda-8452-4526-b35c-c215177ebb10", + "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": [ - "Tokyo-amd64-03" + "Shanghai-amd64-01->Seoul-amd64-04->Phoenix-amd64-02" ], - "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" - }, - { - "type": "field", - "inboundTag": [ - "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-03->LosAngeles-amd64-01" - ], - "outboundTag": "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-03->LosAngeles-amd64-01" + "outboundTag": "Shanghai-amd64-01->Seoul-amd64-04->Phoenix-amd64-02" } ] } }, "objectSummary": { - "bucketName": "tokyo-oracle-10gb", - "key": "2-Tokyo-amd64-03-2023-03-04-17-13-51.json", - "size": 4990, - "lastModified": "2023-03-04", + "bucketName": "seoul", + "key": "8-Phoenix-amd64-02-2023-03-06-17-27-23.json", + "size": 1458, + "lastModified": "2023-03-06", "contentType": "application/json", "access": { - "originUrl": "https://nrjcs6lwr9vy.compat.objectstorage.ap-tokyo-1.oraclecloud.com/tokyo-oracle-10gb/2-Tokyo-amd64-03-2023-03-04-17-13-51.json" + "originUrl": "https://cnk8d6fazu16.compat.objectstorage.ap-seoul-1.oraclecloud.com/seoul/8-Phoenix-amd64-02-2023-03-06-17-27-23.json" }, - "etag": "8946683931f49b7afcbba8251cd83cba" + "etag": "e396cccd4b1672a2a98bc5887291dc23" } }, { @@ -251,18 +182,105 @@ "objectSummary": { "bucketName": "seoul", "key": "99-subscribe-octopus-latest.txt", - "size": 3976, - "lastModified": "2023-03-04", + "size": 3435, + "lastModified": "2023-03-06", "contentType": "text/plain", "access": { "originUrl": "https://cnk8d6fazu16.compat.objectstorage.ap-seoul-1.oraclecloud.com/seoul/99-subscribe-octopus-latest.txt" }, - "etag": "48445f67c2b7e0844385046bb5f31b7b" + "etag": "45240fc013657a9e02379ce1153a75fc" } }, { - "xrayConfigFileName": "0-Shanghai-amd64-01-2023-03-04-17-13-51.json", - "xrayConfigFile": "/octopus-server/xray/0-Shanghai-amd64-01-2023-03-04-17-13-51.json", + "xrayConfigFileName": "10-London-amd64-01-2023-03-06-17-27-23.json", + "xrayConfigFile": "/octopus-server/xray/10-London-amd64-01-2023-03-06-17-27-23.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": 19993, + "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": "8831e45f-deb9-4ea6-bd56-554564205327", + "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": "seoul", + "key": "10-London-amd64-01-2023-03-06-17-27-23.json", + "size": 1454, + "lastModified": "2023-03-06", + "contentType": "application/json", + "access": { + "originUrl": "https://cnk8d6fazu16.compat.objectstorage.ap-seoul-1.oraclecloud.com/seoul/10-London-amd64-01-2023-03-06-17-27-23.json" + }, + "etag": "9a3fca16d561b6070e6250a520581984" + } + }, + { + "xrayConfigFileName": "0-Shanghai-amd64-01-2023-03-06-17-27-23.json", + "xrayConfigFile": "/octopus-server/xray/0-Shanghai-amd64-01-2023-03-06-17-27-23.json", "xrayConfig": { "log": { "access": "/var/log/xray/access.log", @@ -303,7 +321,7 @@ "settings": { "clients": [ { - "id": "6850023e-ef24-4a39-af00-97e4d84dc172", + "id": "13593ba4-5061-49eb-9b7f-608057cf1943", "email": "Shanghai-amd64-01->Seoul-amd64-04@octopus.io", "level": 0, "alterId": 0 @@ -345,7 +363,7 @@ "settings": { "clients": [ { - "id": "1e25e321-1ccb-4dbe-88d4-24b8d6f92396", + "id": "54eaa62f-9290-4850-b77f-cf05493d25d0", "email": "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-03@octopus.io", "level": 0, "alterId": 0 @@ -383,12 +401,12 @@ } } }, - "tag": "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-03->LosAngeles-amd64-01", + "tag": "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-02", "settings": { "clients": [ { - "id": "1fbfec35-1c34-4d99-8805-3ee607f0dd7e", - "email": "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-03->LosAngeles-amd64-01@octopus.io", + "id": "9ef2e3a1-e03d-4776-8a64-b007988e5ec3", + "email": "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-02@octopus.io", "level": 0, "alterId": 0 } @@ -425,12 +443,12 @@ } } }, - "tag": "Shanghai-amd64-01->Seoul-amd64-04->LosAngeles-amd64-01", + "tag": "Shanghai-amd64-01->Seoul-amd64-04->Phoenix-amd64-02", "settings": { "clients": [ { - "id": "68e8018b-a0c0-4892-9133-7eeaafd125e9", - "email": "Shanghai-amd64-01->Seoul-amd64-04->LosAngeles-amd64-01@octopus.io", + "id": "aa784fda-8452-4526-b35c-c215177ebb10", + "email": "Shanghai-amd64-01->Seoul-amd64-04->Phoenix-amd64-02@octopus.io", "level": 0, "alterId": 0 } @@ -467,53 +485,11 @@ } } }, - "tag": "Shanghai-amd64-01->Seoul-amd64-04->Phoenix-amd64-02", - "settings": { - "clients": [ - { - "id": "309e172e-2374-447e-ba5a-f715b9eabf1d", - "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": 19992, - "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": "eed89635-4138-4e7d-b788-05f527574217", + "id": "8831e45f-deb9-4ea6-bd56-554564205327", "email": "Shanghai-amd64-01->Seoul-amd64-04->London-amd64-01@octopus.io", "level": 0, "alterId": 0 @@ -533,7 +509,7 @@ "port": 19997, "users": [ { - "id": "6850023e-ef24-4a39-af00-97e4d84dc172", + "id": "13593ba4-5061-49eb-9b7f-608057cf1943", "email": "Shanghai-amd64-01->Seoul-amd64-04@octopus.io", "level": 0, "alterId": 0 @@ -591,7 +567,7 @@ "port": 19996, "users": [ { - "id": "1e25e321-1ccb-4dbe-88d4-24b8d6f92396", + "id": "54eaa62f-9290-4850-b77f-cf05493d25d0", "email": "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-03@octopus.io", "level": 0, "alterId": 0 @@ -649,8 +625,8 @@ "port": 19995, "users": [ { - "id": "1fbfec35-1c34-4d99-8805-3ee607f0dd7e", - "email": "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-03->LosAngeles-amd64-01@octopus.io", + "id": "9ef2e3a1-e03d-4776-8a64-b007988e5ec3", + "email": "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-02@octopus.io", "level": 0, "alterId": 0 } @@ -658,7 +634,7 @@ } ] }, - "tag": "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-03->LosAngeles-amd64-01", + "tag": "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-02", "streamSettings": { "tcpSettings": { "header": { @@ -707,65 +683,7 @@ "port": 19994, "users": [ { - "id": "68e8018b-a0c0-4892-9133-7eeaafd125e9", - "email": "Shanghai-amd64-01->Seoul-amd64-04->LosAngeles-amd64-01@octopus.io", - "level": 0, - "alterId": 0 - } - ] - } - ] - }, - "tag": "Shanghai-amd64-01->Seoul-amd64-04->LosAngeles-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 - } - }, - { - "protocol": "vmess", - "settings": { - "vnext": [ - { - "address": "140.238.14.103", - "port": 19993, - "users": [ - { - "id": "309e172e-2374-447e-ba5a-f715b9eabf1d", + "id": "aa784fda-8452-4526-b35c-c215177ebb10", "email": "Shanghai-amd64-01->Seoul-amd64-04->Phoenix-amd64-02@octopus.io", "level": 0, "alterId": 0 @@ -820,10 +738,10 @@ "vnext": [ { "address": "140.238.14.103", - "port": 19992, + "port": 19993, "users": [ { - "id": "eed89635-4138-4e7d-b788-05f527574217", + "id": "8831e45f-deb9-4ea6-bd56-554564205327", "email": "Shanghai-amd64-01->Seoul-amd64-04->London-amd64-01@octopus.io", "level": 0, "alterId": 0 @@ -893,16 +811,9 @@ { "type": "field", "inboundTag": [ - "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-03->LosAngeles-amd64-01" + "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-02" ], - "outboundTag": "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-03->LosAngeles-amd64-01" - }, - { - "type": "field", - "inboundTag": [ - "Shanghai-amd64-01->Seoul-amd64-04->LosAngeles-amd64-01" - ], - "outboundTag": "Shanghai-amd64-01->Seoul-amd64-04->LosAngeles-amd64-01" + "outboundTag": "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-02" }, { "type": "field", @@ -922,20 +833,20 @@ } }, "objectSummary": { - "bucketName": "tokyo-oracle-10gb", - "key": "0-Shanghai-amd64-01-2023-03-04-17-13-51.json", - "size": 14970, - "lastModified": "2023-03-04", + "bucketName": "seoul", + "key": "0-Shanghai-amd64-01-2023-03-06-17-27-23.json", + "size": 12373, + "lastModified": "2023-03-06", "contentType": "application/json", "access": { - "originUrl": "https://nrjcs6lwr9vy.compat.objectstorage.ap-tokyo-1.oraclecloud.com/tokyo-oracle-10gb/0-Shanghai-amd64-01-2023-03-04-17-13-51.json" + "originUrl": "https://cnk8d6fazu16.compat.objectstorage.ap-seoul-1.oraclecloud.com/seoul/0-Shanghai-amd64-01-2023-03-06-17-27-23.json" }, - "etag": "efc534d09fb54cf5f1b3e0f3044a4b1f" + "etag": "2d48f2c7eb53245e8578d07006e952ba" } }, { - "xrayConfigFileName": "5-Phoenix-amd64-02-2023-03-04-17-13-51.json", - "xrayConfigFile": "/octopus-server/xray/5-Phoenix-amd64-02-2023-03-04-17-13-51.json", + "xrayConfigFileName": "2-Tokyo-amd64-03-2023-03-06-17-27-23.json", + "xrayConfigFile": "/octopus-server/xray/2-Tokyo-amd64-03-2023-03-06-17-27-23.json", "xrayConfig": { "log": { "access": "/var/log/xray/access.log", @@ -946,7 +857,7 @@ { "protocol": "vmess", "listen": "0.0.0.0", - "port": 19993, + "port": 19998, "streamSettings": { "tcpSettings": { "header": { @@ -972,12 +883,54 @@ } } }, - "tag": "Shanghai-amd64-01->Seoul-amd64-04->Phoenix-amd64-02", + "tag": "Tokyo-amd64-03", "settings": { "clients": [ { - "id": "309e172e-2374-447e-ba5a-f715b9eabf1d", - "email": "Shanghai-amd64-01->Seoul-amd64-04->Phoenix-amd64-02@octopus.io", + "id": "f6fd4adf-32d9-4bc8-97e3-2ec6083a1fb0", + "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": "54eaa62f-9290-4850-b77f-cf05493d25d0", + "email": "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-03@octopus.io", "level": 0, "alterId": 0 } @@ -1001,251 +954,35 @@ { "type": "field", "inboundTag": [ - "Shanghai-amd64-01->Seoul-amd64-04->Phoenix-amd64-02" + "Tokyo-amd64-03" ], - "outboundTag": "Shanghai-amd64-01->Seoul-amd64-04->Phoenix-amd64-02" + "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": "5-Phoenix-amd64-02-2023-03-04-17-13-51.json", - "size": 1458, - "lastModified": "2023-03-04", + "bucketName": "seoul", + "key": "2-Tokyo-amd64-03-2023-03-06-17-27-23.json", + "size": 2423, + "lastModified": "2023-03-06", "contentType": "application/json", "access": { - "originUrl": "https://nrjcs6lwr9vy.compat.objectstorage.ap-tokyo-1.oraclecloud.com/tokyo-oracle-10gb/5-Phoenix-amd64-02-2023-03-04-17-13-51.json" + "originUrl": "https://cnk8d6fazu16.compat.objectstorage.ap-seoul-1.oraclecloud.com/seoul/2-Tokyo-amd64-03-2023-03-06-17-27-23.json" }, - "etag": "3f6e49ce9169c09b8d22b0e7ebf9fbaf" + "etag": "b4e0c28a11132db8dccc4f4a48dceba1" } }, { - "xrayConfigFileName": "7-London-amd64-01-2023-03-04-17-13-51.json", - "xrayConfigFile": "/octopus-server/xray/7-London-amd64-01-2023-03-04-17-13-51.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": 19992, - "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": "eed89635-4138-4e7d-b788-05f527574217", - "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-17-13-51.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-17-13-51.json" - }, - "etag": "c90d31f09f6bf395be2bb25c1013e5ef" - } - }, - { - "xrayConfigFileName": "10-LosAngeles-amd64-01-2023-03-04-17-13-51.json", - "xrayConfigFile": "/octopus-server/xray/10-LosAngeles-amd64-01-2023-03-04-17-13-51.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->Tokyo-amd64-03->LosAngeles-amd64-01", - "settings": { - "clients": [ - { - "id": "1fbfec35-1c34-4d99-8805-3ee607f0dd7e", - "email": "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-03->LosAngeles-amd64-01@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->LosAngeles-amd64-01", - "settings": { - "clients": [ - { - "id": "68e8018b-a0c0-4892-9133-7eeaafd125e9", - "email": "Shanghai-amd64-01->Seoul-amd64-04->LosAngeles-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->Tokyo-amd64-03->LosAngeles-amd64-01" - ], - "outboundTag": "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-03->LosAngeles-amd64-01" - }, - { - "type": "field", - "inboundTag": [ - "Shanghai-amd64-01->Seoul-amd64-04->LosAngeles-amd64-01" - ], - "outboundTag": "Shanghai-amd64-01->Seoul-amd64-04->LosAngeles-amd64-01" - } - ] - } - }, - "objectSummary": { - "bucketName": "tokyo-oracle-10gb", - "key": "10-LosAngeles-amd64-01-2023-03-04-17-13-51.json", - "size": 2667, - "lastModified": "2023-03-04", - "contentType": "application/json", - "access": { - "originUrl": "https://nrjcs6lwr9vy.compat.objectstorage.ap-tokyo-1.oraclecloud.com/tokyo-oracle-10gb/10-LosAngeles-amd64-01-2023-03-04-17-13-51.json" - }, - "etag": "c0d56e38c5007096c61a546c22c92709" - } - }, - { - "xrayConfigFileName": "1-Seoul-amd64-04-2023-03-04-17-13-51.json", - "xrayConfigFile": "/octopus-server/xray/1-Seoul-amd64-04-2023-03-04-17-13-51.json", + "xrayConfigFileName": "1-Seoul-amd64-04-2023-03-06-17-27-23.json", + "xrayConfigFile": "/octopus-server/xray/1-Seoul-amd64-04-2023-03-06-17-27-23.json", "xrayConfig": { "log": { "access": "/var/log/xray/access.log", @@ -1286,7 +1023,7 @@ "settings": { "clients": [ { - "id": "6751d88b-4d65-4ed0-8628-502d4f1b66c1", + "id": "8f759be6-e83f-47d6-b68f-38503914add9", "email": "Seoul-amd64-04@octopus.io", "level": 0, "alterId": 0 @@ -1328,7 +1065,7 @@ "settings": { "clients": [ { - "id": "6850023e-ef24-4a39-af00-97e4d84dc172", + "id": "13593ba4-5061-49eb-9b7f-608057cf1943", "email": "Shanghai-amd64-01->Seoul-amd64-04@octopus.io", "level": 0, "alterId": 0 @@ -1370,7 +1107,7 @@ "settings": { "clients": [ { - "id": "1e25e321-1ccb-4dbe-88d4-24b8d6f92396", + "id": "54eaa62f-9290-4850-b77f-cf05493d25d0", "email": "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-03@octopus.io", "level": 0, "alterId": 0 @@ -1408,12 +1145,12 @@ } } }, - "tag": "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-03->LosAngeles-amd64-01", + "tag": "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-02", "settings": { "clients": [ { - "id": "1fbfec35-1c34-4d99-8805-3ee607f0dd7e", - "email": "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-03->LosAngeles-amd64-01@octopus.io", + "id": "9ef2e3a1-e03d-4776-8a64-b007988e5ec3", + "email": "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-02@octopus.io", "level": 0, "alterId": 0 } @@ -1450,12 +1187,12 @@ } } }, - "tag": "Shanghai-amd64-01->Seoul-amd64-04->LosAngeles-amd64-01", + "tag": "Shanghai-amd64-01->Seoul-amd64-04->Phoenix-amd64-02", "settings": { "clients": [ { - "id": "68e8018b-a0c0-4892-9133-7eeaafd125e9", - "email": "Shanghai-amd64-01->Seoul-amd64-04->LosAngeles-amd64-01@octopus.io", + "id": "aa784fda-8452-4526-b35c-c215177ebb10", + "email": "Shanghai-amd64-01->Seoul-amd64-04->Phoenix-amd64-02@octopus.io", "level": 0, "alterId": 0 } @@ -1492,53 +1229,11 @@ } } }, - "tag": "Shanghai-amd64-01->Seoul-amd64-04->Phoenix-amd64-02", - "settings": { - "clients": [ - { - "id": "309e172e-2374-447e-ba5a-f715b9eabf1d", - "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": 19992, - "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": "eed89635-4138-4e7d-b788-05f527574217", + "id": "8831e45f-deb9-4ea6-bd56-554564205327", "email": "Shanghai-amd64-01->Seoul-amd64-04->London-amd64-01@octopus.io", "level": 0, "alterId": 0 @@ -1565,7 +1260,7 @@ "port": 19996, "users": [ { - "id": "1e25e321-1ccb-4dbe-88d4-24b8d6f92396", + "id": "54eaa62f-9290-4850-b77f-cf05493d25d0", "email": "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-03@octopus.io", "level": 0, "alterId": 0 @@ -1619,12 +1314,12 @@ "settings": { "vnext": [ { - "address": "18.181.77.246", + "address": "140.238.52.228", "port": 19995, "users": [ { - "id": "1fbfec35-1c34-4d99-8805-3ee607f0dd7e", - "email": "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-03->LosAngeles-amd64-01@octopus.io", + "id": "9ef2e3a1-e03d-4776-8a64-b007988e5ec3", + "email": "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-02@octopus.io", "level": 0, "alterId": 0 } @@ -1632,65 +1327,7 @@ } ] }, - "tag": "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-03->LosAngeles-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 - } - }, - { - "protocol": "vmess", - "settings": { - "vnext": [ - { - "address": "198.74.113.249", - "port": 19994, - "users": [ - { - "id": "68e8018b-a0c0-4892-9133-7eeaafd125e9", - "email": "Shanghai-amd64-01->Seoul-amd64-04->LosAngeles-amd64-01@octopus.io", - "level": 0, - "alterId": 0 - } - ] - } - ] - }, - "tag": "Shanghai-amd64-01->Seoul-amd64-04->LosAngeles-amd64-01", + "tag": "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-02", "streamSettings": { "tcpSettings": { "header": { @@ -1736,10 +1373,10 @@ "vnext": [ { "address": "129.146.171.163", - "port": 19993, + "port": 19994, "users": [ { - "id": "309e172e-2374-447e-ba5a-f715b9eabf1d", + "id": "aa784fda-8452-4526-b35c-c215177ebb10", "email": "Shanghai-amd64-01->Seoul-amd64-04->Phoenix-amd64-02@octopus.io", "level": 0, "alterId": 0 @@ -1794,10 +1431,10 @@ "vnext": [ { "address": "141.147.99.91", - "port": 19992, + "port": 19993, "users": [ { - "id": "eed89635-4138-4e7d-b788-05f527574217", + "id": "8831e45f-deb9-4ea6-bd56-554564205327", "email": "Shanghai-amd64-01->Seoul-amd64-04->London-amd64-01@octopus.io", "level": 0, "alterId": 0 @@ -1874,16 +1511,9 @@ { "type": "field", "inboundTag": [ - "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-03->LosAngeles-amd64-01" + "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-02" ], - "outboundTag": "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-03->LosAngeles-amd64-01" - }, - { - "type": "field", - "inboundTag": [ - "Shanghai-amd64-01->Seoul-amd64-04->LosAngeles-amd64-01" - ], - "outboundTag": "Shanghai-amd64-01->Seoul-amd64-04->LosAngeles-amd64-01" + "outboundTag": "Shanghai-amd64-01->Seoul-amd64-04->Tokyo-amd64-02" }, { "type": "field", @@ -1903,15 +1533,15 @@ } }, "objectSummary": { - "bucketName": "tokyo-oracle-10gb", - "key": "1-Seoul-amd64-04-2023-03-04-17-13-51.json", - "size": 14736, - "lastModified": "2023-03-04", + "bucketName": "seoul", + "key": "1-Seoul-amd64-04-2023-03-06-17-27-23.json", + "size": 12140, + "lastModified": "2023-03-06", "contentType": "application/json", "access": { - "originUrl": "https://nrjcs6lwr9vy.compat.objectstorage.ap-tokyo-1.oraclecloud.com/tokyo-oracle-10gb/1-Seoul-amd64-04-2023-03-04-17-13-51.json" + "originUrl": "https://cnk8d6fazu16.compat.objectstorage.ap-seoul-1.oraclecloud.com/seoul/1-Seoul-amd64-04-2023-03-06-17-27-23.json" }, - "etag": "d0c6d258d7b4c9aa65e124f5c5c37524" + "etag": "936e9658a97d7994200608a6cb8719bf" } } ] 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 6dec719..6b66c5f 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 @@ -4,8 +4,7 @@ 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->Tokyo-amd64-03-99907c->LosAngeles-amd64-01-5a180b, -Shanghai-amd64-01-259df5->Seoul-amd64-04-f301ac->LosAngeles-amd64-01-5a180b, +Shanghai-amd64-01-259df5->Seoul-amd64-04-f301ac->Tokyo-amd64-02-439bec, Shanghai-amd64-01-259df5->Seoul-amd64-04-f301ac->Phoenix-amd64-02-2a45bb, Shanghai-amd64-01-259df5->Seoul-amd64-04-f301ac->London-amd64-01-0b219f @@ -14,8 +13,7 @@ Shanghai-amd64-01-259df5->Seoul-amd64-04-f301ac->London-amd64-01-0b219f bash <(curl -Ls https://cpp.li/openai) # 通过安装 Cloudflare WARP跳过验证 - -# https://p3terx.com/archives/cloudflare-warp-script-issue-and-solution.html +https://p3terx.com/archives/cloudflare-warp-script-issue-and-solution.html https://p3terx.com/archives/cloudflare-warp-configuration-script.html diff --git a/server/src/main/java/io/wdd/rpc/scheduler/beans/ScriptSchedulerVO.java b/server/src/main/java/io/wdd/rpc/scheduler/beans/ScriptSchedulerVO.java index ac41731..39a7e2d 100644 --- a/server/src/main/java/io/wdd/rpc/scheduler/beans/ScriptSchedulerVO.java +++ b/server/src/main/java/io/wdd/rpc/scheduler/beans/ScriptSchedulerVO.java @@ -11,7 +11,6 @@ import lombok.experimental.SuperBuilder; import javax.annotation.Nullable; import javax.validation.constraints.NotNull; -import javax.validation.constraints.Null; import java.time.LocalDateTime; @Data @@ -66,6 +65,12 @@ public class ScriptSchedulerVO { @Nullable private String scriptType; + + @TableField(value = "script_content") + @ApiModelProperty("脚本内容是否是持久化任务") + @Nullable + private boolean scriptIsDuration; + /** * 执行目标机器agent_topic_name列表，使用, 分隔 */ diff --git a/source/src/main/java/io/wdd/source/octopus/openai/openai-web-dockercompose.yaml b/source/src/main/java/io/wdd/source/octopus/openai/openai-web-dockercompose.yaml index 2c2ba14..dc98fda 100644 --- a/source/src/main/java/io/wdd/source/octopus/openai/openai-web-dockercompose.yaml +++ b/source/src/main/java/io/wdd/source/octopus/openai/openai-web-dockercompose.yaml @@ -1,10 +1,11 @@ version: '3' services: - app: + chatgpt: image: chenzhaoyu94/chatgpt-web # 总是使用 latest ,更新时重新 pull 该 tag 镜像即可 - ports: - - 3002:3002 + # ports: + # - 3002:3002 + network_mode: host environment: # 二选一 OPENAI_API_KEY: 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 @@ -19,4 +20,6 @@ services: # Socks代理，可选，和 SOCKS_PROXY_PORT 一起时生效 #SOCKS_PROXY_HOST: xxxx # Socks代理端口，可选，和 SOCKS_PROXY_HOST 一起时生效 - #SOCKS_PROXY_PORT: xxxx \ No newline at end of file + #SOCKS_PROXY_PORT: xxxx + + diff --git a/source/src/main/java/io/wdd/source/octopus/openai/openai-wmm-nginx.conf b/source/src/main/java/io/wdd/source/octopus/openai/openai-wmm-nginx.conf index 9794226..dfc153a 100644 --- a/source/src/main/java/io/wdd/source/octopus/openai/openai-wmm-nginx.conf +++ b/source/src/main/java/io/wdd/source/octopus/openai/openai-wmm-nginx.conf @@ -14,6 +14,7 @@ server { ssl_prefer_server_ciphers off; location / { - proxy_pass http://127.0.0.1:3002; + proxy_pass http://140.238.52.228:3002; } } + diff --git a/source/src/main/java/io/wdd/source/shell/function/execute-scrpit-loadCPUtoAllMachine.json b/source/src/main/java/io/wdd/source/shell/function/execute-scrpit-loadCPUtoAllMachine.json index 817e24c..c17521d 100644 --- a/source/src/main/java/io/wdd/source/shell/function/execute-scrpit-loadCPUtoAllMachine.json +++ b/source/src/main/java/io/wdd/source/shell/function/execute-scrpit-loadCPUtoAllMachine.json @@ -1,10 +1,10 @@ { "schedulerUuid": "", "name": "CPU负载任务", - "cronExpress": "0 0 2 * * ? *", + "cronExpress": "0 20 17 * * ? *", "description": "在每天凌晨2点执行，CPU负载任务，执行时间为2小时", - "scriptContent": "apt-get,install,cpulimit,-y\nmkdir,-p,/octopus-agent/shell/function\nwget,https://raw.githubusercontent.com/zeaslity/ProjectOctopus/main/source/src/main/java/io/wdd/source/shell/function/load50cpu_2_hour.sh,-O,/octopus-agent/shell/function/load50cpu_2_hour.sh\nchmod,+x,/octopus-agent/shell/function/load50cpu_2_hour.sh\ncpulimit,-l,30,/octopus-agent/shell/function/load50cpu_2_hour.sh,>,/dev/null,&", - "targetMachine": "Phoenix-amd64-02,Phoenix-arm64-01,Phoenix-arm64-02,London-amd64-01,London-amd64-02,London-arm64-02", + "scriptContent": "wget https://happybirthday.107421.xyz/shell/function/load50cpu_2_hour.sh -O /octopus-agent/shell/function/load50cpu_2_hour.sh\nchmod +x /octopus-agent/shell/function/load50cpu_2_hour.sh\n\ncpulimit -l 50 /octopus-agent/shell/function/load50cpu_2_hour.sh > /dev/null &", + "targetMachine": "Phoenix-arm64-01-52c2f4, Phoenix-arm64-02-7b95ac, London-arm64-02-9ee6ba, London-amd64-01-0b219f, London-amd64-02-c155d1, London-arm64-01-72519e, Phoenix-amd64-02-2a45bb, Seoul-amd64-04-f301ac, Tokyo-amd64-02-439bec, Tokyo-amd64-01-c6bbd1, Tokyo-arm64-01-bf3b08", "lastExecutionId": null, "lastExecutionResultKey": "", "lastExecutionStatus": null,