1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2026-01-20 05:49:43 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: fix missing version issue during mssql installation (#11167)

Browse source
This commit is contained in:
CityFun 2025-12-03 11:56:15 +08:00 • committed by GitHub
parent 2c02dc07e9
commit 8ac9d022b6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 27 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
agent/app/service/app.go
View file

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

25
agent/app/service/app_utils.go
View file

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

1
frontend/src/views/login/components/login-form.vue
View file

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