From a5e2efe2df4893f9d8caa03eb2c79b68b7a84c45 Mon Sep 17 00:00:00 2001
From: otto <731554297@qq.com>
Date: Thu, 28 May 2026 10:07:47 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat(AI=E8=B5=84=E6=BA=90=E5=B9=BF=E5=9C=BA?=
 =?UTF-8?q?):=20=E4=BC=98=E5=8C=96AI=E8=B5=84=E6=BA=90=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/zone/ZoneResourceMapper.xml        | 30 +++++++++++++++----
 1 file changed, 24 insertions(+), 6 deletions(-)

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 @@
             </if>
             <!-- 数据范围过滤 -->
             ${params.dataScope}
-            ORDER BY zr.sort DESC
+            <choose>
+                <when test="resourceCategory != null and resourceCategory !=''">
+                    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
+                </when>
+                <otherwise>
+                    ORDER BY zr.sort DESC
+                </otherwise>
+            </choose>
+
         </where>
     </sql>
 
@@ -190,12 +203,17 @@
             <!-- 数据范围过滤 -->
             ${params.dataScope}
             <choose>
-                <when test="orderByDownloadCount != null and orderByDownloadCount">
-                    order by (select sum(download_count) from sys_file_info sf where FIND_IN_SET(sf.file_id,zr.file_ids)) desc
-                </when>
-                <when test="orderByDownloadCount = null and orderByColumn = null and orderByColumn =''">
-                    order by zr.sort DESC
+                <when test="resourceCategory != null and resourceCategory !=''">
+                    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
                 </when>
+                <otherwise>
+                    ORDER BY zr.sort DESC
+                </otherwise>
             </choose>
         </where>
     </sql>

From e98663e87b24d6463ea227938121ca1abb072e39 Mon Sep 17 00:00:00 2001
From: otto <731554297@qq.com>
Date: Mon, 1 Jun 2026 09:49:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix(AI=E8=B5=84=E6=BA=90=E5=B9=BF=E5=9C=BA)?=
 =?UTF-8?q?:=20=E4=BF=AE=E6=AD=A3zip=E7=BB=84=E4=BB=B6=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resource/service/impl/AiResourceParseServiceImpl.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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