diff --git a/agent/app/service/app.go b/agent/app/service/app.go index a639f9a78c09..194167d02fbd 100644 --- a/agent/app/service/app.go +++ b/agent/app/service/app.go @@ -193,24 +193,7 @@ func (a AppService) GetApp(ctx *gin.Context, key string) (*response.AppDTO, erro if err != nil { return nil, err } - var versionsRaw []string - hasLatest := false - latestVersion := "" - for _, detail := range details { - if strings.Contains(detail.Version, "latest") { - hasLatest = true - latestVersion = detail.Version - continue - } - if key == "openresty" && !common.CompareAppVersion(detail.Version, "1.27") { - continue - } - versionsRaw = append(versionsRaw, detail.Version) - } - appDTO.Versions = common.GetSortedVersions(versionsRaw) - if hasLatest { - appDTO.Versions = append([]string{latestVersion}, appDTO.Versions...) - } + appDTO.Versions = getAppVersions(key, details) tags, err := getAppTags(app.ID, strings.ToLower(common.GetLang(ctx))) if err != nil { return nil, err diff --git a/agent/app/service/app_utils.go b/agent/app/service/app_utils.go index 24fd8d818366..e91cefbcb35e 100644 --- a/agent/app/service/app_utils.go +++ b/agent/app/service/app_utils.go @@ -2174,3 +2174,28 @@ func isEditCompose(installed model.AppInstall) bool { } return false } + +func getAppVersions(key string, details []model.AppDetail) []string { + var ( + versionsRaw []string + versions []string + ) + hasLatest := false + latestVersion := "" + for _, detail := range details { + if key != "mssql" && strings.Contains(detail.Version, "latest") { + hasLatest = true + latestVersion = detail.Version + continue + } + if key == "openresty" && !common.CompareAppVersion(detail.Version, "1.27") { + continue + } + versionsRaw = append(versionsRaw, detail.Version) + } + versions = common.GetSortedVersions(versionsRaw) + if hasLatest { + versions = append([]string{latestVersion}, versions...) + } + return versions +} diff --git a/frontend/src/views/login/components/login-form.vue b/frontend/src/views/login/components/login-form.vue index 71fcd60db09d..d38183914bbf 100644 --- a/frontend/src/views/login/components/login-form.vue +++ b/frontend/src/views/login/components/login-form.vue @@ -353,6 +353,7 @@ const login = (formEl: FormInstance | undefined) => { } catch (res) { if (res.code === 401) { if (res.message === 'ErrCaptchaCode') { + globalStore.ignoreCaptcha = false; loginForm.captcha = ''; errCaptcha.value = true; errAuthInfo.value = false;