fix: refresh app catalog after compatibility changes

This commit is contained in:
2026-07-29 13:26:08 +08:00
parent 7afd23c73b
commit 556fcd7584
4 changed files with 25 additions and 11 deletions
+15 -10
View File
@@ -845,6 +845,8 @@ func (a AppService) GetAppUpdate() (*response.AppUpdateRes, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
storedCompatibility, err := settingRepo.GetValueByKey(global.AppStoreCompatibilitySettingKey)
compatibilityChanged := err != nil || storedCompatibility != global.AppStoreCompatibilityVersion
if setting.AppStoreSyncStatus == constant.StatusSyncing { if setting.AppStoreSyncStatus == constant.StatusSyncing {
res.IsSyncing = true res.IsSyncing = true
return res, nil return res, nil
@@ -852,22 +854,24 @@ func (a AppService) GetAppUpdate() (*response.AppUpdateRes, error) {
appStoreLastModified, _ := strconv.Atoi(setting.AppStoreLastModified) appStoreLastModified, _ := strconv.Atoi(setting.AppStoreLastModified)
res.AppStoreLastModified = appStoreLastModified res.AppStoreLastModified = appStoreLastModified
if setting.AppStoreLastModified == "" || lastModified != appStoreLastModified { if !compatibilityChanged && (setting.AppStoreLastModified == "" || lastModified != appStoreLastModified) {
res.CanUpdate = true res.CanUpdate = true
return res, err return res, err
} }
apps, _ := appRepo.GetBy(appRepo.WithResource(constant.AppResourceRemote)) if !compatibilityChanged {
for _, app := range apps { apps, _ := appRepo.GetBy(appRepo.WithResource(constant.AppResourceRemote))
if app.Icon == "" { for _, app := range apps {
res.CanUpdate = true if app.Icon == "" {
return res, err
}
if appicon.IsIconFile(app.Icon) {
fileName, _ := appicon.ParseIconField(app.Icon)
if fileName == "" || !appicon.IconFileExists(fileName) {
res.CanUpdate = true res.CanUpdate = true
return res, err return res, err
} }
if appicon.IsIconFile(app.Icon) {
fileName, _ := appicon.ParseIconField(app.Icon)
if fileName == "" || !appicon.IconFileExists(fileName) {
res.CanUpdate = true
return res, err
}
}
} }
} }
@@ -880,6 +884,7 @@ func (a AppService) GetAppUpdate() (*response.AppUpdateRes, error) {
return nil, buserr.New("ErrVersionTooLow") return nil, buserr.New("ErrVersionTooLow")
} }
res.AppList = list res.AppList = list
res.CanUpdate = compatibilityChanged
return res, nil return res, nil
} }
+4
View File
@@ -410,6 +410,10 @@ func (a AppService) createSyncAppStoreMetaTask(sharedCtx **appSyncContext) func(
t.LogFailedWithErr(i18n.GetMsgByKey("PersistAppDetails"), err) t.LogFailedWithErr(i18n.GetMsgByKey("PersistAppDetails"), err)
return err return err
} }
if err = ctx.settingService.Update(global.AppStoreCompatibilitySettingKey, global.AppStoreCompatibilityVersion); err != nil {
t.LogFailedWithErr(i18n.GetMsgByKey("PersistAppDetails"), err)
return err
}
global.LOG.Infof("[AppStore] Appstore meta sync completed") global.LOG.Infof("[AppStore] Appstore meta sync completed")
return nil return nil
+5
View File
@@ -4,3 +4,8 @@ package global
// that nPanel has audited against. It is intentionally separate from the // that nPanel has audited against. It is intentionally separate from the
// nPanel product version stored in SystemVersion. // nPanel product version stored in SystemVersion.
const AppStoreCompatibilityVersion = "v2.2.3" const AppStoreCompatibilityVersion = "v2.2.3"
// AppStoreCompatibilitySettingKey records the compatibility level used to
// build the currently cached app catalog. A level change requires a full
// catalog refresh even when the remote catalog timestamp is unchanged.
const AppStoreCompatibilitySettingKey = "AppStoreCompatibilityVersion"
+1 -1
View File
@@ -120,7 +120,7 @@ nPanel 不向用户导向上游社区或商业站点。删除:
应用商店与资源端点需要单独进行兼容性审计:只要它们是保留 Docker 应用生态所必需的,就不自动删除;但 UI 不得展示上游品牌、商业、支持或社区链接。 应用商店与资源端点需要单独进行兼容性审计:只要它们是保留 Docker 应用生态所必需的,就不自动删除;但 UI 不得展示上游品牌、商业、支持或社区链接。
应用商店使用单独的内部兼容级别 `v2.2.3`。它表示 nPanel 已审计应用目录及其版本门槛所需的上游协议基线,不是 nPanel 的产品版本,也不写入用户配置或开放给用户覆盖。nPanel 的产品版本仍独立维护。 应用商店使用单独的内部兼容级别 `v2.2.3`。它表示 nPanel 已审计应用目录及其版本门槛所需的上游协议基线,不是 nPanel 的产品版本,也不写入用户配置或开放给用户覆盖。nPanel 的产品版本仍独立维护。该级别会与缓存的应用目录一起记录;级别变化强制刷新目录详情,不能因远端目录时间戳未变而继续使用按旧规则筛选的缓存。
## 架构 ## 架构