diff --git a/ruoyi-admin/src/main/resources/logback-plus.xml b/ruoyi-admin/src/main/resources/logback-plus.xml index a8eb27bd3..70f8ec5b0 100644 --- a/ruoyi-admin/src/main/resources/logback-plus.xml +++ b/ruoyi-admin/src/main/resources/logback-plus.xml @@ -16,11 +16,13 @@ ${log.path}/sys-console.log - + - ${log.path}/sys-console.%d{yyyy-MM-dd}.log + ${log.path}/sys-console.%d{yyyy-MM-dd}.%i.log 1 + + 10MB ${log.pattern} @@ -35,12 +37,14 @@ ${log.path}/sys-info.log - - + + - ${log.path}/sys-info.%d{yyyy-MM-dd}.log + ${log.path}/sys-info.%d{yyyy-MM-dd}.%i.log 60 + + 10MB ${log.pattern} @@ -57,12 +61,14 @@ ${log.path}/sys-error.log - - + + - ${log.path}/sys-error.%d{yyyy-MM-dd}.log + ${log.path}/sys-error.%d{yyyy-MM-dd}.%i.log 60 + + 10MB ${log.pattern} @@ -98,24 +104,24 @@ - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + @@ -123,7 +129,7 @@ - + diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/VlogServiceImpl.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/VlogServiceImpl.java index aa034a5aa..1550e810b 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/VlogServiceImpl.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/VlogServiceImpl.java @@ -250,12 +250,15 @@ public class VlogServiceImpl extends ServiceImpl implements Vl } //先检查是否已经点过赞了 if (myLikeVlogService.doILikeVlog(vlogId, Long.valueOf(userId))) { - throw new ServiceException("您已经点过赞了"); + return; } // 我点赞的视频,关联关系保存到数据库 myLikeVlogService.like(vlogId, Long.valueOf(vlog.getMemberId()), Long.valueOf(userId)); clearMemberVlogCache(vlogId, userId,vlog.getMemberId()); //发送消息 + if(userId.equals(vlog.getMemberId())){ + return; + } MqUtil.sendIMMessage(buildMessage(vlog)); } @@ -325,8 +328,9 @@ public class VlogServiceImpl extends ServiceImpl implements Vl likedPage.getRecords().stream().forEach( liked -> { - liked.setDoIFollowVloger(true); + liked.setDoIFollowVloger(fansService.queryDoIFollowVloger(user.getUserId(), Long.valueOf(liked.getMemberId()))); liked.setDoILikeThisVlog(true); + liked.setLikeCounts(myLikeVlogService.getVLogLikeCount(liked.getId())); }); return likedPage; } diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/FansServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/FansServiceImpl.java index 42aee5fa7..19c1c053b 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/FansServiceImpl.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/FansServiceImpl.java @@ -151,6 +151,9 @@ public class FansServiceImpl extends ServiceImpl implements IF @Override @Cacheable(cacheNames = GlobalConstants.GLOBAL_MEMBER_DOIFOLLOW, key = "#myId" + "-" + "#vloggerId") public boolean queryDoIFollowVloger(Long myId, Long vloggerId) { + if (myId.equals(vloggerId)) { + return true; + } return baseMapper.selectCount(new LambdaQueryWrapper().eq(Fans::getFanId, myId).eq(Fans::getVloggerId, vloggerId)) > 0; }