diff --git a/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/resource/service/impl/AiResourceParseServiceImpl.java b/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/resource/service/impl/AiResourceParseServiceImpl.java index 1c25ab913..738433caa 100644 --- a/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/resource/service/impl/AiResourceParseServiceImpl.java +++ b/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/resource/service/impl/AiResourceParseServiceImpl.java @@ -64,7 +64,7 @@ public class AiResourceParseServiceImpl implements IAiResourceParseService { List fileTreeNodes = new ArrayList<>(); // 第一遍遍历:收集所有一级和二级目录下的 SKILL.md 路径 - while ((entry = zais.getNextZipEntry()) != null) { + while ((entry = zais.getNextEntry()) != null) { String entryName = entry.getName(); if (entry.isDirectory()) { continue; @@ -111,7 +111,7 @@ public class AiResourceParseServiceImpl implements IAiResourceParseService { try (ZipArchiveInputStream zais2 = new ZipArchiveInputStream(zipFile.getInputStream(), "GBK", true)) { ZipArchiveEntry entry2; skillMdContent = null; - while ((entry2 = zais2.getNextZipEntry()) != null) { + while ((entry2 = zais2.getNextEntry()) != null) { if (targetSkillMdPath.equals(entry2.getName())) { skillMdContent = readEntryContent(zais2); break; diff --git a/microservices-modules/microservices-modules-zone/src/main/resources/mapper/zone/ZoneResourceMapper.xml b/microservices-modules/microservices-modules-zone/src/main/resources/mapper/zone/ZoneResourceMapper.xml index afb74beed..8303cd5cb 100644 --- a/microservices-modules/microservices-modules-zone/src/main/resources/mapper/zone/ZoneResourceMapper.xml +++ b/microservices-modules/microservices-modules-zone/src/main/resources/mapper/zone/ZoneResourceMapper.xml @@ -162,7 +162,20 @@ ${params.dataScope} - ORDER BY zr.sort DESC + + + ORDER BY + zr.like_count DESC, + (select sum(download_count) from sys_file_info sf where FIND_IN_SET(sf.file_id,zr.file_ids)) desc, + zr.view_count DESC, + zr.update_time DESC, + zr.create_time DESC + + + ORDER BY zr.sort DESC + + + @@ -190,12 +203,17 @@ ${params.dataScope} - - order by (select sum(download_count) from sys_file_info sf where FIND_IN_SET(sf.file_id,zr.file_ids)) desc - - - order by zr.sort DESC + + ORDER BY + zr.like_count DESC, + (select sum(download_count) from sys_file_info sf where FIND_IN_SET(sf.file_id,zr.file_ids)) desc, + zr.view_count DESC, + zr.update_time DESC, + zr.create_time DESC + + ORDER BY zr.sort DESC +