zeaslity/ProjectOctopus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[server][xary] - 优化实际配置

Browse Source
This commit is contained in:
zeaslity
2023-03-07 10:27:46 +08:00
parent 32c46c56a7
commit a18f2353a9
9 changed files with 314 additions and 673 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
agent-go/go.mod Normal file
View File

@@ -0,0 +1 @@
module agent-go

1
agent-go/main.go Normal file
View File

@@ -0,0 +1 @@
package agent_go

4
agent/all-agent-hosts.txt
View File

@@ -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

948
server/src/main/java/io/wdd/func/xray/persisit/RealXrayPathConfig.json
View File

File diff suppressed because it is too large Load Diff

6
server/src/main/java/io/wdd/func/xray/persisit/RealXrayPathConfig.txt
View File

@@ -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

7
server/src/main/java/io/wdd/rpc/scheduler/beans/ScriptSchedulerVO.java
View File

@@ -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列表，使用, 分隔
*/

11
source/src/main/java/io/wdd/source/octopus/openai/openai-web-dockercompose.yaml
View File

@@ -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
#SOCKS_PROXY_PORT: xxxx

3
source/src/main/java/io/wdd/source/octopus/openai/openai-wmm-nginx.conf
View File

@@ -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;
}
}

6
source/src/main/java/io/wdd/source/shell/function/execute-scrpit-loadCPUtoAllMachine.json
View File

@@ -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,