From 399b55d3efd64f68298c1ddbc4675f6970855063 Mon Sep 17 00:00:00 2001
From: haotian <2421912570@qq.com>
Date: Mon, 10 Feb 2025 17:25:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E7=AD=96=E7=95=A5--=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0--APP=20=E6=9B=B4=E5=A4=9A=E9=83=A8=E5=88=86=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=85=81=E8=AE=B8=E5=8C=BF=E5=90=8D=E8=AE=BF=E9=97=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/app/AppSystemController.java   | 108 +++++++++++-------
 .../framework/config/SecurityConfig.java      |   2 +
 2 files changed, 71 insertions(+), 39 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java
index 8f42d327..c7036c52 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java
@@ -1741,17 +1741,25 @@ public class AppSystemController extends BaseController {
         for(UserPublishWorkDetailDto userPublishWorkDetail:userWorkList){
             //----------------------------------查看是否点赞该作品--------------------------------------------------
             SysUserLike sysUserLike = new SysUserLike();
-            sysUserLike.setUserId(getUserId());
-            sysUserLike.setTargetId(userPublishWorkDetail.getWorkId());
-            sysUserLike.setTargetType("1");
-            sysUserLike.setStatus("0");
-            List<SysUserLike> sysUserLikeList = sysUserLikeService.selectSysUserLikeList(sysUserLike);
-            if(sysUserLikeList.size() > 0){
-                // 已点赞
-                userPublishWorkDetail.setIsAddLike("1");
-            }else{
-                userPublishWorkDetail.setIsAddLike("0");
+            try{
+                sysUserLike.setUserId(getUserId());
+                sysUserLike.setTargetId(userPublishWorkDetail.getWorkId());
+                sysUserLike.setTargetType("1");
+                sysUserLike.setStatus("0");
+                List<SysUserLike> sysUserLikeList = sysUserLikeService.selectSysUserLikeList(sysUserLike);
+                if(sysUserLikeList.size() > 0){
+                    // 已点赞
+                    userPublishWorkDetail.setIsAddLike("1");
+                }else{
+                    userPublishWorkDetail.setIsAddLike("0");
+                }
             }
+            catch (Exception e){
+                // 未登录
+                userPublishWorkDetail.setIsAddLike("0");
+//                continue;
+            }
+
             //----------------------------------查看是否点赞该作品end-----------------------------------------------
         }
         return getDataTable(userWorkList);
@@ -1813,31 +1821,46 @@ public class AppSystemController extends BaseController {
 
         //----------------------------------查看是否关注该用户-----------------------------------------------
         SysUserFollow userFollow = new SysUserFollow();
-        userFollow.setUserId(getUserId());
-        userFollow.setFollowedUserId(userPublishWorkDetail.getUserId());
-        userFollow.setStatus("0");
-        List<SysUserFollow> userFollowList = userFollowService.selectSysUserFollowList(userFollow);
-        if(userFollowList.size() > 0){
-            // 以关注
-            userPublishWorkDetail.setIsFollow("1");
-        }else{
-            userPublishWorkDetail.setIsFollow("0");
-        }
+        // 这里允许匿名访问
+        try{
+            userFollow.setUserId(getUserId());
+            userFollow.setFollowedUserId(userPublishWorkDetail.getUserId());
+            userFollow.setStatus("0");
+            List<SysUserFollow> userFollowList = userFollowService.selectSysUserFollowList(userFollow);
+            if(userFollowList.size() > 0){
+                // 以关注
+                userPublishWorkDetail.setIsFollow("1");
+            }else{
+                userPublishWorkDetail.setIsFollow("0");
+            }
+        }catch (Exception e)
+            {
+                // 未登录
+                userPublishWorkDetail.setIsFollow("0");
+            }
+
         //----------------------------------查看是否关注该用户end-----------------------------------------------
 
         //----------------------------------查看是否点赞该作品--------------------------------------------------
-        SysUserLike sysUserLike = new SysUserLike();
-        sysUserLike.setUserId(getUserId());
-        sysUserLike.setTargetId(workId);
-        sysUserLike.setTargetType("1");
-        sysUserLike.setStatus("0");
-        List<SysUserLike> sysUserLikeList = sysUserLikeService.selectSysUserLikeList(sysUserLike);
-        if(sysUserLikeList.size() > 0){
-            // 已点赞
-            userPublishWorkDetail.setIsAddLike("1");
-        }else{
+        try{
+            SysUserLike sysUserLike = new SysUserLike();
+            sysUserLike.setUserId(getUserId());
+            sysUserLike.setTargetId(workId);
+            sysUserLike.setTargetType("1");
+            sysUserLike.setStatus("0");
+            List<SysUserLike> sysUserLikeList = sysUserLikeService.selectSysUserLikeList(sysUserLike);
+            if(sysUserLikeList.size() > 0){
+                // 已点赞
+                userPublishWorkDetail.setIsAddLike("1");
+            }else{
+                userPublishWorkDetail.setIsAddLike("0");
+            }
+        }
+        catch (Exception e){
+            // 未登录
             userPublishWorkDetail.setIsAddLike("0");
         }
+
         //----------------------------------查看是否点赞该作品end-----------------------------------------------
 
         userPublishWorkDetail.setSourceList(sourceList);
@@ -1852,17 +1875,24 @@ public class AppSystemController extends BaseController {
         moreUserDetailDto.setUserId(userId);
 
         //----------------------------------查看是否关注该用户-----------------------------------------------
-        SysUserFollow userFollow = new SysUserFollow();
-        userFollow.setUserId(getUserId());
-        userFollow.setFollowedUserId(userId);
-        userFollow.setStatus("0");
-        List<SysUserFollow> userFollowList = userFollowService.selectSysUserFollowList(userFollow);
-        if(userFollowList.size() > 0){
-            // 以关注
-            moreUserDetailDto.setIsFollow("1");
-        }else{
+        try{
+            SysUserFollow userFollow = new SysUserFollow();
+            userFollow.setUserId(getUserId());
+            userFollow.setFollowedUserId(userId);
+            userFollow.setStatus("0");
+            List<SysUserFollow> userFollowList = userFollowService.selectSysUserFollowList(userFollow);
+            if(userFollowList.size() > 0){
+                // 以关注
+                moreUserDetailDto.setIsFollow("1");
+            }else{
+                moreUserDetailDto.setIsFollow("0");
+            }
+        }
+        catch (Exception e){
+            // 未登录
             moreUserDetailDto.setIsFollow("0");
         }
+
         //----------------------------------查看是否关注该用户end-----------------------------------------------
 
 //        // 查看他人发布作品
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
index 20cab6c0..9fd21723 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
@@ -122,6 +122,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .antMatchers("/login", "/register", "/captchaImage","/appLoginCaptchaCode/**","/appCaptchaCode/**","/appUpdatePasswordCaptchaCode/**"
                         ,"/app/system/loginPassword","/app/system/register", "/app/system/loginSms"
                         ,"/registerCheckPhone","/app/system/forgetPassword"
+                        ,"/app/system/getMoreUserPublishWork/**","/app/system/getMoreUserDetail/**","/app/system/getMoreUserPublishWorkDetail/**"
+                        ,"/app/system/getMoreUserWork"
 //                        ,"/websocket/location/**"
                         ,"/websocket/online/**"
                         ,"/backstage/system/loginPassword"