yescent/par
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix-page-config-reload-empty

Browse Source
This commit is contained in:
mediabot-pt
2026-07-06 12:14:38 +08:00
parent 9207039046
commit 7042149a13
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
par-core/src/main/java/com/par/core/service/impl/SitePagesServiceImpl.java
View File

@@ -29,12 +29,15 @@ public class SitePagesServiceImpl implements SitePagesService {
.orderByDesc(SitePages::getId).last("limit 1")); .orderByDesc(SitePages::getId).last("limit 1"));
if (sp == null) return null; if (sp == null) return null;
try { try {
List<Map<String, Object>> entries = om.readValue(sp.getEntriesJson(), // entriesJson 存储的是完整 JSON: { entries: [...], authType: "...", authValue: "..." }
new TypeReference<List<Map<String, Object>>>() {}); Map<String, Object> parsed = om.readValue(sp.getEntriesJson(),
new TypeReference<Map<String, Object>>() {});
Map<String, Object> result = new LinkedHashMap<>(); Map<String, Object> result = new LinkedHashMap<>();
result.put("siteId", siteId); result.put("siteId", siteId);
result.put("version", sp.getVersion()); result.put("version", sp.getVersion());
result.put("entries", entries); result.put("entries", parsed.getOrDefault("entries", List.of()));
if (parsed.containsKey("authType")) result.put("authType", parsed.get("authType"));
if (parsed.containsKey("authValue")) result.put("authValue", parsed.get("authValue"));
result.put("updatedAt", sp.getUpdatedAt()); result.put("updatedAt", sp.getUpdatedAt());
return result; return result;
} catch (Exception e) { } catch (Exception e) {
@@ -126,6 +129,7 @@ public class SitePagesServiceImpl implements SitePagesService {
m.put("siteId", sp.getSiteId()); m.put("siteId", sp.getSiteId());
m.put("version", sp.getVersion()); m.put("version", sp.getVersion());
m.put("updatedAt", sp.getUpdatedAt()); m.put("updatedAt", sp.getUpdatedAt());
m.put("entriesJson", sp.getEntriesJson());
result.add(m); result.add(m);
} }
return result; return result;

3
web/src/views/SitePages.vue
View File

@@ -151,7 +151,8 @@ const fetchAll = async () => {
const pages = pr.status==='fulfilled' ? (pr.value?.data||pr.value||[]) : [] const pages = pr.status==='fulfilled' ? (pr.value?.data||pr.value||[]) : []
const map = {} const map = {}
for (const p of pages) { for (const p of pages) {
const entries = (() => { try { return JSON.parse(p.entriesJson||'[]') } catch {return []} })() const parsed = (() => { try { return JSON.parse(p.entriesJson||'{}') } catch {return {}} })()
const entries = Array.isArray(parsed) ? parsed : (parsed.entries || [])
if (!map[p.siteId] || p.version > map[p.siteId].version) if (!map[p.siteId] || p.version > map[p.siteId].version)
map[p.siteId] = { version: p.version, entryCount: entries.length, updatedAt: p.updatedAt, entriesJson: p.entriesJson } map[p.siteId] = { version: p.version, entryCount: entries.length, updatedAt: p.updatedAt, entriesJson: p.entriesJson }
} }