Skip to content

fix: Remove sorting logic for update system logs #295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ut005973 merged 1 commit into from
May 11, 2026
Merged

fix: Remove sorting logic for update system logs #295

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions src/dcc-update-plugin/operation/updateloghelper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,16 +90,6 @@ void UpdateLogHelper::handleSystem(const QJsonArray &log)

m_systemLog.append(std::move(SystemUpdateLog::fromJsonObj(obj)));
}

// 不依赖服务器返回来日志顺序，用showVersion进行排序
// 如果showVersion版本号相同，则用发布时间排序；不考虑版本号相同且发布时间相同的情况，这种情况应该由运维人员避免
std::sort(m_systemLog.begin(), m_systemLog.end(), [](const SystemUpdateLog& v1, const SystemUpdateLog& v2) -> bool {
int compareRet = v1.showVersion.compare(v2.showVersion);
if (compareRet == 0) {
return v1.publishTime.compare(v2.publishTime) >= 0;
}
return compareRet > 0;
});
}

void UpdateLogHelper::handleSecurity(const QJsonObject &log)
Expand Down
Loading