Skip to content

Commit ec5c6a9

Browse files
author
root
committed
fix server detail
1 parent 4963ee1 commit ec5c6a9

223 files changed

Lines changed: 5077 additions & 1230 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Note.md‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,4 +240,19 @@ Prerequisites
240240
Docker tab 的 container
241241

242242
1. 点击 container 详情后，state 列有点跳动，即详情会导致列表显示发生变化
243-
2. 分页 <> 中的页号与分页操作图标之间建议保持一个字符的距离即可
243+
2. 分页 <> 中的页号与分页操作图标之间建议保持一个字符的距离即可
244+
245+
246+
Components 的 Addos 优化：
247+
248+
1. version 列显示两个版本：
249+
Target version
250+
Current version
251+
没有安装时，仅显示 target version
252+
253+
2. 增加一列表示安装制品格式，包含：package, binary, docker 等
254+
3. Component 列表格内容，增加问号，点击查看这个组件的介绍。
255+
3. Status 列应该表示这个组件的真实运行态，installed 其实不属于这个态。
256+
257+
258+
server detail 的所有tab，当 Connection 都要验证ssh 连接是否存在，如何无法连接，直接显示无法连接，而不是默认的布局

‎backend/appos-agent‎

40 KB
Binary file not shown.

‎backend/docs/openapi/ext-api.yaml‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2754,7 +2754,7 @@ paths:
27542754
schema:
27552755
type: string
27562756
security:
2757-
- bearerAuth: []
2757+
- bearerAuth: [] # superuser required
27582758
responses:
27592759
"200":
27602760
description: OK
@@ -2795,7 +2795,7 @@ paths:
27952795
schema:
27962796
$ref: '#/components/schemas/GenericRequest'
27972797
security:
2798-
- bearerAuth: []
2798+
- bearerAuth: [] # superuser required
27992799
responses:
28002800
"200":
28012801
description: OK
@@ -2843,7 +2843,7 @@ paths:
28432843
schema:
28442844
$ref: '#/components/schemas/GenericRequest'
28452845
security:
2846-
- bearerAuth: []
2846+
- bearerAuth: [] # superuser required
28472847
responses:
28482848
"200":
28492849
description: OK
@@ -2895,7 +2895,7 @@ paths:
28952895
schema:
28962896
type: string
28972897
security:
2898-
- bearerAuth: []
2898+
- bearerAuth: [] # superuser required
28992899
responses:
29002900
"200":
29012901
description: OK
@@ -2937,7 +2937,7 @@ paths:
29372937
schema:
29382938
type: string
29392939
security:
2940-
- bearerAuth: []
2940+
- bearerAuth: [] # superuser required
29412941
responses:
29422942
"200":
29432943
description: OK
@@ -2985,7 +2985,7 @@ paths:
29852985
schema:
29862986
$ref: '#/components/schemas/GenericRequest'
29872987
security:
2988-
- bearerAuth: []
2988+
- bearerAuth: [] # superuser required
29892989
responses:
29902990
"200":
29912991
description: OK
@@ -3033,7 +3033,7 @@ paths:
30333033
schema:
30343034
$ref: '#/components/schemas/GenericRequest'
30353035
security:
3036-
- bearerAuth: []
3036+
- bearerAuth: [] # superuser required
30373037
responses:
30383038
"200":
30393039
description: OK
@@ -3081,7 +3081,7 @@ paths:
30813081
schema:
30823082
$ref: '#/components/schemas/GenericRequest'
30833083
security:
3084-
- bearerAuth: []
3084+
- bearerAuth: [] # superuser required
30853085
responses:
30863086
"200":
30873087
description: OK
@@ -3129,7 +3129,7 @@ paths:
31293129
schema:
31303130
$ref: '#/components/schemas/GenericRequest'
31313131
security:
3132-
- bearerAuth: []
3132+
- bearerAuth: [] # superuser required
31333133
responses:
31343134
"200":
31353135
description: OK
@@ -3171,7 +3171,7 @@ paths:
31713171
schema:
31723172
type: string
31733173
security:
3174-
- bearerAuth: []
3174+
- bearerAuth: [] # superuser required
31753175
responses:
31763176
"200":
31773177
description: OK
@@ -3213,7 +3213,7 @@ paths:
32133213
schema:
32143214
type: string
32153215
security:
3216-
- bearerAuth: []
3216+
- bearerAuth: [] # superuser required
32173217
responses:
32183218
"200":
32193219
description: OK
@@ -3265,7 +3265,7 @@ paths:
32653265
schema:
32663266
type: string
32673267
security:
3268-
- bearerAuth: []
3268+
- bearerAuth: [] # superuser required
32693269
responses:
32703270
"200":
32713271
description: OK
@@ -3311,7 +3311,7 @@ paths:
33113311
schema:
33123312
type: string
33133313
security:
3314-
- bearerAuth: []
3314+
- bearerAuth: [] # superuser required
33153315
responses:
33163316
"200":
33173317
description: OK
@@ -3363,7 +3363,7 @@ paths:
33633363
schema:
33643364
type: string
33653365
security:
3366-
- bearerAuth: []
3366+
- bearerAuth: [] # superuser required
33673367
responses:
33683368
"200":
33693369
description: OK
@@ -3416,7 +3416,7 @@ paths:
34163416
schema:
34173417
$ref: '#/components/schemas/GenericRequest'
34183418
security:
3419-
- bearerAuth: []
3419+
- bearerAuth: [] # superuser required
34203420
responses:
34213421
"200":
34223422
description: OK
@@ -3469,7 +3469,7 @@ paths:
34693469
schema:
34703470
$ref: '#/components/schemas/GenericRequest'
34713471
security:
3472-
- bearerAuth: []
3472+
- bearerAuth: [] # superuser required
34733473
responses:
34743474
"200":
34753475
description: OK
@@ -3522,7 +3522,7 @@ paths:
35223522
schema:
35233523
$ref: '#/components/schemas/GenericRequest'
35243524
security:
3525-
- bearerAuth: []
3525+
- bearerAuth: [] # superuser required
35263526
responses:
35273527
"200":
35283528
description: OK
@@ -3570,7 +3570,7 @@ paths:
35703570
schema:
35713571
$ref: '#/components/schemas/GenericRequest'
35723572
security:
3573-
- bearerAuth: []
3573+
- bearerAuth: [] # superuser required
35743574
responses:
35753575
"200":
35763576
description: OK
@@ -3605,7 +3605,7 @@ paths:
36053605
schema:
36063606
type: string
36073607
security:
3608-
- bearerAuth: []
3608+
- bearerAuth: [] # superuser required
36093609
responses:
36103610
"200":
36113611
description: OK
@@ -3653,7 +3653,7 @@ paths:
36533653
schema:
36543654
$ref: '#/components/schemas/GenericRequest'
36553655
security:
3656-
- bearerAuth: []
3656+
- bearerAuth: [] # superuser required
36573657
responses:
36583658
"200":
36593659
description: OK
@@ -3701,7 +3701,7 @@ paths:
37013701
schema:
37023702
$ref: '#/components/schemas/GenericRequest'
37033703
security:
3704-
- bearerAuth: []
3704+
- bearerAuth: [] # superuser required
37053705
responses:
37063706
"200":
37073707
description: OK
@@ -3753,7 +3753,7 @@ paths:
37533753
schema:
37543754
type: string
37553755
security:
3756-
- bearerAuth: []
3756+
- bearerAuth: [] # superuser required
37573757
responses:
37583758
"200":
37593759
description: OK
@@ -3795,7 +3795,7 @@ paths:
37953795
schema:
37963796
type: string
37973797
security:
3798-
- bearerAuth: []
3798+
- bearerAuth: [] # superuser required
37993799
responses:
38003800
"200":
38013801
description: OK
@@ -3835,7 +3835,7 @@ paths:
38353835
schema:
38363836
type: string
38373837
security:
3838-
- bearerAuth: []
3838+
- bearerAuth: [] # superuser required
38393839
responses:
38403840
"200":
38413841
description: OK
@@ -3882,7 +3882,7 @@ paths:
38823882
schema:
38833883
type: string
38843884
security:
3885-
- bearerAuth: []
3885+
- bearerAuth: [] # superuser required
38863886
responses:
38873887
"200":
38883888
description: OK
@@ -3924,7 +3924,7 @@ paths:
39243924
schema:
39253925
type: string
39263926
security:
3927-
- bearerAuth: []
3927+
- bearerAuth: [] # superuser required
39283928
responses:
39293929
"200":
39303930
description: OK
@@ -3971,7 +3971,7 @@ paths:
39713971
schema:
39723972
$ref: '#/components/schemas/GenericRequest'
39733973
security:
3974-
- bearerAuth: []
3974+
- bearerAuth: [] # superuser required
39753975
responses:
39763976
"200":
39773977
description: OK
@@ -4018,7 +4018,7 @@ paths:
40184018
schema:
40194019
type: string
40204020
security:
4021-
- bearerAuth: []
4021+
- bearerAuth: [] # superuser required
40224022
responses:
40234023
"200":
40244024
description: OK
@@ -4054,7 +4054,7 @@ paths:
40544054
description: "Returns all configured servers with concurrent online/offline ping status. Superuser only."
40554055
operationId: get_api_ext_docker_servers
40564056
security:
4057-
- bearerAuth: []
4057+
- bearerAuth: [] # superuser required
40584058
responses:
40594059
"200":
40604060
description: OK
@@ -4082,7 +4082,7 @@ paths:
40824082
schema:
40834083
type: string
40844084
security:
4085-
- bearerAuth: []
4085+
- bearerAuth: [] # superuser required
40864086
responses:
40874087
"200":
40884088
description: OK
@@ -4130,7 +4130,7 @@ paths:
41304130
schema:
41314131
$ref: '#/components/schemas/GenericRequest'
41324132
security:
4133-
- bearerAuth: []
4133+
- bearerAuth: [] # superuser required
41344134
responses:
41354135
"200":
41364136
description: OK
@@ -4177,7 +4177,7 @@ paths:
41774177
schema:
41784178
type: string
41794179
security:
4180-
- bearerAuth: []
4180+
- bearerAuth: [] # superuser required
41814181
responses:
41824182
"200":
41834183
description: OK
@@ -4224,7 +4224,7 @@ paths:
42244224
schema:
42254225
type: string
42264226
security:
4227-
- bearerAuth: []
4227+
- bearerAuth: [] # superuser required
42284228
responses:
42294229
"200":
42304230
description: OK

‎backend/domain/resource/servers/view.go‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,22 @@ func BuildServerViewItem(record *core.Record, credentialType string, createdByNa
9090
}
9191

9292
if managed.ConnectType != ConnectionModeTunnel {
93+
// Read the cached result of the last TCP probe (written back by the
94+
// connectivity-check endpoint) instead of probing live on every list load.
95+
cachedStatus := strings.TrimSpace(record.GetString("access_status"))
96+
if cachedStatus != "" {
97+
checkedAt := recordDateTime(record, "access_checked_at")
98+
checkedAtStr := ""
99+
if !checkedAt.IsZero() {
100+
checkedAtStr = checkedAt.UTC().Format(time.RFC3339)
101+
}
102+
item.Access = AccessView{
103+
Status: cachedStatus,
104+
Reason: strings.TrimSpace(record.GetString("access_reason")),
105+
CheckedAt: checkedAtStr,
106+
Source: "cached",
107+
}
108+
}
93109
return item
94110
}
95111

0 commit comments

Comments
 (0)