mirror of
https://github.com/1Panel-dev/1Panel.git
synced 2026-10-09 08:00:27 +00:00
Compare commits
463
Commits
v2.1.3
...
release-2.2.2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
439c4794b7 | ||
|
|
5ac7f16b67 | ||
|
|
bfb79066b4 | ||
|
|
19602b42fb | ||
|
|
f987af264f | ||
|
|
a6c76dffc3 | ||
|
|
a2eed66bc4 | ||
|
|
a49b9b132d | ||
|
|
e8505a249a | ||
|
|
dbff9c02e9 | ||
|
|
45c5c5b40f | ||
|
|
aea71664ee | ||
|
|
fc65fb9323 | ||
|
|
f476823531 | ||
|
|
8222579d99 | ||
|
|
209c126445 | ||
|
|
c846ca3e71 | ||
|
|
e777fa143e | ||
|
|
e66000ffd2 | ||
|
|
cfdf448765 | ||
|
|
c61139c5cc | ||
|
|
571a4068c4 | ||
|
|
9ce63adb4f | ||
|
|
ef51a2f9b2 | ||
|
|
fa3e137db8 | ||
|
|
af6a708049 | ||
|
|
5d6ccf5717 | ||
|
|
59c870aca4 | ||
|
|
94cb014598 | ||
|
|
ed30567a22 | ||
|
|
791350c299 | ||
|
|
6547de1758 | ||
|
|
2151daab1f | ||
|
|
b791def0df | ||
|
|
c036d5859f | ||
|
|
6495869664 | ||
|
|
a2e6e7e879 | ||
|
|
338301907a | ||
|
|
681141f971 | ||
|
|
506ff1d46e | ||
|
|
c3b7deedb4 | ||
|
|
51252a15db | ||
|
|
375824f77a | ||
|
|
8918d10253 | ||
|
|
fe343a64ed | ||
|
|
205f12e14a | ||
|
|
aca94e470a | ||
|
|
a69f7b1144 | ||
|
|
e55abfb174 | ||
|
|
4a734b5bb6 | ||
|
|
758eb9dfda | ||
|
|
04e2770763 | ||
|
|
7391b4bcd0 | ||
|
|
d9d4d55eca | ||
|
|
9a64f8de98 | ||
|
|
9f9c9a2688 | ||
|
|
f80f4d1c19 | ||
|
|
145b39c4c0 | ||
|
|
44e264fe65 | ||
|
|
15fef4d84e | ||
|
|
b8bd1490ec | ||
|
|
ccd8923fdd | ||
|
|
e49fa620c8 | ||
|
|
654691543c | ||
|
|
929cd38184 | ||
|
|
9748a0794b | ||
|
|
a3f8c30508 | ||
|
|
602c0e8a3b | ||
|
|
7b7f840c2e | ||
|
|
ba9a8592ee | ||
|
|
389fcbf10c | ||
|
|
9cca14c382 | ||
|
|
243a2fe6f3 | ||
|
|
3d5069fd40 | ||
|
|
2b78bae451 | ||
|
|
8693cc17df | ||
|
|
9a2b7a7775 | ||
|
|
024a4a9ef3 | ||
|
|
f5b47cf74d | ||
|
|
4956b96193 | ||
|
|
a332dfd3b3 | ||
|
|
68f8d8d221 | ||
|
|
4f78060d35 | ||
|
|
adb97730c1 | ||
|
|
f1a0453615 | ||
|
|
e64cc875fe | ||
|
|
b1c028b786 | ||
|
|
d0e3914a29 | ||
|
|
fe7d1108cd | ||
|
|
462a3bbc83 | ||
|
|
b9dff99d63 | ||
|
|
612e67e4cc | ||
|
|
4f0838c98c | ||
|
|
fe70a77264 | ||
|
|
8ed33fd06a | ||
|
|
f5662769b3 | ||
|
|
61a2e20798 | ||
|
|
7d20118f38 | ||
|
|
7307b9d6fb | ||
|
|
c2971812a5 | ||
|
|
176a4bd34c | ||
|
|
4a01726058 | ||
|
|
18a372e027 | ||
|
|
483a2a867b | ||
|
|
1a0de94489 | ||
|
|
979c1588e1 | ||
|
|
e39f6b1003 | ||
|
|
4443ed1b7f | ||
|
|
81f11f13fe | ||
|
|
4fa14f055d | ||
|
|
0fe9033d23 | ||
|
|
e5ff53b1af | ||
|
|
d005e61c72 | ||
|
|
9328a79b37 | ||
|
|
56c7d5e3bd | ||
|
|
0cefe8f6ad | ||
|
|
3759fd2dad | ||
|
|
b35c771d16 | ||
|
|
3ce70cee4d | ||
|
|
8dd27a3e7b | ||
|
|
c91769e364 | ||
|
|
ea7856d591 | ||
|
|
023040a814 | ||
|
|
13fdb6caa9 | ||
|
|
81e1a41130 | ||
|
|
f3933155d6 | ||
|
|
4e692b8667 | ||
|
|
cf5f1cdb4e | ||
|
|
46986fba24 | ||
|
|
4627e7c0af | ||
|
|
38174a0b9f | ||
|
|
c0489245d9 | ||
|
|
bec23f793a | ||
|
|
e7578a9fc5 | ||
|
|
9d3313fe11 | ||
|
|
f41e5e3da5 | ||
|
|
540be68adf | ||
|
|
956bf0992a | ||
|
|
d0faee4eeb | ||
|
|
4517ae2f81 | ||
|
|
c77260193f | ||
|
|
d57c998047 | ||
|
|
3a5d5bc6d7 | ||
|
|
00afa748e0 | ||
|
|
8c9c7b9b1f | ||
|
|
1e2dc42554 | ||
|
|
cd621b9dba | ||
|
|
d10afe7a5a | ||
|
|
03fc9302d6 | ||
|
|
d522d837ff | ||
|
|
aa10760658 | ||
|
|
db6e8841ec | ||
|
|
75258bb465 | ||
|
|
7c7a59cf21 | ||
|
|
6f38c4eb71 | ||
|
|
7abedeae22 | ||
|
|
afacefaccb | ||
|
|
e5b2b5d5dc | ||
|
|
9508238805 | ||
|
|
2c21bd7286 | ||
|
|
811ddcc26c | ||
|
|
6cd0373678 | ||
|
|
11771b2b53 | ||
|
|
ff5c6e878e | ||
|
|
1896aed973 | ||
|
|
6dc5deb6d3 | ||
|
|
d7242d526c | ||
|
|
22c3fc8c40 | ||
|
|
8d44105f88 | ||
|
|
8fb8d97dcf | ||
|
|
6941014153 | ||
|
|
bfd610d255 | ||
|
|
5c61217c78 | ||
|
|
eb527857f3 | ||
|
|
d55982bde0 | ||
|
|
84a27de792 | ||
|
|
111bec547c | ||
|
|
db4f699b85 | ||
|
|
12f2d95265 | ||
|
|
a917ca00a1 | ||
|
|
69906046e8 | ||
|
|
d9cedeca09 | ||
|
|
0e28f27819 | ||
|
|
33fc7f14df | ||
|
|
7159aca226 | ||
|
|
2c5728e27e | ||
|
|
defb40702c | ||
|
|
b476df3b61 | ||
|
|
4bbd9b6f06 | ||
|
|
325b9c4d88 | ||
|
|
76d965b3b7 | ||
|
|
4b1b27abd8 | ||
|
|
f26b4f290d | ||
|
|
5d2221203a | ||
|
|
0aff0d529e | ||
|
|
20f09b3a0c | ||
|
|
c392b72470 | ||
|
|
50a70ef1e5 | ||
|
|
75266ef659 | ||
|
|
b3c593b852 | ||
|
|
73530bb8b9 | ||
|
|
1b6e70964b | ||
|
|
61d42b05e9 | ||
|
|
79703e3c71 | ||
|
|
aee4e4e282 | ||
|
|
744c7559f3 | ||
|
|
d94c3ec9cc | ||
|
|
f2625eab16 | ||
|
|
c6d498a9be | ||
|
|
b06bc0a455 | ||
|
|
68411bddd9 | ||
|
|
a2ac2e0b22 | ||
|
|
a5a5d9f1ac | ||
|
|
82876eac8d | ||
|
|
19c9c0f4e5 | ||
|
|
70f044dc50 | ||
|
|
1c8418026c | ||
|
|
17f8471c14 | ||
|
|
4deb2ea484 | ||
|
|
d05317dbf5 | ||
|
|
1db6ccd72b | ||
|
|
bc00760404 | ||
|
|
e57dc1240b | ||
|
|
4c396d68ca | ||
|
|
ab0fe4286a | ||
|
|
5ab758d626 | ||
|
|
3a0a6537f0 | ||
|
|
4eda92f25c | ||
|
|
94f8c5d2f1 | ||
|
|
92598effc1 | ||
|
|
748cecaee8 | ||
|
|
b783034d0a | ||
|
|
94a4e39793 | ||
|
|
1864dee591 | ||
|
|
8c4ea85d02 | ||
|
|
a714d5a84e | ||
|
|
4f97a7890f | ||
|
|
f15f91e5fa | ||
|
|
02bd500917 | ||
|
|
810c6fd232 | ||
|
|
d50a8983bc | ||
|
|
89647304bb | ||
|
|
9ebad13bf8 | ||
|
|
cc0ac8cc43 | ||
|
|
9f5a1d842a | ||
|
|
beb33957be | ||
|
|
ffcbbb705b | ||
|
|
058bc71630 | ||
|
|
0a38979bd9 | ||
|
|
5fa4a15914 | ||
|
|
81c551a11b | ||
|
|
5681449353 | ||
|
|
88849e6355 | ||
|
|
d6bbcdc32f | ||
|
|
abd1581c1d | ||
|
|
cd30ec7632 | ||
|
|
646826769a | ||
|
|
074c0abb3b | ||
|
|
3a00e893bc | ||
|
|
2f37677650 | ||
|
|
12ae89923b | ||
|
|
031a203a74 | ||
|
|
646b99974a | ||
|
|
254ed954e9 | ||
|
|
a0050dca09 | ||
|
|
cd80b4e6c3 | ||
|
|
df5d3d782c | ||
|
|
3c5b3c3467 | ||
|
|
2bdba42d87 | ||
|
|
0b146f7ff3 | ||
|
|
c28a4f6d69 | ||
|
|
f93a34acc4 | ||
|
|
4e78841bf6 | ||
|
|
7f5bb58c72 | ||
|
|
6a28359ac2 | ||
|
|
59655695b5 | ||
|
|
786c5c1d7c | ||
|
|
08388124b3 | ||
|
|
34ccc68b3a | ||
|
|
97ef386f17 | ||
|
|
394339d7dc | ||
|
|
8362578355 | ||
|
|
6dc218cf80 | ||
|
|
89888cef73 | ||
|
|
4d06f444ac | ||
|
|
6ea07421ac | ||
|
|
326d52e311 | ||
|
|
6e3f751dba | ||
|
|
6982fd22d4 | ||
|
|
04fd456b63 | ||
|
|
bea4bfeee8 | ||
|
|
fa6157b610 | ||
|
|
30af26779c | ||
|
|
16d5c00b9a | ||
|
|
3f14f8f30e | ||
|
|
218f92a960 | ||
|
|
75be8d3a23 | ||
|
|
e2d8125b3d | ||
|
|
7ec3c517c2 | ||
|
|
e186e30d8c | ||
|
|
67a8ba2421 | ||
|
|
24fc15beaf | ||
|
|
c1fe70b53e | ||
|
|
30bf4a8d46 | ||
|
|
9e501ce02b | ||
|
|
d74692a68b | ||
|
|
57fd80fb3d | ||
|
|
39d2c34682 | ||
|
|
3e4a48c892 | ||
|
|
2c8f8f32fd | ||
|
|
3cf6d9ac51 | ||
|
|
64d8fe8bd0 | ||
|
|
8129260508 | ||
|
|
a40786a7fa | ||
|
|
368193a777 | ||
|
|
61ef725892 | ||
|
|
0c49c41085 | ||
|
|
2a498de96e | ||
|
|
d055cbb053 | ||
|
|
4b3f8a9fd0 | ||
|
|
4c26945910 | ||
|
|
55b6104b56 | ||
|
|
12dc8aae81 | ||
|
|
37e2b93693 | ||
|
|
62daf1e019 | ||
|
|
f5e75d4bfa | ||
|
|
32fed45c1e | ||
|
|
8b7597abef | ||
|
|
01fb9a461b | ||
|
|
bc022a4d21 | ||
|
|
973cab2837 | ||
|
|
5ce155eee6 | ||
|
|
d83b49cc70 | ||
|
|
ec981f8153 | ||
|
|
b2853277e7 | ||
|
|
f573a0fa0e | ||
|
|
f787734feb | ||
|
|
52778f520a | ||
|
|
b5aba18248 | ||
|
|
bc9882da50 | ||
|
|
0ba7e98e8d | ||
|
|
e6dc44d135 | ||
|
|
a9f30e9f5f | ||
|
|
f3bf9d0905 | ||
|
|
05ea384a00 | ||
|
|
62c50aafe1 | ||
|
|
6e052b8ef2 | ||
|
|
1d40bdc11b | ||
|
|
3b62197f29 | ||
|
|
2d78ca5a86 | ||
|
|
a9b65b7ce5 | ||
|
|
291b40a45d | ||
|
|
a959da7d44 | ||
|
|
26c4e8323f | ||
|
|
0534badce7 | ||
|
|
594d818db0 | ||
|
|
04dceb93a7 | ||
|
|
7b554c0d61 | ||
|
|
bb642cd8a8 | ||
|
|
40249b527d | ||
|
|
74ff7ddc19 | ||
|
|
096ec8edc7 | ||
|
|
0d19069059 | ||
|
|
0da833302b | ||
|
|
4a69cf0ff5 | ||
|
|
39704ef4e5 | ||
|
|
e52cfeeb78 | ||
|
|
476429005c | ||
|
|
6fb41dc711 | ||
|
|
2cb2058cfa | ||
|
|
8533dd1d33 | ||
|
|
0cfbcd25fc | ||
|
|
b91ca8bdb3 | ||
|
|
72764863bc | ||
|
|
a7b9fd0181 | ||
|
|
2b3164fe82 | ||
|
|
2c6307049a | ||
|
|
acc1b9270f | ||
|
|
60e4143525 | ||
|
|
99bcd6d059 | ||
|
|
c4259dd004 | ||
|
|
1c5a4bc978 | ||
|
|
42f6e9a9a6 | ||
|
|
569363530a | ||
|
|
ec9eba0b9a | ||
|
|
5376d54089 | ||
|
|
c10e5747b0 | ||
|
|
5a80931a49 | ||
|
|
f541379daa | ||
|
|
0018335d64 | ||
|
|
df90286253 | ||
|
|
8dfa7945d7 | ||
|
|
1f4292d9cf | ||
|
|
e635a7beba | ||
|
|
59c657e403 | ||
|
|
ff8f79ed52 | ||
|
|
57a7edf481 | ||
|
|
bbd33c66f1 | ||
|
|
b05ed1a0ca | ||
|
|
b645c4edb4 | ||
|
|
9f61aac8be | ||
|
|
11d78644ee | ||
|
|
b96428e1d6 | ||
|
|
6432c35b1a | ||
|
|
fa843f0940 | ||
|
|
5c7ffc561b | ||
|
|
c2f0c8c6ac | ||
|
|
5bf6d17451 | ||
|
|
7f799004c3 | ||
|
|
c68251cada | ||
|
|
23e7d03d8d | ||
|
|
5085db7a2f | ||
|
|
a9cf7a7d1d | ||
|
|
cf18995182 | ||
|
|
24d7dc0786 | ||
|
|
142c9b9a71 | ||
|
|
f3c7603f6e | ||
|
|
db26da1700 | ||
|
|
d5ff59f4e7 | ||
|
|
85b88db99e | ||
|
|
f7053934b5 | ||
|
|
bf1339bb40 | ||
|
|
43c5e62c23 | ||
|
|
28634ce631 | ||
|
|
72263dfdda | ||
|
|
479d36e25f | ||
|
|
2f3ad3537e | ||
|
|
2dfe5096f0 | ||
|
|
4375722aef | ||
|
|
bde4d06842 | ||
|
|
17a486b2c4 | ||
|
|
8499c09571 | ||
|
|
7cb70f785a | ||
|
|
f3781320de | ||
|
|
869ee75020 | ||
|
|
1d5a26373d | ||
|
|
176fd0f8ad | ||
|
|
341a55ae63 | ||
|
|
fb87cf545f | ||
|
|
6db2a9352e | ||
|
|
21826bcc1a | ||
|
|
eedbc2e95c | ||
|
|
46763df7bb | ||
|
|
175162753e | ||
|
|
d114933fe9 | ||
|
|
432412e596 | ||
|
|
1b577e3d41 | ||
|
|
eda9641d35 | ||
|
|
6808e4892c | ||
|
|
0d71cd4db2 | ||
|
|
b6b3304a71 | ||
|
|
59a0a573ed | ||
|
|
e82d686940 | ||
|
|
b48bb88aa1 | ||
|
|
5ce9ec5b64 | ||
|
|
740f3549ad | ||
|
|
aa8a9e8b1e | ||
|
|
14218e3495 | ||
|
|
c526eb2962 | ||
|
|
1ff8292be4 | ||
|
|
d4394616af | ||
|
|
462ca6b373 | ||
|
|
657c3ad37a |
@@ -0,0 +1,14 @@
|
|||||||
|
version: 2
|
||||||
|
|
||||||
|
updates:
|
||||||
|
- package-ecosystem: "gomod"
|
||||||
|
directories:
|
||||||
|
- "/agent"
|
||||||
|
- "/core"
|
||||||
|
schedule:
|
||||||
|
interval: "daily"
|
||||||
|
|
||||||
|
- package-ecosystem: "npm"
|
||||||
|
directory: "/frontend"
|
||||||
|
schedule:
|
||||||
|
interval: "daily"
|
||||||
@@ -6,7 +6,7 @@ permissions:
|
|||||||
jobs:
|
jobs:
|
||||||
generic_handler:
|
generic_handler:
|
||||||
name: Add Labels to PR
|
name: Add Labels to PR
|
||||||
if: github.repository == '1Panel-dev/1Panel'
|
if: github.repository == '1Panel-dev/1Panel' && github.event.pull_request.user.login != 'dependabot[bot]'
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
|
|||||||
@@ -1,69 +0,0 @@
|
|||||||
name: Build And Publish (OSS + R2)
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
tags:
|
|
||||||
- 'v*'
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
create-release:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Checkout Code
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Setup Node
|
|
||||||
uses: actions/setup-node@v4
|
|
||||||
with:
|
|
||||||
node-version: '22.19.0'
|
|
||||||
|
|
||||||
- name: Build Web
|
|
||||||
run: |
|
|
||||||
cd frontend && npm install && npm run build:pro
|
|
||||||
env:
|
|
||||||
NODE_OPTIONS: --max-old-space-size=8192
|
|
||||||
|
|
||||||
- name: Setup Go
|
|
||||||
uses: actions/setup-go@v5
|
|
||||||
with:
|
|
||||||
go-version: '1.24'
|
|
||||||
cache-dependency-path: |
|
|
||||||
core/go.sum
|
|
||||||
agent/go.sum
|
|
||||||
|
|
||||||
- name: Build Release
|
|
||||||
uses: goreleaser/goreleaser-action@v6
|
|
||||||
with:
|
|
||||||
distribution: goreleaser
|
|
||||||
version: '~> v2'
|
|
||||||
args: release --skip=publish --clean
|
|
||||||
|
|
||||||
- name: Upload Assets
|
|
||||||
uses: softprops/action-gh-release@v1
|
|
||||||
if: startsWith(github.ref, 'refs/tags/')
|
|
||||||
with:
|
|
||||||
draft: true
|
|
||||||
files: |
|
|
||||||
dist/*.tar.gz
|
|
||||||
dist/checksums.txt
|
|
||||||
|
|
||||||
- name: Setup OSSUTIL
|
|
||||||
uses: yizhoumo/setup-ossutil@v2
|
|
||||||
with:
|
|
||||||
endpoint: ${{ secrets.OSS_ENDPOINT }}
|
|
||||||
access-key-id: ${{ secrets.OSS_ACCESS_KEY_ID }}
|
|
||||||
access-key-secret: ${{ secrets.OSS_ACCESS_KEY_SECRET }}
|
|
||||||
ossutil-version: '1.7.18'
|
|
||||||
|
|
||||||
- name: Upload Assets to OSS
|
|
||||||
run: |
|
|
||||||
ossutil cp -r dist/ oss://resource-fit2cloud-com/1panel/package/v2/stable/${{ github.ref_name }}/release/ --include "*.tar.gz" --include "checksums.txt" --only-current-dir --force
|
|
||||||
|
|
||||||
- name: Setup Rclone
|
|
||||||
uses: AnimMouse/setup-rclone@v1
|
|
||||||
with:
|
|
||||||
rclone_config: ${{ secrets.RCLONE_CONFIG }}
|
|
||||||
|
|
||||||
- name: Upload to Cloudflare R2
|
|
||||||
run: |
|
|
||||||
rclone copy dist/ cloudflare_r2:package/v2/stable/${{ github.ref_name }}/release/ --include "*.tar.gz" --include "checksums.txt" --progress
|
|
||||||
+13
-8
@@ -9,7 +9,6 @@ build/1panel-core
|
|||||||
|
|
||||||
# Mac
|
# Mac
|
||||||
.DS_Store
|
.DS_Store
|
||||||
*/.DS_Store
|
|
||||||
|
|
||||||
# VS Code
|
# VS Code
|
||||||
.vscode
|
.vscode
|
||||||
@@ -41,20 +40,23 @@ core/cmd/server/web/index.html
|
|||||||
frontend/auto-imports.d.ts
|
frontend/auto-imports.d.ts
|
||||||
frontend/components.d.ts
|
frontend/components.d.ts
|
||||||
frontend/src/xpack
|
frontend/src/xpack
|
||||||
|
frontend/src/enterprise
|
||||||
agent/xpack
|
agent/xpack
|
||||||
|
agent/enterprise
|
||||||
agent/router/entry_xpack.go
|
agent/router/entry_xpack.go
|
||||||
|
agent/router/entry_enterprise.go
|
||||||
agent/server/init_xpack.go
|
agent/server/init_xpack.go
|
||||||
|
agent/server/init_enterprise.go
|
||||||
agent/utils/xpack/xpack.go
|
agent/utils/xpack/xpack.go
|
||||||
agent/utils/xpack/xpack_xpack.go
|
agent/utils/xpack/enterprise.go
|
||||||
core/xpack
|
core/xpack
|
||||||
|
core/enterprise
|
||||||
core/router/entry_xpack.go
|
core/router/entry_xpack.go
|
||||||
|
core/router/entry_enterprise.go
|
||||||
core/server/init_xpack.go
|
core/server/init_xpack.go
|
||||||
|
core/server/init_enterprise.go
|
||||||
core/utils/xpack/xpack.go
|
core/utils/xpack/xpack.go
|
||||||
core/utils/xpack/xpack_xpack.go
|
core/utils/xpack/enterprise.go
|
||||||
core/xpack-ee
|
|
||||||
core/router/entry_xpackee.go
|
|
||||||
core/server/init_xpackee.go
|
|
||||||
core/utils/xpack/xpack_xpackee.go
|
|
||||||
|
|
||||||
.history/
|
.history/
|
||||||
dist/
|
dist/
|
||||||
@@ -73,4 +75,7 @@ agent/.golangci.yml
|
|||||||
openspec
|
openspec
|
||||||
CLAUDE.md
|
CLAUDE.md
|
||||||
AGENTS.md
|
AGENTS.md
|
||||||
opencode.json
|
opencode.json
|
||||||
|
superpowers
|
||||||
|
.worktrees/
|
||||||
|
.codex/
|
||||||
|
|||||||
@@ -1,82 +0,0 @@
|
|||||||
# yaml-language-server: $schema=https://goreleaser.com/static/schema.json
|
|
||||||
# vim: set ts=2 sw=2 tw=0 fo=jcroql
|
|
||||||
version: 2
|
|
||||||
|
|
||||||
before:
|
|
||||||
hooks:
|
|
||||||
# - export NODE_OPTIONS="--max-old-space-size=8192"
|
|
||||||
# - make build_web
|
|
||||||
- chmod +x ./ci/script.sh
|
|
||||||
- ./ci/script.sh
|
|
||||||
- sed -i 's@ORIGINAL_VERSION=.*@ORIGINAL_VERSION=v{{ .Version }}@g' 1pctl
|
|
||||||
|
|
||||||
builds:
|
|
||||||
- id: agent
|
|
||||||
dir: agent
|
|
||||||
main: cmd/server/main.go
|
|
||||||
binary: 1panel-agent
|
|
||||||
flags:
|
|
||||||
- -tags=xpack
|
|
||||||
- -trimpath
|
|
||||||
ldflags:
|
|
||||||
- -w -s
|
|
||||||
env:
|
|
||||||
- CGO_ENABLED=0
|
|
||||||
goos:
|
|
||||||
- linux
|
|
||||||
goarm:
|
|
||||||
- 7
|
|
||||||
goarch:
|
|
||||||
- amd64
|
|
||||||
- arm64
|
|
||||||
- arm
|
|
||||||
- ppc64le
|
|
||||||
- s390x
|
|
||||||
- riscv64
|
|
||||||
|
|
||||||
- id: core
|
|
||||||
dir: core
|
|
||||||
main: cmd/server/main.go
|
|
||||||
binary: 1panel-core
|
|
||||||
flags:
|
|
||||||
- -tags=xpack
|
|
||||||
- -trimpath
|
|
||||||
ldflags:
|
|
||||||
- -w -s
|
|
||||||
env:
|
|
||||||
- CGO_ENABLED=0
|
|
||||||
goos:
|
|
||||||
- linux
|
|
||||||
goarm:
|
|
||||||
- 7
|
|
||||||
goarch:
|
|
||||||
- amd64
|
|
||||||
- arm64
|
|
||||||
- arm
|
|
||||||
- ppc64le
|
|
||||||
- s390x
|
|
||||||
- riscv64
|
|
||||||
|
|
||||||
archives:
|
|
||||||
- formats: [ 'tar.gz' ]
|
|
||||||
ids: [core, agent]
|
|
||||||
name_template: "1panel-v{{ .Version }}-{{ .Os }}-{{ .Arch }}{{- if .Arm }}v{{ .Arm }}{{ end }}"
|
|
||||||
wrap_in_directory: true
|
|
||||||
files:
|
|
||||||
- 1pctl
|
|
||||||
- install.sh
|
|
||||||
- 1panel-core.service
|
|
||||||
- 1panel-agent.service
|
|
||||||
- initscript/*
|
|
||||||
- lang/*
|
|
||||||
- GeoIP.mmdb
|
|
||||||
|
|
||||||
checksum:
|
|
||||||
name_template: 'checksums.txt'
|
|
||||||
|
|
||||||
changelog:
|
|
||||||
sort: asc
|
|
||||||
filters:
|
|
||||||
exclude:
|
|
||||||
- "^docs:"
|
|
||||||
- "^test:"
|
|
||||||
+4
-2
@@ -10,10 +10,12 @@ PR are always welcome, even if they only contain small fixes like typos or a few
|
|||||||
|
|
||||||
Please submit a PR broken down into small changes bit by bit. A PR consisting of a lot of features and code changes may be hard to review. It is recommended to submit PRs in an incremental fashion.
|
Please submit a PR broken down into small changes bit by bit. A PR consisting of a lot of features and code changes may be hard to review. It is recommended to submit PRs in an incremental fashion.
|
||||||
|
|
||||||
This [development guideline](https://docs.1panel.pro/dev_manual/dev_manual/) contains information about repository structure, how to set up development environment, how to run it, and more.
|
|
||||||
|
|
||||||
Note: If you split your pull request to small changes, please make sure any of the changes goes to master will not break anything. Otherwise, it can not be merged until this feature complete.
|
Note: If you split your pull request to small changes, please make sure any of the changes goes to master will not break anything. Otherwise, it can not be merged until this feature complete.
|
||||||
|
|
||||||
|
## Add a new translation
|
||||||
|
|
||||||
|
If you'd like to help translate 1Panel into a new language, please read the [Translation Contribution Guide](docs/TRANSLATION.md). It lists every file you need to create or modify, along with a reference PR you can use as a concrete example.
|
||||||
|
|
||||||
## Report issues
|
## Report issues
|
||||||
It is a great way to contribute by reporting an issue. Well-written and complete bug reports are always welcome! Please open an issue and follow the template to fill in required information.
|
It is a great way to contribute by reporting an issue. Well-written and complete bug reports are always welcome! Please open an issue and follow the template to fill in required information.
|
||||||
|
|
||||||
|
|||||||
@@ -2,8 +2,10 @@ reviewers:
|
|||||||
- wanghe-fit2cloud
|
- wanghe-fit2cloud
|
||||||
- zhengkunwang223
|
- zhengkunwang223
|
||||||
- ssongliu
|
- ssongliu
|
||||||
|
- lan-yonghui
|
||||||
|
|
||||||
approvers:
|
approvers:
|
||||||
- wanghe-fit2cloud
|
- wanghe-fit2cloud
|
||||||
- zhengkunwang223
|
- zhengkunwang223
|
||||||
- ssongliu
|
- ssongliu
|
||||||
|
- lan-yonghui
|
||||||
|
|||||||
@@ -1,17 +1,23 @@
|
|||||||
<p align="center"><a href="https://1panel.pro"><img src="https://resource.1panel.pro/img/1panel-logo.png" alt="1Panel" width="300" /></a></p>
|
<p align="center"><a href="https://1panel.pro"><img src="https://resource.1panel.pro/img/1panel-logo.png" alt="1Panel" width="300" /></a></p>
|
||||||
<h3 align="center">Take control of your VPS with 1Panel</h3>
|
|
||||||
|
<h3 align="center">The open-source VPS control panel with native AI agent support</h3>
|
||||||
|
|
||||||
|
<p align="center">
|
||||||
|
Trusted by <strong>2,000,000+</strong> self-hosters worldwide
|
||||||
|
</p>
|
||||||
|
|
||||||
<p align="center">
|
<p align="center">
|
||||||
<a href="https://trendshift.io/repositories/2462" target="_blank"><img src="https://trendshift.io/api/badge/repositories/2462" alt="1Panel-dev%2F1Panel | Trendshift" style="width: 240px; height: auto;" /></a>
|
<a href="https://trendshift.io/repositories/2462" target="_blank"><img src="https://trendshift.io/api/badge/repositories/2462" alt="1Panel-dev%2F1Panel | Trendshift" style="width: 240px; height: auto;" /></a>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<p align="center">
|
<p align="center">
|
||||||
<a href="https://www.gnu.org/licenses/gpl-3.0.html"><img src="https://shields.io/github/license/1Panel-dev/1Panel?color=%231890FF" alt="License: GPL v3"></a>
|
<a href="https://www.gnu.org/licenses/gpl-3.0.html"><img src="https://shields.io/github/license/1Panel-dev/1Panel?color=%231890FF" alt="License: GPL v3"></a>
|
||||||
<a href="https://app.codacy.com/gh/1Panel-dev/1Panel?utm_source=github.com&utm_medium=referral&utm_content=1Panel-dev/1Panel&utm_campaign=Badge_Grade_Dashboard"><img src="https://app.codacy.com/project/badge/Grade/da67574fd82b473992781d1386b937ef" alt="Codacy"></a>
|
<a href="https://app.codacy.com/gh/1Panel-dev/1Panel"><img src="https://app.codacy.com/project/badge/Grade/da67574fd82b473992781d1386b937ef" alt="Codacy"></a>
|
||||||
<a href="https://discord.gg/bUpUqWqdRr" target="_blank">
|
<a href="https://discord.gg/bUpUqWqdRr"><img src="https://img.shields.io/discord/1318846410149335080?logo=discord&labelColor=%20%235462eb&logoColor=%20%23f5f5f5&color=%20%235462eb" alt="Discord"></a>
|
||||||
<img src="https://img.shields.io/discord/1318846410149335080?logo=discord&labelColor=%20%235462eb&logoColor=%20%23f5f5f5&color=%20%235462eb"
|
|
||||||
alt="chat on Discord"></a>
|
|
||||||
<a href="https://github.com/1Panel-dev/1Panel/releases"><img src="https://img.shields.io/github/v/release/1Panel-dev/1Panel" alt="GitHub release"></a>
|
<a href="https://github.com/1Panel-dev/1Panel/releases"><img src="https://img.shields.io/github/v/release/1Panel-dev/1Panel" alt="GitHub release"></a>
|
||||||
<a href="https://github.com/1Panel-dev/1Panel"><img src="https://img.shields.io/github/stars/1Panel-dev/1Panel?color=%231890FF&style=flat-square" alt="Stars"></a><br>
|
<a href="https://github.com/1Panel-dev/1Panel"><img src="https://img.shields.io/github/stars/1Panel-dev/1Panel?color=%231890FF&style=flat-square" alt="Stars"></a>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<p align="center">
|
<p align="center">
|
||||||
<a href="/README.md"><img alt="English" src="https://img.shields.io/badge/English-d9d9d9"></a>
|
<a href="/README.md"><img alt="English" src="https://img.shields.io/badge/English-d9d9d9"></a>
|
||||||
<a href="/docs/README.zh-Hans.md"><img alt="中文(简体)" src="https://img.shields.io/badge/中文(简体)-d9d9d9"></a>
|
<a href="/docs/README.zh-Hans.md"><img alt="中文(简体)" src="https://img.shields.io/badge/中文(简体)-d9d9d9"></a>
|
||||||
@@ -19,58 +25,91 @@
|
|||||||
<a href="/docs/README.pt-br.md"><img alt="Português (Brasil)" src="https://img.shields.io/badge/Português (Brasil)-d9d9d9"></a>
|
<a href="/docs/README.pt-br.md"><img alt="Português (Brasil)" src="https://img.shields.io/badge/Português (Brasil)-d9d9d9"></a>
|
||||||
<a href="/docs/README.ar.md"><img alt="العربية" src="https://img.shields.io/badge/العربية-d9d9d9"></a>
|
<a href="/docs/README.ar.md"><img alt="العربية" src="https://img.shields.io/badge/العربية-d9d9d9"></a>
|
||||||
<a href="/docs/README.de.md"><img alt="Deutsch" src="https://img.shields.io/badge/Deutsch-d9d9d9"></a>
|
<a href="/docs/README.de.md"><img alt="Deutsch" src="https://img.shields.io/badge/Deutsch-d9d9d9"></a>
|
||||||
<a href="/docs/README.es.md"><img alt="Español" src="https://img.shields.io/badge/Español-d9d9d9"></a><br>
|
<a href="/docs/README.es.md"><img alt="Español" src="https://img.shields.io/badge/Español-d9d9d9"></a>
|
||||||
<a href="/docs/README.fr.md"><img alt="français" src="https://img.shields.io/badge/français-d9d9d9"></a>
|
<a href="/docs/README.fr.md"><img alt="français" src="https://img.shields.io/badge/français-d9d9d9"></a>
|
||||||
<a href="/docs/README.ko.md"><img alt="한국어" src="https://img.shields.io/badge/한국어-d9d9d9"></a>
|
<a href="/docs/README.ko.md"><img alt="한국어" src="https://img.shields.io/badge/한국어-d9d9d9"></a>
|
||||||
<a href="/docs/README.id.md"><img alt="Bahasa Indonesia" src="https://img.shields.io/badge/Bahasa Indonesia-d9d9d9"></a>
|
<a href="/docs/README.id.md"><img alt="Bahasa Indonesia" src="https://img.shields.io/badge/Bahasa Indonesia-d9d9d9"></a>
|
||||||
<a href="/docs/README.zh-Hant.md"><img alt="中文(繁體)" src="https://img.shields.io/badge/中文(繁體)-d9d9d9"></a>
|
<a href="/docs/README.zh-Hant.md"><img alt="中文(繁體)" src="https://img.shields.io/badge/中文(繁體)-d9d9d9"></a>
|
||||||
<a href="/docs/README.tr.md"><img alt="Türkçe" src="https://img.shields.io/badge/Türkçe-d9d9d9"></a>
|
<a href="/docs/README.tr.md"><img alt="Türkçe" src="https://img.shields.io/badge/Türkçe-d9d9d9"></a>
|
||||||
<a href="/docs/README.ru.md"><img alt="Русский" src="https://img.shields.io/badge/%D0%A0%D1%83%D1%81%D1%81%D0%BA%D0%B8%D0%B9-d9d9d9"></a>
|
<a href="/docs/README.ru.md"><img alt="Русский" src="https://img.shields.io/badge/Русский-d9d9d9"></a>
|
||||||
<a href="/docs/README.ms.md"><img alt="Bahasa Melayu" src="https://img.shields.io/badge/Bahasa Melayu-d9d9d9"></a>
|
<a href="/docs/README.ms.md"><img alt="Bahasa Melayu" src="https://img.shields.io/badge/Bahasa Melayu-d9d9d9"></a>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
------------------------------
|
---
|
||||||
## What is 1Panel?
|
|
||||||
|
|
||||||
1Panel is a modern, open-source VPS control panel that streamlines administration through an intuitive, clean web interface.
|
## What is 1Panel?
|
||||||
|
|
||||||
## Key Features
|
1Panel is a modern, open-source VPS control panel — and the only one with **native AI agent support**. Run Ollama models, deploy OpenClaw agents, and manage your entire server stack from one clean web interface. No CLI memorization required.
|
||||||
|
|
||||||
- **One-Click OpenClaw Deployment**: Seamlessly deploy OpenClaw agents, host local LLMs using Ollama, and monitor GPU utilization—all within a unified workspace.
|
👉 Watch the [2-minute introduction](https://www.youtube.com/watch?v=Jl_wqp-XA08)
|
||||||
- **One-Click Website Deployment**: Launch production-ready websites instantly with automatic domain binding, SSL certificate provisioning, and configuration—zero manual setup required.
|
|
||||||
- **Curated App Marketplace**: Discover, install, and update trusted open-source applications (Nextcloud, Bitwarden, Umami, and more) with a single click.
|
## Why 1Panel?
|
||||||
- **Centralized Server Management**: Monitor system resources and manage files, databases, containers, and services effortlessly through a unified, intuitive dashboard.
|
|
||||||
- **Enterprise-Grade Security**: Strengthen your defenses with container isolation, firewall controls, audit logging, and secure deployment practices—ensuring compliance and peace of mind.
|
| | 1Panel | cPanel / Plesk | aaPanel | Webmin |
|
||||||
- **Intelligent Backup & Restore**: Schedule automated backups or perform instant restores to local storage or major cloud platforms (AWS S3, Cloudflare R2, and more), with flexible retention and destination options.
|
|--|--------|----------------|---------|--------|
|
||||||
|
| Free & open source | ✅ | ❌ | Partial | ✅ |
|
||||||
|
| Native AI agent runtime | ✅ | ❌ | ❌ | ❌ |
|
||||||
|
| One-click app marketplace | ✅ 165+ apps | ❌ | ✅ | ❌ |
|
||||||
|
| Modern UI (post-2020) | ✅ | ❌ | Partial | ❌ |
|
||||||
|
| Docker / container management | ✅ | ❌ | ❌ | ❌ |
|
||||||
|
| Active development | ✅ | ✅ | ✅ | Slow |
|
||||||
|
|
||||||
|
## Key Features
|
||||||
|
|
||||||
|
- **AI Agent Runtime**: Deploy Ollama LLMs, spin up OpenClaw personal agents, and monitor GPU utilization — all from the dashboard. No separate AI stack to manage.
|
||||||
|
- **One-Click Website Deployment**: Launch production-ready websites with automatic domain binding, SSL provisioning, and Nginx config — zero manual setup.
|
||||||
|
- **App Marketplace**: 165+ trusted open-source apps (Nextcloud, Bitwarden, Umami, NocoBase, and more) installed and updated with a single click.
|
||||||
|
- **Docker & Container Management**: Create, start, stop, and inspect containers, images, networks, and volumes through a visual UI — no CLI juggling.
|
||||||
|
- **Security Out of the Box**: Firewall rules, fail2ban, container isolation, WAF, and audit logs — configured and running from day one.
|
||||||
|
- **Backup & Restore**: Schedule automated backups to AWS S3, Cloudflare R2, or local storage. Restore any snapshot in one click.
|
||||||
|
|
||||||
## Quick Start
|
## Quick Start
|
||||||
|
|
||||||
Execute the script below and follow the prompts to install 1Panel:
|
> **Requirements:** Linux VPS (Debian / Ubuntu / CentOS / Rocky), 1 GB RAM, internet access.
|
||||||
|
> Takes ~60 seconds.
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
bash -c "$(curl -sSL https://resource.1panel.pro/v2/quick_start.sh)"
|
bash -c "$(curl -sSL https://resource.1panel.pro/v2/quick_start.sh)"
|
||||||
```
|
```
|
||||||
|
|
||||||
|
After installation, open `http://<your-server-ip>:<port>/<security-path>` in your browser.
|
||||||
|
Run `1pctl user-info` via SSH if you need to retrieve your access credentials.
|
||||||
|
|
||||||
## Screenshot
|
## Screenshot
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
|
## Pro Edition
|
||||||
|
|
||||||
|
1Panel OSS is free forever. Pro adds features built for teams and production workloads:
|
||||||
|
|
||||||
|
| Feature | OSS | Pro |
|
||||||
|
|---------|:---:|:---:|
|
||||||
|
| One-click app installs | ✅ | ✅ |
|
||||||
|
| AI agents (OpenClaw) | 1 agent | Unlimited |
|
||||||
|
| WAF & advanced security | Basic | ✅ |
|
||||||
|
| Website tamper protection | ❌ | ✅ |
|
||||||
|
| Website uptime monitoring | ❌ | ✅ |
|
||||||
|
| Multi-node management | ❌ | ✅ |
|
||||||
|
| Custom logo & theme | ❌ | ✅ |
|
||||||
|
| Priority support | ❌ | ✅ |
|
||||||
|
|
||||||
|
**From $80/year.** [Compare plans & start 30-day free trial →](https://1panel.pro/pricing)
|
||||||
|
|
||||||
## Star History
|
## Star History
|
||||||
|
|
||||||
[](https://star-history.com/#1Panel-dev/1Panel&Date)
|
[](https://star-history.com/#1Panel-dev/1Panel&Date)
|
||||||
|
|
||||||
## Pro Edition
|
## Community & Support
|
||||||
|
|
||||||
Compared to the OSS Edition, 1Panel Pro Edition provides users with a wealth of enhanced features and technical support services. Enhanced features include WAF enhancement, website tamper protection, website monitoring, GPU monitoring, custom logo and theme color, etc. [Click to view the detailed introduction of the Pro Edition](https://1panel.pro/pricing).
|
- **Discord** — [Join the community](https://discord.gg/bUpUqWqdRr) for help, feature requests, and show-and-tell
|
||||||
|
- **Docs** — [1panel.pro/docs](https://1panel.pro/docs)
|
||||||
|
- **Issues** — [GitHub Issues](https://github.com/1Panel-dev/1Panel/issues) for bug reports
|
||||||
|
|
||||||
## Security Information
|
## Security
|
||||||
|
|
||||||
If you discover any security issues, please refer to [SECURITY.md](/SECURITY.md).
|
Found a vulnerability? Please read [SECURITY.md](/SECURITY.md) before disclosing.
|
||||||
|
|
||||||
## License
|
## License
|
||||||
|
|
||||||
Licensed under The GNU General Public License version 3 (GPLv3) (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
|
Licensed under the [GNU General Public License v3.0](https://www.gnu.org/licenses/gpl-3.0.html).
|
||||||
|
|
||||||
<https://www.gnu.org/licenses/gpl-3.0.html>
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
|
|
||||||
|
|||||||
+958
-36
File diff suppressed because it is too large
Load Diff
+9
-42
@@ -3,9 +3,6 @@ package v2
|
|||||||
import (
|
import (
|
||||||
"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
|
"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
|
||||||
"github.com/1Panel-dev/1Panel/agent/app/dto"
|
"github.com/1Panel-dev/1Panel/agent/app/dto"
|
||||||
"github.com/1Panel-dev/1Panel/agent/utils/ai_tools/gpu"
|
|
||||||
"github.com/1Panel-dev/1Panel/agent/utils/ai_tools/gpu/common"
|
|
||||||
"github.com/1Panel-dev/1Panel/agent/utils/ai_tools/xpu"
|
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -163,37 +160,6 @@ func (b *BaseApi) DeleteOllamaModel(c *gin.Context) {
|
|||||||
helper.Success(c)
|
helper.Success(c)
|
||||||
}
|
}
|
||||||
|
|
||||||
// @Tags AI
|
|
||||||
// @Summary Load gpu / xpu info
|
|
||||||
// @Accept json
|
|
||||||
// @Success 200
|
|
||||||
// @Security ApiKeyAuth
|
|
||||||
// @Security Timestamp
|
|
||||||
// @Router /ai/gpu/load [get]
|
|
||||||
func (b *BaseApi) LoadGpuInfo(c *gin.Context) {
|
|
||||||
ok, client := gpu.New()
|
|
||||||
if ok {
|
|
||||||
info, err := client.LoadGpuInfo()
|
|
||||||
if err != nil {
|
|
||||||
helper.BadRequest(c, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
helper.SuccessWithData(c, info)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
xpuOK, xpuClient := xpu.New()
|
|
||||||
if xpuOK {
|
|
||||||
info, err := xpuClient.LoadGpuInfo()
|
|
||||||
if err != nil {
|
|
||||||
helper.BadRequest(c, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
helper.SuccessWithData(c, info)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
helper.SuccessWithData(c, &common.GpuInfo{})
|
|
||||||
}
|
|
||||||
|
|
||||||
// @Tags AI
|
// @Tags AI
|
||||||
// @Summary Bind domain
|
// @Summary Bind domain
|
||||||
// @Accept json
|
// @Accept json
|
||||||
@@ -235,14 +201,15 @@ func (b *BaseApi) GetBindDomain(c *gin.Context) {
|
|||||||
helper.SuccessWithData(c, res)
|
helper.SuccessWithData(c, res)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Tags AI
|
// @Tags AI
|
||||||
// Summary Update bind domain
|
// @Summary Update bind domain
|
||||||
// Accept json
|
// @Accept json
|
||||||
// Param request body dto.OllamaBindDomain true "request"
|
// @Param request body dto.OllamaBindDomain true "request"
|
||||||
// Success 200
|
// @Success 200
|
||||||
// Security ApiKeyAuth
|
// @Security ApiKeyAuth
|
||||||
// Security Timestamp
|
// @Security Timestamp
|
||||||
// Router /ai/domain/update [post]
|
// @Router /ai/domain/update [post]
|
||||||
|
// @x-panel-log {"bodyKeys":["domain"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新 Ollama 绑定域名 [domain]","formatEN":"update Ollama bind domain [domain]"}
|
||||||
func (b *BaseApi) UpdateBindDomain(c *gin.Context) {
|
func (b *BaseApi) UpdateBindDomain(c *gin.Context) {
|
||||||
var req dto.OllamaBindDomain
|
var req dto.OllamaBindDomain
|
||||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
|||||||
+159
-4
@@ -2,11 +2,24 @@ package v2
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
|
"net/url"
|
||||||
|
"strings"
|
||||||
|
|
||||||
"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
|
"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
|
||||||
"github.com/1Panel-dev/1Panel/agent/app/dto"
|
"github.com/1Panel-dev/1Panel/agent/app/dto"
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
const defaultAuditUser = "system"
|
||||||
|
|
||||||
|
// @Tags Alert
|
||||||
|
// @Summary Page alert
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body dto.AlertSearch true "request"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /alert/search [post]
|
||||||
func (b *BaseApi) PageAlert(c *gin.Context) {
|
func (b *BaseApi) PageAlert(c *gin.Context) {
|
||||||
var req dto.AlertSearch
|
var req dto.AlertSearch
|
||||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
@@ -32,12 +45,21 @@ func (b *BaseApi) GetAlerts(c *gin.Context) {
|
|||||||
helper.SuccessWithData(c, alerts)
|
helper.SuccessWithData(c, alerts)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// @Tags Alert
|
||||||
|
// @Summary Create alert
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body dto.AlertCreate true "request"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /alert [post]
|
||||||
|
// @x-panel-log {"bodyKeys":["title"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建告警任务 [title]","formatEN":"create alert [title]"}
|
||||||
func (b *BaseApi) CreateAlert(c *gin.Context) {
|
func (b *BaseApi) CreateAlert(c *gin.Context) {
|
||||||
var req dto.AlertCreate
|
var req dto.AlertCreate
|
||||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
err := alertService.CreateAlert(req)
|
err := alertService.CreateAlert(req, loadAuditUser(c))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
helper.InternalServer(c, err)
|
helper.InternalServer(c, err)
|
||||||
return
|
return
|
||||||
@@ -45,6 +67,15 @@ func (b *BaseApi) CreateAlert(c *gin.Context) {
|
|||||||
helper.Success(c)
|
helper.Success(c)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// @Tags Alert
|
||||||
|
// @Summary Delete alert
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body dto.DeleteRequest true "request"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /alert/del [post]
|
||||||
|
// @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"删除告警任务 [id]","formatEN":"delete alert [id]"}
|
||||||
func (b *BaseApi) DeleteAlert(c *gin.Context) {
|
func (b *BaseApi) DeleteAlert(c *gin.Context) {
|
||||||
var req dto.DeleteRequest
|
var req dto.DeleteRequest
|
||||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
@@ -58,12 +89,21 @@ func (b *BaseApi) DeleteAlert(c *gin.Context) {
|
|||||||
helper.Success(c)
|
helper.Success(c)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// @Tags Alert
|
||||||
|
// @Summary Update alert
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body dto.AlertUpdate true "request"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /alert/update [post]
|
||||||
|
// @x-panel-log {"bodyKeys":["title"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新告警任务 [title]","formatEN":"update alert [title]"}
|
||||||
func (b *BaseApi) UpdateAlert(c *gin.Context) {
|
func (b *BaseApi) UpdateAlert(c *gin.Context) {
|
||||||
var req dto.AlertUpdate
|
var req dto.AlertUpdate
|
||||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if err := alertService.UpdateAlert(req); err != nil {
|
if err := alertService.UpdateAlert(req, loadAuditUser(c)); err != nil {
|
||||||
helper.InternalServer(c, err)
|
helper.InternalServer(c, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -84,6 +124,15 @@ func (b *BaseApi) GetAlert(c *gin.Context) {
|
|||||||
helper.SuccessWithData(c, alert)
|
helper.SuccessWithData(c, alert)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// @Tags Alert
|
||||||
|
// @Summary Update alert status
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body dto.AlertUpdateStatus true "request"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /alert/status [post]
|
||||||
|
// @x-panel-log {"bodyKeys":["id","status"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新告警任务 [id] 状态 [status]","formatEN":"update alert [id] status [status]"}
|
||||||
func (b *BaseApi) UpdateAlertStatus(c *gin.Context) {
|
func (b *BaseApi) UpdateAlertStatus(c *gin.Context) {
|
||||||
var req dto.AlertUpdateStatus
|
var req dto.AlertUpdateStatus
|
||||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
@@ -97,6 +146,12 @@ func (b *BaseApi) UpdateAlertStatus(c *gin.Context) {
|
|||||||
helper.Success(c)
|
helper.Success(c)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// @Tags Alert
|
||||||
|
// @Summary Get disks
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /alert/disks/list [get]
|
||||||
func (b *BaseApi) GetDisks(c *gin.Context) {
|
func (b *BaseApi) GetDisks(c *gin.Context) {
|
||||||
alerts, err := alertService.GetDisks()
|
alerts, err := alertService.GetDisks()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -106,6 +161,14 @@ func (b *BaseApi) GetDisks(c *gin.Context) {
|
|||||||
helper.SuccessWithData(c, alerts)
|
helper.SuccessWithData(c, alerts)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// @Tags Alert
|
||||||
|
// @Summary Page alert logs
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body dto.AlertLogSearch true "request"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /alert/logs/search [post]
|
||||||
func (b *BaseApi) PageAlertLogs(c *gin.Context) {
|
func (b *BaseApi) PageAlertLogs(c *gin.Context) {
|
||||||
var req dto.AlertLogSearch
|
var req dto.AlertLogSearch
|
||||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
@@ -122,6 +185,13 @@ func (b *BaseApi) PageAlertLogs(c *gin.Context) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// @Tags Alert
|
||||||
|
// @Summary Clean alert logs
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /alert/logs/clean [post]
|
||||||
|
// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"清空告警日志","formatEN":"clean alert logs"}
|
||||||
func (b *BaseApi) CleanAlertLogs(c *gin.Context) {
|
func (b *BaseApi) CleanAlertLogs(c *gin.Context) {
|
||||||
if err := alertService.CleanAlertLogs(); err != nil {
|
if err := alertService.CleanAlertLogs(); err != nil {
|
||||||
helper.InternalServer(c, err)
|
helper.InternalServer(c, err)
|
||||||
@@ -130,6 +200,12 @@ func (b *BaseApi) CleanAlertLogs(c *gin.Context) {
|
|||||||
helper.Success(c)
|
helper.Success(c)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// @Tags Alert
|
||||||
|
// @Summary Get clams
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /alert/clams/list [get]
|
||||||
func (b *BaseApi) GetClams(c *gin.Context) {
|
func (b *BaseApi) GetClams(c *gin.Context) {
|
||||||
clams, err := alertService.GetClams()
|
clams, err := alertService.GetClams()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -139,6 +215,14 @@ func (b *BaseApi) GetClams(c *gin.Context) {
|
|||||||
helper.SuccessWithData(c, clams)
|
helper.SuccessWithData(c, clams)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// @Tags Alert
|
||||||
|
// @Summary Get cron jobs
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body dto.CronJobReq true "request"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /alert/cronjob/list [post]
|
||||||
func (b *BaseApi) GetCronJobs(c *gin.Context) {
|
func (b *BaseApi) GetCronJobs(c *gin.Context) {
|
||||||
var req dto.CronJobReq
|
var req dto.CronJobReq
|
||||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
@@ -152,8 +236,18 @@ func (b *BaseApi) GetCronJobs(c *gin.Context) {
|
|||||||
helper.SuccessWithData(c, cronJobs)
|
helper.SuccessWithData(c, cronJobs)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// @Tags Alert
|
||||||
|
// @Summary Get alert config
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /alert/config/info [post]
|
||||||
func (b *BaseApi) GetAlertConfig(c *gin.Context) {
|
func (b *BaseApi) GetAlertConfig(c *gin.Context) {
|
||||||
config, err := alertService.GetAlertConfig()
|
var req dto.AlertConfigQuery
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
config, err := alertService.GetAlertConfig(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
helper.InternalServer(c, err)
|
helper.InternalServer(c, err)
|
||||||
return
|
return
|
||||||
@@ -161,18 +255,71 @@ func (b *BaseApi) GetAlertConfig(c *gin.Context) {
|
|||||||
helper.SuccessWithData(c, config)
|
helper.SuccessWithData(c, config)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// @Tags Alert
|
||||||
|
// @Summary Page alert config
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body dto.AlertConfigPageReq true "request"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /alert/config/search [post]
|
||||||
|
func (b *BaseApi) PageAlertConfig(c *gin.Context) {
|
||||||
|
var req dto.AlertConfigPageReq
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
total, configs, err := alertService.PageAlertConfig(req)
|
||||||
|
if err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.SuccessWithData(c, dto.PageResult{
|
||||||
|
Total: total,
|
||||||
|
Items: configs,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Tags Alert
|
||||||
|
// @Summary Update alert config
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body dto.AlertConfigUpdate true "request"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /alert/config/update [post]
|
||||||
|
// @x-panel-log {"bodyKeys":["id","displayName"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新告警配置 [id][displayName]","formatEN":"update alert config [id][displayName]"}
|
||||||
func (b *BaseApi) UpdateAlertConfig(c *gin.Context) {
|
func (b *BaseApi) UpdateAlertConfig(c *gin.Context) {
|
||||||
var req dto.AlertConfigUpdate
|
var req dto.AlertConfigUpdate
|
||||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if err := alertService.UpdateAlertConfig(req); err != nil {
|
if err := alertService.UpdateAlertConfig(req, loadAuditUser(c)); err != nil {
|
||||||
helper.InternalServer(c, err)
|
helper.InternalServer(c, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
helper.Success(c)
|
helper.Success(c)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func loadAuditUser(c *gin.Context) string {
|
||||||
|
userName := strings.TrimSpace(c.GetHeader("X-Panel-User"))
|
||||||
|
if userName == "" {
|
||||||
|
return defaultAuditUser
|
||||||
|
}
|
||||||
|
if decoded, err := url.QueryUnescape(userName); err == nil {
|
||||||
|
return decoded
|
||||||
|
}
|
||||||
|
return userName
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Tags Alert
|
||||||
|
// @Summary Delete alert config
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body dto.DeleteRequest true "request"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /alert/config/del [post]
|
||||||
|
// @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"删除告警配置 [id]","formatEN":"delete alert config [id]"}
|
||||||
func (b *BaseApi) DeleteAlertConfig(c *gin.Context) {
|
func (b *BaseApi) DeleteAlertConfig(c *gin.Context) {
|
||||||
var req dto.DeleteRequest
|
var req dto.DeleteRequest
|
||||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
@@ -186,6 +333,14 @@ func (b *BaseApi) DeleteAlertConfig(c *gin.Context) {
|
|||||||
helper.Success(c)
|
helper.Success(c)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// @Tags Alert
|
||||||
|
// @Summary Test alert config
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body dto.AlertConfigTest true "request"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /alert/config/test [post]
|
||||||
func (b *BaseApi) TestAlertConfig(c *gin.Context) {
|
func (b *BaseApi) TestAlertConfig(c *gin.Context) {
|
||||||
var req dto.AlertConfigTest
|
var req dto.AlertConfigTest
|
||||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
|||||||
+10
-4
@@ -107,7 +107,7 @@ func (b *BaseApi) GetApp(c *gin.Context) {
|
|||||||
// @Accept json
|
// @Accept json
|
||||||
// @Param appId path integer true "app id"
|
// @Param appId path integer true "app id"
|
||||||
// @Param version path string true "app 版本"
|
// @Param version path string true "app 版本"
|
||||||
// @Param version path string true "app 类型"
|
// @Param type path string true "app 类型"
|
||||||
// @Success 200 {object} response.AppDetailDTO
|
// @Success 200 {object} response.AppDetailDTO
|
||||||
// @Security ApiKeyAuth
|
// @Security ApiKeyAuth
|
||||||
// @Security Timestamp
|
// @Security Timestamp
|
||||||
@@ -131,7 +131,7 @@ func (b *BaseApi) GetAppDetail(c *gin.Context) {
|
|||||||
// @Tags App
|
// @Tags App
|
||||||
// @Summary Get app detail by id
|
// @Summary Get app detail by id
|
||||||
// @Accept json
|
// @Accept json
|
||||||
// @Param appId path integer true "id"
|
// @Param id path integer true "id"
|
||||||
// @Success 200 {object} response.AppDetailDTO
|
// @Success 200 {object} response.AppDetailDTO
|
||||||
// @Security ApiKeyAuth
|
// @Security ApiKeyAuth
|
||||||
// @Security Timestamp
|
// @Security Timestamp
|
||||||
@@ -172,6 +172,12 @@ func (b *BaseApi) InstallApp(c *gin.Context) {
|
|||||||
helper.SuccessWithData(c, install)
|
helper.SuccessWithData(c, install)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// @Tags App
|
||||||
|
// @Summary Get app tags
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /apps/tags [get]
|
||||||
func (b *BaseApi) GetAppTags(c *gin.Context) {
|
func (b *BaseApi) GetAppTags(c *gin.Context) {
|
||||||
tags, err := appService.GetAppTags(c)
|
tags, err := appService.GetAppTags(c)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -199,7 +205,7 @@ func (b *BaseApi) GetAppListUpdate(c *gin.Context) {
|
|||||||
// @Tags App
|
// @Tags App
|
||||||
// @Summary Get app icon by app_id
|
// @Summary Get app icon by app_id
|
||||||
// @Accept json
|
// @Accept json
|
||||||
// @Param appId path integer true "app id"
|
// @Param key path string true "app key"
|
||||||
// @Success 200 {file} file "app icon"
|
// @Success 200 {file} file "app icon"
|
||||||
// @Security ApiKeyAuth
|
// @Security ApiKeyAuth
|
||||||
// @Security Timestamp
|
// @Security Timestamp
|
||||||
@@ -237,7 +243,7 @@ func (b *BaseApi) GetAppIcon(c *gin.Context) {
|
|||||||
// @Tags App
|
// @Tags App
|
||||||
// @Summary Search app detail by appkey and version
|
// @Summary Search app detail by appkey and version
|
||||||
// @Accept json
|
// @Accept json
|
||||||
// @Param appId path integer true "app key"
|
// @Param appKey path string true "app key"
|
||||||
// @Param version path string true "app version"
|
// @Param version path string true "app version"
|
||||||
// @Success 200 {object} response.AppDetailSimpleDTO
|
// @Success 200 {object} response.AppDetailSimpleDTO
|
||||||
// @Security ApiKeyAuth
|
// @Security ApiKeyAuth
|
||||||
|
|||||||
@@ -203,7 +203,6 @@ func (b *BaseApi) GetServices(c *gin.Context) {
|
|||||||
// @Tags App
|
// @Tags App
|
||||||
// @Summary Search app update version by install id
|
// @Summary Search app update version by install id
|
||||||
// @Accept json
|
// @Accept json
|
||||||
// @Param appInstallId path integer true "request"
|
|
||||||
// @Success 200 {array} dto.AppVersion
|
// @Success 200 {array} dto.AppVersion
|
||||||
// @Security ApiKeyAuth
|
// @Security ApiKeyAuth
|
||||||
// @Security Timestamp
|
// @Security Timestamp
|
||||||
@@ -267,7 +266,7 @@ func (b *BaseApi) GetDefaultConfig(c *gin.Context) {
|
|||||||
// @Tags App
|
// @Tags App
|
||||||
// @Summary Search params by appInstallId
|
// @Summary Search params by appInstallId
|
||||||
// @Accept json
|
// @Accept json
|
||||||
// @Param appInstallId path string true "request"
|
// @Param appInstallId path integer true "request"
|
||||||
// @Success 200 {object} response.AppConfig
|
// @Success 200 {object} response.AppConfig
|
||||||
// @Security ApiKeyAuth
|
// @Security ApiKeyAuth
|
||||||
// @Security Timestamp
|
// @Security Timestamp
|
||||||
@@ -350,6 +349,15 @@ func (b *BaseApi) GetAppInstallInfo(c *gin.Context) {
|
|||||||
helper.SuccessWithData(c, info)
|
helper.SuccessWithData(c, info)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// @Tags App
|
||||||
|
// @Summary Update app install sort
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body request.AppInstallSort true "request"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /apps/installed/sort/update [post]
|
||||||
|
// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新已安装应用排序","formatEN":"update installed app sort"}
|
||||||
func (b *BaseApi) UpdateAppInstallSort(c *gin.Context) {
|
func (b *BaseApi) UpdateAppInstallSort(c *gin.Context) {
|
||||||
var req request.AppInstallSort
|
var req request.AppInstallSort
|
||||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
|||||||
@@ -10,6 +10,13 @@ import (
|
|||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// @Tags Backup Account
|
||||||
|
// @Summary Check backup used
|
||||||
|
// @Param name path string true "name"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /backups/check/{name} [get]
|
||||||
func (b *BaseApi) CheckBackupUsed(c *gin.Context) {
|
func (b *BaseApi) CheckBackupUsed(c *gin.Context) {
|
||||||
name, err := helper.GetStrParamByKey(c, "name")
|
name, err := helper.GetStrParamByKey(c, "name")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -32,7 +39,7 @@ func (b *BaseApi) CheckBackupUsed(c *gin.Context) {
|
|||||||
// @Success 200
|
// @Success 200
|
||||||
// @Security ApiKeyAuth
|
// @Security ApiKeyAuth
|
||||||
// @Security Timestamp
|
// @Security Timestamp
|
||||||
// @Router /backups/check [post]
|
// @Router /backups/conn/check [post]
|
||||||
func (b *BaseApi) CheckBackup(c *gin.Context) {
|
func (b *BaseApi) CheckBackup(c *gin.Context) {
|
||||||
var req dto.BackupOperate
|
var req dto.BackupOperate
|
||||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
@@ -136,7 +143,7 @@ func (b *BaseApi) DeleteBackup(c *gin.Context) {
|
|||||||
// @Security ApiKeyAuth
|
// @Security ApiKeyAuth
|
||||||
// @Security Timestamp
|
// @Security Timestamp
|
||||||
// @Router /backups/update [post]
|
// @Router /backups/update [post]
|
||||||
// @x-panel-log {"bodyKeys":["type"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新备份账号 [types]","formatEN":"update backup account [types]"}
|
// @x-panel-log {"bodyKeys":["type"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新备份账号 [type]","formatEN":"update backup account [type]"}
|
||||||
func (b *BaseApi) UpdateBackup(c *gin.Context) {
|
func (b *BaseApi) UpdateBackup(c *gin.Context) {
|
||||||
var req dto.BackupOperate
|
var req dto.BackupOperate
|
||||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
@@ -415,6 +422,11 @@ func (b *BaseApi) Backup(c *gin.Context) {
|
|||||||
helper.InternalServer(c, err)
|
helper.InternalServer(c, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
case "mongodb":
|
||||||
|
if err := backupService.MongodbBackup(req); err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
case constant.AppPostgresql, constant.AppPostgresqlCluster:
|
case constant.AppPostgresql, constant.AppPostgresqlCluster:
|
||||||
if err := backupService.PostgresqlBackup(req); err != nil {
|
if err := backupService.PostgresqlBackup(req); err != nil {
|
||||||
helper.InternalServer(c, err)
|
helper.InternalServer(c, err)
|
||||||
@@ -430,6 +442,16 @@ func (b *BaseApi) Backup(c *gin.Context) {
|
|||||||
helper.InternalServer(c, err)
|
helper.InternalServer(c, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
case "container":
|
||||||
|
if err := backupService.ContainerBackup(req); err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
case "compose":
|
||||||
|
if err := backupService.ComposeBackup(req); err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
}
|
}
|
||||||
helper.Success(c)
|
helper.Success(c)
|
||||||
}
|
}
|
||||||
@@ -465,6 +487,11 @@ func (b *BaseApi) Recover(c *gin.Context) {
|
|||||||
helper.InternalServer(c, err)
|
helper.InternalServer(c, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
case "mongodb":
|
||||||
|
if err := backupService.MongodbRecover(req); err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
case constant.AppPostgresql, constant.AppPostgresqlCluster:
|
case constant.AppPostgresql, constant.AppPostgresqlCluster:
|
||||||
if err := backupService.PostgresqlRecover(req); err != nil {
|
if err := backupService.PostgresqlRecover(req); err != nil {
|
||||||
helper.InternalServer(c, err)
|
helper.InternalServer(c, err)
|
||||||
@@ -485,6 +512,16 @@ func (b *BaseApi) Recover(c *gin.Context) {
|
|||||||
helper.InternalServer(c, err)
|
helper.InternalServer(c, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
case "container":
|
||||||
|
if err := backupService.ContainerRecover(req); err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
case "compose":
|
||||||
|
if err := backupService.ComposeRecover(req); err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
}
|
}
|
||||||
helper.Success(c)
|
helper.Success(c)
|
||||||
}
|
}
|
||||||
@@ -510,6 +547,11 @@ func (b *BaseApi) RecoverByUpload(c *gin.Context) {
|
|||||||
helper.InternalServer(c, err)
|
helper.InternalServer(c, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
case "mongodb":
|
||||||
|
if err := backupService.MongodbRecoverByUpload(req); err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
case constant.AppPostgresql, constant.AppPostgresqlCluster:
|
case constant.AppPostgresql, constant.AppPostgresqlCluster:
|
||||||
if err := backupService.PostgresqlRecoverByUpload(req); err != nil {
|
if err := backupService.PostgresqlRecoverByUpload(req); err != nil {
|
||||||
helper.InternalServer(c, err)
|
helper.InternalServer(c, err)
|
||||||
@@ -525,6 +567,16 @@ func (b *BaseApi) RecoverByUpload(c *gin.Context) {
|
|||||||
helper.InternalServer(c, err)
|
helper.InternalServer(c, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
case "container":
|
||||||
|
if err := backupService.ContainerRecover(req); err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
case "compose":
|
||||||
|
if err := backupService.ComposeRecover(req); err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
}
|
}
|
||||||
helper.Success(c)
|
helper.Success(c)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ func (b *BaseApi) CreateClam(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := clamService.Create(req); err != nil {
|
if err := clamService.Create(req, loadAuditUser(c)); err != nil {
|
||||||
helper.InternalServer(c, err)
|
helper.InternalServer(c, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -43,7 +43,7 @@ func (b *BaseApi) UpdateClam(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := clamService.Update(req); err != nil {
|
if err := clamService.Update(req, loadAuditUser(c)); err != nil {
|
||||||
helper.InternalServer(c, err)
|
helper.InternalServer(c, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -123,7 +123,7 @@ func (b *BaseApi) LoadClamBaseInfo(c *gin.Context) {
|
|||||||
// @Security ApiKeyAuth
|
// @Security ApiKeyAuth
|
||||||
// @Security Timestamp
|
// @Security Timestamp
|
||||||
// @Router /toolbox/clam/operate [post]
|
// @Router /toolbox/clam/operate [post]
|
||||||
// @x-panel-log {"bodyKeys":["operation"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"[operation] Clam","formatEN":"[operation] FTP"}
|
// @x-panel-log {"bodyKeys":["operation"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"[operation] Clam","formatEN":"[operation] Clam"}
|
||||||
func (b *BaseApi) OperateClam(c *gin.Context) {
|
func (b *BaseApi) OperateClam(c *gin.Context) {
|
||||||
var req dto.Operate
|
var req dto.Operate
|
||||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
|||||||
@@ -1,7 +1,11 @@
|
|||||||
package v2
|
package v2
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"net/http"
|
||||||
|
"net/url"
|
||||||
|
"path"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
|
||||||
"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
|
"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
|
||||||
"github.com/1Panel-dev/1Panel/agent/app/dto"
|
"github.com/1Panel-dev/1Panel/agent/app/dto"
|
||||||
@@ -53,6 +57,162 @@ func (b *BaseApi) LoadContainerUsers(c *gin.Context) {
|
|||||||
helper.SuccessWithData(c, containerService.LoadUsers(req))
|
helper.SuccessWithData(c, containerService.LoadUsers(req))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// @Tags Container
|
||||||
|
// @Summary List container files
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body dto.ContainerFileReq true "request"
|
||||||
|
// @Success 200 {array} dto.ContainerFileInfo
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /containers/files/search [post]
|
||||||
|
func (b *BaseApi) ListContainerFiles(c *gin.Context) {
|
||||||
|
var req dto.ContainerFileReq
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
files, err := containerService.ListContainerFiles(req)
|
||||||
|
if err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.SuccessWithData(c, files)
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Tags Container
|
||||||
|
// @Summary Upload container file
|
||||||
|
// @Accept multipart/form-data
|
||||||
|
// @Param containerID formData string true "containerID"
|
||||||
|
// @Param path formData string true "path"
|
||||||
|
// @Param file formData file true "file"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /containers/files/upload [post]
|
||||||
|
// @x-panel-log {"bodyKeys":["containerID","path"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"容器 [containerID] 上传文件到 [path]","formatEN":"Upload file to [path] in container [containerID]"}
|
||||||
|
func (b *BaseApi) UploadContainerFile(c *gin.Context) {
|
||||||
|
form, err := c.MultipartForm()
|
||||||
|
if err != nil {
|
||||||
|
helper.BadRequest(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
containerIDs := form.Value["containerID"]
|
||||||
|
paths := form.Value["path"]
|
||||||
|
uploadFiles := form.File["file"]
|
||||||
|
if len(containerIDs) == 0 || len(paths) == 0 || len(uploadFiles) == 0 {
|
||||||
|
helper.BadRequest(c, errors.New("invalid container file upload params"))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
req := dto.ContainerFileReq{
|
||||||
|
ContainerID: containerIDs[0],
|
||||||
|
Path: paths[0],
|
||||||
|
}
|
||||||
|
for _, uploadFile := range uploadFiles {
|
||||||
|
file, err := uploadFile.Open()
|
||||||
|
if err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
err = containerService.UploadContainerFile(req, path.Base(uploadFile.Filename), uploadFile.Size, file)
|
||||||
|
_ = file.Close()
|
||||||
|
if err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
helper.Success(c)
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Tags Container
|
||||||
|
// @Summary Get container file content
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body dto.ContainerFileReq true "request"
|
||||||
|
// @Success 200 {object} dto.ContainerFileContent
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /containers/files/content [post]
|
||||||
|
func (b *BaseApi) GetContainerFileContent(c *gin.Context) {
|
||||||
|
var req dto.ContainerFileReq
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
content, err := containerService.GetContainerFileContent(req)
|
||||||
|
if err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.SuccessWithData(c, content)
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Tags Container
|
||||||
|
// @Summary Get container file size
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body dto.ContainerFileReq true "request"
|
||||||
|
// @Success 200 {int} size
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /containers/files/size [post]
|
||||||
|
func (b *BaseApi) GetContainerFileSize(c *gin.Context) {
|
||||||
|
var req dto.ContainerFileReq
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
size, err := containerService.GetContainerFileSize(req)
|
||||||
|
if err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.SuccessWithData(c, size)
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Tags Container
|
||||||
|
// @Summary Delete container file
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body dto.ContainerFileBatchDeleteReq true "request"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /containers/files/del [post]
|
||||||
|
// @x-panel-log {"bodyKeys":["containerID","paths"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"删除容器 [containerID] 文件 [paths]","formatEN":"Delete files [paths] in container [containerID]"}
|
||||||
|
func (b *BaseApi) DeleteContainerFile(c *gin.Context) {
|
||||||
|
var req dto.ContainerFileBatchDeleteReq
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if err := containerService.DeleteContainerFile(req); err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.Success(c)
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Tags Container
|
||||||
|
// @Summary Download container file
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body dto.ContainerFileReq true "request"
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /containers/files/download [post]
|
||||||
|
// @x-panel-log {"bodyKeys":["containerID","path"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"下载容器 [containerID] 文件 [path]","formatEN":"Download file [path] from container [containerID]"}
|
||||||
|
func (b *BaseApi) DownloadContainerFile(c *gin.Context) {
|
||||||
|
var req dto.ContainerFileReq
|
||||||
|
if err := c.ShouldBindJSON(&req); err != nil {
|
||||||
|
helper.BadRequest(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if req.ContainerID == "" || req.Path == "" {
|
||||||
|
helper.BadRequest(c, errors.New("invalid container file download params"))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
reader, fileName, contentType, err := containerService.DownloadContainerFile(req)
|
||||||
|
if err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer reader.Close()
|
||||||
|
c.Header("Content-Disposition", "attachment; filename*=utf-8''"+url.PathEscape(fileName))
|
||||||
|
c.DataFromReader(http.StatusOK, -1, contentType, reader, nil)
|
||||||
|
}
|
||||||
|
|
||||||
// @Tags Container
|
// @Tags Container
|
||||||
// @Summary List containers
|
// @Summary List containers
|
||||||
// @Accept json
|
// @Accept json
|
||||||
@@ -235,6 +395,7 @@ func (b *BaseApi) ContainerInfo(c *gin.Context) {
|
|||||||
helper.SuccessWithData(c, data)
|
helper.SuccessWithData(c, data)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// @Tags Container
|
||||||
// @Summary Load container limits
|
// @Summary Load container limits
|
||||||
// @Success 200 {object} dto.ResourceLimit
|
// @Success 200 {object} dto.ResourceLimit
|
||||||
// @Security ApiKeyAuth
|
// @Security ApiKeyAuth
|
||||||
@@ -249,6 +410,7 @@ func (b *BaseApi) LoadResourceLimit(c *gin.Context) {
|
|||||||
helper.SuccessWithData(c, data)
|
helper.SuccessWithData(c, data)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// @Tags Container
|
||||||
// @Summary Load container stats
|
// @Summary Load container stats
|
||||||
// @Success 200 {array} dto.ContainerListStats
|
// @Success 200 {array} dto.ContainerListStats
|
||||||
// @Security ApiKeyAuth
|
// @Security ApiKeyAuth
|
||||||
@@ -263,6 +425,7 @@ func (b *BaseApi) ContainerListStats(c *gin.Context) {
|
|||||||
helper.SuccessWithData(c, data)
|
helper.SuccessWithData(c, data)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// @Tags Container
|
||||||
// @Summary Load container stats size
|
// @Summary Load container stats size
|
||||||
// @Accept json
|
// @Accept json
|
||||||
// @Param request body dto.OperationWithName true "request"
|
// @Param request body dto.OperationWithName true "request"
|
||||||
@@ -503,6 +666,14 @@ func (b *BaseApi) Inspect(c *gin.Context) {
|
|||||||
helper.SuccessWithData(c, result)
|
helper.SuccessWithData(c, result)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// @Tags Container
|
||||||
|
// @Summary Download container logs
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body dto.ContainerLog true "request"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /containers/download/log [post]
|
||||||
func (b *BaseApi) DownloadContainerLogs(c *gin.Context) {
|
func (b *BaseApi) DownloadContainerLogs(c *gin.Context) {
|
||||||
var req dto.ContainerLog
|
var req dto.ContainerLog
|
||||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
@@ -742,6 +913,10 @@ func (b *BaseApi) LoadComposeEnv(c *gin.Context) {
|
|||||||
// @Security Timestamp
|
// @Security Timestamp
|
||||||
// @Router /containers/search/log [get]
|
// @Router /containers/search/log [get]
|
||||||
func (b *BaseApi) ContainerStreamLogs(c *gin.Context) {
|
func (b *BaseApi) ContainerStreamLogs(c *gin.Context) {
|
||||||
|
if !strings.Contains(strings.ToLower(c.GetHeader("Accept")), "text/event-stream") {
|
||||||
|
helper.Success(c)
|
||||||
|
return
|
||||||
|
}
|
||||||
c.Header("Content-Type", "text/event-stream")
|
c.Header("Content-Type", "text/event-stream")
|
||||||
c.Header("Cache-Control", "no-cache")
|
c.Header("Cache-Control", "no-cache")
|
||||||
c.Header("Connection", "keep-alive")
|
c.Header("Connection", "keep-alive")
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ func (b *BaseApi) CreateCronjob(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := cronjobService.Create(req); err != nil {
|
if err := cronjobService.Create(req, loadAuditUser(c)); err != nil {
|
||||||
helper.InternalServer(c, err)
|
helper.InternalServer(c, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -91,7 +91,7 @@ func (b *BaseApi) ImportCronjob(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := cronjobService.Import(req.Cronjobs); err != nil {
|
if err := cronjobService.Import(req.Cronjobs, loadAuditUser(c)); err != nil {
|
||||||
helper.InternalServer(c, err)
|
helper.InternalServer(c, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -285,7 +285,7 @@ func (b *BaseApi) UpdateCronjob(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := cronjobService.Update(req.ID, req); err != nil {
|
if err := cronjobService.Update(req.ID, req, loadAuditUser(c)); err != nil {
|
||||||
helper.InternalServer(c, err)
|
helper.InternalServer(c, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -95,6 +95,7 @@ func (b *BaseApi) SearchDatabase(c *gin.Context) {
|
|||||||
// @Success 200 {array} dto.DatabaseOption
|
// @Success 200 {array} dto.DatabaseOption
|
||||||
// @Security ApiKeyAuth
|
// @Security ApiKeyAuth
|
||||||
// @Security Timestamp
|
// @Security Timestamp
|
||||||
|
// @Param type path string true "type"
|
||||||
// @Router /databases/db/list/:type [get]
|
// @Router /databases/db/list/:type [get]
|
||||||
func (b *BaseApi) ListDatabase(c *gin.Context) {
|
func (b *BaseApi) ListDatabase(c *gin.Context) {
|
||||||
dbType, err := helper.GetStrParamByKey(c, "type")
|
dbType, err := helper.GetStrParamByKey(c, "type")
|
||||||
@@ -116,6 +117,7 @@ func (b *BaseApi) ListDatabase(c *gin.Context) {
|
|||||||
// @Success 200 {array} dto.DatabaseItem
|
// @Success 200 {array} dto.DatabaseItem
|
||||||
// @Security ApiKeyAuth
|
// @Security ApiKeyAuth
|
||||||
// @Security Timestamp
|
// @Security Timestamp
|
||||||
|
// @Param type path string true "type"
|
||||||
// @Router /databases/db/item/:type [get]
|
// @Router /databases/db/item/:type [get]
|
||||||
func (b *BaseApi) LoadDatabaseItems(c *gin.Context) {
|
func (b *BaseApi) LoadDatabaseItems(c *gin.Context) {
|
||||||
dbType, err := helper.GetStrParamByKey(c, "type")
|
dbType, err := helper.GetStrParamByKey(c, "type")
|
||||||
@@ -137,6 +139,7 @@ func (b *BaseApi) LoadDatabaseItems(c *gin.Context) {
|
|||||||
// @Success 200 {object} dto.DatabaseInfo
|
// @Success 200 {object} dto.DatabaseInfo
|
||||||
// @Security ApiKeyAuth
|
// @Security ApiKeyAuth
|
||||||
// @Security Timestamp
|
// @Security Timestamp
|
||||||
|
// @Param name path string true "name"
|
||||||
// @Router /databases/db/:name [get]
|
// @Router /databases/db/:name [get]
|
||||||
func (b *BaseApi) GetDatabase(c *gin.Context) {
|
func (b *BaseApi) GetDatabase(c *gin.Context) {
|
||||||
name, err := helper.GetStrParamByKey(c, "name")
|
name, err := helper.GetStrParamByKey(c, "name")
|
||||||
|
|||||||
@@ -0,0 +1,294 @@
|
|||||||
|
package v2
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"encoding/base64"
|
||||||
|
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/dto"
|
||||||
|
"github.com/gin-gonic/gin"
|
||||||
|
)
|
||||||
|
|
||||||
|
// @Tags Database Mongodb
|
||||||
|
// @Summary Create mongodb database
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body dto.MongodbDBCreate true "request"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /databases/mongodb [post]
|
||||||
|
// @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建 mongodb 数据库 [name]","formatEN":"create mongodb database [name]"}
|
||||||
|
func (b *BaseApi) CreateMongodb(c *gin.Context) {
|
||||||
|
var req dto.MongodbDBCreate
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(req.Password) != 0 {
|
||||||
|
password, err := base64.StdEncoding.DecodeString(req.Password)
|
||||||
|
if err != nil {
|
||||||
|
helper.BadRequest(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
req.Password = string(password)
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := mongodbService.Create(context.Background(), req); err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.Success(c)
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Tags Database Mongodb
|
||||||
|
// @Summary Page mongodb databases
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body dto.MongodbDBSearch true "request"
|
||||||
|
// @Success 200 {object} dto.PageResult
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /databases/mongodb/search [post]
|
||||||
|
func (b *BaseApi) SearchMongodb(c *gin.Context) {
|
||||||
|
var req dto.MongodbDBSearch
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
total, list, err := mongodbService.SearchWithPage(req)
|
||||||
|
if err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
helper.SuccessWithData(c, dto.PageResult{
|
||||||
|
Items: list,
|
||||||
|
Total: total,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Tags Database Mongodb
|
||||||
|
// @Summary Update mongodb database description
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body dto.UpdateDescription true "request"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /databases/mongodb/description [post]
|
||||||
|
// @x-panel-log {"bodyKeys":["id","description"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"database_mongodbs","output_column":"name","output_value":"name"}],"formatZH":"mongodb 数据库 [name] 描述信息修改 [description]","formatEN":"The description of the mongodb database [name] is modified => [description]"}
|
||||||
|
func (b *BaseApi) UpdateMongodbDescription(c *gin.Context) {
|
||||||
|
var req dto.UpdateDescription
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := mongodbService.UpdateDescription(req); err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.Success(c)
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Tags Database Mongodb
|
||||||
|
// @Summary Load mongodb database from remote
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body dto.MongodbLoadDB true "request"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /databases/mongodb/load [post]
|
||||||
|
func (b *BaseApi) LoadMongodbFromRemote(c *gin.Context) {
|
||||||
|
var req dto.MongodbLoadDB
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := mongodbService.LoadFromRemote(req); err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.Success(c)
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Tags Database Mongodb
|
||||||
|
// @Summary Bind mongodb database user info
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body dto.MongodbBind true "request"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /databases/mongodb/bind [post]
|
||||||
|
// @x-panel-log {"bodyKeys":["database", "name", "username"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"绑定 mongodb 数据库 [database] [name] 用户 [username]","formatEN":"bind mongodb database [database] [name] user [username]"}
|
||||||
|
func (b *BaseApi) BindMongodbUser(c *gin.Context) {
|
||||||
|
var req dto.MongodbBind
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(req.Password) != 0 {
|
||||||
|
password, err := base64.StdEncoding.DecodeString(req.Password)
|
||||||
|
if err != nil {
|
||||||
|
helper.BadRequest(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
req.Password = string(password)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := mongodbService.BindUser(req); err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.Success(c)
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Tags Database Mongodb
|
||||||
|
// @Summary Change mongodb database password
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body dto.MongodbPassword true "request"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /databases/mongodb/password [post]
|
||||||
|
// @x-panel-log {"bodyKeys":["database", "name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新 mongodb 数据库 [database] [name] 密码","formatEN":"update mongodb database [database] [name] password"}
|
||||||
|
func (b *BaseApi) ChangeMongodbPassword(c *gin.Context) {
|
||||||
|
var req dto.MongodbPassword
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(req.Password) != 0 {
|
||||||
|
password, err := base64.StdEncoding.DecodeString(req.Password)
|
||||||
|
if err != nil {
|
||||||
|
helper.BadRequest(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
req.Password = string(password)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := mongodbService.ChangePassword(req); err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.Success(c)
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Tags Database Mongodb
|
||||||
|
// @Summary Change mongodb root password
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body dto.ChangeDBInfo true "request"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /databases/mongodb/root/password [post]
|
||||||
|
// @x-panel-log {"bodyKeys":["database"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新 mongodb 数据库 [database] root 密码","formatEN":"update mongodb database [database] root password"}
|
||||||
|
func (b *BaseApi) ChangeMongodbRootPassword(c *gin.Context) {
|
||||||
|
var req dto.ChangeDBInfo
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(req.Value) != 0 {
|
||||||
|
value, err := base64.StdEncoding.DecodeString(req.Value)
|
||||||
|
if err != nil {
|
||||||
|
helper.BadRequest(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
req.Value = string(value)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := mongodbService.ChangeRootPassword(req); err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.Success(c)
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Tags Database Mongodb
|
||||||
|
// @Summary Load mongodb privileges
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body dto.MongodbPrivilegesLoad true "request"
|
||||||
|
// @Success 200 {string} string
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /databases/mongodb/privileges [post]
|
||||||
|
func (b *BaseApi) LoadMongodbPrivileges(c *gin.Context) {
|
||||||
|
var req dto.MongodbPrivilegesLoad
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
permission, err := mongodbService.LoadPrivileges(req)
|
||||||
|
if err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.SuccessWithData(c, permission)
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Tags Database Mongodb
|
||||||
|
// @Summary Change mongodb privileges
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body dto.MongodbPrivileges true "request"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /databases/mongodb/privileges/change [post]
|
||||||
|
// @x-panel-log {"bodyKeys":["database", "username"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新 mongodb 数据库 [database] 用户 [username] 权限","formatEN":"update mongodb database [database] user [username] privileges"}
|
||||||
|
func (b *BaseApi) ChangeMongodbPrivileges(c *gin.Context) {
|
||||||
|
var req dto.MongodbPrivileges
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := mongodbService.ChangePrivileges(req); err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.Success(c)
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Tags Database Mongodb
|
||||||
|
// @Summary Check before delete mongodb database
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body dto.MongodbDBDeleteCheck true "request"
|
||||||
|
// @Success 200 {array} string
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /databases/mongodb/del/check [post]
|
||||||
|
func (b *BaseApi) DeleteCheckMongodb(c *gin.Context) {
|
||||||
|
var req dto.MongodbDBDeleteCheck
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
apps, err := mongodbService.DeleteCheck(req)
|
||||||
|
if err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.SuccessWithData(c, apps)
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Tags Database Mongodb
|
||||||
|
// @Summary Delete mongodb database
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body dto.MongodbDBDelete true "request"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /databases/mongodb/del [post]
|
||||||
|
// @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"database_mongodbs","output_column":"name","output_value":"name"}],"formatZH":"删除 mongodb 数据库 [name]","formatEN":"delete mongodb database [name]"}
|
||||||
|
func (b *BaseApi) DeleteMongodb(c *gin.Context) {
|
||||||
|
var req dto.MongodbDBDelete
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
tx, ctx := helper.GetTxAndContext()
|
||||||
|
if err := mongodbService.Delete(ctx, req); err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
tx.Rollback()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
tx.Commit()
|
||||||
|
helper.Success(c)
|
||||||
|
}
|
||||||
@@ -92,7 +92,7 @@ func (b *BaseApi) UpdatePostgresqlDescription(c *gin.Context) {
|
|||||||
// @Security ApiKeyAuth
|
// @Security ApiKeyAuth
|
||||||
// @Security Timestamp
|
// @Security Timestamp
|
||||||
// @Router /databases/pg/privileges [post]
|
// @Router /databases/pg/privileges [post]
|
||||||
// @x-panel-log {"bodyKeys":["database", "username"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新数据库 [database] 用户 [username] 权限","formatEN":"Update [user] privileges of database [database]"}
|
// @x-panel-log {"bodyKeys":["database", "username"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新数据库 [database] 用户 [username] 权限","formatEN":"Update [username] privileges of database [database]"}
|
||||||
func (b *BaseApi) ChangePostgresqlPrivileges(c *gin.Context) {
|
func (b *BaseApi) ChangePostgresqlPrivileges(c *gin.Context) {
|
||||||
var req dto.PostgresqlPrivileges
|
var req dto.PostgresqlPrivileges
|
||||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
@@ -170,6 +170,7 @@ func (b *BaseApi) SearchPostgresql(c *gin.Context) {
|
|||||||
// @Success 200
|
// @Success 200
|
||||||
// @Security ApiKeyAuth
|
// @Security ApiKeyAuth
|
||||||
// @Security Timestamp
|
// @Security Timestamp
|
||||||
|
// @Param database path string true "database"
|
||||||
// @Router /databases/pg/:database/load [post]
|
// @Router /databases/pg/:database/load [post]
|
||||||
func (b *BaseApi) LoadPostgresqlDBFromRemote(c *gin.Context) {
|
func (b *BaseApi) LoadPostgresqlDBFromRemote(c *gin.Context) {
|
||||||
database, err := helper.GetStrParamByKey(c, "database")
|
database, err := helper.GetStrParamByKey(c, "database")
|
||||||
|
|||||||
@@ -74,6 +74,12 @@ func (b *BaseApi) LoadPersistenceConf(c *gin.Context) {
|
|||||||
helper.SuccessWithData(c, data)
|
helper.SuccessWithData(c, data)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// @Tags Database Redis
|
||||||
|
// @Summary Check has cli
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /databases/redis/check [get]
|
||||||
func (b *BaseApi) CheckHasCli(c *gin.Context) {
|
func (b *BaseApi) CheckHasCli(c *gin.Context) {
|
||||||
helper.SuccessWithData(c, redisService.CheckHasCli())
|
helper.SuccessWithData(c, redisService.CheckHasCli())
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -31,17 +31,20 @@ var (
|
|||||||
dbCommonService = service.NewIDBCommonService()
|
dbCommonService = service.NewIDBCommonService()
|
||||||
mysqlService = service.NewIMysqlService()
|
mysqlService = service.NewIMysqlService()
|
||||||
postgresqlService = service.NewIPostgresqlService()
|
postgresqlService = service.NewIPostgresqlService()
|
||||||
|
mongodbService = service.NewIMongodbService()
|
||||||
databaseService = service.NewIDatabaseService()
|
databaseService = service.NewIDatabaseService()
|
||||||
redisService = service.NewIRedisService()
|
redisService = service.NewIRedisService()
|
||||||
|
|
||||||
cronjobService = service.NewICronjobService()
|
cronjobService = service.NewICronjobService()
|
||||||
|
|
||||||
fileService = service.NewIFileService()
|
fileService = service.NewIFileService()
|
||||||
sshService = service.NewISSHService()
|
fileHistoryService = service.NewIFileHistoryService()
|
||||||
firewallService = service.NewIFirewallService()
|
fileShareService = service.NewIFileShareService()
|
||||||
iptablesService = service.NewIIptablesService()
|
sshService = service.NewISSHService()
|
||||||
monitorService = service.NewIMonitorService()
|
firewallService = service.NewIFirewallService()
|
||||||
systemService = service.NewISystemService()
|
iptablesService = service.NewIIptablesService()
|
||||||
|
monitorService = service.NewIMonitorService()
|
||||||
|
systemService = service.NewISystemService()
|
||||||
|
|
||||||
deviceService = service.NewIDeviceService()
|
deviceService = service.NewIDeviceService()
|
||||||
fail2banService = service.NewIFail2BanService()
|
fail2banService = service.NewIFail2BanService()
|
||||||
@@ -70,6 +73,7 @@ var (
|
|||||||
|
|
||||||
recycleBinService = service.NewIRecycleBinService()
|
recycleBinService = service.NewIRecycleBinService()
|
||||||
favoriteService = service.NewIFavoriteService()
|
favoriteService = service.NewIFavoriteService()
|
||||||
|
hostService = service.NewIHostService()
|
||||||
|
|
||||||
websiteCAService = service.NewIWebsiteCAService()
|
websiteCAService = service.NewIWebsiteCAService()
|
||||||
taskService = service.NewITaskService()
|
taskService = service.NewITaskService()
|
||||||
|
|||||||
+378
-18
@@ -25,6 +25,7 @@ import (
|
|||||||
websocket2 "github.com/1Panel-dev/1Panel/agent/utils/websocket"
|
websocket2 "github.com/1Panel-dev/1Panel/agent/utils/websocket"
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
"github.com/gorilla/websocket"
|
"github.com/gorilla/websocket"
|
||||||
|
qrcode "github.com/skip2/go-qrcode"
|
||||||
)
|
)
|
||||||
|
|
||||||
// @Tags File
|
// @Tags File
|
||||||
@@ -48,6 +49,31 @@ func (b *BaseApi) ListFiles(c *gin.Context) {
|
|||||||
helper.SuccessWithData(c, fileList)
|
helper.SuccessWithData(c, fileList)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// @Tags File
|
||||||
|
// @Summary File search: content grep + optional AI summary
|
||||||
|
// @Description When file-management AI is enabled, returns mode=ai with summary and hits. When disabled, returns mode=grep with hits only. Scans file contents only. Supports match options, extension/size/time filters, and scan limits.
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body request.FileAISearch true "request"
|
||||||
|
// @Success 200 {object} response.FileAISearchResult
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /files/ai-search [post]
|
||||||
|
func (b *BaseApi) FileAISearch(c *gin.Context) {
|
||||||
|
var req request.FileAISearch
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if strings.TrimSpace(req.ResponseLanguage) == "" {
|
||||||
|
req.ResponseLanguage = strings.TrimSpace(c.GetHeader("Accept-Language"))
|
||||||
|
}
|
||||||
|
res, err := fileService.AISearch(req)
|
||||||
|
if err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.SuccessWithData(c, res)
|
||||||
|
}
|
||||||
|
|
||||||
// @Tags File
|
// @Tags File
|
||||||
// @Summary Page file
|
// @Summary Page file
|
||||||
// @Accept json
|
// @Accept json
|
||||||
@@ -167,7 +193,7 @@ func (b *BaseApi) BatchDeleteFile(c *gin.Context) {
|
|||||||
// @Security ApiKeyAuth
|
// @Security ApiKeyAuth
|
||||||
// @Security Timestamp
|
// @Security Timestamp
|
||||||
// @Router /files/mode [post]
|
// @Router /files/mode [post]
|
||||||
// @x-panel-log {"bodyKeys":["path","mode"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改权限 [paths] => [mode]","formatEN":"Change mode [paths] => [mode]"}
|
// @x-panel-log {"bodyKeys":["path","mode"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改权限 [path] => [mode]","formatEN":"Change mode [path] => [mode]"}
|
||||||
func (b *BaseApi) ChangeFileMode(c *gin.Context) {
|
func (b *BaseApi) ChangeFileMode(c *gin.Context) {
|
||||||
var req request.FileCreate
|
var req request.FileCreate
|
||||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
@@ -189,7 +215,7 @@ func (b *BaseApi) ChangeFileMode(c *gin.Context) {
|
|||||||
// @Security ApiKeyAuth
|
// @Security ApiKeyAuth
|
||||||
// @Security Timestamp
|
// @Security Timestamp
|
||||||
// @Router /files/owner [post]
|
// @Router /files/owner [post]
|
||||||
// @x-panel-log {"bodyKeys":["path","user","group"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改用户/组 [paths] => [user]/[group]","formatEN":"Change owner [paths] => [user]/[group]"}
|
// @x-panel-log {"bodyKeys":["path","user","group"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改用户/组 [path] => [user]/[group]","formatEN":"Change owner [path] => [user]/[group]"}
|
||||||
func (b *BaseApi) ChangeFileOwner(c *gin.Context) {
|
func (b *BaseApi) ChangeFileOwner(c *gin.Context) {
|
||||||
var req request.FileRoleUpdate
|
var req request.FileRoleUpdate
|
||||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
@@ -224,6 +250,26 @@ func (b *BaseApi) CompressFile(c *gin.Context) {
|
|||||||
helper.Success(c)
|
helper.Success(c)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// @Tags File
|
||||||
|
// @Summary Stop compress task
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body request.FileCompressStopReq true "request"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /files/compress/stop [post]
|
||||||
|
func (b *BaseApi) StopCompressFile(c *gin.Context) {
|
||||||
|
var req request.FileCompressStopReq
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if err := fileService.StopCompress(req.TaskID); err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.Success(c)
|
||||||
|
}
|
||||||
|
|
||||||
// @Tags File
|
// @Tags File
|
||||||
// @Summary Decompress file
|
// @Summary Decompress file
|
||||||
// @Accept json
|
// @Accept json
|
||||||
@@ -246,6 +292,26 @@ func (b *BaseApi) DeCompressFile(c *gin.Context) {
|
|||||||
helper.Success(c)
|
helper.Success(c)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// @Tags File
|
||||||
|
// @Summary Stop decompress task
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body request.FileDeCompressStopReq true "request"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /files/decompress/stop [post]
|
||||||
|
func (b *BaseApi) StopDeCompressFile(c *gin.Context) {
|
||||||
|
var req request.FileDeCompressStopReq
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if err := fileService.StopDeCompress(req.TaskID); err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.Success(c)
|
||||||
|
}
|
||||||
|
|
||||||
// @Tags File
|
// @Tags File
|
||||||
// @Summary Load file content
|
// @Summary Load file content
|
||||||
// @Accept json
|
// @Accept json
|
||||||
@@ -345,7 +411,7 @@ func (b *BaseApi) UploadFiles(c *gin.Context) {
|
|||||||
helper.BadRequest(c, errors.New("error paths in request"))
|
helper.BadRequest(c, errors.New("error paths in request"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
dir := path.Dir(paths[0])
|
dir := path.Clean(paths[0])
|
||||||
|
|
||||||
_, err = os.Stat(dir)
|
_, err = os.Stat(dir)
|
||||||
if err != nil && os.IsNotExist(err) {
|
if err != nil && os.IsNotExist(err) {
|
||||||
@@ -386,8 +452,14 @@ func (b *BaseApi) UploadFiles(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
_ = os.Chown(dstDir, uid, gid)
|
_ = os.Chown(dstDir, uid, gid)
|
||||||
}
|
}
|
||||||
|
dstDirMode := mode
|
||||||
|
dstFileMode := mode.Perm()
|
||||||
|
if dstDirInfo, err := os.Stat(dstDir); err == nil {
|
||||||
|
dstDirMode = dstDirInfo.Mode()
|
||||||
|
dstFileMode = dstDirInfo.Mode().Perm()
|
||||||
|
}
|
||||||
tmpFilename := dstFilename + ".tmp"
|
tmpFilename := dstFilename + ".tmp"
|
||||||
if err := c.SaveUploadedFile(file, tmpFilename); err != nil {
|
if err := c.SaveUploadedFile(file, tmpFilename, dstDirMode); err != nil {
|
||||||
_ = os.Remove(tmpFilename)
|
_ = os.Remove(tmpFilename)
|
||||||
e := fmt.Errorf("upload [%s] file failed, err: %v", file.Filename, err)
|
e := fmt.Errorf("upload [%s] file failed, err: %v", file.Filename, err)
|
||||||
failures[file.Filename] = e
|
failures[file.Filename] = e
|
||||||
@@ -410,7 +482,7 @@ func (b *BaseApi) UploadFiles(c *gin.Context) {
|
|||||||
if statErr == nil {
|
if statErr == nil {
|
||||||
_ = os.Chmod(dstFilename, dstInfo.Mode())
|
_ = os.Chmod(dstFilename, dstInfo.Mode())
|
||||||
} else {
|
} else {
|
||||||
_ = os.Chmod(dstFilename, mode)
|
_ = os.Chmod(dstFilename, dstFileMode)
|
||||||
}
|
}
|
||||||
if uid != -1 && gid != -1 {
|
if uid != -1 && gid != -1 {
|
||||||
_ = os.Chown(dstFilename, uid, gid)
|
_ = os.Chown(dstFilename, uid, gid)
|
||||||
@@ -515,6 +587,29 @@ func (b *BaseApi) WgetFile(c *gin.Context) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// @Tags File
|
||||||
|
// @Summary Stop wget file download
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body request.FileProcessReq true "request"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /files/wget/stop [post]
|
||||||
|
// @x-panel-log {"bodyKeys":["key"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"停止下载任务 [key]","formatEN":"Stop wget task [key]"}
|
||||||
|
func (b *BaseApi) StopWget(c *gin.Context) {
|
||||||
|
var req request.FileProcessReq
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if strings.TrimSpace(req.Key) == "" {
|
||||||
|
helper.BadRequest(c, errors.New("key is required"))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
files.CancelDownload(req.Key)
|
||||||
|
helper.Success(c)
|
||||||
|
}
|
||||||
|
|
||||||
// @Tags File
|
// @Tags File
|
||||||
// @Summary Move file
|
// @Summary Move file
|
||||||
// @Accept json
|
// @Accept json
|
||||||
@@ -545,6 +640,10 @@ func (b *BaseApi) MoveFile(c *gin.Context) {
|
|||||||
// @Router /files/download [get]
|
// @Router /files/download [get]
|
||||||
func (b *BaseApi) Download(c *gin.Context) {
|
func (b *BaseApi) Download(c *gin.Context) {
|
||||||
filePath := c.Query("path")
|
filePath := c.Query("path")
|
||||||
|
if files.ShouldDenySensitiveFileRead(filePath) {
|
||||||
|
helper.InternalServer(c, buserr.New("ErrSensitiveFileRead"))
|
||||||
|
return
|
||||||
|
}
|
||||||
file, err := os.Open(filePath)
|
file, err := os.Open(filePath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
helper.InternalServer(c, err)
|
helper.InternalServer(c, err)
|
||||||
@@ -580,6 +679,10 @@ func (b *BaseApi) DownloadChunkFiles(c *gin.Context) {
|
|||||||
helper.ErrorWithDetail(c, http.StatusInternalServerError, "ErrPathNotFound", nil)
|
helper.ErrorWithDetail(c, http.StatusInternalServerError, "ErrPathNotFound", nil)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
if files.ShouldDenySensitiveFileRead(req.Path) {
|
||||||
|
helper.InternalServer(c, buserr.New("ErrSensitiveFileRead"))
|
||||||
|
return
|
||||||
|
}
|
||||||
filePath := req.Path
|
filePath := req.Path
|
||||||
fstFile, err := fileOp.OpenFile(filePath)
|
fstFile, err := fileOp.OpenFile(filePath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -698,12 +801,13 @@ func mergeChunks(fileName string, fileDir string, dstDir string, chunkCount int,
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if dstDirInfo, err := os.Stat(dstDir); err == nil {
|
||||||
|
mode = dstDirInfo.Mode().Perm()
|
||||||
|
}
|
||||||
dstFileName := filepath.Join(dstDir, fileName)
|
dstFileName := filepath.Join(dstDir, fileName)
|
||||||
dstInfo, statErr := os.Stat(dstFileName)
|
dstInfo, statErr := os.Stat(dstFileName)
|
||||||
if statErr == nil {
|
if statErr == nil {
|
||||||
mode = dstInfo.Mode()
|
mode = dstInfo.Mode()
|
||||||
} else {
|
|
||||||
mode = 0644
|
|
||||||
}
|
}
|
||||||
if overwrite {
|
if overwrite {
|
||||||
_ = os.Remove(dstFileName)
|
_ = os.Remove(dstFileName)
|
||||||
@@ -725,6 +829,7 @@ func mergeChunks(fileName string, fileDir string, dstDir string, chunkCount int,
|
|||||||
}
|
}
|
||||||
_ = os.Remove(chunkPath)
|
_ = os.Remove(chunkPath)
|
||||||
}
|
}
|
||||||
|
_ = os.Chmod(dstFileName, mode)
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
@@ -829,7 +934,17 @@ var wsUpgrade = websocket.Upgrader{
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// @Tags File
|
||||||
|
// @Summary Wget process
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /files/wget/process [get]
|
||||||
func (b *BaseApi) WgetProcess(c *gin.Context) {
|
func (b *BaseApi) WgetProcess(c *gin.Context) {
|
||||||
|
if !websocket.IsWebSocketUpgrade(c.Request) {
|
||||||
|
helper.Success(c)
|
||||||
|
return
|
||||||
|
}
|
||||||
ws, err := wsUpgrade.Upgrade(c.Writer, c.Request, nil)
|
ws, err := wsUpgrade.Upgrade(c.Writer, c.Request, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
@@ -839,6 +954,12 @@ func (b *BaseApi) WgetProcess(c *gin.Context) {
|
|||||||
go wsClient.Write()
|
go wsClient.Write()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// @Tags File
|
||||||
|
// @Summary Process keys
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /files/wget/process/keys [get]
|
||||||
func (b *BaseApi) ProcessKeys(c *gin.Context) {
|
func (b *BaseApi) ProcessKeys(c *gin.Context) {
|
||||||
res := &response.FileProcessKeys{}
|
res := &response.FileProcessKeys{}
|
||||||
keys := global.CACHE.PrefixScanKey("file-wget-")
|
keys := global.CACHE.PrefixScanKey("file-wget-")
|
||||||
@@ -858,16 +979,20 @@ func (b *BaseApi) ProcessKeys(c *gin.Context) {
|
|||||||
|
|
||||||
// @Tags File
|
// @Tags File
|
||||||
// @Summary Read file by Line
|
// @Summary Read file by Line
|
||||||
|
// @Param type path string true "type"
|
||||||
// @Param request body request.FileReadByLineReq true "request"
|
// @Param request body request.FileReadByLineReq true "request"
|
||||||
// @Success 200 {object} response.FileLineContent
|
// @Success 200 {object} response.FileLineContent
|
||||||
// @Security ApiKeyAuth
|
// @Security ApiKeyAuth
|
||||||
// @Security Timestamp
|
// @Security Timestamp
|
||||||
// @Router /files/read [post]
|
// @Router /files/read/{type} [post]
|
||||||
func (b *BaseApi) ReadFileByLine(c *gin.Context) {
|
func (b *BaseApi) ReadFileByLine(c *gin.Context) {
|
||||||
var req request.FileReadByLineReq
|
var req request.FileReadByLineReq
|
||||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
if readType := strings.TrimSpace(c.Param("type")); readType != "" {
|
||||||
|
req.Type = readType
|
||||||
|
}
|
||||||
res, err := fileService.ReadLogByLine(req)
|
res, err := fileService.ReadLogByLine(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
helper.InternalServer(c, err)
|
helper.InternalServer(c, err)
|
||||||
@@ -900,16 +1025,6 @@ func (b *BaseApi) BatchChangeModeAndOwner(c *gin.Context) {
|
|||||||
helper.Success(c)
|
helper.Success(c)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (b *BaseApi) GetPathByType(c *gin.Context) {
|
|
||||||
pathType, ok := c.Params.Get("type")
|
|
||||||
if !ok {
|
|
||||||
helper.BadRequest(c, errors.New("error pathType id in path"))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
resPath := fileService.GetPathByType(pathType)
|
|
||||||
helper.SuccessWithData(c, resPath)
|
|
||||||
}
|
|
||||||
|
|
||||||
// @Tags File
|
// @Tags File
|
||||||
// @Summary system mount
|
// @Summary system mount
|
||||||
// @Accept json
|
// @Accept json
|
||||||
@@ -1015,3 +1130,248 @@ func (b *BaseApi) SetFileRemark(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
helper.Success(c)
|
helper.Success(c)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// @Tags File
|
||||||
|
// @Summary List file shares
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body dto.PageInfo true "request"
|
||||||
|
// @Success 200 {object} dto.PageResult
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /files/share/search [post]
|
||||||
|
func (b *BaseApi) SearchFileShare(c *gin.Context) {
|
||||||
|
var req dto.PageInfo
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
total, list, err := fileShareService.Page(req)
|
||||||
|
if err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.SuccessWithData(c, dto.PageResult{
|
||||||
|
Total: total,
|
||||||
|
Items: list,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Tags File
|
||||||
|
// @Summary Get file share detail by path
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body dto.FilePath true "request"
|
||||||
|
// @Success 200 {object} response.FileShareInfo
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /files/share/detail [post]
|
||||||
|
func (b *BaseApi) GetFileShareDetail(c *gin.Context) {
|
||||||
|
var req dto.FilePath
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
info, err := fileShareService.GetByPath(req.Path)
|
||||||
|
if err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.SuccessWithData(c, info)
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Tags File
|
||||||
|
// @Summary Get file share detail by code (no login)
|
||||||
|
// @Param code query string true "share code"
|
||||||
|
// @Success 200 {object} response.FileSharePublicInfo
|
||||||
|
// @Router /files/share/info [get]
|
||||||
|
func (b *BaseApi) GetPublicFileShareInfo(c *gin.Context) {
|
||||||
|
code := strings.TrimSpace(c.Query("code"))
|
||||||
|
if code == "" {
|
||||||
|
helper.BadRequest(c, errors.New("code is required"))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
info, err := fileShareService.GetPublicByCode(code)
|
||||||
|
if err != nil {
|
||||||
|
if be, ok := err.(buserr.BusinessError); ok {
|
||||||
|
helper.ErrorWithDetail(c, http.StatusBadRequest, be.Msg, be)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.SuccessWithData(c, info)
|
||||||
|
}
|
||||||
|
|
||||||
|
func buildSharePublicURL(c *gin.Context, code, operateNode string) string {
|
||||||
|
scheme := strings.TrimSpace(c.GetHeader("X-Forwarded-Proto"))
|
||||||
|
if scheme == "" {
|
||||||
|
if c.Request.TLS != nil {
|
||||||
|
scheme = "https"
|
||||||
|
} else {
|
||||||
|
scheme = "http"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
host := strings.TrimSpace(c.GetHeader("X-Forwarded-Host"))
|
||||||
|
if host == "" {
|
||||||
|
host = c.Request.Host
|
||||||
|
}
|
||||||
|
shareURL := url.URL{
|
||||||
|
Scheme: scheme,
|
||||||
|
Host: host,
|
||||||
|
Path: "/s/" + url.PathEscape(code),
|
||||||
|
}
|
||||||
|
query := shareURL.Query()
|
||||||
|
if strings.TrimSpace(operateNode) != "" {
|
||||||
|
query.Set("operateNode", operateNode)
|
||||||
|
}
|
||||||
|
shareURL.RawQuery = query.Encode()
|
||||||
|
return shareURL.String()
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Tags File
|
||||||
|
// @Summary Get file share QR code image
|
||||||
|
// @Produce png
|
||||||
|
// @Param code query string true "share code"
|
||||||
|
// @Param operateNode query string false "operate node"
|
||||||
|
// @Success 200 {file} file
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /files/share/qrcode [get]
|
||||||
|
func (b *BaseApi) GetFileShareQRCode(c *gin.Context) {
|
||||||
|
code := strings.TrimSpace(c.Query("code"))
|
||||||
|
if code == "" {
|
||||||
|
helper.BadRequest(c, errors.New("code is required"))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if _, err := fileShareService.GetByCode(code); err != nil {
|
||||||
|
if be, ok := err.(buserr.BusinessError); ok {
|
||||||
|
helper.ErrorWithDetail(c, http.StatusBadRequest, be.Msg, be)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
png, err := qrcode.Encode(buildSharePublicURL(c, code, c.Query("operateNode")), qrcode.Medium, 256)
|
||||||
|
if err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
c.Header("Cache-Control", "private, max-age=300")
|
||||||
|
c.Data(http.StatusOK, "image/png", png)
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Tags File
|
||||||
|
// @Summary Create temporary file share link
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body request.FileShareCreate true "request"
|
||||||
|
// @Success 200 {object} response.FileShareInfo
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /files/share/create [post]
|
||||||
|
// @x-panel-log {"bodyKeys":["path","expireMinutes"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建文件分享 [path]","formatEN":"Create file share [path]"}
|
||||||
|
func (b *BaseApi) CreateFileShare(c *gin.Context) {
|
||||||
|
var req request.FileShareCreate
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
res, err := fileShareService.Create(req)
|
||||||
|
if err != nil {
|
||||||
|
if be, ok := err.(buserr.BusinessError); ok {
|
||||||
|
helper.ErrorWithDetail(c, http.StatusInternalServerError, be.Msg, be.Err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.SuccessWithData(c, res)
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Tags File
|
||||||
|
// @Summary Delete file share by path
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body dto.FilePath true "request"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /files/share/del [post]
|
||||||
|
// @x-panel-log {"bodyKeys":["path"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"关闭文件分享 [path]","formatEN":"Close file share [path]"}
|
||||||
|
func (b *BaseApi) DeleteFileShare(c *gin.Context) {
|
||||||
|
var req dto.FilePath
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if err := fileShareService.DeleteByPath(req.Path); err != nil {
|
||||||
|
if be, ok := err.(buserr.BusinessError); ok {
|
||||||
|
helper.ErrorWithDetail(c, http.StatusInternalServerError, be.Msg, be.Err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.Success(c)
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Tags File
|
||||||
|
// @Summary Check file share code (no login)
|
||||||
|
// @Param code query string true "share code"
|
||||||
|
// @Param password query string false "optional password"
|
||||||
|
// @Success 200 {object} dto.Response
|
||||||
|
// @Router /files/share/check [get]
|
||||||
|
func (b *BaseApi) CheckFileShare(c *gin.Context) {
|
||||||
|
code := strings.TrimSpace(c.Query("code"))
|
||||||
|
password := c.Query("password")
|
||||||
|
if code == "" {
|
||||||
|
helper.BadRequest(c, errors.New("code is required"))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if err := fileShareService.Check(code, password); err != nil {
|
||||||
|
if be, ok := err.(buserr.BusinessError); ok {
|
||||||
|
helper.ErrorWithDetail(c, http.StatusBadRequest, be.Msg, be)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.Success(c)
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Tags File
|
||||||
|
// @Summary Download file by share code (no login)
|
||||||
|
// @Produce octet-stream
|
||||||
|
// @Param code query string true "share code"
|
||||||
|
// @Param password query string false "optional password"
|
||||||
|
// @Success 200 {file} file
|
||||||
|
// @Router /files/share/download [get]
|
||||||
|
func (b *BaseApi) DownloadFileShare(c *gin.Context) {
|
||||||
|
code := strings.TrimSpace(c.Query("code"))
|
||||||
|
password := c.Query("password")
|
||||||
|
if code == "" {
|
||||||
|
helper.BadRequest(c, errors.New("code is required"))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
filePath, displayName, err := fileShareService.PrepareDownload(code, password)
|
||||||
|
if err != nil {
|
||||||
|
if be, ok := err.(buserr.BusinessError); ok {
|
||||||
|
helper.ErrorWithDetail(c, http.StatusBadRequest, be.Msg, be)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if files.ShouldDenySensitiveFileRead(filePath) {
|
||||||
|
helper.InternalServer(c, buserr.New("ErrSensitiveFileRead"))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
file, err := os.Open(filePath)
|
||||||
|
if err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer file.Close()
|
||||||
|
info, err := file.Stat()
|
||||||
|
if err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
c.Header("Content-Length", strconv.FormatInt(info.Size(), 10))
|
||||||
|
c.Header("Content-Disposition", "attachment; filename*=utf-8''"+url.PathEscape(displayName))
|
||||||
|
http.ServeContent(c.Writer, c.Request, displayName, info.ModTime(), file)
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,91 @@
|
|||||||
|
package v2
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/dto"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/dto/request"
|
||||||
|
"github.com/gin-gonic/gin"
|
||||||
|
)
|
||||||
|
|
||||||
|
// @Tags File
|
||||||
|
// @Summary Load file history list
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body request.FileHistorySearchReq true "request"
|
||||||
|
// @Success 200 {object} dto.PageResult
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /files/history/search [post]
|
||||||
|
func (b *BaseApi) SearchFileHistory(c *gin.Context) {
|
||||||
|
var req request.FileHistorySearchReq
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
total, items, err := fileHistoryService.Search(req)
|
||||||
|
if err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.SuccessWithData(c, dto.PageResult{Items: items, Total: total})
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Tags File
|
||||||
|
// @Summary Load file history content
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body request.FileHistoryContentReq true "request"
|
||||||
|
// @Success 200 {object} response.FileHistoryInfo
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /files/history/content [post]
|
||||||
|
func (b *BaseApi) GetFileHistoryContent(c *gin.Context) {
|
||||||
|
var req request.FileHistoryContentReq
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
item, err := fileHistoryService.GetContent(req)
|
||||||
|
if err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.SuccessWithData(c, item)
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Tags File
|
||||||
|
// @Summary Delete file history record
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body request.FileHistoryDeleteReq true "request"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /files/history/del [post]
|
||||||
|
func (b *BaseApi) DeleteFileHistory(c *gin.Context) {
|
||||||
|
var req request.FileHistoryDeleteReq
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if err := fileHistoryService.Delete(req); err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.Success(c)
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Tags File
|
||||||
|
// @Summary Restore file history record
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body request.FileHistoryRestoreReq true "request"
|
||||||
|
// @Success 200 {object} response.FileInfo
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /files/history/restore [post]
|
||||||
|
func (b *BaseApi) RestoreFileHistory(c *gin.Context) {
|
||||||
|
var req request.FileHistoryRestoreReq
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
info, err := fileHistoryService.Restore(req)
|
||||||
|
if err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.SuccessWithData(c, info)
|
||||||
|
}
|
||||||
@@ -236,7 +236,7 @@ func (b *BaseApi) UpdateAddrRule(c *gin.Context) {
|
|||||||
// @Success 200 {object} dto.PageResult
|
// @Success 200 {object} dto.PageResult
|
||||||
// @Security ApiKeyAuth
|
// @Security ApiKeyAuth
|
||||||
// @Security Timestamp
|
// @Security Timestamp
|
||||||
// @Router /hosts/firewall/filter/search [post]
|
// @Router /hosts/firewall/filter/rule/search [post]
|
||||||
func (b *BaseApi) SearchFilterRules(c *gin.Context) {
|
func (b *BaseApi) SearchFilterRules(c *gin.Context) {
|
||||||
var req dto.SearchPageWithType
|
var req dto.SearchPageWithType
|
||||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
|||||||
@@ -0,0 +1,72 @@
|
|||||||
|
package v2
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/dto"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/utils/ai_tools/gpu"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/utils/ai_tools/gpu/common"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/utils/ai_tools/xpu"
|
||||||
|
"github.com/gin-gonic/gin"
|
||||||
|
)
|
||||||
|
|
||||||
|
// @Tags AI
|
||||||
|
// @Summary Load gpu / xpu info
|
||||||
|
// @Accept json
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /ai/gpu/load [get]
|
||||||
|
func (b *BaseApi) LoadGpuInfo(c *gin.Context) {
|
||||||
|
ok, client := gpu.New()
|
||||||
|
if ok {
|
||||||
|
info, err := client.LoadGpuInfo()
|
||||||
|
if err != nil {
|
||||||
|
helper.BadRequest(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.SuccessWithData(c, info)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
xpuOK, xpuClient := xpu.New()
|
||||||
|
if xpuOK {
|
||||||
|
info, err := xpuClient.LoadGpuInfo()
|
||||||
|
if err != nil {
|
||||||
|
helper.BadRequest(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.SuccessWithData(c, info)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.SuccessWithData(c, &common.GpuInfo{})
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Tags AI
|
||||||
|
// @Summary Get CPU options
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /ai/gpu/options [get]
|
||||||
|
func (b *BaseApi) GetCPUOptions(c *gin.Context) {
|
||||||
|
helper.SuccessWithData(c, monitorService.LoadGPUOptions())
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Tags Monitor
|
||||||
|
// @Summary Load monitor data
|
||||||
|
// @Param request body dto.MonitorGPUSearch true "request"
|
||||||
|
// @Success 200 {object} dto.MonitorGPUData
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /ai/gpu/search [post]
|
||||||
|
func (b *BaseApi) LoadGPUMonitor(c *gin.Context) {
|
||||||
|
var req dto.MonitorGPUSearch
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
data, err := monitorService.LoadGPUMonitorData(req)
|
||||||
|
if err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.SuccessWithData(c, data)
|
||||||
|
}
|
||||||
@@ -5,6 +5,12 @@ import (
|
|||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// @Tags Health
|
||||||
|
// @Summary Check health
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /health/check [get]
|
||||||
func (b *BaseApi) CheckHealth(c *gin.Context) {
|
func (b *BaseApi) CheckHealth(c *gin.Context) {
|
||||||
helper.Success(c)
|
helper.Success(c)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,243 @@
|
|||||||
|
package v2
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/dto"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/utils/encrypt"
|
||||||
|
"github.com/gin-gonic/gin"
|
||||||
|
)
|
||||||
|
|
||||||
|
// @Tags Host
|
||||||
|
// @Summary Create host
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body dto.HostOperate true "request"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /hosts [post]
|
||||||
|
// @x-panel-log {"bodyKeys":["name","addr"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建主机 [name][addr]","formatEN":"create host [name][addr]"}
|
||||||
|
func (b *BaseApi) CreateHost(c *gin.Context) {
|
||||||
|
var req dto.HostOperate
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
host, err := hostService.Create(req)
|
||||||
|
if err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.SuccessWithData(c, host)
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Tags Host
|
||||||
|
// @Summary Test by info
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body dto.HostConnTest true "request"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /hosts/test/byinfo [post]
|
||||||
|
func (b *BaseApi) TestByInfo(c *gin.Context) {
|
||||||
|
var req dto.HostConnTest
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
helper.SuccessWithData(c, hostService.TestByInfo(req))
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Tags Host
|
||||||
|
// @Summary Test by ID
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body dto.OperateByID true "request"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /hosts/test/byid [post]
|
||||||
|
func (b *BaseApi) TestByID(c *gin.Context) {
|
||||||
|
var req dto.OperateByID
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
helper.SuccessWithData(c, hostService.TestLocalConn(req.ID))
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Tags Host
|
||||||
|
// @Summary Host tree
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body dto.SearchForTree true "request"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /hosts/tree [post]
|
||||||
|
func (b *BaseApi) HostTree(c *gin.Context) {
|
||||||
|
var req dto.SearchForTree
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
data, err := hostService.SearchForTree(req)
|
||||||
|
if err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.SuccessWithData(c, data)
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Tags Host
|
||||||
|
// @Summary Search host
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body dto.SearchPageWithGroup true "request"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /hosts/search [post]
|
||||||
|
func (b *BaseApi) SearchHost(c *gin.Context) {
|
||||||
|
var req dto.SearchPageWithGroup
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
total, list, err := hostService.SearchWithPage(req)
|
||||||
|
if err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
helper.SuccessWithData(c, dto.PageResult{Items: list, Total: total})
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Tags Host
|
||||||
|
// @Summary Delete host
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body dto.OperateByIDs true "request"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /hosts/del [post]
|
||||||
|
// @x-panel-log {"bodyKeys":["ids"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"ids","isList":true,"db":"hosts","output_column":"name","output_value":"names"}],"formatZH":"删除主机 [names]","formatEN":"delete host [names]"}
|
||||||
|
func (b *BaseApi) DeleteHost(c *gin.Context) {
|
||||||
|
var req dto.OperateByIDs
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := hostService.Delete(req.IDs); err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.Success(c)
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Tags Host
|
||||||
|
// @Summary Update host
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body dto.HostOperate true "request"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /hosts/update [post]
|
||||||
|
// @x-panel-log {"bodyKeys":["name","addr"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新主机 [name][addr]","formatEN":"update host [name][addr]"}
|
||||||
|
func (b *BaseApi) UpdateHost(c *gin.Context) {
|
||||||
|
var req dto.HostOperate
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var err error
|
||||||
|
if len(req.Password) != 0 && req.AuthMode == "password" {
|
||||||
|
req.Password, err = hostService.EncryptHost(req.Password)
|
||||||
|
if err != nil {
|
||||||
|
helper.BadRequest(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
req.PrivateKey = ""
|
||||||
|
req.PassPhrase = ""
|
||||||
|
}
|
||||||
|
if len(req.PrivateKey) != 0 && req.AuthMode == "key" {
|
||||||
|
req.PrivateKey, err = hostService.EncryptHost(req.PrivateKey)
|
||||||
|
if err != nil {
|
||||||
|
helper.BadRequest(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if len(req.PassPhrase) != 0 {
|
||||||
|
req.PassPhrase, err = encrypt.StringEncrypt(req.PassPhrase)
|
||||||
|
if err != nil {
|
||||||
|
helper.BadRequest(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
req.Password = ""
|
||||||
|
}
|
||||||
|
|
||||||
|
upMap := map[string]interface{}{
|
||||||
|
"name": req.Name,
|
||||||
|
"group_id": req.GroupID,
|
||||||
|
"addr": req.Addr,
|
||||||
|
"port": req.Port,
|
||||||
|
"user": req.User,
|
||||||
|
"auth_mode": req.AuthMode,
|
||||||
|
"remember_password": req.RememberPassword,
|
||||||
|
"description": req.Description,
|
||||||
|
}
|
||||||
|
if req.AuthMode == "password" {
|
||||||
|
upMap["password"] = req.Password
|
||||||
|
upMap["private_key"] = ""
|
||||||
|
upMap["pass_phrase"] = ""
|
||||||
|
} else {
|
||||||
|
upMap["password"] = ""
|
||||||
|
upMap["private_key"] = req.PrivateKey
|
||||||
|
upMap["pass_phrase"] = req.PassPhrase
|
||||||
|
}
|
||||||
|
hostItem, err := hostService.Update(req.ID, upMap)
|
||||||
|
if err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.SuccessWithData(c, hostItem)
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Tags Host
|
||||||
|
// @Summary Update host group
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body dto.ChangeGroup true "request"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /hosts/update/group [post]
|
||||||
|
// @x-panel-log {"bodyKeys":["id","groupID"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"hosts","output_column":"name","output_value":"name"}],"formatZH":"更新主机 [name] 分组","formatEN":"update host [name] group"}
|
||||||
|
func (b *BaseApi) UpdateHostGroup(c *gin.Context) {
|
||||||
|
var req dto.ChangeGroup
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := hostService.Update(req.ID, map[string]interface{}{"group_id": req.GroupID}); err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.Success(c)
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Tags Host
|
||||||
|
// @Summary Get host by ID
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body dto.OperateByID true "request"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /hosts/info [post]
|
||||||
|
func (b *BaseApi) GetHostByID(c *gin.Context) {
|
||||||
|
var req dto.OperateByID
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
info, err := hostService.GetHostByID(req.ID)
|
||||||
|
if err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.SuccessWithData(c, info)
|
||||||
|
}
|
||||||
@@ -9,13 +9,13 @@ import (
|
|||||||
// @Tags Host tool
|
// @Tags Host tool
|
||||||
// @Summary Get tool status
|
// @Summary Get tool status
|
||||||
// @Accept json
|
// @Accept json
|
||||||
// @Param request body request.HostToolReq true "request"
|
// @Param request body request.HostToolTypeReq true "request"
|
||||||
// @Success 200 {object} response.HostToolRes
|
// @Success 200 {object} response.HostToolRes
|
||||||
// @Security ApiKeyAuth
|
// @Security ApiKeyAuth
|
||||||
// @Security Timestamp
|
// @Security Timestamp
|
||||||
// @Router /hosts/tool [post]
|
// @Router /hosts/tool/status [post]
|
||||||
func (b *BaseApi) GetToolStatus(c *gin.Context) {
|
func (b *BaseApi) GetToolStatus(c *gin.Context) {
|
||||||
var req request.HostToolReq
|
var req request.HostToolTypeReq
|
||||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -53,14 +53,14 @@ func (b *BaseApi) InitToolConfig(c *gin.Context) {
|
|||||||
// @Tags Host tool
|
// @Tags Host tool
|
||||||
// @Summary Operate tool
|
// @Summary Operate tool
|
||||||
// @Accept json
|
// @Accept json
|
||||||
// @Param request body request.HostToolReq true "request"
|
// @Param request body request.HostToolOperateReq true "request"
|
||||||
// @Success 200
|
// @Success 200
|
||||||
// @Security ApiKeyAuth
|
// @Security ApiKeyAuth
|
||||||
// @Security Timestamp
|
// @Security Timestamp
|
||||||
// @Router /hosts/tool/operate [post]
|
// @Router /hosts/tool/operate [post]
|
||||||
// @x-panel-log {"bodyKeys":["operate","type"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"[operate] [type] ","formatEN":"[operate] [type]"}
|
// @x-panel-log {"bodyKeys":["operate","type"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"[operate] [type] ","formatEN":"[operate] [type]"}
|
||||||
func (b *BaseApi) OperateTool(c *gin.Context) {
|
func (b *BaseApi) OperateTool(c *gin.Context) {
|
||||||
var req request.HostToolReq
|
var req request.HostToolOperateReq
|
||||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -75,19 +75,18 @@ func (b *BaseApi) OperateTool(c *gin.Context) {
|
|||||||
// @Tags Host tool
|
// @Tags Host tool
|
||||||
// @Summary Get tool config
|
// @Summary Get tool config
|
||||||
// @Accept json
|
// @Accept json
|
||||||
// @Param request body request.HostToolConfig true "request"
|
// @Param request body request.HostToolTypeReq true "request"
|
||||||
// @Success 200 {object} response.HostToolConfig
|
// @Success 200 {object} response.HostToolConfig
|
||||||
// @Security ApiKeyAuth
|
// @Security ApiKeyAuth
|
||||||
// @Security Timestamp
|
// @Security Timestamp
|
||||||
// @Router /hosts/tool/config [post]
|
// @Router /hosts/tool/config/get [post]
|
||||||
// @x-panel-log {"bodyKeys":["operate"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"[operate] 主机工具配置文件 ","formatEN":"[operate] tool config"}
|
func (b *BaseApi) GetToolConfig(c *gin.Context) {
|
||||||
func (b *BaseApi) OperateToolConfig(c *gin.Context) {
|
var req request.HostToolTypeReq
|
||||||
var req request.HostToolConfig
|
|
||||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
config, err := hostToolService.OperateToolConfig(req)
|
config, err := hostToolService.GetToolConfig(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
helper.InternalServer(c, err)
|
helper.InternalServer(c, err)
|
||||||
return
|
return
|
||||||
@@ -95,6 +94,28 @@ func (b *BaseApi) OperateToolConfig(c *gin.Context) {
|
|||||||
helper.SuccessWithData(c, config)
|
helper.SuccessWithData(c, config)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// @Tags Host tool
|
||||||
|
// @Summary Update tool config
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body request.HostToolConfigUpdate true "request"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /hosts/tool/config/set [post]
|
||||||
|
// @x-panel-log {"bodyKeys":["type"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新 [type] 主机工具配置文件 ","formatEN":"update [type] tool config"}
|
||||||
|
func (b *BaseApi) UpdateToolConfig(c *gin.Context) {
|
||||||
|
var req request.HostToolConfigUpdate
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := hostToolService.UpdateToolConfig(req); err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.Success(c)
|
||||||
|
}
|
||||||
|
|
||||||
// @Tags Host tool
|
// @Tags Host tool
|
||||||
// @Summary Create Supervisor process
|
// @Summary Create Supervisor process
|
||||||
// @Accept json
|
// @Accept json
|
||||||
@@ -137,18 +158,44 @@ func (b *BaseApi) GetProcess(c *gin.Context) {
|
|||||||
// @Tags Host tool
|
// @Tags Host tool
|
||||||
// @Summary Get Supervisor process config file
|
// @Summary Get Supervisor process config file
|
||||||
// @Accept json
|
// @Accept json
|
||||||
// @Param request body request.SupervisorProcessFileReq true "request"
|
// @Param request body request.HostSupervisorProcessFileGetReq true "request"
|
||||||
// @Success 200 {string} content
|
// @Success 200 {string} content
|
||||||
// @Security ApiKeyAuth
|
// @Security ApiKeyAuth
|
||||||
// @Security Timestamp
|
// @Security Timestamp
|
||||||
// @Router /hosts/tool/supervisor/process/file [post]
|
// @Router /hosts/tool/supervisor/process/file/get [post]
|
||||||
// @x-panel-log {"bodyKeys":["operate"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"[operate] Supervisor 进程文件 ","formatEN":"[operate] Supervisor Process Config file"}
|
|
||||||
func (b *BaseApi) GetProcessFile(c *gin.Context) {
|
func (b *BaseApi) GetProcessFile(c *gin.Context) {
|
||||||
var req request.SupervisorProcessFileReq
|
var req request.HostSupervisorProcessFileGetReq
|
||||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
content, err := hostToolService.OperateSupervisorProcessFile(req)
|
content, err := hostToolService.GetSupervisorProcessFile(req)
|
||||||
|
if err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.SuccessWithData(c, content)
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Tags Host tool
|
||||||
|
// @Summary Operate Supervisor process config file
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body request.HostSupervisorProcessFileOperateReq true "request"
|
||||||
|
// @Success 200 {string} content
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /hosts/tool/supervisor/process/file [post]
|
||||||
|
// @x-panel-log {"bodyKeys":["operate"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"[operate] Supervisor 进程文件 ","formatEN":"[operate] Supervisor Process Config file"}
|
||||||
|
func (b *BaseApi) OperateProcessFile(c *gin.Context) {
|
||||||
|
var req request.HostSupervisorProcessFileOperateReq
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
content, err := hostToolService.OperateSupervisorProcessFile(request.SupervisorProcessFileReq{
|
||||||
|
Name: req.Name,
|
||||||
|
Operate: req.Operate,
|
||||||
|
Content: req.Content,
|
||||||
|
File: req.File,
|
||||||
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
helper.InternalServer(c, err)
|
helper.InternalServer(c, err)
|
||||||
return
|
return
|
||||||
|
|||||||
+13
-26
@@ -31,27 +31,6 @@ func (b *BaseApi) LoadMonitor(c *gin.Context) {
|
|||||||
helper.SuccessWithDataGzipped(c, data)
|
helper.SuccessWithDataGzipped(c, data)
|
||||||
}
|
}
|
||||||
|
|
||||||
// @Tags Monitor
|
|
||||||
// @Summary Load monitor data
|
|
||||||
// @Param request body dto.MonitorGPUSearch true "request"
|
|
||||||
// @Success 200 {object} dto.MonitorGPUData
|
|
||||||
// @Security ApiKeyAuth
|
|
||||||
// @Security Timestamp
|
|
||||||
// @Router /hosts/monitor/gpu/search [post]
|
|
||||||
func (b *BaseApi) LoadGPUMonitor(c *gin.Context) {
|
|
||||||
var req dto.MonitorGPUSearch
|
|
||||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
data, err := monitorService.LoadGPUMonitorData(req)
|
|
||||||
if err != nil {
|
|
||||||
helper.InternalServer(c, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
helper.SuccessWithData(c, data)
|
|
||||||
}
|
|
||||||
|
|
||||||
// @Tags Monitor
|
// @Tags Monitor
|
||||||
// @Summary Clean monitor data
|
// @Summary Clean monitor data
|
||||||
// @Success 200
|
// @Success 200
|
||||||
@@ -91,7 +70,7 @@ func (b *BaseApi) LoadMonitorSetting(c *gin.Context) {
|
|||||||
// @Security ApiKeyAuth
|
// @Security ApiKeyAuth
|
||||||
// @Security Timestamp
|
// @Security Timestamp
|
||||||
// @Router /hosts/monitor/setting/update [post]
|
// @Router /hosts/monitor/setting/update [post]
|
||||||
// @x-panel-log {"bodyKeys":["key", "value"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改默认监控网卡 [name]-[value]","formatEN":"update default monitor [name]-[value]"}
|
// @x-panel-log {"bodyKeys":["key", "value"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改默认监控网卡 [key]-[value]","formatEN":"update default monitor [key]-[value]"}
|
||||||
func (b *BaseApi) UpdateMonitorSetting(c *gin.Context) {
|
func (b *BaseApi) UpdateMonitorSetting(c *gin.Context) {
|
||||||
var req dto.MonitorSettingUpdate
|
var req dto.MonitorSettingUpdate
|
||||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
@@ -105,6 +84,12 @@ func (b *BaseApi) UpdateMonitorSetting(c *gin.Context) {
|
|||||||
helper.Success(c)
|
helper.Success(c)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// @Tags Monitor
|
||||||
|
// @Summary Get network options
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /hosts/monitor/netoptions [get]
|
||||||
func (b *BaseApi) GetNetworkOptions(c *gin.Context) {
|
func (b *BaseApi) GetNetworkOptions(c *gin.Context) {
|
||||||
netStat, _ := net.IOCounters(true)
|
netStat, _ := net.IOCounters(true)
|
||||||
var options []string
|
var options []string
|
||||||
@@ -116,6 +101,12 @@ func (b *BaseApi) GetNetworkOptions(c *gin.Context) {
|
|||||||
helper.SuccessWithData(c, options)
|
helper.SuccessWithData(c, options)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// @Tags Monitor
|
||||||
|
// @Summary Get IO options
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /hosts/monitor/iooptions [get]
|
||||||
func (b *BaseApi) GetIOOptions(c *gin.Context) {
|
func (b *BaseApi) GetIOOptions(c *gin.Context) {
|
||||||
diskStat, _ := disk.IOCounters()
|
diskStat, _ := disk.IOCounters()
|
||||||
var options []string
|
var options []string
|
||||||
@@ -126,7 +117,3 @@ func (b *BaseApi) GetIOOptions(c *gin.Context) {
|
|||||||
sort.Strings(options)
|
sort.Strings(options)
|
||||||
helper.SuccessWithData(c, options)
|
helper.SuccessWithData(c, options)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (b *BaseApi) GetCPUOptions(c *gin.Context) {
|
|
||||||
helper.SuccessWithData(c, monitorService.LoadGPUOptions())
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -5,9 +5,20 @@ import (
|
|||||||
"github.com/1Panel-dev/1Panel/agent/app/dto/request"
|
"github.com/1Panel-dev/1Panel/agent/app/dto/request"
|
||||||
websocket2 "github.com/1Panel-dev/1Panel/agent/utils/websocket"
|
websocket2 "github.com/1Panel-dev/1Panel/agent/utils/websocket"
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
|
"github.com/gorilla/websocket"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// @Tags Process
|
||||||
|
// @Summary Process ws
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /process/ws [get]
|
||||||
func (b *BaseApi) ProcessWs(c *gin.Context) {
|
func (b *BaseApi) ProcessWs(c *gin.Context) {
|
||||||
|
if !websocket.IsWebSocketUpgrade(c.Request) {
|
||||||
|
helper.Success(c)
|
||||||
|
return
|
||||||
|
}
|
||||||
ws, err := wsUpgrade.Upgrade(c.Writer, c.Request, nil)
|
ws, err := wsUpgrade.Upgrade(c.Writer, c.Request, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ func (b *BaseApi) CreateRuntime(c *gin.Context) {
|
|||||||
// @Security ApiKeyAuth
|
// @Security ApiKeyAuth
|
||||||
// @Security Timestamp
|
// @Security Timestamp
|
||||||
// @Router /runtimes/del [post]
|
// @Router /runtimes/del [post]
|
||||||
// @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"删除运行环境 [name]","formatEN":"Delete runtime [name]"}
|
// @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"删除运行环境 [id]","formatEN":"Delete runtime [id]"}
|
||||||
func (b *BaseApi) DeleteRuntime(c *gin.Context) {
|
func (b *BaseApi) DeleteRuntime(c *gin.Context) {
|
||||||
var req request.RuntimeDelete
|
var req request.RuntimeDelete
|
||||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
@@ -81,6 +81,7 @@ func (b *BaseApi) DeleteRuntime(c *gin.Context) {
|
|||||||
// @Success 200 {array} dto.AppResource
|
// @Success 200 {array} dto.AppResource
|
||||||
// @Security ApiKeyAuth
|
// @Security ApiKeyAuth
|
||||||
// @Security Timestamp
|
// @Security Timestamp
|
||||||
|
// @Param id path integer true "id"
|
||||||
// @Router /runtimes/installed/delete/check/:id [get]
|
// @Router /runtimes/installed/delete/check/:id [get]
|
||||||
func (b *BaseApi) DeleteRuntimeCheck(c *gin.Context) {
|
func (b *BaseApi) DeleteRuntimeCheck(c *gin.Context) {
|
||||||
runTimeId, err := helper.GetIntParamByKey(c, "id")
|
runTimeId, err := helper.GetIntParamByKey(c, "id")
|
||||||
@@ -120,7 +121,7 @@ func (b *BaseApi) UpdateRuntime(c *gin.Context) {
|
|||||||
// @Tags Runtime
|
// @Tags Runtime
|
||||||
// @Summary Get runtime
|
// @Summary Get runtime
|
||||||
// @Accept json
|
// @Accept json
|
||||||
// @Param id path string true "request"
|
// @Param id path integer true "request"
|
||||||
// @Success 200 {object} response.RuntimeDTO
|
// @Success 200 {object} response.RuntimeDTO
|
||||||
// @Security ApiKeyAuth
|
// @Security ApiKeyAuth
|
||||||
// @Security Timestamp
|
// @Security Timestamp
|
||||||
@@ -168,7 +169,7 @@ func (b *BaseApi) GetNodePackageRunScript(c *gin.Context) {
|
|||||||
// @Security ApiKeyAuth
|
// @Security ApiKeyAuth
|
||||||
// @Security Timestamp
|
// @Security Timestamp
|
||||||
// @Router /runtimes/operate [post]
|
// @Router /runtimes/operate [post]
|
||||||
// @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"操作运行环境 [name]","formatEN":"Operate runtime [name]"}
|
// @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"操作运行环境 [id]","formatEN":"Operate runtime [id]"}
|
||||||
func (b *BaseApi) OperateRuntime(c *gin.Context) {
|
func (b *BaseApi) OperateRuntime(c *gin.Context) {
|
||||||
var req request.RuntimeOperate
|
var req request.RuntimeOperate
|
||||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
@@ -242,7 +243,7 @@ func (b *BaseApi) SyncStatus(c *gin.Context) {
|
|||||||
// @Tags Runtime
|
// @Tags Runtime
|
||||||
// @Summary Get php runtime extension
|
// @Summary Get php runtime extension
|
||||||
// @Accept json
|
// @Accept json
|
||||||
// @Param id path string true "request"
|
// @Param id path integer true "request"
|
||||||
// @Success 200 {object} response.PHPExtensionRes
|
// @Success 200 {object} response.PHPExtensionRes
|
||||||
// @Security ApiKeyAuth
|
// @Security ApiKeyAuth
|
||||||
// @Security Timestamp
|
// @Security Timestamp
|
||||||
|
|||||||
+130
-30
@@ -1,15 +1,12 @@
|
|||||||
package v2
|
package v2
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
|
||||||
|
|
||||||
"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
|
"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
|
||||||
"github.com/1Panel-dev/1Panel/agent/app/dto"
|
"github.com/1Panel-dev/1Panel/agent/app/dto"
|
||||||
"github.com/1Panel-dev/1Panel/agent/app/model"
|
"github.com/1Panel-dev/1Panel/agent/app/dto/request"
|
||||||
"github.com/1Panel-dev/1Panel/agent/global"
|
"github.com/1Panel-dev/1Panel/agent/global"
|
||||||
"github.com/1Panel-dev/1Panel/agent/utils/ssh"
|
"github.com/1Panel-dev/1Panel/agent/utils/ssh"
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
"github.com/pkg/errors"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// @Tags System Setting
|
// @Tags System Setting
|
||||||
@@ -27,6 +24,21 @@ func (b *BaseApi) GetSettingInfo(c *gin.Context) {
|
|||||||
helper.SuccessWithData(c, setting)
|
helper.SuccessWithData(c, setting)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// @Tags System Setting
|
||||||
|
// @Summary Get terminal AI setting info
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /settings/terminal/ai/search [post]
|
||||||
|
func (b *BaseApi) GetTerminalAISettingInfo(c *gin.Context) {
|
||||||
|
setting, err := settingService.GetTerminalAIInfo()
|
||||||
|
if err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.SuccessWithData(c, setting)
|
||||||
|
}
|
||||||
|
|
||||||
// @Tags System Setting
|
// @Tags System Setting
|
||||||
// @Summary Load system available status
|
// @Summary Load system available status
|
||||||
// @Success 200
|
// @Success 200
|
||||||
@@ -40,14 +52,14 @@ func (b *BaseApi) GetSystemAvailable(c *gin.Context) {
|
|||||||
// @Tags System Setting
|
// @Tags System Setting
|
||||||
// @Summary Update system setting
|
// @Summary Update system setting
|
||||||
// @Accept json
|
// @Accept json
|
||||||
// @Param request body dto.SettingUpdate true "request"
|
// @Param request body dto.AgentSettingUpdate true "request"
|
||||||
// @Success 200
|
// @Success 200
|
||||||
// @Security ApiKeyAuth
|
// @Security ApiKeyAuth
|
||||||
// @Security Timestamp
|
// @Security Timestamp
|
||||||
// @Router /settings/update [post]
|
// @Router /settings/update [post]
|
||||||
// @x-panel-log {"bodyKeys":["key","value"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改系统配置 [key] => [value]","formatEN":"update system setting [key] => [value]"}
|
// @x-panel-log {"bodyKeys":["key","value"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改系统配置 [key] => [value]","formatEN":"update system setting [key] => [value]"}
|
||||||
func (b *BaseApi) UpdateSetting(c *gin.Context) {
|
func (b *BaseApi) UpdateSetting(c *gin.Context) {
|
||||||
var req dto.SettingUpdate
|
var req dto.AgentSettingUpdate
|
||||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -59,6 +71,109 @@ func (b *BaseApi) UpdateSetting(c *gin.Context) {
|
|||||||
helper.Success(c)
|
helper.Success(c)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// @Tags System Setting
|
||||||
|
// @Summary Update terminal AI setting
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body dto.TerminalAIInfo true "request"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /settings/terminal/ai/update [post]
|
||||||
|
// @x-panel-log {"bodyKeys":["aiStatus","aiAccountId"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新终端 AI 设置 [aiStatus][aiAccountId]","formatEN":"update terminal AI setting [aiStatus][aiAccountId]"}
|
||||||
|
func (b *BaseApi) UpdateTerminalAISetting(c *gin.Context) {
|
||||||
|
var req dto.TerminalAIInfo
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := settingService.UpdateTerminalAI(req); err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.Success(c)
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Tags System Setting
|
||||||
|
// @Summary Get file manage AI setting info
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /settings/files/ai/search [post]
|
||||||
|
func (b *BaseApi) GetFileManageAISettingInfo(c *gin.Context) {
|
||||||
|
setting, err := settingService.GetFileManageAIInfo()
|
||||||
|
if err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.SuccessWithData(c, setting)
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Tags System Setting
|
||||||
|
// @Summary Update file manage AI setting
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body dto.FileManageAIInfo true "request"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /settings/files/ai/update [post]
|
||||||
|
// @x-panel-log {"bodyKeys":["aiStatus","aiAccountId"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新文件管理 AI 设置 [aiStatus][aiAccountId]","formatEN":"update file manage AI setting [aiStatus][aiAccountId]"}
|
||||||
|
func (b *BaseApi) UpdateFileManageAISetting(c *gin.Context) {
|
||||||
|
var req dto.FileManageAIInfo
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if err := settingService.UpdateFileManageAI(req); err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.Success(c)
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Tags System Setting
|
||||||
|
// @Summary Load file history setting info
|
||||||
|
// @Success 200 {object} response.FileHistorySettingInfo
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /settings/file-history/search [post]
|
||||||
|
func (b *BaseApi) GetFileHistorySettingInfo(c *gin.Context) {
|
||||||
|
setting, err := settingService.GetFileHistorySettingInfo()
|
||||||
|
if err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.SuccessWithData(c, setting)
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Tags System Setting
|
||||||
|
// @Summary Update file history setting
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body request.FileHistorySettingUpdate true "request"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /settings/file-history/update [post]
|
||||||
|
func (b *BaseApi) UpdateFileHistorySetting(c *gin.Context) {
|
||||||
|
var req request.FileHistorySettingUpdate
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if err := settingService.UpdateFileHistorySetting(req); err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.Success(c)
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Tags System Setting
|
||||||
|
// @Summary Load website dir
|
||||||
|
// @Success 200 {string} path
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /settings/website/dir [get]
|
||||||
|
func (b *BaseApi) LoadWebsiteDir(c *gin.Context) {
|
||||||
|
helper.SuccessWithData(c, settingService.GetWebsiteDir())
|
||||||
|
}
|
||||||
|
|
||||||
// @Tags System Setting
|
// @Tags System Setting
|
||||||
// @Summary Load local backup dir
|
// @Summary Load local backup dir
|
||||||
// @Success 200 {string} path
|
// @Success 200 {string} path
|
||||||
@@ -79,6 +194,12 @@ func (b *BaseApi) LoadLocalConn(c *gin.Context) {
|
|||||||
helper.SuccessWithData(c, settingService.GetLocalConn())
|
helper.SuccessWithData(c, settingService.GetLocalConn())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// @Tags System Setting
|
||||||
|
// @Summary Check local conn
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /settings/ssh/check [post]
|
||||||
func (b *BaseApi) CheckLocalConn(c *gin.Context) {
|
func (b *BaseApi) CheckLocalConn(c *gin.Context) {
|
||||||
client, err := loadLocalConn()
|
client, err := loadLocalConn()
|
||||||
if err == nil && client != nil {
|
if err == nil && client != nil {
|
||||||
@@ -94,7 +215,7 @@ func (b *BaseApi) CheckLocalConn(c *gin.Context) {
|
|||||||
// @Success 200
|
// @Success 200
|
||||||
// @Security ApiKeyAuth
|
// @Security ApiKeyAuth
|
||||||
// @Security Timestamp
|
// @Security Timestamp
|
||||||
// @Router /settings/ssh/conn/default [post]
|
// @Router /settings/ssh/default [post]
|
||||||
// @x-panel-log {"bodyKeys":["defaultConn"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"本地终端默认连接 [defaultConn]","formatEN":"update system default conn [defaultConn]"}
|
// @x-panel-log {"bodyKeys":["defaultConn"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"本地终端默认连接 [defaultConn]","formatEN":"update system default conn [defaultConn]"}
|
||||||
func (b *BaseApi) SetDefaultIsConn(c *gin.Context) {
|
func (b *BaseApi) SetDefaultIsConn(c *gin.Context) {
|
||||||
var req dto.SSHDefaultConn
|
var req dto.SSHDefaultConn
|
||||||
@@ -144,12 +265,8 @@ func (b *BaseApi) SaveLocalConn(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func loadLocalConn() (*ssh.SSHClient, error) {
|
func loadLocalConn() (*ssh.SSHClient, error) {
|
||||||
connInfoInDB := settingService.GetSettingByKey("LocalSSHConn")
|
connInDB, err := settingService.GetLocalConnForSSH()
|
||||||
if len(connInfoInDB) == 0 {
|
if err != nil {
|
||||||
return nil, errors.New("no such ssh conn info in db!")
|
|
||||||
}
|
|
||||||
var connInDB model.LocalConnInfo
|
|
||||||
if err := json.Unmarshal([]byte(connInfoInDB), &connInDB); err != nil {
|
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
sshInfo := ssh.ConnInfo{
|
sshInfo := ssh.ConnInfo{
|
||||||
@@ -164,23 +281,6 @@ func loadLocalConn() (*ssh.SSHClient, error) {
|
|||||||
return ssh.NewClient(sshInfo)
|
return ssh.NewClient(sshInfo)
|
||||||
}
|
}
|
||||||
|
|
||||||
// @Tags System Setting
|
|
||||||
// @Summary Load system setting by key
|
|
||||||
// @Param key path string true "key"
|
|
||||||
// @Success 200 {object} dto.SettingInfo
|
|
||||||
// @Security ApiKeyAuth
|
|
||||||
// @Security Timestamp
|
|
||||||
// @Router /settings/get/{key} [get]
|
|
||||||
func (b *BaseApi) GetSettingByKey(c *gin.Context) {
|
|
||||||
key := c.Param("key")
|
|
||||||
if len(key) == 0 {
|
|
||||||
helper.BadRequest(c, errors.New("key is empty"))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
value := settingService.GetSettingByKey(key)
|
|
||||||
helper.SuccessWithData(c, value)
|
|
||||||
}
|
|
||||||
|
|
||||||
// @Tags System Setting
|
// @Tags System Setting
|
||||||
// @Summary Save common description
|
// @Summary Save common description
|
||||||
// @Accept json
|
// @Accept json
|
||||||
|
|||||||
@@ -249,14 +249,14 @@ func (b *BaseApi) LoadSSHFile(c *gin.Context) {
|
|||||||
// @Tags SSH
|
// @Tags SSH
|
||||||
// @Summary Update host SSH setting by file
|
// @Summary Update host SSH setting by file
|
||||||
// @Accept json
|
// @Accept json
|
||||||
// @Param request body dto.SSHConf true "request"
|
// @Param request body dto.SSHConfUpdate true "request"
|
||||||
// @Success 200
|
// @Success 200
|
||||||
// @Security ApiKeyAuth
|
// @Security ApiKeyAuth
|
||||||
// @Security Timestamp
|
// @Security Timestamp
|
||||||
// @Router /hosts/ssh/file/update [post]
|
// @Router /hosts/ssh/file/update [post]
|
||||||
// @x-panel-log {"bodyKeys":["key"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改 SSH 配置文件 [key]","formatEN":"update SSH conf [key]"}
|
// @x-panel-log {"bodyKeys":["key"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改 SSH 配置文件 [key]","formatEN":"update SSH conf [key]"}
|
||||||
func (b *BaseApi) UpdateSSHByFile(c *gin.Context) {
|
func (b *BaseApi) UpdateSSHByFile(c *gin.Context) {
|
||||||
var req dto.SettingUpdate
|
var req dto.SSHConfUpdate
|
||||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,8 @@ package v2
|
|||||||
import (
|
import (
|
||||||
"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
|
"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
|
||||||
"github.com/1Panel-dev/1Panel/agent/app/dto"
|
"github.com/1Panel-dev/1Panel/agent/app/dto"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/dto/request"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/dto/response"
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -30,6 +32,31 @@ func (b *BaseApi) PageTasks(c *gin.Context) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// @Tags TaskLog
|
||||||
|
// @Summary Read task log by Line
|
||||||
|
// @Param request body request.TaskLogReadReq true "request"
|
||||||
|
// @Success 200 {object} response.FileLineContent
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /logs/tasks/read [post]
|
||||||
|
func (b *BaseApi) ReadTaskLogByLine(c *gin.Context) {
|
||||||
|
var req request.TaskLogReadReq
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
var res *response.FileLineContent
|
||||||
|
res, err := taskService.ReadByLine(req)
|
||||||
|
if err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if res.TotalLines > 100 {
|
||||||
|
helper.SuccessWithDataGzipped(c, res)
|
||||||
|
} else {
|
||||||
|
helper.SuccessWithData(c, res)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// @Tags TaskLog
|
// @Tags TaskLog
|
||||||
// @Summary Get the number of executing tasks
|
// @Summary Get the number of executing tasks
|
||||||
// @Success 200 {integer} int64
|
// @Success 200 {integer} int64
|
||||||
|
|||||||
@@ -6,6 +6,14 @@ import (
|
|||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// @Tags TensorRT LLM
|
||||||
|
// @Summary Page TensorRT LLMs
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body request.TensorRTLLMSearch true "request"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /ai/tensorrt/search [post]
|
||||||
func (b *BaseApi) PageTensorRTLLMs(c *gin.Context) {
|
func (b *BaseApi) PageTensorRTLLMs(c *gin.Context) {
|
||||||
var req request.TensorRTLLMSearch
|
var req request.TensorRTLLMSearch
|
||||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
@@ -15,6 +23,15 @@ func (b *BaseApi) PageTensorRTLLMs(c *gin.Context) {
|
|||||||
helper.SuccessWithData(c, list)
|
helper.SuccessWithData(c, list)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// @Tags TensorRT LLM
|
||||||
|
// @Summary Create TensorRT LLM
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body request.TensorRTLLMCreate true "request"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /ai/tensorrt/create [post]
|
||||||
|
// @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建 TensorRT LLM [name]","formatEN":"create TensorRT LLM [name]"}
|
||||||
func (b *BaseApi) CreateTensorRTLLM(c *gin.Context) {
|
func (b *BaseApi) CreateTensorRTLLM(c *gin.Context) {
|
||||||
var req request.TensorRTLLMCreate
|
var req request.TensorRTLLMCreate
|
||||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
@@ -28,6 +45,15 @@ func (b *BaseApi) CreateTensorRTLLM(c *gin.Context) {
|
|||||||
helper.Success(c)
|
helper.Success(c)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// @Tags TensorRT LLM
|
||||||
|
// @Summary Update TensorRT LLM
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body request.TensorRTLLMUpdate true "request"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /ai/tensorrt/update [post]
|
||||||
|
// @x-panel-log {"bodyKeys":["id","name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新 TensorRT LLM [id][name]","formatEN":"update TensorRT LLM [id][name]"}
|
||||||
func (b *BaseApi) UpdateTensorRTLLM(c *gin.Context) {
|
func (b *BaseApi) UpdateTensorRTLLM(c *gin.Context) {
|
||||||
var req request.TensorRTLLMUpdate
|
var req request.TensorRTLLMUpdate
|
||||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
@@ -41,6 +67,15 @@ func (b *BaseApi) UpdateTensorRTLLM(c *gin.Context) {
|
|||||||
helper.Success(c)
|
helper.Success(c)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// @Tags TensorRT LLM
|
||||||
|
// @Summary Delete TensorRT LLM
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body request.TensorRTLLMDelete true "request"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /ai/tensorrt/delete [post]
|
||||||
|
// @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"删除 TensorRT LLM [id]","formatEN":"delete TensorRT LLM [id]"}
|
||||||
func (b *BaseApi) DeleteTensorRTLLM(c *gin.Context) {
|
func (b *BaseApi) DeleteTensorRTLLM(c *gin.Context) {
|
||||||
var req request.TensorRTLLMDelete
|
var req request.TensorRTLLMDelete
|
||||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
@@ -54,6 +89,15 @@ func (b *BaseApi) DeleteTensorRTLLM(c *gin.Context) {
|
|||||||
helper.Success(c)
|
helper.Success(c)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// @Tags TensorRT LLM
|
||||||
|
// @Summary Operate TensorRT LLM
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body request.TensorRTLLMOperate true "request"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /ai/tensorrt/operate [post]
|
||||||
|
// @x-panel-log {"bodyKeys":["id","operate"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"操作 TensorRT LLM [id][operate]","formatEN":"operate TensorRT LLM [id][operate]"}
|
||||||
func (b *BaseApi) OperateTensorRTLLM(c *gin.Context) {
|
func (b *BaseApi) OperateTensorRTLLM(c *gin.Context) {
|
||||||
var req request.TensorRTLLMOperate
|
var req request.TensorRTLLMOperate
|
||||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
|||||||
+157
-82
@@ -8,102 +8,65 @@ import (
|
|||||||
"strconv"
|
"strconv"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
|
||||||
"github.com/1Panel-dev/1Panel/agent/app/dto"
|
"github.com/1Panel-dev/1Panel/agent/app/dto"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/model"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/service"
|
||||||
"github.com/1Panel-dev/1Panel/agent/global"
|
"github.com/1Panel-dev/1Panel/agent/global"
|
||||||
"github.com/1Panel-dev/1Panel/agent/utils/cmd"
|
"github.com/1Panel-dev/1Panel/agent/utils/cmd"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/utils/ssh"
|
||||||
"github.com/1Panel-dev/1Panel/agent/utils/terminal"
|
"github.com/1Panel-dev/1Panel/agent/utils/terminal"
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
"github.com/gorilla/websocket"
|
"github.com/gorilla/websocket"
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
)
|
)
|
||||||
|
|
||||||
func (b *BaseApi) WsSSH(c *gin.Context) {
|
// @Tags Terminal
|
||||||
wsConn, err := upGrader.Upgrade(c.Writer, c.Request, nil)
|
// @Summary Ws local terminal
|
||||||
if err != nil {
|
// @Param command query string false "command"
|
||||||
global.LOG.Errorf("gin context http handler failed, err: %v", err)
|
// @Success 200
|
||||||
return
|
// @Security ApiKeyAuth
|
||||||
}
|
// @Security Timestamp
|
||||||
defer wsConn.Close()
|
// @Router /hosts/terminal/local [get]
|
||||||
|
func (b *BaseApi) WsLocalTerminal(c *gin.Context) {
|
||||||
if global.CONF.Base.IsDemo {
|
b.runSSHSession(c, loadLocalConn, c.DefaultQuery("command", ""))
|
||||||
if wshandleError(wsConn, errors.New(" demo server, prohibit this operation!")) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
cols, err := strconv.Atoi(c.DefaultQuery("cols", "80"))
|
|
||||||
if wshandleError(wsConn, errors.WithMessage(err, "invalid param cols in request")) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
rows, err := strconv.Atoi(c.DefaultQuery("rows", "40"))
|
|
||||||
if wshandleError(wsConn, errors.WithMessage(err, "invalid param rows in request")) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
client, err := loadLocalConn()
|
|
||||||
if wshandleError(wsConn, errors.WithMessage(err, "failed to set up the connection. Please check the host information")) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
defer client.Close()
|
|
||||||
command := c.DefaultQuery("command", "")
|
|
||||||
sws, err := terminal.NewLogicSshWsSession(cols, rows, client.Client, wsConn, command)
|
|
||||||
if wshandleError(wsConn, err) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
defer sws.Close()
|
|
||||||
|
|
||||||
quitChan := make(chan bool, 3)
|
|
||||||
sws.Start(quitChan)
|
|
||||||
go sws.Wait(quitChan)
|
|
||||||
|
|
||||||
<-quitChan
|
|
||||||
|
|
||||||
dt := time.Now().Add(time.Second)
|
|
||||||
_ = wsConn.WriteControl(websocket.CloseMessage, nil, dt)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (b *BaseApi) ContainerWsSSH(c *gin.Context) {
|
// @Tags Terminal
|
||||||
wsConn, err := upGrader.Upgrade(c.Writer, c.Request, nil)
|
// @Summary Ws host SSH
|
||||||
if err != nil {
|
// @Param id query integer false "id"
|
||||||
global.LOG.Errorf("gin context http handler failed, err: %v", err)
|
// @Param command query string false "command"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /hosts/terminal/ssh [get]
|
||||||
|
func (b *BaseApi) WsHostSSH(c *gin.Context) {
|
||||||
|
b.runSSHSession(c, func() (*ssh.SSHClient, error) {
|
||||||
|
hostID, _ := strconv.Atoi(c.DefaultQuery("id", "0"))
|
||||||
|
if hostID <= 0 {
|
||||||
|
return nil, errors.New("missing host id")
|
||||||
|
}
|
||||||
|
host, err := service.GetHostInfo(uint(hostID))
|
||||||
|
return newHostSSHClient(host, err)
|
||||||
|
}, c.DefaultQuery("command", ""))
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Tags Terminal
|
||||||
|
// @Summary Ws container terminal
|
||||||
|
// @Param cols query integer false "cols"
|
||||||
|
// @Param rows query integer false "rows"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /hosts/terminal/container [get]
|
||||||
|
func (b *BaseApi) WsContainerTerminal(c *gin.Context) {
|
||||||
|
wsConn, cols, rows, ok := prepareTerminalSession(c)
|
||||||
|
if !ok {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
defer wsConn.Close()
|
defer wsConn.Close()
|
||||||
|
|
||||||
if global.CONF.Base.IsDemo {
|
slave, err := loadContainerTerminalCommand(c)
|
||||||
if wshandleError(wsConn, errors.New(" demo server, prohibit this operation!")) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
cols, err := strconv.Atoi(c.DefaultQuery("cols", "80"))
|
|
||||||
if wshandleError(wsConn, errors.WithMessage(err, "invalid param cols in request")) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
rows, err := strconv.Atoi(c.DefaultQuery("rows", "40"))
|
|
||||||
if wshandleError(wsConn, errors.WithMessage(err, "invalid param rows in request")) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
source := c.Query("source")
|
|
||||||
var initCmd []string
|
|
||||||
switch source {
|
|
||||||
case "redis", "redis-cluster":
|
|
||||||
initCmd, err = loadRedisInitCmd(c, source)
|
|
||||||
case "ollama":
|
|
||||||
initCmd, err = loadOllamaInitCmd(c)
|
|
||||||
case "container":
|
|
||||||
initCmd, err = loadContainerInitCmd(c)
|
|
||||||
case "database":
|
|
||||||
initCmd, err = loadDatabaseInitCmd(c)
|
|
||||||
default:
|
|
||||||
if wshandleError(wsConn, fmt.Errorf("not support such source %s", source)) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if wshandleError(wsConn, err) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
slave, err := terminal.NewCommand("docker", initCmd...)
|
|
||||||
if wshandleError(wsConn, err) {
|
if wshandleError(wsConn, err) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -121,10 +84,112 @@ func (b *BaseApi) ContainerWsSSH(c *gin.Context) {
|
|||||||
<-quitChan
|
<-quitChan
|
||||||
|
|
||||||
global.LOG.Info("websocket finished")
|
global.LOG.Info("websocket finished")
|
||||||
|
closeTerminalConn(wsConn)
|
||||||
|
}
|
||||||
|
|
||||||
|
func prepareTerminalSession(c *gin.Context) (*websocket.Conn, int, int, bool) {
|
||||||
|
if !websocket.IsWebSocketUpgrade(c.Request) {
|
||||||
|
helper.Success(c)
|
||||||
|
return nil, 0, 0, false
|
||||||
|
}
|
||||||
|
wsConn, err := upGrader.Upgrade(c.Writer, c.Request, nil)
|
||||||
|
if err != nil {
|
||||||
|
global.LOG.Errorf("gin context http handler failed, err: %v", err)
|
||||||
|
return nil, 0, 0, false
|
||||||
|
}
|
||||||
|
|
||||||
|
if global.CONF.Base.IsDemo {
|
||||||
|
if wshandleError(wsConn, errors.New(" demo server, prohibit this operation!")) {
|
||||||
|
return nil, 0, 0, false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
cols, err := strconv.Atoi(c.DefaultQuery("cols", "80"))
|
||||||
|
if wshandleError(wsConn, errors.WithMessage(err, "invalid param cols in request")) {
|
||||||
|
return nil, 0, 0, false
|
||||||
|
}
|
||||||
|
rows, err := strconv.Atoi(c.DefaultQuery("rows", "40"))
|
||||||
|
if wshandleError(wsConn, errors.WithMessage(err, "invalid param rows in request")) {
|
||||||
|
return nil, 0, 0, false
|
||||||
|
}
|
||||||
|
return wsConn, cols, rows, true
|
||||||
|
}
|
||||||
|
|
||||||
|
func (b *BaseApi) runSSHSession(c *gin.Context, connect func() (*ssh.SSHClient, error), command string) {
|
||||||
|
wsConn, cols, rows, ok := prepareTerminalSession(c)
|
||||||
|
if !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer wsConn.Close()
|
||||||
|
|
||||||
|
client, clientErr := connect()
|
||||||
|
if wshandleError(wsConn, errors.WithMessage(clientErr, "failed to set up the connection. Please check the host information")) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer client.Close()
|
||||||
|
|
||||||
|
sws, err := terminal.NewLogicSshWsSession(cols, rows, client.Client, wsConn, command)
|
||||||
|
if wshandleError(wsConn, err) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer sws.Close()
|
||||||
|
|
||||||
|
quitChan := make(chan bool, 3)
|
||||||
|
sws.Start(quitChan)
|
||||||
|
go sws.Wait(quitChan)
|
||||||
|
|
||||||
|
<-quitChan
|
||||||
|
|
||||||
|
closeTerminalConn(wsConn)
|
||||||
|
}
|
||||||
|
|
||||||
|
func closeTerminalConn(wsConn *websocket.Conn) {
|
||||||
dt := time.Now().Add(time.Second)
|
dt := time.Now().Add(time.Second)
|
||||||
_ = wsConn.WriteControl(websocket.CloseMessage, nil, dt)
|
_ = wsConn.WriteControl(websocket.CloseMessage, nil, dt)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func newHostSSHClient(host *model.Host, err error) (*ssh.SSHClient, error) {
|
||||||
|
if err != nil {
|
||||||
|
return nil, errors.WithMessage(err, "load host info by id failed")
|
||||||
|
}
|
||||||
|
connInfo := ssh.ConnInfo{
|
||||||
|
Addr: host.Addr,
|
||||||
|
Port: int(host.Port),
|
||||||
|
User: host.User,
|
||||||
|
AuthMode: host.AuthMode,
|
||||||
|
Password: host.Password,
|
||||||
|
PrivateKey: []byte(host.PrivateKey),
|
||||||
|
}
|
||||||
|
if len(host.PassPhrase) != 0 {
|
||||||
|
connInfo.PassPhrase = []byte(host.PassPhrase)
|
||||||
|
}
|
||||||
|
return ssh.NewClient(connInfo)
|
||||||
|
}
|
||||||
|
|
||||||
|
func loadContainerTerminalCommand(c *gin.Context) (*terminal.LocalCommand, error) {
|
||||||
|
source := c.Query("source")
|
||||||
|
var (
|
||||||
|
initCmd []string
|
||||||
|
err error
|
||||||
|
)
|
||||||
|
switch source {
|
||||||
|
case "redis", "redis-cluster":
|
||||||
|
initCmd, err = loadRedisInitCmd(c, source)
|
||||||
|
case "ollama":
|
||||||
|
initCmd, err = loadOllamaInitCmd(c)
|
||||||
|
case "container":
|
||||||
|
initCmd, err = loadContainerInitCmd(c)
|
||||||
|
case "database":
|
||||||
|
initCmd, err = loadDatabaseInitCmd(c)
|
||||||
|
default:
|
||||||
|
return nil, fmt.Errorf("not support such source %s", source)
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return terminal.NewCommand("docker", initCmd...)
|
||||||
|
}
|
||||||
|
|
||||||
func loadRedisInitCmd(c *gin.Context, redisType string) ([]string, error) {
|
func loadRedisInitCmd(c *gin.Context, redisType string) ([]string, error) {
|
||||||
name := c.Query("name")
|
name := c.Query("name")
|
||||||
from := c.Query("from")
|
from := c.Query("from")
|
||||||
@@ -187,19 +252,29 @@ func loadContainerInitCmd(c *gin.Context) ([]string, error) {
|
|||||||
func loadDatabaseInitCmd(c *gin.Context) ([]string, error) {
|
func loadDatabaseInitCmd(c *gin.Context) ([]string, error) {
|
||||||
database := c.Query("database")
|
database := c.Query("database")
|
||||||
databaseType := c.Query("databaseType")
|
databaseType := c.Query("databaseType")
|
||||||
if len(database) == 0 || len(databaseType) == 0 {
|
if len(databaseType) == 0 {
|
||||||
return nil, fmt.Errorf("error param of database: %s or database type: %s", database, databaseType)
|
return nil, fmt.Errorf("error param of database: %s or database type: %s", database, databaseType)
|
||||||
}
|
}
|
||||||
databaseConn, err := appInstallService.LoadConnInfo(dto.OperationWithNameAndType{Type: databaseType, Name: database})
|
databaseConn, err := appInstallService.LoadConnInfo(dto.OperationWithNameAndType{Type: databaseType, Name: database})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("no such database in db, err: %v", err)
|
return nil, fmt.Errorf("no such database in db, err: %v", err)
|
||||||
}
|
}
|
||||||
|
if len(databaseConn.ContainerName) == 0 {
|
||||||
|
return nil, fmt.Errorf("no such database container for database: %s or database type: %s", database, databaseType)
|
||||||
|
}
|
||||||
commands := []string{"exec", "-it", databaseConn.ContainerName}
|
commands := []string{"exec", "-it", databaseConn.ContainerName}
|
||||||
switch databaseType {
|
switch databaseType {
|
||||||
case "mysql", "mysql-cluster":
|
case "mysql", "mysql-cluster":
|
||||||
commands = append(commands, []string{"mysql", "-uroot", "-p" + databaseConn.Password}...)
|
commands = append(commands, []string{"mysql", "-uroot", "-p" + databaseConn.Password}...)
|
||||||
case "mariadb":
|
case "mariadb":
|
||||||
commands = append(commands, []string{"mariadb", "-uroot", "-p" + databaseConn.Password}...)
|
commands = append(commands, []string{"mariadb", "-uroot", "-p" + databaseConn.Password}...)
|
||||||
|
case "mongodb":
|
||||||
|
commands = append(commands, []string{
|
||||||
|
"mongosh",
|
||||||
|
"--username", databaseConn.Username,
|
||||||
|
"--password", databaseConn.Password,
|
||||||
|
"--authenticationDatabase", "admin",
|
||||||
|
}...)
|
||||||
case "postgresql", "postgresql-cluster":
|
case "postgresql", "postgresql-cluster":
|
||||||
commands = []string{"exec", "-e", fmt.Sprintf("PGPASSWORD=%s", databaseConn.Password), "-it", databaseConn.ContainerName, "psql", "-t", "-U", databaseConn.Username}
|
commands = []string{"exec", "-e", fmt.Sprintf("PGPASSWORD=%s", databaseConn.Password), "-it", databaseConn.ContainerName, "psql", "-t", "-U", databaseConn.Username}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -181,6 +181,7 @@ func (b *BaseApi) GetWebsite(c *gin.Context) {
|
|||||||
// @Success 200 {object} response.FileInfo
|
// @Success 200 {object} response.FileInfo
|
||||||
// @Security ApiKeyAuth
|
// @Security ApiKeyAuth
|
||||||
// @Security Timestamp
|
// @Security Timestamp
|
||||||
|
// @Param type path string true "type"
|
||||||
// @Router /websites/:id/config/:type [get]
|
// @Router /websites/:id/config/:type [get]
|
||||||
func (b *BaseApi) GetWebsiteNginx(c *gin.Context) {
|
func (b *BaseApi) GetWebsiteNginx(c *gin.Context) {
|
||||||
id, err := helper.GetParamID(c)
|
id, err := helper.GetParamID(c)
|
||||||
@@ -269,6 +270,7 @@ func (b *BaseApi) GetHTTPSConfig(c *gin.Context) {
|
|||||||
// @Success 200 {object} response.WebsiteHTTPS
|
// @Success 200 {object} response.WebsiteHTTPS
|
||||||
// @Security ApiKeyAuth
|
// @Security ApiKeyAuth
|
||||||
// @Security Timestamp
|
// @Security Timestamp
|
||||||
|
// @Param id path string true "id"
|
||||||
// @Router /websites/:id/https [post]
|
// @Router /websites/:id/https [post]
|
||||||
// @x-panel-log {"bodyKeys":["websiteId"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"websiteId","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"更新网站 [domain] https 配置","formatEN":"Update website https [domain] conf"}
|
// @x-panel-log {"bodyKeys":["websiteId"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"websiteId","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"更新网站 [domain] https 配置","formatEN":"Update website https [domain] conf"}
|
||||||
func (b *BaseApi) UpdateHTTPSConfig(c *gin.Context) {
|
func (b *BaseApi) UpdateHTTPSConfig(c *gin.Context) {
|
||||||
@@ -330,25 +332,45 @@ func (b *BaseApi) UpdateWebsiteNginxConfig(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// @Tags Website
|
// @Tags Website
|
||||||
// @Summary Operate website log
|
// @Summary Get website log
|
||||||
// @Accept json
|
// @Accept json
|
||||||
// @Param request body request.WebsiteLogReq true "request"
|
// @Param request body request.WebsiteLogSearchReq true "request"
|
||||||
// @Success 200 {object} response.WebsiteLog
|
// @Success 200 {object} response.WebsiteLog
|
||||||
// @Security ApiKeyAuth
|
// @Security ApiKeyAuth
|
||||||
// @Security Timestamp
|
// @Security Timestamp
|
||||||
// @Router /websites/log [post]
|
// @Router /websites/log/search [post]
|
||||||
|
func (b *BaseApi) GetWebsiteLog(c *gin.Context) {
|
||||||
|
var req request.WebsiteLogSearchReq
|
||||||
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
res, err := websiteService.GetWebsiteLog(req)
|
||||||
|
if err != nil {
|
||||||
|
helper.InternalServer(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
helper.SuccessWithData(c, res)
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Tags Website
|
||||||
|
// @Summary Operate website log
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body request.WebsiteLogReq true "request"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /websites/log/operate [post]
|
||||||
// @x-panel-log {"bodyKeys":["id", "operate"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"[domain][operate] 日志","formatEN":"[domain][operate] logs"}
|
// @x-panel-log {"bodyKeys":["id", "operate"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"[domain][operate] 日志","formatEN":"[domain][operate] logs"}
|
||||||
func (b *BaseApi) OpWebsiteLog(c *gin.Context) {
|
func (b *BaseApi) OpWebsiteLog(c *gin.Context) {
|
||||||
var req request.WebsiteLogReq
|
var req request.WebsiteLogReq
|
||||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
res, err := websiteService.OpWebsiteLog(req)
|
if err := websiteService.OpWebsiteLog(req); err != nil {
|
||||||
if err != nil {
|
|
||||||
helper.InternalServer(c, err)
|
helper.InternalServer(c, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
helper.SuccessWithData(c, res)
|
helper.Success(c)
|
||||||
}
|
}
|
||||||
|
|
||||||
// @Tags Website
|
// @Tags Website
|
||||||
@@ -799,6 +821,7 @@ func (b *BaseApi) GetDirConfig(c *gin.Context) {
|
|||||||
// @Success 200 {object} response.WebsiteHtmlRes
|
// @Success 200 {object} response.WebsiteHtmlRes
|
||||||
// @Security ApiKeyAuth
|
// @Security ApiKeyAuth
|
||||||
// @Security Timestamp
|
// @Security Timestamp
|
||||||
|
// @Param type path string true "type"
|
||||||
// @Router /websites/default/html/:type [get]
|
// @Router /websites/default/html/:type [get]
|
||||||
func (b *BaseApi) GetDefaultHtml(c *gin.Context) {
|
func (b *BaseApi) GetDefaultHtml(c *gin.Context) {
|
||||||
resourceType, err := helper.GetStrParamByKey(c, "type")
|
resourceType, err := helper.GetStrParamByKey(c, "type")
|
||||||
@@ -838,11 +861,11 @@ func (b *BaseApi) UpdateDefaultHtml(c *gin.Context) {
|
|||||||
// @Tags Website
|
// @Tags Website
|
||||||
// @Summary Get website upstreams
|
// @Summary Get website upstreams
|
||||||
// @Accept json
|
// @Accept json
|
||||||
// @Param request body request.WebsiteCommonReq true "request"
|
// @Param id path integer true "id"
|
||||||
// @Success 200 {array} dto.NginxUpstream
|
// @Success 200 {array} dto.NginxUpstream
|
||||||
// @Security ApiKeyAuth
|
// @Security ApiKeyAuth
|
||||||
// @Security Timestamp
|
// @Security Timestamp
|
||||||
// @Router /websites/lbs [get]
|
// @Router /websites/{id}/lbs [get]
|
||||||
func (b *BaseApi) GetLoadBalances(c *gin.Context) {
|
func (b *BaseApi) GetLoadBalances(c *gin.Context) {
|
||||||
id, err := helper.GetParamID(c)
|
id, err := helper.GetParamID(c)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -937,6 +960,15 @@ func (b *BaseApi) UpdateLoadBalanceFile(c *gin.Context) {
|
|||||||
helper.Success(c)
|
helper.Success(c)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// @Tags Website
|
||||||
|
// @Summary Change website group
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body dto.UpdateGroup true "request"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /websites/group/change [post]
|
||||||
|
// @x-panel-log {"bodyKeys":["group","newGroup"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"网站分组 [group] 迁移到 [newGroup]","formatEN":"change website group [group] to [newGroup]"}
|
||||||
func (b *BaseApi) ChangeWebsiteGroup(c *gin.Context) {
|
func (b *BaseApi) ChangeWebsiteGroup(c *gin.Context) {
|
||||||
var req dto.UpdateGroup
|
var req dto.UpdateGroup
|
||||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
@@ -969,6 +1001,7 @@ func (b *BaseApi) UpdateProxyCache(c *gin.Context) {
|
|||||||
helper.Success(c)
|
helper.Success(c)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// @Tags Website
|
||||||
// @Summary Get website proxy cache config
|
// @Summary Get website proxy cache config
|
||||||
// @Accept json
|
// @Accept json
|
||||||
// @Param id path int true "id"
|
// @Param id path int true "id"
|
||||||
@@ -1295,7 +1328,7 @@ func (b *BaseApi) UpdateStreamConfig(c *gin.Context) {
|
|||||||
// @Success 200
|
// @Success 200
|
||||||
// @Security ApiKeyAuth
|
// @Security ApiKeyAuth
|
||||||
// @Security Timestamp
|
// @Security Timestamp
|
||||||
// @Router /websites/batch/https [post]
|
// @Router /websites/batch/ssl [post]
|
||||||
func (b *BaseApi) BatchSetHttps(c *gin.Context) {
|
func (b *BaseApi) BatchSetHttps(c *gin.Context) {
|
||||||
var req request.BatchWebsiteHttps
|
var req request.BatchWebsiteHttps
|
||||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
|||||||
@@ -333,6 +333,15 @@ func (b *BaseApi) DownloadWebsiteSSL(c *gin.Context) {
|
|||||||
http.ServeContent(c.Writer, c.Request, info.Name(), info.ModTime(), file)
|
http.ServeContent(c.Writer, c.Request, info.Name(), info.ModTime(), file)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// @Tags Website SSL
|
||||||
|
// @Summary Import master SSL
|
||||||
|
// @Accept json
|
||||||
|
// @Param request body model.WebsiteSSL true "request"
|
||||||
|
// @Success 200
|
||||||
|
// @Security ApiKeyAuth
|
||||||
|
// @Security Timestamp
|
||||||
|
// @Router /websites/ssl/import [post]
|
||||||
|
// @x-panel-log {"bodyKeys":["primaryDomain"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"导入主节点证书 [primaryDomain]","formatEN":"import master SSL [primaryDomain]"}
|
||||||
func (b *BaseApi) ImportMasterSSL(c *gin.Context) {
|
func (b *BaseApi) ImportMasterSSL(c *gin.Context) {
|
||||||
var req model.WebsiteSSL
|
var req model.WebsiteSSL
|
||||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||||
|
|||||||
+615
-133
@@ -3,59 +3,138 @@ package dto
|
|||||||
import "time"
|
import "time"
|
||||||
|
|
||||||
type AgentCreateReq struct {
|
type AgentCreateReq struct {
|
||||||
Name string `json:"name" validate:"required"`
|
Name string `json:"name" validate:"required"`
|
||||||
AppVersion string `json:"appVersion" validate:"required"`
|
Remark string `json:"remark"`
|
||||||
WebUIPort int `json:"webUIPort" validate:"required"`
|
AppVersion string `json:"appVersion" validate:"required"`
|
||||||
BridgePort int `json:"bridgePort"`
|
WebUIPort int `json:"webUIPort" validate:"required,min=1,max=65535"`
|
||||||
AgentType string `json:"agentType"`
|
BridgePort int `json:"bridgePort"`
|
||||||
Provider string `json:"provider"`
|
AllowedOrigins []string `json:"allowedOrigins"`
|
||||||
Model string `json:"model"`
|
AgentType string `json:"agentType" validate:"required,oneof=openclaw copaw hermes-agent"`
|
||||||
APIType string `json:"apiType"`
|
Model string `json:"model"`
|
||||||
MaxTokens int `json:"maxTokens"`
|
AccountID uint `json:"accountId"`
|
||||||
ContextWindow int `json:"contextWindow"`
|
Token string `json:"token"`
|
||||||
AccountID uint `json:"accountId"`
|
TaskID string `json:"taskID"`
|
||||||
APIKey string `json:"apiKey"`
|
Advanced bool `json:"advanced"`
|
||||||
BaseURL string `json:"baseURL"`
|
ContainerName string `json:"containerName"`
|
||||||
Token string `json:"token"`
|
AllowPort bool `json:"allowPort"`
|
||||||
TaskID string `json:"taskID"`
|
SpecifyIP string `json:"specifyIP"`
|
||||||
Advanced bool `json:"advanced"`
|
RestartPolicy string `json:"restartPolicy"`
|
||||||
ContainerName string `json:"containerName"`
|
CpuQuota float64 `json:"cpuQuota"`
|
||||||
AllowPort bool `json:"allowPort"`
|
MemoryLimit float64 `json:"memoryLimit"`
|
||||||
SpecifyIP string `json:"specifyIP"`
|
MemoryUnit string `json:"memoryUnit"`
|
||||||
RestartPolicy string `json:"restartPolicy"`
|
PullImage bool `json:"pullImage"`
|
||||||
CpuQuota float64 `json:"cpuQuota"`
|
EditCompose bool `json:"editCompose"`
|
||||||
MemoryLimit float64 `json:"memoryLimit"`
|
DockerCompose string `json:"dockerCompose"`
|
||||||
MemoryUnit string `json:"memoryUnit"`
|
}
|
||||||
PullImage bool `json:"pullImage"`
|
|
||||||
EditCompose bool `json:"editCompose"`
|
type AgentBatchInstallReq struct {
|
||||||
DockerCompose string `json:"dockerCompose"`
|
Name string `json:"name"`
|
||||||
|
Remark string `json:"remark"`
|
||||||
|
AppVersion string `json:"appVersion" validate:"required"`
|
||||||
|
WebUIPort int `json:"webUIPort" validate:"required,min=1,max=65535"`
|
||||||
|
BridgePort int `json:"bridgePort"`
|
||||||
|
AllowedOrigins []string `json:"allowedOrigins"`
|
||||||
|
AgentType string `json:"agentType" validate:"required,oneof=openclaw copaw hermes-agent"`
|
||||||
|
Model string `json:"model"`
|
||||||
|
AccountID uint `json:"accountId"`
|
||||||
|
Token string `json:"token"`
|
||||||
|
TaskID string `json:"taskID"`
|
||||||
|
Advanced bool `json:"advanced"`
|
||||||
|
ContainerName string `json:"containerName"`
|
||||||
|
AllowPort bool `json:"allowPort"`
|
||||||
|
SpecifyIP string `json:"specifyIP"`
|
||||||
|
RestartPolicy string `json:"restartPolicy"`
|
||||||
|
CpuQuota float64 `json:"cpuQuota"`
|
||||||
|
MemoryLimit float64 `json:"memoryLimit"`
|
||||||
|
MemoryUnit string `json:"memoryUnit"`
|
||||||
|
PullImage bool `json:"pullImage"`
|
||||||
|
EditCompose bool `json:"editCompose"`
|
||||||
|
DockerCompose string `json:"dockerCompose"`
|
||||||
|
MasterAccountID uint `json:"masterAccountId"`
|
||||||
|
FallbackAccessHost string `json:"fallbackAccessHost"`
|
||||||
|
AccountSnapshot AgentAccountInfo `json:"accountSnapshot"`
|
||||||
|
AccountModels []AgentAccountModel `json:"accountModels"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentBatchUpgradeReq struct {
|
||||||
|
AgentType string `json:"agentType" validate:"required,oneof=openclaw copaw hermes-agent"`
|
||||||
|
TargetVersion string `json:"targetVersion" validate:"required"`
|
||||||
|
Backup bool `json:"backup"`
|
||||||
|
PullImage bool `json:"pullImage"`
|
||||||
|
TaskID string `json:"taskID"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentBatchUpgradeResult struct {
|
||||||
|
AgentID uint `json:"agentID"`
|
||||||
|
AgentName string `json:"agentName"`
|
||||||
|
AppInstallID uint `json:"appInstallID"`
|
||||||
|
Success bool `json:"success"`
|
||||||
|
Skipped bool `json:"skipped"`
|
||||||
|
Message string `json:"message"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentBatchSkillInstallReq struct {
|
||||||
|
AgentType string `json:"agentType" validate:"required,oneof=openclaw hermes-agent"`
|
||||||
|
SkillName string `json:"skillName" validate:"required"`
|
||||||
|
PackagePath string `json:"packagePath" validate:"required"`
|
||||||
|
TaskID string `json:"taskID"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentBatchSkillInstallResult struct {
|
||||||
|
AgentID uint `json:"agentID"`
|
||||||
|
AgentName string `json:"agentName"`
|
||||||
|
AppInstallID uint `json:"appInstallID"`
|
||||||
|
Success bool `json:"success"`
|
||||||
|
Skipped bool `json:"skipped"`
|
||||||
|
Message string `json:"message"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentBatchOperateReq struct {
|
||||||
|
AgentType string `json:"agentType" validate:"required,oneof=openclaw copaw hermes-agent"`
|
||||||
|
Operate string `json:"operate" validate:"required,oneof=start stop restart delete"`
|
||||||
|
ForceDelete bool `json:"forceDelete"`
|
||||||
|
TaskID string `json:"taskID"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentBatchOperateResult struct {
|
||||||
|
AgentID uint `json:"agentID"`
|
||||||
|
AgentName string `json:"agentName"`
|
||||||
|
AppInstallID uint `json:"appInstallID"`
|
||||||
|
Success bool `json:"success"`
|
||||||
|
Skipped bool `json:"skipped"`
|
||||||
|
Message string `json:"message"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type AgentItem struct {
|
type AgentItem struct {
|
||||||
ID uint `json:"id"`
|
ID uint `json:"id"`
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
AgentType string `json:"agentType"`
|
Remark string `json:"remark"`
|
||||||
Provider string `json:"provider"`
|
AgentType string `json:"agentType"`
|
||||||
ProviderName string `json:"providerName"`
|
Provider string `json:"provider"`
|
||||||
Model string `json:"model"`
|
ProviderName string `json:"providerName"`
|
||||||
APIType string `json:"apiType"`
|
Model string `json:"model"`
|
||||||
MaxTokens int `json:"maxTokens"`
|
APIType string `json:"apiType"`
|
||||||
ContextWindow int `json:"contextWindow"`
|
MaxTokens int `json:"maxTokens"`
|
||||||
BaseURL string `json:"baseUrl"`
|
ContextWindow int `json:"contextWindow"`
|
||||||
APIKey string `json:"apiKey"`
|
BaseURL string `json:"baseUrl"`
|
||||||
Token string `json:"token"`
|
APIKey string `json:"apiKey"`
|
||||||
Status string `json:"status"`
|
Token string `json:"token"`
|
||||||
Message string `json:"message"`
|
Status string `json:"status"`
|
||||||
AppInstallID uint `json:"appInstallId"`
|
Message string `json:"message"`
|
||||||
AccountID uint `json:"accountId"`
|
AppInstallID uint `json:"appInstallId"`
|
||||||
AppVersion string `json:"appVersion"`
|
WebsiteID uint `json:"websiteId"`
|
||||||
Container string `json:"containerName"`
|
WebsitePrimaryDomain string `json:"websitePrimaryDomain"`
|
||||||
WebUIPort int `json:"webUIPort"`
|
WebsiteType string `json:"websiteType"`
|
||||||
BridgePort int `json:"bridgePort"`
|
WebsiteProtocol string `json:"websiteProtocol"`
|
||||||
Path string `json:"path"`
|
AccountID uint `json:"accountId"`
|
||||||
ConfigPath string `json:"configPath"`
|
AppVersion string `json:"appVersion"`
|
||||||
Upgradable bool `json:"upgradable"`
|
Container string `json:"containerName"`
|
||||||
CreatedAt time.Time `json:"createdAt"`
|
WebUIPort int `json:"webUIPort"`
|
||||||
|
BridgePort int `json:"bridgePort"`
|
||||||
|
Path string `json:"path"`
|
||||||
|
ConfigPath string `json:"configPath"`
|
||||||
|
Upgradable bool `json:"upgradable"`
|
||||||
|
CreatedAt time.Time `json:"createdAt"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type AgentDeleteReq struct {
|
type AgentDeleteReq struct {
|
||||||
@@ -68,23 +147,182 @@ type AgentTokenResetReq struct {
|
|||||||
ID uint `json:"id" validate:"required"`
|
ID uint `json:"id" validate:"required"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type AgentRemarkUpdateReq struct {
|
||||||
|
ID uint `json:"id" validate:"required"`
|
||||||
|
Remark string `json:"remark"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentWebsiteBindReq struct {
|
||||||
|
AgentID uint `json:"agentId" validate:"required"`
|
||||||
|
WebsiteID uint `json:"websiteId" validate:"required"`
|
||||||
|
}
|
||||||
|
|
||||||
type AgentModelConfigUpdateReq struct {
|
type AgentModelConfigUpdateReq struct {
|
||||||
|
AgentID uint `json:"agentId" validate:"required"`
|
||||||
|
AccountID uint `json:"accountId" validate:"required"`
|
||||||
|
Model string `json:"model" validate:"required"`
|
||||||
|
Fallbacks []string `json:"fallbacks"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentModelConfig struct {
|
||||||
|
AccountID uint `json:"accountId"`
|
||||||
|
Model string `json:"model"`
|
||||||
|
Fallbacks []string `json:"fallbacks"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentHermesChatSessionItem struct {
|
||||||
|
ID string `json:"id"`
|
||||||
|
Title string `json:"title"`
|
||||||
|
Model string `json:"model"`
|
||||||
|
MessageCount int64 `json:"messageCount"`
|
||||||
|
StartedAt string `json:"startedAt"`
|
||||||
|
LastActive string `json:"lastActive"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentOverviewReq struct {
|
||||||
|
AgentID uint `json:"agentId" validate:"required"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentIDReq struct {
|
||||||
|
AgentID uint `json:"agentId" validate:"required"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentHermesChatSessionRenameReq struct {
|
||||||
|
AgentID uint `json:"agentId" validate:"required"`
|
||||||
|
ID string `json:"id" validate:"required"`
|
||||||
|
Title string `json:"title" validate:"required"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentHermesChatSessionDeleteReq struct {
|
||||||
|
AgentID uint `json:"agentId" validate:"required"`
|
||||||
|
ID string `json:"id" validate:"required"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentOverview struct {
|
||||||
|
Snapshot AgentOverviewSnapshot `json:"snapshot"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentRoleBinding struct {
|
||||||
|
Channel string `json:"channel" validate:"required"`
|
||||||
|
AccountID string `json:"accountId"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentRoleCreateReq struct {
|
||||||
|
AgentID uint `json:"agentId" validate:"required"`
|
||||||
|
Name string `json:"name" validate:"required"`
|
||||||
|
Model string `json:"model"`
|
||||||
|
Bindings []AgentRoleBinding `json:"bindings"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentRoleCreateResp struct {
|
||||||
|
Output string `json:"output"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentRoleDeleteReq struct {
|
||||||
|
AgentID uint `json:"agentId" validate:"required"`
|
||||||
|
ID string `json:"id" validate:"required"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentRoleBindReq struct {
|
||||||
AgentID uint `json:"agentId" validate:"required"`
|
AgentID uint `json:"agentId" validate:"required"`
|
||||||
AccountID uint `json:"accountId" validate:"required"`
|
ID string `json:"id" validate:"required"`
|
||||||
Model string `json:"model" validate:"required"`
|
Channel string `json:"channel" validate:"required"`
|
||||||
|
AccountID string `json:"accountId"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentConfiguredAgentsReq struct {
|
||||||
|
AgentID uint `json:"agentId" validate:"required"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentRoleChannelsReq struct {
|
||||||
|
AgentID uint `json:"agentId" validate:"required"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentRoleChannelItem struct {
|
||||||
|
Name string `json:"name"`
|
||||||
|
Bound bool `json:"bound"`
|
||||||
|
AccountIDs []string `json:"accountIds"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentRoleMarkdownFilesReq struct {
|
||||||
|
AgentID uint `json:"agentId" validate:"required"`
|
||||||
|
Workspace string `json:"workspace" validate:"required"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentConfiguredAgentItem struct {
|
||||||
|
ID string `json:"id"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
Workspace string `json:"workspace"`
|
||||||
|
Model string `json:"model"`
|
||||||
|
AgentDir string `json:"agentDir"`
|
||||||
|
Bindings []AgentRoleBinding `json:"bindings"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentRoleMarkdownFileItem struct {
|
||||||
|
Name string `json:"name"`
|
||||||
|
Content string `json:"content"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentRoleMarkdownFileUpdateItem struct {
|
||||||
|
Name string `json:"name" validate:"required,oneof=AGENTS.md SOUL.md USER.md IDENTITY.md TOOLS.md HEARTBEAT.md BOOT.md BOOTSTRAP.md"`
|
||||||
|
Content string `json:"content"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentRoleMarkdownFilesUpdateReq struct {
|
||||||
|
AgentID uint `json:"agentId" validate:"required"`
|
||||||
|
Workspace string `json:"workspace" validate:"required"`
|
||||||
|
Restart bool `json:"restart"`
|
||||||
|
Files []AgentRoleMarkdownFileUpdateItem `json:"files" validate:"required"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentOverviewSnapshot struct {
|
||||||
|
ContainerStatus string `json:"containerStatus"`
|
||||||
|
AppVersion string `json:"appVersion"`
|
||||||
|
DefaultModel string `json:"defaultModel"`
|
||||||
|
ChannelCount int `json:"channelCount"`
|
||||||
|
SkillCount int `json:"skillCount"`
|
||||||
|
JobCount int `json:"jobCount"`
|
||||||
|
SessionCount int `json:"sessionCount"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentAccountModel struct {
|
||||||
|
RecordID uint `json:"recordId"`
|
||||||
|
ID string `json:"id"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
ContextWindow int `json:"contextWindow"`
|
||||||
|
MaxTokens int `json:"maxTokens"`
|
||||||
|
Reasoning bool `json:"reasoning"`
|
||||||
|
Input []string `json:"input"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentAccountModelReq struct {
|
||||||
|
AccountID uint `json:"accountId" validate:"required"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentAccountModelCreateReq struct {
|
||||||
|
AccountID uint `json:"accountId" validate:"required"`
|
||||||
|
Model AgentAccountModel `json:"model" validate:"required"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentAccountModelUpdateReq struct {
|
||||||
|
AccountID uint `json:"accountId" validate:"required"`
|
||||||
|
Model AgentAccountModel `json:"model" validate:"required"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentAccountModelDeleteReq struct {
|
||||||
|
AccountID uint `json:"accountId" validate:"required"`
|
||||||
|
RecordID uint `json:"recordId" validate:"required"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type AgentAccountCreateReq struct {
|
type AgentAccountCreateReq struct {
|
||||||
Provider string `json:"provider" validate:"required"`
|
Provider string `json:"provider" validate:"required"`
|
||||||
Name string `json:"name" validate:"required"`
|
Name string `json:"name" validate:"required"`
|
||||||
APIKey string `json:"apiKey" validate:"required"`
|
APIKey string `json:"apiKey" validate:"required"`
|
||||||
RememberAPIKey bool `json:"rememberApiKey"`
|
RememberAPIKey bool `json:"rememberApiKey"`
|
||||||
BaseURL string `json:"baseURL"`
|
BaseURL string `json:"baseURL"`
|
||||||
Model string `json:"model"`
|
Models []AgentAccountModel `json:"models"`
|
||||||
APIType string `json:"apiType"`
|
APIType string `json:"apiType" validate:"required"`
|
||||||
MaxTokens int `json:"maxTokens"`
|
Remark string `json:"remark"`
|
||||||
ContextWindow int `json:"contextWindow"`
|
|
||||||
Remark string `json:"remark"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type AgentAccountUpdateReq struct {
|
type AgentAccountUpdateReq struct {
|
||||||
@@ -93,10 +331,7 @@ type AgentAccountUpdateReq struct {
|
|||||||
APIKey string `json:"apiKey" validate:"required"`
|
APIKey string `json:"apiKey" validate:"required"`
|
||||||
RememberAPIKey bool `json:"rememberApiKey"`
|
RememberAPIKey bool `json:"rememberApiKey"`
|
||||||
BaseURL string `json:"baseURL"`
|
BaseURL string `json:"baseURL"`
|
||||||
Model string `json:"model"`
|
APIType string `json:"apiType" validate:"required"`
|
||||||
APIType string `json:"apiType"`
|
|
||||||
MaxTokens int `json:"maxTokens"`
|
|
||||||
ContextWindow int `json:"contextWindow"`
|
|
||||||
Remark string `json:"remark"`
|
Remark string `json:"remark"`
|
||||||
SyncAgents bool `json:"syncAgents"`
|
SyncAgents bool `json:"syncAgents"`
|
||||||
}
|
}
|
||||||
@@ -117,26 +352,33 @@ type AgentAccountSearch struct {
|
|||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type AgentAccountProviderCountReq struct {
|
||||||
|
Providers []string `json:"providers"`
|
||||||
|
}
|
||||||
|
|
||||||
type AgentAccountInfo struct {
|
type AgentAccountInfo struct {
|
||||||
ID uint `json:"id"`
|
ID uint `json:"id"`
|
||||||
Provider string `json:"provider"`
|
MasterAccountID uint `json:"masterAccountId"`
|
||||||
ProviderName string `json:"providerName"`
|
Provider string `json:"provider"`
|
||||||
Name string `json:"name"`
|
ProviderName string `json:"providerName"`
|
||||||
APIKey string `json:"apiKey"`
|
Name string `json:"name"`
|
||||||
RememberAPIKey bool `json:"rememberApiKey"`
|
APIKey string `json:"apiKey"`
|
||||||
BaseURL string `json:"baseUrl"`
|
RememberAPIKey bool `json:"rememberApiKey"`
|
||||||
Model string `json:"model"`
|
BaseURL string `json:"baseUrl"`
|
||||||
APIType string `json:"apiType"`
|
Models []AgentAccountModel `json:"models"`
|
||||||
MaxTokens int `json:"maxTokens"`
|
APIType string `json:"apiType"`
|
||||||
ContextWindow int `json:"contextWindow"`
|
Verified bool `json:"verified"`
|
||||||
Verified bool `json:"verified"`
|
Remark string `json:"remark"`
|
||||||
Remark string `json:"remark"`
|
CreatedAt time.Time `json:"createdAt"`
|
||||||
CreatedAt time.Time `json:"createdAt"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type ProviderModelInfo struct {
|
type ProviderModelInfo struct {
|
||||||
ID string `json:"id"`
|
ID string `json:"id"`
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
|
ContextWindow int `json:"contextWindow"`
|
||||||
|
MaxTokens int `json:"maxTokens"`
|
||||||
|
Reasoning bool `json:"reasoning"`
|
||||||
|
Input []string `json:"input"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type ProviderInfo struct {
|
type ProviderInfo struct {
|
||||||
@@ -152,12 +394,17 @@ type AgentFeishuConfigReq struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type AgentFeishuConfigUpdateReq struct {
|
type AgentFeishuConfigUpdateReq struct {
|
||||||
AgentID uint `json:"agentId" validate:"required"`
|
AgentID uint `json:"agentId" validate:"required"`
|
||||||
BotName string `json:"botName" validate:"required"`
|
Enabled bool `json:"enabled"`
|
||||||
AppID string `json:"appId" validate:"required"`
|
ThreadSession bool `json:"threadSession"`
|
||||||
AppSecret string `json:"appSecret" validate:"required"`
|
ReplyMode string `json:"replyMode" validate:"required"`
|
||||||
Enabled bool `json:"enabled"`
|
Streaming bool `json:"streaming"`
|
||||||
DmPolicy string `json:"dmPolicy" validate:"required"`
|
RequireMention string `json:"requireMention" validate:"required,oneof=true false open"`
|
||||||
|
GroupPolicy string `json:"groupPolicy" validate:"required,oneof=open allowlist disabled"`
|
||||||
|
GroupAllowFrom []string `json:"groupAllowFrom"`
|
||||||
|
Domain string `json:"domain"`
|
||||||
|
ConnectionMode string `json:"connectionMode"`
|
||||||
|
Bots []AgentFeishuBot `json:"bots" validate:"required,min=1"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type AgentFeishuPairingApproveReq struct {
|
type AgentFeishuPairingApproveReq struct {
|
||||||
@@ -166,11 +413,17 @@ type AgentFeishuPairingApproveReq struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type AgentFeishuConfig struct {
|
type AgentFeishuConfig struct {
|
||||||
Enabled bool `json:"enabled"`
|
Enabled bool `json:"enabled"`
|
||||||
DmPolicy string `json:"dmPolicy"`
|
ThreadSession bool `json:"threadSession"`
|
||||||
BotName string `json:"botName"`
|
ReplyMode string `json:"replyMode"`
|
||||||
AppID string `json:"appId"`
|
Streaming bool `json:"streaming"`
|
||||||
AppSecret string `json:"appSecret"`
|
RequireMention string `json:"requireMention"`
|
||||||
|
GroupPolicy string `json:"groupPolicy"`
|
||||||
|
GroupAllowFrom []string `json:"groupAllowFrom"`
|
||||||
|
Domain string `json:"domain"`
|
||||||
|
ConnectionMode string `json:"connectionMode"`
|
||||||
|
Bots []AgentFeishuBot `json:"bots"`
|
||||||
|
Installed bool `json:"installed"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type AgentTelegramConfigReq struct {
|
type AgentTelegramConfigReq struct {
|
||||||
@@ -178,76 +431,305 @@ type AgentTelegramConfigReq struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type AgentTelegramConfigUpdateReq struct {
|
type AgentTelegramConfigUpdateReq struct {
|
||||||
AgentID uint `json:"agentId" validate:"required"`
|
AgentID uint `json:"agentId" validate:"required"`
|
||||||
Enabled bool `json:"enabled"`
|
Enabled bool `json:"enabled"`
|
||||||
DmPolicy string `json:"dmPolicy" validate:"required"`
|
DmPolicy string `json:"dmPolicy" validate:"required,oneof=pairing open allowlist disabled"`
|
||||||
BotToken string `json:"botToken" validate:"required"`
|
AllowFrom []string `json:"allowFrom"`
|
||||||
Proxy string `json:"proxy"`
|
RequireMention bool `json:"requireMention"`
|
||||||
|
GroupPolicy string `json:"groupPolicy" validate:"required,oneof=open allowlist disabled"`
|
||||||
|
GroupAllowFrom []string `json:"groupAllowFrom"`
|
||||||
|
Proxy string `json:"proxy"`
|
||||||
|
Streaming string `json:"streaming" validate:"required,oneof=off partial block progress"`
|
||||||
|
DefaultAccount string `json:"defaultAccount" validate:"required"`
|
||||||
|
Bots []AgentTelegramBot `json:"bots" validate:"required,min=1"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type AgentTelegramConfig struct {
|
type AgentTelegramConfig struct {
|
||||||
Enabled bool `json:"enabled"`
|
Enabled bool `json:"enabled"`
|
||||||
DmPolicy string `json:"dmPolicy"`
|
DmPolicy string `json:"dmPolicy"`
|
||||||
BotToken string `json:"botToken"`
|
AllowFrom []string `json:"allowFrom"`
|
||||||
Proxy string `json:"proxy"`
|
RequireMention bool `json:"requireMention"`
|
||||||
|
GroupPolicy string `json:"groupPolicy"`
|
||||||
|
GroupAllowFrom []string `json:"groupAllowFrom"`
|
||||||
|
Proxy string `json:"proxy"`
|
||||||
|
Streaming string `json:"streaming"`
|
||||||
|
DefaultAccount string `json:"defaultAccount"`
|
||||||
|
Bots []AgentTelegramBot `json:"bots"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type AgentChannelPairingApproveReq struct {
|
type AgentChannelPairingApproveReq struct {
|
||||||
AgentID uint `json:"agentId" validate:"required"`
|
AgentID uint `json:"agentId" validate:"required"`
|
||||||
Type string `json:"type" validate:"required,oneof=feishu telegram discord"`
|
Type string `json:"type" validate:"required,oneof=feishu telegram discord wecom qqbot dingtalk"`
|
||||||
PairingCode string `json:"pairingCode" validate:"required"`
|
PairingCode string `json:"pairingCode" validate:"required"`
|
||||||
|
AccountID string `json:"accountId"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type AgentDiscordConfigReq struct {
|
type AgentChannelDeleteReq struct {
|
||||||
AgentID uint `json:"agentId" validate:"required"`
|
AgentID uint `json:"agentId" validate:"required"`
|
||||||
|
Type string `json:"type" validate:"required,oneof=feishu telegram discord wecom qqbot dingtalk weixin"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentWecomConfigUpdateReq struct {
|
||||||
|
AgentID uint `json:"agentId" validate:"required"`
|
||||||
|
Enabled bool `json:"enabled"`
|
||||||
|
DmPolicy string `json:"dmPolicy" validate:"required,oneof=pairing open allowlist disabled"`
|
||||||
|
AllowFrom []string `json:"allowFrom"`
|
||||||
|
GroupPolicy string `json:"groupPolicy" validate:"required,oneof=open allowlist disabled"`
|
||||||
|
GroupAllowFrom []string `json:"groupAllowFrom"`
|
||||||
|
BotID string `json:"botId" validate:"required"`
|
||||||
|
Secret string `json:"secret" validate:"required"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentWecomConfig struct {
|
||||||
|
Enabled bool `json:"enabled"`
|
||||||
|
DmPolicy string `json:"dmPolicy"`
|
||||||
|
AllowFrom []string `json:"allowFrom"`
|
||||||
|
GroupPolicy string `json:"groupPolicy"`
|
||||||
|
GroupAllowFrom []string `json:"groupAllowFrom"`
|
||||||
|
BotID string `json:"botId"`
|
||||||
|
Secret string `json:"secret"`
|
||||||
|
Installed bool `json:"installed"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentDingTalkConfigUpdateReq struct {
|
||||||
|
AgentID uint `json:"agentId" validate:"required"`
|
||||||
|
Enabled bool `json:"enabled"`
|
||||||
|
DmPolicy string `json:"dmPolicy" validate:"required,oneof=pairing allowlist open disabled"`
|
||||||
|
AllowFrom []string `json:"allowFrom"`
|
||||||
|
GroupPolicy string `json:"groupPolicy" validate:"required,oneof=open allowlist disabled"`
|
||||||
|
GroupAllowFrom []string `json:"groupAllowFrom"`
|
||||||
|
SeparateSessionByConversation bool `json:"separateSessionByConversation"`
|
||||||
|
GroupSessionScope string `json:"groupSessionScope" validate:"required,oneof=group group_sender"`
|
||||||
|
SharedMemoryAcrossConversations bool `json:"sharedMemoryAcrossConversations"`
|
||||||
|
AsyncMode bool `json:"asyncMode"`
|
||||||
|
AckText string `json:"ackText"`
|
||||||
|
Bots []AgentDingTalkBot `json:"bots" validate:"required,min=1"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentDingTalkConfig struct {
|
||||||
|
Enabled bool `json:"enabled"`
|
||||||
|
DmPolicy string `json:"dmPolicy"`
|
||||||
|
AllowFrom []string `json:"allowFrom"`
|
||||||
|
GroupPolicy string `json:"groupPolicy"`
|
||||||
|
GroupAllowFrom []string `json:"groupAllowFrom"`
|
||||||
|
SeparateSessionByConversation bool `json:"separateSessionByConversation"`
|
||||||
|
GroupSessionScope string `json:"groupSessionScope"`
|
||||||
|
SharedMemoryAcrossConversations bool `json:"sharedMemoryAcrossConversations"`
|
||||||
|
AsyncMode bool `json:"asyncMode"`
|
||||||
|
AckText string `json:"ackText"`
|
||||||
|
Bots []AgentDingTalkBot `json:"bots"`
|
||||||
|
Installed bool `json:"installed"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentWeixinLoginReq struct {
|
||||||
|
AgentID uint `json:"agentId" validate:"required"`
|
||||||
|
TaskID string `json:"taskID" validate:"required"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentWeixinConfig struct {
|
||||||
|
Enabled bool `json:"enabled"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentQQBotConfigUpdateReq struct {
|
||||||
|
AgentID uint `json:"agentId" validate:"required"`
|
||||||
|
Enabled bool `json:"enabled"`
|
||||||
|
DmPolicy string `json:"dmPolicy"`
|
||||||
|
AllowFrom []string `json:"allowFrom"`
|
||||||
|
GroupPolicy string `json:"groupPolicy"`
|
||||||
|
GroupAllowFrom []string `json:"groupAllowFrom"`
|
||||||
|
Bots []AgentQQBotBot `json:"bots" validate:"required,min=1"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentQQBotConfig struct {
|
||||||
|
Enabled bool `json:"enabled"`
|
||||||
|
DmPolicy string `json:"dmPolicy"`
|
||||||
|
AllowFrom []string `json:"allowFrom"`
|
||||||
|
GroupPolicy string `json:"groupPolicy"`
|
||||||
|
GroupAllowFrom []string `json:"groupAllowFrom"`
|
||||||
|
Bots []AgentQQBotBot `json:"bots"`
|
||||||
|
Installed bool `json:"installed"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentPluginInstallReq struct {
|
||||||
|
AgentID uint `json:"agentId" validate:"required"`
|
||||||
|
Type string `json:"type" validate:"required,oneof=feishu qqbot wecom dingtalk weixin"`
|
||||||
|
TaskID string `json:"taskID" validate:"required"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentPluginUpgradeReq struct {
|
||||||
|
AgentID uint `json:"agentId" validate:"required"`
|
||||||
|
Type string `json:"type" validate:"required,oneof=feishu qqbot wecom dingtalk weixin"`
|
||||||
|
TaskID string `json:"taskID" validate:"required"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentPluginUninstallReq struct {
|
||||||
|
AgentID uint `json:"agentId" validate:"required"`
|
||||||
|
Type string `json:"type" validate:"required,oneof=feishu qqbot wecom dingtalk weixin"`
|
||||||
|
TaskID string `json:"taskID" validate:"required"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentPluginCheckReq struct {
|
||||||
|
AgentID uint `json:"agentId" validate:"required"`
|
||||||
|
Type string `json:"type" validate:"required,oneof=feishu qqbot wecom dingtalk weixin"`
|
||||||
|
CheckLatest bool `json:"checkLatest"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentPluginStatus struct {
|
||||||
|
Installed bool `json:"installed"`
|
||||||
|
CurrentVersion string `json:"currentVersion"`
|
||||||
|
LatestVersion string `json:"latestVersion"`
|
||||||
|
Upgradable bool `json:"upgradable"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type AgentDiscordConfigUpdateReq struct {
|
type AgentDiscordConfigUpdateReq struct {
|
||||||
AgentID uint `json:"agentId" validate:"required"`
|
AgentID uint `json:"agentId" validate:"required"`
|
||||||
Enabled bool `json:"enabled"`
|
Enabled bool `json:"enabled"`
|
||||||
DmPolicy string `json:"dmPolicy" validate:"required"`
|
DmPolicy string `json:"dmPolicy" validate:"required"`
|
||||||
GroupPolicy string `json:"groupPolicy" validate:"required,oneof=open allowlist disabled"`
|
AllowFrom []string `json:"allowFrom"`
|
||||||
Token string `json:"token" validate:"required"`
|
RequireMention bool `json:"requireMention"`
|
||||||
Proxy string `json:"proxy"`
|
GroupPolicy string `json:"groupPolicy" validate:"required,oneof=open allowlist disabled"`
|
||||||
|
Proxy string `json:"proxy"`
|
||||||
|
DefaultAccount string `json:"defaultAccount" validate:"required"`
|
||||||
|
Bots []AgentDiscordBot `json:"bots" validate:"required,min=1"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type AgentDiscordConfig struct {
|
type AgentDiscordConfig struct {
|
||||||
Enabled bool `json:"enabled"`
|
Enabled bool `json:"enabled"`
|
||||||
|
DmPolicy string `json:"dmPolicy"`
|
||||||
|
AllowFrom []string `json:"allowFrom"`
|
||||||
|
RequireMention bool `json:"requireMention"`
|
||||||
|
GroupPolicy string `json:"groupPolicy"`
|
||||||
|
Proxy string `json:"proxy"`
|
||||||
|
DefaultAccount string `json:"defaultAccount"`
|
||||||
|
Bots []AgentDiscordBot `json:"bots"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentChannelBotBase struct {
|
||||||
|
AccountID string `json:"accountId"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
Enabled bool `json:"enabled"`
|
||||||
|
IsDefault bool `json:"isDefault"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (b AgentChannelBotBase) IsEnabled() bool {
|
||||||
|
return b.Enabled
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentFeishuBot struct {
|
||||||
|
AgentChannelBotBase
|
||||||
|
AppID string `json:"appId"`
|
||||||
|
AppSecret string `json:"appSecret"`
|
||||||
|
DmPolicy string `json:"dmPolicy"`
|
||||||
|
AllowFrom []string `json:"allowFrom"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentTelegramBot struct {
|
||||||
|
AgentChannelBotBase
|
||||||
|
BotToken string `json:"botToken"`
|
||||||
DmPolicy string `json:"dmPolicy"`
|
DmPolicy string `json:"dmPolicy"`
|
||||||
GroupPolicy string `json:"groupPolicy"`
|
GroupPolicy string `json:"groupPolicy"`
|
||||||
Token string `json:"token"`
|
Streaming string `json:"streaming"`
|
||||||
Proxy string `json:"proxy"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type AgentBrowserConfigReq struct {
|
type AgentDiscordBot struct {
|
||||||
AgentID uint `json:"agentId" validate:"required"`
|
AgentChannelBotBase
|
||||||
|
Token string `json:"token"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type AgentBrowserConfigUpdateReq struct {
|
type AgentQQBotBot struct {
|
||||||
AgentID uint `json:"agentId" validate:"required"`
|
AgentChannelBotBase
|
||||||
Enabled bool `json:"enabled"`
|
AppID string `json:"appId"`
|
||||||
Headless bool `json:"headless"`
|
ClientSecret string `json:"clientSecret"`
|
||||||
NoSandbox bool `json:"noSandbox"`
|
AllowFrom []string `json:"allowFrom"`
|
||||||
DefaultProfile string `json:"defaultProfile" validate:"required"`
|
SystemPrompt string `json:"systemPrompt"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type AgentBrowserConfig struct {
|
type AgentDingTalkBot struct {
|
||||||
Enabled bool `json:"enabled"`
|
AgentChannelBotBase
|
||||||
ExecutablePath string `json:"executablePath"`
|
ClientID string `json:"clientId"`
|
||||||
Headless bool `json:"headless"`
|
ClientSecret string `json:"clientSecret"`
|
||||||
NoSandbox bool `json:"noSandbox"`
|
|
||||||
DefaultProfile string `json:"defaultProfile"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type AgentOtherConfigReq struct {
|
type AgentSecurityConfigUpdateReq struct {
|
||||||
AgentID uint `json:"agentId" validate:"required"`
|
AgentID uint `json:"agentId" validate:"required"`
|
||||||
|
AllowedOrigins []string `json:"allowedOrigins"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentSecurityConfig struct {
|
||||||
|
AllowedOrigins []string `json:"allowedOrigins"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type AgentOtherConfigUpdateReq struct {
|
type AgentOtherConfigUpdateReq struct {
|
||||||
AgentID uint `json:"agentId" validate:"required"`
|
AgentID uint `json:"agentId" validate:"required"`
|
||||||
UserTimezone string `json:"userTimezone" validate:"required"`
|
UserTimezone string `json:"userTimezone" validate:"required"`
|
||||||
|
BrowserEnabled bool `json:"browserEnabled"`
|
||||||
|
NPMRegistry string `json:"npmRegistry" validate:"required"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type AgentOtherConfig struct {
|
type AgentOtherConfig struct {
|
||||||
UserTimezone string `json:"userTimezone"`
|
UserTimezone string `json:"userTimezone"`
|
||||||
|
BrowserEnabled bool `json:"browserEnabled"`
|
||||||
|
NPMRegistry string `json:"npmRegistry"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentConfigFileReq struct {
|
||||||
|
AgentID uint `json:"agentId" validate:"required"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentConfigFileUpdateReq struct {
|
||||||
|
AgentID uint `json:"agentId" validate:"required"`
|
||||||
|
Content string `json:"content" validate:"required"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentConfigFile struct {
|
||||||
|
Content string `json:"content"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentSkillSearchReq struct {
|
||||||
|
AgentID uint `json:"agentId" validate:"required"`
|
||||||
|
Source string `json:"source" validate:"required,oneof=clawhub-global clawhub-cn skillhub official skills-sh local-hub"`
|
||||||
|
Keyword string `json:"keyword" validate:"required"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentSkillItem struct {
|
||||||
|
Name string `json:"name"`
|
||||||
|
Description string `json:"description"`
|
||||||
|
Category string `json:"category"`
|
||||||
|
Tags []string `json:"tags"`
|
||||||
|
Source string `json:"source"`
|
||||||
|
Trust string `json:"trust"`
|
||||||
|
Identifier string `json:"identifier"`
|
||||||
|
Bundled bool `json:"bundled"`
|
||||||
|
Disabled bool `json:"disabled"`
|
||||||
|
Uninstallable bool `json:"uninstallable"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentSkillSearchItem struct {
|
||||||
|
Slug string `json:"slug"`
|
||||||
|
Identifier string `json:"identifier"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
Description string `json:"description"`
|
||||||
|
Summary string `json:"summary"`
|
||||||
|
Version string `json:"version"`
|
||||||
|
Source string `json:"source"`
|
||||||
|
Trust string `json:"trust"`
|
||||||
|
Score string `json:"score"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentSkillUpdateReq struct {
|
||||||
|
AgentID uint `json:"agentId" validate:"required"`
|
||||||
|
Name string `json:"name" validate:"required"`
|
||||||
|
Enabled bool `json:"enabled"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentSkillInstallReq struct {
|
||||||
|
AgentID uint `json:"agentId" validate:"required"`
|
||||||
|
Source string `json:"source" validate:"required,oneof=clawhub-global clawhub-cn skillhub official skills-sh local-hub"`
|
||||||
|
Slug string `json:"slug" validate:"required"`
|
||||||
|
TaskID string `json:"taskID" validate:"required"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AgentSkillUninstallReq struct {
|
||||||
|
AgentID uint `json:"agentId" validate:"required"`
|
||||||
|
Name string `json:"name" validate:"required"`
|
||||||
}
|
}
|
||||||
|
|||||||
+19
-6
@@ -2,8 +2,9 @@ package dto
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"github.com/1Panel-dev/1Panel/agent/app/model"
|
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/model"
|
||||||
)
|
)
|
||||||
|
|
||||||
type CreateOrUpdateAlert struct {
|
type CreateOrUpdateAlert struct {
|
||||||
@@ -35,6 +36,15 @@ type AlertSearch struct {
|
|||||||
Method string `json:"method"`
|
Method string `json:"method"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type AlertConfigQuery struct {
|
||||||
|
ExcludeTypes []string `json:"excludeTypes"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AlertConfigPageReq struct {
|
||||||
|
PageInfo
|
||||||
|
ExcludeTypes []string `json:"excludeTypes"`
|
||||||
|
}
|
||||||
|
|
||||||
type AlertDTO struct {
|
type AlertDTO struct {
|
||||||
ID uint `json:"id"`
|
ID uint `json:"id"`
|
||||||
Type string `json:"type"`
|
Type string `json:"type"`
|
||||||
@@ -46,6 +56,8 @@ type AlertDTO struct {
|
|||||||
Status string `json:"status"`
|
Status string `json:"status"`
|
||||||
SendCount uint `json:"sendCount"`
|
SendCount uint `json:"sendCount"`
|
||||||
AdvancedParams string `json:"advancedParams"`
|
AdvancedParams string `json:"advancedParams"`
|
||||||
|
CreateUser string `json:"createUser"`
|
||||||
|
UpdateUser string `json:"updateUser"`
|
||||||
CreatedAt time.Time `json:"createdAt"`
|
CreatedAt time.Time `json:"createdAt"`
|
||||||
UpdatedAt time.Time `json:"updatedAt"`
|
UpdatedAt time.Time `json:"updatedAt"`
|
||||||
}
|
}
|
||||||
@@ -281,11 +293,12 @@ type OfflineQueryRequest struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type AlertConfigUpdate struct {
|
type AlertConfigUpdate struct {
|
||||||
ID uint `json:"id"`
|
ID uint `json:"id"`
|
||||||
Type string `json:"type"`
|
Type string `json:"type"`
|
||||||
Title string `json:"title"`
|
Title string `json:"title"`
|
||||||
Status string `json:"status"`
|
Status string `json:"status"`
|
||||||
Config string `json:"config"`
|
Config string `json:"config"`
|
||||||
|
DisplayName string `json:"displayName"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type AlertConfigTest struct {
|
type AlertConfigTest struct {
|
||||||
|
|||||||
+12
-10
@@ -65,10 +65,11 @@ type UploadForRecover struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type CommonBackup struct {
|
type CommonBackup struct {
|
||||||
Type string `json:"type" validate:"required,oneof=app mysql mariadb redis website postgresql mysql-cluster postgresql-cluster redis-cluster"`
|
Type string `json:"type" validate:"required,oneof=app mysql mariadb redis website postgresql mongodb mysql-cluster postgresql-cluster redis-cluster container compose"`
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
DetailName string `json:"detailName"`
|
DetailName string `json:"detailName"`
|
||||||
Secret string `json:"secret"`
|
Secret string `json:"secret"`
|
||||||
|
StopBefore bool `json:"stopBefore"`
|
||||||
TaskID string `json:"taskID"`
|
TaskID string `json:"taskID"`
|
||||||
FileName string `json:"fileName"`
|
FileName string `json:"fileName"`
|
||||||
Args []string `json:"args"`
|
Args []string `json:"args"`
|
||||||
@@ -76,15 +77,16 @@ type CommonBackup struct {
|
|||||||
Description string `json:"description"`
|
Description string `json:"description"`
|
||||||
}
|
}
|
||||||
type CommonRecover struct {
|
type CommonRecover struct {
|
||||||
DownloadAccountID uint `json:"downloadAccountID" validate:"required"`
|
DownloadAccountID uint `json:"downloadAccountID" validate:"required"`
|
||||||
Type string `json:"type" validate:"required,oneof=app mysql mariadb redis website postgresql mysql-cluster postgresql-cluster redis-cluster"`
|
Type string `json:"type" validate:"required,oneof=app mysql mariadb redis website postgresql mongodb mysql-cluster postgresql-cluster redis-cluster container compose"`
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
DetailName string `json:"detailName"`
|
DetailName string `json:"detailName"`
|
||||||
File string `json:"file"`
|
File string `json:"file"`
|
||||||
Secret string `json:"secret"`
|
Secret string `json:"secret"`
|
||||||
TaskID string `json:"taskID"`
|
DropAllCollections bool `json:"dropAllCollections"`
|
||||||
BackupRecordID uint `json:"backupRecordID"`
|
TaskID string `json:"taskID"`
|
||||||
Timeout int `json:"timeout"`
|
BackupRecordID uint `json:"backupRecordID"`
|
||||||
|
Timeout int `json:"timeout"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type RecordSearch struct {
|
type RecordSearch struct {
|
||||||
|
|||||||
@@ -11,6 +11,12 @@ type SearchPageWithType struct {
|
|||||||
Type string `json:"type"`
|
Type string `json:"type"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type SearchPageWithGroup struct {
|
||||||
|
PageInfo
|
||||||
|
GroupID uint `json:"groupID"`
|
||||||
|
Info string `json:"info"`
|
||||||
|
}
|
||||||
|
|
||||||
type PageInfo struct {
|
type PageInfo struct {
|
||||||
Page int `json:"page" validate:"required,number"`
|
Page int `json:"page" validate:"required,number"`
|
||||||
PageSize int `json:"pageSize" validate:"required,number"`
|
PageSize int `json:"pageSize" validate:"required,number"`
|
||||||
|
|||||||
+39
-10
@@ -48,6 +48,34 @@ type ContainerOptions struct {
|
|||||||
State string `json:"state"`
|
State string `json:"state"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type ContainerFileReq struct {
|
||||||
|
ContainerID string `json:"containerID" validate:"required"`
|
||||||
|
Path string `json:"path" validate:"required"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type ContainerFileBatchDeleteReq struct {
|
||||||
|
ContainerID string `json:"containerID" validate:"required"`
|
||||||
|
Paths []string `json:"paths" validate:"required,min=1,dive,required"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type ContainerFileInfo struct {
|
||||||
|
Name string `json:"name"`
|
||||||
|
Path string `json:"path"`
|
||||||
|
IsDir bool `json:"isDir"`
|
||||||
|
IsLink bool `json:"isLink"`
|
||||||
|
LinkTo string `json:"linkTo"`
|
||||||
|
Size int64 `json:"size"`
|
||||||
|
Mode string `json:"mode"`
|
||||||
|
ModTime string `json:"modTime"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type ContainerFileContent struct {
|
||||||
|
Content string `json:"content"`
|
||||||
|
Size int64 `json:"size"`
|
||||||
|
Truncated bool `json:"truncated"`
|
||||||
|
IsBinary bool `json:"isBinary"`
|
||||||
|
}
|
||||||
|
|
||||||
type ContainerStatus struct {
|
type ContainerStatus struct {
|
||||||
Created int `json:"created"`
|
Created int `json:"created"`
|
||||||
Running int `json:"running"`
|
Running int `json:"running"`
|
||||||
@@ -259,16 +287,17 @@ type BatchDelete struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type ComposeInfo struct {
|
type ComposeInfo struct {
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
CreatedAt string `json:"createdAt"`
|
CreatedAt string `json:"createdAt"`
|
||||||
CreatedBy string `json:"createdBy"`
|
CreatedBy string `json:"createdBy"`
|
||||||
ContainerCount int `json:"containerCount"`
|
ContainerCount int `json:"containerCount"`
|
||||||
RunningCount int `json:"runningCount"`
|
RunningCount int `json:"runningCount"`
|
||||||
ConfigFile string `json:"configFile"`
|
ConfigFile string `json:"configFile"`
|
||||||
Workdir string `json:"workdir"`
|
Workdir string `json:"workdir"`
|
||||||
Path string `json:"path"`
|
ComposeFileExists bool `json:"composeFileExists"`
|
||||||
Containers []ComposeContainer `json:"containers"`
|
Path string `json:"path"`
|
||||||
Env string `json:"env"`
|
Containers []ComposeContainer `json:"containers"`
|
||||||
|
Env string `json:"env"`
|
||||||
}
|
}
|
||||||
type ComposeContainer struct {
|
type ComposeContainer struct {
|
||||||
ContainerID string `json:"containerID"`
|
ContainerID string `json:"containerID"`
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import "time"
|
|||||||
|
|
||||||
type DashboardBase struct {
|
type DashboardBase struct {
|
||||||
WebsiteNumber int `json:"websiteNumber"`
|
WebsiteNumber int `json:"websiteNumber"`
|
||||||
|
AgentNumber int `json:"agentNumber"`
|
||||||
DatabaseNumber int `json:"databaseNumber"`
|
DatabaseNumber int `json:"databaseNumber"`
|
||||||
CronjobNumber int `json:"cronjobNumber"`
|
CronjobNumber int `json:"cronjobNumber"`
|
||||||
AppInstalledNumber int `json:"appInstalledNumber"`
|
AppInstalledNumber int `json:"appInstalledNumber"`
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ type DBConfUpdateByFile struct {
|
|||||||
type ChangeDBInfo struct {
|
type ChangeDBInfo struct {
|
||||||
ID uint `json:"id"`
|
ID uint `json:"id"`
|
||||||
From string `json:"from" validate:"required,oneof=local remote"`
|
From string `json:"from" validate:"required,oneof=local remote"`
|
||||||
Type string `json:"type" validate:"required,oneof=mysql mariadb postgresql redis mysql-cluster postgresql-cluster redis-cluster"`
|
Type string `json:"type" validate:"required,oneof=mysql mariadb postgresql redis mongodb mysql-cluster postgresql-cluster redis-cluster"`
|
||||||
Database string `json:"database" validate:"required"`
|
Database string `json:"database" validate:"required"`
|
||||||
Value string `json:"value" validate:"required"`
|
Value string `json:"value" validate:"required"`
|
||||||
}
|
}
|
||||||
@@ -137,6 +137,83 @@ type MysqlStatus struct {
|
|||||||
Position string `json:"Position"`
|
Position string `json:"Position"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// mongodb
|
||||||
|
type MongodbDBSearch struct {
|
||||||
|
PageInfo
|
||||||
|
Info string `json:"info"`
|
||||||
|
Database string `json:"database" validate:"required"`
|
||||||
|
OrderBy string `json:"orderBy" validate:"required,oneof=name createdAt"`
|
||||||
|
Order string `json:"order" validate:"required,oneof=null ascending descending"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type MongodbDBInfo struct {
|
||||||
|
ID uint `json:"id"`
|
||||||
|
CreatedAt time.Time `json:"createdAt"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
From string `json:"from"`
|
||||||
|
MongodbName string `json:"mongodbName"`
|
||||||
|
Username string `json:"username"`
|
||||||
|
Password string `json:"password"`
|
||||||
|
IsDelete bool `json:"isDelete"`
|
||||||
|
Description string `json:"description"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type MongodbDBCreate struct {
|
||||||
|
Name string `json:"name" validate:"required"`
|
||||||
|
From string `json:"from" validate:"required,oneof=local remote"`
|
||||||
|
Database string `json:"database" validate:"required"`
|
||||||
|
Username string `json:"username" validate:"required"`
|
||||||
|
Password string `json:"password" validate:"required"`
|
||||||
|
Permission string `json:"permission" validate:"required,oneof=dbOwner read readWrite userAdmin"`
|
||||||
|
Description string `json:"description"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type MongodbLoadDB struct {
|
||||||
|
From string `json:"from" validate:"required,oneof=local remote"`
|
||||||
|
Type string `json:"type" validate:"required,oneof=mongodb"`
|
||||||
|
Database string `json:"database" validate:"required"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type MongodbDBDeleteCheck struct {
|
||||||
|
ID uint `json:"id" validate:"required"`
|
||||||
|
Type string `json:"type" validate:"required,oneof=mongodb"`
|
||||||
|
Database string `json:"database" validate:"required"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type MongodbDBDelete struct {
|
||||||
|
ID uint `json:"id" validate:"required"`
|
||||||
|
Type string `json:"type" validate:"required,oneof=mongodb"`
|
||||||
|
Database string `json:"database" validate:"required"`
|
||||||
|
ForceDelete bool `json:"forceDelete"`
|
||||||
|
DeleteBackup bool `json:"deleteBackup"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type MongodbBind struct {
|
||||||
|
Database string `json:"database" validate:"required"`
|
||||||
|
Name string `json:"name" validate:"required"`
|
||||||
|
Username string `json:"username" validate:"required"`
|
||||||
|
Password string `json:"password" validate:"required"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type MongodbPassword struct {
|
||||||
|
Database string `json:"database" validate:"required"`
|
||||||
|
Name string `json:"name" validate:"required"`
|
||||||
|
Password string `json:"password" validate:"required"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type MongodbPrivileges struct {
|
||||||
|
Database string `json:"database" validate:"required"`
|
||||||
|
Name string `json:"name" validate:"required"`
|
||||||
|
Username string `json:"username" validate:"required"`
|
||||||
|
Permission string `json:"permission" validate:"required,oneof=dbOwner read readWrite userAdmin"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type MongodbPrivilegesLoad struct {
|
||||||
|
Database string `json:"database" validate:"required"`
|
||||||
|
Name string `json:"name" validate:"required"`
|
||||||
|
Username string `json:"username" validate:"required"`
|
||||||
|
}
|
||||||
|
|
||||||
type MysqlVariables struct {
|
type MysqlVariables struct {
|
||||||
BinlogCacheSize string `json:"binlog_cache_size"`
|
BinlogCacheSize string `json:"binlog_cache_size"`
|
||||||
InnodbBufferPoolSize string `json:"innodb_buffer_pool_size"`
|
InnodbBufferPoolSize string `json:"innodb_buffer_pool_size"`
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
package dto
|
package dto
|
||||||
|
|
||||||
import (
|
import "time"
|
||||||
"time"
|
|
||||||
)
|
|
||||||
|
|
||||||
type HostOperate struct {
|
type HostOperate struct {
|
||||||
ID uint `json:"id"`
|
ID uint `json:"id"`
|
||||||
@@ -34,11 +32,6 @@ type SearchForTree struct {
|
|||||||
Info string `json:"info"`
|
Info string `json:"info"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type ChangeHostGroup struct {
|
|
||||||
ID uint `json:"id" validate:"required"`
|
|
||||||
GroupID uint `json:"groupID" validate:"required"`
|
|
||||||
}
|
|
||||||
|
|
||||||
type HostInfo struct {
|
type HostInfo struct {
|
||||||
ID uint `json:"id"`
|
ID uint `json:"id"`
|
||||||
CreatedAt time.Time `json:"createdAt"`
|
CreatedAt time.Time `json:"createdAt"`
|
||||||
@@ -7,6 +7,7 @@ import (
|
|||||||
type SearchTaskLogReq struct {
|
type SearchTaskLogReq struct {
|
||||||
Status string `json:"status"`
|
Status string `json:"status"`
|
||||||
Type string `json:"type"`
|
Type string `json:"type"`
|
||||||
|
TaskID string `json:"taskID"`
|
||||||
PageInfo
|
PageInfo
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -9,6 +9,29 @@ type FileOption struct {
|
|||||||
files.FileOption
|
files.FileOption
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type FileAISearch struct {
|
||||||
|
Path string `json:"path" validate:"required"`
|
||||||
|
Query string `json:"query" validate:"required"`
|
||||||
|
ResponseLanguage string `json:"responseLanguage,omitempty"`
|
||||||
|
ContainSub *bool `json:"containSub,omitempty"`
|
||||||
|
MaxItems int `json:"maxItems" validate:"omitempty,min=1,max=2000"`
|
||||||
|
MatchCase bool `json:"matchCase"`
|
||||||
|
WholeWord bool `json:"wholeWord"`
|
||||||
|
UseRegex bool `json:"useRegex"`
|
||||||
|
Extensions []string `json:"extensions,omitempty"`
|
||||||
|
MinSize int64 `json:"minSize"`
|
||||||
|
MaxSize int64 `json:"maxSize"`
|
||||||
|
ModifiedAfter string `json:"modifiedAfter,omitempty"`
|
||||||
|
ModifiedBefore string `json:"modifiedBefore,omitempty"`
|
||||||
|
|
||||||
|
MaxScanFiles int `json:"maxScanFiles"`
|
||||||
|
MaxFileBytes int64 `json:"maxFileBytes"`
|
||||||
|
MaxHitsPerFile int `json:"maxHitsPerFile"`
|
||||||
|
MaxTotalHits int `json:"maxTotalHits"`
|
||||||
|
ContentHitsPromptMaxBytes int `json:"contentHitsPromptMaxBytes"`
|
||||||
|
LlmMaxOutputTokens int `json:"llmMaxOutputTokens"`
|
||||||
|
}
|
||||||
|
|
||||||
type FileContentReq struct {
|
type FileContentReq struct {
|
||||||
Path string `json:"path" validate:"required"`
|
Path string `json:"path" validate:"required"`
|
||||||
IsDetail bool `json:"isDetail"`
|
IsDetail bool `json:"isDetail"`
|
||||||
@@ -55,6 +78,11 @@ type FileCompress struct {
|
|||||||
Name string `json:"name" validate:"required"`
|
Name string `json:"name" validate:"required"`
|
||||||
Replace bool `json:"replace"`
|
Replace bool `json:"replace"`
|
||||||
Secret string `json:"secret"`
|
Secret string `json:"secret"`
|
||||||
|
TaskID string `json:"taskID"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type FileCompressStopReq struct {
|
||||||
|
TaskID string `json:"taskID" validate:"required"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type FileDeCompress struct {
|
type FileDeCompress struct {
|
||||||
@@ -62,6 +90,11 @@ type FileDeCompress struct {
|
|||||||
Type string `json:"type" validate:"required"`
|
Type string `json:"type" validate:"required"`
|
||||||
Path string `json:"path" validate:"required"`
|
Path string `json:"path" validate:"required"`
|
||||||
Secret string `json:"secret"`
|
Secret string `json:"secret"`
|
||||||
|
TaskID string `json:"taskID"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type FileDeCompressStopReq struct {
|
||||||
|
TaskID string `json:"taskID" validate:"required"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type FileEdit struct {
|
type FileEdit struct {
|
||||||
@@ -88,6 +121,7 @@ type FileWget struct {
|
|||||||
Path string `json:"path" validate:"required"`
|
Path string `json:"path" validate:"required"`
|
||||||
Name string `json:"name" validate:"required"`
|
Name string `json:"name" validate:"required"`
|
||||||
IgnoreCertificate bool `json:"ignoreCertificate"`
|
IgnoreCertificate bool `json:"ignoreCertificate"`
|
||||||
|
UseProxy bool `json:"useProxy"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type FileMove struct {
|
type FileMove struct {
|
||||||
@@ -129,13 +163,20 @@ type FileRoleUpdate struct {
|
|||||||
type FileReadByLineReq struct {
|
type FileReadByLineReq struct {
|
||||||
Page int `json:"page" validate:"required"`
|
Page int `json:"page" validate:"required"`
|
||||||
PageSize int `json:"pageSize" validate:"required"`
|
PageSize int `json:"pageSize" validate:"required"`
|
||||||
Type string `json:"type" validate:"required"`
|
Type string `json:"type"`
|
||||||
ID uint `json:"ID"`
|
ID uint `json:"ID"`
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
Latest bool `json:"latest"`
|
Latest bool `json:"latest"`
|
||||||
TaskReq
|
TaskReq
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type TaskLogReadReq struct {
|
||||||
|
Page int `json:"page" validate:"required,min=1"`
|
||||||
|
PageSize int `json:"pageSize" validate:"required,min=1"`
|
||||||
|
Latest bool `json:"latest"`
|
||||||
|
TaskReq
|
||||||
|
}
|
||||||
|
|
||||||
type TaskReq struct {
|
type TaskReq struct {
|
||||||
TaskID string `json:"taskID"`
|
TaskID string `json:"taskID"`
|
||||||
TaskType string `json:"taskType"`
|
TaskType string `json:"taskType"`
|
||||||
@@ -172,3 +213,9 @@ type FileRemarkUpdate struct {
|
|||||||
Path string `json:"path" validate:"required"`
|
Path string `json:"path" validate:"required"`
|
||||||
Remark string `json:"remark"`
|
Remark string `json:"remark"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type FileShareCreate struct {
|
||||||
|
Path string `json:"path" validate:"required"`
|
||||||
|
ExpireMinutes int `json:"expireMinutes" validate:"min=0,max=10080"`
|
||||||
|
Password *string `json:"password"`
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,52 @@
|
|||||||
|
package request
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/dto"
|
||||||
|
)
|
||||||
|
|
||||||
|
type FileHistorySearchReq struct {
|
||||||
|
dto.PageInfo
|
||||||
|
Path string `json:"path"`
|
||||||
|
Scope string `json:"scope" validate:"required,oneof=current all"`
|
||||||
|
Operation string `json:"operation"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type FileHistoryContentReq struct {
|
||||||
|
ID uint `json:"id" validate:"required"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type FileHistoryIDs []uint
|
||||||
|
|
||||||
|
func (ids *FileHistoryIDs) UnmarshalJSON(data []byte) error {
|
||||||
|
type alias []uint
|
||||||
|
var direct alias
|
||||||
|
if err := json.Unmarshal(data, &direct); err == nil {
|
||||||
|
*ids = FileHistoryIDs(direct)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
var wrapped struct {
|
||||||
|
IDs []uint `json:"ids"`
|
||||||
|
}
|
||||||
|
if err := json.Unmarshal(data, &wrapped); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
*ids = FileHistoryIDs(wrapped.IDs)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
type FileHistoryDeleteReq struct {
|
||||||
|
IDs FileHistoryIDs `json:"ids" validate:"required"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type FileHistoryRestoreReq struct {
|
||||||
|
ID uint `json:"id" validate:"required"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type FileHistorySettingUpdate struct {
|
||||||
|
Enable string `json:"enable" validate:"required,oneof=Enable Disable"`
|
||||||
|
MaxPerPath int `json:"maxPerPath" validate:"min=0,max=1000"`
|
||||||
|
DiskQuotaMB int `json:"diskQuotaMB" validate:"min=0,max=1048576"`
|
||||||
|
}
|
||||||
@@ -1,8 +1,12 @@
|
|||||||
package request
|
package request
|
||||||
|
|
||||||
type HostToolReq struct {
|
type HostToolTypeReq struct {
|
||||||
|
Type string `json:"type" validate:"required,oneof=supervisord"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type HostToolOperateReq struct {
|
||||||
Type string `json:"type" validate:"required,oneof=supervisord"`
|
Type string `json:"type" validate:"required,oneof=supervisord"`
|
||||||
Operate string `json:"operate" validate:"oneof=status restart start stop"`
|
Operate string `json:"operate" validate:"required,oneof=restart start stop"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type HostToolCreate struct {
|
type HostToolCreate struct {
|
||||||
@@ -15,13 +19,8 @@ type SupervisorConfig struct {
|
|||||||
ServiceName string `json:"serviceName"`
|
ServiceName string `json:"serviceName"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type HostToolLogReq struct {
|
type HostToolConfigUpdate struct {
|
||||||
Type string `json:"type" validate:"required,oneof=supervisord"`
|
|
||||||
}
|
|
||||||
|
|
||||||
type HostToolConfig struct {
|
|
||||||
Type string `json:"type" validate:"required,oneof=supervisord"`
|
Type string `json:"type" validate:"required,oneof=supervisord"`
|
||||||
Operate string `json:"operate" validate:"oneof=get set"`
|
|
||||||
Content string `json:"content"`
|
Content string `json:"content"`
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -43,3 +42,15 @@ type SupervisorProcessFileReq struct {
|
|||||||
Content string `json:"content"`
|
Content string `json:"content"`
|
||||||
File string `json:"file" validate:"required,oneof=out.log err.log config"`
|
File string `json:"file" validate:"required,oneof=out.log err.log config"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type HostSupervisorProcessFileGetReq struct {
|
||||||
|
Name string `json:"name" validate:"required"`
|
||||||
|
File string `json:"file" validate:"required,oneof=out.log err.log config"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type HostSupervisorProcessFileOperateReq struct {
|
||||||
|
Name string `json:"name" validate:"required"`
|
||||||
|
Operate string `json:"operate" validate:"required,oneof=clear update"`
|
||||||
|
Content string `json:"content"`
|
||||||
|
File string `json:"file" validate:"required,oneof=out.log err.log config"`
|
||||||
|
}
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
package request
|
|
||||||
@@ -223,9 +223,14 @@ type WebsiteNginxUpdate struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type WebsiteLogReq struct {
|
type WebsiteLogReq struct {
|
||||||
|
ID uint `json:"id" validate:"required"`
|
||||||
|
Operate string `json:"operate" validate:"required,oneof=enable disable delete"`
|
||||||
|
LogType string `json:"logType" validate:"required,oneof=access.log error.log"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type WebsiteLogSearchReq struct {
|
||||||
ID uint `json:"id" validate:"required"`
|
ID uint `json:"id" validate:"required"`
|
||||||
Operate string `json:"operate" validate:"required"`
|
LogType string `json:"logType" validate:"required,oneof=access.log error.log"`
|
||||||
LogType string `json:"logType" validate:"required"`
|
|
||||||
Page int `json:"page"`
|
Page int `json:"page"`
|
||||||
PageSize int `json:"pageSize"`
|
PageSize int `json:"pageSize"`
|
||||||
}
|
}
|
||||||
@@ -269,6 +274,7 @@ type WebsiteProxyConfig struct {
|
|||||||
Replaces map[string]string `json:"replaces"`
|
Replaces map[string]string `json:"replaces"`
|
||||||
SNI bool `json:"sni"`
|
SNI bool `json:"sni"`
|
||||||
ProxySSLName string `json:"proxySSLName"`
|
ProxySSLName string `json:"proxySSLName"`
|
||||||
|
SSLVerify bool `json:"sslVerify"`
|
||||||
CorsConfig
|
CorsConfig
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ type WebsiteSSLSearch struct {
|
|||||||
dto.PageInfo
|
dto.PageInfo
|
||||||
AcmeAccountID string `json:"acmeAccountID"`
|
AcmeAccountID string `json:"acmeAccountID"`
|
||||||
Domain string `json:"domain"`
|
Domain string `json:"domain"`
|
||||||
OrderBy string `json:"orderBy" validate:"omitempty,oneof=created_at expire_date"`
|
OrderBy string `json:"orderBy" validate:"omitempty,oneof=created_at updated_at expire_date"`
|
||||||
Order string `json:"order" validate:"omitempty,oneof=null ascending descending"`
|
Order string `json:"order" validate:"omitempty,oneof=null ascending descending"`
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -51,7 +51,6 @@ type WebsiteSSLApply struct {
|
|||||||
ID uint `json:"ID" validate:"required"`
|
ID uint `json:"ID" validate:"required"`
|
||||||
SkipDNSCheck bool `json:"skipDNSCheck"`
|
SkipDNSCheck bool `json:"skipDNSCheck"`
|
||||||
Nameservers []string `json:"nameservers"`
|
Nameservers []string `json:"nameservers"`
|
||||||
DisableLog bool `json:"disableLog"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type WebsiteSSLObtain struct {
|
type WebsiteSSLObtain struct {
|
||||||
@@ -62,7 +61,7 @@ type WebsiteSSLObtain struct {
|
|||||||
type WebsiteAcmeAccountCreate struct {
|
type WebsiteAcmeAccountCreate struct {
|
||||||
Email string `json:"email" validate:"required"`
|
Email string `json:"email" validate:"required"`
|
||||||
Type string `json:"type" validate:"required,oneof=letsencrypt zerossl buypass google custom"`
|
Type string `json:"type" validate:"required,oneof=letsencrypt zerossl buypass google custom"`
|
||||||
KeyType string `json:"keyType" validate:"required,oneof=P256 P384 2048 3072 4096 8192"`
|
KeyType string `json:"keyType" validate:"required,oneof=EC256 EC384 RSA2048 RSA3072 RSA4096 RSA8192"`
|
||||||
EabKid string `json:"eabKid"`
|
EabKid string `json:"eabKid"`
|
||||||
EabHmacKey string `json:"eabHmacKey"`
|
EabHmacKey string `json:"eabHmacKey"`
|
||||||
UseProxy bool `json:"useProxy"`
|
UseProxy bool `json:"useProxy"`
|
||||||
@@ -139,7 +138,7 @@ type WebsiteCACreate struct {
|
|||||||
Organization string `json:"organization" validate:"required"`
|
Organization string `json:"organization" validate:"required"`
|
||||||
OrganizationUint string `json:"organizationUint"`
|
OrganizationUint string `json:"organizationUint"`
|
||||||
Name string `json:"name" validate:"required"`
|
Name string `json:"name" validate:"required"`
|
||||||
KeyType string `json:"keyType" validate:"required,oneof=P256 P384 2048 3072 4096 8192"`
|
KeyType string `json:"keyType" validate:"required,oneof=EC256 EC384 RSA2048 RSA3072 RSA4096 RSA8192"`
|
||||||
Province string `json:"province" `
|
Province string `json:"province" `
|
||||||
City string `json:"city"`
|
City string `json:"city"`
|
||||||
}
|
}
|
||||||
@@ -147,7 +146,7 @@ type WebsiteCACreate struct {
|
|||||||
type WebsiteCAObtain struct {
|
type WebsiteCAObtain struct {
|
||||||
ID uint `json:"id" validate:"required"`
|
ID uint `json:"id" validate:"required"`
|
||||||
Domains string `json:"domains" validate:"required"`
|
Domains string `json:"domains" validate:"required"`
|
||||||
KeyType string `json:"keyType" validate:"required,oneof=P256 P384 2048 3072 4096 8192"`
|
KeyType string `json:"keyType" validate:"required,oneof=EC256 EC384 RSA2048 RSA3072 RSA4096 RSA8192"`
|
||||||
Time int `json:"time" validate:"required"`
|
Time int `json:"time" validate:"required"`
|
||||||
Unit string `json:"unit" validate:"required"`
|
Unit string `json:"unit" validate:"required"`
|
||||||
PushDir bool `json:"pushDir"`
|
PushDir bool `json:"pushDir"`
|
||||||
|
|||||||
@@ -85,3 +85,41 @@ type FileConvertLog struct {
|
|||||||
type FileRemarksRes struct {
|
type FileRemarksRes struct {
|
||||||
Remarks map[string]string `json:"remarks"`
|
Remarks map[string]string `json:"remarks"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type FileShareInfo struct {
|
||||||
|
Code string `json:"code"`
|
||||||
|
Path string `json:"path"`
|
||||||
|
FileName string `json:"fileName"`
|
||||||
|
ExpiresAt int64 `json:"expiresAt"`
|
||||||
|
Permanent bool `json:"permanent"`
|
||||||
|
HasPassword bool `json:"hasPassword"`
|
||||||
|
Password string `json:"password,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type FileSharePublicInfo struct {
|
||||||
|
FileName string `json:"fileName"`
|
||||||
|
ExpiresAt int64 `json:"expiresAt"`
|
||||||
|
Permanent bool `json:"permanent"`
|
||||||
|
HasPassword bool `json:"hasPassword"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type FileAIContentHit struct {
|
||||||
|
Path string `json:"path"`
|
||||||
|
Line int `json:"line"`
|
||||||
|
Text string `json:"text"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type FileAISearchResult struct {
|
||||||
|
Mode string `json:"mode"`
|
||||||
|
Summary string `json:"summary"`
|
||||||
|
Hits []FileAIContentHit `json:"hits"`
|
||||||
|
ContentScannedFiles int `json:"contentScannedFiles"`
|
||||||
|
ContentHitsTruncated bool `json:"contentHitsTruncated"`
|
||||||
|
Truncated bool `json:"truncated"`
|
||||||
|
PreFiltered bool `json:"preFiltered"`
|
||||||
|
ItemCount int `json:"itemCount"`
|
||||||
|
PromptTokens int `json:"promptTokens"`
|
||||||
|
CompletionTokens int `json:"completionTokens"`
|
||||||
|
TotalTokens int `json:"totalTokens"`
|
||||||
|
Duration string `json:"duration"`
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,31 @@
|
|||||||
|
package response
|
||||||
|
|
||||||
|
import "time"
|
||||||
|
|
||||||
|
type FileHistoryInfo struct {
|
||||||
|
ID uint `json:"id"`
|
||||||
|
FileID string `json:"fileId"`
|
||||||
|
Path string `json:"path"`
|
||||||
|
CurrentPath string `json:"currentPath"`
|
||||||
|
PreviousID uint `json:"previousId"`
|
||||||
|
SourcePath string `json:"sourcePath"`
|
||||||
|
TargetPath string `json:"targetPath"`
|
||||||
|
FileName string `json:"fileName"`
|
||||||
|
Extension string `json:"extension"`
|
||||||
|
FileMode string `json:"fileMode"`
|
||||||
|
Operation string `json:"operation"`
|
||||||
|
Deleted bool `json:"deleted"`
|
||||||
|
ContentSize int64 `json:"contentSize"`
|
||||||
|
ContentSHA string `json:"contentSHA"`
|
||||||
|
StoragePath string `json:"storagePath,omitempty"`
|
||||||
|
Content string `json:"content,omitempty"`
|
||||||
|
CurrentContent string `json:"currentContent,omitempty"`
|
||||||
|
CreatedAt time.Time `json:"createdAt"`
|
||||||
|
UpdatedAt time.Time `json:"updatedAt"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type FileHistorySettingInfo struct {
|
||||||
|
Enable string `json:"enable"`
|
||||||
|
MaxPerPath int `json:"maxPerPath"`
|
||||||
|
DiskQuotaMB int `json:"diskQuotaMB"`
|
||||||
|
}
|
||||||
@@ -23,7 +23,10 @@ type SettingInfo struct {
|
|||||||
AppStoreLastModified string `json:"appStoreLastModified"`
|
AppStoreLastModified string `json:"appStoreLastModified"`
|
||||||
AppStoreSyncStatus string `json:"appStoreSyncStatus"`
|
AppStoreSyncStatus string `json:"appStoreSyncStatus"`
|
||||||
|
|
||||||
FileRecycleBin string `json:"fileRecycleBin"`
|
FileRecycleBin string `json:"fileRecycleBin"`
|
||||||
|
LocalSSHConnShow string `json:"localSSHConnShow"`
|
||||||
|
|
||||||
|
FirewallPortWhiteList string `json:"firewallPortWhiteList"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type SettingUpdate struct {
|
type SettingUpdate struct {
|
||||||
@@ -31,6 +34,11 @@ type SettingUpdate struct {
|
|||||||
Value string `json:"value"`
|
Value string `json:"value"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type AgentSettingUpdate struct {
|
||||||
|
Key string `json:"key" validate:"required,oneof=SystemIP DockerSockPath FileRecycleBin FirewallPortWhiteList"`
|
||||||
|
Value string `json:"value"`
|
||||||
|
}
|
||||||
|
|
||||||
type SyncTime struct {
|
type SyncTime struct {
|
||||||
NtpSite string `json:"ntpSite" validate:"required"`
|
NtpSite string `json:"ntpSite" validate:"required"`
|
||||||
}
|
}
|
||||||
@@ -55,6 +63,7 @@ type CleanTree struct {
|
|||||||
Size uint64 `json:"size"`
|
Size uint64 `json:"size"`
|
||||||
IsCheck bool `json:"isCheck"`
|
IsCheck bool `json:"isCheck"`
|
||||||
IsRecommend bool `json:"isRecommend"`
|
IsRecommend bool `json:"isRecommend"`
|
||||||
|
CanDelete bool `json:"canDelete"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type Clean struct {
|
type Clean struct {
|
||||||
@@ -87,6 +96,19 @@ type SystemProxy struct {
|
|||||||
Password string `json:"password"`
|
Password string `json:"password"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type TerminalAIInfo struct {
|
||||||
|
AIStatus string `json:"aiStatus"`
|
||||||
|
AIAccountID string `json:"aiAccountId"`
|
||||||
|
AIPrefix string `json:"aiPrefix" validate:"required,oneof=@ai #ai /ai"`
|
||||||
|
AIRiskCommands string `json:"aiRiskCommands"`
|
||||||
|
AIRiskCommandsDefault string `json:"aiRiskCommandsDefault"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type FileManageAIInfo struct {
|
||||||
|
AIStatus string `json:"aiStatus"`
|
||||||
|
AIAccountID string `json:"aiAccountId"`
|
||||||
|
}
|
||||||
|
|
||||||
type CommonDescription struct {
|
type CommonDescription struct {
|
||||||
ID string `json:"id" validate:"required"`
|
ID string `json:"id" validate:"required"`
|
||||||
Type string `json:"type" validate:"required"`
|
Type string `json:"type" validate:"required"`
|
||||||
|
|||||||
+10
-3
@@ -4,7 +4,6 @@ import "time"
|
|||||||
|
|
||||||
type SSHUpdate struct {
|
type SSHUpdate struct {
|
||||||
Key string `json:"key" validate:"required"`
|
Key string `json:"key" validate:"required"`
|
||||||
OldValue string `json:"oldValue"`
|
|
||||||
NewValue string `json:"newValue"`
|
NewValue string `json:"newValue"`
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -50,10 +49,18 @@ type GenerateLoad struct {
|
|||||||
type SSHConf struct {
|
type SSHConf struct {
|
||||||
File string `json:"file"`
|
File string `json:"file"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type SSHConfUpdate struct {
|
||||||
|
Key string `json:"key" validate:"required"`
|
||||||
|
Path string `json:"path"`
|
||||||
|
Value string `json:"value"`
|
||||||
|
}
|
||||||
type SearchSSHLog struct {
|
type SearchSSHLog struct {
|
||||||
PageInfo
|
PageInfo
|
||||||
Info string `json:"info"`
|
Info string `json:"info"`
|
||||||
Status string `json:"Status" validate:"required,oneof=Success Failed All"`
|
Status string `json:"Status" validate:"required,oneof=Success Failed All"`
|
||||||
|
StartTime time.Time `json:"startTime"`
|
||||||
|
EndTime time.Time `json:"endTime"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type SSHHistory struct {
|
type SSHHistory struct {
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package model
|
|||||||
type Agent struct {
|
type Agent struct {
|
||||||
BaseModel
|
BaseModel
|
||||||
Name string `json:"name" gorm:"not null;unique"`
|
Name string `json:"name" gorm:"not null;unique"`
|
||||||
|
Remark string `json:"remark"`
|
||||||
AgentType string `json:"agentType" gorm:"default:openclaw"`
|
AgentType string `json:"agentType" gorm:"default:openclaw"`
|
||||||
Provider string `json:"provider"`
|
Provider string `json:"provider"`
|
||||||
Model string `json:"model"`
|
Model string `json:"model"`
|
||||||
@@ -15,6 +16,7 @@ type Agent struct {
|
|||||||
Status string `json:"status"`
|
Status string `json:"status"`
|
||||||
Message string `json:"message"`
|
Message string `json:"message"`
|
||||||
AppInstallID uint `json:"appInstallId"`
|
AppInstallID uint `json:"appInstallId"`
|
||||||
|
WebsiteID uint `json:"websiteId"`
|
||||||
AccountID uint `json:"accountId"`
|
AccountID uint `json:"accountId"`
|
||||||
ConfigPath string `json:"configPath"`
|
ConfigPath string `json:"configPath"`
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,17 +2,15 @@ package model
|
|||||||
|
|
||||||
type AgentAccount struct {
|
type AgentAccount struct {
|
||||||
BaseModel
|
BaseModel
|
||||||
Provider string `json:"provider"`
|
Provider string `json:"provider"`
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
APIKey string `json:"apiKey"`
|
APIKey string `json:"apiKey"`
|
||||||
BaseURL string `json:"baseUrl"`
|
BaseURL string `json:"baseUrl"`
|
||||||
Model string `json:"model"`
|
APIType string `json:"apiType"`
|
||||||
APIType string `json:"apiType"`
|
RememberAPIKey bool `json:"rememberApiKey"`
|
||||||
MaxTokens int `json:"maxTokens"`
|
Verified bool `json:"verified"`
|
||||||
ContextWindow int `json:"contextWindow"`
|
Remark string `json:"remark"`
|
||||||
RememberAPIKey bool `json:"rememberApiKey"`
|
MasterAccountID uint `json:"masterAccountId" gorm:"index"`
|
||||||
Verified bool `json:"verified"`
|
|
||||||
Remark string `json:"remark"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (AgentAccount) TableName() string {
|
func (AgentAccount) TableName() string {
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
package model
|
||||||
|
|
||||||
|
type AgentAccountModel struct {
|
||||||
|
BaseModel
|
||||||
|
AccountID uint `json:"accountId" gorm:"index"`
|
||||||
|
Model string `json:"model" gorm:"index"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
ContextWindow int `json:"contextWindow"`
|
||||||
|
MaxTokens int `json:"maxTokens"`
|
||||||
|
Reasoning bool `json:"reasoning"`
|
||||||
|
Input string `json:"input" gorm:"type:text"`
|
||||||
|
SortOrder int `json:"sortOrder" gorm:"index"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (AgentAccountModel) TableName() string {
|
||||||
|
return "agent_account_models"
|
||||||
|
}
|
||||||
@@ -9,9 +9,11 @@ type Alert struct {
|
|||||||
Count uint `gorm:"type:integer;not null" json:"count"`
|
Count uint `gorm:"type:integer;not null" json:"count"`
|
||||||
Project string `gorm:"type:varchar(64)" json:"project"`
|
Project string `gorm:"type:varchar(64)" json:"project"`
|
||||||
Status string `gorm:"type:varchar(64);not null" json:"status"`
|
Status string `gorm:"type:varchar(64);not null" json:"status"`
|
||||||
Method string `gorm:"type:varchar(64);not null" json:"method"`
|
Method string `gorm:"type:text;not null" json:"method"`
|
||||||
SendCount uint `gorm:"type:integer" json:"sendCount"`
|
SendCount uint `gorm:"type:integer" json:"sendCount"`
|
||||||
AdvancedParams string `gorm:"type:longText" json:"advancedParams"`
|
AdvancedParams string `gorm:"type:longText" json:"advancedParams"`
|
||||||
|
CreateUser string `gorm:"type:varchar(256)" json:"createUser"`
|
||||||
|
UpdateUser string `gorm:"type:varchar(256)" json:"updateUser"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type AlertTask struct {
|
type AlertTask struct {
|
||||||
@@ -19,7 +21,7 @@ type AlertTask struct {
|
|||||||
Type string `gorm:"type:varchar(64);not null" json:"type"`
|
Type string `gorm:"type:varchar(64);not null" json:"type"`
|
||||||
Quota string `gorm:"type:varchar(64)" json:"quota"`
|
Quota string `gorm:"type:varchar(64)" json:"quota"`
|
||||||
QuotaType string `gorm:"type:varchar(64)" json:"quotaType"`
|
QuotaType string `gorm:"type:varchar(64)" json:"quotaType"`
|
||||||
Method string `gorm:"type:varchar(64);not null;default:'sms'" json:"method"`
|
Method string `gorm:"type:varchar(128);not null;default:'sms'" json:"method"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type AlertLog struct {
|
type AlertLog struct {
|
||||||
@@ -34,15 +36,17 @@ type AlertLog struct {
|
|||||||
Message string `gorm:"type:varchar(256);" json:"message"`
|
Message string `gorm:"type:varchar(256);" json:"message"`
|
||||||
RecordId uint `gorm:"type:integer;" json:"recordId"`
|
RecordId uint `gorm:"type:integer;" json:"recordId"`
|
||||||
LicenseId string `gorm:"type:varchar(256);not null;" json:"licenseId" `
|
LicenseId string `gorm:"type:varchar(256);not null;" json:"licenseId" `
|
||||||
Method string `gorm:"type:varchar(64);not null;default:'sms'" json:"method"`
|
Method string `gorm:"type:varchar(128);not null;default:'sms'" json:"method"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type AlertConfig struct {
|
type AlertConfig struct {
|
||||||
BaseModel
|
BaseModel
|
||||||
Type string `gorm:"type:varchar(64);not null" json:"type"`
|
Type string `gorm:"type:varchar(64);not null" json:"type"`
|
||||||
Title string `gorm:"type:varchar(64);not null" json:"title"`
|
Title string `gorm:"type:varchar(64);not null" json:"title"`
|
||||||
Status string `gorm:"type:varchar(64);not null" json:"status"`
|
Status string `gorm:"type:varchar(64);not null" json:"status"`
|
||||||
Config string `gorm:"type:varchar(256);not null" json:"config"`
|
Config string `gorm:"type:varchar(256);not null" json:"config"`
|
||||||
|
CreateUser string `gorm:"type:varchar(256)" json:"createUser"`
|
||||||
|
UpdateUser string `gorm:"type:varchar(256)" json:"updateUser"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type LoginLog struct {
|
type LoginLog struct {
|
||||||
|
|||||||
@@ -0,0 +1,12 @@
|
|||||||
|
package model
|
||||||
|
|
||||||
|
type DatabaseMongodb struct {
|
||||||
|
BaseModel
|
||||||
|
Name string `json:"name" gorm:"not null"`
|
||||||
|
From string `json:"from" gorm:"not null;default:local"`
|
||||||
|
MongodbName string `json:"mongodbName" gorm:"not null"`
|
||||||
|
Username string `json:"username" gorm:"not null"`
|
||||||
|
Password string `json:"password" gorm:"not null"`
|
||||||
|
IsDelete bool `json:"isDelete"`
|
||||||
|
Description string `json:"description"`
|
||||||
|
}
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
package model
|
||||||
|
|
||||||
|
type FileHistory struct {
|
||||||
|
BaseModel
|
||||||
|
FileID string `json:"fileId" gorm:"not null;index:idx_file_history_file_id_created_at,priority:1;index:idx_file_history_file_id_deleted_created_at,priority:1"`
|
||||||
|
Path string `json:"path" gorm:"not null;index:idx_file_history_path_created_at,priority:1;index:idx_file_history_path_hash_created_at,priority:1;index:idx_file_history_related_path,priority:1"`
|
||||||
|
PathHash string `json:"pathHash" gorm:"not null;index:idx_file_history_path_created_at,priority:2;index:idx_file_history_path_hash_created_at,priority:2"`
|
||||||
|
PreviousID uint `json:"previousId" gorm:"index"`
|
||||||
|
SourcePath string `json:"sourcePath" gorm:"index:idx_file_history_related_path,priority:2"`
|
||||||
|
TargetPath string `json:"targetPath" gorm:"index:idx_file_history_related_path,priority:3"`
|
||||||
|
FileName string `json:"fileName" gorm:"not null"`
|
||||||
|
Extension string `json:"extension"`
|
||||||
|
FileMode string `json:"fileMode"`
|
||||||
|
Operation string `json:"operation" gorm:"not null;index:idx_file_history_operation_created_at,priority:1"`
|
||||||
|
Deleted bool `json:"deleted" gorm:"not null;default:false;index:idx_file_history_deleted_created_at,priority:1;index:idx_file_history_file_id_deleted_created_at,priority:2"`
|
||||||
|
ContentSize int64 `json:"contentSize" gorm:"not null"`
|
||||||
|
ContentSHA string `json:"contentSHA" gorm:"not null;index"`
|
||||||
|
StoragePath string `json:"storagePath" gorm:"not null;uniqueIndex"`
|
||||||
|
}
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
package model
|
||||||
|
|
||||||
|
type FileShare struct {
|
||||||
|
BaseModel
|
||||||
|
Path string `gorm:"not null;uniqueIndex" json:"path"`
|
||||||
|
Token string `gorm:"not null;uniqueIndex" json:"token"`
|
||||||
|
FileName string `gorm:"not null" json:"fileName"`
|
||||||
|
ExpiresUnix int64 `json:"expiresUnix"`
|
||||||
|
PasswordEnc string `json:"-"`
|
||||||
|
PasswordSalt string `json:"passwordSalt"`
|
||||||
|
PasswordHash string `json:"passwordHash"`
|
||||||
|
MaxDownloads int `json:"maxDownloads"`
|
||||||
|
DownloadCount int `json:"downloadCount"`
|
||||||
|
}
|
||||||
@@ -8,7 +8,7 @@ type WebsiteAcmeAccount struct {
|
|||||||
Type string `gorm:"not null;default:letsencrypt" json:"type"`
|
Type string `gorm:"not null;default:letsencrypt" json:"type"`
|
||||||
EabKid string `json:"eabKid"`
|
EabKid string `json:"eabKid"`
|
||||||
EabHmacKey string `json:"eabHmacKey"`
|
EabHmacKey string `json:"eabHmacKey"`
|
||||||
KeyType string `gorm:"not null;default:2048" json:"keyType"`
|
KeyType string `gorm:"not null;default:RSA2048" json:"keyType"`
|
||||||
UseProxy bool `gorm:"default:false" json:"useProxy"`
|
UseProxy bool `gorm:"default:false" json:"useProxy"`
|
||||||
CaDirURL string `json:"caDirURL"`
|
CaDirURL string `json:"caDirURL"`
|
||||||
UseEAB bool `json:"useEAB"`
|
UseEAB bool `json:"useEAB"`
|
||||||
|
|||||||
@@ -5,5 +5,5 @@ type WebsiteCA struct {
|
|||||||
CSR string `gorm:"not null;" json:"csr"`
|
CSR string `gorm:"not null;" json:"csr"`
|
||||||
Name string `gorm:"not null;" json:"name"`
|
Name string `gorm:"not null;" json:"name"`
|
||||||
PrivateKey string `gorm:"not null" json:"privateKey"`
|
PrivateKey string `gorm:"not null" json:"privateKey"`
|
||||||
KeyType string `gorm:"not null;default:2048" json:"keyType"`
|
KeyType string `gorm:"not null;default:RSA2048" json:"keyType"`
|
||||||
}
|
}
|
||||||
|
|||||||
+341
-163
@@ -5,8 +5,19 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
type Model struct {
|
type Model struct {
|
||||||
ID string
|
ID string
|
||||||
Name string
|
Name string
|
||||||
|
ContextWindow int
|
||||||
|
MaxTokens int
|
||||||
|
Reasoning bool
|
||||||
|
Input []string
|
||||||
|
}
|
||||||
|
|
||||||
|
type RuntimeDefault struct {
|
||||||
|
APIType string
|
||||||
|
ContextWindow int
|
||||||
|
MaxTokens int
|
||||||
|
Input []string
|
||||||
}
|
}
|
||||||
|
|
||||||
type Meta struct {
|
type Meta struct {
|
||||||
@@ -15,195 +26,298 @@ type Meta struct {
|
|||||||
Sort uint
|
Sort uint
|
||||||
DefaultBaseURL string
|
DefaultBaseURL string
|
||||||
EnvKey string
|
EnvKey string
|
||||||
|
Default RuntimeDefault
|
||||||
Models []Model
|
Models []Model
|
||||||
Enabled bool
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var catalog = map[string]Meta{
|
var catalog = map[string]Meta{
|
||||||
|
"custom": {
|
||||||
|
Key: "custom",
|
||||||
|
DisplayName: "Custom",
|
||||||
|
Sort: 10,
|
||||||
|
DefaultBaseURL: "",
|
||||||
|
EnvKey: "CUSTOM_API_KEY",
|
||||||
|
Default: RuntimeDefault{
|
||||||
|
APIType: "openai-completions",
|
||||||
|
ContextWindow: 128000,
|
||||||
|
MaxTokens: 8192,
|
||||||
|
Input: []string{"text"},
|
||||||
|
},
|
||||||
|
Models: []Model{},
|
||||||
|
},
|
||||||
"ollama": {
|
"ollama": {
|
||||||
Key: "ollama",
|
Key: "ollama",
|
||||||
DisplayName: "Ollama",
|
DisplayName: "Ollama",
|
||||||
Sort: 10,
|
Sort: 15,
|
||||||
Enabled: true,
|
Default: RuntimeDefault{
|
||||||
|
APIType: "openai-responses",
|
||||||
|
ContextWindow: 160000,
|
||||||
|
MaxTokens: 8192,
|
||||||
|
Input: []string{"text"},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
"vllm": {
|
||||||
|
Key: "vllm",
|
||||||
|
DisplayName: "vLLM",
|
||||||
|
Sort: 20,
|
||||||
|
DefaultBaseURL: "",
|
||||||
|
EnvKey: "VLLM_API_KEY",
|
||||||
|
Default: RuntimeDefault{
|
||||||
|
APIType: "openai-completions",
|
||||||
|
ContextWindow: 128000,
|
||||||
|
MaxTokens: 8192,
|
||||||
|
Input: []string{"text"},
|
||||||
|
},
|
||||||
|
Models: []Model{},
|
||||||
},
|
},
|
||||||
"deepseek": {
|
"deepseek": {
|
||||||
Key: "deepseek",
|
Key: "deepseek",
|
||||||
DisplayName: "DeepSeek",
|
DisplayName: "DeepSeek",
|
||||||
Sort: 20,
|
Sort: 25,
|
||||||
DefaultBaseURL: "https://api.deepseek.com/v1",
|
DefaultBaseURL: "https://api.deepseek.com/v1",
|
||||||
EnvKey: "DEEPSEEK_API_KEY",
|
EnvKey: "DEEPSEEK_API_KEY",
|
||||||
Enabled: true,
|
Default: RuntimeDefault{
|
||||||
Models: []Model{
|
APIType: "openai-completions",
|
||||||
{ID: "deepseek/deepseek-chat", Name: "DeepSeek Chat"},
|
ContextWindow: 131072,
|
||||||
{ID: "deepseek/deepseek-reasoner", Name: "DeepSeek Reasoner"},
|
MaxTokens: 8192,
|
||||||
{ID: "deepseek/deepseek-r1:1.5b", Name: "DeepSeek R1 1.5B"},
|
Input: []string{"text"},
|
||||||
},
|
},
|
||||||
},
|
|
||||||
"custom": {
|
|
||||||
Key: "custom",
|
|
||||||
DisplayName: "Custom",
|
|
||||||
Sort: 30,
|
|
||||||
DefaultBaseURL: "",
|
|
||||||
EnvKey: "CUSTOM_API_KEY",
|
|
||||||
Enabled: true,
|
|
||||||
Models: []Model{},
|
|
||||||
},
|
|
||||||
"openai": {
|
|
||||||
Key: "openai",
|
|
||||||
DisplayName: "OpenAI",
|
|
||||||
Sort: 40,
|
|
||||||
DefaultBaseURL: "https://api.openai.com/v1",
|
|
||||||
EnvKey: "OPENAI_API_KEY",
|
|
||||||
Enabled: true,
|
|
||||||
Models: []Model{
|
Models: []Model{
|
||||||
{ID: "openai/codex-mini-latest", Name: "Codex Mini"},
|
{ID: "deepseek/deepseek-v4-flash", Name: "deepseek-v4-flash"},
|
||||||
{ID: "openai/gpt-4.1", Name: "GPT-4.1"},
|
{ID: "deepseek/deepseek-v4-pro", Name: "deepseek-v4-pro"},
|
||||||
{ID: "openai/gpt-4o", Name: "GPT-4o"},
|
|
||||||
{ID: "openai/gpt-4o-mini", Name: "GPT-4o Mini"},
|
|
||||||
{ID: "openai/gpt-5", Name: "GPT-5"},
|
|
||||||
{ID: "openai/gpt-5-mini", Name: "GPT-5 Mini"},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
"anthropic": {
|
|
||||||
Key: "anthropic",
|
|
||||||
DisplayName: "Anthropic",
|
|
||||||
Sort: 50,
|
|
||||||
DefaultBaseURL: "https://api.anthropic.com",
|
|
||||||
EnvKey: "ANTHROPIC_API_KEY",
|
|
||||||
Enabled: true,
|
|
||||||
Models: []Model{
|
|
||||||
{ID: "anthropic/claude-3-haiku-20240307", Name: "Claude 3 Haiku"},
|
|
||||||
{ID: "anthropic/claude-3-5-haiku-latest", Name: "Claude 3.5 Haiku"},
|
|
||||||
{ID: "anthropic/claude-3-5-sonnet-20241022", Name: "Claude 3.5 Sonnet"},
|
|
||||||
{ID: "anthropic/claude-3-7-sonnet-20250219", Name: "Claude 3.7 Sonnet"},
|
|
||||||
{ID: "anthropic/claude-opus-4-1", Name: "Claude Opus 4.1"},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
"gemini": {
|
|
||||||
Key: "gemini",
|
|
||||||
DisplayName: "Gemini",
|
|
||||||
Sort: 60,
|
|
||||||
DefaultBaseURL: "https://generativelanguage.googleapis.com",
|
|
||||||
EnvKey: "GEMINI_API_KEY",
|
|
||||||
Enabled: true,
|
|
||||||
Models: []Model{
|
|
||||||
{ID: "google/gemini-1.5-flash", Name: "Gemini 1.5 Flash"},
|
|
||||||
{ID: "google/gemini-1.5-pro", Name: "Gemini 1.5 Pro"},
|
|
||||||
{ID: "google/gemini-2.0-flash", Name: "Gemini 2.0 Flash"},
|
|
||||||
{ID: "google/gemini-2.5-flash", Name: "Gemini 2.5 Flash"},
|
|
||||||
{ID: "google/gemini-2.5-pro", Name: "Gemini 2.5 Pro"},
|
|
||||||
{ID: "google/gemini-3-flash-preview", Name: "Gemini 3 Flash Preview"},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
"minimax": {
|
|
||||||
Key: "minimax",
|
|
||||||
DisplayName: "MiniMax (CN)",
|
|
||||||
Sort: 70,
|
|
||||||
DefaultBaseURL: "https://api.minimaxi.com/anthropic",
|
|
||||||
EnvKey: "MINIMAX_API_KEY",
|
|
||||||
Enabled: true,
|
|
||||||
Models: []Model{
|
|
||||||
{ID: "minimax/MiniMax-M2.1", Name: "MiniMax M2.1"},
|
|
||||||
{ID: "minimax/MiniMax-M2.1-lightning", Name: "MiniMax M2.1 Lightning"},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
"moonshot": {
|
|
||||||
Key: "moonshot",
|
|
||||||
DisplayName: "Moonshot (Global)",
|
|
||||||
Sort: 80,
|
|
||||||
DefaultBaseURL: "https://api.moonshot.ai/v1",
|
|
||||||
EnvKey: "MOONSHOT_API_KEY",
|
|
||||||
Enabled: true,
|
|
||||||
Models: []Model{
|
|
||||||
{ID: "moonshot/kimi-k2.5", Name: "Kimi K2.5"},
|
|
||||||
{ID: "moonshot/kimi-k2-0905-preview", Name: "Kimi K2 0905 Preview"},
|
|
||||||
{ID: "moonshot/kimi-k2-thinking", Name: "Kimi K2 Thinking"},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
"kimi": {
|
|
||||||
Key: "kimi",
|
|
||||||
DisplayName: "Kimi (CN)",
|
|
||||||
Sort: 90,
|
|
||||||
DefaultBaseURL: "https://api.moonshot.cn/v1",
|
|
||||||
EnvKey: "KIMI_API_KEY",
|
|
||||||
Enabled: true,
|
|
||||||
Models: []Model{
|
|
||||||
{ID: "kimi/kimi-k2.5", Name: "Kimi K2.5"},
|
|
||||||
{ID: "kimi/kimi-k2-0905-preview", Name: "Kimi K2 0905 Preview"},
|
|
||||||
{ID: "kimi/kimi-k2-thinking", Name: "Kimi K2 Thinking"},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
"zai": {
|
|
||||||
Key: "zai",
|
|
||||||
DisplayName: "Z.ai",
|
|
||||||
Sort: 95,
|
|
||||||
DefaultBaseURL: "https://open.bigmodel.cn/api/paas/v4",
|
|
||||||
EnvKey: "ZAI_API_KEY",
|
|
||||||
Enabled: true,
|
|
||||||
Models: []Model{
|
|
||||||
{ID: "zai/glm-5", Name: "GLM-5"},
|
|
||||||
{ID: "zai/glm-4.7", Name: "GLM-4.7"},
|
|
||||||
{ID: "zai/glm-4.7-flash", Name: "GLM-4.7-Flash"},
|
|
||||||
{ID: "zai/glm-4.7-flashx", Name: "GLM-4.7-FlashX"},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
"kimi-coding": {
|
|
||||||
Key: "kimi-coding",
|
|
||||||
DisplayName: "Kimi Coding",
|
|
||||||
Sort: 100,
|
|
||||||
DefaultBaseURL: "https://api.kimi.com/coding/",
|
|
||||||
EnvKey: "KIMI_API_KEY",
|
|
||||||
Enabled: true,
|
|
||||||
Models: []Model{
|
|
||||||
{ID: "kimi-coding/k2p5", Name: "Kimi K2.5"},
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
"bailian-coding-plan": {
|
"bailian-coding-plan": {
|
||||||
Key: "bailian-coding-plan",
|
Key: "bailian-coding-plan",
|
||||||
DisplayName: "阿里云百炼 Coding Plan",
|
DisplayName: "阿里云百炼 Coding Plan",
|
||||||
Sort: 11,
|
Sort: 30,
|
||||||
DefaultBaseURL: "https://coding.dashscope.aliyuncs.com/v1",
|
DefaultBaseURL: "https://coding.dashscope.aliyuncs.com/v1",
|
||||||
EnvKey: "QWEN_API_KEY",
|
EnvKey: "QWEN_API_KEY",
|
||||||
Enabled: true,
|
Default: RuntimeDefault{
|
||||||
|
APIType: "openai-completions",
|
||||||
|
ContextWindow: 256000,
|
||||||
|
MaxTokens: 8192,
|
||||||
|
Input: []string{"text"},
|
||||||
|
},
|
||||||
Models: []Model{
|
Models: []Model{
|
||||||
{ID: "bailian-coding-plan/qwen3.5-plus", Name: "Qwen3.5-Plus"},
|
{ID: "bailian-coding-plan/qwen3.5-plus", Name: "Qwen3.5-Plus", Reasoning: true},
|
||||||
{ID: "bailian-coding-plan/qwen3-max", Name: "Qwen3-Max"},
|
{ID: "bailian-coding-plan/qwen3-max", Name: "Qwen3-Max", Reasoning: true},
|
||||||
{ID: "bailian-coding-plan/qwen3-coder-next", Name: "Qwen3-Coder-Next"},
|
{ID: "bailian-coding-plan/qwen3-coder-next", Name: "Qwen3-Coder-Next", Reasoning: true},
|
||||||
{ID: "bailian-coding-plan/qwen3-coder-plus", Name: "Qwen3-Coder-Plus"},
|
{ID: "bailian-coding-plan/qwen3-coder-plus", Name: "Qwen3-Coder-Plus", Reasoning: true},
|
||||||
{ID: "bailian-coding-plan/minimax-m2.5", Name: "MiniMax M2.5"},
|
{ID: "bailian-coding-plan/minimax-m2.5", Name: "MiniMax M2.5", Reasoning: true},
|
||||||
{ID: "bailian-coding-plan/glm-5", Name: "GLM-5"},
|
{ID: "bailian-coding-plan/glm-5", Name: "GLM-5", Reasoning: true},
|
||||||
{ID: "bailian-coding-plan/kimi-k2.5", Name: "Kimi-k2.5"},
|
{ID: "bailian-coding-plan/kimi-k2.5", Name: "Kimi-k2.5", Reasoning: true},
|
||||||
{ID: "bailian-coding-plan/glm-4.7", Name: "GLM-4.7"},
|
{ID: "bailian-coding-plan/glm-4.7", Name: "GLM-4.7", Reasoning: true},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
"ark-coding-plan": {
|
"ark-coding-plan": {
|
||||||
Key: "ark-coding-plan",
|
Key: "ark-coding-plan",
|
||||||
DisplayName: "方舟 Coding Plan",
|
DisplayName: "方舟 Coding Plan",
|
||||||
Sort: 12,
|
Sort: 35,
|
||||||
DefaultBaseURL: "https://ark.cn-beijing.volces.com/api/coding/v3",
|
DefaultBaseURL: "https://ark.cn-beijing.volces.com/api/coding/v3",
|
||||||
EnvKey: "ARK_API_KEY",
|
EnvKey: "ARK_API_KEY",
|
||||||
Enabled: true,
|
Default: RuntimeDefault{
|
||||||
|
APIType: "openai-completions",
|
||||||
|
ContextWindow: 256000,
|
||||||
|
MaxTokens: 4096,
|
||||||
|
Input: []string{"text"},
|
||||||
|
},
|
||||||
Models: []Model{
|
Models: []Model{
|
||||||
{ID: "ark-coding-plan/doubao-seed-2.0-code", Name: "Doubao-Seed-2.0-Code"},
|
{ID: "ark-coding-plan/ark-code-latest", Name: "Ark Coding Plan", ContextWindow: 256000, MaxTokens: 4096},
|
||||||
{ID: "ark-coding-plan/doubao-seed-code", Name: "Doubao-Seed-Code"},
|
{ID: "ark-coding-plan/doubao-seed-code", Name: "Doubao Seed Code", ContextWindow: 256000, MaxTokens: 4096},
|
||||||
{ID: "ark-coding-plan/kimi-k2.5", Name: "Kimi-K2.5"},
|
{ID: "ark-coding-plan/glm-4.7", Name: "GLM 4.7 Coding", ContextWindow: 200000, MaxTokens: 4096},
|
||||||
{ID: "ark-coding-plan/glm-4.7", Name: "GLM-4.7"},
|
{ID: "ark-coding-plan/kimi-k2-thinking", Name: "Kimi K2 Thinking", ContextWindow: 256000, MaxTokens: 4096},
|
||||||
{ID: "ark-coding-plan/deepseek-v3.2", Name: "DeepSeek-V3.2"},
|
{ID: "ark-coding-plan/kimi-k2.5", Name: "Kimi K2.5 Coding", ContextWindow: 256000, MaxTokens: 4096},
|
||||||
{ID: "ark-coding-plan/kimi-k2-thinking", Name: "Kimi-K2-thinking"},
|
{ID: "ark-coding-plan/doubao-seed-code-preview-251028", Name: "Doubao Seed Code Preview", ContextWindow: 256000, MaxTokens: 4096},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
"qwen": {
|
"zai": {
|
||||||
Key: "qwen",
|
Key: "zai",
|
||||||
DisplayName: "Qwen",
|
DisplayName: "Z.ai",
|
||||||
Sort: 110,
|
Sort: 40,
|
||||||
DefaultBaseURL: "https://dashscope.aliyuncs.com/compatible-mode/v1",
|
DefaultBaseURL: "https://open.bigmodel.cn/api/paas/v4",
|
||||||
EnvKey: "QWEN_API_KEY",
|
EnvKey: "ZAI_API_KEY",
|
||||||
Enabled: false,
|
Default: RuntimeDefault{
|
||||||
|
APIType: "openai-completions",
|
||||||
|
ContextWindow: 204800,
|
||||||
|
MaxTokens: 131072,
|
||||||
|
Input: []string{"text"},
|
||||||
|
},
|
||||||
|
Models: []Model{
|
||||||
|
{ID: "zai/glm-5", Name: "GLM-5", Reasoning: true},
|
||||||
|
{ID: "zai/glm-4.7", Name: "GLM-4.7", Reasoning: true},
|
||||||
|
{ID: "zai/glm-4.7-flash", Name: "GLM-4.7-Flash", Reasoning: true},
|
||||||
|
{ID: "zai/glm-4.7-flashx", Name: "GLM-4.7-FlashX", Reasoning: true},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
"minimax": {
|
||||||
|
Key: "minimax",
|
||||||
|
DisplayName: "MiniMax (CN)",
|
||||||
|
Sort: 45,
|
||||||
|
DefaultBaseURL: "https://api.minimaxi.com/anthropic",
|
||||||
|
EnvKey: "MINIMAX_API_KEY",
|
||||||
|
Default: RuntimeDefault{
|
||||||
|
APIType: "anthropic-messages",
|
||||||
|
ContextWindow: 200000,
|
||||||
|
MaxTokens: 8192,
|
||||||
|
Input: []string{"text"},
|
||||||
|
},
|
||||||
|
Models: []Model{
|
||||||
|
{ID: "minimax/MiniMax-M2.7", Name: "MiniMax M2.7"},
|
||||||
|
{ID: "minimax/MiniMax-M2.7-highspeed", Name: "MiniMax M2.7 highspeed"},
|
||||||
|
{ID: "minimax/MiniMax-M2.5", Name: "MiniMax M2.5", Reasoning: true},
|
||||||
|
{ID: "minimax/MiniMax-M2.5-highspeed", Name: "MiniMax M2.5 highspeed"},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
"xiaomi": {
|
||||||
|
Key: "xiaomi",
|
||||||
|
DisplayName: "Xiaomi",
|
||||||
|
Sort: 46,
|
||||||
|
DefaultBaseURL: "https://api.xiaomimimo.com/v1",
|
||||||
|
EnvKey: "XIAOMI_API_KEY",
|
||||||
|
Default: RuntimeDefault{
|
||||||
|
APIType: "openai-completions",
|
||||||
|
ContextWindow: 262144,
|
||||||
|
MaxTokens: 8192,
|
||||||
|
Input: []string{"text"},
|
||||||
|
},
|
||||||
|
Models: []Model{
|
||||||
|
{ID: "xiaomi/mimo-v2-flash", Name: "Xiaomi MiMo V2 Flash", ContextWindow: 262144, MaxTokens: 8192, Input: []string{"text"}},
|
||||||
|
{ID: "xiaomi/mimo-v2-pro", Name: "Xiaomi MiMo V2 Pro", ContextWindow: 1048576, MaxTokens: 32000, Reasoning: true, Input: []string{"text"}},
|
||||||
|
{ID: "xiaomi/mimo-v2-omni", Name: "Xiaomi MiMo V2 Omni", ContextWindow: 262144, MaxTokens: 32000, Reasoning: true, Input: []string{"text", "image"}},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
"kimi": {
|
||||||
|
Key: "kimi",
|
||||||
|
DisplayName: "Kimi (CN)",
|
||||||
|
Sort: 50,
|
||||||
|
DefaultBaseURL: "https://api.moonshot.cn/v1",
|
||||||
|
EnvKey: "KIMI_API_KEY",
|
||||||
|
Default: RuntimeDefault{
|
||||||
|
APIType: "openai-completions",
|
||||||
|
ContextWindow: 256000,
|
||||||
|
MaxTokens: 8192,
|
||||||
|
Input: []string{"text", "image"},
|
||||||
|
},
|
||||||
|
Models: []Model{
|
||||||
|
{ID: "kimi/kimi-k2.5", Name: "Kimi K2.5", Reasoning: true},
|
||||||
|
{ID: "kimi/kimi-k2-0905-preview", Name: "Kimi K2 0905 Preview"},
|
||||||
|
{ID: "kimi/kimi-k2-thinking", Name: "Kimi K2 Thinking", Reasoning: true},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
"kimi-coding": {
|
||||||
|
Key: "kimi-coding",
|
||||||
|
DisplayName: "Kimi Coding",
|
||||||
|
Sort: 51,
|
||||||
|
DefaultBaseURL: "https://api.kimi.com/coding/",
|
||||||
|
EnvKey: "KIMI_API_KEY",
|
||||||
|
Default: RuntimeDefault{
|
||||||
|
APIType: "anthropic-messages",
|
||||||
|
ContextWindow: 262144,
|
||||||
|
MaxTokens: 32768,
|
||||||
|
Input: []string{"text", "image"},
|
||||||
|
},
|
||||||
|
Models: []Model{
|
||||||
|
{ID: "kimi-coding/kimi-code", Name: "Kimi Code", ContextWindow: 262144, MaxTokens: 32768, Reasoning: true, Input: []string{"text", "image"}},
|
||||||
|
{ID: "kimi-coding/k2p5", Name: "Kimi K2.5", ContextWindow: 262144, MaxTokens: 32768, Reasoning: true, Input: []string{"text", "image"}},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
"openai": {
|
||||||
|
Key: "openai",
|
||||||
|
DisplayName: "OpenAI",
|
||||||
|
Sort: 55,
|
||||||
|
DefaultBaseURL: "https://api.openai.com/v1",
|
||||||
|
EnvKey: "OPENAI_API_KEY",
|
||||||
|
Default: RuntimeDefault{
|
||||||
|
APIType: "openai-responses",
|
||||||
|
ContextWindow: 272000,
|
||||||
|
MaxTokens: 128000,
|
||||||
|
Input: []string{"text", "image"},
|
||||||
|
},
|
||||||
|
Models: []Model{
|
||||||
|
{ID: "openai/gpt-5.4", Name: "gpt-5.4", ContextWindow: 272000, MaxTokens: 128000, Reasoning: true, Input: []string{"text", "image"}},
|
||||||
|
{ID: "openai/gpt-5.4-pro", Name: "gpt-5.4-pro", ContextWindow: 1050000, MaxTokens: 128000, Reasoning: true, Input: []string{"text", "image"}},
|
||||||
|
{ID: "openai/gpt-5.4-mini", Name: "gpt-5.4-mini", ContextWindow: 400000, MaxTokens: 128000, Reasoning: true, Input: []string{"text", "image"}},
|
||||||
|
{ID: "openai/gpt-5.4-nano", Name: "gpt-5.4-nano", ContextWindow: 400000, MaxTokens: 128000, Reasoning: true, Input: []string{"text", "image"}},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
"openrouter": {
|
||||||
|
Key: "openrouter",
|
||||||
|
DisplayName: "OpenRouter",
|
||||||
|
Sort: 56,
|
||||||
|
DefaultBaseURL: "https://openrouter.ai/api/v1",
|
||||||
|
EnvKey: "OPENROUTER_API_KEY",
|
||||||
|
Default: RuntimeDefault{
|
||||||
|
APIType: "openai-completions",
|
||||||
|
ContextWindow: 128000,
|
||||||
|
MaxTokens: 8192,
|
||||||
|
Input: []string{"text"},
|
||||||
|
},
|
||||||
|
Models: []Model{
|
||||||
|
{ID: "openrouter/free", Name: "openrouter/free"},
|
||||||
|
{ID: "openrouter/auto", Name: "openrouter/auto"},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
"anthropic": {
|
||||||
|
Key: "anthropic",
|
||||||
|
DisplayName: "Anthropic",
|
||||||
|
Sort: 60,
|
||||||
|
DefaultBaseURL: "https://api.anthropic.com",
|
||||||
|
EnvKey: "ANTHROPIC_API_KEY",
|
||||||
|
Default: RuntimeDefault{
|
||||||
|
APIType: "anthropic-messages",
|
||||||
|
ContextWindow: 256000,
|
||||||
|
MaxTokens: 8192,
|
||||||
|
Input: []string{"text", "image"},
|
||||||
|
},
|
||||||
|
Models: []Model{
|
||||||
|
{ID: "anthropic/claude-sonnet-4-6", Name: "Claude Sonnet 4.6", Reasoning: true},
|
||||||
|
{ID: "anthropic/claude-opus-4-6", Name: "Claude Opus 4.6", Reasoning: true},
|
||||||
|
{ID: "anthropic/claude-opus-4-5", Name: "Claude Opus 4.5"},
|
||||||
|
{ID: "anthropic/claude-sonnet-4-5", Name: "Claude Sonnet 4.5"},
|
||||||
|
{ID: "anthropic/claude-haiku-4-5", Name: "Claude Haiku 4.5"},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
"gemini": {
|
||||||
|
Key: "gemini",
|
||||||
|
DisplayName: "Gemini",
|
||||||
|
Sort: 65,
|
||||||
|
DefaultBaseURL: "https://generativelanguage.googleapis.com",
|
||||||
|
EnvKey: "GEMINI_API_KEY",
|
||||||
|
Default: RuntimeDefault{
|
||||||
|
APIType: "openai-completions",
|
||||||
|
ContextWindow: 256000,
|
||||||
|
MaxTokens: 8192,
|
||||||
|
Input: []string{"text", "image"},
|
||||||
|
},
|
||||||
|
Models: []Model{
|
||||||
|
{ID: "google/gemini-3-flash-preview", Name: "Gemini 3 Flash Preview", Reasoning: true},
|
||||||
|
{ID: "google/gemini-flash-latest", Name: "Gemini Flash Latest"},
|
||||||
|
{ID: "google/gemini-3-pro-preview", Name: "Gemini 3 Pro Preview", Reasoning: true},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
"moonshot": {
|
||||||
|
Key: "moonshot",
|
||||||
|
DisplayName: "Moonshot (Global)",
|
||||||
|
Sort: 70,
|
||||||
|
DefaultBaseURL: "https://api.moonshot.ai/v1",
|
||||||
|
EnvKey: "MOONSHOT_API_KEY",
|
||||||
|
Default: RuntimeDefault{
|
||||||
|
APIType: "openai-completions",
|
||||||
|
ContextWindow: 256000,
|
||||||
|
MaxTokens: 8192,
|
||||||
|
Input: []string{"text"},
|
||||||
|
},
|
||||||
|
Models: []Model{
|
||||||
|
{ID: "moonshot/kimi-k2.5", Name: "Kimi K2.5", Reasoning: true},
|
||||||
|
{ID: "moonshot/kimi-k2-0905-preview", Name: "Kimi K2 0905 Preview"},
|
||||||
|
{ID: "moonshot/kimi-k2-thinking", Name: "Kimi K2 Thinking", Reasoning: true},
|
||||||
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
func Get(key string) (Meta, bool) {
|
func Get(key string) (Meta, bool) {
|
||||||
meta, ok := catalog[strings.ToLower(strings.TrimSpace(key))]
|
meta, ok := catalog[key]
|
||||||
if !ok {
|
if !ok {
|
||||||
return Meta{}, false
|
return Meta{}, false
|
||||||
}
|
}
|
||||||
@@ -218,13 +332,8 @@ func All() map[string]Meta {
|
|||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
|
|
||||||
func IsEnabled(key string) bool {
|
|
||||||
meta, ok := catalog[strings.ToLower(strings.TrimSpace(key))]
|
|
||||||
return ok && meta.Enabled
|
|
||||||
}
|
|
||||||
|
|
||||||
func DefaultBaseURL(key string) (string, bool) {
|
func DefaultBaseURL(key string) (string, bool) {
|
||||||
meta, ok := catalog[strings.ToLower(strings.TrimSpace(key))]
|
meta, ok := catalog[key]
|
||||||
if !ok || strings.TrimSpace(meta.DefaultBaseURL) == "" {
|
if !ok || strings.TrimSpace(meta.DefaultBaseURL) == "" {
|
||||||
return "", false
|
return "", false
|
||||||
}
|
}
|
||||||
@@ -232,7 +341,7 @@ func DefaultBaseURL(key string) (string, bool) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func EnvKey(key string) string {
|
func EnvKey(key string) string {
|
||||||
meta, ok := catalog[strings.ToLower(strings.TrimSpace(key))]
|
meta, ok := catalog[key]
|
||||||
if !ok {
|
if !ok {
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
@@ -240,7 +349,7 @@ func EnvKey(key string) string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func DisplayName(key string) string {
|
func DisplayName(key string) string {
|
||||||
meta, ok := catalog[strings.ToLower(strings.TrimSpace(key))]
|
meta, ok := catalog[key]
|
||||||
if !ok {
|
if !ok {
|
||||||
return key
|
return key
|
||||||
}
|
}
|
||||||
@@ -250,11 +359,80 @@ func DisplayName(key string) string {
|
|||||||
return meta.DisplayName
|
return meta.DisplayName
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func FindModel(key, modelID string) (Model, bool) {
|
||||||
|
meta, ok := Get(key)
|
||||||
|
if !ok {
|
||||||
|
return Model{}, false
|
||||||
|
}
|
||||||
|
for _, item := range meta.Models {
|
||||||
|
if item.ID == modelID {
|
||||||
|
return item, true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return Model{}, false
|
||||||
|
}
|
||||||
|
|
||||||
func cloneMeta(meta Meta) Meta {
|
func cloneMeta(meta Meta) Meta {
|
||||||
clone := meta
|
clone := meta
|
||||||
|
if len(meta.Default.Input) > 0 {
|
||||||
|
clone.Default.Input = make([]string, len(meta.Default.Input))
|
||||||
|
copy(clone.Default.Input, meta.Default.Input)
|
||||||
|
}
|
||||||
if len(meta.Models) > 0 {
|
if len(meta.Models) > 0 {
|
||||||
clone.Models = make([]Model, len(meta.Models))
|
clone.Models = make([]Model, len(meta.Models))
|
||||||
copy(clone.Models, meta.Models)
|
for i, item := range meta.Models {
|
||||||
|
clone.Models[i] = normalizeModel(meta, item)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return clone
|
return clone
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func normalizeModel(meta Meta, model Model) Model {
|
||||||
|
clone := model
|
||||||
|
clone.ID = strings.TrimSpace(clone.ID)
|
||||||
|
clone.Name = strings.TrimSpace(clone.Name)
|
||||||
|
if clone.Name == "" {
|
||||||
|
clone.Name = clone.ID
|
||||||
|
}
|
||||||
|
if clone.MaxTokens <= 0 {
|
||||||
|
clone.MaxTokens = meta.Default.MaxTokens
|
||||||
|
}
|
||||||
|
if clone.ContextWindow <= 0 {
|
||||||
|
clone.ContextWindow = meta.Default.ContextWindow
|
||||||
|
}
|
||||||
|
if len(clone.Input) == 0 && len(meta.Default.Input) > 0 {
|
||||||
|
clone.Input = make([]string, len(meta.Default.Input))
|
||||||
|
copy(clone.Input, meta.Default.Input)
|
||||||
|
}
|
||||||
|
return clone
|
||||||
|
}
|
||||||
|
|
||||||
|
func ResolveRuntimeParams(provider, apiType string, maxTokens, contextWindow int) (string, int, int) {
|
||||||
|
defaultAPIType := "openai-completions"
|
||||||
|
defaultMaxTokens := 8192
|
||||||
|
defaultContextWindow := 256000
|
||||||
|
if meta, ok := Get(provider); ok {
|
||||||
|
if meta.Default.APIType != "" {
|
||||||
|
defaultAPIType = meta.Default.APIType
|
||||||
|
}
|
||||||
|
if meta.Default.MaxTokens > 0 {
|
||||||
|
defaultMaxTokens = meta.Default.MaxTokens
|
||||||
|
}
|
||||||
|
if meta.Default.ContextWindow > 0 {
|
||||||
|
defaultContextWindow = meta.Default.ContextWindow
|
||||||
|
}
|
||||||
|
}
|
||||||
|
resolvedAPI := apiType
|
||||||
|
if strings.TrimSpace(apiType) == "" {
|
||||||
|
resolvedAPI = defaultAPIType
|
||||||
|
}
|
||||||
|
resolvedMaxTokens := defaultMaxTokens
|
||||||
|
resolvedContextWindow := defaultContextWindow
|
||||||
|
if maxTokens > 0 {
|
||||||
|
resolvedMaxTokens = maxTokens
|
||||||
|
}
|
||||||
|
if contextWindow > 0 {
|
||||||
|
resolvedContextWindow = contextWindow
|
||||||
|
}
|
||||||
|
return resolvedAPI, resolvedMaxTokens, resolvedContextWindow
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,86 @@
|
|||||||
|
package provider
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
type OpenClawProviderPatch struct {
|
||||||
|
PrimaryModel string
|
||||||
|
ProviderKey string
|
||||||
|
ModelID string
|
||||||
|
APIKey string
|
||||||
|
BaseURL string
|
||||||
|
APIType string
|
||||||
|
AuthHeader bool
|
||||||
|
}
|
||||||
|
|
||||||
|
func BuildOpenClawProviderPatch(provider, modelName, apiType, baseURL, apiKey string) (*OpenClawProviderPatch, error) {
|
||||||
|
if modelName == "" {
|
||||||
|
return nil, fmt.Errorf("model is required")
|
||||||
|
}
|
||||||
|
resolvedAPIType, _, _ := ResolveRuntimeParams(provider, apiType, 0, 0)
|
||||||
|
modelID := resolveOpenClawModelID(provider, modelName)
|
||||||
|
switch provider {
|
||||||
|
case "deepseek":
|
||||||
|
return newOpenClawProviderPatch(modelName, "deepseek", modelID, apiKey, baseURL, "openai-completions", false), nil
|
||||||
|
case "gemini":
|
||||||
|
return newOpenClawProviderPatch("google/"+modelID, "google", modelID, apiKey, baseURL, resolvedAPIType, false), nil
|
||||||
|
case "moonshot", "kimi":
|
||||||
|
return buildMoonshotProviderPatch(provider, modelName, modelID, baseURL, apiKey), nil
|
||||||
|
case "bailian-coding-plan":
|
||||||
|
return newOpenClawProviderPatch("bailian-coding-plan/"+modelID, "bailian-coding-plan", modelID, apiKey, baseURL, "openai-completions", false), nil
|
||||||
|
case "ark-coding-plan":
|
||||||
|
return newOpenClawProviderPatch("ark-coding-plan/"+modelID, "ark-coding-plan", modelID, apiKey, baseURL, "openai-completions", false), nil
|
||||||
|
case "minimax":
|
||||||
|
return newOpenClawProviderPatch("minimax/"+modelID, "minimax", modelID, apiKey, baseURL, "anthropic-messages", true), nil
|
||||||
|
case "xiaomi":
|
||||||
|
return newOpenClawProviderPatch("xiaomi/"+modelID, "xiaomi", modelID, apiKey, baseURL, "openai-completions", false), nil
|
||||||
|
case "custom", "vllm":
|
||||||
|
return newOpenClawProviderPatch(provider+"/"+modelID, provider, modelID, apiKey, baseURL, resolvedAPIType, false), nil
|
||||||
|
case "ollama":
|
||||||
|
return newOpenClawProviderPatch(modelName, "ollama", modelID, "ollama", baseURL, resolvedAPIType, false), nil
|
||||||
|
case "kimi-coding":
|
||||||
|
return newOpenClawProviderPatch(modelName, "kimi-coding", modelID, apiKey, baseURL, "anthropic-messages", false), nil
|
||||||
|
case "zai":
|
||||||
|
return newOpenClawProviderPatch("zai/"+modelID, "zai", modelID, apiKey, baseURL, "openai-completions", false), nil
|
||||||
|
default:
|
||||||
|
return newOpenClawProviderPatch(modelName, provider, modelID, apiKey, baseURL, resolvedAPIType, false), nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func buildMoonshotProviderPatch(provider, modelName, modelID, baseURL, apiKey string) *OpenClawProviderPatch {
|
||||||
|
providerKey := provider
|
||||||
|
primaryModel := modelName
|
||||||
|
if provider == "kimi" {
|
||||||
|
providerKey = "moonshot"
|
||||||
|
primaryModel = "moonshot/" + modelID
|
||||||
|
}
|
||||||
|
return newOpenClawProviderPatch(primaryModel, providerKey, modelID, apiKey, baseURL, "openai-completions", false)
|
||||||
|
}
|
||||||
|
|
||||||
|
func newOpenClawProviderPatch(primaryModel, providerKey, modelID, apiKey, baseURL, apiType string, authHeader bool) *OpenClawProviderPatch {
|
||||||
|
return &OpenClawProviderPatch{
|
||||||
|
PrimaryModel: primaryModel,
|
||||||
|
ProviderKey: providerKey,
|
||||||
|
ModelID: modelID,
|
||||||
|
APIKey: apiKey,
|
||||||
|
BaseURL: baseURL,
|
||||||
|
APIType: apiType,
|
||||||
|
AuthHeader: authHeader,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func resolveOpenClawModelID(provider, modelName string) string {
|
||||||
|
if provider == "custom" || provider == "vllm" {
|
||||||
|
target := strings.TrimLeft(modelName, "/")
|
||||||
|
if parts := strings.SplitN(target, "/", 2); len(parts) == 2 && parts[0] == "custom" {
|
||||||
|
return strings.TrimLeft(parts[1], "/")
|
||||||
|
}
|
||||||
|
return target
|
||||||
|
}
|
||||||
|
if parts := strings.SplitN(modelName, "/", 2); len(parts) == 2 {
|
||||||
|
return parts[1]
|
||||||
|
}
|
||||||
|
return modelName
|
||||||
|
}
|
||||||
@@ -0,0 +1,181 @@
|
|||||||
|
package provider
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/buserr"
|
||||||
|
)
|
||||||
|
|
||||||
|
type VerifyRequest struct {
|
||||||
|
Method string
|
||||||
|
URL string
|
||||||
|
Headers map[string]string
|
||||||
|
Body []byte
|
||||||
|
}
|
||||||
|
|
||||||
|
const (
|
||||||
|
defaultVerifyTimeout = 30 * time.Second
|
||||||
|
)
|
||||||
|
|
||||||
|
func SkipVerification(key string) bool {
|
||||||
|
switch key {
|
||||||
|
case "custom", "vllm", "ollama", "kimi-coding":
|
||||||
|
return true
|
||||||
|
default:
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func VerifyAccount(provider, baseURL, apiKey string) error {
|
||||||
|
req := BuildVerifyRequest(provider, baseURL, apiKey)
|
||||||
|
var body *bytes.Buffer
|
||||||
|
if len(req.Body) > 0 {
|
||||||
|
body = bytes.NewBuffer(req.Body)
|
||||||
|
} else {
|
||||||
|
body = bytes.NewBuffer(nil)
|
||||||
|
}
|
||||||
|
httpReq, err := http.NewRequest(req.Method, req.URL, body)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
for key, value := range req.Headers {
|
||||||
|
httpReq.Header.Set(key, value)
|
||||||
|
}
|
||||||
|
resp, err := (&http.Client{Timeout: verifyTimeout()}).Do(httpReq)
|
||||||
|
if err != nil {
|
||||||
|
return buserr.WithErr("ErrAgentAccountUnavailable", err)
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
if resp.StatusCode >= 400 {
|
||||||
|
return buserr.WithErr("ErrAgentAccountUnavailable", fmt.Errorf("verify failed: %s", resp.Status))
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func verifyTimeout() time.Duration {
|
||||||
|
return defaultVerifyTimeout
|
||||||
|
}
|
||||||
|
|
||||||
|
func BuildVerifyRequest(provider, baseURL, apiKey string) VerifyRequest {
|
||||||
|
base := strings.TrimRight(strings.TrimSpace(baseURL), "/")
|
||||||
|
headers := map[string]string{}
|
||||||
|
request := VerifyRequest{Method: http.MethodGet, Headers: headers}
|
||||||
|
|
||||||
|
switch provider {
|
||||||
|
case "anthropic", "kimi-coding":
|
||||||
|
headers["x-api-key"] = apiKey
|
||||||
|
headers["anthropic-version"] = "2023-06-01"
|
||||||
|
if strings.Contains(base, "/v1") {
|
||||||
|
request.URL = base + "/models"
|
||||||
|
} else {
|
||||||
|
request.URL = base + "/v1/models"
|
||||||
|
}
|
||||||
|
case "gemini":
|
||||||
|
request.Method = http.MethodPost
|
||||||
|
if strings.Contains(base, "/v1beta") {
|
||||||
|
request.URL = base + "/models/gemini-3-flash-preview:generateContent"
|
||||||
|
} else {
|
||||||
|
request.URL = base + "/v1beta/models/gemini-3-flash-preview:generateContent"
|
||||||
|
}
|
||||||
|
headers["x-goog-api-key"] = apiKey
|
||||||
|
headers["Content-Type"] = "application/json"
|
||||||
|
request.Body = mustJSON(map[string]interface{}{
|
||||||
|
"contents": []map[string]interface{}{{
|
||||||
|
"parts": []map[string]string{{
|
||||||
|
"text": "Explain how AI works in a few words",
|
||||||
|
}},
|
||||||
|
}},
|
||||||
|
})
|
||||||
|
case "zai":
|
||||||
|
headers["Authorization"] = fmt.Sprintf("Bearer %s", apiKey)
|
||||||
|
request.URL = base + "/models"
|
||||||
|
case "bailian-coding-plan":
|
||||||
|
request.Method = http.MethodPost
|
||||||
|
if !strings.Contains(base, "/v1") {
|
||||||
|
base = base + "/v1"
|
||||||
|
}
|
||||||
|
request.URL = base + "/chat/completions"
|
||||||
|
headers["Authorization"] = fmt.Sprintf("Bearer %s", apiKey)
|
||||||
|
headers["Content-Type"] = "application/json"
|
||||||
|
request.Body = mustJSON(map[string]interface{}{
|
||||||
|
"model": "qwen3.5-plus",
|
||||||
|
"messages": []map[string]string{{"role": "user", "content": "test"}},
|
||||||
|
"max_tokens": 1,
|
||||||
|
})
|
||||||
|
case "ark-coding-plan":
|
||||||
|
request.Method = http.MethodPost
|
||||||
|
if !strings.Contains(base, "/api/coding/v3") {
|
||||||
|
base = "https://ark.cn-beijing.volces.com/api/coding/v3"
|
||||||
|
}
|
||||||
|
request.URL = base + "/chat/completions"
|
||||||
|
headers["Authorization"] = fmt.Sprintf("Bearer %s", apiKey)
|
||||||
|
headers["Content-Type"] = "application/json"
|
||||||
|
request.Body = mustJSON(map[string]interface{}{
|
||||||
|
"model": "ark-code-latest",
|
||||||
|
"messages": []map[string]string{{"role": "user", "content": "test"}},
|
||||||
|
"max_tokens": 1,
|
||||||
|
})
|
||||||
|
case "minimax":
|
||||||
|
request.Method = http.MethodPost
|
||||||
|
headers["x-api-key"] = apiKey
|
||||||
|
headers["anthropic-version"] = "2023-06-01"
|
||||||
|
headers["Content-Type"] = "application/json"
|
||||||
|
if strings.Contains(base, "/v1") {
|
||||||
|
request.URL = base + "/messages"
|
||||||
|
} else {
|
||||||
|
request.URL = base + "/v1/messages"
|
||||||
|
}
|
||||||
|
request.Body = mustJSON(map[string]interface{}{
|
||||||
|
"model": "MiniMax-M2.5",
|
||||||
|
"max_tokens": 1,
|
||||||
|
"messages": []map[string]interface{}{{
|
||||||
|
"role": "user",
|
||||||
|
"content": []map[string]string{{
|
||||||
|
"type": "text",
|
||||||
|
"text": "test",
|
||||||
|
}},
|
||||||
|
}},
|
||||||
|
})
|
||||||
|
case "xiaomi":
|
||||||
|
request.Method = http.MethodPost
|
||||||
|
headers["Authorization"] = fmt.Sprintf("Bearer %s", apiKey)
|
||||||
|
headers["Content-Type"] = "application/json"
|
||||||
|
if !strings.Contains(base, "/v1") {
|
||||||
|
base = base + "/v1"
|
||||||
|
}
|
||||||
|
request.URL = base + "/chat/completions"
|
||||||
|
request.Body = mustJSON(map[string]interface{}{
|
||||||
|
"model": "mimo-v2-flash",
|
||||||
|
"max_tokens": 1,
|
||||||
|
"messages": []map[string]string{{"role": "user", "content": "test"}},
|
||||||
|
})
|
||||||
|
case "openrouter":
|
||||||
|
headers["Authorization"] = fmt.Sprintf("Bearer %s", apiKey)
|
||||||
|
if strings.Contains(base, "/v1") {
|
||||||
|
request.URL = base + "/key"
|
||||||
|
} else {
|
||||||
|
request.URL = base + "/v1/key"
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
headers["Authorization"] = fmt.Sprintf("Bearer %s", apiKey)
|
||||||
|
if strings.Contains(base, "/v1") {
|
||||||
|
request.URL = base + "/models"
|
||||||
|
} else {
|
||||||
|
request.URL = base + "/v1/models"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return request
|
||||||
|
}
|
||||||
|
|
||||||
|
func mustJSON(value interface{}) []byte {
|
||||||
|
payload, err := json.Marshal(value)
|
||||||
|
if err != nil {
|
||||||
|
return []byte("{}")
|
||||||
|
}
|
||||||
|
return payload
|
||||||
|
}
|
||||||
@@ -16,6 +16,7 @@ type IAgentRepo interface {
|
|||||||
DeleteByID(id uint) error
|
DeleteByID(id uint) error
|
||||||
DeleteByAppInstallID(appInstallID uint) error
|
DeleteByAppInstallID(appInstallID uint) error
|
||||||
DeleteByAppInstallIDWithCtx(ctx context.Context, appInstallID uint) error
|
DeleteByAppInstallIDWithCtx(ctx context.Context, appInstallID uint) error
|
||||||
|
ClearWebsiteIDByWebsiteIDWithCtx(ctx context.Context, websiteID uint) error
|
||||||
List(opts ...DBOption) ([]model.Agent, error)
|
List(opts ...DBOption) ([]model.Agent, error)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -66,6 +67,13 @@ func (a AgentRepo) DeleteByAppInstallIDWithCtx(ctx context.Context, appInstallID
|
|||||||
return getTx(ctx).Where("app_install_id = ?", appInstallID).Delete(&model.Agent{}).Error
|
return getTx(ctx).Where("app_install_id = ?", appInstallID).Delete(&model.Agent{}).Error
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (a AgentRepo) ClearWebsiteIDByWebsiteIDWithCtx(ctx context.Context, websiteID uint) error {
|
||||||
|
if websiteID == 0 {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return getTx(ctx).Model(&model.Agent{}).Where("website_id = ?", websiteID).Update("website_id", 0).Error
|
||||||
|
}
|
||||||
|
|
||||||
func (a AgentRepo) List(opts ...DBOption) ([]model.Agent, error) {
|
func (a AgentRepo) List(opts ...DBOption) ([]model.Agent, error) {
|
||||||
var agents []model.Agent
|
var agents []model.Agent
|
||||||
if err := getDb(opts...).Find(&agents).Error; err != nil {
|
if err := getDb(opts...).Find(&agents).Error; err != nil {
|
||||||
|
|||||||
@@ -1,16 +1,23 @@
|
|||||||
package repo
|
package repo
|
||||||
|
|
||||||
import "github.com/1Panel-dev/1Panel/agent/app/model"
|
import (
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/model"
|
||||||
|
"gorm.io/gorm"
|
||||||
|
)
|
||||||
|
|
||||||
type AgentAccountRepo struct{}
|
type AgentAccountRepo struct{}
|
||||||
|
|
||||||
type IAgentAccountRepo interface {
|
type IAgentAccountRepo interface {
|
||||||
Page(page, size int, opts ...DBOption) (int64, []model.AgentAccount, error)
|
Page(page, size int, opts ...DBOption) (int64, []model.AgentAccount, error)
|
||||||
GetFirst(opts ...DBOption) (*model.AgentAccount, error)
|
GetFirst(opts ...DBOption) (*model.AgentAccount, error)
|
||||||
|
WithByMasterAccountID(masterID uint) DBOption
|
||||||
Create(account *model.AgentAccount) error
|
Create(account *model.AgentAccount) error
|
||||||
Save(account *model.AgentAccount) error
|
Save(account *model.AgentAccount) error
|
||||||
DeleteByID(id uint) error
|
DeleteByID(id uint) error
|
||||||
List(opts ...DBOption) ([]model.AgentAccount, error)
|
List(opts ...DBOption) ([]model.AgentAccount, error)
|
||||||
|
CountByProviders(providers []string) (map[string]int64, error)
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewIAgentAccountRepo() IAgentAccountRepo {
|
func NewIAgentAccountRepo() IAgentAccountRepo {
|
||||||
@@ -34,6 +41,12 @@ func (a AgentAccountRepo) GetFirst(opts ...DBOption) (*model.AgentAccount, error
|
|||||||
return &account, nil
|
return &account, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (a AgentAccountRepo) WithByMasterAccountID(masterID uint) DBOption {
|
||||||
|
return func(g *gorm.DB) *gorm.DB {
|
||||||
|
return g.Where("master_account_id = ?", masterID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func (a AgentAccountRepo) Create(account *model.AgentAccount) error {
|
func (a AgentAccountRepo) Create(account *model.AgentAccount) error {
|
||||||
return getDb().Create(account).Error
|
return getDb().Create(account).Error
|
||||||
}
|
}
|
||||||
@@ -53,3 +66,49 @@ func (a AgentAccountRepo) List(opts ...DBOption) ([]model.AgentAccount, error) {
|
|||||||
}
|
}
|
||||||
return accounts, nil
|
return accounts, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (a AgentAccountRepo) CountByProviders(providers []string) (map[string]int64, error) {
|
||||||
|
normalizedProviders := normalizeProviders(providers)
|
||||||
|
counts := make(map[string]int64, len(normalizedProviders))
|
||||||
|
for _, provider := range normalizedProviders {
|
||||||
|
counts[provider] = 0
|
||||||
|
}
|
||||||
|
if len(normalizedProviders) == 0 {
|
||||||
|
return counts, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
type providerCount struct {
|
||||||
|
Provider string
|
||||||
|
Count int64
|
||||||
|
}
|
||||||
|
var rows []providerCount
|
||||||
|
if err := getDb().
|
||||||
|
Model(&model.AgentAccount{}).
|
||||||
|
Select("provider, COUNT(*) as count").
|
||||||
|
Where("provider IN ?", normalizedProviders).
|
||||||
|
Group("provider").
|
||||||
|
Scan(&rows).Error; err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
for _, row := range rows {
|
||||||
|
counts[row.Provider] = row.Count
|
||||||
|
}
|
||||||
|
return counts, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func normalizeProviders(providers []string) []string {
|
||||||
|
seen := make(map[string]struct{}, len(providers))
|
||||||
|
result := make([]string, 0, len(providers))
|
||||||
|
for _, provider := range providers {
|
||||||
|
provider = strings.TrimSpace(provider)
|
||||||
|
if provider == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if _, ok := seen[provider]; ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
seen[provider] = struct{}{}
|
||||||
|
result = append(result, provider)
|
||||||
|
}
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,50 @@
|
|||||||
|
package repo
|
||||||
|
|
||||||
|
import "github.com/1Panel-dev/1Panel/agent/app/model"
|
||||||
|
|
||||||
|
type AgentAccountModelRepo struct{}
|
||||||
|
|
||||||
|
type IAgentAccountModelRepo interface {
|
||||||
|
List(opts ...DBOption) ([]model.AgentAccountModel, error)
|
||||||
|
GetFirst(opts ...DBOption) (*model.AgentAccountModel, error)
|
||||||
|
Create(item *model.AgentAccountModel) error
|
||||||
|
Save(item *model.AgentAccountModel) error
|
||||||
|
DeleteByID(id uint) error
|
||||||
|
Delete(opts ...DBOption) error
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewIAgentAccountModelRepo() IAgentAccountModelRepo {
|
||||||
|
return &AgentAccountModelRepo{}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a AgentAccountModelRepo) List(opts ...DBOption) ([]model.AgentAccountModel, error) {
|
||||||
|
var list []model.AgentAccountModel
|
||||||
|
if err := getDb(opts...).Find(&list).Error; err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return list, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a AgentAccountModelRepo) GetFirst(opts ...DBOption) (*model.AgentAccountModel, error) {
|
||||||
|
var item model.AgentAccountModel
|
||||||
|
if err := getDb(opts...).First(&item).Error; err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return &item, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a AgentAccountModelRepo) Create(item *model.AgentAccountModel) error {
|
||||||
|
return getDb().Create(item).Error
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a AgentAccountModelRepo) Save(item *model.AgentAccountModel) error {
|
||||||
|
return getDb().Save(item).Error
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a AgentAccountModelRepo) DeleteByID(id uint) error {
|
||||||
|
return getDb().Delete(&model.AgentAccountModel{}, id).Error
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a AgentAccountModelRepo) Delete(opts ...DBOption) error {
|
||||||
|
return getDb(opts...).Delete(&model.AgentAccountModel{}).Error
|
||||||
|
}
|
||||||
+235
-14
@@ -1,11 +1,15 @@
|
|||||||
package repo
|
package repo
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"strings"
|
||||||
|
|
||||||
"github.com/1Panel-dev/1Panel/agent/app/model"
|
"github.com/1Panel-dev/1Panel/agent/app/model"
|
||||||
"github.com/1Panel-dev/1Panel/agent/constant"
|
"github.com/1Panel-dev/1Panel/agent/constant"
|
||||||
"github.com/1Panel-dev/1Panel/agent/global"
|
"github.com/1Panel-dev/1Panel/agent/global"
|
||||||
"google.golang.org/genproto/googleapis/type/date"
|
"google.golang.org/genproto/googleapis/type/date"
|
||||||
"gorm.io/gorm"
|
"gorm.io/gorm"
|
||||||
|
"strconv"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -20,7 +24,8 @@ type IAlertRepo interface {
|
|||||||
WithByCreateAt(date *date.Date) DBOption
|
WithByCreateAt(date *date.Date) DBOption
|
||||||
WithByLicenseId(licenseId string) DBOption
|
WithByLicenseId(licenseId string) DBOption
|
||||||
WithByRecordId(recordId uint) DBOption
|
WithByRecordId(recordId uint) DBOption
|
||||||
WithByMethod(method string) DBOption
|
WithByAlertMethodContainsConfigID(id uint) DBOption
|
||||||
|
WithByMethodConfigIDs(ids []uint) DBOption
|
||||||
|
|
||||||
Create(alert *model.Alert) error
|
Create(alert *model.Alert) error
|
||||||
Get(opts ...DBOption) (model.Alert, error)
|
Get(opts ...DBOption) (model.Alert, error)
|
||||||
@@ -47,11 +52,15 @@ type IAlertRepo interface {
|
|||||||
GetLicensePushCount(method string) (uint, error)
|
GetLicensePushCount(method string) (uint, error)
|
||||||
|
|
||||||
GetConfig(opts ...DBOption) (model.AlertConfig, error)
|
GetConfig(opts ...DBOption) (model.AlertConfig, error)
|
||||||
|
GetConfigById(id uint) (model.AlertConfig, error)
|
||||||
AlertConfigList(opts ...DBOption) ([]model.AlertConfig, error)
|
AlertConfigList(opts ...DBOption) ([]model.AlertConfig, error)
|
||||||
UpdateAlertConfig(maps map[string]interface{}, opts ...DBOption) error
|
UpdateAlertConfig(maps map[string]interface{}, opts ...DBOption) error
|
||||||
CreateAlertConfig(config *model.AlertConfig) error
|
CreateAlertConfig(config *model.AlertConfig) error
|
||||||
DeleteAlertConfig(opts ...DBOption) error
|
DeleteAlertConfig(opts ...DBOption) error
|
||||||
|
|
||||||
|
WithByTypeNotIn(types []string) DBOption
|
||||||
|
PageAlertConfig(page, size int, opts ...DBOption) (int64, []model.AlertConfig, error)
|
||||||
|
|
||||||
SyncAll(data []model.AlertConfig) error
|
SyncAll(data []model.AlertConfig) error
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -101,9 +110,20 @@ func (a *AlertRepo) WithByRecordId(recordId uint) DBOption {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a *AlertRepo) WithByMethod(method string) DBOption {
|
func (a *AlertRepo) WithByAlertMethodContainsConfigID(id uint) DBOption {
|
||||||
|
method := strconv.Itoa(int(id))
|
||||||
return func(g *gorm.DB) *gorm.DB {
|
return func(g *gorm.DB) *gorm.DB {
|
||||||
return g.Where("method = ?", method)
|
return g.Where("(method = ? OR method LIKE ? OR method LIKE ? OR method LIKE ?)", method, method+",%", "%,"+method, "%,"+method+",%")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *AlertRepo) WithByMethodConfigIDs(ids []uint) DBOption {
|
||||||
|
return func(g *gorm.DB) *gorm.DB {
|
||||||
|
methods := make([]string, 0, len(ids))
|
||||||
|
for _, id := range ids {
|
||||||
|
methods = append(methods, strconv.Itoa(int(id)))
|
||||||
|
}
|
||||||
|
return g.Where("method IN ?", methods)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -306,32 +326,233 @@ func (a *AlertRepo) GetConfig(opts ...DBOption) (model.AlertConfig, error) {
|
|||||||
return alertConfig, err
|
return alertConfig, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (a *AlertRepo) GetConfigById(id uint) (model.AlertConfig, error) {
|
||||||
|
var config model.AlertConfig
|
||||||
|
err := global.AlertDB.First(&config, id).Error
|
||||||
|
return config, err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *AlertRepo) WithByTypeNotIn(types []string) DBOption {
|
||||||
|
return func(g *gorm.DB) *gorm.DB {
|
||||||
|
return g.Where("`type` NOT IN (?)", types)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *AlertRepo) PageAlertConfig(page, size int, opts ...DBOption) (int64, []model.AlertConfig, error) {
|
||||||
|
var configs []model.AlertConfig
|
||||||
|
db := global.AlertDB.Model(&model.AlertConfig{})
|
||||||
|
for _, opt := range opts {
|
||||||
|
db = opt(db)
|
||||||
|
}
|
||||||
|
count := int64(0)
|
||||||
|
db = db.Count(&count)
|
||||||
|
err := db.Limit(size).Offset(size * (page - 1)).Find(&configs).Error
|
||||||
|
return count, configs, err
|
||||||
|
}
|
||||||
|
|
||||||
|
var singletonTypes = map[string]bool{
|
||||||
|
constant.CommonConfig: true,
|
||||||
|
}
|
||||||
|
|
||||||
func (a *AlertRepo) SyncAll(data []model.AlertConfig) error {
|
func (a *AlertRepo) SyncAll(data []model.AlertConfig) error {
|
||||||
tx := global.AlertDB.Begin()
|
tx := global.AlertDB.Begin()
|
||||||
|
if tx.Error != nil {
|
||||||
|
return tx.Error
|
||||||
|
}
|
||||||
|
defer func() {
|
||||||
|
if r := recover(); r != nil {
|
||||||
|
tx.Rollback()
|
||||||
|
panic(r)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
var oldConfigs []model.AlertConfig
|
var oldConfigs []model.AlertConfig
|
||||||
_ = tx.Find(&oldConfigs).Error
|
if err := tx.Find(&oldConfigs).Error; err != nil {
|
||||||
|
tx.Rollback()
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
usedConfigIDs, err := loadUsedAlertConfigIDs(tx)
|
||||||
|
if err != nil {
|
||||||
|
tx.Rollback()
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
oldConfigMap := make(map[string]uint)
|
oldConfigMap := make(map[string]uint)
|
||||||
|
oldConfigByType := make(map[string][]model.AlertConfig)
|
||||||
|
oldConfigByKey := make(map[string][]model.AlertConfig)
|
||||||
|
consumedConfigIDs := make(map[uint]struct{})
|
||||||
for _, item := range oldConfigs {
|
for _, item := range oldConfigs {
|
||||||
oldConfigMap[item.Type] = item.ID
|
if singletonTypes[item.Type] {
|
||||||
|
oldConfigMap[item.Type] = item.ID
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
oldConfigByType[item.Type] = append(oldConfigByType[item.Type], item)
|
||||||
|
oldConfigByKey[alertConfigSyncKey(item)] = append(oldConfigByKey[alertConfigSyncKey(item)], item)
|
||||||
}
|
}
|
||||||
for _, item := range data {
|
for _, item := range data {
|
||||||
if val, ok := oldConfigMap[item.Type]; ok {
|
if singletonTypes[item.Type] {
|
||||||
item.ID = val
|
if val, ok := oldConfigMap[item.Type]; ok {
|
||||||
delete(oldConfigMap, item.Type)
|
item.ID = val
|
||||||
} else {
|
delete(oldConfigMap, item.Type)
|
||||||
item.ID = 0
|
consumedConfigIDs[item.ID] = struct{}{}
|
||||||
|
} else {
|
||||||
|
item.ID = 0
|
||||||
|
}
|
||||||
|
if item.ID == 0 {
|
||||||
|
if err := tx.Create(&item).Error; err != nil {
|
||||||
|
tx.Rollback()
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
} else if err := tx.Save(&item).Error; err != nil {
|
||||||
|
tx.Rollback()
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
continue
|
||||||
}
|
}
|
||||||
if err := tx.Model(model.AlertConfig{}).Where("id = ?", item.ID).Save(&item).Error; err != nil {
|
|
||||||
|
key := alertConfigSyncKey(item)
|
||||||
|
if matched, ok := popAlertConfigByKey(oldConfigByKey, key); ok {
|
||||||
|
item.ID = matched.ID
|
||||||
|
consumedConfigIDs[item.ID] = struct{}{}
|
||||||
|
if err := tx.Save(&item).Error; err != nil {
|
||||||
|
tx.Rollback()
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
deleteAlertConfigByID(oldConfigByType, matched.ID)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
if matched, ok := popUnusedAlertConfigByType(oldConfigByType, usedConfigIDs, item.Type); ok {
|
||||||
|
item.ID = matched.ID
|
||||||
|
consumedConfigIDs[item.ID] = struct{}{}
|
||||||
|
if err := tx.Save(&item).Error; err != nil {
|
||||||
|
tx.Rollback()
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
item.ID = 0
|
||||||
|
if err := tx.Create(&item).Error; err != nil {
|
||||||
tx.Rollback()
|
tx.Rollback()
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for _, val := range oldConfigMap {
|
for _, item := range oldConfigs {
|
||||||
if err := tx.Where("id = ?", val).Delete(&model.AlertConfig{}).Error; err != nil {
|
if _, used := usedConfigIDs[item.ID]; used {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if _, kept := consumedConfigIDs[item.ID]; kept {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if err := tx.Where("id = ?", item.ID).Delete(&model.AlertConfig{}).Error; err != nil {
|
||||||
tx.Rollback()
|
tx.Rollback()
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
tx.Commit()
|
if err := tx.Commit().Error; err != nil {
|
||||||
|
tx.Rollback()
|
||||||
|
return err
|
||||||
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func loadUsedAlertConfigIDs(tx *gorm.DB) (map[uint]struct{}, error) {
|
||||||
|
var alerts []model.Alert
|
||||||
|
if err := tx.Select("method").Find(&alerts).Error; err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
usedIDs := make(map[uint]struct{})
|
||||||
|
for _, alert := range alerts {
|
||||||
|
for _, item := range strings.Split(alert.Method, ",") {
|
||||||
|
item = strings.TrimSpace(item)
|
||||||
|
if item == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
id, err := strconv.ParseUint(item, 10, 64)
|
||||||
|
if err != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
usedIDs[uint(id)] = struct{}{}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return usedIDs, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func alertConfigSyncKey(item model.AlertConfig) string {
|
||||||
|
return item.Type + "::" + normalizeAlertConfigJSON(item.Config)
|
||||||
|
}
|
||||||
|
|
||||||
|
func normalizeAlertConfigJSON(config string) string {
|
||||||
|
trimmed := strings.TrimSpace(config)
|
||||||
|
if trimmed == "" {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
var data any
|
||||||
|
if err := json.Unmarshal([]byte(trimmed), &data); err != nil {
|
||||||
|
return trimmed
|
||||||
|
}
|
||||||
|
buf, err := json.Marshal(data)
|
||||||
|
if err != nil {
|
||||||
|
return trimmed
|
||||||
|
}
|
||||||
|
return string(buf)
|
||||||
|
}
|
||||||
|
|
||||||
|
func popAlertConfigByKey(configMap map[string][]model.AlertConfig, key string) (model.AlertConfig, bool) {
|
||||||
|
items := configMap[key]
|
||||||
|
if len(items) == 0 {
|
||||||
|
return model.AlertConfig{}, false
|
||||||
|
}
|
||||||
|
|
||||||
|
item := items[0]
|
||||||
|
if len(items) == 1 {
|
||||||
|
delete(configMap, key)
|
||||||
|
} else {
|
||||||
|
configMap[key] = items[1:]
|
||||||
|
}
|
||||||
|
return item, true
|
||||||
|
}
|
||||||
|
|
||||||
|
func popUnusedAlertConfigByType(configMap map[string][]model.AlertConfig, usedConfigIDs map[uint]struct{}, configType string) (model.AlertConfig, bool) {
|
||||||
|
items := configMap[configType]
|
||||||
|
if len(items) == 0 {
|
||||||
|
return model.AlertConfig{}, false
|
||||||
|
}
|
||||||
|
|
||||||
|
for idx, item := range items {
|
||||||
|
if _, used := usedConfigIDs[item.ID]; used {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if idx == 0 {
|
||||||
|
if len(items) == 1 {
|
||||||
|
delete(configMap, configType)
|
||||||
|
} else {
|
||||||
|
configMap[configType] = items[1:]
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
configMap[configType] = append(items[:idx], items[idx+1:]...)
|
||||||
|
}
|
||||||
|
return item, true
|
||||||
|
}
|
||||||
|
return model.AlertConfig{}, false
|
||||||
|
}
|
||||||
|
|
||||||
|
func deleteAlertConfigByID(configMap map[string][]model.AlertConfig, id uint) {
|
||||||
|
for key, items := range configMap {
|
||||||
|
for idx, item := range items {
|
||||||
|
if item.ID != id {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if len(items) == 1 {
|
||||||
|
delete(configMap, key)
|
||||||
|
} else {
|
||||||
|
configMap[key] = append(items[:idx], items[idx+1:]...)
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -80,9 +80,10 @@ func (u *LauncherRepo) ListQuickJump(withAll bool) []model.QuickJump {
|
|||||||
}
|
}
|
||||||
if !withAll && len(quicks) == 0 {
|
if !withAll && len(quicks) == 0 {
|
||||||
return []model.QuickJump{
|
return []model.QuickJump{
|
||||||
|
{Name: "Agent", Title: "aiTools.agents.agent", Recommend: 1, IsShow: true, Router: "/ai/agents/agent"},
|
||||||
{Name: "Website", Title: "menu.website", Recommend: 10, IsShow: true, Router: "/websites"},
|
{Name: "Website", Title: "menu.website", Recommend: 10, IsShow: true, Router: "/websites"},
|
||||||
{Name: "Database", Title: "menu.database", Recommend: 30, IsShow: true, Router: "/databases"},
|
{Name: "Database", Title: "menu.database", Recommend: 30, IsShow: true, Router: "/databases"},
|
||||||
{Name: "Cronjob", Title: "menu.cronjob", Recommend: 50, IsShow: true, Router: "/cronjobs"},
|
{Name: "Cronjob", Title: "menu.cronjob", Recommend: 50, IsShow: false, Router: "/cronjobs"},
|
||||||
{Name: "AppInstalled", Title: "home.appInstalled", Recommend: 70, IsShow: true, Router: "/apps/installed"},
|
{Name: "AppInstalled", Title: "home.appInstalled", Recommend: 70, IsShow: true, Router: "/apps/installed"},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,6 +19,12 @@ func WithByID(id uint) DBOption {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func WithByGroupID(id uint) DBOption {
|
||||||
|
return func(g *gorm.DB) *gorm.DB {
|
||||||
|
return g.Where("group_id = ?", id)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func WithByNOTID(id uint) DBOption {
|
func WithByNOTID(id uint) DBOption {
|
||||||
return func(g *gorm.DB) *gorm.DB {
|
return func(g *gorm.DB) *gorm.DB {
|
||||||
return g.Where("id != ?", id)
|
return g.Where("id != ?", id)
|
||||||
@@ -43,6 +49,12 @@ func WithByName(name string) DBOption {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func WithByAddr(addr string) DBOption {
|
||||||
|
return func(g *gorm.DB) *gorm.DB {
|
||||||
|
return g.Where("addr = ?", addr)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func WithByKey(key string) DBOption {
|
func WithByKey(key string) DBOption {
|
||||||
return func(g *gorm.DB) *gorm.DB {
|
return func(g *gorm.DB) *gorm.DB {
|
||||||
return g.Where("key = ?", key)
|
return g.Where("key = ?", key)
|
||||||
@@ -100,6 +112,24 @@ func WithByAccountID(accountID uint) DBOption {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func WithByWebsiteID(websiteID uint) DBOption {
|
||||||
|
return func(g *gorm.DB) *gorm.DB {
|
||||||
|
if websiteID == 0 {
|
||||||
|
return g
|
||||||
|
}
|
||||||
|
return g.Where("website_id = ?", websiteID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func WithByAppInstallID(appInstallID uint) DBOption {
|
||||||
|
return func(g *gorm.DB) *gorm.DB {
|
||||||
|
if appInstallID == 0 {
|
||||||
|
return g
|
||||||
|
}
|
||||||
|
return g.Where("app_install_id = ?", appInstallID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func WithByType(tp string) DBOption {
|
func WithByType(tp string) DBOption {
|
||||||
return func(g *gorm.DB) *gorm.DB {
|
return func(g *gorm.DB) *gorm.DB {
|
||||||
return g.Where("`type` = ?", tp)
|
return g.Where("`type` = ?", tp)
|
||||||
|
|||||||
@@ -0,0 +1,113 @@
|
|||||||
|
package repo
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/model"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/global"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/utils/encrypt"
|
||||||
|
"gorm.io/gorm"
|
||||||
|
)
|
||||||
|
|
||||||
|
type MongodbRepo struct{}
|
||||||
|
|
||||||
|
type IMongodbRepo interface {
|
||||||
|
Get(opts ...DBOption) (model.DatabaseMongodb, error)
|
||||||
|
WithByMongodbName(mongodbName string) DBOption
|
||||||
|
List(opts ...DBOption) ([]model.DatabaseMongodb, error)
|
||||||
|
Page(limit, offset int, opts ...DBOption) (int64, []model.DatabaseMongodb, error)
|
||||||
|
Create(ctx context.Context, mongodb *model.DatabaseMongodb) error
|
||||||
|
Delete(ctx context.Context, opts ...DBOption) error
|
||||||
|
Update(id uint, vars map[string]interface{}) error
|
||||||
|
DeleteLocal(ctx context.Context) error
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewIMongodbRepo() IMongodbRepo {
|
||||||
|
return &MongodbRepo{}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (u *MongodbRepo) Get(opts ...DBOption) (model.DatabaseMongodb, error) {
|
||||||
|
var mongodb model.DatabaseMongodb
|
||||||
|
db := global.DB
|
||||||
|
for _, opt := range opts {
|
||||||
|
db = opt(db)
|
||||||
|
}
|
||||||
|
if err := db.First(&mongodb).Error; err != nil {
|
||||||
|
return mongodb, err
|
||||||
|
}
|
||||||
|
|
||||||
|
pass, err := encrypt.StringDecrypt(mongodb.Password)
|
||||||
|
if err != nil {
|
||||||
|
global.LOG.Errorf("decrypt mongodb db %s password failed, err: %v", mongodb.Name, err)
|
||||||
|
}
|
||||||
|
mongodb.Password = pass
|
||||||
|
return mongodb, err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (u *MongodbRepo) List(opts ...DBOption) ([]model.DatabaseMongodb, error) {
|
||||||
|
var mongodbs []model.DatabaseMongodb
|
||||||
|
db := global.DB.Model(&model.DatabaseMongodb{})
|
||||||
|
for _, opt := range opts {
|
||||||
|
db = opt(db)
|
||||||
|
}
|
||||||
|
if err := db.Find(&mongodbs).Error; err != nil {
|
||||||
|
return mongodbs, err
|
||||||
|
}
|
||||||
|
for i := 0; i < len(mongodbs); i++ {
|
||||||
|
pass, err := encrypt.StringDecrypt(mongodbs[i].Password)
|
||||||
|
if err != nil {
|
||||||
|
global.LOG.Errorf("decrypt mongodb db %s password failed, err: %v", mongodbs[i].Name, err)
|
||||||
|
}
|
||||||
|
mongodbs[i].Password = pass
|
||||||
|
}
|
||||||
|
return mongodbs, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (u *MongodbRepo) Page(page, size int, opts ...DBOption) (int64, []model.DatabaseMongodb, error) {
|
||||||
|
var mongodbs []model.DatabaseMongodb
|
||||||
|
db := global.DB.Model(&model.DatabaseMongodb{})
|
||||||
|
for _, opt := range opts {
|
||||||
|
db = opt(db)
|
||||||
|
}
|
||||||
|
count := int64(0)
|
||||||
|
db = db.Count(&count)
|
||||||
|
if err := db.Limit(size).Offset(size * (page - 1)).Find(&mongodbs).Error; err != nil {
|
||||||
|
return count, mongodbs, err
|
||||||
|
}
|
||||||
|
for i := 0; i < len(mongodbs); i++ {
|
||||||
|
pass, err := encrypt.StringDecrypt(mongodbs[i].Password)
|
||||||
|
if err != nil {
|
||||||
|
global.LOG.Errorf("decrypt mongodb db %s password failed, err: %v", mongodbs[i].Name, err)
|
||||||
|
}
|
||||||
|
mongodbs[i].Password = pass
|
||||||
|
}
|
||||||
|
return count, mongodbs, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (u *MongodbRepo) Create(ctx context.Context, mongodb *model.DatabaseMongodb) error {
|
||||||
|
pass, err := encrypt.StringEncrypt(mongodb.Password)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("encrypt mongodb db %s password failed, err: %v", mongodb.Name, err)
|
||||||
|
}
|
||||||
|
mongodb.Password = pass
|
||||||
|
return getTx(ctx).Create(mongodb).Error
|
||||||
|
}
|
||||||
|
|
||||||
|
func (u *MongodbRepo) Delete(ctx context.Context, opts ...DBOption) error {
|
||||||
|
return getTx(ctx, opts...).Delete(&model.DatabaseMongodb{}).Error
|
||||||
|
}
|
||||||
|
|
||||||
|
func (u *MongodbRepo) DeleteLocal(ctx context.Context) error {
|
||||||
|
return getTx(ctx).Where("`from` = ?", "local").Delete(&model.DatabaseMongodb{}).Error
|
||||||
|
}
|
||||||
|
|
||||||
|
func (u *MongodbRepo) Update(id uint, vars map[string]interface{}) error {
|
||||||
|
return global.DB.Model(&model.DatabaseMongodb{}).Where("id = ?", id).Updates(vars).Error
|
||||||
|
}
|
||||||
|
|
||||||
|
func (u *MongodbRepo) WithByMongodbName(mongodbName string) DBOption {
|
||||||
|
return func(g *gorm.DB) *gorm.DB {
|
||||||
|
return g.Where("mongodb_name = ?", mongodbName)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,121 @@
|
|||||||
|
package repo
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/model"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/global"
|
||||||
|
"gorm.io/gorm"
|
||||||
|
)
|
||||||
|
|
||||||
|
type FileHistoryRepo struct{}
|
||||||
|
|
||||||
|
type IFileHistoryRepo interface {
|
||||||
|
Get(opts ...DBOption) (model.FileHistory, error)
|
||||||
|
Page(limit, offset int, opts ...DBOption) (int64, []model.FileHistory, error)
|
||||||
|
Create(history *model.FileHistory) error
|
||||||
|
Delete(opts ...DBOption) error
|
||||||
|
DeleteByIDs(ids []uint) error
|
||||||
|
WithByID(id uint) DBOption
|
||||||
|
WithByFileID(fileID string) DBOption
|
||||||
|
WithByPath(path string) DBOption
|
||||||
|
WithByPathHash(pathHash string) DBOption
|
||||||
|
WithByPathLike(path string) DBOption
|
||||||
|
WithByOperation(operation string) DBOption
|
||||||
|
WithNotOperation(operation string) DBOption
|
||||||
|
WithByRelatedPath(path string) DBOption
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewIFileHistoryRepo() IFileHistoryRepo {
|
||||||
|
return &FileHistoryRepo{}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *FileHistoryRepo) Get(opts ...DBOption) (model.FileHistory, error) {
|
||||||
|
var item model.FileHistory
|
||||||
|
db := global.DB.Model(&model.FileHistory{})
|
||||||
|
for _, opt := range opts {
|
||||||
|
db = opt(db)
|
||||||
|
}
|
||||||
|
return item, db.First(&item).Error
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *FileHistoryRepo) Page(limit, offset int, opts ...DBOption) (int64, []model.FileHistory, error) {
|
||||||
|
var total int64
|
||||||
|
var items []model.FileHistory
|
||||||
|
db := global.DB.Model(&model.FileHistory{})
|
||||||
|
for _, opt := range opts {
|
||||||
|
db = opt(db)
|
||||||
|
}
|
||||||
|
if err := db.Count(&total).Error; err != nil {
|
||||||
|
return 0, nil, err
|
||||||
|
}
|
||||||
|
if err := db.Order("created_at desc").Limit(limit).Offset(offset).Find(&items).Error; err != nil {
|
||||||
|
return 0, nil, err
|
||||||
|
}
|
||||||
|
return total, items, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *FileHistoryRepo) Create(history *model.FileHistory) error {
|
||||||
|
return global.DB.Create(history).Error
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *FileHistoryRepo) Delete(opts ...DBOption) error {
|
||||||
|
db := global.DB.Model(&model.FileHistory{})
|
||||||
|
for _, opt := range opts {
|
||||||
|
db = opt(db)
|
||||||
|
}
|
||||||
|
return db.Delete(&model.FileHistory{}).Error
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *FileHistoryRepo) DeleteByIDs(ids []uint) error {
|
||||||
|
if len(ids) == 0 {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return global.DB.Where("id in ?", ids).Delete(&model.FileHistory{}).Error
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *FileHistoryRepo) WithByID(id uint) DBOption {
|
||||||
|
return func(db *gorm.DB) *gorm.DB {
|
||||||
|
return db.Where("id = ?", id)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *FileHistoryRepo) WithByFileID(fileID string) DBOption {
|
||||||
|
return func(db *gorm.DB) *gorm.DB {
|
||||||
|
return db.Where("file_id = ?", fileID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *FileHistoryRepo) WithByPath(path string) DBOption {
|
||||||
|
return func(db *gorm.DB) *gorm.DB {
|
||||||
|
return db.Where("path = ?", path)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *FileHistoryRepo) WithByPathHash(pathHash string) DBOption {
|
||||||
|
return func(db *gorm.DB) *gorm.DB {
|
||||||
|
return db.Where("path_hash = ?", pathHash)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *FileHistoryRepo) WithByPathLike(path string) DBOption {
|
||||||
|
return func(db *gorm.DB) *gorm.DB {
|
||||||
|
return db.Where("path like ?", "%"+path+"%")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *FileHistoryRepo) WithByOperation(operation string) DBOption {
|
||||||
|
return func(db *gorm.DB) *gorm.DB {
|
||||||
|
return db.Where("operation = ?", operation)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *FileHistoryRepo) WithNotOperation(operation string) DBOption {
|
||||||
|
return func(db *gorm.DB) *gorm.DB {
|
||||||
|
return db.Where("operation <> ?", operation)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *FileHistoryRepo) WithByRelatedPath(path string) DBOption {
|
||||||
|
return func(db *gorm.DB) *gorm.DB {
|
||||||
|
return db.Where("path = ? OR source_path = ? OR target_path = ?", path, path, path)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,77 @@
|
|||||||
|
package repo
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/model"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/global"
|
||||||
|
"gorm.io/gorm"
|
||||||
|
)
|
||||||
|
|
||||||
|
type FileShareRepo struct{}
|
||||||
|
|
||||||
|
type IFileShareRepo interface {
|
||||||
|
Page(page, size int, opts ...DBOption) (int64, []model.FileShare, error)
|
||||||
|
Create(fileShare *model.FileShare) error
|
||||||
|
Save(fileShare *model.FileShare) error
|
||||||
|
Delete(opts ...DBOption) error
|
||||||
|
GetFirst(opts ...DBOption) (model.FileShare, error)
|
||||||
|
All() ([]model.FileShare, error)
|
||||||
|
WithByPath(path string) DBOption
|
||||||
|
WithByCode(code string) DBOption
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewIFileShareRepo() IFileShareRepo {
|
||||||
|
return &FileShareRepo{}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *FileShareRepo) WithByPath(path string) DBOption {
|
||||||
|
return func(db *gorm.DB) *gorm.DB {
|
||||||
|
return db.Where("path = ?", path)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *FileShareRepo) WithByCode(code string) DBOption {
|
||||||
|
return func(db *gorm.DB) *gorm.DB {
|
||||||
|
return db.Where("token = ?", code)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *FileShareRepo) Page(page, size int, opts ...DBOption) (int64, []model.FileShare, error) {
|
||||||
|
var (
|
||||||
|
items []model.FileShare
|
||||||
|
count int64
|
||||||
|
)
|
||||||
|
db := getDb(opts...).Model(&model.FileShare{})
|
||||||
|
db = db.Count(&count)
|
||||||
|
err := db.Order("path asc").Limit(size).Offset(size * (page - 1)).Find(&items).Error
|
||||||
|
return count, items, err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *FileShareRepo) Create(fileShare *model.FileShare) error {
|
||||||
|
return global.DB.Create(fileShare).Error
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *FileShareRepo) Save(fileShare *model.FileShare) error {
|
||||||
|
return global.DB.Save(fileShare).Error
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *FileShareRepo) GetFirst(opts ...DBOption) (model.FileShare, error) {
|
||||||
|
var item model.FileShare
|
||||||
|
db := getDb(opts...).Model(&model.FileShare{})
|
||||||
|
if err := db.First(&item).Error; err != nil {
|
||||||
|
return item, err
|
||||||
|
}
|
||||||
|
return item, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *FileShareRepo) Delete(opts ...DBOption) error {
|
||||||
|
db := getDb(opts...).Model(&model.FileShare{})
|
||||||
|
return db.Delete(&model.FileShare{}).Error
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *FileShareRepo) All() ([]model.FileShare, error) {
|
||||||
|
var items []model.FileShare
|
||||||
|
if err := getDb().Order("path asc").Find(&items).Error; err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return items, nil
|
||||||
|
}
|
||||||
@@ -10,6 +10,18 @@ import (
|
|||||||
type HostRepo struct{}
|
type HostRepo struct{}
|
||||||
|
|
||||||
type IHostRepo interface {
|
type IHostRepo interface {
|
||||||
|
Get(opts ...DBOption) (model.Host, error)
|
||||||
|
GetList(opts ...DBOption) ([]model.Host, error)
|
||||||
|
Page(limit, offset int, opts ...DBOption) (int64, []model.Host, error)
|
||||||
|
Create(host *model.Host) error
|
||||||
|
Update(id uint, vars map[string]interface{}) error
|
||||||
|
UpdateGroup(group, newGroup uint) error
|
||||||
|
Delete(opts ...DBOption) error
|
||||||
|
|
||||||
|
WithByInfo(info string) DBOption
|
||||||
|
WithByPort(port uint) DBOption
|
||||||
|
WithByUser(user string) DBOption
|
||||||
|
|
||||||
GetFirewallRecord(opts ...DBOption) (model.Firewall, error)
|
GetFirewallRecord(opts ...DBOption) (model.Firewall, error)
|
||||||
ListFirewallRecord(opts ...DBOption) ([]model.Firewall, error)
|
ListFirewallRecord(opts ...DBOption) ([]model.Firewall, error)
|
||||||
SaveFirewallRecord(firewall *model.Firewall) error
|
SaveFirewallRecord(firewall *model.Firewall) error
|
||||||
@@ -30,6 +42,80 @@ func NewIHostRepo() IHostRepo {
|
|||||||
return &HostRepo{}
|
return &HostRepo{}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (h *HostRepo) Get(opts ...DBOption) (model.Host, error) {
|
||||||
|
var host model.Host
|
||||||
|
db := global.DB
|
||||||
|
for _, opt := range opts {
|
||||||
|
db = opt(db)
|
||||||
|
}
|
||||||
|
err := db.First(&host).Error
|
||||||
|
return host, err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *HostRepo) GetList(opts ...DBOption) ([]model.Host, error) {
|
||||||
|
var hosts []model.Host
|
||||||
|
db := global.DB.Model(&model.Host{})
|
||||||
|
for _, opt := range opts {
|
||||||
|
db = opt(db)
|
||||||
|
}
|
||||||
|
err := db.Find(&hosts).Error
|
||||||
|
return hosts, err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *HostRepo) Page(page, size int, opts ...DBOption) (int64, []model.Host, error) {
|
||||||
|
var hosts []model.Host
|
||||||
|
db := global.DB.Model(&model.Host{})
|
||||||
|
for _, opt := range opts {
|
||||||
|
db = opt(db)
|
||||||
|
}
|
||||||
|
count := int64(0)
|
||||||
|
db = db.Count(&count)
|
||||||
|
err := db.Limit(size).Offset(size * (page - 1)).Find(&hosts).Error
|
||||||
|
return count, hosts, err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *HostRepo) WithByInfo(info string) DBOption {
|
||||||
|
return func(g *gorm.DB) *gorm.DB {
|
||||||
|
if len(info) == 0 {
|
||||||
|
return g
|
||||||
|
}
|
||||||
|
infoStr := "%" + info + "%"
|
||||||
|
return g.Where("name LIKE ? OR addr LIKE ?", infoStr, infoStr)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *HostRepo) WithByPort(port uint) DBOption {
|
||||||
|
return func(g *gorm.DB) *gorm.DB {
|
||||||
|
return g.Where("port = ?", port)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *HostRepo) WithByUser(user string) DBOption {
|
||||||
|
return func(g *gorm.DB) *gorm.DB {
|
||||||
|
return g.Where("user = ?", user)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *HostRepo) Create(host *model.Host) error {
|
||||||
|
return global.DB.Create(host).Error
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *HostRepo) Update(id uint, vars map[string]interface{}) error {
|
||||||
|
return global.DB.Model(&model.Host{}).Where("id = ?", id).Updates(vars).Error
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *HostRepo) UpdateGroup(group, newGroup uint) error {
|
||||||
|
return global.DB.Model(&model.Host{}).Where("group_id = ?", group).Updates(map[string]interface{}{"group_id": newGroup}).Error
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *HostRepo) Delete(opts ...DBOption) error {
|
||||||
|
db := global.DB
|
||||||
|
for _, opt := range opts {
|
||||||
|
db = opt(db)
|
||||||
|
}
|
||||||
|
return db.Delete(&model.Host{}).Error
|
||||||
|
}
|
||||||
|
|
||||||
func (h *HostRepo) GetFirewallRecord(opts ...DBOption) (model.Firewall, error) {
|
func (h *HostRepo) GetFirewallRecord(opts ...DBOption) (model.Firewall, error) {
|
||||||
var firewall model.Firewall
|
var firewall model.Firewall
|
||||||
db := global.DB
|
db := global.DB
|
||||||
@@ -79,6 +165,9 @@ func (h *HostRepo) SaveFirewallRecord(firewall *model.Firewall) error {
|
|||||||
firewall.Strategy,
|
firewall.Strategy,
|
||||||
).First(&data).Error
|
).First(&data).Error
|
||||||
}
|
}
|
||||||
|
if data.ID != 0 {
|
||||||
|
firewall.ID = data.ID
|
||||||
|
}
|
||||||
return global.DB.Save(firewall).Error
|
return global.DB.Save(firewall).Error
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import (
|
|||||||
|
|
||||||
type IWebsiteRepo interface {
|
type IWebsiteRepo interface {
|
||||||
WithAppInstallId(appInstallId uint) DBOption
|
WithAppInstallId(appInstallId uint) DBOption
|
||||||
|
WithAppInstallIds(appInstallIds []uint) DBOption
|
||||||
WithDomain(domain string) DBOption
|
WithDomain(domain string) DBOption
|
||||||
WithAlias(alias string) DBOption
|
WithAlias(alias string) DBOption
|
||||||
WithWebsiteSSLID(sslId uint) DBOption
|
WithWebsiteSSLID(sslId uint) DBOption
|
||||||
@@ -48,6 +49,15 @@ func (w *WebsiteRepo) WithAppInstallId(appInstallID uint) DBOption {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (w *WebsiteRepo) WithAppInstallIds(appInstallIDs []uint) DBOption {
|
||||||
|
return func(db *gorm.DB) *gorm.DB {
|
||||||
|
if len(appInstallIDs) == 0 {
|
||||||
|
return db
|
||||||
|
}
|
||||||
|
return db.Where("app_install_id in (?)", appInstallIDs)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func (w *WebsiteRepo) WithRuntimeID(runtimeID uint) DBOption {
|
func (w *WebsiteRepo) WithRuntimeID(runtimeID uint) DBOption {
|
||||||
return func(db *gorm.DB) *gorm.DB {
|
return func(db *gorm.DB) *gorm.DB {
|
||||||
return db.Where("runtime_id = ?", runtimeID)
|
return db.Where("runtime_id = ?", runtimeID)
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ type WebsiteDomainRepo struct {
|
|||||||
|
|
||||||
type IWebsiteDomainRepo interface {
|
type IWebsiteDomainRepo interface {
|
||||||
WithWebsiteId(websiteId uint) DBOption
|
WithWebsiteId(websiteId uint) DBOption
|
||||||
|
WithWebsiteIds(websiteIds []uint) DBOption
|
||||||
WithPort(port int) DBOption
|
WithPort(port int) DBOption
|
||||||
WithDomain(domain string) DBOption
|
WithDomain(domain string) DBOption
|
||||||
WithDomainLike(domain string) DBOption
|
WithDomainLike(domain string) DBOption
|
||||||
@@ -36,6 +37,15 @@ func (w WebsiteDomainRepo) WithWebsiteId(websiteId uint) DBOption {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (w WebsiteDomainRepo) WithWebsiteIds(websiteIds []uint) DBOption {
|
||||||
|
return func(db *gorm.DB) *gorm.DB {
|
||||||
|
if len(websiteIds) == 0 {
|
||||||
|
return db
|
||||||
|
}
|
||||||
|
return db.Where("website_id in (?)", websiteIds)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func (w WebsiteDomainRepo) WithPort(port int) DBOption {
|
func (w WebsiteDomainRepo) WithPort(port int) DBOption {
|
||||||
return func(db *gorm.DB) *gorm.DB {
|
return func(db *gorm.DB) *gorm.DB {
|
||||||
return db.Where("port = ?", port)
|
return db.Where("port = ?", port)
|
||||||
|
|||||||
@@ -2,8 +2,10 @@ package repo
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"time"
|
||||||
|
|
||||||
"github.com/1Panel-dev/1Panel/agent/app/model"
|
"github.com/1Panel-dev/1Panel/agent/app/model"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/constant"
|
||||||
"gorm.io/gorm"
|
"gorm.io/gorm"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -21,6 +23,7 @@ type ISSLRepo interface {
|
|||||||
Page(page, size int, opts ...DBOption) (int64, []model.WebsiteSSL, error)
|
Page(page, size int, opts ...DBOption) (int64, []model.WebsiteSSL, error)
|
||||||
GetFirst(opts ...DBOption) (*model.WebsiteSSL, error)
|
GetFirst(opts ...DBOption) (*model.WebsiteSSL, error)
|
||||||
List(opts ...DBOption) ([]model.WebsiteSSL, error)
|
List(opts ...DBOption) ([]model.WebsiteSSL, error)
|
||||||
|
TryMarkApplying(id uint) (bool, error)
|
||||||
Create(ctx context.Context, ssl *model.WebsiteSSL) error
|
Create(ctx context.Context, ssl *model.WebsiteSSL) error
|
||||||
Save(ssl *model.WebsiteSSL) error
|
Save(ssl *model.WebsiteSSL) error
|
||||||
DeleteBy(opts ...DBOption) error
|
DeleteBy(opts ...DBOption) error
|
||||||
@@ -76,12 +79,12 @@ func (w WebsiteSSLRepo) Page(page, size int, opts ...DBOption) (int64, []model.W
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (w WebsiteSSLRepo) GetFirst(opts ...DBOption) (*model.WebsiteSSL, error) {
|
func (w WebsiteSSLRepo) GetFirst(opts ...DBOption) (*model.WebsiteSSL, error) {
|
||||||
var website *model.WebsiteSSL
|
var website model.WebsiteSSL
|
||||||
db := getDb(opts...).Model(&model.WebsiteSSL{})
|
db := getDb(opts...).Model(&model.WebsiteSSL{})
|
||||||
if err := db.Preload("AcmeAccount").Preload("DnsAccount").First(&website).Error; err != nil {
|
if err := db.Preload("AcmeAccount").Preload("DnsAccount").First(&website).Error; err != nil {
|
||||||
return website, err
|
return nil, err
|
||||||
}
|
}
|
||||||
return website, nil
|
return &website, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (w WebsiteSSLRepo) List(opts ...DBOption) ([]model.WebsiteSSL, error) {
|
func (w WebsiteSSLRepo) List(opts ...DBOption) ([]model.WebsiteSSL, error) {
|
||||||
@@ -93,14 +96,25 @@ func (w WebsiteSSLRepo) List(opts ...DBOption) ([]model.WebsiteSSL, error) {
|
|||||||
return websites, nil
|
return websites, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (w WebsiteSSLRepo) TryMarkApplying(id uint) (bool, error) {
|
||||||
|
db := getDb().Model(&model.WebsiteSSL{}).
|
||||||
|
Where("id = ? AND status <> ?", id, constant.SSLApply).
|
||||||
|
Updates(map[string]interface{}{
|
||||||
|
"status": constant.SSLApply,
|
||||||
|
"updated_at": time.Now(),
|
||||||
|
})
|
||||||
|
if db.Error != nil {
|
||||||
|
return false, db.Error
|
||||||
|
}
|
||||||
|
return db.RowsAffected > 0, nil
|
||||||
|
}
|
||||||
|
|
||||||
func (w WebsiteSSLRepo) Create(ctx context.Context, ssl *model.WebsiteSSL) error {
|
func (w WebsiteSSLRepo) Create(ctx context.Context, ssl *model.WebsiteSSL) error {
|
||||||
return getTx(ctx).Create(ssl).Error
|
return getTx(ctx).Create(ssl).Error
|
||||||
}
|
}
|
||||||
|
|
||||||
func (w WebsiteSSLRepo) Save(ssl *model.WebsiteSSL) error {
|
func (w WebsiteSSLRepo) Save(ssl *model.WebsiteSSL) error {
|
||||||
return getDb().Model(&model.WebsiteSSL{BaseModel: model.BaseModel{
|
return getDb().Save(ssl).Error
|
||||||
ID: ssl.ID,
|
|
||||||
}}).Save(&ssl).Error
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (w WebsiteSSLRepo) SaveByMap(ssl *model.WebsiteSSL, params map[string]interface{}) error {
|
func (w WebsiteSSLRepo) SaveByMap(ssl *model.WebsiteSSL, params map[string]interface{}) error {
|
||||||
|
|||||||
+1146
-1843
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,527 @@
|
|||||||
|
package service
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os"
|
||||||
|
"path"
|
||||||
|
"sort"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/dto"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/dto/request"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/buserr"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/constant"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/global"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/utils/cmd"
|
||||||
|
)
|
||||||
|
|
||||||
|
var agentMarkdownFileNames = []string{"AGENTS.md", "SOUL.md", "USER.md", "IDENTITY.md", "TOOLS.md", "HEARTBEAT.md", "BOOT.md", "BOOTSTRAP.md"}
|
||||||
|
|
||||||
|
func (a AgentService) CreateRole(req dto.AgentRoleCreateReq) (*dto.AgentRoleCreateResp, error) {
|
||||||
|
_, install, err := a.loadAgentAndInstall(req.AgentID)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
args := []string{"openclaw", "agents", "add", req.Name}
|
||||||
|
workspace := "/home/node/.openclaw/workspace-agent_" + req.Name
|
||||||
|
agentDir := "/home/node/.openclaw/agents/" + req.Name
|
||||||
|
args = append(args, "--workspace", workspace)
|
||||||
|
if model := strings.TrimSpace(req.Model); model != "" {
|
||||||
|
args = append(args, "--model", model)
|
||||||
|
}
|
||||||
|
for _, binding := range req.Bindings {
|
||||||
|
channel := binding.Channel
|
||||||
|
if channel == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if accountID := binding.AccountID; accountID != "" {
|
||||||
|
channel = channel + ":" + accountID
|
||||||
|
}
|
||||||
|
args = append(args, "--bind", channel)
|
||||||
|
}
|
||||||
|
args = append(args, "--agent-dir", agentDir)
|
||||||
|
args = append(args, "--non-interactive", "--json")
|
||||||
|
|
||||||
|
output, err := cmd.RunDockerExecWithStdout(5*time.Minute, install.ContainerName, args...)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return &dto.AgentRoleCreateResp{Output: strings.TrimSpace(output)}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a AgentService) GetConfiguredAgents(req dto.AgentConfiguredAgentsReq) ([]dto.AgentConfiguredAgentItem, error) {
|
||||||
|
agent, _, conf, err := a.loadAgentConfig(req.AgentID)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
agents, ok := conf["agents"].(map[string]interface{})
|
||||||
|
if !ok {
|
||||||
|
return []dto.AgentConfiguredAgentItem{}, nil
|
||||||
|
}
|
||||||
|
rawList, ok := agents["list"].([]interface{})
|
||||||
|
if !ok {
|
||||||
|
return []dto.AgentConfiguredAgentItem{}, nil
|
||||||
|
}
|
||||||
|
result := make([]dto.AgentConfiguredAgentItem, 0, len(rawList))
|
||||||
|
baseDir := path.Join(global.Dir.AppInstallDir, agent.AgentType, agent.Name, "data")
|
||||||
|
for _, item := range rawList {
|
||||||
|
record, ok := item.(map[string]interface{})
|
||||||
|
if !ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
configured := extractConfiguredAgentItem(baseDir, record)
|
||||||
|
if strings.EqualFold(configured.ID, "main") {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
result = append(result, configured)
|
||||||
|
}
|
||||||
|
applyConfiguredAgentBindings(result, conf["bindings"])
|
||||||
|
return result, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a AgentService) GetRoleChannels(req dto.AgentRoleChannelsReq) ([]dto.AgentRoleChannelItem, error) {
|
||||||
|
_, _, conf, err := a.loadAgentConfig(req.AgentID)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
channels, ok := conf["channels"].(map[string]interface{})
|
||||||
|
if !ok || len(channels) == 0 {
|
||||||
|
return []dto.AgentRoleChannelItem{}, nil
|
||||||
|
}
|
||||||
|
boundBindings := loadBoundChannelBindings(conf["bindings"])
|
||||||
|
result := make([]dto.AgentRoleChannelItem, 0, len(channels))
|
||||||
|
for key := range channels {
|
||||||
|
if key == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
accountIDs := extractRoleChannelAccountIDs(conf, key)
|
||||||
|
availableAccountIDs := filterAvailableChannelAccountIDs(boundBindings, key, accountIDs)
|
||||||
|
result = append(result, dto.AgentRoleChannelItem{
|
||||||
|
Name: key,
|
||||||
|
Bound: isRoleChannelFullyBound(boundBindings, key, accountIDs, availableAccountIDs),
|
||||||
|
AccountIDs: availableAccountIDs,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
sort.Slice(result, func(i, j int) bool {
|
||||||
|
return result[i].Name < result[j].Name
|
||||||
|
})
|
||||||
|
return result, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a AgentService) DeleteRole(req dto.AgentRoleDeleteReq) error {
|
||||||
|
agent, install, conf, err := a.loadAgentConfig(req.AgentID)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
baseDir := path.Join(global.Dir.AppInstallDir, agent.AgentType, agent.Name, "data")
|
||||||
|
if req.ID == "" {
|
||||||
|
return buserr.New("ErrRecordNotFound")
|
||||||
|
}
|
||||||
|
target, ok := findConfiguredAgentByID(baseDir, conf, req.ID)
|
||||||
|
if !ok {
|
||||||
|
return buserr.New("ErrRecordNotFound")
|
||||||
|
}
|
||||||
|
|
||||||
|
args := []string{"openclaw", "agents", "delete", req.ID, "--force"}
|
||||||
|
if _, err = cmd.RunDockerExecWithStdout(5*time.Minute, install.ContainerName, args...); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if target.Workspace != "" {
|
||||||
|
if err := os.RemoveAll(target.Workspace); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if target.AgentDir != "" {
|
||||||
|
if err := os.RemoveAll(target.AgentDir); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a AgentService) BindRole(req dto.AgentRoleBindReq) error {
|
||||||
|
return a.operateRoleBinding(req, "bind")
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a AgentService) UnbindRole(req dto.AgentRoleBindReq) error {
|
||||||
|
return a.operateRoleBinding(req, "unbind")
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a AgentService) operateRoleBinding(req dto.AgentRoleBindReq, action string) error {
|
||||||
|
agent, install, conf, err := a.loadAgentConfig(req.AgentID)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
baseDir := path.Join(global.Dir.AppInstallDir, agent.AgentType, agent.Name, "data")
|
||||||
|
if req.ID == "" {
|
||||||
|
return buserr.New("ErrRecordNotFound")
|
||||||
|
}
|
||||||
|
if _, ok := findConfiguredAgentByID(baseDir, conf, req.ID); !ok {
|
||||||
|
return buserr.New("ErrRecordNotFound")
|
||||||
|
}
|
||||||
|
|
||||||
|
binding := formatRoleBinding(req.Channel, req.AccountID)
|
||||||
|
if binding == "" {
|
||||||
|
return buserr.New("ErrInvalidParams")
|
||||||
|
}
|
||||||
|
args := []string{
|
||||||
|
"openclaw",
|
||||||
|
"agents",
|
||||||
|
action,
|
||||||
|
"--agent",
|
||||||
|
req.ID,
|
||||||
|
"--bind",
|
||||||
|
binding,
|
||||||
|
}
|
||||||
|
args = append(args, "--json")
|
||||||
|
_, err = cmd.RunDockerExecWithStdout(5*time.Minute, install.ContainerName, args...)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a AgentService) GetRoleMarkdownFiles(req dto.AgentRoleMarkdownFilesReq) ([]dto.AgentRoleMarkdownFileItem, error) {
|
||||||
|
agent, err := loadOpenclawAgentByID(req.AgentID)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
baseDir := path.Join(global.Dir.AppInstallDir, agent.AgentType, agent.Name, "data")
|
||||||
|
workspaceDir, err := resolveMarkdownWorkspaceDir(baseDir, req.Workspace)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
items := make([]dto.AgentRoleMarkdownFileItem, 0, len(agentMarkdownFileNames))
|
||||||
|
for _, name := range agentMarkdownFileNames {
|
||||||
|
item := dto.AgentRoleMarkdownFileItem{
|
||||||
|
Name: name,
|
||||||
|
}
|
||||||
|
content, readErr := os.ReadFile(path.Join(workspaceDir, name))
|
||||||
|
if readErr == nil {
|
||||||
|
item.Content = string(content)
|
||||||
|
} else if !os.IsNotExist(readErr) {
|
||||||
|
return nil, readErr
|
||||||
|
}
|
||||||
|
items = append(items, item)
|
||||||
|
}
|
||||||
|
return items, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a AgentService) UpdateRoleMarkdownFiles(req dto.AgentRoleMarkdownFilesUpdateReq) error {
|
||||||
|
agent, install, err := a.loadOpenclawAgentAndInstall(req.AgentID)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
baseDir := path.Join(global.Dir.AppInstallDir, agent.AgentType, agent.Name, "data")
|
||||||
|
dirPath, err := resolveMarkdownWorkspaceDir(baseDir, req.Workspace)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err = os.MkdirAll(dirPath, 0755); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
for _, item := range req.Files {
|
||||||
|
file := path.Join(dirPath, item.Name)
|
||||||
|
if err = os.WriteFile(file, []byte(item.Content), 0644); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if req.Restart {
|
||||||
|
return NewIAppInstalledService().Operate(request.AppInstalledOperate{
|
||||||
|
InstallId: install.ID,
|
||||||
|
Operate: constant.Restart,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func extractConfiguredAgentItem(installDir string, record map[string]interface{}) dto.AgentConfiguredAgentItem {
|
||||||
|
item := dto.AgentConfiguredAgentItem{Bindings: []dto.AgentRoleBinding{}}
|
||||||
|
if id, ok := record["id"].(string); ok {
|
||||||
|
item.ID = id
|
||||||
|
} else if id, ok := record["agentId"].(string); ok {
|
||||||
|
item.ID = id
|
||||||
|
}
|
||||||
|
if name, ok := record["name"].(string); ok {
|
||||||
|
item.Name = name
|
||||||
|
}
|
||||||
|
if workspace, ok := record["workspace"].(string); ok {
|
||||||
|
item.Workspace = resolveRoleDir(installDir, workspace)
|
||||||
|
}
|
||||||
|
if model, ok := record["model"].(string); ok {
|
||||||
|
item.Model = model
|
||||||
|
}
|
||||||
|
if agentDir, ok := record["agentDir"].(string); ok {
|
||||||
|
item.AgentDir = agentDir
|
||||||
|
} else if agentDir, ok := record["agent_dir"].(string); ok {
|
||||||
|
item.AgentDir = agentDir
|
||||||
|
}
|
||||||
|
item.AgentDir = resolveRoleDir(installDir, item.AgentDir)
|
||||||
|
return item
|
||||||
|
}
|
||||||
|
|
||||||
|
func findConfiguredAgentByID(baseDir string, conf map[string]interface{}, id string) (dto.AgentConfiguredAgentItem, bool) {
|
||||||
|
agents, ok := conf["agents"].(map[string]interface{})
|
||||||
|
if !ok {
|
||||||
|
return dto.AgentConfiguredAgentItem{}, false
|
||||||
|
}
|
||||||
|
rawList, ok := agents["list"].([]interface{})
|
||||||
|
if !ok {
|
||||||
|
return dto.AgentConfiguredAgentItem{}, false
|
||||||
|
}
|
||||||
|
for _, item := range rawList {
|
||||||
|
record, ok := item.(map[string]interface{})
|
||||||
|
if !ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
configured := extractConfiguredAgentItem(baseDir, record)
|
||||||
|
if strings.EqualFold(configured.ID, id) {
|
||||||
|
return configured, true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return dto.AgentConfiguredAgentItem{}, false
|
||||||
|
}
|
||||||
|
|
||||||
|
func formatRoleBinding(channel, accountID string) string {
|
||||||
|
if channel == "" {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
if accountID == "" {
|
||||||
|
return channel
|
||||||
|
}
|
||||||
|
return channel + ":" + accountID
|
||||||
|
}
|
||||||
|
|
||||||
|
func applyConfiguredAgentBindings(agents []dto.AgentConfiguredAgentItem, value interface{}) {
|
||||||
|
bindings, ok := value.([]interface{})
|
||||||
|
if !ok || len(agents) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
indexByID := make(map[string]int, len(agents))
|
||||||
|
indexByName := make(map[string]int, len(agents))
|
||||||
|
for i, agent := range agents {
|
||||||
|
if agent.ID != "" {
|
||||||
|
indexByID[agent.ID] = i
|
||||||
|
}
|
||||||
|
if agent.Name != "" {
|
||||||
|
indexByName[agent.Name] = i
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for _, binding := range bindings {
|
||||||
|
record, ok := binding.(map[string]interface{})
|
||||||
|
if !ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if bindingType, _ := record["type"].(string); !strings.EqualFold(bindingType, "route") {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
targetID, _ := record["agentId"].(string)
|
||||||
|
if targetID == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
match, ok := record["match"].(map[string]interface{})
|
||||||
|
if !ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
channel, _ := match["channel"].(string)
|
||||||
|
if channel == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
index, ok := indexByID[targetID]
|
||||||
|
if !ok {
|
||||||
|
index, ok = indexByName[targetID]
|
||||||
|
}
|
||||||
|
if !ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
accountID, _ := match["accountId"].(string)
|
||||||
|
if accountID == "" {
|
||||||
|
accountID, _ = record["accountId"].(string)
|
||||||
|
}
|
||||||
|
agents[index].Bindings = append(agents[index].Bindings, dto.AgentRoleBinding{
|
||||||
|
Channel: channel,
|
||||||
|
AccountID: accountID,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func loadBoundChannelBindings(value interface{}) map[string]map[string]struct{} {
|
||||||
|
result := make(map[string]map[string]struct{})
|
||||||
|
bindings, ok := value.([]interface{})
|
||||||
|
if !ok {
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
for _, binding := range bindings {
|
||||||
|
record, ok := binding.(map[string]interface{})
|
||||||
|
if !ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if bindingType, _ := record["type"].(string); !strings.EqualFold(bindingType, "route") {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
match, ok := record["match"].(map[string]interface{})
|
||||||
|
if !ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
channel, _ := match["channel"].(string)
|
||||||
|
if channel == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
accountID, _ := match["accountId"].(string)
|
||||||
|
if accountID == "" {
|
||||||
|
accountID, _ = record["accountId"].(string)
|
||||||
|
}
|
||||||
|
if _, ok := result[channel]; !ok {
|
||||||
|
result[channel] = make(map[string]struct{})
|
||||||
|
}
|
||||||
|
result[channel][accountID] = struct{}{}
|
||||||
|
}
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
|
||||||
|
func extractRoleChannelAccountIDs(conf map[string]interface{}, channel string) []string {
|
||||||
|
switch channel {
|
||||||
|
case "feishu":
|
||||||
|
config := extractFeishuConfig(conf)
|
||||||
|
accountIDs := make([]string, 0, len(config.Bots))
|
||||||
|
for _, item := range config.Bots {
|
||||||
|
if accountID := item.AccountID; accountID != "" {
|
||||||
|
accountIDs = append(accountIDs, accountID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
sort.Strings(accountIDs)
|
||||||
|
return accountIDs
|
||||||
|
case "telegram":
|
||||||
|
config := extractTelegramConfig(conf)
|
||||||
|
accountIDs := make([]string, 0, len(config.Bots))
|
||||||
|
for _, item := range config.Bots {
|
||||||
|
if accountID := item.AccountID; accountID != "" {
|
||||||
|
accountIDs = append(accountIDs, accountID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
sort.Strings(accountIDs)
|
||||||
|
return accountIDs
|
||||||
|
case "discord":
|
||||||
|
config := extractDiscordConfig(conf)
|
||||||
|
accountIDs := make([]string, 0, len(config.Bots))
|
||||||
|
for _, item := range config.Bots {
|
||||||
|
if accountID := item.AccountID; accountID != "" {
|
||||||
|
accountIDs = append(accountIDs, accountID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
sort.Strings(accountIDs)
|
||||||
|
return accountIDs
|
||||||
|
case "qqbot":
|
||||||
|
config := extractQQBotConfig(conf)
|
||||||
|
accountIDs := make([]string, 0, len(config.Bots))
|
||||||
|
for _, item := range config.Bots {
|
||||||
|
if accountID := item.AccountID; accountID != "" {
|
||||||
|
accountIDs = append(accountIDs, accountID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
sort.Strings(accountIDs)
|
||||||
|
return accountIDs
|
||||||
|
case "dingtalk-connector":
|
||||||
|
config := extractDingTalkConfig(conf)
|
||||||
|
accountIDs := make([]string, 0, len(config.Bots))
|
||||||
|
for _, item := range config.Bots {
|
||||||
|
if accountID := item.AccountID; accountID != "" {
|
||||||
|
accountIDs = append(accountIDs, accountID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
sort.Strings(accountIDs)
|
||||||
|
return accountIDs
|
||||||
|
case "wecom":
|
||||||
|
return []string{}
|
||||||
|
default:
|
||||||
|
return extractRawChannelAccountIDs(getChannelConfig(conf, channel))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func filterAvailableChannelAccountIDs(bindings map[string]map[string]struct{}, channel string, accountIDs []string) []string {
|
||||||
|
channelBindings, ok := bindings[channel]
|
||||||
|
if !ok || len(channelBindings) == 0 {
|
||||||
|
return append([]string(nil), accountIDs...)
|
||||||
|
}
|
||||||
|
if _, ok := channelBindings[""]; ok {
|
||||||
|
return []string{}
|
||||||
|
}
|
||||||
|
result := make([]string, 0, len(accountIDs))
|
||||||
|
for _, accountID := range accountIDs {
|
||||||
|
if _, ok := channelBindings[accountID]; ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
result = append(result, accountID)
|
||||||
|
}
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
|
||||||
|
func isRoleChannelFullyBound(bindings map[string]map[string]struct{}, channel string, allAccountIDs, availableAccountIDs []string) bool {
|
||||||
|
channelBindings, ok := bindings[channel]
|
||||||
|
if !ok || len(channelBindings) == 0 {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
if _, ok := channelBindings[""]; ok {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
if len(allAccountIDs) == 0 {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return len(availableAccountIDs) == 0
|
||||||
|
}
|
||||||
|
|
||||||
|
func extractRawChannelAccountIDs(channel map[string]interface{}) []string {
|
||||||
|
if len(channel) == 0 {
|
||||||
|
return []string{}
|
||||||
|
}
|
||||||
|
accounts, ok := channel["accounts"].(map[string]interface{})
|
||||||
|
if !ok || len(accounts) == 0 {
|
||||||
|
return []string{}
|
||||||
|
}
|
||||||
|
result := make([]string, 0, len(accounts))
|
||||||
|
for key := range accounts {
|
||||||
|
if key == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
result = append(result, key)
|
||||||
|
}
|
||||||
|
sort.Strings(result)
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
|
||||||
|
func resolveRoleDir(installDir, workspace string) string {
|
||||||
|
if workspace == "" {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
if strings.HasPrefix(workspace, "/home/node/.openclaw/workspace/") {
|
||||||
|
return strings.ReplaceAll(workspace, "/home/node/.openclaw", installDir)
|
||||||
|
}
|
||||||
|
return strings.ReplaceAll(workspace, "/home/node/.openclaw", path.Join(installDir, "conf"))
|
||||||
|
}
|
||||||
|
|
||||||
|
func resolveMarkdownWorkspaceDir(installDir, workspace string) (string, error) {
|
||||||
|
if workspace == "" {
|
||||||
|
return "", buserr.New("ErrRecordNotFound")
|
||||||
|
}
|
||||||
|
|
||||||
|
confDir := path.Join(installDir, "conf")
|
||||||
|
allowedOpenclawPrefixes := []string{
|
||||||
|
"/home/node/.openclaw/workspace/",
|
||||||
|
"/home/node/.openclaw/workspace-agent_",
|
||||||
|
}
|
||||||
|
for _, prefix := range allowedOpenclawPrefixes {
|
||||||
|
if strings.HasPrefix(workspace, prefix) {
|
||||||
|
return resolveRoleDir(installDir, workspace), nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
cleanWorkspace := path.Clean(workspace)
|
||||||
|
cleanConfDir := path.Clean(confDir)
|
||||||
|
if cleanWorkspace == cleanConfDir || strings.HasPrefix(cleanWorkspace, cleanConfDir+"/") {
|
||||||
|
return cleanWorkspace, nil
|
||||||
|
}
|
||||||
|
return "", buserr.New("ErrRecordNotFound")
|
||||||
|
}
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,731 @@
|
|||||||
|
package service
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"path"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/dto"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/model"
|
||||||
|
providercatalog "github.com/1Panel-dev/1Panel/agent/app/provider"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/buserr"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/constant"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/utils/common"
|
||||||
|
agentenv "github.com/1Panel-dev/1Panel/agent/utils/env"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/utils/files"
|
||||||
|
"github.com/joho/godotenv"
|
||||||
|
"gopkg.in/yaml.v3"
|
||||||
|
)
|
||||||
|
|
||||||
|
const hermesWorkspaceDir = "/opt/data/workspace"
|
||||||
|
const hermesExecutablePath = "/opt/hermes/.venv/bin/hermes"
|
||||||
|
|
||||||
|
type hermesConfig struct {
|
||||||
|
Model hermesModelConfig `yaml:"model"`
|
||||||
|
Terminal hermesTerminalConfig `yaml:"terminal"`
|
||||||
|
Timezone string `yaml:"timezone,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type hermesModelConfig struct {
|
||||||
|
Default string `yaml:"default"`
|
||||||
|
Provider string `yaml:"provider"`
|
||||||
|
BaseURL string `yaml:"base_url,omitempty"`
|
||||||
|
APIKey string `yaml:"api_key,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type hermesTerminalConfig struct {
|
||||||
|
Backend string `yaml:"backend"`
|
||||||
|
Cwd string `yaml:"cwd"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type hermesEnvEntry struct {
|
||||||
|
Key string
|
||||||
|
Value string
|
||||||
|
}
|
||||||
|
|
||||||
|
func buildHermesDockerExecCommandArgs(containerName, command string, commandArgs ...string) []string {
|
||||||
|
args := []string{"exec", "-u", "hermes", containerName, command}
|
||||||
|
return append(args, commandArgs...)
|
||||||
|
}
|
||||||
|
|
||||||
|
func buildHermesDockerExecArgs(containerName string, hermesArgs ...string) []string {
|
||||||
|
return buildHermesDockerExecCommandArgs(containerName, "hermes", hermesArgs...)
|
||||||
|
}
|
||||||
|
|
||||||
|
func writeHermesConfig(confDir string, account *model.AgentAccount, modelName string, timezone string) error {
|
||||||
|
if strings.TrimSpace(confDir) == "" {
|
||||||
|
return fmt.Errorf("config dir is required")
|
||||||
|
}
|
||||||
|
if account == nil {
|
||||||
|
return fmt.Errorf("account is required")
|
||||||
|
}
|
||||||
|
if strings.TrimSpace(modelName) == "" {
|
||||||
|
return fmt.Errorf("model is required")
|
||||||
|
}
|
||||||
|
fileOp := files.NewFileOp()
|
||||||
|
if !fileOp.Stat(confDir) {
|
||||||
|
if err := fileOp.CreateDir(confDir, constant.DirPerm); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
provider := resolveHermesProvider(account.Provider)
|
||||||
|
configPath := path.Join(confDir, "config.yaml")
|
||||||
|
cfg, err := readHermesConfigMap(configPath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
model := map[string]interface{}{
|
||||||
|
"default": resolveHermesModel(account.Provider, provider, modelName),
|
||||||
|
"provider": provider,
|
||||||
|
"base_url": account.BaseURL,
|
||||||
|
}
|
||||||
|
if provider == "custom" && account.APIKey != "" {
|
||||||
|
model["api_key"] = "${CUSTOM_API_KEY}"
|
||||||
|
}
|
||||||
|
cfg["model"] = model
|
||||||
|
cfg["terminal"] = map[string]interface{}{
|
||||||
|
"backend": "local",
|
||||||
|
"cwd": hermesWorkspaceDir,
|
||||||
|
}
|
||||||
|
if timezone != "" {
|
||||||
|
cfg["timezone"] = timezone
|
||||||
|
} else {
|
||||||
|
delete(cfg, "timezone")
|
||||||
|
}
|
||||||
|
if err := writeHermesConfigMap(configPath, cfg); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return writeHermesModelEnv(path.Join(confDir, ".env"), account)
|
||||||
|
}
|
||||||
|
|
||||||
|
func prepareHermesInstallFiles(appInstall *model.AppInstall, account *model.AgentAccount, modelName string) error {
|
||||||
|
if appInstall == nil {
|
||||||
|
return fmt.Errorf("app install is required")
|
||||||
|
}
|
||||||
|
dataDir := path.Join(appInstall.GetPath(), "data")
|
||||||
|
if err := writeHermesConfig(dataDir, account, modelName, normalizeHermesTimezone(common.LoadTimeZoneByCmd())); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return files.NewFileOp().ChownR(dataDir, "1000", "1000", true)
|
||||||
|
}
|
||||||
|
|
||||||
|
func readHermesConfig(configPath string) (*hermesConfig, error) {
|
||||||
|
content, err := files.NewFileOp().GetContent(configPath)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
var cfg hermesConfig
|
||||||
|
if err := yaml.Unmarshal(content, &cfg); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return &cfg, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func readHermesConfigMap(configPath string) (map[string]interface{}, error) {
|
||||||
|
fileOp := files.NewFileOp()
|
||||||
|
if !fileOp.Stat(configPath) {
|
||||||
|
return map[string]interface{}{}, nil
|
||||||
|
}
|
||||||
|
content, err := fileOp.GetContent(configPath)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
cfg := map[string]interface{}{}
|
||||||
|
if strings.TrimSpace(string(content)) == "" {
|
||||||
|
return cfg, nil
|
||||||
|
}
|
||||||
|
if err := yaml.Unmarshal(content, &cfg); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return cfg, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func writeHermesConfigMap(configPath string, cfg map[string]interface{}) error {
|
||||||
|
payload, err := yaml.Marshal(cfg)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return files.NewFileOp().SaveFile(configPath, string(payload), 0600)
|
||||||
|
}
|
||||||
|
|
||||||
|
func readHermesTelegramChannelConfig(confDir string) (*dto.AgentTelegramConfig, error) {
|
||||||
|
envMap, err := readHermesEnvMap(path.Join(confDir, ".env"))
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
cfg, err := readHermesConfigMap(path.Join(confDir, "config.yaml"))
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
allowFrom := splitHermesEnvList(envMap["TELEGRAM_ALLOWED_USERS"])
|
||||||
|
requireMention := extractBoolValue(childMap(cfg, "telegram")["require_mention"], false)
|
||||||
|
dmPolicy := ""
|
||||||
|
if extractHermesEnvBool(envMap, "TELEGRAM_ALLOW_ALL_USERS", false) {
|
||||||
|
dmPolicy = "open"
|
||||||
|
} else if len(allowFrom) > 0 {
|
||||||
|
dmPolicy = "allowlist"
|
||||||
|
} else if envMap["TELEGRAM_BOT_TOKEN"] != "" {
|
||||||
|
dmPolicy = "pairing"
|
||||||
|
}
|
||||||
|
groupPolicy := ""
|
||||||
|
if requireMention {
|
||||||
|
groupPolicy = "allowlist"
|
||||||
|
} else if envMap["TELEGRAM_BOT_TOKEN"] != "" {
|
||||||
|
groupPolicy = "open"
|
||||||
|
}
|
||||||
|
token := envMap["TELEGRAM_BOT_TOKEN"]
|
||||||
|
result := &dto.AgentTelegramConfig{
|
||||||
|
Enabled: token != "",
|
||||||
|
DmPolicy: dmPolicy,
|
||||||
|
AllowFrom: allowFrom,
|
||||||
|
RequireMention: requireMention,
|
||||||
|
GroupPolicy: groupPolicy,
|
||||||
|
GroupAllowFrom: []string{},
|
||||||
|
Streaming: "",
|
||||||
|
DefaultAccount: "",
|
||||||
|
}
|
||||||
|
if token != "" {
|
||||||
|
result.Bots = []dto.AgentTelegramBot{
|
||||||
|
{
|
||||||
|
AgentChannelBotBase: dto.AgentChannelBotBase{
|
||||||
|
AccountID: "default",
|
||||||
|
Name: "Default",
|
||||||
|
Enabled: true,
|
||||||
|
IsDefault: true,
|
||||||
|
},
|
||||||
|
BotToken: token,
|
||||||
|
DmPolicy: dmPolicy,
|
||||||
|
GroupPolicy: groupPolicy,
|
||||||
|
Streaming: "",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return result, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func writeHermesTelegramChannelConfig(confDir string, config dto.AgentTelegramConfig) error {
|
||||||
|
envPath := path.Join(confDir, ".env")
|
||||||
|
envMap, err := readHermesEnvMap(envPath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
token := firstHermesTelegramBotToken(config.Bots, config.DefaultAccount)
|
||||||
|
if token != "" {
|
||||||
|
envMap["TELEGRAM_BOT_TOKEN"] = token
|
||||||
|
} else {
|
||||||
|
delete(envMap, "TELEGRAM_BOT_TOKEN")
|
||||||
|
}
|
||||||
|
delete(envMap, "TELEGRAM_ALLOWED_USERS")
|
||||||
|
delete(envMap, "TELEGRAM_ALLOW_ALL_USERS")
|
||||||
|
switch config.DmPolicy {
|
||||||
|
case "open":
|
||||||
|
envMap["TELEGRAM_ALLOW_ALL_USERS"] = "true"
|
||||||
|
case "allowlist":
|
||||||
|
if allow := joinHermesEnvList(config.AllowFrom); allow != "" {
|
||||||
|
envMap["TELEGRAM_ALLOWED_USERS"] = allow
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if err := writeHermesEnvMap(envPath, envMap, []string{
|
||||||
|
"TELEGRAM_BOT_TOKEN",
|
||||||
|
"TELEGRAM_ALLOWED_USERS",
|
||||||
|
"TELEGRAM_ALLOW_ALL_USERS",
|
||||||
|
}); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
configPath := path.Join(confDir, "config.yaml")
|
||||||
|
cfg, err := readHermesConfigMap(configPath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
telegram := ensureChildMap(cfg, "telegram")
|
||||||
|
telegram["require_mention"] = config.RequireMention
|
||||||
|
return writeHermesConfigMap(configPath, cfg)
|
||||||
|
}
|
||||||
|
|
||||||
|
func readHermesDiscordChannelConfig(confDir string) (*dto.AgentDiscordConfig, error) {
|
||||||
|
envMap, err := readHermesEnvMap(path.Join(confDir, ".env"))
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
cfg, err := readHermesConfigMap(path.Join(confDir, "config.yaml"))
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
allowFrom := splitHermesEnvList(envMap["DISCORD_ALLOWED_USERS"])
|
||||||
|
requireMention := extractBoolValue(childMap(cfg, "discord")["require_mention"], false)
|
||||||
|
dmPolicy := ""
|
||||||
|
if extractHermesEnvBool(envMap, "DISCORD_ALLOW_ALL_USERS", false) {
|
||||||
|
dmPolicy = "open"
|
||||||
|
} else if len(allowFrom) > 0 {
|
||||||
|
dmPolicy = "allowlist"
|
||||||
|
} else if envMap["DISCORD_BOT_TOKEN"] != "" {
|
||||||
|
dmPolicy = "pairing"
|
||||||
|
}
|
||||||
|
groupPolicy := ""
|
||||||
|
if requireMention {
|
||||||
|
groupPolicy = "allowlist"
|
||||||
|
} else if envMap["DISCORD_BOT_TOKEN"] != "" {
|
||||||
|
groupPolicy = "open"
|
||||||
|
}
|
||||||
|
token := envMap["DISCORD_BOT_TOKEN"]
|
||||||
|
result := &dto.AgentDiscordConfig{
|
||||||
|
Enabled: token != "",
|
||||||
|
DmPolicy: dmPolicy,
|
||||||
|
AllowFrom: allowFrom,
|
||||||
|
RequireMention: requireMention,
|
||||||
|
GroupPolicy: groupPolicy,
|
||||||
|
DefaultAccount: "",
|
||||||
|
}
|
||||||
|
if token != "" {
|
||||||
|
result.Bots = []dto.AgentDiscordBot{
|
||||||
|
{
|
||||||
|
AgentChannelBotBase: dto.AgentChannelBotBase{
|
||||||
|
AccountID: "default",
|
||||||
|
Name: "Default",
|
||||||
|
Enabled: true,
|
||||||
|
IsDefault: true,
|
||||||
|
},
|
||||||
|
Token: token,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return result, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func writeHermesDiscordChannelConfig(confDir string, config dto.AgentDiscordConfig) error {
|
||||||
|
envPath := path.Join(confDir, ".env")
|
||||||
|
envMap, err := readHermesEnvMap(envPath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
token := firstHermesDiscordBotToken(config.Bots, config.DefaultAccount)
|
||||||
|
if token != "" {
|
||||||
|
envMap["DISCORD_BOT_TOKEN"] = token
|
||||||
|
} else {
|
||||||
|
delete(envMap, "DISCORD_BOT_TOKEN")
|
||||||
|
}
|
||||||
|
delete(envMap, "DISCORD_ALLOWED_USERS")
|
||||||
|
delete(envMap, "DISCORD_ALLOW_ALL_USERS")
|
||||||
|
switch config.DmPolicy {
|
||||||
|
case "open":
|
||||||
|
envMap["DISCORD_ALLOW_ALL_USERS"] = "true"
|
||||||
|
case "allowlist":
|
||||||
|
if allow := joinHermesEnvList(config.AllowFrom); allow != "" {
|
||||||
|
envMap["DISCORD_ALLOWED_USERS"] = allow
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if err := writeHermesEnvMap(envPath, envMap, []string{
|
||||||
|
"DISCORD_BOT_TOKEN",
|
||||||
|
"DISCORD_ALLOWED_USERS",
|
||||||
|
"DISCORD_ALLOW_ALL_USERS",
|
||||||
|
}); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
configPath := path.Join(confDir, "config.yaml")
|
||||||
|
cfg, err := readHermesConfigMap(configPath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
discord := ensureChildMap(cfg, "discord")
|
||||||
|
discord["require_mention"] = config.RequireMention
|
||||||
|
return writeHermesConfigMap(configPath, cfg)
|
||||||
|
}
|
||||||
|
|
||||||
|
func deleteHermesEnvKeys(confDir string, keys ...string) error {
|
||||||
|
envPath := path.Join(confDir, ".env")
|
||||||
|
envMap, err := readHermesEnvMap(envPath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
for _, key := range keys {
|
||||||
|
delete(envMap, key)
|
||||||
|
}
|
||||||
|
return writeHermesEnvMap(envPath, envMap, keys)
|
||||||
|
}
|
||||||
|
|
||||||
|
func deleteHermesConfigSections(confDir string, topLevelKeys []string, platformKeys []string) error {
|
||||||
|
configPath := path.Join(confDir, "config.yaml")
|
||||||
|
cfg, err := readHermesConfigMap(configPath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
for _, key := range topLevelKeys {
|
||||||
|
delete(cfg, key)
|
||||||
|
}
|
||||||
|
if len(platformKeys) > 0 {
|
||||||
|
if platforms, ok := cfg["platforms"].(map[string]interface{}); ok {
|
||||||
|
for _, key := range platformKeys {
|
||||||
|
delete(platforms, key)
|
||||||
|
}
|
||||||
|
if len(platforms) == 0 {
|
||||||
|
delete(cfg, "platforms")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return writeHermesConfigMap(configPath, cfg)
|
||||||
|
}
|
||||||
|
|
||||||
|
func deleteHermesTelegramChannelConfig(confDir string) error {
|
||||||
|
if err := deleteHermesEnvKeys(confDir,
|
||||||
|
"TELEGRAM_BOT_TOKEN",
|
||||||
|
"TELEGRAM_ALLOWED_USERS",
|
||||||
|
"TELEGRAM_ALLOW_ALL_USERS",
|
||||||
|
"TELEGRAM_HOME_CHANNEL",
|
||||||
|
); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return deleteHermesConfigSections(confDir, []string{"telegram"}, []string{"telegram"})
|
||||||
|
}
|
||||||
|
|
||||||
|
func deleteHermesDiscordChannelConfig(confDir string) error {
|
||||||
|
if err := deleteHermesEnvKeys(confDir,
|
||||||
|
"DISCORD_BOT_TOKEN",
|
||||||
|
"DISCORD_ALLOWED_USERS",
|
||||||
|
"DISCORD_ALLOW_ALL_USERS",
|
||||||
|
"DISCORD_HOME_CHANNEL",
|
||||||
|
); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return deleteHermesConfigSections(confDir, []string{"discord"}, []string{"discord"})
|
||||||
|
}
|
||||||
|
|
||||||
|
func normalizeHermesTimezone(timezone string) string {
|
||||||
|
timezone = strings.TrimSpace(timezone)
|
||||||
|
if timezone == "" {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
if _, err := time.LoadLocation(timezone); err != nil {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
return timezone
|
||||||
|
}
|
||||||
|
|
||||||
|
func resolveHermesProvider(provider string) string {
|
||||||
|
switch provider {
|
||||||
|
case "":
|
||||||
|
return "custom"
|
||||||
|
case "openrouter", "anthropic", "gemini", "zai", "kimi-coding", "xiaomi":
|
||||||
|
return provider
|
||||||
|
case "minimax":
|
||||||
|
return "minimax-cn"
|
||||||
|
default:
|
||||||
|
return "custom"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func resolveHermesModel(sourceProvider, targetProvider, modelName string) string {
|
||||||
|
target := strings.TrimSpace(modelName)
|
||||||
|
if target == "" {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
if targetProvider != "custom" {
|
||||||
|
return target
|
||||||
|
}
|
||||||
|
if sourceProvider == "custom" || sourceProvider == "vllm" {
|
||||||
|
return normalizeCustomModel(target)
|
||||||
|
}
|
||||||
|
if strings.Contains(target, "/") {
|
||||||
|
parts := strings.SplitN(target, "/", 2)
|
||||||
|
model := strings.TrimSpace(parts[1])
|
||||||
|
if model != "" {
|
||||||
|
return model
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return target
|
||||||
|
}
|
||||||
|
|
||||||
|
func resolveHermesConfiguredModelID(account *model.AgentAccount, accountModels []dto.AgentAccountModel, configuredModel string) (string, error) {
|
||||||
|
if account == nil {
|
||||||
|
return "", buserr.New("ErrAgentModelNotInAccount")
|
||||||
|
}
|
||||||
|
configuredModel = strings.TrimSpace(configuredModel)
|
||||||
|
if configuredModel == "" {
|
||||||
|
return "", buserr.New("ErrAgentModelNotInAccount")
|
||||||
|
}
|
||||||
|
provider := resolveHermesProvider(account.Provider)
|
||||||
|
for _, item := range accountModels {
|
||||||
|
if resolveHermesModel(account.Provider, provider, item.ID) == configuredModel {
|
||||||
|
return item.ID, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return "", buserr.New("ErrAgentModelNotInAccount")
|
||||||
|
}
|
||||||
|
|
||||||
|
func resolveHermesEnvEntries(account *model.AgentAccount) []hermesEnvEntry {
|
||||||
|
if account == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if resolveHermesProvider(account.Provider) == "custom" {
|
||||||
|
if account.APIKey == "" {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return []hermesEnvEntry{
|
||||||
|
{Key: "CUSTOM_API_KEY", Value: account.APIKey},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
apiKey := account.APIKey
|
||||||
|
baseURL := account.BaseURL
|
||||||
|
entries := make([]hermesEnvEntry, 0, 4)
|
||||||
|
|
||||||
|
appendEntry := func(key, value string) {
|
||||||
|
if key == "" || value == "" {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
entries = append(entries, hermesEnvEntry{Key: key, Value: value})
|
||||||
|
}
|
||||||
|
|
||||||
|
switch account.Provider {
|
||||||
|
case "openrouter":
|
||||||
|
appendEntry("OPENROUTER_API_KEY", apiKey)
|
||||||
|
appendEntry("OPENROUTER_BASE_URL", baseURL)
|
||||||
|
case "anthropic":
|
||||||
|
appendEntry("ANTHROPIC_API_KEY", apiKey)
|
||||||
|
case "gemini":
|
||||||
|
appendEntry("GOOGLE_API_KEY", apiKey)
|
||||||
|
appendEntry("GEMINI_API_KEY", apiKey)
|
||||||
|
appendEntry("GEMINI_BASE_URL", baseURL)
|
||||||
|
case "zai":
|
||||||
|
appendEntry("GLM_API_KEY", apiKey)
|
||||||
|
appendEntry("ZAI_API_KEY", apiKey)
|
||||||
|
appendEntry("Z_AI_API_KEY", apiKey)
|
||||||
|
appendEntry("GLM_BASE_URL", baseURL)
|
||||||
|
case "kimi-coding", "moonshot":
|
||||||
|
appendEntry("KIMI_API_KEY", apiKey)
|
||||||
|
appendEntry("KIMI_BASE_URL", baseURL)
|
||||||
|
case "kimi":
|
||||||
|
appendEntry("KIMI_CN_API_KEY", apiKey)
|
||||||
|
appendEntry("KIMI_BASE_URL", baseURL)
|
||||||
|
case "minimax":
|
||||||
|
appendEntry("MINIMAX_CN_API_KEY", apiKey)
|
||||||
|
appendEntry("MINIMAX_CN_BASE_URL", baseURL)
|
||||||
|
case "xiaomi":
|
||||||
|
appendEntry("XIAOMI_API_KEY", apiKey)
|
||||||
|
appendEntry("XIAOMI_BASE_URL", baseURL)
|
||||||
|
case "deepseek":
|
||||||
|
appendEntry("DEEPSEEK_API_KEY", apiKey)
|
||||||
|
appendEntry("DEEPSEEK_BASE_URL", baseURL)
|
||||||
|
case "bailian-coding-plan":
|
||||||
|
appendEntry("DASHSCOPE_API_KEY", apiKey)
|
||||||
|
appendEntry("DASHSCOPE_BASE_URL", baseURL)
|
||||||
|
case "openai":
|
||||||
|
appendEntry("OPENAI_API_KEY", apiKey)
|
||||||
|
appendEntry("OPENAI_BASE_URL", baseURL)
|
||||||
|
case "custom", "vllm":
|
||||||
|
if account.APIType == "openai-completions" || account.APIType == "openai-responses" {
|
||||||
|
appendEntry("OPENAI_API_KEY", apiKey)
|
||||||
|
appendEntry("OPENAI_BASE_URL", baseURL)
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
if envKey := providercatalog.EnvKey(account.Provider); envKey != "" {
|
||||||
|
appendEntry(envKey, apiKey)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return entries
|
||||||
|
}
|
||||||
|
|
||||||
|
func writeHermesModelEnv(envPath string, account *model.AgentAccount) error {
|
||||||
|
envMap, err := readHermesEnvMap(envPath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
for _, key := range hermesManagedModelEnvKeys() {
|
||||||
|
delete(envMap, key)
|
||||||
|
}
|
||||||
|
entries := resolveHermesEnvEntries(account)
|
||||||
|
order := make([]string, 0, len(entries))
|
||||||
|
for _, entry := range entries {
|
||||||
|
if entry.Key == "" || entry.Value == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
envMap[entry.Key] = entry.Value
|
||||||
|
order = append(order, entry.Key)
|
||||||
|
}
|
||||||
|
return writeHermesEnvMap(envPath, envMap, order)
|
||||||
|
}
|
||||||
|
|
||||||
|
func hermesManagedModelEnvKeys() []string {
|
||||||
|
keys := []string{
|
||||||
|
"OPENROUTER_API_KEY",
|
||||||
|
"OPENROUTER_BASE_URL",
|
||||||
|
"ANTHROPIC_API_KEY",
|
||||||
|
"GOOGLE_API_KEY",
|
||||||
|
"GEMINI_API_KEY",
|
||||||
|
"GEMINI_BASE_URL",
|
||||||
|
"GLM_API_KEY",
|
||||||
|
"ZAI_API_KEY",
|
||||||
|
"Z_AI_API_KEY",
|
||||||
|
"GLM_BASE_URL",
|
||||||
|
"KIMI_API_KEY",
|
||||||
|
"KIMI_CN_API_KEY",
|
||||||
|
"KIMI_BASE_URL",
|
||||||
|
"MINIMAX_CN_API_KEY",
|
||||||
|
"MINIMAX_CN_BASE_URL",
|
||||||
|
"XIAOMI_API_KEY",
|
||||||
|
"XIAOMI_BASE_URL",
|
||||||
|
"DEEPSEEK_API_KEY",
|
||||||
|
"DEEPSEEK_BASE_URL",
|
||||||
|
"DASHSCOPE_API_KEY",
|
||||||
|
"DASHSCOPE_BASE_URL",
|
||||||
|
"OPENAI_API_KEY",
|
||||||
|
"OPENAI_BASE_URL",
|
||||||
|
}
|
||||||
|
seen := make(map[string]struct{}, len(keys))
|
||||||
|
result := make([]string, 0, len(keys))
|
||||||
|
appendKey := func(key string) {
|
||||||
|
if key == "" {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if _, ok := seen[key]; ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
seen[key] = struct{}{}
|
||||||
|
result = append(result, key)
|
||||||
|
}
|
||||||
|
for _, key := range keys {
|
||||||
|
appendKey(key)
|
||||||
|
}
|
||||||
|
for _, meta := range providercatalog.All() {
|
||||||
|
appendKey(meta.EnvKey)
|
||||||
|
}
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
|
||||||
|
func writeHermesEnv(envPath string, entries []hermesEnvEntry) error {
|
||||||
|
envMap, err := readHermesEnvMap(envPath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
for _, entry := range entries {
|
||||||
|
if entry.Key == "" || entry.Value == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
envMap[entry.Key] = entry.Value
|
||||||
|
}
|
||||||
|
order := make([]string, 0, len(entries))
|
||||||
|
for _, entry := range entries {
|
||||||
|
if entry.Key == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
order = append(order, entry.Key)
|
||||||
|
}
|
||||||
|
return writeHermesEnvMap(envPath, envMap, order)
|
||||||
|
}
|
||||||
|
|
||||||
|
func readHermesEnvMap(envPath string) (map[string]string, error) {
|
||||||
|
fileOp := files.NewFileOp()
|
||||||
|
if !fileOp.Stat(envPath) {
|
||||||
|
return map[string]string{}, nil
|
||||||
|
}
|
||||||
|
envMap, err := godotenv.Read(envPath)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return envMap, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func writeHermesEnvMap(envPath string, envMap map[string]string, order []string) error {
|
||||||
|
if len(envMap) == 0 {
|
||||||
|
return files.NewFileOp().SaveFile(envPath, "", 0600)
|
||||||
|
}
|
||||||
|
return agentenv.WriteWithOrder(envMap, envPath, order)
|
||||||
|
}
|
||||||
|
|
||||||
|
func splitHermesEnvList(value string) []string {
|
||||||
|
if value == "" {
|
||||||
|
return []string{}
|
||||||
|
}
|
||||||
|
parts := strings.Split(value, ",")
|
||||||
|
result := make([]string, 0, len(parts))
|
||||||
|
seen := make(map[string]struct{}, len(parts))
|
||||||
|
for _, part := range parts {
|
||||||
|
item := strings.TrimSpace(part)
|
||||||
|
if item == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if _, ok := seen[item]; ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
seen[item] = struct{}{}
|
||||||
|
result = append(result, item)
|
||||||
|
}
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
|
||||||
|
func joinHermesEnvList(values []string) string {
|
||||||
|
if len(values) == 0 {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
result := make([]string, 0, len(values))
|
||||||
|
seen := make(map[string]struct{}, len(values))
|
||||||
|
for _, value := range values {
|
||||||
|
item := strings.TrimSpace(value)
|
||||||
|
if item == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if _, ok := seen[item]; ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
seen[item] = struct{}{}
|
||||||
|
result = append(result, item)
|
||||||
|
}
|
||||||
|
return strings.Join(result, ",")
|
||||||
|
}
|
||||||
|
|
||||||
|
func firstHermesTelegramBotToken(bots []dto.AgentTelegramBot, defaultAccount string) string {
|
||||||
|
for _, bot := range bots {
|
||||||
|
if bot.AccountID == defaultAccount || bot.IsDefault {
|
||||||
|
return bot.BotToken
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(bots) == 0 {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
return bots[0].BotToken
|
||||||
|
}
|
||||||
|
|
||||||
|
func firstHermesDiscordBotToken(bots []dto.AgentDiscordBot, defaultAccount string) string {
|
||||||
|
for _, bot := range bots {
|
||||||
|
if bot.AccountID == defaultAccount || bot.IsDefault {
|
||||||
|
return bot.Token
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(bots) == 0 {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
return bots[0].Token
|
||||||
|
}
|
||||||
|
|
||||||
|
func extractHermesEnvBool(envMap map[string]string, key string, defaultValue bool) bool {
|
||||||
|
value, ok := envMap[key]
|
||||||
|
if !ok || value == "" {
|
||||||
|
return defaultValue
|
||||||
|
}
|
||||||
|
return strings.EqualFold(value, "true")
|
||||||
|
}
|
||||||
|
|
||||||
|
func validateHermesPairingApproveResult(output string, err error) error {
|
||||||
|
if strings.Contains(output, "Approved!") {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if strings.Contains(output, "not found or expired for platform") {
|
||||||
|
return buserr.New("ErrHermesPairingCodeUnavailable")
|
||||||
|
}
|
||||||
|
if err == nil {
|
||||||
|
if strings.TrimSpace(output) == "" {
|
||||||
|
return fmt.Errorf("unexpected hermes pairing approve result")
|
||||||
|
}
|
||||||
|
return errors.New(strings.TrimSpace(output))
|
||||||
|
}
|
||||||
|
if strings.Contains(err.Error(), "not found or expired for platform") {
|
||||||
|
return buserr.New("ErrHermesPairingCodeUnavailable")
|
||||||
|
}
|
||||||
|
return err
|
||||||
|
}
|
||||||
@@ -0,0 +1,591 @@
|
|||||||
|
package service
|
||||||
|
|
||||||
|
import (
|
||||||
|
"path"
|
||||||
|
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/dto"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/buserr"
|
||||||
|
)
|
||||||
|
|
||||||
|
const hermesWeixinLoginScript = `import asyncio
|
||||||
|
from gateway.platforms.weixin import qr_login
|
||||||
|
from hermes_cli.config import save_env_value
|
||||||
|
|
||||||
|
creds = asyncio.run(qr_login('/opt/data'))
|
||||||
|
print('RESULT =', creds)
|
||||||
|
|
||||||
|
if not creds:
|
||||||
|
raise SystemExit(1)
|
||||||
|
|
||||||
|
save_env_value('WEIXIN_ACCOUNT_ID', creds.get('account_id', ''))
|
||||||
|
save_env_value('WEIXIN_TOKEN', creds.get('token', ''))
|
||||||
|
if creds.get('base_url'):
|
||||||
|
save_env_value('WEIXIN_BASE_URL', creds['base_url'])
|
||||||
|
save_env_value('WEIXIN_CDN_BASE_URL', 'https://novac2c.cdn.weixin.qq.com/c2c')
|
||||||
|
save_env_value('WEIXIN_DM_POLICY', 'open')
|
||||||
|
save_env_value('WEIXIN_ALLOW_ALL_USERS', 'true')
|
||||||
|
save_env_value('WEIXIN_ALLOWED_USERS', '')
|
||||||
|
save_env_value('WEIXIN_GROUP_POLICY', 'disabled')
|
||||||
|
save_env_value('WEIXIN_GROUP_ALLOWED_USERS', '')
|
||||||
|
save_env_value('WEIXIN_HOME_CHANNEL', creds.get('user_id', ''))
|
||||||
|
|
||||||
|
print('WEIXIN ENV WRITTEN')
|
||||||
|
print('Restart the Hermes-Agent container to apply the new Weixin settings.')
|
||||||
|
`
|
||||||
|
|
||||||
|
func readHermesQQBotChannelConfig(confDir string) (*dto.AgentQQBotConfig, error) {
|
||||||
|
envMap, err := readHermesEnvMap(path.Join(confDir, ".env"))
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
cfg, err := readHermesConfigMap(path.Join(confDir, "config.yaml"))
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
platform := childMap(childMap(cfg, "platforms"), "qq")
|
||||||
|
extra := childMap(platform, "extra")
|
||||||
|
appID := envMap["QQ_APP_ID"]
|
||||||
|
clientSecret := envMap["QQ_CLIENT_SECRET"]
|
||||||
|
dmPolicy := extractStringValue(extra["dm_policy"])
|
||||||
|
allowFrom := splitHermesEnvList(envMap["QQ_ALLOWED_USERS"])
|
||||||
|
groupPolicy := extractStringValue(extra["group_policy"])
|
||||||
|
groupAllowFrom := splitHermesEnvList(envMap["QQ_GROUP_ALLOWED_USERS"])
|
||||||
|
|
||||||
|
result := &dto.AgentQQBotConfig{
|
||||||
|
Enabled: extractBoolValue(platform["enabled"], false) && appID != "" && clientSecret != "",
|
||||||
|
DmPolicy: dmPolicy,
|
||||||
|
AllowFrom: allowFrom,
|
||||||
|
GroupPolicy: groupPolicy,
|
||||||
|
GroupAllowFrom: groupAllowFrom,
|
||||||
|
}
|
||||||
|
if appID != "" || clientSecret != "" {
|
||||||
|
result.Bots = []dto.AgentQQBotBot{
|
||||||
|
{
|
||||||
|
AgentChannelBotBase: dto.AgentChannelBotBase{
|
||||||
|
AccountID: "default",
|
||||||
|
Name: "Default",
|
||||||
|
Enabled: true,
|
||||||
|
IsDefault: true,
|
||||||
|
},
|
||||||
|
AppID: appID,
|
||||||
|
ClientSecret: clientSecret,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return result, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func writeHermesQQBotChannelConfig(confDir string, config dto.AgentQQBotConfig) error {
|
||||||
|
envPath := path.Join(confDir, ".env")
|
||||||
|
envMap, err := readHermesEnvMap(envPath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
defaultBot := getDefaultQQBot(config.Bots)
|
||||||
|
envMap["QQ_APP_ID"] = defaultBot.AppID
|
||||||
|
envMap["QQ_CLIENT_SECRET"] = defaultBot.ClientSecret
|
||||||
|
delete(envMap, "QQ_ALLOWED_USERS")
|
||||||
|
delete(envMap, "QQ_GROUP_ALLOWED_USERS")
|
||||||
|
delete(envMap, "QQ_ALLOW_ALL_USERS")
|
||||||
|
delete(envMap, "QQ_MARKDOWN_SUPPORT")
|
||||||
|
if config.DmPolicy == "open" {
|
||||||
|
envMap["QQ_ALLOW_ALL_USERS"] = "true"
|
||||||
|
} else if config.DmPolicy == "allowlist" {
|
||||||
|
if allow := joinHermesEnvList(config.AllowFrom); allow != "" {
|
||||||
|
envMap["QQ_ALLOWED_USERS"] = allow
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if config.GroupPolicy == "allowlist" {
|
||||||
|
if allow := joinHermesEnvList(config.GroupAllowFrom); allow != "" {
|
||||||
|
envMap["QQ_GROUP_ALLOWED_USERS"] = allow
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if err := writeHermesEnvMap(envPath, envMap, []string{
|
||||||
|
"QQ_APP_ID",
|
||||||
|
"QQ_CLIENT_SECRET",
|
||||||
|
"QQ_ALLOW_ALL_USERS",
|
||||||
|
"QQ_ALLOWED_USERS",
|
||||||
|
"QQ_GROUP_ALLOWED_USERS",
|
||||||
|
"QQ_HOME_CHANNEL",
|
||||||
|
"QQ_HOME_CHANNEL_NAME",
|
||||||
|
"QQ_STT_API_KEY",
|
||||||
|
"QQ_STT_BASE_URL",
|
||||||
|
"QQ_STT_MODEL",
|
||||||
|
}); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
configPath := path.Join(confDir, "config.yaml")
|
||||||
|
cfg, err := readHermesConfigMap(configPath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
platform := ensureChildMap(ensureChildMap(cfg, "platforms"), "qq")
|
||||||
|
platform["enabled"] = config.Enabled && defaultBot.AppID != "" && defaultBot.ClientSecret != ""
|
||||||
|
extra := ensureChildMap(platform, "extra")
|
||||||
|
extra["markdown_support"] = true
|
||||||
|
extra["dm_policy"] = config.DmPolicy
|
||||||
|
extra["group_policy"] = config.GroupPolicy
|
||||||
|
delete(extra, "app_id")
|
||||||
|
delete(extra, "client_secret")
|
||||||
|
if config.DmPolicy == "allowlist" {
|
||||||
|
extra["allow_from"] = append([]string(nil), config.AllowFrom...)
|
||||||
|
} else {
|
||||||
|
delete(extra, "allow_from")
|
||||||
|
}
|
||||||
|
if config.GroupPolicy == "allowlist" {
|
||||||
|
extra["group_allow_from"] = append([]string(nil), config.GroupAllowFrom...)
|
||||||
|
} else {
|
||||||
|
delete(extra, "group_allow_from")
|
||||||
|
}
|
||||||
|
return writeHermesConfigMap(configPath, cfg)
|
||||||
|
}
|
||||||
|
|
||||||
|
func deleteHermesQQBotChannelConfig(confDir string) error {
|
||||||
|
if err := deleteHermesEnvKeys(confDir,
|
||||||
|
"QQ_APP_ID",
|
||||||
|
"QQ_CLIENT_SECRET",
|
||||||
|
"QQ_ALLOW_ALL_USERS",
|
||||||
|
"QQ_ALLOWED_USERS",
|
||||||
|
"QQ_GROUP_ALLOWED_USERS",
|
||||||
|
"QQ_HOME_CHANNEL",
|
||||||
|
"QQ_HOME_CHANNEL_NAME",
|
||||||
|
"QQ_STT_API_KEY",
|
||||||
|
"QQ_STT_BASE_URL",
|
||||||
|
"QQ_STT_MODEL",
|
||||||
|
); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return deleteHermesConfigSections(confDir, nil, []string{"qq"})
|
||||||
|
}
|
||||||
|
|
||||||
|
func readHermesWecomChannelConfig(confDir string) (*dto.AgentWecomConfig, error) {
|
||||||
|
envMap, err := readHermesEnvMap(path.Join(confDir, ".env"))
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
cfg, err := readHermesConfigMap(path.Join(confDir, "config.yaml"))
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
platform := childMap(childMap(cfg, "platforms"), "wecom")
|
||||||
|
allowFrom := splitHermesEnvList(envMap["WECOM_ALLOWED_USERS"])
|
||||||
|
groupAllowFrom := splitHermesEnvList(envMap["WECOM_GROUP_ALLOWED_USERS"])
|
||||||
|
dmPolicy := envMap["WECOM_DM_POLICY"]
|
||||||
|
groupPolicy := envMap["WECOM_GROUP_POLICY"]
|
||||||
|
|
||||||
|
botID := envMap["WECOM_BOT_ID"]
|
||||||
|
secret := envMap["WECOM_SECRET"]
|
||||||
|
|
||||||
|
return &dto.AgentWecomConfig{
|
||||||
|
Enabled: extractBoolValue(platform["enabled"], false) && botID != "" && secret != "",
|
||||||
|
DmPolicy: dmPolicy,
|
||||||
|
AllowFrom: allowFrom,
|
||||||
|
GroupPolicy: groupPolicy,
|
||||||
|
GroupAllowFrom: groupAllowFrom,
|
||||||
|
BotID: botID,
|
||||||
|
Secret: secret,
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func writeHermesWecomChannelConfig(confDir string, config dto.AgentWecomConfig) error {
|
||||||
|
envPath := path.Join(confDir, ".env")
|
||||||
|
envMap, err := readHermesEnvMap(envPath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if config.BotID != "" {
|
||||||
|
envMap["WECOM_BOT_ID"] = config.BotID
|
||||||
|
} else {
|
||||||
|
delete(envMap, "WECOM_BOT_ID")
|
||||||
|
}
|
||||||
|
if config.Secret != "" {
|
||||||
|
envMap["WECOM_SECRET"] = config.Secret
|
||||||
|
} else {
|
||||||
|
delete(envMap, "WECOM_SECRET")
|
||||||
|
}
|
||||||
|
delete(envMap, "WECOM_ALLOWED_USERS")
|
||||||
|
delete(envMap, "WECOM_GROUP_ALLOWED_USERS")
|
||||||
|
delete(envMap, "WECOM_ALLOW_ALL_USERS")
|
||||||
|
delete(envMap, "WECOM_DM_POLICY")
|
||||||
|
delete(envMap, "WECOM_GROUP_POLICY")
|
||||||
|
if config.DmPolicy != "" {
|
||||||
|
envMap["WECOM_DM_POLICY"] = config.DmPolicy
|
||||||
|
}
|
||||||
|
if config.GroupPolicy != "" {
|
||||||
|
envMap["WECOM_GROUP_POLICY"] = config.GroupPolicy
|
||||||
|
}
|
||||||
|
if config.DmPolicy == "allowlist" {
|
||||||
|
if allow := joinHermesEnvList(config.AllowFrom); allow != "" {
|
||||||
|
envMap["WECOM_ALLOWED_USERS"] = allow
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if config.GroupPolicy == "allowlist" {
|
||||||
|
if allow := joinHermesEnvList(config.GroupAllowFrom); allow != "" {
|
||||||
|
envMap["WECOM_GROUP_ALLOWED_USERS"] = allow
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if err := writeHermesEnvMap(envPath, envMap, []string{
|
||||||
|
"WECOM_BOT_ID",
|
||||||
|
"WECOM_SECRET",
|
||||||
|
"WECOM_DM_POLICY",
|
||||||
|
"WECOM_ALLOWED_USERS",
|
||||||
|
"WECOM_GROUP_POLICY",
|
||||||
|
"WECOM_GROUP_ALLOWED_USERS",
|
||||||
|
}); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
configPath := path.Join(confDir, "config.yaml")
|
||||||
|
cfg, err := readHermesConfigMap(configPath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
platform := ensureChildMap(ensureChildMap(cfg, "platforms"), "wecom")
|
||||||
|
platform["enabled"] = config.Enabled && config.BotID != "" && config.Secret != ""
|
||||||
|
extra := ensureChildMap(platform, "extra")
|
||||||
|
extra["dm_policy"] = config.DmPolicy
|
||||||
|
extra["group_policy"] = config.GroupPolicy
|
||||||
|
delete(extra, "bot_id")
|
||||||
|
delete(extra, "secret")
|
||||||
|
if config.DmPolicy == "allowlist" {
|
||||||
|
extra["allow_from"] = append([]string(nil), config.AllowFrom...)
|
||||||
|
} else {
|
||||||
|
delete(extra, "allow_from")
|
||||||
|
}
|
||||||
|
if config.GroupPolicy == "allowlist" {
|
||||||
|
extra["group_allow_from"] = append([]string(nil), config.GroupAllowFrom...)
|
||||||
|
} else {
|
||||||
|
delete(extra, "group_allow_from")
|
||||||
|
}
|
||||||
|
return writeHermesConfigMap(configPath, cfg)
|
||||||
|
}
|
||||||
|
|
||||||
|
func deleteHermesWecomChannelConfig(confDir string) error {
|
||||||
|
if err := deleteHermesEnvKeys(confDir,
|
||||||
|
"WECOM_BOT_ID",
|
||||||
|
"WECOM_SECRET",
|
||||||
|
"WECOM_ALLOW_ALL_USERS",
|
||||||
|
"WECOM_DM_POLICY",
|
||||||
|
"WECOM_ALLOWED_USERS",
|
||||||
|
"WECOM_GROUP_POLICY",
|
||||||
|
"WECOM_GROUP_ALLOWED_USERS",
|
||||||
|
"WECOM_HOME_CHANNEL",
|
||||||
|
); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return deleteHermesConfigSections(confDir, nil, []string{"wecom"})
|
||||||
|
}
|
||||||
|
|
||||||
|
func readHermesDingTalkChannelConfig(confDir string) (*dto.AgentDingTalkConfig, error) {
|
||||||
|
envMap, err := readHermesEnvMap(path.Join(confDir, ".env"))
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
cfg, err := readHermesConfigMap(path.Join(confDir, "config.yaml"))
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
platform := childMap(childMap(cfg, "platforms"), "dingtalk")
|
||||||
|
extra := childMap(platform, "extra")
|
||||||
|
clientID := envMap["DINGTALK_CLIENT_ID"]
|
||||||
|
clientSecret := envMap["DINGTALK_CLIENT_SECRET"]
|
||||||
|
allowFrom := splitHermesEnvList(envMap["DINGTALK_ALLOWED_USERS"])
|
||||||
|
dmPolicy := ""
|
||||||
|
if extractHermesEnvBool(envMap, "DINGTALK_ALLOW_ALL_USERS", false) {
|
||||||
|
dmPolicy = "open"
|
||||||
|
} else if len(allowFrom) > 0 {
|
||||||
|
dmPolicy = "allowlist"
|
||||||
|
} else if extractStringValue(extra["unauthorized_dm_behavior"]) == "ignore" {
|
||||||
|
dmPolicy = "disabled"
|
||||||
|
} else if clientID != "" || clientSecret != "" {
|
||||||
|
dmPolicy = "pairing"
|
||||||
|
}
|
||||||
|
result := &dto.AgentDingTalkConfig{
|
||||||
|
Enabled: extractBoolValue(platform["enabled"], clientID != "" && clientSecret != ""),
|
||||||
|
DmPolicy: dmPolicy,
|
||||||
|
AllowFrom: allowFrom,
|
||||||
|
GroupPolicy: "",
|
||||||
|
GroupAllowFrom: []string{},
|
||||||
|
}
|
||||||
|
if clientID != "" || clientSecret != "" {
|
||||||
|
result.Bots = []dto.AgentDingTalkBot{
|
||||||
|
{
|
||||||
|
AgentChannelBotBase: dto.AgentChannelBotBase{
|
||||||
|
AccountID: "default",
|
||||||
|
Name: "Default",
|
||||||
|
Enabled: true,
|
||||||
|
IsDefault: true,
|
||||||
|
},
|
||||||
|
ClientID: clientID,
|
||||||
|
ClientSecret: clientSecret,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return result, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func writeHermesDingTalkChannelConfig(confDir string, config dto.AgentDingTalkConfig) error {
|
||||||
|
envPath := path.Join(confDir, ".env")
|
||||||
|
envMap, err := readHermesEnvMap(envPath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
clientID, clientSecret := firstHermesDingTalkBotCredentials(config.Bots)
|
||||||
|
if config.Enabled && clientID != "" {
|
||||||
|
envMap["DINGTALK_CLIENT_ID"] = clientID
|
||||||
|
} else {
|
||||||
|
delete(envMap, "DINGTALK_CLIENT_ID")
|
||||||
|
}
|
||||||
|
if config.Enabled && clientSecret != "" {
|
||||||
|
envMap["DINGTALK_CLIENT_SECRET"] = clientSecret
|
||||||
|
} else {
|
||||||
|
delete(envMap, "DINGTALK_CLIENT_SECRET")
|
||||||
|
}
|
||||||
|
delete(envMap, "DINGTALK_ALLOWED_USERS")
|
||||||
|
delete(envMap, "DINGTALK_ALLOW_ALL_USERS")
|
||||||
|
if config.DmPolicy == "allowlist" {
|
||||||
|
if allow := joinHermesEnvList(config.AllowFrom); allow != "" {
|
||||||
|
envMap["DINGTALK_ALLOWED_USERS"] = allow
|
||||||
|
}
|
||||||
|
} else if config.DmPolicy == "open" {
|
||||||
|
envMap["DINGTALK_ALLOW_ALL_USERS"] = "true"
|
||||||
|
}
|
||||||
|
if err := writeHermesEnvMap(envPath, envMap, []string{
|
||||||
|
"DINGTALK_CLIENT_ID",
|
||||||
|
"DINGTALK_CLIENT_SECRET",
|
||||||
|
"DINGTALK_ALLOW_ALL_USERS",
|
||||||
|
"DINGTALK_ALLOWED_USERS",
|
||||||
|
}); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
configPath := path.Join(confDir, "config.yaml")
|
||||||
|
cfg, err := readHermesConfigMap(configPath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
platform := ensureChildMap(ensureChildMap(cfg, "platforms"), "dingtalk")
|
||||||
|
platform["enabled"] = config.Enabled && clientID != "" && clientSecret != ""
|
||||||
|
extra := ensureChildMap(platform, "extra")
|
||||||
|
switch config.DmPolicy {
|
||||||
|
case "pairing":
|
||||||
|
extra["unauthorized_dm_behavior"] = "pair"
|
||||||
|
case "disabled":
|
||||||
|
extra["unauthorized_dm_behavior"] = "ignore"
|
||||||
|
default:
|
||||||
|
delete(extra, "unauthorized_dm_behavior")
|
||||||
|
}
|
||||||
|
return writeHermesConfigMap(configPath, cfg)
|
||||||
|
}
|
||||||
|
|
||||||
|
func deleteHermesDingTalkChannelConfig(confDir string) error {
|
||||||
|
if err := deleteHermesEnvKeys(confDir,
|
||||||
|
"DINGTALK_CLIENT_ID",
|
||||||
|
"DINGTALK_CLIENT_SECRET",
|
||||||
|
"DINGTALK_ALLOW_ALL_USERS",
|
||||||
|
"DINGTALK_ALLOWED_USERS",
|
||||||
|
"DINGTALK_HOME_CHANNEL",
|
||||||
|
); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return deleteHermesConfigSections(confDir, nil, []string{"dingtalk"})
|
||||||
|
}
|
||||||
|
|
||||||
|
func readHermesFeishuChannelConfig(confDir string) (*dto.AgentFeishuConfig, error) {
|
||||||
|
envMap, err := readHermesEnvMap(path.Join(confDir, ".env"))
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
cfg, err := readHermesConfigMap(path.Join(confDir, "config.yaml"))
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
platform := childMap(childMap(cfg, "platforms"), "feishu")
|
||||||
|
appID := envMap["FEISHU_APP_ID"]
|
||||||
|
appSecret := envMap["FEISHU_APP_SECRET"]
|
||||||
|
allowFrom := splitHermesEnvList(envMap["FEISHU_ALLOWED_USERS"])
|
||||||
|
dmPolicy := ""
|
||||||
|
if extractHermesEnvBool(envMap, "FEISHU_ALLOW_ALL_USERS", false) {
|
||||||
|
dmPolicy = "open"
|
||||||
|
} else if len(allowFrom) > 0 {
|
||||||
|
dmPolicy = "allowlist"
|
||||||
|
} else if appID != "" || appSecret != "" {
|
||||||
|
dmPolicy = "pairing"
|
||||||
|
}
|
||||||
|
groupPolicy := envMap["FEISHU_GROUP_POLICY"]
|
||||||
|
result := &dto.AgentFeishuConfig{
|
||||||
|
Enabled: extractBoolValue(platform["enabled"], appID != "" && appSecret != ""),
|
||||||
|
ThreadSession: false,
|
||||||
|
ReplyMode: "",
|
||||||
|
Streaming: false,
|
||||||
|
RequireMention: "",
|
||||||
|
GroupPolicy: groupPolicy,
|
||||||
|
GroupAllowFrom: []string{},
|
||||||
|
Domain: envMap["FEISHU_DOMAIN"],
|
||||||
|
ConnectionMode: envMap["FEISHU_CONNECTION_MODE"],
|
||||||
|
}
|
||||||
|
if appID != "" || appSecret != "" {
|
||||||
|
result.Bots = []dto.AgentFeishuBot{
|
||||||
|
{
|
||||||
|
AgentChannelBotBase: dto.AgentChannelBotBase{
|
||||||
|
AccountID: "default",
|
||||||
|
Name: "Default",
|
||||||
|
Enabled: true,
|
||||||
|
IsDefault: true,
|
||||||
|
},
|
||||||
|
AppID: appID,
|
||||||
|
AppSecret: appSecret,
|
||||||
|
DmPolicy: dmPolicy,
|
||||||
|
AllowFrom: allowFrom,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return result, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func writeHermesFeishuChannelConfig(confDir string, config dto.AgentFeishuConfig) error {
|
||||||
|
envPath := path.Join(confDir, ".env")
|
||||||
|
envMap, err := readHermesEnvMap(envPath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
bot := firstHermesFeishuBot(config.Bots)
|
||||||
|
if config.GroupPolicy == "allowlist" && bot.DmPolicy == "pairing" {
|
||||||
|
return buserr.New("ErrHermesFeishuGroupAllowlistRequiresAllowlist")
|
||||||
|
}
|
||||||
|
if bot.AppID != "" {
|
||||||
|
envMap["FEISHU_APP_ID"] = bot.AppID
|
||||||
|
} else {
|
||||||
|
delete(envMap, "FEISHU_APP_ID")
|
||||||
|
}
|
||||||
|
if bot.AppSecret != "" {
|
||||||
|
envMap["FEISHU_APP_SECRET"] = bot.AppSecret
|
||||||
|
} else {
|
||||||
|
delete(envMap, "FEISHU_APP_SECRET")
|
||||||
|
}
|
||||||
|
envMap["FEISHU_DOMAIN"] = "feishu"
|
||||||
|
envMap["FEISHU_CONNECTION_MODE"] = "websocket"
|
||||||
|
envMap["FEISHU_GROUP_POLICY"] = config.GroupPolicy
|
||||||
|
delete(envMap, "FEISHU_ALLOW_ALL_USERS")
|
||||||
|
delete(envMap, "FEISHU_ALLOWED_USERS")
|
||||||
|
switch bot.DmPolicy {
|
||||||
|
case "open":
|
||||||
|
envMap["FEISHU_ALLOW_ALL_USERS"] = "true"
|
||||||
|
case "allowlist":
|
||||||
|
if allow := joinHermesEnvList(bot.AllowFrom); allow != "" {
|
||||||
|
envMap["FEISHU_ALLOWED_USERS"] = allow
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if config.GroupPolicy == "allowlist" {
|
||||||
|
if allow := joinHermesEnvList(bot.AllowFrom); allow != "" {
|
||||||
|
envMap["FEISHU_ALLOWED_USERS"] = allow
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if err := writeHermesEnvMap(envPath, envMap, []string{
|
||||||
|
"FEISHU_APP_ID",
|
||||||
|
"FEISHU_APP_SECRET",
|
||||||
|
"FEISHU_DOMAIN",
|
||||||
|
"FEISHU_CONNECTION_MODE",
|
||||||
|
"FEISHU_ALLOW_ALL_USERS",
|
||||||
|
"FEISHU_ALLOWED_USERS",
|
||||||
|
"FEISHU_GROUP_POLICY",
|
||||||
|
}); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
configPath := path.Join(confDir, "config.yaml")
|
||||||
|
cfg, err := readHermesConfigMap(configPath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
platform := ensureChildMap(ensureChildMap(cfg, "platforms"), "feishu")
|
||||||
|
platform["enabled"] = config.Enabled && bot.AppID != "" && bot.AppSecret != ""
|
||||||
|
return writeHermesConfigMap(configPath, cfg)
|
||||||
|
}
|
||||||
|
|
||||||
|
func deleteHermesFeishuChannelConfig(confDir string) error {
|
||||||
|
if err := deleteHermesEnvKeys(confDir,
|
||||||
|
"FEISHU_APP_ID",
|
||||||
|
"FEISHU_APP_SECRET",
|
||||||
|
"FEISHU_DOMAIN",
|
||||||
|
"FEISHU_CONNECTION_MODE",
|
||||||
|
"FEISHU_ALLOW_ALL_USERS",
|
||||||
|
"FEISHU_ALLOWED_USERS",
|
||||||
|
"FEISHU_GROUP_POLICY",
|
||||||
|
"FEISHU_HOME_CHANNEL",
|
||||||
|
"FEISHU_VERIFICATION_TOKEN",
|
||||||
|
"FEISHU_ENCRYPT_KEY",
|
||||||
|
); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return deleteHermesConfigSections(confDir, nil, []string{"feishu"})
|
||||||
|
}
|
||||||
|
|
||||||
|
func readHermesWeixinChannelConfig(confDir string) (*dto.AgentWeixinConfig, error) {
|
||||||
|
envMap, err := readHermesEnvMap(path.Join(confDir, ".env"))
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return &dto.AgentWeixinConfig{
|
||||||
|
Enabled: envMap["WEIXIN_ACCOUNT_ID"] != "" || envMap["WEIXIN_TOKEN"] != "",
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func deleteHermesWeixinChannelConfig(confDir string) error {
|
||||||
|
if err := deleteHermesEnvKeys(confDir,
|
||||||
|
"WEIXIN_ACCOUNT_ID",
|
||||||
|
"WEIXIN_TOKEN",
|
||||||
|
"WEIXIN_BASE_URL",
|
||||||
|
"WEIXIN_CDN_BASE_URL",
|
||||||
|
"WEIXIN_DM_POLICY",
|
||||||
|
"WEIXIN_ALLOW_ALL_USERS",
|
||||||
|
"WEIXIN_ALLOWED_USERS",
|
||||||
|
"WEIXIN_GROUP_POLICY",
|
||||||
|
"WEIXIN_GROUP_ALLOWED_USERS",
|
||||||
|
"WEIXIN_HOME_CHANNEL",
|
||||||
|
); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return deleteHermesConfigSections(confDir, nil, []string{"weixin"})
|
||||||
|
}
|
||||||
|
|
||||||
|
func firstHermesDingTalkBotCredentials(bots []dto.AgentDingTalkBot) (string, string) {
|
||||||
|
for _, bot := range bots {
|
||||||
|
if bot.IsDefault || bot.AccountID == "default" {
|
||||||
|
return bot.ClientID, bot.ClientSecret
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(bots) == 0 {
|
||||||
|
return "", ""
|
||||||
|
}
|
||||||
|
return bots[0].ClientID, bots[0].ClientSecret
|
||||||
|
}
|
||||||
|
|
||||||
|
func firstHermesFeishuBot(bots []dto.AgentFeishuBot) dto.AgentFeishuBot {
|
||||||
|
for _, bot := range bots {
|
||||||
|
if bot.IsDefault || bot.AccountID == "default" {
|
||||||
|
return bot
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(bots) == 0 {
|
||||||
|
return dto.AgentFeishuBot{}
|
||||||
|
}
|
||||||
|
return bots[0]
|
||||||
|
}
|
||||||
|
|
||||||
|
func buildHermesWeixinLoginArgs(containerName string) []string {
|
||||||
|
return buildHermesDockerExecCommandArgs(
|
||||||
|
containerName,
|
||||||
|
"/opt/hermes/.venv/bin/python",
|
||||||
|
"-u",
|
||||||
|
"-c",
|
||||||
|
hermesWeixinLoginScript,
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -0,0 +1,126 @@
|
|||||||
|
package service
|
||||||
|
|
||||||
|
import (
|
||||||
|
"database/sql"
|
||||||
|
"fmt"
|
||||||
|
"math"
|
||||||
|
"path/filepath"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/dto"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/constant"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/utils/cmd"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/utils/files"
|
||||||
|
)
|
||||||
|
|
||||||
|
const hermesSessionListLimit = 100
|
||||||
|
|
||||||
|
func (a AgentService) GetHermesChatSessions(req dto.AgentIDReq) ([]dto.AgentHermesChatSessionItem, error) {
|
||||||
|
agent, install, err := a.loadAgentAndInstall(req.AgentID)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if agent.AgentType != constant.AppHermesAgent {
|
||||||
|
return nil, fmt.Errorf("%s does not support", agent.AgentType)
|
||||||
|
}
|
||||||
|
return listHermesChatSessionsFromStateDB(filepath.Join(install.GetPath(), "data", "state.db"))
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a AgentService) RenameHermesChatSession(req dto.AgentHermesChatSessionRenameReq) error {
|
||||||
|
agent, install, err := a.loadAgentAndInstall(req.AgentID)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if agent.AgentType != constant.AppHermesAgent {
|
||||||
|
return fmt.Errorf("%s does not support", agent.AgentType)
|
||||||
|
}
|
||||||
|
|
||||||
|
_, err = cmd.NewCommandMgr(cmd.WithTimeout(20*time.Second)).RunWithStdout(
|
||||||
|
"docker",
|
||||||
|
buildHermesDockerExecArgs(install.ContainerName, "sessions", "rename", req.ID, req.Title)...,
|
||||||
|
)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a AgentService) DeleteHermesChatSession(req dto.AgentHermesChatSessionDeleteReq) error {
|
||||||
|
agent, install, err := a.loadAgentAndInstall(req.AgentID)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if agent.AgentType != constant.AppHermesAgent {
|
||||||
|
return fmt.Errorf("%s does not support", agent.AgentType)
|
||||||
|
}
|
||||||
|
|
||||||
|
_, err = cmd.NewCommandMgr(cmd.WithTimeout(20*time.Second)).RunWithStdout(
|
||||||
|
"docker",
|
||||||
|
buildHermesDockerExecArgs(install.ContainerName, "sessions", "delete", req.ID, "--yes")...,
|
||||||
|
)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
func listHermesChatSessionsFromStateDB(stateDBPath string) ([]dto.AgentHermesChatSessionItem, error) {
|
||||||
|
if !files.NewFileOp().Stat(stateDBPath) {
|
||||||
|
return []dto.AgentHermesChatSessionItem{}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
db, err := sql.Open("sqlite", stateDBPath)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
defer db.Close()
|
||||||
|
|
||||||
|
rows, err := db.Query(`
|
||||||
|
SELECT
|
||||||
|
s.id,
|
||||||
|
COALESCE(NULLIF(TRIM(s.title), ''), s.id) AS title,
|
||||||
|
COALESCE(s.model, '') AS model,
|
||||||
|
COALESCE(s.message_count, 0) AS message_count,
|
||||||
|
s.started_at,
|
||||||
|
COALESCE(MAX(m.timestamp), s.started_at) AS last_active
|
||||||
|
FROM sessions s
|
||||||
|
LEFT JOIN messages m ON m.session_id = s.id
|
||||||
|
WHERE s.source = 'cli'
|
||||||
|
GROUP BY s.id, title, model, s.message_count, s.started_at
|
||||||
|
ORDER BY last_active DESC
|
||||||
|
LIMIT ?
|
||||||
|
`, hermesSessionListLimit)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
|
||||||
|
items := make([]dto.AgentHermesChatSessionItem, 0, 8)
|
||||||
|
for rows.Next() {
|
||||||
|
var item dto.AgentHermesChatSessionItem
|
||||||
|
var title sql.NullString
|
||||||
|
var model sql.NullString
|
||||||
|
var startedAt sql.NullFloat64
|
||||||
|
var lastActive sql.NullFloat64
|
||||||
|
if err := rows.Scan(&item.ID, &title, &model, &item.MessageCount, &startedAt, &lastActive); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
item.Title = strings.TrimSpace(title.String)
|
||||||
|
if item.Title == "" {
|
||||||
|
item.Title = item.ID
|
||||||
|
}
|
||||||
|
item.Model = strings.TrimSpace(model.String)
|
||||||
|
item.StartedAt = formatHermesSessionTimestamp(startedAt)
|
||||||
|
item.LastActive = formatHermesSessionTimestamp(lastActive)
|
||||||
|
items = append(items, item)
|
||||||
|
}
|
||||||
|
if err := rows.Err(); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return items, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func formatHermesSessionTimestamp(value sql.NullFloat64) string {
|
||||||
|
if !value.Valid || value.Float64 <= 0 {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
seconds, fraction := math.Modf(value.Float64)
|
||||||
|
return time.Unix(int64(seconds), int64(fraction*float64(time.Second))).UTC().Format(time.RFC3339)
|
||||||
|
}
|
||||||
@@ -0,0 +1,215 @@
|
|||||||
|
package service
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/dto"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/utils/cmd"
|
||||||
|
)
|
||||||
|
|
||||||
|
type hermesSkillsListEntry struct {
|
||||||
|
Name string `json:"name"`
|
||||||
|
Description string `json:"description"`
|
||||||
|
Category string `json:"category"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type hermesSkillsListPayload struct {
|
||||||
|
Skills []hermesSkillsListEntry `json:"skills"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func listHermesSkills(containerName string) ([]dto.AgentSkillItem, error) {
|
||||||
|
output, err := runHermesSkillsCommandWithStdout(2*time.Minute, containerName, "list", "--source", "all")
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
items, err := parseHermesSkillsListOutput(output)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
metadata, err := readHermesSkillsListMetadata(containerName)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return mergeHermesSkillsWithMetadata(items, metadata), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func searchHermesSkills(containerName, source, keyword string) ([]dto.AgentSkillSearchItem, error) {
|
||||||
|
if source != "official" && source != "skills-sh" {
|
||||||
|
return nil, fmt.Errorf("unsupported hermes skill source: %s", source)
|
||||||
|
}
|
||||||
|
output, err := runHermesSkillsCommandWithStdout(
|
||||||
|
2*time.Minute,
|
||||||
|
containerName,
|
||||||
|
"search",
|
||||||
|
keyword,
|
||||||
|
"--source",
|
||||||
|
source,
|
||||||
|
"--limit",
|
||||||
|
"20",
|
||||||
|
)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return parseHermesSkillSearchOutput(output)
|
||||||
|
}
|
||||||
|
|
||||||
|
func runHermesSkillsCommandWithStdout(timeout time.Duration, containerName string, hermesArgs ...string) (string, error) {
|
||||||
|
args := []string{"exec", "-e", "COLUMNS=240", "-u", "hermes", containerName, "hermes", "skills"}
|
||||||
|
args = append(args, hermesArgs...)
|
||||||
|
return cmd.NewCommandMgr(cmd.WithTimeout(timeout)).RunWithStdout("docker", args...)
|
||||||
|
}
|
||||||
|
|
||||||
|
func readHermesSkillsListMetadata(containerName string) (map[string]hermesSkillsListEntry, error) {
|
||||||
|
output, err := cmd.NewCommandMgr(cmd.WithTimeout(2*time.Minute)).RunWithStdout(
|
||||||
|
"docker",
|
||||||
|
"exec",
|
||||||
|
"-u",
|
||||||
|
"hermes",
|
||||||
|
containerName,
|
||||||
|
"python",
|
||||||
|
"-c",
|
||||||
|
"import sys; sys.path.insert(0, '/opt/hermes'); from tools.skills_tool import skills_list; print(skills_list())",
|
||||||
|
)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return parseHermesSkillsListMetadataOutput(output)
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseHermesSkillsListOutput(output string) ([]dto.AgentSkillItem, error) {
|
||||||
|
headers, rows, err := parseHermesTableOutput(output)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
items := make([]dto.AgentSkillItem, 0, len(rows))
|
||||||
|
for _, row := range rows {
|
||||||
|
item := dto.AgentSkillItem{
|
||||||
|
Name: row[headers["Name"]],
|
||||||
|
Category: row[headers["Category"]],
|
||||||
|
Source: row[headers["Source"]],
|
||||||
|
Trust: row[headers["Trust"]],
|
||||||
|
Uninstallable: row[headers["Source"]] != "builtin" && row[headers["Source"]] != "local",
|
||||||
|
}
|
||||||
|
items = append(items, item)
|
||||||
|
}
|
||||||
|
return items, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseHermesSkillsListMetadataOutput(output string) (map[string]hermesSkillsListEntry, error) {
|
||||||
|
if strings.TrimSpace(output) == "" {
|
||||||
|
return map[string]hermesSkillsListEntry{}, nil
|
||||||
|
}
|
||||||
|
var payload hermesSkillsListPayload
|
||||||
|
if err := json.Unmarshal([]byte(output), &payload); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
metadata := make(map[string]hermesSkillsListEntry, len(payload.Skills))
|
||||||
|
for _, skill := range payload.Skills {
|
||||||
|
if skill.Name == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
metadata[skill.Name] = skill
|
||||||
|
}
|
||||||
|
return metadata, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func mergeHermesSkillsWithMetadata(items []dto.AgentSkillItem, metadata map[string]hermesSkillsListEntry) []dto.AgentSkillItem {
|
||||||
|
for i := range items {
|
||||||
|
entry, ok := metadata[items[i].Name]
|
||||||
|
if !ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
items[i].Description = entry.Description
|
||||||
|
if items[i].Category == "" && entry.Category != "" {
|
||||||
|
items[i].Category = entry.Category
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return items
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseHermesSkillSearchOutput(output string) ([]dto.AgentSkillSearchItem, error) {
|
||||||
|
if strings.Contains(output, "No skills found matching your query.") {
|
||||||
|
return []dto.AgentSkillSearchItem{}, nil
|
||||||
|
}
|
||||||
|
headers, rows, err := parseHermesTableOutput(output)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
items := make([]dto.AgentSkillSearchItem, 0, len(rows))
|
||||||
|
for _, row := range rows {
|
||||||
|
identifier := row[headers["Identifier"]]
|
||||||
|
items = append(items, dto.AgentSkillSearchItem{
|
||||||
|
Slug: identifier,
|
||||||
|
Identifier: identifier,
|
||||||
|
Name: row[headers["Name"]],
|
||||||
|
Description: row[headers["Description"]],
|
||||||
|
Source: row[headers["Source"]],
|
||||||
|
Trust: row[headers["Trust"]],
|
||||||
|
})
|
||||||
|
}
|
||||||
|
return items, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseHermesTableOutput(output string) (map[string]int, [][]string, error) {
|
||||||
|
lines := strings.Split(strings.TrimSpace(ansiEscapePattern.ReplaceAllString(output, "")), "\n")
|
||||||
|
var headers []string
|
||||||
|
rows := make([][]string, 0)
|
||||||
|
var current []string
|
||||||
|
|
||||||
|
for _, rawLine := range lines {
|
||||||
|
line := strings.TrimSpace(rawLine)
|
||||||
|
if (!strings.HasPrefix(line, "│") || !strings.HasSuffix(line, "│")) &&
|
||||||
|
(!strings.HasPrefix(line, "┃") || !strings.HasSuffix(line, "┃")) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
line = strings.ReplaceAll(line, "┃", "│")
|
||||||
|
parts := strings.Split(line, "│")
|
||||||
|
if len(parts) < 3 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
cols := make([]string, 0, len(parts)-2)
|
||||||
|
for _, part := range parts[1 : len(parts)-1] {
|
||||||
|
cols = append(cols, strings.TrimSpace(part))
|
||||||
|
}
|
||||||
|
if len(headers) == 0 {
|
||||||
|
headers = cols
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if cols[0] != "" {
|
||||||
|
if current != nil {
|
||||||
|
rows = append(rows, current)
|
||||||
|
}
|
||||||
|
current = cols
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if current == nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
for i := range cols {
|
||||||
|
if cols[i] == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if current[i] == "" {
|
||||||
|
current[i] = cols[i]
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
current[i] = current[i] + " " + cols[i]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if current != nil {
|
||||||
|
rows = append(rows, current)
|
||||||
|
}
|
||||||
|
if len(headers) == 0 {
|
||||||
|
return nil, nil, fmt.Errorf("hermes skills table not found")
|
||||||
|
}
|
||||||
|
|
||||||
|
headerIndex := make(map[string]int, len(headers))
|
||||||
|
for i, header := range headers {
|
||||||
|
headerIndex[header] = i
|
||||||
|
}
|
||||||
|
return headerIndex, rows, nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,240 @@
|
|||||||
|
package service
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/dto"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/constant"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/utils/cmd"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
openclawCronJobsRelativePath = "data/conf/cron/jobs.json"
|
||||||
|
openclawSessionStoreRelativeGlob = "data/conf/agents/*/sessions/sessions.json"
|
||||||
|
openclawSessionFilesRelativeGlob = "data/conf/agents/*/sessions/*.jsonl"
|
||||||
|
)
|
||||||
|
|
||||||
|
func (a AgentService) GetOverview(req dto.AgentOverviewReq) (*dto.AgentOverview, error) {
|
||||||
|
agent, install, conf, err := a.loadOpenclawAgentConfig(req.AgentID)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
overview := &dto.AgentOverview{
|
||||||
|
Snapshot: dto.AgentOverviewSnapshot{
|
||||||
|
ContainerStatus: install.Status,
|
||||||
|
AppVersion: install.Version,
|
||||||
|
DefaultModel: extractOpenclawDefaultModel(conf),
|
||||||
|
ChannelCount: countOpenclawConfiguredChannels(conf),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
if overview.Snapshot.DefaultModel == "" {
|
||||||
|
overview.Snapshot.DefaultModel = agent.Model
|
||||||
|
}
|
||||||
|
if install.Status != constant.StatusRunning {
|
||||||
|
return overview, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
var wg sync.WaitGroup
|
||||||
|
wg.Add(3)
|
||||||
|
go func() {
|
||||||
|
defer wg.Done()
|
||||||
|
skillCount, err := loadOpenclawOverviewSkillStats(install.ContainerName)
|
||||||
|
if err == nil {
|
||||||
|
overview.Snapshot.SkillCount = skillCount
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
go func() {
|
||||||
|
defer wg.Done()
|
||||||
|
sessionCount, err := loadOpenclawOverviewSessionCount(install.GetPath())
|
||||||
|
if err == nil {
|
||||||
|
overview.Snapshot.SessionCount = sessionCount
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
go func() {
|
||||||
|
defer wg.Done()
|
||||||
|
jobCount, err := loadOpenclawOverviewJobCount(install.GetPath())
|
||||||
|
if err == nil {
|
||||||
|
overview.Snapshot.JobCount = jobCount
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
wg.Wait()
|
||||||
|
|
||||||
|
return overview, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func extractOpenclawDefaultModel(conf map[string]interface{}) string {
|
||||||
|
agents, ok := conf["agents"].(map[string]interface{})
|
||||||
|
if !ok {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
defaults, ok := agents["defaults"].(map[string]interface{})
|
||||||
|
if !ok {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
model, ok := defaults["model"].(map[string]interface{})
|
||||||
|
if !ok {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
primary, _ := model["primary"].(string)
|
||||||
|
return strings.TrimSpace(primary)
|
||||||
|
}
|
||||||
|
|
||||||
|
func countOpenclawConfiguredChannels(conf map[string]interface{}) int {
|
||||||
|
channels, ok := conf["channels"].(map[string]interface{})
|
||||||
|
if !ok {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
count := 0
|
||||||
|
for _, value := range channels {
|
||||||
|
channel, ok := value.(map[string]interface{})
|
||||||
|
if !ok || len(channel) == 0 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
count++
|
||||||
|
}
|
||||||
|
return count
|
||||||
|
}
|
||||||
|
|
||||||
|
func loadOpenclawOverviewSkillStats(containerName string) (int, error) {
|
||||||
|
output, err := cmd.RunDockerExecWithStdout(5*time.Minute, containerName, "openclaw", "skills", "list", "--json")
|
||||||
|
if err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
if strings.TrimSpace(output) == "" {
|
||||||
|
return 0, nil
|
||||||
|
}
|
||||||
|
skills, err := parseOpenclawSkillsList(output)
|
||||||
|
if err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
return len(skills), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func loadOpenclawOverviewSessionCount(installPath string) (int, error) {
|
||||||
|
sessionStorePaths, err := filepath.Glob(filepath.Join(installPath, openclawSessionStoreRelativeGlob))
|
||||||
|
if err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
total := 0
|
||||||
|
for _, sessionStorePath := range sessionStorePaths {
|
||||||
|
count, err := loadOpenclawSessionCountFromFile(sessionStorePath)
|
||||||
|
if err != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
total += count
|
||||||
|
}
|
||||||
|
if total > 0 {
|
||||||
|
return total, nil
|
||||||
|
}
|
||||||
|
sessionFiles, err := filepath.Glob(filepath.Join(installPath, openclawSessionFilesRelativeGlob))
|
||||||
|
if err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
return len(sessionFiles), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func loadOpenclawSessionCountFromFile(sessionStorePath string) (int, error) {
|
||||||
|
content, err := os.ReadFile(sessionStorePath)
|
||||||
|
if err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
return parseOpenclawSessionCount(string(content))
|
||||||
|
}
|
||||||
|
|
||||||
|
func loadOpenclawOverviewJobCount(installPath string) (int, error) {
|
||||||
|
content, err := os.ReadFile(filepath.Join(installPath, openclawCronJobsRelativePath))
|
||||||
|
if err != nil {
|
||||||
|
if os.IsNotExist(err) {
|
||||||
|
return 0, nil
|
||||||
|
}
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
return parseOpenclawCronCount(string(content))
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseOpenclawSessionCount(output string) (int, error) {
|
||||||
|
if strings.TrimSpace(output) == "" {
|
||||||
|
return 0, nil
|
||||||
|
}
|
||||||
|
var payload interface{}
|
||||||
|
if err := json.Unmarshal([]byte(strings.TrimSpace(output)), &payload); err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
return countOpenclawSessions(payload), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseOpenclawCronCount(output string) (int, error) {
|
||||||
|
if strings.TrimSpace(output) == "" {
|
||||||
|
return 0, nil
|
||||||
|
}
|
||||||
|
var payload interface{}
|
||||||
|
if err := json.Unmarshal([]byte(strings.TrimSpace(output)), &payload); err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
switch value := payload.(type) {
|
||||||
|
case []interface{}:
|
||||||
|
return len(value), nil
|
||||||
|
case map[string]interface{}:
|
||||||
|
if total, ok := value["total"].(float64); ok {
|
||||||
|
return int(total), nil
|
||||||
|
}
|
||||||
|
if jobs, ok := value["jobs"].([]interface{}); ok {
|
||||||
|
return len(jobs), nil
|
||||||
|
}
|
||||||
|
return len(value), nil
|
||||||
|
default:
|
||||||
|
return 0, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func countOpenclawSessions(payload interface{}) int {
|
||||||
|
switch value := payload.(type) {
|
||||||
|
case []interface{}:
|
||||||
|
return len(value)
|
||||||
|
case map[string]interface{}:
|
||||||
|
if count, ok := value["count"].(float64); ok {
|
||||||
|
return int(count)
|
||||||
|
}
|
||||||
|
if sessions, ok := value["sessions"]; ok {
|
||||||
|
return countOpenclawSessions(sessions)
|
||||||
|
}
|
||||||
|
count := 0
|
||||||
|
for _, item := range value {
|
||||||
|
switch typed := item.(type) {
|
||||||
|
case map[string]interface{}:
|
||||||
|
if looksLikeOpenclawSession(typed) {
|
||||||
|
count++
|
||||||
|
}
|
||||||
|
case string:
|
||||||
|
if strings.HasSuffix(strings.TrimSpace(typed), ".jsonl") {
|
||||||
|
count++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return count
|
||||||
|
default:
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func looksLikeOpenclawSession(item map[string]interface{}) bool {
|
||||||
|
if _, ok := item["sessionFile"]; ok {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
if _, ok := item["agentId"]; ok {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
if _, ok := item["lastActivityTs"]; ok {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
if _, ok := item["updatedAt"]; ok {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
@@ -0,0 +1,910 @@
|
|||||||
|
package service
|
||||||
|
|
||||||
|
import (
|
||||||
|
"archive/tar"
|
||||||
|
"archive/zip"
|
||||||
|
"compress/gzip"
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"os"
|
||||||
|
"os/exec"
|
||||||
|
"path"
|
||||||
|
"path/filepath"
|
||||||
|
"regexp"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/dto"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/task"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/constant"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/global"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/utils/cmd"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/utils/common"
|
||||||
|
)
|
||||||
|
|
||||||
|
const clawhubGlobalRegistry = "https://clawhub.com"
|
||||||
|
const clawhubChinaRegistry = "https://mirror-cn.clawhub.com"
|
||||||
|
const localSkillHubSource = "local-hub"
|
||||||
|
const localSkillHubPublishedStatus = "published"
|
||||||
|
const clawHubSkillTmpSubDir = "1panel/tmp/clawhub-skills"
|
||||||
|
const hermesManagedSkillsDir = "/opt/data/skills"
|
||||||
|
|
||||||
|
type openclawSkillsList struct {
|
||||||
|
Skills []openclawSkillListItem `json:"skills"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type openclawSkillListItem struct {
|
||||||
|
Name string `json:"name"`
|
||||||
|
Description string `json:"description"`
|
||||||
|
Source string `json:"source"`
|
||||||
|
Bundled bool `json:"bundled"`
|
||||||
|
Disabled bool `json:"disabled"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type openclawSkillInfo struct {
|
||||||
|
SkillKey string `json:"skillKey"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type skillhubSearchPayload struct {
|
||||||
|
Skills []dto.AgentSkillSearchItem `json:"skills"`
|
||||||
|
Results []dto.AgentSkillSearchItem `json:"results"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type localSkillHubItem struct {
|
||||||
|
ID uint
|
||||||
|
Name string
|
||||||
|
Status string
|
||||||
|
ApplicableAgent string
|
||||||
|
PackagePath string
|
||||||
|
}
|
||||||
|
|
||||||
|
var clawhubSearchLinePattern = regexp.MustCompile(`^(\S+)\s+(.+?)\s+\(([\d.]+)\)$`)
|
||||||
|
var ansiEscapePattern = regexp.MustCompile(`\x1b\[[0-9;?]*[ -/]*[@-~]`)
|
||||||
|
var safeLocalSkillDirNamePattern = regexp.MustCompile(`[^a-zA-Z0-9._-]+`)
|
||||||
|
|
||||||
|
func (a AgentService) ListSkills(req dto.AgentIDReq) ([]dto.AgentSkillItem, error) {
|
||||||
|
agent, install, err := a.loadAgentAndInstall(req.AgentID)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if err := ensureContainerRunning(install.ContainerName); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if agent.AgentType == constant.AppHermesAgent {
|
||||||
|
return listHermesSkills(install.ContainerName)
|
||||||
|
}
|
||||||
|
if agent.AgentType != constant.AppOpenclaw {
|
||||||
|
return nil, fmt.Errorf("%s does not support", agent.AgentType)
|
||||||
|
}
|
||||||
|
output, err := cmd.RunDockerExecWithStdout(5*time.Minute, install.ContainerName, "openclaw", "skills", "list", "--json")
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if len(output) == 0 {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
return parseOpenclawSkillsList(output)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a AgentService) SearchSkills(req dto.AgentSkillSearchReq) ([]dto.AgentSkillSearchItem, error) {
|
||||||
|
if req.Source == localSkillHubSource {
|
||||||
|
return nil, fmt.Errorf("local skills hub is provided by enterprise edition")
|
||||||
|
}
|
||||||
|
if global.CONF.Base.IsOffline {
|
||||||
|
return nil, fmt.Errorf("offline environment cannot access remote Skills Hub")
|
||||||
|
}
|
||||||
|
agent, install, err := a.loadAgentAndInstall(req.AgentID)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if err := ensureContainerRunning(install.ContainerName); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if agent.AgentType == constant.AppHermesAgent {
|
||||||
|
return searchHermesSkills(install.ContainerName, req.Source, req.Keyword)
|
||||||
|
}
|
||||||
|
if agent.AgentType != constant.AppOpenclaw {
|
||||||
|
return nil, fmt.Errorf("%s does not support", agent.AgentType)
|
||||||
|
}
|
||||||
|
output, err := loadOpenclawSkillSearchOutput(install.ContainerName, req.Source, req.Keyword)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if len(output) == 0 {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
switch req.Source {
|
||||||
|
case "skillhub":
|
||||||
|
return parseSkillhubSearchResult(output)
|
||||||
|
default:
|
||||||
|
return parseClawhubSearchResult(output, req.Source), nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a AgentService) UpdateSkill(req dto.AgentSkillUpdateReq) error {
|
||||||
|
agent, install, err := a.loadOpenclawAgentAndInstall(req.AgentID)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err := ensureContainerRunning(install.ContainerName); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
conf, err := readOpenclawConfig(agent.ConfigPath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
skillKey, err := getOpenclawSkillKey(install.ContainerName, req.Name)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
setOpenclawSkillEnabled(conf, skillKey, req.Enabled)
|
||||||
|
return writeOpenclawConfigRaw(agent.ConfigPath, conf)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a AgentService) InstallSkill(req dto.AgentSkillInstallReq) error {
|
||||||
|
if global.CONF.Base.IsOffline && req.Source != localSkillHubSource {
|
||||||
|
return fmt.Errorf("offline environment cannot access remote Skills Hub")
|
||||||
|
}
|
||||||
|
agent, install, err := a.loadAgentAndInstall(req.AgentID)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err := ensureContainerRunning(install.ContainerName); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if req.Source == localSkillHubSource {
|
||||||
|
if !global.IsMaster {
|
||||||
|
return fmt.Errorf("local skills hub is only available on the master node")
|
||||||
|
}
|
||||||
|
hostPath, skillName, err := resolveLocalSkillPackage(agent.AgentType, req.Slug)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
installTask, err := task.NewTaskWithOps(skillName, task.TaskInstall, task.TaskScopeAI, req.TaskID, req.AgentID)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
installTask.AddSubTask("Install local skill", func(t *task.Task) error {
|
||||||
|
mgr := cmd.NewCommandMgr(cmd.WithTask(*t), cmd.WithContext(t.TaskCtx), cmd.WithTimeout(20*time.Minute))
|
||||||
|
return installLocalSkillPackage(mgr, install.ContainerName, agent.AgentType, agent.ConfigPath, hostPath, skillName)
|
||||||
|
}, nil)
|
||||||
|
go func() {
|
||||||
|
if err := installTask.Execute(); err != nil {
|
||||||
|
global.LOG.Errorf("install local skill failed: %v", err)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
installTask, err := task.NewTaskWithOps(req.Slug, task.TaskInstall, task.TaskScopeAI, req.TaskID, req.AgentID)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if agent.AgentType == constant.AppHermesAgent {
|
||||||
|
installTask.AddSubTask("Install Hermes skill", func(t *task.Task) error {
|
||||||
|
mgr := cmd.NewCommandMgr(cmd.WithTask(*t), cmd.WithContext(t.TaskCtx), cmd.WithTimeout(20*time.Minute))
|
||||||
|
return mgr.Run("docker", buildHermesDockerExecArgs(install.ContainerName, "skills", "install", req.Slug, "--yes")...)
|
||||||
|
}, nil)
|
||||||
|
go func() {
|
||||||
|
if err := installTask.Execute(); err != nil {
|
||||||
|
global.LOG.Errorf("install hermes skill failed: %v", err)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if agent.AgentType != constant.AppOpenclaw {
|
||||||
|
return fmt.Errorf("%s does not support", agent.AgentType)
|
||||||
|
}
|
||||||
|
installTask.AddSubTask("Install OpenClaw skill", func(t *task.Task) error {
|
||||||
|
mgr := cmd.NewCommandMgr(cmd.WithTask(*t), cmd.WithContext(t.TaskCtx), cmd.WithTimeout(20*time.Minute))
|
||||||
|
return installOpenclawSkill(mgr, install.ContainerName, req.Source, req.Slug)
|
||||||
|
}, nil)
|
||||||
|
go func() {
|
||||||
|
if err := installTask.Execute(); err != nil {
|
||||||
|
global.LOG.Errorf("install openclaw skill failed: %v", err)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func installLocalSkillPackage(mgr *cmd.CommandHelper, containerName, agentType, configPath, hostPath, skillName string) error {
|
||||||
|
targetDir, err := resolveAgentLocalSkillDir(agentType)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
tempDir, err := os.MkdirTemp("", "1panel-agent-skill-*")
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer os.RemoveAll(tempDir)
|
||||||
|
extractRoot := filepath.Join(tempDir, "extract")
|
||||||
|
if err := os.MkdirAll(extractRoot, 0755); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err := extractLocalSkillPackage(hostPath, extractRoot); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
copyRoot, installedSkillName, err := normalizeLocalSkillInstallRoot(extractRoot, filepath.Join(tempDir, "install"), skillName)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err := mgr.Run("docker", "exec", containerName, "mkdir", "-p", targetDir); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err := mgr.Run("docker", "cp", copyRoot+"/.", containerName+":"+targetDir); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if agentType == constant.AppOpenclaw {
|
||||||
|
return registerOpenclawLocalSkill(containerName, configPath, installedSkillName)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func resolveAgentLocalSkillDir(agentType string) (string, error) {
|
||||||
|
switch agentType {
|
||||||
|
case constant.AppOpenclaw:
|
||||||
|
return openclawManagedSkillsDir, nil
|
||||||
|
case constant.AppHermesAgent:
|
||||||
|
return hermesManagedSkillsDir, nil
|
||||||
|
default:
|
||||||
|
return "", fmt.Errorf("%s does not support", agentType)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func resolveLocalSkillPackage(agentType, skillID string) (string, string, error) {
|
||||||
|
skillID = strings.TrimSpace(skillID)
|
||||||
|
id, err := strconv.ParseUint(skillID, 10, 64)
|
||||||
|
if err != nil || id == 0 {
|
||||||
|
return "", "", fmt.Errorf("invalid local skill id")
|
||||||
|
}
|
||||||
|
dbPath := filepath.Join(global.CONF.Base.InstallDir, "1panel", "db", "enterprise.db")
|
||||||
|
if _, err := os.Stat(dbPath); err != nil {
|
||||||
|
return "", "", fmt.Errorf("local skills hub is unavailable")
|
||||||
|
}
|
||||||
|
db, err := common.GetDBWithPath(dbPath)
|
||||||
|
if err != nil {
|
||||||
|
return "", "", err
|
||||||
|
}
|
||||||
|
defer common.CloseDB(db)
|
||||||
|
var item localSkillHubItem
|
||||||
|
if err := db.Table("skill_hub_items").
|
||||||
|
Select("id,name,status,applicable_agent,package_path").
|
||||||
|
Where("id = ? AND status = ?", uint(id), localSkillHubPublishedStatus).
|
||||||
|
First(&item).Error; err != nil {
|
||||||
|
return "", "", fmt.Errorf("local skill is not published or does not exist")
|
||||||
|
}
|
||||||
|
if !matchLocalSkillAgent(item.ApplicableAgent, agentType) {
|
||||||
|
return "", "", fmt.Errorf("local skill does not support %s", agentType)
|
||||||
|
}
|
||||||
|
packagePath, err := validateLocalSkillPackagePath(item.PackagePath)
|
||||||
|
if err != nil {
|
||||||
|
return "", "", err
|
||||||
|
}
|
||||||
|
return packagePath, sanitizeLocalSkillDirName(item.Name, packagePath, skillID), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func matchLocalSkillAgent(applicableAgent, agentType string) bool {
|
||||||
|
applicableAgent = strings.TrimSpace(applicableAgent)
|
||||||
|
if applicableAgent == "" {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
for _, item := range strings.Split(applicableAgent, ",") {
|
||||||
|
normalized := normalizeLocalSkillAgent(strings.TrimSpace(item))
|
||||||
|
if normalized == "common" || normalized == normalizeLocalSkillAgent(agentType) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
func normalizeLocalSkillAgent(agentType string) string {
|
||||||
|
switch strings.ToLower(strings.TrimSpace(agentType)) {
|
||||||
|
case constant.AppHermesAgent:
|
||||||
|
return "hermes"
|
||||||
|
default:
|
||||||
|
return strings.ToLower(strings.TrimSpace(agentType))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func sanitizeLocalSkillDirName(name, packagePath, fallback string) string {
|
||||||
|
name = strings.TrimSpace(name)
|
||||||
|
if name == "" {
|
||||||
|
name = strings.TrimSuffix(filepath.Base(packagePath), localSkillPackageExtension(packagePath))
|
||||||
|
}
|
||||||
|
name = strings.Trim(safeLocalSkillDirNamePattern.ReplaceAllString(name, "-"), "-")
|
||||||
|
if name == "" || name == "." || name == ".." {
|
||||||
|
name = "skill-" + strings.TrimSpace(fallback)
|
||||||
|
}
|
||||||
|
if name == "skill-" {
|
||||||
|
return "skill"
|
||||||
|
}
|
||||||
|
return name
|
||||||
|
}
|
||||||
|
|
||||||
|
func validateLocalSkillPackagePath(packagePath string) (string, error) {
|
||||||
|
packagePath = strings.TrimSpace(packagePath)
|
||||||
|
if packagePath == "" {
|
||||||
|
return "", fmt.Errorf("skill package path is required")
|
||||||
|
}
|
||||||
|
if _, err := localSkillPackageFormat(packagePath); err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
absPath, err := filepath.Abs(packagePath)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
resolvedPath, err := filepath.EvalSymlinks(absPath)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
if !isLocalSkillPackageAllowedPath(resolvedPath) {
|
||||||
|
return "", fmt.Errorf("invalid local skill package path")
|
||||||
|
}
|
||||||
|
info, err := os.Stat(resolvedPath)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
if info.IsDir() {
|
||||||
|
return "", fmt.Errorf("skill package must be a file")
|
||||||
|
}
|
||||||
|
return resolvedPath, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func isLocalSkillPackageAllowedPath(resolvedPath string) bool {
|
||||||
|
roots := []string{
|
||||||
|
filepath.Join(global.CONF.Base.InstallDir, "1panel", "uploads", "skills-hub"),
|
||||||
|
filepath.Join(global.CONF.Base.InstallDir, filepath.FromSlash(clawHubSkillTmpSubDir)),
|
||||||
|
}
|
||||||
|
for _, root := range roots {
|
||||||
|
if isPathInsideResolvedRoot(resolvedPath, root) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
func isPathInsideResolvedRoot(resolvedPath, root string) bool {
|
||||||
|
absRoot, err := filepath.Abs(root)
|
||||||
|
if err != nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
resolvedRoot, err := filepath.EvalSymlinks(absRoot)
|
||||||
|
if err != nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
rel, err := filepath.Rel(resolvedRoot, resolvedPath)
|
||||||
|
return err == nil && rel != "." && rel != ".." && !strings.HasPrefix(rel, ".."+string(os.PathSeparator))
|
||||||
|
}
|
||||||
|
|
||||||
|
func normalizeLocalSkillInstallRoot(extractRoot, installRoot, skillName string) (string, string, error) {
|
||||||
|
entries, err := os.ReadDir(extractRoot)
|
||||||
|
if err != nil {
|
||||||
|
return "", "", err
|
||||||
|
}
|
||||||
|
if len(entries) == 0 {
|
||||||
|
return "", "", fmt.Errorf("skill package is empty")
|
||||||
|
}
|
||||||
|
if len(entries) == 1 && entries[0].IsDir() {
|
||||||
|
return extractRoot, entries[0].Name(), nil
|
||||||
|
}
|
||||||
|
skillRoot := filepath.Join(installRoot, skillName)
|
||||||
|
if err := os.MkdirAll(skillRoot, 0755); err != nil {
|
||||||
|
return "", "", err
|
||||||
|
}
|
||||||
|
if err := copyLocalDirContents(extractRoot, skillRoot); err != nil {
|
||||||
|
return "", "", err
|
||||||
|
}
|
||||||
|
return installRoot, skillName, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func registerOpenclawLocalSkill(containerName, configPath, skillName string) error {
|
||||||
|
conf, err := readOpenclawConfig(configPath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
skillKey, err := getOpenclawSkillKey(containerName, skillName)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
setOpenclawSkillEnabled(conf, skillKey, true)
|
||||||
|
return writeOpenclawConfigRaw(configPath, conf)
|
||||||
|
}
|
||||||
|
|
||||||
|
func extractLocalSkillPackage(packagePath, targetDir string) error {
|
||||||
|
format, err := localSkillPackageFormat(packagePath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
switch format {
|
||||||
|
case "zip":
|
||||||
|
return unzipLocalSkillPackage(packagePath, targetDir)
|
||||||
|
case "tar", "targz":
|
||||||
|
return untarLocalSkillPackage(packagePath, targetDir, format == "targz")
|
||||||
|
case "7z":
|
||||||
|
return un7zLocalSkillPackage(packagePath, targetDir)
|
||||||
|
default:
|
||||||
|
return fmt.Errorf("unsupported skill package format")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func unzipLocalSkillPackage(packagePath, targetDir string) error {
|
||||||
|
reader, err := zip.OpenReader(packagePath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer reader.Close()
|
||||||
|
root, err := filepath.Abs(targetDir)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
for _, file := range reader.File {
|
||||||
|
name, err := safeLocalSkillZipEntryName(file.Name)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
targetPath := filepath.Join(root, name)
|
||||||
|
rel, err := filepath.Rel(root, targetPath)
|
||||||
|
if err != nil || rel == ".." || strings.HasPrefix(rel, ".."+string(os.PathSeparator)) {
|
||||||
|
return fmt.Errorf("invalid zip entry: %s", file.Name)
|
||||||
|
}
|
||||||
|
if file.FileInfo().IsDir() {
|
||||||
|
if err := os.MkdirAll(targetPath, file.Mode()); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if file.Mode()&os.ModeSymlink != 0 {
|
||||||
|
return fmt.Errorf("unsupported zip entry: %s", file.Name)
|
||||||
|
}
|
||||||
|
if err := os.MkdirAll(filepath.Dir(targetPath), 0755); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
rc, err := file.Open()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
dst, err := os.OpenFile(targetPath, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, file.Mode())
|
||||||
|
if err != nil {
|
||||||
|
_ = rc.Close()
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
_, copyErr := io.Copy(dst, rc)
|
||||||
|
closeErr := dst.Close()
|
||||||
|
_ = rc.Close()
|
||||||
|
if copyErr != nil {
|
||||||
|
return copyErr
|
||||||
|
}
|
||||||
|
if closeErr != nil {
|
||||||
|
return closeErr
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func untarLocalSkillPackage(packagePath, targetDir string, gzipped bool) error {
|
||||||
|
src, err := os.Open(packagePath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer src.Close()
|
||||||
|
var reader io.Reader = src
|
||||||
|
var gzipReader *gzip.Reader
|
||||||
|
if gzipped {
|
||||||
|
gzipReader, err = gzip.NewReader(src)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer gzipReader.Close()
|
||||||
|
reader = gzipReader
|
||||||
|
}
|
||||||
|
root, err := filepath.Abs(targetDir)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
tarReader := tar.NewReader(reader)
|
||||||
|
for {
|
||||||
|
header, err := tarReader.Next()
|
||||||
|
if err == io.EOF {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
name, err := safeLocalSkillZipEntryName(header.Name)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
targetPath := filepath.Join(root, name)
|
||||||
|
rel, err := filepath.Rel(root, targetPath)
|
||||||
|
if err != nil || rel == ".." || strings.HasPrefix(rel, ".."+string(os.PathSeparator)) {
|
||||||
|
return fmt.Errorf("invalid tar entry: %s", header.Name)
|
||||||
|
}
|
||||||
|
info := header.FileInfo()
|
||||||
|
if info.IsDir() {
|
||||||
|
if err := os.MkdirAll(targetPath, info.Mode()); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if header.Typeflag != tar.TypeReg && header.Typeflag != tar.TypeRegA {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if err := os.MkdirAll(filepath.Dir(targetPath), 0755); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
dst, err := os.OpenFile(targetPath, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, info.Mode())
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
_, copyErr := io.Copy(dst, tarReader)
|
||||||
|
closeErr := dst.Close()
|
||||||
|
if copyErr != nil {
|
||||||
|
return copyErr
|
||||||
|
}
|
||||||
|
if closeErr != nil {
|
||||||
|
return closeErr
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func un7zLocalSkillPackage(packagePath, targetDir string) error {
|
||||||
|
if _, err := listLocal7zEntries(packagePath); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
root, err := filepath.Abs(targetDir)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
bin, err := findLocal7zBinary()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
tempDir, err := os.MkdirTemp("", "1panel-agent-skill-7z-*")
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer os.RemoveAll(tempDir)
|
||||||
|
if err := cmd.NewCommandMgr(cmd.WithTimeout(20*time.Minute)).Run(bin, "x", "-y", "-o"+tempDir, packagePath); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err := validateExtractedLocalSkillPackage(tempDir); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return copyLocalDirContents(tempDir, root)
|
||||||
|
}
|
||||||
|
|
||||||
|
func safeLocalSkillZipEntryName(name string) (string, error) {
|
||||||
|
clean := path.Clean(strings.ReplaceAll(name, "\\", "/"))
|
||||||
|
clean = strings.TrimLeft(clean, "/")
|
||||||
|
if clean == "." || clean == "" || clean == ".." || strings.HasPrefix(clean, "../") {
|
||||||
|
return "", fmt.Errorf("invalid zip entry: %s", name)
|
||||||
|
}
|
||||||
|
return clean, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func copyLocalDirContents(sourceRoot, targetRoot string) error {
|
||||||
|
return filepath.Walk(sourceRoot, func(sourcePath string, info os.FileInfo, err error) error {
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if sourcePath == sourceRoot {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if info.Mode()&os.ModeSymlink != 0 || (!info.IsDir() && !info.Mode().IsRegular()) {
|
||||||
|
return fmt.Errorf("unsupported skill package entry: %s", sourcePath)
|
||||||
|
}
|
||||||
|
rel, err := filepath.Rel(sourceRoot, sourcePath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
name, err := safeLocalSkillZipEntryName(rel)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
targetPath := filepath.Join(targetRoot, name)
|
||||||
|
if info.IsDir() {
|
||||||
|
return os.MkdirAll(targetPath, info.Mode())
|
||||||
|
}
|
||||||
|
return copyLocalSkillFile(sourcePath, targetPath)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func copyLocalSkillFile(source, target string) error {
|
||||||
|
src, err := os.Open(source)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer src.Close()
|
||||||
|
if err := os.MkdirAll(filepath.Dir(target), 0755); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
dst, err := os.OpenFile(target, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0644)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if _, err := io.Copy(dst, src); err != nil {
|
||||||
|
_ = dst.Close()
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return dst.Close()
|
||||||
|
}
|
||||||
|
|
||||||
|
func validateExtractedLocalSkillPackage(root string) error {
|
||||||
|
return filepath.Walk(root, func(currentPath string, info os.FileInfo, err error) error {
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if currentPath == root {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if info.Mode()&os.ModeSymlink != 0 || (!info.IsDir() && !info.Mode().IsRegular()) {
|
||||||
|
return fmt.Errorf("unsupported skill package entry: %s", currentPath)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func localSkillPackageExtension(name string) string {
|
||||||
|
lower := strings.ToLower(filepath.Base(strings.TrimSpace(name)))
|
||||||
|
if lower == "" || lower == "." {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
if strings.HasSuffix(lower, ".tar.gz") {
|
||||||
|
return ".tar.gz"
|
||||||
|
}
|
||||||
|
return strings.ToLower(filepath.Ext(lower))
|
||||||
|
}
|
||||||
|
|
||||||
|
func localSkillPackageFormat(name string) (string, error) {
|
||||||
|
switch localSkillPackageExtension(name) {
|
||||||
|
case ".zip":
|
||||||
|
return "zip", nil
|
||||||
|
case ".7z":
|
||||||
|
return "7z", nil
|
||||||
|
case ".tar":
|
||||||
|
return "tar", nil
|
||||||
|
case ".tar.gz":
|
||||||
|
return "targz", nil
|
||||||
|
default:
|
||||||
|
return "", fmt.Errorf("only .zip, .7z, .tar, and .tar.gz skill packages are supported")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func findLocal7zBinary() (string, error) {
|
||||||
|
for _, name := range []string{"7z", "7za", "7zr"} {
|
||||||
|
if path, err := exec.LookPath(name); err == nil {
|
||||||
|
return path, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return "", fmt.Errorf("7z command is required to process .7z skill packages")
|
||||||
|
}
|
||||||
|
|
||||||
|
func listLocal7zEntries(packagePath string) ([]string, error) {
|
||||||
|
bin, err := findLocal7zBinary()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
output, err := exec.Command(bin, "l", "-slt", packagePath).CombinedOutput()
|
||||||
|
if err != nil {
|
||||||
|
if message := strings.TrimSpace(string(output)); message != "" {
|
||||||
|
return nil, fmt.Errorf("7z failed: %w: %s", err, message)
|
||||||
|
}
|
||||||
|
return nil, fmt.Errorf("7z failed: %w", err)
|
||||||
|
}
|
||||||
|
entries := make([]string, 0)
|
||||||
|
for _, line := range strings.Split(string(output), "\n") {
|
||||||
|
line = strings.TrimSpace(line)
|
||||||
|
if !strings.HasPrefix(line, "Path = ") {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
entry := strings.TrimSpace(strings.TrimPrefix(line, "Path = "))
|
||||||
|
if entry == "" || entry == packagePath || entry == filepath.Base(packagePath) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
name, err := safeLocalSkillZipEntryName(entry)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
entries = append(entries, name)
|
||||||
|
}
|
||||||
|
if len(entries) == 0 {
|
||||||
|
return nil, fmt.Errorf("skill package is empty")
|
||||||
|
}
|
||||||
|
return entries, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a AgentService) UninstallSkill(req dto.AgentSkillUninstallReq) error {
|
||||||
|
agent, install, err := a.loadAgentAndInstall(req.AgentID)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if agent.AgentType != constant.AppHermesAgent {
|
||||||
|
return fmt.Errorf("%s does not support", agent.AgentType)
|
||||||
|
}
|
||||||
|
if err := ensureContainerRunning(install.ContainerName); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return cmd.NewCommandMgr(cmd.WithTimeout(5*time.Minute)).Run(
|
||||||
|
"docker",
|
||||||
|
buildHermesDockerExecCommandArgs(
|
||||||
|
install.ContainerName,
|
||||||
|
"sh",
|
||||||
|
"-lc",
|
||||||
|
fmt.Sprintf(`printf 'y\n' | %s skills uninstall "$1"`, hermesExecutablePath),
|
||||||
|
"sh",
|
||||||
|
req.Name,
|
||||||
|
)...,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseOpenclawSkillsList(output string) ([]dto.AgentSkillItem, error) {
|
||||||
|
payloadBytes, err := extractEmbeddedJSON(output)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if len(payloadBytes) == 0 {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
var payload openclawSkillsList
|
||||||
|
if err := json.Unmarshal(payloadBytes, &payload); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
items := make([]dto.AgentSkillItem, 0, len(payload.Skills))
|
||||||
|
for _, item := range payload.Skills {
|
||||||
|
items = append(items, dto.AgentSkillItem{
|
||||||
|
Name: item.Name,
|
||||||
|
Description: item.Description,
|
||||||
|
Source: item.Source,
|
||||||
|
Bundled: item.Bundled,
|
||||||
|
Disabled: item.Disabled,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
return items, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func loadOpenclawSkillSearchOutput(containerName, source, keyword string) (string, error) {
|
||||||
|
switch source {
|
||||||
|
case "skillhub":
|
||||||
|
return cmd.RunDockerExecWithStdout(2*time.Minute, containerName, "skillhub", "search", keyword, "--json")
|
||||||
|
default:
|
||||||
|
return cmd.NewCommandMgr(cmd.WithTimeout(2*time.Minute)).
|
||||||
|
RunWithStdout(
|
||||||
|
"docker",
|
||||||
|
"exec",
|
||||||
|
"-e",
|
||||||
|
"CLAWHUB_REGISTRY="+resolveClawhubRegistry(source),
|
||||||
|
containerName,
|
||||||
|
"clawhub",
|
||||||
|
"search",
|
||||||
|
keyword,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseSkillhubSearchResult(output string) ([]dto.AgentSkillSearchItem, error) {
|
||||||
|
trimmed := strings.TrimSpace(output)
|
||||||
|
if trimmed == "" {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
var list []dto.AgentSkillSearchItem
|
||||||
|
if err := json.Unmarshal([]byte(trimmed), &list); err == nil {
|
||||||
|
for i := range list {
|
||||||
|
list[i].Source = "skillhub"
|
||||||
|
}
|
||||||
|
return list, nil
|
||||||
|
}
|
||||||
|
var payload skillhubSearchPayload
|
||||||
|
if err := json.Unmarshal([]byte(trimmed), &payload); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
items := payload.Skills
|
||||||
|
if len(items) == 0 {
|
||||||
|
items = payload.Results
|
||||||
|
}
|
||||||
|
for i := range items {
|
||||||
|
items[i].Source = "skillhub"
|
||||||
|
}
|
||||||
|
return items, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseClawhubSearchResult(output, source string) []dto.AgentSkillSearchItem {
|
||||||
|
lines := strings.Split(strings.TrimSpace(output), "\n")
|
||||||
|
items := make([]dto.AgentSkillSearchItem, 0, len(lines))
|
||||||
|
for _, line := range lines {
|
||||||
|
matches := clawhubSearchLinePattern.FindStringSubmatch(strings.TrimSpace(line))
|
||||||
|
if len(matches) != 4 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
items = append(items, dto.AgentSkillSearchItem{
|
||||||
|
Slug: matches[1],
|
||||||
|
Name: matches[2],
|
||||||
|
Score: matches[3],
|
||||||
|
Source: source,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
return items
|
||||||
|
}
|
||||||
|
|
||||||
|
func installOpenclawSkill(mgr *cmd.CommandHelper, containerName, source, slug string) error {
|
||||||
|
if err := mgr.Run("docker", "exec", containerName, "mkdir", "-p", openclawManagedSkillsDir); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
switch source {
|
||||||
|
case "clawhub-global", "clawhub-cn":
|
||||||
|
return mgr.Run(
|
||||||
|
"docker",
|
||||||
|
"exec",
|
||||||
|
"-e",
|
||||||
|
"CLAWHUB_REGISTRY="+resolveClawhubRegistry(source),
|
||||||
|
containerName,
|
||||||
|
"clawhub",
|
||||||
|
"--workdir",
|
||||||
|
"/home/node/.openclaw",
|
||||||
|
"--dir",
|
||||||
|
"skills",
|
||||||
|
"install",
|
||||||
|
slug,
|
||||||
|
)
|
||||||
|
default:
|
||||||
|
return mgr.Run("docker", "exec", containerName, "skillhub", "--dir", openclawManagedSkillsDir, "install", slug)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func resolveClawhubRegistry(source string) string {
|
||||||
|
switch source {
|
||||||
|
case "clawhub-cn":
|
||||||
|
return clawhubChinaRegistry
|
||||||
|
default:
|
||||||
|
return clawhubGlobalRegistry
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func getOpenclawSkillKey(containerName, name string) (string, error) {
|
||||||
|
output, err := cmd.RunDockerExecWithStdout(2*time.Minute, containerName, "openclaw", "skills", "info", name, "--json")
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
return parseOpenclawSkillKey(name, output)
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseOpenclawSkillKey(name, output string) (string, error) {
|
||||||
|
payloadBytes, err := extractEmbeddedJSON(output)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
var payload openclawSkillInfo
|
||||||
|
if err := json.Unmarshal(payloadBytes, &payload); err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
if payload.SkillKey == "" {
|
||||||
|
return name, nil
|
||||||
|
}
|
||||||
|
return payload.SkillKey, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func extractEmbeddedJSON(output string) ([]byte, error) {
|
||||||
|
trimmed := strings.TrimSpace(ansiEscapePattern.ReplaceAllString(output, ""))
|
||||||
|
if trimmed == "" {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
for i := 0; i < len(trimmed); i++ {
|
||||||
|
if trimmed[i] != '{' && trimmed[i] != '[' {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
decoder := json.NewDecoder(strings.NewReader(trimmed[i:]))
|
||||||
|
var raw json.RawMessage
|
||||||
|
if err := decoder.Decode(&raw); err == nil {
|
||||||
|
return raw, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil, fmt.Errorf("json payload not found")
|
||||||
|
}
|
||||||
|
|
||||||
|
func setOpenclawSkillEnabled(conf map[string]interface{}, skillKey string, enabled bool) {
|
||||||
|
skills := ensureChildMap(conf, "skills")
|
||||||
|
entries := ensureChildMap(skills, "entries")
|
||||||
|
entry := ensureChildMap(entries, skillKey)
|
||||||
|
entry["enabled"] = enabled
|
||||||
|
}
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,338 @@
|
|||||||
|
package service
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"net"
|
||||||
|
"sort"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/dto"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/model"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/repo"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/buserr"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/constant"
|
||||||
|
"gorm.io/gorm"
|
||||||
|
)
|
||||||
|
|
||||||
|
func (a AgentService) BindWebsite(req dto.AgentWebsiteBindReq) error {
|
||||||
|
agent, err := agentRepo.GetFirst(repo.WithByID(req.AgentID))
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if agent.WebsiteID != 0 {
|
||||||
|
return buserr.New("ErrAgentWebsiteBound")
|
||||||
|
}
|
||||||
|
|
||||||
|
website, err := websiteRepo.GetFirst(repo.WithByID(req.WebsiteID))
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if !isBindableAgentWebsiteType(website.Type) {
|
||||||
|
return buserr.New("ErrAgentWebsiteTypeUnsupported")
|
||||||
|
}
|
||||||
|
|
||||||
|
boundAgent, err := agentRepo.GetFirst(repo.WithByWebsiteID(req.WebsiteID))
|
||||||
|
if err == nil && boundAgent.ID > 0 {
|
||||||
|
return buserr.New("ErrAgentWebsiteInUse")
|
||||||
|
}
|
||||||
|
if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
agent.WebsiteID = req.WebsiteID
|
||||||
|
if err := agentRepo.Save(agent); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return ensureOpenclawWebsiteAllowedOrigin(agent, &website)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a AgentService) UnbindWebsite(req dto.AgentIDReq) error {
|
||||||
|
agent, err := agentRepo.GetFirst(repo.WithByID(req.AgentID))
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if agent.WebsiteID == 0 {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
website, err := websiteRepo.GetFirst(repo.WithByID(agent.WebsiteID))
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if website.Type == constant.Deployment {
|
||||||
|
return buserr.New("ErrAgentWebsiteUnbindUnsupported")
|
||||||
|
}
|
||||||
|
|
||||||
|
agent.WebsiteID = 0
|
||||||
|
return agentRepo.Save(agent)
|
||||||
|
}
|
||||||
|
|
||||||
|
func hydrateAgentWebsiteItems(items []dto.AgentItem) error {
|
||||||
|
explicitWebsiteMap, err := loadAgentWebsiteMapByID(items)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
websiteDomainMap, err := loadAgentWebsiteDomainMapByWebsiteID(items)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
fillAgentWebsiteItems(items, explicitWebsiteMap, websiteDomainMap)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func loadAgentWebsiteMapByID(items []dto.AgentItem) (map[uint]model.Website, error) {
|
||||||
|
websiteIDs := make([]uint, 0, len(items))
|
||||||
|
for _, item := range items {
|
||||||
|
if item.WebsiteID > 0 {
|
||||||
|
websiteIDs = append(websiteIDs, item.WebsiteID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(websiteIDs) == 0 {
|
||||||
|
return map[uint]model.Website{}, nil
|
||||||
|
}
|
||||||
|
websites, err := websiteRepo.GetBy(repo.WithByIDs(uniqueUintList(websiteIDs)))
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
websiteMap := make(map[uint]model.Website, len(websites))
|
||||||
|
for _, website := range websites {
|
||||||
|
websiteMap[website.ID] = website
|
||||||
|
}
|
||||||
|
return websiteMap, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func loadAgentWebsiteDomainMapByWebsiteID(items []dto.AgentItem) (map[uint][]model.WebsiteDomain, error) {
|
||||||
|
websiteIDs := make([]uint, 0, len(items))
|
||||||
|
for _, item := range items {
|
||||||
|
if item.WebsiteID > 0 {
|
||||||
|
websiteIDs = append(websiteIDs, item.WebsiteID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(websiteIDs) == 0 {
|
||||||
|
return map[uint][]model.WebsiteDomain{}, nil
|
||||||
|
}
|
||||||
|
websiteDomains, err := websiteDomainRepo.GetBy(websiteDomainRepo.WithWebsiteIds(uniqueUintList(websiteIDs)), repo.WithOrderAsc("id"))
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
websiteDomainMap := make(map[uint][]model.WebsiteDomain, len(websiteDomains))
|
||||||
|
for _, websiteDomain := range websiteDomains {
|
||||||
|
websiteDomainMap[websiteDomain.WebsiteID] = append(websiteDomainMap[websiteDomain.WebsiteID], websiteDomain)
|
||||||
|
}
|
||||||
|
return websiteDomainMap, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func loadAgentWebsiteResourceName(website model.Website) (string, error) {
|
||||||
|
websiteDomains, err := websiteDomainRepo.GetBy(websiteDomainRepo.WithWebsiteId(website.ID), repo.WithOrderAsc("id"))
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
if len(websiteDomains) > 0 {
|
||||||
|
return websiteDomains[0].Domain, nil
|
||||||
|
}
|
||||||
|
if website.PrimaryDomain != "" {
|
||||||
|
return website.PrimaryDomain, nil
|
||||||
|
}
|
||||||
|
return fmt.Sprintf("%d", website.ID), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func fillAgentWebsiteItems(items []dto.AgentItem, explicitWebsiteMap map[uint]model.Website, websiteDomainMap map[uint][]model.WebsiteDomain) {
|
||||||
|
for index := range items {
|
||||||
|
if items[index].WebsiteID == 0 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
website, ok := explicitWebsiteMap[items[index].WebsiteID]
|
||||||
|
if !ok {
|
||||||
|
items[index].WebsiteID = 0
|
||||||
|
items[index].WebsitePrimaryDomain = ""
|
||||||
|
items[index].WebsiteType = ""
|
||||||
|
items[index].WebsiteProtocol = ""
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
items[index].WebsiteType = website.Type
|
||||||
|
items[index].WebsiteProtocol = website.Protocol
|
||||||
|
websiteDomains := websiteDomainMap[items[index].WebsiteID]
|
||||||
|
if len(websiteDomains) == 0 {
|
||||||
|
items[index].WebsitePrimaryDomain = ""
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
items[index].WebsitePrimaryDomain = websiteDomains[0].Domain
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func uniqueDeploymentWebsiteMapByAppInstall(websites []model.Website) map[uint]model.Website {
|
||||||
|
websiteMap := make(map[uint]model.Website)
|
||||||
|
duplicateAppInstallIDs := make(map[uint]struct{})
|
||||||
|
for _, website := range websites {
|
||||||
|
if website.AppInstallID == 0 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if _, duplicated := duplicateAppInstallIDs[website.AppInstallID]; duplicated {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if _, exists := websiteMap[website.AppInstallID]; exists {
|
||||||
|
delete(websiteMap, website.AppInstallID)
|
||||||
|
duplicateAppInstallIDs[website.AppInstallID] = struct{}{}
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
websiteMap[website.AppInstallID] = website
|
||||||
|
}
|
||||||
|
return websiteMap
|
||||||
|
}
|
||||||
|
|
||||||
|
func UniqueDeploymentWebsiteMapForMigration(websites []model.Website) map[uint]model.Website {
|
||||||
|
return uniqueDeploymentWebsiteMapByAppInstall(websites)
|
||||||
|
}
|
||||||
|
|
||||||
|
func uniqueUintList(items []uint) []uint {
|
||||||
|
itemMap := make(map[uint]struct{}, len(items))
|
||||||
|
uniq := make([]uint, 0, len(items))
|
||||||
|
for _, item := range items {
|
||||||
|
if item == 0 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if _, exists := itemMap[item]; exists {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
itemMap[item] = struct{}{}
|
||||||
|
uniq = append(uniq, item)
|
||||||
|
}
|
||||||
|
return uniq
|
||||||
|
}
|
||||||
|
|
||||||
|
func isBindableAgentWebsiteType(websiteType string) bool {
|
||||||
|
return websiteType == constant.Proxy || websiteType == constant.Static
|
||||||
|
}
|
||||||
|
|
||||||
|
func bindDeploymentWebsiteToAgentByAppInstall(website *model.Website) error {
|
||||||
|
if website.ID == 0 || website.Type != constant.Deployment || website.AppInstallID == 0 {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
appInstall, err := appInstallRepo.GetFirst(repo.WithByID(website.AppInstallID))
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if appInstall.App.Key != constant.AppOpenclaw && appInstall.App.Key != constant.AppCopaw && appInstall.App.Key != constant.AppHermesAgent {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
agent, err := agentRepo.GetFirst(repo.WithByAppInstallID(website.AppInstallID))
|
||||||
|
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if agent.WebsiteID != 0 {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
agent.WebsiteID = website.ID
|
||||||
|
if err := agentRepo.Save(agent); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return ensureOpenclawWebsiteAllowedOrigin(agent, website)
|
||||||
|
}
|
||||||
|
|
||||||
|
func ensureOpenclawWebsiteAllowedOrigin(agent *model.Agent, website *model.Website) error {
|
||||||
|
if agent == nil || website == nil || agent.AgentType != constant.AppOpenclaw {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
origins, err := buildWebsiteAllowedOrigins(website)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if len(origins) == 0 {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
install, err := appInstallRepo.GetFirst(repo.WithByID(agent.AppInstallID))
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
conf, err := readOpenclawConfig(agent.ConfigPath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
allowedOrigins := extractSecurityConfig(conf).AllowedOrigins
|
||||||
|
allowedOrigins, err = normalizeAllowedOrigins(append(allowedOrigins, origins...))
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
setSecurityConfig(conf, dto.AgentSecurityConfig{AllowedOrigins: allowedOrigins})
|
||||||
|
if err := writeOpenclawConfigRaw(agent.ConfigPath, conf); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err := syncOpenclawAllowedOriginEnv(&install, allowedOrigins); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return appInstallRepo.Save(context.Background(), &install)
|
||||||
|
}
|
||||||
|
|
||||||
|
func buildWebsiteAllowedOrigins(website *model.Website) ([]string, error) {
|
||||||
|
websiteDomains, err := websiteDomainRepo.GetBy(websiteDomainRepo.WithWebsiteId(website.ID), repo.WithOrderAsc("id"))
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if len(websiteDomains) == 0 {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
defaultHTTPSPort := 443
|
||||||
|
if strings.EqualFold(website.Protocol, "https") {
|
||||||
|
nginxInstall, err := getAppInstallByKey(constant.AppOpenresty)
|
||||||
|
if err == nil && nginxInstall.HttpsPort > 0 {
|
||||||
|
defaultHTTPSPort = nginxInstall.HttpsPort
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return buildWebsiteAllowedOriginsFromDomains(website, websiteDomains, defaultHTTPSPort)
|
||||||
|
}
|
||||||
|
|
||||||
|
func buildWebsiteAllowedOriginsFromDomains(website *model.Website, websiteDomains []model.WebsiteDomain, defaultHTTPSPort int) ([]string, error) {
|
||||||
|
if len(websiteDomains) == 0 {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
sort.Slice(websiteDomains, func(i, j int) bool {
|
||||||
|
return websiteDomains[i].ID < websiteDomains[j].ID
|
||||||
|
})
|
||||||
|
origins := make([]string, 0, len(websiteDomains))
|
||||||
|
for _, websiteDomain := range websiteDomains {
|
||||||
|
origin, err := buildWebsiteDomainOrigin(website.Protocol, websiteDomain, defaultHTTPSPort)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
origins = append(origins, origin)
|
||||||
|
}
|
||||||
|
return origins, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func buildWebsiteDomainOrigin(protocol string, websiteDomain model.WebsiteDomain, defaultHTTPSPort int) (string, error) {
|
||||||
|
origin := strings.ToLower(strings.TrimSpace(protocol)) + "://" + formatWebsiteDomainHost(websiteDomain.Domain)
|
||||||
|
switch strings.ToLower(strings.TrimSpace(protocol)) {
|
||||||
|
case "http":
|
||||||
|
if websiteDomain.Port > 0 && websiteDomain.Port != 80 {
|
||||||
|
origin = fmt.Sprintf("%s:%d", origin, websiteDomain.Port)
|
||||||
|
}
|
||||||
|
case "https":
|
||||||
|
port := websiteDomain.Port
|
||||||
|
if !websiteDomain.SSL {
|
||||||
|
port = defaultHTTPSPort
|
||||||
|
}
|
||||||
|
if port > 0 && port != 443 {
|
||||||
|
origin = fmt.Sprintf("%s:%d", origin, port)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return normalizeAllowedOrigin(origin)
|
||||||
|
}
|
||||||
|
|
||||||
|
func formatWebsiteDomainHost(domain string) string {
|
||||||
|
host := strings.Trim(strings.TrimSpace(domain), "[]")
|
||||||
|
if ip := net.ParseIP(host); ip != nil && strings.Contains(host, ":") {
|
||||||
|
return "[" + host + "]"
|
||||||
|
}
|
||||||
|
return host
|
||||||
|
}
|
||||||
+138
-9
@@ -1,11 +1,14 @@
|
|||||||
package service
|
package service
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"bytes"
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
|
"os/exec"
|
||||||
"path"
|
"path"
|
||||||
"strings"
|
"strings"
|
||||||
|
"syscall"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/1Panel-dev/1Panel/agent/app/dto"
|
"github.com/1Panel-dev/1Panel/agent/app/dto"
|
||||||
@@ -19,6 +22,7 @@ import (
|
|||||||
"github.com/1Panel-dev/1Panel/agent/i18n"
|
"github.com/1Panel-dev/1Panel/agent/i18n"
|
||||||
"github.com/1Panel-dev/1Panel/agent/utils/cmd"
|
"github.com/1Panel-dev/1Panel/agent/utils/cmd"
|
||||||
"github.com/1Panel-dev/1Panel/agent/utils/common"
|
"github.com/1Panel-dev/1Panel/agent/utils/common"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/utils/re"
|
||||||
"github.com/jinzhu/copier"
|
"github.com/jinzhu/copier"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -73,7 +77,7 @@ func (u *AIToolService) LoadDetail(name string) (string, error) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
stdout, err := cmd.RunDefaultWithStdoutBashCf("docker exec %s ollama show %s", containerName, name)
|
stdout, err := cmd.RunDockerExecWithStdout(20*time.Second, containerName, "ollama", "show", name)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
@@ -107,8 +111,7 @@ func (u *AIToolService) Create(req dto.OllamaModelName) error {
|
|||||||
}
|
}
|
||||||
go func() {
|
go func() {
|
||||||
taskItem.AddSubTask(i18n.GetWithName("OllamaModelPull", req.Name), func(t *task.Task) error {
|
taskItem.AddSubTask(i18n.GetWithName("OllamaModelPull", req.Name), func(t *task.Task) error {
|
||||||
cmdMgr := cmd.NewCommandMgr(cmd.WithTask(*taskItem), cmd.WithTimeout(time.Hour))
|
return runOllamaPullWithProcess(t, containerName, info.Name)
|
||||||
return cmdMgr.Run("docker", "exec", containerName, "ollama", "pull", info.Name)
|
|
||||||
}, nil)
|
}, nil)
|
||||||
taskItem.AddSubTask(i18n.GetWithName("OllamaModelSize", req.Name), func(t *task.Task) error {
|
taskItem.AddSubTask(i18n.GetWithName("OllamaModelSize", req.Name), func(t *task.Task) error {
|
||||||
itemSize, err := loadModelSize(info.Name, containerName)
|
itemSize, err := loadModelSize(info.Name, containerName)
|
||||||
@@ -134,7 +137,7 @@ func (u *AIToolService) Close(name string) error {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if err := cmd.RunDefaultBashCf("docker exec %s ollama stop %s", containerName, name); err != nil {
|
if err := cmd.NewCommandMgr().Run("docker", "exec", containerName, "ollama", "stop", name); err != nil {
|
||||||
return fmt.Errorf("handle ollama stop %s failed, %v", name, err)
|
return fmt.Errorf("handle ollama stop %s failed, %v", name, err)
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
@@ -162,8 +165,7 @@ func (u *AIToolService) Recreate(req dto.OllamaModelName) error {
|
|||||||
}
|
}
|
||||||
go func() {
|
go func() {
|
||||||
taskItem.AddSubTask(i18n.GetWithName("OllamaModelPull", req.Name), func(t *task.Task) error {
|
taskItem.AddSubTask(i18n.GetWithName("OllamaModelPull", req.Name), func(t *task.Task) error {
|
||||||
cmdMgr := cmd.NewCommandMgr(cmd.WithTask(*taskItem), cmd.WithTimeout(time.Hour))
|
return runOllamaPullWithProcess(t, containerName, req.Name)
|
||||||
return cmdMgr.Run("docker", "exec", containerName, "ollama", "pull", req.Name)
|
|
||||||
}, nil)
|
}, nil)
|
||||||
taskItem.AddSubTask(i18n.GetWithName("OllamaModelSize", req.Name), func(t *task.Task) error {
|
taskItem.AddSubTask(i18n.GetWithName("OllamaModelSize", req.Name), func(t *task.Task) error {
|
||||||
itemSize, err := loadModelSize(modelInfo.Name, containerName)
|
itemSize, err := loadModelSize(modelInfo.Name, containerName)
|
||||||
@@ -192,7 +194,7 @@ func (u *AIToolService) Delete(req dto.ForceDelete) error {
|
|||||||
}
|
}
|
||||||
for _, item := range ollamaList {
|
for _, item := range ollamaList {
|
||||||
if item.Status != constant.StatusDeleted {
|
if item.Status != constant.StatusDeleted {
|
||||||
if err := cmd.RunDefaultBashCf("docker exec %s ollama rm %s", containerName, item.Name); err != nil && !req.ForceDelete {
|
if err := cmd.NewCommandMgr().Run("docker", "exec", containerName, "ollama", "rm", item.Name); err != nil && !req.ForceDelete {
|
||||||
return fmt.Errorf("handle ollama rm %s failed, %v", item.Name, err)
|
return fmt.Errorf("handle ollama rm %s failed, %v", item.Name, err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -208,7 +210,7 @@ func (u *AIToolService) Sync() ([]dto.OllamaModelDropList, error) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
stdout, err := cmd.RunDefaultWithStdoutBashCf("docker exec %s ollama list", containerName)
|
stdout, err := cmd.RunDockerExecWithStdout(20*time.Second, containerName, "ollama", "list")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -380,12 +382,15 @@ func LoadContainerName() (string, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func loadModelSize(name string, containerName string) (string, error) {
|
func loadModelSize(name string, containerName string) (string, error) {
|
||||||
stdout, err := cmd.RunDefaultWithStdoutBashCf("docker exec %s ollama list | grep %s", containerName, name)
|
stdout, err := cmd.RunDockerExecWithStdout(20*time.Second, containerName, "ollama", "list")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
lines := strings.Split(stdout, "\n")
|
lines := strings.Split(stdout, "\n")
|
||||||
for _, line := range lines {
|
for _, line := range lines {
|
||||||
|
if !strings.Contains(line, name) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
parts := strings.Fields(line)
|
parts := strings.Fields(line)
|
||||||
if len(parts) < 5 {
|
if len(parts) < 5 {
|
||||||
continue
|
continue
|
||||||
@@ -394,3 +399,127 @@ func loadModelSize(name string, containerName string) (string, error) {
|
|||||||
}
|
}
|
||||||
return "", fmt.Errorf("no such model %s in ollama list, std: %s", name, stdout)
|
return "", fmt.Errorf("no such model %s in ollama list, std: %s", name, stdout)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func runOllamaPullWithProcess(taskItem *task.Task, containerName, modelName string) error {
|
||||||
|
ctx, cancel := context.WithTimeout(context.Background(), time.Hour)
|
||||||
|
defer cancel()
|
||||||
|
|
||||||
|
cmdItem := exec.CommandContext(ctx, "docker", "exec", containerName, "ollama", "pull", modelName)
|
||||||
|
cmdItem.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
|
||||||
|
writer := &ollamaPullLogWriter{taskItem: taskItem}
|
||||||
|
cmdItem.Stdout = writer
|
||||||
|
cmdItem.Stderr = writer
|
||||||
|
|
||||||
|
if err := cmdItem.Start(); err != nil {
|
||||||
|
return fmt.Errorf("failed to start ollama pull %s: %w", modelName, err)
|
||||||
|
}
|
||||||
|
waitErr := cmdItem.Wait()
|
||||||
|
writer.Flush()
|
||||||
|
if ctx.Err() == context.DeadlineExceeded {
|
||||||
|
if cmdItem.Process != nil && cmdItem.Process.Pid > 0 {
|
||||||
|
_ = syscall.Kill(-cmdItem.Process.Pid, syscall.SIGKILL)
|
||||||
|
}
|
||||||
|
return buserr.New("ErrCmdTimeout")
|
||||||
|
}
|
||||||
|
if waitErr == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if len(strings.TrimSpace(writer.errBuf.String())) > 0 {
|
||||||
|
return fmt.Errorf("%s", strings.TrimSpace(writer.errBuf.String()))
|
||||||
|
}
|
||||||
|
return waitErr
|
||||||
|
}
|
||||||
|
|
||||||
|
type ollamaPullLogWriter struct {
|
||||||
|
taskItem *task.Task
|
||||||
|
errBuf bytes.Buffer
|
||||||
|
}
|
||||||
|
|
||||||
|
func (w *ollamaPullLogWriter) Write(p []byte) (n int, err error) {
|
||||||
|
w.errBuf.Write(p)
|
||||||
|
for _, segment := range splitOllamaPullSegments(string(p)) {
|
||||||
|
w.logLine(segment)
|
||||||
|
}
|
||||||
|
return len(p), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (w *ollamaPullLogWriter) Flush() {}
|
||||||
|
|
||||||
|
func (w *ollamaPullLogWriter) logLine(line string) {
|
||||||
|
if w == nil || w.taskItem == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
line = sanitizeOllamaPullLine(line)
|
||||||
|
if line == "" {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if prefix := resolveOllamaPullLogPrefix(line); prefix != "" {
|
||||||
|
_ = replaceOllamaPullLogLine(prefix, line, w.taskItem)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
w.taskItem.Log(line)
|
||||||
|
}
|
||||||
|
|
||||||
|
func sanitizeOllamaPullLine(line string) string {
|
||||||
|
line = re.StripAnsiControlSeq(line)
|
||||||
|
line = strings.TrimSpace(line)
|
||||||
|
if strings.HasPrefix(line, "pulling manifes") {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
return line
|
||||||
|
}
|
||||||
|
|
||||||
|
func splitOllamaPullSegments(chunk string) []string {
|
||||||
|
if chunk == "" {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
chunk = strings.ReplaceAll(chunk, "\r", "\n")
|
||||||
|
parts := strings.Split(chunk, "\x1b[1G")
|
||||||
|
segments := make([]string, 0, len(parts))
|
||||||
|
for _, part := range parts {
|
||||||
|
for _, line := range strings.Split(part, "\n") {
|
||||||
|
line = strings.TrimSpace(line)
|
||||||
|
if line == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
segments = append(segments, line)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return segments
|
||||||
|
}
|
||||||
|
|
||||||
|
func resolveOllamaPullLogPrefix(line string) string {
|
||||||
|
if strings.HasPrefix(line, "pulling ") {
|
||||||
|
if idx := strings.Index(line, ":"); idx > 0 {
|
||||||
|
return strings.TrimSpace(line[:idx])
|
||||||
|
}
|
||||||
|
fields := strings.Fields(line)
|
||||||
|
if len(fields) >= 2 {
|
||||||
|
return strings.TrimSpace(fields[0] + " " + fields[1])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
func replaceOllamaPullLogLine(prefix, newLine string, taskItem *task.Task) error {
|
||||||
|
if taskItem == nil || taskItem.Task == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
data, err := os.ReadFile(taskItem.Task.LogFile)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
lines := strings.Split(string(data), "\n")
|
||||||
|
for idx, line := range lines {
|
||||||
|
trimmed := strings.TrimSpace(line)
|
||||||
|
if trimmed == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if strings.Contains(trimmed, prefix) {
|
||||||
|
lines[idx] = time.Now().Format("2006/01/02 15:04:05") + " " + newLine
|
||||||
|
return os.WriteFile(taskItem.Task.LogFile, []byte(strings.Join(lines, "\n")), os.ModePerm)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
taskItem.Log(newLine)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|||||||
+215
-21
@@ -3,6 +3,13 @@ package service
|
|||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"mime"
|
||||||
|
"sort"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
"github.com/1Panel-dev/1Panel/agent/app/dto"
|
"github.com/1Panel-dev/1Panel/agent/app/dto"
|
||||||
"github.com/1Panel-dev/1Panel/agent/app/model"
|
"github.com/1Panel-dev/1Panel/agent/app/model"
|
||||||
"github.com/1Panel-dev/1Panel/agent/app/repo"
|
"github.com/1Panel-dev/1Panel/agent/app/repo"
|
||||||
@@ -15,23 +22,27 @@ import (
|
|||||||
"github.com/1Panel-dev/1Panel/agent/utils/email"
|
"github.com/1Panel-dev/1Panel/agent/utils/email"
|
||||||
"github.com/1Panel-dev/1Panel/agent/utils/xpack"
|
"github.com/1Panel-dev/1Panel/agent/utils/xpack"
|
||||||
"github.com/shirou/gopsutil/v4/disk"
|
"github.com/shirou/gopsutil/v4/disk"
|
||||||
"sort"
|
|
||||||
"strings"
|
|
||||||
"sync"
|
|
||||||
"time"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type AlertService struct{}
|
type AlertService struct{}
|
||||||
|
|
||||||
|
var eeHiddenAlertTypes = []string{"licenseException", "panelUpdate", "panelPwdEndTime"}
|
||||||
|
var communityAlertMethodTypeNames = map[string]string{
|
||||||
|
constant.WeCom: "WeCom",
|
||||||
|
constant.DingTalk: "DingTalk",
|
||||||
|
constant.FeiShu: "FeiShu",
|
||||||
|
constant.SMS: "SMS",
|
||||||
|
}
|
||||||
|
|
||||||
type IAlertService interface {
|
type IAlertService interface {
|
||||||
PageAlert(req dto.AlertSearch) (int64, []dto.AlertDTO, error)
|
PageAlert(req dto.AlertSearch) (int64, []dto.AlertDTO, error)
|
||||||
GetAlerts() ([]dto.AlertDTO, error)
|
GetAlerts() ([]dto.AlertDTO, error)
|
||||||
CreateAlert(create dto.AlertCreate) error
|
CreateAlert(create dto.AlertCreate, operator string) error
|
||||||
UpdateAlert(req dto.AlertUpdate) error
|
UpdateAlert(req dto.AlertUpdate, operator string) error
|
||||||
DeleteAlert(id uint) error
|
DeleteAlert(id uint) error
|
||||||
GetAlert(id uint) (dto.AlertDTO, error)
|
GetAlert(id uint) (dto.AlertDTO, error)
|
||||||
UpdateStatus(id uint, status string) error
|
UpdateStatus(id uint, status string) error
|
||||||
ExternalUpdateAlert(req dto.AlertCreate) error
|
ExternalUpdateAlert(req dto.AlertCreate, operator string) error
|
||||||
|
|
||||||
GetDisks() ([]dto.DiskDTO, error)
|
GetDisks() ([]dto.DiskDTO, error)
|
||||||
PageAlertLogs(req dto.AlertLogSearch) (int64, []dto.AlertLogDTO, error)
|
PageAlertLogs(req dto.AlertLogSearch) (int64, []dto.AlertLogDTO, error)
|
||||||
@@ -39,8 +50,9 @@ type IAlertService interface {
|
|||||||
GetClams() ([]dto.ClamDTO, error)
|
GetClams() ([]dto.ClamDTO, error)
|
||||||
GetCronJobs(req dto.CronJobReq) ([]dto.CronJobDTO, error)
|
GetCronJobs(req dto.CronJobReq) ([]dto.CronJobDTO, error)
|
||||||
|
|
||||||
GetAlertConfig() ([]model.AlertConfig, error)
|
GetAlertConfig(req dto.AlertConfigQuery) ([]model.AlertConfig, error)
|
||||||
UpdateAlertConfig(req dto.AlertConfigUpdate) error
|
PageAlertConfig(req dto.AlertConfigPageReq) (int64, []model.AlertConfig, error)
|
||||||
|
UpdateAlertConfig(req dto.AlertConfigUpdate, operator string) error
|
||||||
DeleteAlertConfig(id uint) error
|
DeleteAlertConfig(id uint) error
|
||||||
TestAlertConfig(req dto.AlertConfigTest) (bool, error)
|
TestAlertConfig(req dto.AlertConfigTest) (bool, error)
|
||||||
}
|
}
|
||||||
@@ -54,6 +66,9 @@ func (a AlertService) PageAlert(search dto.AlertSearch) (int64, []dto.AlertDTO,
|
|||||||
opts []repo.DBOption
|
opts []repo.DBOption
|
||||||
result []dto.AlertDTO
|
result []dto.AlertDTO
|
||||||
)
|
)
|
||||||
|
if global.CONF.Base.IsEnterprise {
|
||||||
|
opts = append(opts, alertRepo.WithByTypeNotIn(eeHiddenAlertTypes))
|
||||||
|
}
|
||||||
if search.Status != "" {
|
if search.Status != "" {
|
||||||
opts = append(opts, repo.WithByStatus(search.Status))
|
opts = append(opts, repo.WithByStatus(search.Status))
|
||||||
}
|
}
|
||||||
@@ -80,6 +95,8 @@ func (a AlertService) PageAlert(search dto.AlertSearch) (int64, []dto.AlertDTO,
|
|||||||
Status: item.Status,
|
Status: item.Status,
|
||||||
SendCount: item.SendCount,
|
SendCount: item.SendCount,
|
||||||
AdvancedParams: item.AdvancedParams,
|
AdvancedParams: item.AdvancedParams,
|
||||||
|
CreateUser: item.CreateUser,
|
||||||
|
UpdateUser: item.UpdateUser,
|
||||||
CreatedAt: item.CreatedAt,
|
CreatedAt: item.CreatedAt,
|
||||||
UpdatedAt: item.UpdatedAt,
|
UpdatedAt: item.UpdatedAt,
|
||||||
})
|
})
|
||||||
@@ -111,6 +128,8 @@ func (a AlertService) GetAlerts() ([]dto.AlertDTO, error) {
|
|||||||
Status: item.Status,
|
Status: item.Status,
|
||||||
SendCount: item.SendCount,
|
SendCount: item.SendCount,
|
||||||
AdvancedParams: item.AdvancedParams,
|
AdvancedParams: item.AdvancedParams,
|
||||||
|
CreateUser: item.CreateUser,
|
||||||
|
UpdateUser: item.UpdateUser,
|
||||||
CreatedAt: item.CreatedAt,
|
CreatedAt: item.CreatedAt,
|
||||||
UpdatedAt: item.UpdatedAt,
|
UpdatedAt: item.UpdatedAt,
|
||||||
})
|
})
|
||||||
@@ -119,7 +138,10 @@ func (a AlertService) GetAlerts() ([]dto.AlertDTO, error) {
|
|||||||
return result, err
|
return result, err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a AlertService) CreateAlert(create dto.AlertCreate) error {
|
func (a AlertService) CreateAlert(create dto.AlertCreate, operator string) error {
|
||||||
|
if err := a.validateCommunityAlertMethod(create.Method); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
var alertID uint
|
var alertID uint
|
||||||
var alertInfo model.Alert
|
var alertInfo model.Alert
|
||||||
if create.Project != "" {
|
if create.Project != "" {
|
||||||
@@ -136,7 +158,7 @@ func (a AlertService) CreateAlert(create dto.AlertCreate) error {
|
|||||||
return buserr.WithErr("ErrStructTransform", err)
|
return buserr.WithErr("ErrStructTransform", err)
|
||||||
}
|
}
|
||||||
upAlert.ID = alertID
|
upAlert.ID = alertID
|
||||||
err := a.UpdateAlert(upAlert)
|
err := a.UpdateAlert(upAlert, operator)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -145,6 +167,8 @@ func (a AlertService) CreateAlert(create dto.AlertCreate) error {
|
|||||||
if err := copier.Copy(&alertInfo, &create); err != nil {
|
if err := copier.Copy(&alertInfo, &create); err != nil {
|
||||||
return buserr.WithErr("ErrStructTransform", err)
|
return buserr.WithErr("ErrStructTransform", err)
|
||||||
}
|
}
|
||||||
|
alertInfo.CreateUser = operator
|
||||||
|
alertInfo.UpdateUser = operator
|
||||||
|
|
||||||
if err := alertRepo.Create(&alertInfo); err != nil {
|
if err := alertRepo.Create(&alertInfo); err != nil {
|
||||||
return err
|
return err
|
||||||
@@ -155,7 +179,10 @@ func (a AlertService) CreateAlert(create dto.AlertCreate) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a AlertService) UpdateAlert(req dto.AlertUpdate) error {
|
func (a AlertService) UpdateAlert(req dto.AlertUpdate, operator string) error {
|
||||||
|
if err := a.validateCommunityAlertMethod(req.Method); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
upMap := make(map[string]interface{})
|
upMap := make(map[string]interface{})
|
||||||
upMap["id"] = req.ID
|
upMap["id"] = req.ID
|
||||||
@@ -168,6 +195,7 @@ func (a AlertService) UpdateAlert(req dto.AlertUpdate) error {
|
|||||||
upMap["status"] = req.Status
|
upMap["status"] = req.Status
|
||||||
upMap["send_count"] = req.SendCount
|
upMap["send_count"] = req.SendCount
|
||||||
upMap["advanced_params"] = req.AdvancedParams
|
upMap["advanced_params"] = req.AdvancedParams
|
||||||
|
upMap["update_user"] = operator
|
||||||
|
|
||||||
if err := alertRepo.Update(upMap, repo.WithByID(req.ID)); err != nil {
|
if err := alertRepo.Update(upMap, repo.WithByID(req.ID)); err != nil {
|
||||||
return err
|
return err
|
||||||
@@ -307,12 +335,25 @@ func (a AlertService) GetDisks() ([]dto.DiskDTO, error) {
|
|||||||
|
|
||||||
func executeDiskCommand() (string, error) {
|
func executeDiskCommand() (string, error) {
|
||||||
cmdMgr := cmd.NewCommandMgr(cmd.WithTimeout(2 * time.Second))
|
cmdMgr := cmd.NewCommandMgr(cmd.WithTimeout(2 * time.Second))
|
||||||
stdout, err := cmdMgr.RunWithStdoutBashC("df -hT -P | grep '/' | grep -v tmpfs | grep -v 'snap/core' | grep -v udev")
|
stdout, err := cmdMgr.RunWithStdout("df", "-hT", "-P")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
cmdMgr2 := cmd.NewCommandMgr(cmd.WithTimeout(1 * time.Second))
|
cmdMgr2 := cmd.NewCommandMgr(cmd.WithTimeout(1 * time.Second))
|
||||||
stdout, err = cmdMgr2.RunWithStdoutBashC("df -lhT -P | grep '/' | grep -v tmpfs | grep -v 'snap/core' | grep -v udev")
|
stdout, err = cmdMgr2.RunWithStdout("df", "-lhT", "-P")
|
||||||
}
|
}
|
||||||
return stdout, err
|
if err != nil {
|
||||||
|
return stdout, err
|
||||||
|
}
|
||||||
|
var lines []string
|
||||||
|
for _, line := range strings.Split(stdout, "\n") {
|
||||||
|
if !strings.Contains(line, "/") || strings.Contains(line, "tmpfs") || strings.Contains(line, "snap/core") || strings.Contains(line, "udev") {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
lines = append(lines, line)
|
||||||
|
}
|
||||||
|
if len(lines) == 0 {
|
||||||
|
return "", nil
|
||||||
|
}
|
||||||
|
return strings.Join(lines, "\n"), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func shouldExclude(fields []string, mountPoint string, excludes map[string]struct{}) bool {
|
func shouldExclude(fields []string, mountPoint string, excludes map[string]struct{}) bool {
|
||||||
@@ -440,17 +481,40 @@ func (a AlertService) GetCronJobs(req dto.CronJobReq) ([]dto.CronJobDTO, error)
|
|||||||
return cronJobs, err
|
return cronJobs, err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a AlertService) GetAlertConfig() ([]model.AlertConfig, error) {
|
func (a AlertService) GetAlertConfig(req dto.AlertConfigQuery) ([]model.AlertConfig, error) {
|
||||||
var (
|
var (
|
||||||
opts []repo.DBOption
|
opts []repo.DBOption
|
||||||
configs []model.AlertConfig
|
configs []model.AlertConfig
|
||||||
)
|
)
|
||||||
|
if len(req.ExcludeTypes) > 0 {
|
||||||
|
opts = append(opts, alertRepo.WithByTypeNotIn(req.ExcludeTypes))
|
||||||
|
}
|
||||||
opts = append(opts, repo.WithByStatus(constant.AlertEnable))
|
opts = append(opts, repo.WithByStatus(constant.AlertEnable))
|
||||||
configs, err := alertRepo.AlertConfigList(opts...)
|
configs, err := alertRepo.AlertConfigList(opts...)
|
||||||
return configs, err
|
return configs, err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a AlertService) UpdateAlertConfig(req dto.AlertConfigUpdate) error {
|
func (a AlertService) PageAlertConfig(req dto.AlertConfigPageReq) (int64, []model.AlertConfig, error) {
|
||||||
|
opts := []repo.DBOption{
|
||||||
|
alertRepo.WithByTypeNotIn([]string{"common"}),
|
||||||
|
repo.WithOrderDesc("created_at"),
|
||||||
|
}
|
||||||
|
if len(req.ExcludeTypes) > 0 {
|
||||||
|
opts = append(opts, alertRepo.WithByTypeNotIn(req.ExcludeTypes))
|
||||||
|
}
|
||||||
|
return alertRepo.PageAlertConfig(req.Page, req.PageSize, opts...)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a AlertService) UpdateAlertConfig(req dto.AlertConfigUpdate, operator string) error {
|
||||||
|
if err := a.validateCommunityAlertConfigType(req.Type); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err := a.checkAlertConfigDisplayNameUnique(req); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err := a.checkAlertConfigSMSPhoneUnique(req); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
if req.ID != 0 {
|
if req.ID != 0 {
|
||||||
upMap := make(map[string]interface{})
|
upMap := make(map[string]interface{})
|
||||||
upMap["id"] = req.ID
|
upMap["id"] = req.ID
|
||||||
@@ -458,6 +522,7 @@ func (a AlertService) UpdateAlertConfig(req dto.AlertConfigUpdate) error {
|
|||||||
upMap["title"] = req.Title
|
upMap["title"] = req.Title
|
||||||
upMap["status"] = req.Status
|
upMap["status"] = req.Status
|
||||||
upMap["config"] = req.Config
|
upMap["config"] = req.Config
|
||||||
|
upMap["update_user"] = operator
|
||||||
if err := alertRepo.UpdateAlertConfig(upMap, repo.WithByID(req.ID)); err != nil {
|
if err := alertRepo.UpdateAlertConfig(upMap, repo.WithByID(req.ID)); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -466,6 +531,8 @@ func (a AlertService) UpdateAlertConfig(req dto.AlertConfigUpdate) error {
|
|||||||
if err := copier.Copy(&alertConfig, &req); err != nil {
|
if err := copier.Copy(&alertConfig, &req); err != nil {
|
||||||
return buserr.WithErr("ErrStructTransform", err)
|
return buserr.WithErr("ErrStructTransform", err)
|
||||||
}
|
}
|
||||||
|
alertConfig.CreateUser = operator
|
||||||
|
alertConfig.UpdateUser = operator
|
||||||
if err := alertRepo.CreateAlertConfig(&alertConfig); err != nil {
|
if err := alertRepo.CreateAlertConfig(&alertConfig); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -474,7 +541,130 @@ func (a AlertService) UpdateAlertConfig(req dto.AlertConfigUpdate) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (a AlertService) checkAlertConfigSMSPhoneUnique(req dto.AlertConfigUpdate) error {
|
||||||
|
if req.Type != constant.SMSConfig {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
phone := alertConfigSMSPhone(req.Config)
|
||||||
|
configs, err := alertRepo.AlertConfigList(alertRepo.WithByType(req.Type))
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, config := range configs {
|
||||||
|
if req.ID != 0 && config.ID == req.ID {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if alertConfigSMSPhone(config.Config) == phone {
|
||||||
|
return buserr.New("ErrAlertConfigPhoneExist")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a AlertService) checkAlertConfigDisplayNameUnique(req dto.AlertConfigUpdate) error {
|
||||||
|
displayName := alertConfigDisplayName(req.Type, req.Config)
|
||||||
|
if displayName == "" {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
configs, err := alertRepo.AlertConfigList(alertRepo.WithByType(req.Type))
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, config := range configs {
|
||||||
|
if req.ID != 0 && config.ID == req.ID {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if alertConfigDisplayName(config.Type, config.Config) == displayName {
|
||||||
|
return buserr.New("ErrNameIsExist")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a AlertService) validateCommunityAlertMethod(method string) error {
|
||||||
|
if global.CONF.Base.IsEnterprise || global.CONF.Base.Edition == "cn" {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if strings.TrimSpace(method) == "" {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, item := range strings.Split(method, ",") {
|
||||||
|
item = strings.TrimSpace(item)
|
||||||
|
if item == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if configID, err := strconv.ParseUint(item, 10, 64); err == nil {
|
||||||
|
config, err := alertRepo.GetConfigById(uint(configID))
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if _, ok := communityAlertMethodTypeNames[config.Type]; ok {
|
||||||
|
return buserr.WithErr("ErrAlertMethodNotSupported", nil)
|
||||||
|
}
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if _, ok := communityAlertMethodTypeNames[item]; ok {
|
||||||
|
return buserr.WithErr("ErrAlertMethodNotSupported", nil)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a AlertService) validateCommunityAlertConfigType(configType string) error {
|
||||||
|
if global.CONF.Base.IsEnterprise || global.CONF.Base.Edition == "cn" {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if _, ok := communityAlertMethodTypeNames[configType]; ok {
|
||||||
|
return buserr.WithErr("ErrAlertMethodNotSupported", nil)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func alertConfigDisplayName(configType, configData string) string {
|
||||||
|
switch configType {
|
||||||
|
case constant.Email, constant.WeCom, constant.DingTalk, constant.FeiShu, constant.Bark, constant.SMS:
|
||||||
|
var cfg struct {
|
||||||
|
DisplayName string `json:"displayName"`
|
||||||
|
}
|
||||||
|
if err := json.Unmarshal([]byte(configData), &cfg); err != nil {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
return strings.TrimSpace(cfg.DisplayName)
|
||||||
|
default:
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func alertConfigSMSPhone(configData string) string {
|
||||||
|
var cfg struct {
|
||||||
|
Phone string `json:"phone"`
|
||||||
|
}
|
||||||
|
if err := json.Unmarshal([]byte(configData), &cfg); err != nil {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
return strings.TrimSpace(cfg.Phone)
|
||||||
|
}
|
||||||
|
|
||||||
func (a AlertService) DeleteAlertConfig(id uint) error {
|
func (a AlertService) DeleteAlertConfig(id uint) error {
|
||||||
|
_, err := alertRepo.GetConfigById(id)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
usedAlerts, err := alertRepo.List(alertRepo.WithByAlertMethodContainsConfigID(id))
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if len(usedAlerts) > 0 {
|
||||||
|
return buserr.New("ErrAlertConfigInUse")
|
||||||
|
}
|
||||||
return alertRepo.DeleteAlertConfig(repo.WithByID(id))
|
return alertRepo.DeleteAlertConfig(repo.WithByID(id))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -483,13 +673,14 @@ func (a AlertService) TestAlertConfig(req dto.AlertConfigTest) (bool, error) {
|
|||||||
if username == "" {
|
if username == "" {
|
||||||
username = req.Sender
|
username = req.Sender
|
||||||
}
|
}
|
||||||
|
encodedDisplayName := mime.BEncoding.Encode("UTF-8", req.DisplayName)
|
||||||
cfg := email.SMTPConfig{
|
cfg := email.SMTPConfig{
|
||||||
Host: req.Host,
|
Host: req.Host,
|
||||||
Port: req.Port,
|
Port: req.Port,
|
||||||
Sender: req.Sender,
|
Sender: req.Sender,
|
||||||
Username: username,
|
Username: username,
|
||||||
Password: req.Password,
|
Password: req.Password,
|
||||||
From: fmt.Sprintf(`"%s" <%s>`, req.DisplayName, req.Sender),
|
From: fmt.Sprintf(`"%s" <%s>`, encodedDisplayName, req.Sender),
|
||||||
Encryption: req.Encryption,
|
Encryption: req.Encryption,
|
||||||
Recipient: req.Recipient,
|
Recipient: req.Recipient,
|
||||||
}
|
}
|
||||||
@@ -499,14 +690,17 @@ func (a AlertService) TestAlertConfig(req dto.AlertConfigTest) (bool, error) {
|
|||||||
Body: i18n.GetMsgByKey("TestAlert"),
|
Body: i18n.GetMsgByKey("TestAlert"),
|
||||||
IsHTML: false,
|
IsHTML: false,
|
||||||
}
|
}
|
||||||
transport := xpack.LoadRequestTransport()
|
transport := xpack.MultiNodeProvider.LoadRequestTransport()
|
||||||
if err := email.SendMail(cfg, msg, transport); err != nil {
|
if err := email.SendMail(cfg, msg, transport); err != nil {
|
||||||
return false, err
|
return false, err
|
||||||
}
|
}
|
||||||
return true, nil
|
return true, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a AlertService) ExternalUpdateAlert(updateAlert dto.AlertCreate) error {
|
func (a AlertService) ExternalUpdateAlert(updateAlert dto.AlertCreate, operator string) error {
|
||||||
|
if err := a.validateCommunityAlertMethod(updateAlert.Method); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
upMap := make(map[string]interface{})
|
upMap := make(map[string]interface{})
|
||||||
var newStatus string
|
var newStatus string
|
||||||
if updateAlert.SendCount == 0 {
|
if updateAlert.SendCount == 0 {
|
||||||
@@ -550,7 +744,7 @@ func (a AlertService) ExternalUpdateAlert(updateAlert dto.AlertCreate) error {
|
|||||||
} else {
|
} else {
|
||||||
if updateAlert.Method != "" && updateAlert.Title != "" {
|
if updateAlert.Method != "" && updateAlert.Title != "" {
|
||||||
updateAlert.Status = newStatus
|
updateAlert.Status = newStatus
|
||||||
if err := a.CreateAlert(updateAlert); err != nil {
|
if err := a.CreateAlert(updateAlert, operator); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+250
-113
@@ -3,6 +3,14 @@ package service
|
|||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"math"
|
||||||
|
"net"
|
||||||
|
"sort"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
"github.com/1Panel-dev/1Panel/agent/app/dto"
|
"github.com/1Panel-dev/1Panel/agent/app/dto"
|
||||||
"github.com/1Panel-dev/1Panel/agent/app/model"
|
"github.com/1Panel-dev/1Panel/agent/app/model"
|
||||||
"github.com/1Panel-dev/1Panel/agent/app/repo"
|
"github.com/1Panel-dev/1Panel/agent/app/repo"
|
||||||
@@ -17,12 +25,7 @@ import (
|
|||||||
"github.com/shirou/gopsutil/v4/disk"
|
"github.com/shirou/gopsutil/v4/disk"
|
||||||
"github.com/shirou/gopsutil/v4/load"
|
"github.com/shirou/gopsutil/v4/load"
|
||||||
"github.com/shirou/gopsutil/v4/mem"
|
"github.com/shirou/gopsutil/v4/mem"
|
||||||
"github.com/shirou/gopsutil/v4/net"
|
gnet "github.com/shirou/gopsutil/v4/net"
|
||||||
"math"
|
|
||||||
"sort"
|
|
||||||
"strconv"
|
|
||||||
"strings"
|
|
||||||
"time"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
@@ -33,7 +36,7 @@ const (
|
|||||||
|
|
||||||
type AlertTaskHelper struct {
|
type AlertTaskHelper struct {
|
||||||
DiskIO chan []disk.IOCountersStat
|
DiskIO chan []disk.IOCountersStat
|
||||||
NetIO chan []net.IOCountersStat
|
NetIO chan []gnet.IOCountersStat
|
||||||
}
|
}
|
||||||
|
|
||||||
type IAlertTaskHelper interface {
|
type IAlertTaskHelper interface {
|
||||||
@@ -45,6 +48,7 @@ type IAlertTaskHelper interface {
|
|||||||
|
|
||||||
var cpuLoad1, cpuLoad5, cpuLoad15 []float64
|
var cpuLoad1, cpuLoad5, cpuLoad15 []float64
|
||||||
var memoryLoad1, memoryLoad5, memoryLoad15 []float64
|
var memoryLoad1, memoryLoad5, memoryLoad15 []float64
|
||||||
|
var alertTaskMu sync.Mutex
|
||||||
|
|
||||||
var baseTypes = map[string]bool{"ssl": true, "siteEndTime": true, "panelPwdEndTime": true, "panelUpdate": true}
|
var baseTypes = map[string]bool{"ssl": true, "siteEndTime": true, "panelPwdEndTime": true, "panelUpdate": true}
|
||||||
var resourceTypes = map[string]bool{"cpu": true, "memory": true, "disk": true, "load": true, "panelLogin": true, "sshLogin": true, "nodeException": true, "licenseException": true}
|
var resourceTypes = map[string]bool{"cpu": true, "memory": true, "disk": true, "load": true, "panelLogin": true, "sshLogin": true, "nodeException": true, "licenseException": true}
|
||||||
@@ -52,36 +56,53 @@ var resourceTypes = map[string]bool{"cpu": true, "memory": true, "disk": true, "
|
|||||||
func NewIAlertTaskHelper() IAlertTaskHelper {
|
func NewIAlertTaskHelper() IAlertTaskHelper {
|
||||||
return &AlertTaskHelper{
|
return &AlertTaskHelper{
|
||||||
DiskIO: make(chan []disk.IOCountersStat, 1),
|
DiskIO: make(chan []disk.IOCountersStat, 1),
|
||||||
NetIO: make(chan []net.IOCountersStat, 1),
|
NetIO: make(chan []gnet.IOCountersStat, 1),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
func (m *AlertTaskHelper) StartTask() {
|
func (m *AlertTaskHelper) StartTask() {
|
||||||
|
alertTaskMu.Lock()
|
||||||
|
defer alertTaskMu.Unlock()
|
||||||
|
m.startTaskLocked()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *AlertTaskHelper) startTaskLocked() {
|
||||||
baseAlert, resourceAlert := m.getClassifiedAlerts()
|
baseAlert, resourceAlert := m.getClassifiedAlerts()
|
||||||
if len(baseAlert) == 0 && len(resourceAlert) == 0 {
|
if len(baseAlert) == 0 && len(resourceAlert) == 0 {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
handleBaseAlerts(baseAlert)
|
handleBaseAlertsLocked(baseAlert)
|
||||||
handleResourceAlerts(resourceAlert)
|
handleResourceAlertsLocked(resourceAlert)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *AlertTaskHelper) StopTask() {
|
func (m *AlertTaskHelper) StopTask() {
|
||||||
stopBaseJob()
|
alertTaskMu.Lock()
|
||||||
stopResourceJob()
|
defer alertTaskMu.Unlock()
|
||||||
|
stopBaseJobLocked()
|
||||||
|
stopResourceJobLocked()
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *AlertTaskHelper) ResetTask() {
|
func (m *AlertTaskHelper) ResetTask() {
|
||||||
m.StopTask()
|
alertTaskMu.Lock()
|
||||||
m.StartTask()
|
defer alertTaskMu.Unlock()
|
||||||
|
stopBaseJobLocked()
|
||||||
|
stopResourceJobLocked()
|
||||||
|
m.startTaskLocked()
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *AlertTaskHelper) InitTask(alertType string) {
|
func (m *AlertTaskHelper) InitTask(alertType string) {
|
||||||
|
alertTaskMu.Lock()
|
||||||
|
defer alertTaskMu.Unlock()
|
||||||
|
m.initTaskLocked(alertType)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *AlertTaskHelper) initTaskLocked(alertType string) {
|
||||||
resetAlertState(alertType)
|
resetAlertState(alertType)
|
||||||
if baseTypes[alertType] {
|
if baseTypes[alertType] {
|
||||||
stopBaseJob()
|
stopBaseJobLocked()
|
||||||
} else if resourceTypes[alertType] {
|
} else if resourceTypes[alertType] {
|
||||||
stopResourceJob()
|
stopResourceJobLocked()
|
||||||
}
|
}
|
||||||
m.StartTask()
|
m.startTaskLocked()
|
||||||
}
|
}
|
||||||
|
|
||||||
func resetAlertState(alertType string) {
|
func resetAlertState(alertType string) {
|
||||||
@@ -109,14 +130,14 @@ func (m *AlertTaskHelper) getClassifiedAlerts() (baseAlerts, resourceAlerts []dt
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
func handleBaseAlerts(baseAlerts []dto.AlertDTO) {
|
func handleBaseAlertsLocked(baseAlerts []dto.AlertDTO) {
|
||||||
if len(baseAlerts) == 0 {
|
if len(baseAlerts) == 0 {
|
||||||
stopBaseJob()
|
stopBaseJobLocked()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if global.AlertBaseJobID == 0 {
|
if global.AlertBaseJobID == 0 {
|
||||||
baseTask(baseAlerts)
|
baseTask(baseAlerts)
|
||||||
jobID, err := global.Cron.AddFunc("*/30 * * * *", func() {
|
jobID, err := global.Cron.AddFunc("@every 30m", func() {
|
||||||
baseTask(baseAlerts)
|
baseTask(baseAlerts)
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -128,9 +149,9 @@ func handleBaseAlerts(baseAlerts []dto.AlertDTO) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func handleResourceAlerts(resourceAlerts []dto.AlertDTO) {
|
func handleResourceAlertsLocked(resourceAlerts []dto.AlertDTO) {
|
||||||
if len(resourceAlerts) == 0 {
|
if len(resourceAlerts) == 0 {
|
||||||
stopResourceJob()
|
stopResourceJobLocked()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if global.AlertResourceJobID == 0 {
|
if global.AlertResourceJobID == 0 {
|
||||||
@@ -146,7 +167,7 @@ func handleResourceAlerts(resourceAlerts []dto.AlertDTO) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func stopBaseJob() {
|
func stopBaseJobLocked() {
|
||||||
if global.AlertBaseJobID != 0 {
|
if global.AlertBaseJobID != 0 {
|
||||||
global.Cron.Remove(global.AlertBaseJobID)
|
global.Cron.Remove(global.AlertBaseJobID)
|
||||||
global.AlertBaseJobID = 0
|
global.AlertBaseJobID = 0
|
||||||
@@ -154,7 +175,7 @@ func stopBaseJob() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func stopResourceJob() {
|
func stopResourceJobLocked() {
|
||||||
if global.AlertResourceJobID != 0 {
|
if global.AlertResourceJobID != 0 {
|
||||||
global.Cron.Remove(global.AlertResourceJobID)
|
global.Cron.Remove(global.AlertResourceJobID)
|
||||||
global.AlertResourceJobID = 0
|
global.AlertResourceJobID = 0
|
||||||
@@ -173,10 +194,16 @@ func baseTask(baseAlert []dto.AlertDTO) {
|
|||||||
case "siteEndTime":
|
case "siteEndTime":
|
||||||
loadWebsiteInfo(alert)
|
loadWebsiteInfo(alert)
|
||||||
case "panelPwdEndTime":
|
case "panelPwdEndTime":
|
||||||
|
if global.CONF.Base.IsEnterprise {
|
||||||
|
continue
|
||||||
|
}
|
||||||
if global.IsMaster {
|
if global.IsMaster {
|
||||||
loadPanelPwd(alert)
|
loadPanelPwd(alert)
|
||||||
}
|
}
|
||||||
case "panelUpdate":
|
case "panelUpdate":
|
||||||
|
if global.CONF.Base.IsEnterprise {
|
||||||
|
continue
|
||||||
|
}
|
||||||
if global.IsMaster {
|
if global.IsMaster {
|
||||||
loadPanelUpdate(alert)
|
loadPanelUpdate(alert)
|
||||||
}
|
}
|
||||||
@@ -209,6 +236,9 @@ func resourceTask(resourceAlert []dto.AlertDTO) {
|
|||||||
loadNodeException(alert)
|
loadNodeException(alert)
|
||||||
}
|
}
|
||||||
case "licenseException":
|
case "licenseException":
|
||||||
|
if global.CONF.Base.IsEnterprise {
|
||||||
|
continue
|
||||||
|
}
|
||||||
if execute && global.IsMaster {
|
if execute && global.IsMaster {
|
||||||
loadLicenseException(alert)
|
loadLicenseException(alert)
|
||||||
}
|
}
|
||||||
@@ -423,25 +453,19 @@ func loadDiskUsage(alert dto.AlertDTO) {
|
|||||||
}
|
}
|
||||||
if isAlertDue(newDate) {
|
if isAlertDue(newDate) {
|
||||||
if strings.Contains(alert.Project, "all") {
|
if strings.Contains(alert.Project, "all") {
|
||||||
err = processAllDisks(alert)
|
_ = processAllDisks(alert)
|
||||||
} else {
|
} else {
|
||||||
err = processSingleDisk(alert)
|
_ = processSingleDisk(alert)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func loadPanelLogin(alert dto.AlertDTO) {
|
func loadPanelLogin(alert dto.AlertDTO) {
|
||||||
count, isAlert, err := alertUtil.CountRecentFailedLoginLogs(alert.Cycle, alert.Count)
|
count, isAlert, err := alertUtil.CountRecentFailedLoginLogs(alert.Cycle, alert.Count)
|
||||||
alertType := alert.Type
|
|
||||||
quota := strconv.Itoa(count)
|
|
||||||
quotaType := strconv.Itoa(int(alert.Cycle))
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
global.LOG.Errorf("Failed to count recent failed login logs: %v", err)
|
global.LOG.Errorf("Failed to count recent failed login logs: %v", err)
|
||||||
}
|
}
|
||||||
if isAlert {
|
if isAlert {
|
||||||
alertType = "panelLogin"
|
|
||||||
quota = strconv.Itoa(count)
|
|
||||||
quotaType = "panelLogin"
|
|
||||||
params := []dto.Param{
|
params := []dto.Param{
|
||||||
{
|
{
|
||||||
Index: "1",
|
Index: "1",
|
||||||
@@ -454,7 +478,7 @@ func loadPanelLogin(alert dto.AlertDTO) {
|
|||||||
Value: "",
|
Value: "",
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
sendAlerts(alert, alertType, quota, quotaType, params)
|
sendAlerts(alert, "panelLogin", strconv.Itoa(count), "panelLogin", params)
|
||||||
}
|
}
|
||||||
|
|
||||||
whitelist := strings.Split(strings.TrimSpace(alert.AdvancedParams), "\n")
|
whitelist := strings.Split(strings.TrimSpace(alert.AdvancedParams), "\n")
|
||||||
@@ -462,16 +486,15 @@ func loadPanelLogin(alert dto.AlertDTO) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
global.LOG.Errorf("Failed to check recent failed ip login logs: %v", err)
|
global.LOG.Errorf("Failed to check recent failed ip login logs: %v", err)
|
||||||
}
|
}
|
||||||
|
records = filterLoginLogsNotInWhitelist(records, whitelist)
|
||||||
if len(records) > 0 {
|
if len(records) > 0 {
|
||||||
quota = strings.Join(func() []string {
|
quota := strings.Join(func() []string {
|
||||||
var ips []string
|
var ips []string
|
||||||
for _, r := range records {
|
for _, r := range records {
|
||||||
ips = append(ips, r.IP)
|
ips = append(ips, r.IP)
|
||||||
}
|
}
|
||||||
return ips
|
return ips
|
||||||
}(), "\n")
|
}(), "\n")
|
||||||
alertType = "panelIpLogin"
|
|
||||||
quotaType = "panelIpLogin"
|
|
||||||
params := []dto.Param{
|
params := []dto.Param{
|
||||||
{
|
{
|
||||||
Index: "1",
|
Index: "1",
|
||||||
@@ -484,22 +507,16 @@ func loadPanelLogin(alert dto.AlertDTO) {
|
|||||||
Value: " IP ",
|
Value: " IP ",
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
sendAlerts(alert, alertType, quota, quotaType, params)
|
sendAlerts(alert, "panelIpLogin", quota, "panelIpLogin", params)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func loadSSHLogin(alert dto.AlertDTO) {
|
func loadSSHLogin(alert dto.AlertDTO) {
|
||||||
count, isAlert, err := alertUtil.CountRecentFailedSSHLog(alert.Cycle, alert.Count)
|
count, isAlert, err := alertUtil.CountRecentFailedSSHLog(alert.Cycle, alert.Count)
|
||||||
alertType := alert.Type
|
|
||||||
quota := strconv.Itoa(count)
|
|
||||||
quotaType := strconv.Itoa(int(alert.Cycle))
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
global.LOG.Errorf("Failed to count recent failed ssh login logs: %v", err)
|
global.LOG.Errorf("Failed to count recent failed ssh login logs: %v", err)
|
||||||
}
|
}
|
||||||
if isAlert {
|
if isAlert {
|
||||||
alertType = "sshLogin"
|
|
||||||
quota = strconv.Itoa(count)
|
|
||||||
quotaType = "sshLogin"
|
|
||||||
params := []dto.Param{
|
params := []dto.Param{
|
||||||
{
|
{
|
||||||
Index: "1",
|
Index: "1",
|
||||||
@@ -512,17 +529,16 @@ func loadSSHLogin(alert dto.AlertDTO) {
|
|||||||
Value: "",
|
Value: "",
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
sendAlerts(alert, alertType, quota, quotaType, params)
|
sendAlerts(alert, "sshLogin", strconv.Itoa(count), "sshLogin", params)
|
||||||
}
|
}
|
||||||
whitelist := strings.Split(strings.TrimSpace(alert.AdvancedParams), "\n")
|
whitelist := strings.Split(strings.TrimSpace(alert.AdvancedParams), "\n")
|
||||||
records, err := alertUtil.FindRecentSuccessLoginNotInWhitelist(30, whitelist)
|
records, err := alertUtil.FindRecentSuccessLoginNotInWhitelist(30, whitelist)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
global.LOG.Errorf("Failed to check recent failed ip ssh login logs: %v", err)
|
global.LOG.Errorf("Failed to check recent failed ip ssh login logs: %v", err)
|
||||||
}
|
}
|
||||||
|
records = filterSSHLoginEntriesNotInWhitelist(records, whitelist)
|
||||||
if len(records) > 0 {
|
if len(records) > 0 {
|
||||||
quota = strings.Join(records, "\n")
|
quota := strings.Join(records, "\n")
|
||||||
alertType = "sshIpLogin"
|
|
||||||
quotaType = "sshIpLogin"
|
|
||||||
params := []dto.Param{
|
params := []dto.Param{
|
||||||
{
|
{
|
||||||
Index: "1",
|
Index: "1",
|
||||||
@@ -535,13 +551,67 @@ func loadSSHLogin(alert dto.AlertDTO) {
|
|||||||
Value: " IP ",
|
Value: " IP ",
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
sendAlerts(alert, alertType, quota, quotaType, params)
|
sendAlerts(alert, "sshIpLogin", quota, "sshIpLogin", params)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func filterLoginLogsNotInWhitelist(records []model.LoginLog, whitelist []string) []model.LoginLog {
|
||||||
|
filtered := make([]model.LoginLog, 0, len(records))
|
||||||
|
for _, record := range records {
|
||||||
|
if !isIPInWhitelist(record.IP, whitelist) {
|
||||||
|
filtered = append(filtered, record)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return filtered
|
||||||
|
}
|
||||||
|
|
||||||
|
func filterSSHLoginEntriesNotInWhitelist(records []string, whitelist []string) []string {
|
||||||
|
filtered := make([]string, 0, len(records))
|
||||||
|
for _, record := range records {
|
||||||
|
ip := record
|
||||||
|
if idx := strings.Index(record, "-"); idx >= 0 {
|
||||||
|
ip = record[:idx]
|
||||||
|
}
|
||||||
|
if !isIPInWhitelist(ip, whitelist) {
|
||||||
|
filtered = append(filtered, record)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return filtered
|
||||||
|
}
|
||||||
|
|
||||||
|
func isIPInWhitelist(ip string, whitelist []string) bool {
|
||||||
|
targetIP := net.ParseIP(strings.TrimSpace(ip))
|
||||||
|
if targetIP == nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
for _, item := range whitelist {
|
||||||
|
item = strings.TrimSpace(item)
|
||||||
|
if item == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if item == ip {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
if whiteIP := net.ParseIP(item); whiteIP != nil {
|
||||||
|
if whiteIP.Equal(targetIP) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
_, ipNet, err := net.ParseCIDR(item)
|
||||||
|
if err != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if ipNet.Contains(targetIP) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
func loadNodeException(alert dto.AlertDTO) {
|
func loadNodeException(alert dto.AlertDTO) {
|
||||||
// only master alert
|
// only master alert
|
||||||
failCount, err := xpack.GetNodeErrorAlert()
|
failCount, err := xpack.AlertProvider.GetNodeErrorAlert()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
global.LOG.Errorf("error getting node, err: %s", err)
|
global.LOG.Errorf("error getting node, err: %s", err)
|
||||||
return
|
return
|
||||||
@@ -570,7 +640,7 @@ func loadNodeException(alert dto.AlertDTO) {
|
|||||||
|
|
||||||
func loadLicenseException(alert dto.AlertDTO) {
|
func loadLicenseException(alert dto.AlertDTO) {
|
||||||
// only master alert
|
// only master alert
|
||||||
failCount, err := xpack.GetLicenseErrorAlert()
|
failCount, err := xpack.AlertProvider.GetLicenseErrorAlert()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
global.LOG.Errorf("error getting license, err: %s", err)
|
global.LOG.Errorf("error getting license, err: %s", err)
|
||||||
return
|
return
|
||||||
@@ -605,72 +675,139 @@ func sendAlerts(alert dto.AlertDTO, alertType, quota, quotaType string, params [
|
|||||||
if newDate.IsZero() || calculateMinutesDifference(newDate) > ResourceAlertInterval {
|
if newDate.IsZero() || calculateMinutesDifference(newDate) > ResourceAlertInterval {
|
||||||
for _, m := range methods {
|
for _, m := range methods {
|
||||||
m = strings.TrimSpace(m)
|
m = strings.TrimSpace(m)
|
||||||
switch m {
|
if configId, err := strconv.ParseUint(m, 10, 64); err == nil {
|
||||||
case constant.SMS:
|
sendAlertsByConfigId(alert, alertType, quota, quotaType, params, uint(configId))
|
||||||
if !alertUtil.CheckSMSSendLimit(constant.SMS) {
|
} else {
|
||||||
continue
|
sendAlertsByLegacyMethod(alert, alertType, quota, quotaType, params, m)
|
||||||
}
|
|
||||||
todayCount, isValid := canSendAlertToday(alertType, quotaType, alert.SendCount, constant.SMS)
|
|
||||||
if !isValid {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
create := dto.AlertLogCreate{
|
|
||||||
Type: alertType,
|
|
||||||
AlertId: alert.ID,
|
|
||||||
Count: todayCount + 1,
|
|
||||||
}
|
|
||||||
alertErr := xpack.CreateSMSAlertLog(alertType, alert, create, quotaType, params, constant.SMS)
|
|
||||||
if alertErr != nil {
|
|
||||||
global.LOG.Infof("%s alert sms push faild, err: %v", alertType, alertErr.Error())
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
alertUtil.CreateNewAlertTask(quota, alertType, quotaType, constant.SMS)
|
|
||||||
case constant.Email:
|
|
||||||
todayCount, isValid := canSendAlertToday(alertType, quotaType, alert.SendCount, constant.Email)
|
|
||||||
if !isValid {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
create := dto.AlertLogCreate{
|
|
||||||
Type: alertType,
|
|
||||||
AlertId: alert.ID,
|
|
||||||
Count: todayCount + 1,
|
|
||||||
}
|
|
||||||
alertInfo := alert
|
|
||||||
alertInfo.Type = alertType
|
|
||||||
create.AlertRule = alertUtil.ProcessAlertRule(alert)
|
|
||||||
create.AlertDetail = alertUtil.ProcessAlertDetail(alertInfo, quotaType, params, constant.Email)
|
|
||||||
transport := xpack.LoadRequestTransport()
|
|
||||||
agentInfo, _ := xpack.GetAgentInfo()
|
|
||||||
alertErr := alertUtil.CreateEmailAlertLog(create, alertInfo, params, transport, agentInfo)
|
|
||||||
if alertErr != nil {
|
|
||||||
global.LOG.Infof("%s alert email push faild, err: %v", alertType, alertErr.Error())
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
alertUtil.CreateNewAlertTask(quota, alertType, quotaType, constant.Email)
|
|
||||||
case constant.WeCom, constant.DingTalk, constant.FeiShu:
|
|
||||||
todayCount, isValid := canSendAlertToday(alertType, quotaType, alert.SendCount, m)
|
|
||||||
if !isValid {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
var create = dto.AlertLogCreate{
|
|
||||||
Type: alertUtil.GetCronJobType(alert.Type),
|
|
||||||
AlertId: alert.ID,
|
|
||||||
Count: todayCount + 1,
|
|
||||||
}
|
|
||||||
transport := xpack.LoadRequestTransport()
|
|
||||||
agentInfo, _ := xpack.GetAgentInfo()
|
|
||||||
err := xpack.CreateWebhookAlertLog(alertType, alert, create, quotaType, params, m, transport, agentInfo)
|
|
||||||
if err != nil {
|
|
||||||
global.LOG.Infof("%s alert webhook %s push faild, err: %v", alertType, m, err)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
alertUtil.CreateNewAlertTask(quota, alertType, quotaType, m)
|
|
||||||
default:
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func sendAlertsByConfigId(alert dto.AlertDTO, alertType, quota, quotaType string, params []dto.Param, configId uint) {
|
||||||
|
config, err := alertRepo.GetConfigById(configId)
|
||||||
|
if err != nil {
|
||||||
|
global.LOG.Errorf("alert config not found for id %d: %v", configId, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
doSendAlert(alert, alertType, quota, quotaType, params, config)
|
||||||
|
}
|
||||||
|
|
||||||
|
func sendAlertsByLegacyMethod(alert dto.AlertDTO, alertType, quota, quotaType string, params []dto.Param, method string) {
|
||||||
|
typeMap := map[string]string{
|
||||||
|
"mail": constant.Email,
|
||||||
|
constant.Bark: constant.Bark,
|
||||||
|
constant.SMS: constant.SMS,
|
||||||
|
}
|
||||||
|
configType, ok := typeMap[method]
|
||||||
|
if !ok {
|
||||||
|
configType = method
|
||||||
|
}
|
||||||
|
config, err := alertRepo.GetConfig(alertRepo.WithByType(configType))
|
||||||
|
if err != nil {
|
||||||
|
global.LOG.Errorf("alert config not found for type %s: %v", configType, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
doSendAlert(alert, alertType, quota, quotaType, params, config)
|
||||||
|
}
|
||||||
|
|
||||||
|
func doSendAlert(alert dto.AlertDTO, alertType, quota, quotaType string, params []dto.Param, config model.AlertConfig) {
|
||||||
|
if !alertUtil.IsAlertConfigEnabled(config) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
methodStr := strconv.Itoa(int(config.ID))
|
||||||
|
switch config.Type {
|
||||||
|
case constant.SMS:
|
||||||
|
if !alertUtil.CheckSMSSendLimit(config, methodStr) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
todayCount, isValid := canSendAlertToday(alertType, quotaType, alert.SendCount, methodStr)
|
||||||
|
if !isValid {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
create := dto.AlertLogCreate{
|
||||||
|
Type: alertType,
|
||||||
|
AlertId: alert.ID,
|
||||||
|
Count: todayCount + 1,
|
||||||
|
Method: methodStr,
|
||||||
|
}
|
||||||
|
alertErr := xpack.AlertProvider.CreateSMSAlertLog(alertType, alert, create, quotaType, params, config, methodStr)
|
||||||
|
if alertErr != nil {
|
||||||
|
global.LOG.Infof("%s alert sms push faild, err: %v", alertType, alertErr.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
alertUtil.CreateNewAlertTask(quota, alertType, quotaType, methodStr)
|
||||||
|
|
||||||
|
case constant.Email:
|
||||||
|
todayCount, isValid := canSendAlertToday(alertType, quotaType, alert.SendCount, methodStr)
|
||||||
|
if !isValid {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
create := dto.AlertLogCreate{
|
||||||
|
Type: alertType,
|
||||||
|
AlertId: alert.ID,
|
||||||
|
Count: todayCount + 1,
|
||||||
|
Method: methodStr,
|
||||||
|
}
|
||||||
|
alertInfo := alert
|
||||||
|
alertInfo.Type = alertType
|
||||||
|
create.AlertRule = alertUtil.ProcessAlertRule(alert)
|
||||||
|
create.AlertDetail = alertUtil.ProcessAlertDetail(alertInfo, quotaType, params, constant.Email)
|
||||||
|
transport := xpack.MultiNodeProvider.LoadRequestTransport()
|
||||||
|
agentInfo, _ := xpack.MultiNodeProvider.GetAgentInfo()
|
||||||
|
alertErr := alertUtil.CreateEmailAlertLog(create, alertInfo, params, transport, agentInfo, config)
|
||||||
|
if alertErr != nil {
|
||||||
|
global.LOG.Infof("%s alert email push faild, err: %v", alertType, alertErr.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
alertUtil.CreateNewAlertTask(quota, alertType, quotaType, methodStr)
|
||||||
|
|
||||||
|
case constant.Bark:
|
||||||
|
todayCount, isValid := canSendAlertToday(alertType, quotaType, alert.SendCount, methodStr)
|
||||||
|
if !isValid {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
create := dto.AlertLogCreate{
|
||||||
|
Type: alertType,
|
||||||
|
AlertId: alert.ID,
|
||||||
|
Count: todayCount + 1,
|
||||||
|
Method: methodStr,
|
||||||
|
}
|
||||||
|
alertInfo := alert
|
||||||
|
alertInfo.Type = alertType
|
||||||
|
create.AlertRule = alertUtil.ProcessAlertRule(alert)
|
||||||
|
create.AlertDetail = alertUtil.ProcessAlertDetail(alertInfo, quotaType, params, constant.Bark)
|
||||||
|
transport := xpack.MultiNodeProvider.LoadRequestTransport()
|
||||||
|
agentInfo, _ := xpack.MultiNodeProvider.GetAgentInfo()
|
||||||
|
alertErr := alertUtil.CreateBarkAlertLog(create, alertInfo, params, transport, agentInfo, config)
|
||||||
|
if alertErr != nil {
|
||||||
|
global.LOG.Infof("%s alert %s push failed, err: %v", alertType, methodStr, alertErr.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
alertUtil.CreateNewAlertTask(quota, alertType, quotaType, methodStr)
|
||||||
|
|
||||||
|
case constant.WeCom, constant.DingTalk, constant.FeiShu:
|
||||||
|
todayCount, isValid := canSendAlertToday(alertType, quotaType, alert.SendCount, methodStr)
|
||||||
|
if !isValid {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
create := dto.AlertLogCreate{
|
||||||
|
Type: alertType,
|
||||||
|
AlertId: alert.ID,
|
||||||
|
Count: todayCount + 1,
|
||||||
|
Method: methodStr,
|
||||||
|
}
|
||||||
|
transport := xpack.MultiNodeProvider.LoadRequestTransport()
|
||||||
|
agentInfo, _ := xpack.MultiNodeProvider.GetAgentInfo()
|
||||||
|
alertErr := xpack.AlertProvider.CreateWebhookAlertLog(alertType, alert, create, quotaType, params, config, transport, agentInfo)
|
||||||
|
if alertErr != nil {
|
||||||
|
global.LOG.Infof("%s alert webhook %s push faild, err: %v", alertType, methodStr, alertErr)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
alertUtil.CreateNewAlertTask(quota, alertType, quotaType, methodStr)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// ------------------------------
|
// ------------------------------
|
||||||
func getRepoOptionsByProject(project string) []repo.DBOption {
|
func getRepoOptionsByProject(project string) []repo.DBOption {
|
||||||
var opts []repo.DBOption
|
var opts []repo.DBOption
|
||||||
@@ -894,7 +1031,7 @@ func processAllDisks(alert dto.AlertDTO) error {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
errMsg := fmt.Sprintf("disk path %s process failed: %v", item.Path, err)
|
errMsg := fmt.Sprintf("disk path %s process failed: %v", item.Path, err)
|
||||||
errMsgs = append(errMsgs, errMsg)
|
errMsgs = append(errMsgs, errMsg)
|
||||||
global.LOG.Errorf(errMsg)
|
global.LOG.Errorf("%s", errMsg)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -907,7 +1044,7 @@ func processAllDisks(alert dto.AlertDTO) error {
|
|||||||
func processSingleDisk(alert dto.AlertDTO) error {
|
func processSingleDisk(alert dto.AlertDTO) error {
|
||||||
err := checkAndCreateDiskAlert(alert, alert.Project)
|
err := checkAndCreateDiskAlert(alert, alert.Project)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
global.LOG.Errorf(err.Error())
|
global.LOG.Errorf("%s", err.Error())
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
|
|||||||
@@ -1,12 +1,16 @@
|
|||||||
package service
|
package service
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
|
||||||
"github.com/1Panel-dev/1Panel/agent/app/dto"
|
"github.com/1Panel-dev/1Panel/agent/app/dto"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/model"
|
||||||
|
"github.com/1Panel-dev/1Panel/agent/app/repo"
|
||||||
"github.com/1Panel-dev/1Panel/agent/constant"
|
"github.com/1Panel-dev/1Panel/agent/constant"
|
||||||
"github.com/1Panel-dev/1Panel/agent/global"
|
"github.com/1Panel-dev/1Panel/agent/global"
|
||||||
alertUtil "github.com/1Panel-dev/1Panel/agent/utils/alert"
|
alertUtil "github.com/1Panel-dev/1Panel/agent/utils/alert"
|
||||||
"github.com/1Panel-dev/1Panel/agent/utils/xpack"
|
"github.com/1Panel-dev/1Panel/agent/utils/xpack"
|
||||||
"strings"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type AlertSender struct {
|
type AlertSender struct {
|
||||||
@@ -22,41 +26,92 @@ func NewAlertSender(alert dto.AlertDTO, quotaType string) *AlertSender {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (s *AlertSender) Send(quota string, params []dto.Param) {
|
func (s *AlertSender) Send(quota string, params []dto.Param) {
|
||||||
methods := strings.Split(s.alert.Method, ",")
|
s.sendByConfigIds(s.alert.Method, quota, params, false)
|
||||||
for _, method := range methods {
|
|
||||||
method = strings.TrimSpace(method)
|
|
||||||
switch method {
|
|
||||||
case constant.SMS:
|
|
||||||
s.sendSMS(quota, params)
|
|
||||||
case constant.Email:
|
|
||||||
s.sendEmail(quota, params)
|
|
||||||
case constant.WeCom, constant.DingTalk, constant.FeiShu:
|
|
||||||
s.sendWebhook(quota, params, method)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *AlertSender) ResourceSend(quota string, params []dto.Param) {
|
func (s *AlertSender) ResourceSend(quota string, params []dto.Param) {
|
||||||
methods := strings.Split(s.alert.Method, ",")
|
s.sendByConfigIds(s.alert.Method, quota, params, true)
|
||||||
for _, method := range methods {
|
}
|
||||||
method = strings.TrimSpace(method)
|
|
||||||
switch method {
|
func (s *AlertSender) sendByConfigIds(methodStr string, quota string, params []dto.Param, isResource bool) {
|
||||||
case constant.SMS:
|
alertRepo := repo.NewIAlertRepo()
|
||||||
s.sendResourceSMS(quota, params)
|
configIds := strings.Split(methodStr, ",")
|
||||||
case constant.Email:
|
for _, idStr := range configIds {
|
||||||
s.sendResourceEmail(quota, params)
|
idStr = strings.TrimSpace(idStr)
|
||||||
case constant.WeCom, constant.DingTalk, constant.FeiShu:
|
configId, err := strconv.ParseUint(idStr, 10, 64)
|
||||||
s.sendResourceWebhook(quota, params, method)
|
if err != nil {
|
||||||
|
s.sendByLegacyMethod(idStr, quota, params, isResource)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
config, err := alertRepo.GetConfigById(uint(configId))
|
||||||
|
if err != nil {
|
||||||
|
global.LOG.Errorf("alert config not found for id %d: %v", configId, err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
s.sendByConfig(config, quota, params, isResource)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *AlertSender) sendByConfig(config model.AlertConfig, quota string, params []dto.Param, isResource bool) {
|
||||||
|
if !alertUtil.IsAlertConfigEnabled(config) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
switch config.Type {
|
||||||
|
case constant.SMS:
|
||||||
|
if isResource {
|
||||||
|
s.sendResourceSMSWithConfig(config, quota, params)
|
||||||
|
} else {
|
||||||
|
s.sendSMSWithConfig(config, quota, params)
|
||||||
|
}
|
||||||
|
case constant.Email:
|
||||||
|
if isResource {
|
||||||
|
s.sendResourceEmailWithConfig(config, quota, params)
|
||||||
|
} else {
|
||||||
|
s.sendEmailWithConfig(config, quota, params)
|
||||||
|
}
|
||||||
|
case constant.Bark:
|
||||||
|
if isResource {
|
||||||
|
s.sendResourceBarkWithConfig(config, quota, params)
|
||||||
|
} else {
|
||||||
|
s.sendBarkWithConfig(config, quota, params)
|
||||||
|
}
|
||||||
|
case constant.WeCom, constant.DingTalk, constant.FeiShu:
|
||||||
|
if isResource {
|
||||||
|
s.sendResourceWebhookWithConfig(config, quota, params)
|
||||||
|
} else {
|
||||||
|
s.sendWebhookWithConfig(config, quota, params)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *AlertSender) sendSMS(quota string, params []dto.Param) {
|
func (s *AlertSender) sendByLegacyMethod(method string, quota string, params []dto.Param, isResource bool) {
|
||||||
if !alertUtil.CheckSMSSendLimit(constant.SMS) {
|
alertRepo := repo.NewIAlertRepo()
|
||||||
|
typeMap := map[string]string{"mail": constant.Email, constant.Bark: constant.Bark, constant.SMS: constant.SMS}
|
||||||
|
configType := method
|
||||||
|
if mapped, ok := typeMap[method]; ok {
|
||||||
|
configType = mapped
|
||||||
|
}
|
||||||
|
config, err := alertRepo.GetConfig(alertRepo.WithByType(configType))
|
||||||
|
if err != nil {
|
||||||
|
global.LOG.Errorf("alert config not found for type %s: %v", configType, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if !alertUtil.IsAlertConfigEnabled(config) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
s.sendByConfig(config, quota, params, isResource)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *AlertSender) sendSMSWithConfig(config model.AlertConfig, quota string, params []dto.Param) {
|
||||||
|
if !alertUtil.IsAlertConfigEnabled(config) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
method := strconv.Itoa(int(config.ID))
|
||||||
|
if !alertUtil.CheckSMSSendLimit(config, method) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
totalCount, isValid := s.canSendAlert(constant.SMS)
|
totalCount, isValid := s.canSendAlert(method)
|
||||||
if !isValid {
|
if !isValid {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -66,18 +121,31 @@ func (s *AlertSender) sendSMS(quota string, params []dto.Param) {
|
|||||||
Count: totalCount + 1,
|
Count: totalCount + 1,
|
||||||
AlertId: s.alert.ID,
|
AlertId: s.alert.ID,
|
||||||
Type: s.alert.Type,
|
Type: s.alert.Type,
|
||||||
|
Method: method,
|
||||||
}
|
}
|
||||||
|
|
||||||
err := xpack.CreateSMSAlertLog(s.alert.Type, s.alert, create, quota, params, constant.SMS)
|
err := xpack.AlertProvider.CreateSMSAlertLog(s.alert.Type, s.alert, create, quota, params, config, method)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
global.LOG.Errorf("%s alert sms push failed: %v", s.alert.Type, err)
|
global.LOG.Errorf("%s alert sms push failed: %v", s.alert.Type, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
alertUtil.CreateNewAlertTask(quota, s.alert.Type, s.quotaType, constant.SMS)
|
alertUtil.CreateNewAlertTask(quota, s.alert.Type, s.quotaType, method)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *AlertSender) sendEmail(quota string, params []dto.Param) {
|
func (s *AlertSender) sendSMS(quota string, params []dto.Param) {
|
||||||
totalCount, isValid := s.canSendAlert(constant.Email)
|
alertRepo := repo.NewIAlertRepo()
|
||||||
|
config, err := alertRepo.GetConfig(alertRepo.WithByType(constant.SMS))
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
s.sendSMSWithConfig(config, quota, params)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *AlertSender) sendEmailWithConfig(config model.AlertConfig, quota string, params []dto.Param) {
|
||||||
|
if !alertUtil.IsAlertConfigEnabled(config) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
totalCount, isValid := s.canSendAlert(strconv.Itoa(int(config.ID)))
|
||||||
if !isValid {
|
if !isValid {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -89,66 +157,24 @@ func (s *AlertSender) sendEmail(quota string, params []dto.Param) {
|
|||||||
Type: s.alert.Type,
|
Type: s.alert.Type,
|
||||||
AlertRule: alertUtil.ProcessAlertRule(s.alert),
|
AlertRule: alertUtil.ProcessAlertRule(s.alert),
|
||||||
AlertDetail: alertUtil.ProcessAlertDetail(s.alert, quota, params, constant.Email),
|
AlertDetail: alertUtil.ProcessAlertDetail(s.alert, quota, params, constant.Email),
|
||||||
|
Method: strconv.Itoa(int(config.ID)),
|
||||||
}
|
}
|
||||||
|
|
||||||
transport := xpack.LoadRequestTransport()
|
transport := xpack.MultiNodeProvider.LoadRequestTransport()
|
||||||
agentInfo, _ := xpack.GetAgentInfo()
|
agentInfo, _ := xpack.MultiNodeProvider.GetAgentInfo()
|
||||||
err := alertUtil.CreateEmailAlertLog(create, s.alert, params, transport, agentInfo)
|
err := alertUtil.CreateEmailAlertLog(create, s.alert, params, transport, agentInfo, config)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
global.LOG.Errorf("%s alert email push failed: %v", s.alert.Type, err)
|
global.LOG.Errorf("%s alert email push failed: %v", s.alert.Type, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
alertUtil.CreateNewAlertTask(quota, s.alert.Type, s.quotaType, constant.Email)
|
alertUtil.CreateNewAlertTask(quota, s.alert.Type, s.quotaType, strconv.Itoa(int(config.ID)))
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *AlertSender) sendWebhook(quota string, params []dto.Param, method string) {
|
func (s *AlertSender) sendResourceEmailWithConfig(config model.AlertConfig, quota string, params []dto.Param) {
|
||||||
totalCount, isValid := s.canSendAlert(method)
|
if !alertUtil.IsAlertConfigEnabled(config) {
|
||||||
if !isValid {
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
todayCount, isValid := s.canResourceSendAlert(strconv.Itoa(int(config.ID)))
|
||||||
create := dto.AlertLogCreate{
|
|
||||||
Status: constant.AlertSuccess,
|
|
||||||
Count: totalCount + 1,
|
|
||||||
AlertId: s.alert.ID,
|
|
||||||
Type: s.alert.Type,
|
|
||||||
}
|
|
||||||
transport := xpack.LoadRequestTransport()
|
|
||||||
agentInfo, _ := xpack.GetAgentInfo()
|
|
||||||
err := xpack.CreateWebhookAlertLog(s.alert.Type, s.alert, create, quota, params, method, transport, agentInfo)
|
|
||||||
if err != nil {
|
|
||||||
global.LOG.Errorf("%s alert %s webhook push failed: %v", s.alert.Type, method, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
alertUtil.CreateNewAlertTask(quota, s.alert.Type, s.quotaType, method)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *AlertSender) sendResourceSMS(quota string, params []dto.Param) {
|
|
||||||
if !alertUtil.CheckSMSSendLimit(constant.SMS) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
todayCount, isValid := s.canResourceSendAlert(constant.SMS)
|
|
||||||
if !isValid {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
create := dto.AlertLogCreate{
|
|
||||||
Status: constant.AlertSuccess,
|
|
||||||
Count: todayCount + 1,
|
|
||||||
AlertId: s.alert.ID,
|
|
||||||
Type: s.alert.Type,
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := xpack.CreateSMSAlertLog(s.alert.Type, s.alert, create, quota, params, constant.SMS); err != nil {
|
|
||||||
global.LOG.Errorf("failed to send SMS alert: %v", err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
alertUtil.CreateNewAlertTask(quota, s.alert.Type, s.quotaType, constant.SMS)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *AlertSender) sendResourceEmail(quota string, params []dto.Param) {
|
|
||||||
todayCount, isValid := s.canResourceSendAlert(constant.Email)
|
|
||||||
if !isValid {
|
if !isValid {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -160,18 +186,189 @@ func (s *AlertSender) sendResourceEmail(quota string, params []dto.Param) {
|
|||||||
Type: s.alert.Type,
|
Type: s.alert.Type,
|
||||||
AlertRule: alertUtil.ProcessAlertRule(s.alert),
|
AlertRule: alertUtil.ProcessAlertRule(s.alert),
|
||||||
AlertDetail: alertUtil.ProcessAlertDetail(s.alert, quota, params, constant.Email),
|
AlertDetail: alertUtil.ProcessAlertDetail(s.alert, quota, params, constant.Email),
|
||||||
|
Method: strconv.Itoa(int(config.ID)),
|
||||||
}
|
}
|
||||||
|
|
||||||
transport := xpack.LoadRequestTransport()
|
transport := xpack.MultiNodeProvider.LoadRequestTransport()
|
||||||
agentInfo, _ := xpack.GetAgentInfo()
|
agentInfo, _ := xpack.MultiNodeProvider.GetAgentInfo()
|
||||||
if err := alertUtil.CreateEmailAlertLog(create, s.alert, params, transport, agentInfo); err != nil {
|
if err := alertUtil.CreateEmailAlertLog(create, s.alert, params, transport, agentInfo, config); err != nil {
|
||||||
global.LOG.Errorf("failed to send Email alert: %v", err)
|
global.LOG.Errorf("failed to send Email alert: %v", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
alertUtil.CreateNewAlertTask(quota, s.alert.Type, s.quotaType, constant.Email)
|
alertUtil.CreateNewAlertTask(quota, s.alert.Type, s.quotaType, strconv.Itoa(int(config.ID)))
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *AlertSender) sendEmail(quota string, params []dto.Param) {
|
||||||
|
alertRepo := repo.NewIAlertRepo()
|
||||||
|
config, err := alertRepo.GetConfig(alertRepo.WithByType(constant.EmailConfig))
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
s.sendEmailWithConfig(config, quota, params)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *AlertSender) sendResourceEmail(quota string, params []dto.Param) {
|
||||||
|
alertRepo := repo.NewIAlertRepo()
|
||||||
|
config, err := alertRepo.GetConfig(alertRepo.WithByType(constant.EmailConfig))
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
s.sendResourceEmailWithConfig(config, quota, params)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *AlertSender) sendBarkWithConfig(config model.AlertConfig, quota string, params []dto.Param) {
|
||||||
|
if !alertUtil.IsAlertConfigEnabled(config) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
totalCount, isValid := s.canSendAlert(strconv.Itoa(int(config.ID)))
|
||||||
|
if !isValid {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
create := dto.AlertLogCreate{
|
||||||
|
Status: constant.AlertSuccess,
|
||||||
|
Count: totalCount + 1,
|
||||||
|
AlertId: s.alert.ID,
|
||||||
|
Type: s.alert.Type,
|
||||||
|
AlertRule: alertUtil.ProcessAlertRule(s.alert),
|
||||||
|
AlertDetail: alertUtil.ProcessAlertDetail(s.alert, quota, params, constant.Bark),
|
||||||
|
Method: strconv.Itoa(int(config.ID)),
|
||||||
|
}
|
||||||
|
|
||||||
|
transport := xpack.MultiNodeProvider.LoadRequestTransport()
|
||||||
|
agentInfo, _ := xpack.MultiNodeProvider.GetAgentInfo()
|
||||||
|
err := alertUtil.CreateBarkAlertLog(create, s.alert, params, transport, agentInfo, config)
|
||||||
|
if err != nil {
|
||||||
|
global.LOG.Errorf("%s alert bark push failed: %v", s.alert.Type, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
alertUtil.CreateNewAlertTask(quota, s.alert.Type, s.quotaType, strconv.Itoa(int(config.ID)))
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *AlertSender) sendResourceBarkWithConfig(config model.AlertConfig, quota string, params []dto.Param) {
|
||||||
|
if !alertUtil.IsAlertConfigEnabled(config) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
todayCount, isValid := s.canResourceSendAlert(strconv.Itoa(int(config.ID)))
|
||||||
|
if !isValid {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
create := dto.AlertLogCreate{
|
||||||
|
Status: constant.AlertSuccess,
|
||||||
|
Count: todayCount + 1,
|
||||||
|
AlertId: s.alert.ID,
|
||||||
|
Type: s.alert.Type,
|
||||||
|
AlertRule: alertUtil.ProcessAlertRule(s.alert),
|
||||||
|
AlertDetail: alertUtil.ProcessAlertDetail(s.alert, quota, params, constant.Bark),
|
||||||
|
Method: strconv.Itoa(int(config.ID)),
|
||||||
|
}
|
||||||
|
|
||||||
|
transport := xpack.MultiNodeProvider.LoadRequestTransport()
|
||||||
|
agentInfo, _ := xpack.MultiNodeProvider.GetAgentInfo()
|
||||||
|
if err := alertUtil.CreateBarkAlertLog(create, s.alert, params, transport, agentInfo, config); err != nil {
|
||||||
|
global.LOG.Errorf("failed to send Bark alert: %v", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
alertUtil.CreateNewAlertTask(quota, s.alert.Type, s.quotaType, strconv.Itoa(int(config.ID)))
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *AlertSender) sendBark(quota string, params []dto.Param) {
|
||||||
|
alertRepo := repo.NewIAlertRepo()
|
||||||
|
config, err := alertRepo.GetConfig(alertRepo.WithByType(constant.Bark))
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
s.sendBarkWithConfig(config, quota, params)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *AlertSender) sendResourceBark(quota string, params []dto.Param) {
|
||||||
|
alertRepo := repo.NewIAlertRepo()
|
||||||
|
config, err := alertRepo.GetConfig(alertRepo.WithByType(constant.Bark))
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
s.sendResourceBarkWithConfig(config, quota, params)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *AlertSender) sendWebhookWithConfig(config model.AlertConfig, quota string, params []dto.Param) {
|
||||||
|
if !alertUtil.IsAlertConfigEnabled(config) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
totalCount, isValid := s.canSendAlert(strconv.Itoa(int(config.ID)))
|
||||||
|
if !isValid {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
create := dto.AlertLogCreate{
|
||||||
|
Status: constant.AlertSuccess,
|
||||||
|
Count: totalCount + 1,
|
||||||
|
AlertId: s.alert.ID,
|
||||||
|
Type: s.alert.Type,
|
||||||
|
Method: strconv.Itoa(int(config.ID)),
|
||||||
|
}
|
||||||
|
transport := xpack.MultiNodeProvider.LoadRequestTransport()
|
||||||
|
agentInfo, _ := xpack.MultiNodeProvider.GetAgentInfo()
|
||||||
|
err := xpack.AlertProvider.CreateWebhookAlertLog(s.alert.Type, s.alert, create, quota, params, config, transport, agentInfo)
|
||||||
|
if err != nil {
|
||||||
|
global.LOG.Errorf("%s alert %s webhook push failed: %v", s.alert.Type, config.Type, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
alertUtil.CreateNewAlertTask(quota, s.alert.Type, s.quotaType, strconv.Itoa(int(config.ID)))
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *AlertSender) sendResourceWebhookWithConfig(config model.AlertConfig, quota string, params []dto.Param) {
|
||||||
|
if !alertUtil.IsAlertConfigEnabled(config) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
todayCount, isValid := s.canResourceSendAlert(strconv.Itoa(int(config.ID)))
|
||||||
|
if !isValid {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
create := dto.AlertLogCreate{
|
||||||
|
Status: constant.AlertSuccess,
|
||||||
|
Count: todayCount + 1,
|
||||||
|
AlertId: s.alert.ID,
|
||||||
|
Type: s.alert.Type,
|
||||||
|
Method: strconv.Itoa(int(config.ID)),
|
||||||
|
}
|
||||||
|
transport := xpack.MultiNodeProvider.LoadRequestTransport()
|
||||||
|
agentInfo, _ := xpack.MultiNodeProvider.GetAgentInfo()
|
||||||
|
if err := xpack.AlertProvider.CreateWebhookAlertLog(s.alert.Type, s.alert, create, quota, params, config, transport, agentInfo); err != nil {
|
||||||
|
global.LOG.Errorf("%s alert %s webhook push failed: %v", s.alert.Type, config.Type, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
alertUtil.CreateNewAlertTask(quota, s.alert.Type, s.quotaType, strconv.Itoa(int(config.ID)))
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *AlertSender) sendWebhook(quota string, params []dto.Param, method string) {
|
||||||
|
alertRepo := repo.NewIAlertRepo()
|
||||||
|
config, err := alertRepo.GetConfig(alertRepo.WithByType(method))
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
s.sendWebhookWithConfig(config, quota, params)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *AlertSender) sendResourceWebhook(quota string, params []dto.Param, method string) {
|
func (s *AlertSender) sendResourceWebhook(quota string, params []dto.Param, method string) {
|
||||||
|
alertRepo := repo.NewIAlertRepo()
|
||||||
|
config, err := alertRepo.GetConfig(alertRepo.WithByType(method))
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
s.sendResourceWebhookWithConfig(config, quota, params)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *AlertSender) sendResourceSMSWithConfig(config model.AlertConfig, quota string, params []dto.Param) {
|
||||||
|
if !alertUtil.IsAlertConfigEnabled(config) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
method := strconv.Itoa(int(config.ID))
|
||||||
|
if !alertUtil.CheckSMSSendLimit(config, method) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
todayCount, isValid := s.canResourceSendAlert(method)
|
todayCount, isValid := s.canResourceSendAlert(method)
|
||||||
if !isValid {
|
if !isValid {
|
||||||
return
|
return
|
||||||
@@ -182,16 +379,25 @@ func (s *AlertSender) sendResourceWebhook(quota string, params []dto.Param, meth
|
|||||||
Count: todayCount + 1,
|
Count: todayCount + 1,
|
||||||
AlertId: s.alert.ID,
|
AlertId: s.alert.ID,
|
||||||
Type: s.alert.Type,
|
Type: s.alert.Type,
|
||||||
|
Method: method,
|
||||||
}
|
}
|
||||||
transport := xpack.LoadRequestTransport()
|
|
||||||
agentInfo, _ := xpack.GetAgentInfo()
|
if err := xpack.AlertProvider.CreateSMSAlertLog(s.alert.Type, s.alert, create, quota, params, config, method); err != nil {
|
||||||
if err := xpack.CreateWebhookAlertLog(s.alert.Type, s.alert, create, quota, params, method, transport, agentInfo); err != nil {
|
global.LOG.Errorf("failed to send SMS alert: %v", err)
|
||||||
global.LOG.Errorf("%s alert %s webhook push failed: %v", s.alert.Type, method, err)
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
alertUtil.CreateNewAlertTask(quota, s.alert.Type, s.quotaType, method)
|
alertUtil.CreateNewAlertTask(quota, s.alert.Type, s.quotaType, method)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (s *AlertSender) sendResourceSMS(quota string, params []dto.Param) {
|
||||||
|
alertRepo := repo.NewIAlertRepo()
|
||||||
|
config, err := alertRepo.GetConfig(alertRepo.WithByType(constant.SMSConfig))
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
s.sendResourceSMSWithConfig(config, quota, params)
|
||||||
|
}
|
||||||
|
|
||||||
func (s *AlertSender) canSendAlert(method string) (uint, bool) {
|
func (s *AlertSender) canSendAlert(method string) (uint, bool) {
|
||||||
todayCount, totalCount, err := alertRepo.LoadTaskCount(s.alert.Type, s.quotaType, method)
|
todayCount, totalCount, err := alertRepo.LoadTaskCount(s.alert.Type, s.quotaType, method)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ import (
|
|||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
|
|
||||||
@@ -57,6 +58,10 @@ type IAppService interface {
|
|||||||
GetAppDetailByKey(appKey, version string) (response.AppDetailSimpleDTO, error)
|
GetAppDetailByKey(appKey, version string) (response.AppDetailSimpleDTO, error)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type appInstallHooks struct {
|
||||||
|
AfterCopyData func(appInstall *model.AppInstall) error
|
||||||
|
}
|
||||||
|
|
||||||
func NewIAppService() IAppService {
|
func NewIAppService() IAppService {
|
||||||
return &AppService{}
|
return &AppService{}
|
||||||
}
|
}
|
||||||
@@ -121,7 +126,7 @@ func (a AppService) PageApp(ctx *gin.Context, req request.AppSearch) (*response.
|
|||||||
lang := strings.ToLower(common.GetLang(ctx))
|
lang := strings.ToLower(common.GetLang(ctx))
|
||||||
for _, ap := range apps {
|
for _, ap := range apps {
|
||||||
if req.Type == "php" {
|
if req.Type == "php" {
|
||||||
if !global.CONF.Base.IsOffLine && (ap.RequiredPanelVersion == 0 || !common.CompareAppVersion(common.GetSystemVersion(info.SystemVersion), fmt.Sprintf("%f", ap.RequiredPanelVersion))) {
|
if !global.CONF.Base.IsOffline && (ap.RequiredPanelVersion == 0 || !common.CompareAppVersion(common.GetSystemVersion(info.SystemVersion), fmt.Sprintf("%f", ap.RequiredPanelVersion))) {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -340,6 +345,10 @@ func (a AppService) GetAppDetailByID(id uint) (*response.AppDetailDTO, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (a AppService) Install(req request.AppInstallCreate, executeScript bool) (appInstall *model.AppInstall, err error) {
|
func (a AppService) Install(req request.AppInstallCreate, executeScript bool) (appInstall *model.AppInstall, err error) {
|
||||||
|
return a.installWithHooks(req, executeScript, nil)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a AppService) installWithHooks(req request.AppInstallCreate, executeScript bool, hooks *appInstallHooks) (appInstall *model.AppInstall, err error) {
|
||||||
if err = docker.CreateDefaultDockerNetwork(); err != nil {
|
if err = docker.CreateDefaultDockerNetwork(); err != nil {
|
||||||
err = buserr.WithDetail("Err1PanelNetworkFailed", err.Error(), nil)
|
err = buserr.WithDetail("Err1PanelNetworkFailed", err.Error(), nil)
|
||||||
return
|
return
|
||||||
@@ -537,6 +546,11 @@ func (a AppService) Install(req request.AppInstallCreate, executeScript bool) (a
|
|||||||
if err = copyData(t, app, appDetail, appInstall, req); err != nil {
|
if err = copyData(t, app, appDetail, appInstall, req); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
if hooks != nil && hooks.AfterCopyData != nil {
|
||||||
|
if err = hooks.AfterCopyData(appInstall); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
if executeScript {
|
if executeScript {
|
||||||
if err = runScript(t, appInstall, "init"); err != nil {
|
if err = runScript(t, appInstall, "init"); err != nil {
|
||||||
return err
|
return err
|
||||||
@@ -563,7 +577,7 @@ func (a AppService) Install(req request.AppInstallCreate, executeScript bool) (a
|
|||||||
_ = appInstallRepo.Save(context.Background(), appInstall)
|
_ = appInstallRepo.Save(context.Background(), appInstall)
|
||||||
}
|
}
|
||||||
|
|
||||||
installTask.AddSubTask(task.GetTaskName(appInstall.Name, task.TaskInstall, task.TaskScopeApp), installApp, handleAppStatus)
|
installTask.AddSubTaskWithOps(task.GetTaskName(appInstall.Name, task.TaskInstall, task.TaskScopeApp), installApp, handleAppStatus, 0, time.Hour)
|
||||||
|
|
||||||
go func() {
|
go func() {
|
||||||
if taskErr := installTask.Execute(); taskErr != nil {
|
if taskErr := installTask.Execute(); taskErr != nil {
|
||||||
@@ -882,7 +896,7 @@ func getAppFromRepo(downloadPath string) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := fileOp.Decompress(packagePath, global.Dir.ResourceDir, files.SdkZip, ""); err != nil {
|
if err := fileOp.Decompress(context.Background(), packagePath, global.Dir.ResourceDir, files.SdkZip, ""); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
defer func() {
|
defer func() {
|
||||||
@@ -952,7 +966,7 @@ func deleteCustomApp() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (a AppService) SyncAppListFromRemote(taskID string) (err error) {
|
func (a AppService) SyncAppListFromRemote(taskID string) (err error) {
|
||||||
if xpack.IsUseCustomApp() {
|
if xpack.MultiNodeProvider.IsUseCustomApp() {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user