获取tag增加拉黑标识

ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java

@@ -201,7 +201,7 @@ public class CommonController {
                 new File(tempThumbnailFile).delete();
             }
 
-            if ("image".equalsIgnoreCase(fileType)) {
+            if ("image".equalsIgnoreCase(fileType) && !fileLastType.equalsIgnoreCase(".gif")) {
                 String tempWatermarkFile = "";
                 // 下载源文件到本地临时目录
                 String tempSourceFile = System.getProperty("java.io.tmpdir") + File.separator + "source_" + FileUtils.getName(fileName);
@@ -244,6 +244,10 @@ public class CommonController {
             }
 
             fileNameResult = fileNameResult.replace("https://cysd.oss-cn-shanghai.aliyuncs.com", fileUrl);
+            if (fileLastType.equalsIgnoreCase(".gif")) {
+                compressedFileUrl = fileNameResult;
+            }
+
             compressedFileUrl = compressedFileUrl.replace("https://cysd.oss-cn-shanghai.aliyuncs.com", fileUrl);
             String url = fileNameResult;
             AjaxResult ajax = AjaxResult.success();

ruoyi-admin/src/main/resources/logback.xml

@@ -20,7 +20,7 @@
             <!-- 日志文件名格式，添加.gz后缀实现自动压缩 -->
 			<fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log.gz</fileNamePattern>
 			<!-- 日志最大的历史 60天 -->
-			<maxHistory>60</maxHistory>
+			<maxHistory>3</maxHistory>
 			<!-- 日志文件总大小上限，超过后会删除旧文件，单位可以是KB、MB或GB -->
 			<totalSizeCap>1GB</totalSizeCap>
 		</rollingPolicy>
@@ -68,7 +68,7 @@
             <!-- 按天回滚 daily，添加.gz后缀实现自动压缩 -->
             <fileNamePattern>${log.path}/sys-user.%d{yyyy-MM-dd}.log.gz</fileNamePattern>
             <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
+            <maxHistory>3</maxHistory>
             <!-- 日志文件总大小上限 -->
             <totalSizeCap>2GB</totalSizeCap>
         </rollingPolicy>

ruoyi-common/src/main/java/com/ruoyi/common/utils/file/OssUtils.java

@@ -199,7 +199,7 @@ public class OssUtils {
                     .replaceFirst("=+$", "");
 
             // 添加水印
-            String style = "image/watermark,text_" + watermarkText + ",pady_0,size_100,fill_1,t_30,rotate_45,type_d3F5LW1pY3JvaGVp";
+            String style = "image/watermark,text_" + watermarkText + ",pady_10,size_100,fill_1,t_30,rotate_45,type_d3F5LW1pY3JvaGVp";
             GetObjectRequest request = new GetObjectRequest(bucketName, objectName);
             request.setProcess(style);
             // 将处理后的图片命名为example-new.jpg并保存到本地。

ruoyi-generator/src/main/java/com/ruoyi/generator/controller/CommunityArticleController.java

@@ -253,26 +253,29 @@ public class CommunityArticleController extends BaseController {
         String cacheKey = generateCacheKey(userId, communityArticle, pageNum, pageSize, searchType);
 
         try {
-            // 尝试从缓存中获取数据
-            TableDataInfo cachedData = null;
-            try {
-                cachedData = redisCache.getCacheObject(cacheKey);
-                if (cachedData != null) {
-                    log.info("从缓存中获取文章列表数据, key: {}", cacheKey);
-                    return cachedData;
-                }
-            } catch (Exception e) {
-                // 如果从缓存获取数据时出错，记录错误并继续从数据库获取
-                log.error("从缓存获取数据失败: {}", e.getMessage(), e);
-                // 清除可能损坏的缓存
+            if (searchType != 3) {
+// 尝试从缓存中获取数据
+                TableDataInfo cachedData = null;
                 try {
-                    redisCache.deleteObject(cacheKey);
-                    log.info("已清除可能损坏的缓存: {}", cacheKey);
-                } catch (Exception ex) {
-                    log.error("清除缓存失败: {}", ex.getMessage());
+                    cachedData = redisCache.getCacheObject(cacheKey);
+                    if (cachedData != null) {
+                        log.info("从缓存中获取文章列表数据, key: {}", cacheKey);
+                        return cachedData;
+                    }
+                } catch (Exception e) {
+                    // 如果从缓存获取数据时出错，记录错误并继续从数据库获取
+                    log.error("从缓存获取数据失败: {}", e.getMessage(), e);
+                    // 清除可能损坏的缓存
+                    try {
+                        redisCache.deleteObject(cacheKey);
+                        log.info("已清除可能损坏的缓存: {}", cacheKey);
+                    } catch (Exception ex) {
+                        log.error("清除缓存失败: {}", ex.getMessage());
+                    }
                 }
             }
 
+
             // 缓存中没有数据或获取缓存失败，从数据库查询
             log.info("从数据库中获取文章列表数据");
             rspData = new TableDataInfo();
@@ -357,6 +360,9 @@ public class CommunityArticleController extends BaseController {
                     String fileType = FileUtils.getFileTypeFromUrl(image.getImages());
                     log.info("fileType:{}", fileType);
                     if ("image".equals(fileType)) {
+                        if (image.getImages().contains(".gif") || image.getImages().contains(".GIF")) {
+                            continue;
+                        }
                         // 本地临时水印文件路径
                         String tempWatermarkFile = System.getProperty("java.io.tmpdir") + File.separator + "watermark_" + FileUtils.getName(image.getImages());
                         String tempSourceFile = System.getProperty("java.io.tmpdir") + File.separator + "source_" + FileUtils.getName(image.getImages());

ruoyi-generator/src/main/java/com/ruoyi/generator/controller/CommunityTagController.java

@@ -2,7 +2,6 @@ package com.ruoyi.generator.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.common.constant.CacheConstants;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.redis.RedisCache;
@@ -12,24 +11,22 @@ import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.generator.domain.Community.*;
+import com.ruoyi.generator.domain.Community.CommunityTag;
+import com.ruoyi.generator.domain.Community.CommunityTagBlock;
+import com.ruoyi.generator.domain.Community.CommunityUserTag;
 import com.ruoyi.generator.mapper.community.CommunityTagBlockMapper;
 import com.ruoyi.generator.mapper.community.CommunityTagMapper;
 import com.ruoyi.generator.mapper.community.CommunityUserCircleMapper;
 import com.ruoyi.generator.mapper.community.CommunityUserTagMapper;
 import com.ruoyi.generator.service.ICommunityTagService;
-import com.ruoyi.generator.vo.CommunityTagVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
-import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 /**
@@ -81,7 +78,6 @@ public class CommunityTagController extends BaseController {
                     .like("tag_name", tagName)
                     .orderByDesc("tag_hot")).getRecords();
 
-
             if (isToken) {
                 Long userId = SecurityUtils.getLoginUser().getUserId();
                 for (CommunityTag communityTag : communityTags) {
@@ -94,8 +90,17 @@ public class CommunityTagController extends BaseController {
                     if (userTag != null){
                         communityTag.setIsLike(true);
                     }
+
+                    CommunityTagBlock communityTagBlock = communityTagBlockMapper.selectOne(new QueryWrapper<CommunityTagBlock>()
+                            .eq("user_id", userId)
+                            .eq("tag_id", communityTag.getId()));
+                    if (communityTagBlock != null) {
+                        communityTag.setIsBlock(true);
+                    }
                 }
 
+
+
             }
         } catch (Exception e) {
             System.out.println(e.getMessage());
@@ -299,7 +304,7 @@ public class CommunityTagController extends BaseController {
             List<CommunityTagBlock> userTags = communityTagBlockMapper.selectPage(page, queryWrapper).getRecords();
 
             List<Long> tagList = userTags.stream().map(CommunityTagBlock::getTagId).collect(Collectors.toList());
-            if (tagList.size() == 0){
+            if (tagList.isEmpty()){
                 return AjaxResult.success(communityTags);
             }
 
@@ -328,6 +333,11 @@ public class CommunityTagController extends BaseController {
         } catch (Exception e) {
             System.out.println(e.getMessage());
             throw new ProjectException();
+        } finally {
+            assert communityTags != null;
+            for (CommunityTag communityTag : communityTags) {
+                communityTag.setIsBlock(true);
+            }
         }
 
         return AjaxResult.success(communityTags);

ruoyi-generator/src/main/java/com/ruoyi/generator/domain/Community/CommunityTag.java

@@ -95,11 +95,17 @@ public class CommunityTag implements Serializable {
     @ApiModelProperty("弹性字段5")
     private String attribute5;
 
-
     /**
      * 是否关注
      */
     @ApiModelProperty("是否关注")
     @TableField(exist = false)
     private Boolean isLike = false;
+
+    /**
+     * 是否已拉黑
+     */
+    @ApiModelProperty("是否已拉黑")
+    @TableField(exist = false)
+    private Boolean isBlock = false;
 }