Skip to content

Commit 551049f

Browse files
authored
fix osconsole & aiproxy url info
Signed-off-by: Jiahui <bxy4543@163.com>
1 parent bb1e9f3 commit 551049f

1 file changed

Lines changed: 7 additions & 12 deletions

File tree

info/main.go

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -114,13 +114,13 @@ func main() {
114114
// 收集所有服务信息
115115
var services []ServiceInfo
116116

117-
services = append(services, minioInfo(sealosCloudDomain, sealosCloudPort)...)
117+
services = append(services, minioInfo(sealosCloudDomain)...)
118118
services = append(services, grafanaInfo(sealosCloudDomain)...)
119119
services = append(services, vmInfo(sealosCloudDomain)...)
120120
services = append(services, vlogsInfo(sealosCloudDomain)...)
121121
services = append(services, hamiInfo()...) // 添加 HAMI 信息
122122
services = append(services, finishInfo(sealosCloudDomain, sealosCloudPort, k8sVersion, sealosCloudVersion)...)
123-
services = append(services, aiproxyInfo()...) // 添加 AIProxy 信息
123+
services = append(services, aiproxyInfo(sealosCloudDomain)...) // 添加 AIProxy 信息
124124
services = append(services, cockroachInfo(sealosCloudDomain)...) // 添加 CockroachDB 信息
125125

126126
// 输出表格
@@ -280,7 +280,7 @@ func finishInfo(domain, port, k8sVersion, sealosCloudVersion string) []ServiceIn
280280
return services
281281
}
282282

283-
func minioInfo(domain, port string) []ServiceInfo {
283+
func minioInfo(domain string) []ServiceInfo {
284284
var services []ServiceInfo
285285

286286
consoleUser, err := runCommand("kubectl", "get", "cm", "objectstorage-config", "-n", "sealos-system",
@@ -297,12 +297,7 @@ func minioInfo(domain, port string) []ServiceInfo {
297297
testUserPassword, _ := runCommand("kubectl", "get", "cm", "objectstorage-config", "-n", "sealos-system",
298298
"-o", "jsonpath={.data.MINIO_TESTUSER_PASSWORD}")
299299

300-
minioPort := port
301-
if minioPort == "" {
302-
minioPort = "80"
303-
}
304-
305-
minioURL := fmt.Sprintf("http://objectstorageconsole.%s:%s", domain, minioPort)
300+
minioURL := fmt.Sprintf("https://osconsole.%s", domain)
306301

307302
// MinIO Console
308303
services = append(services, ServiceInfo{
@@ -469,7 +464,7 @@ func hamiInfo() []ServiceInfo {
469464
return services
470465
}
471466

472-
func aiproxyInfo() []ServiceInfo {
467+
func aiproxyInfo(domain string) []ServiceInfo {
473468
var services []ServiceInfo
474469

475470
// 读取 AIProxy 配置
@@ -479,14 +474,14 @@ func aiproxyInfo() []ServiceInfo {
479474
// AIProxy 配置不存在,直接返回空数组
480475
return services
481476
}
482-
477+
aiproxyURL := fmt.Sprintf("https://aiproxy.%s", domain)
483478
// 添加 AIProxy 信息到表格
484479
services = append(services, ServiceInfo{
485480
Name: "AIProxy",
486481
User: "admin",
487482
Password: adminKey,
488483
Version: "-",
489-
PublishAddr: "-",
484+
PublishAddr: aiproxyURL,
490485
})
491486

492487
return services

0 commit comments

Comments
 (0)