:bug: 首页视频添加缓存

jlsb-vue/src/views/aa/AaSlideshowList.vue

@@ -41,6 +41,12 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-popconfirm v-has="'aa:slideshow:clear:cache'" placement="top" ok-text="确定" cancel-text="取消" @confirm="()=>handleClearCache()">
+        <template slot="title">
+          <p>确认清理首页缓存数据吗？</p>
+        </template>
+        <a-button :loading="loadingCleanCacheBtn"  type="danger" icon="warning">清理缓存</a-button>
+      </a-popconfirm>
 <!--      <a-button type="primary" icon="download" @click="handleExportXls('轮播页管理')">导出</a-button>-->
 <!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
 <!--        <a-button type="primary" icon="import">导入</a-button>-->
@@ -243,10 +249,11 @@
           deleteBatch: "/aa/aaSlideshow/deleteBatch",
           exportXlsUrl: "/aa/aaSlideshow/exportXls",
           importExcelUrl: "aa/aaSlideshow/importExcel",
-
+          clearCache: "aa/aaSlideshow/clearCache",
         },
         dictOptions:{},
         superFieldList:[],
+        loadingCleanCacheBtn: false
       }
     },
     created() {
@@ -288,7 +295,19 @@
           this.loading = false
           this.searchQuery();
         })
-      }
+      },
+      handleClearCache(){
+        this.loadingCleanCacheBtn = true
+        getAction(this.url.clearCache, {}).then(res => {
+          if (res.success) {
+            this.$message.success(res.message)
+          } else {
+            this.$message.warning(res.message)
+          }
+        }).finally(() => {
+          this.loadingCleanCacheBtn = false
+        })
+      },
     }
   }
 </script>

jlsb/jeecg-boot-base/jeecg-boot-base-tools/pom.xml

@@ -29,12 +29,16 @@
         <!--加载hutool-->
         <dependency>
             <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+        </dependency>
+<!--        <dependency>
+            <groupId>cn.hutool</groupId>
             <artifactId>hutool-core</artifactId>
         </dependency>
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-crypto</artifactId>
-        </dependency>
+        </dependency>-->
         <!--加载beanutils-->
         <dependency>
             <groupId>commons-beanutils</groupId>
@@ -42,4 +46,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>

jlsb/jeecg-boot-module-system/src/main/java/org/jeecg/modules/aa/controller/AaSlideshowController.java

@@ -24,6 +24,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.system.service.ISysFileCacheService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -54,6 +55,21 @@ public class AaSlideshowController extends JeecgController<AaSlideshow, IAaSlide
 	@Autowired
 	private IAaSlideshowService aaSlideshowService;
 
+	@Autowired
+	private ISysFileCacheService sysFileCacheService;
+
+	 /**
+	  * 清理缓存
+	  *
+	  * @return
+	  */
+	 @ApiOperation(value="轮播管理-清理轮播页缓存", notes="轮播管理-清理轮播页缓存")
+	 @GetMapping(value = "/clearCache")
+	 public Result<IPage<AaSlideshow>> queryPageList() {
+		 sysFileCacheService.getDefaultLFUFileCache().clear();
+		 return Result.OK("缓存清理成功");
+	 }
+
 	/**
 	 * 分页列表查询
 	 *

jlsb/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/CommonController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.system.controller;
 
+import cn.hutool.cache.file.LFUFileCache;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
@@ -11,6 +12,7 @@ import org.jeecg.common.util.CommonUtils;
 import org.jeecg.common.util.RestUtil;
 import org.jeecg.common.util.TokenUtils;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.system.service.ISysFileCacheService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpHeaders;
@@ -42,9 +44,15 @@ import java.net.URLDecoder;
 @RequestMapping("/sys/common")
 public class CommonController {
 
+    // 图片缓存key
+    private static final String CACHE_IMG_NAME = "sys_common_static_images_cache";
+
     @Autowired
     private ISysBaseAPI sysBaseAPI;
 
+    @Autowired
+    private ISysFileCacheService sysFileCacheService;
+
     @Value(value = "${jeecg.path.upload}")
     private String uploadpath;
 
@@ -230,9 +238,25 @@ public class CommonController {
             }
             response.setContentType("application/force-download");// 设置强制下载不打开
             response.addHeader("Content-Disposition", "attachment;fileName=" + new String(file.getName().getBytes("UTF-8"),"iso-8859-1"));
-            inputStream = new BufferedInputStream(new FileInputStream(filePath));
+            // 优化本地文件使用缓存
+            //outputStream = response.getOutputStream();
+            if (imgPath.endsWith(".mp4") || imgPath.endsWith(".wmv") || imgPath.endsWith(".mpg")||imgPath.endsWith(".mov")||imgPath.endsWith(".avi")||imgPath.endsWith(".flv")){
+                byte[] cacheFile = sysFileCacheService.getDefCacheFile(filePath);
+                //outputStream.write(cacheFile, 0, cacheFile.length);
+                inputStream = new ByteArrayInputStream(cacheFile);
+                log.info("视频缓存");
+            } else {
+                // 内存使用太多不使用缓存
+/*                LFUFileCache fileCache = sysFileCacheService.getFileCache(CACHE_IMG_NAME);
+                byte[] fileBytes = fileCache.getFileBytes(file);
+                //outputStream.write(fileBytes, 0, fileBytes.length);
+                inputStream = new ByteArrayInputStream(fileBytes);
+                log.info("其他文件缓存");*/
+                inputStream = new BufferedInputStream(new FileInputStream(filePath));
+            }
+            //inputStream = new BufferedInputStream(new FileInputStream(filePath));
             outputStream = response.getOutputStream();
-            byte[] buf = new byte[1024];
+            byte[] buf = new byte[4096];
             int len;
             while ((len = inputStream.read(buf)) > 0) {
                 outputStream.write(buf, 0, len);

jlsb/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysFileCacheService.java

@@ -0,0 +1,37 @@
+package org.jeecg.modules.system.service;
+
+import cn.hutool.cache.file.AbstractFileCache;
+import cn.hutool.cache.file.LFUFileCache;
+
+import java.io.File;
+
+/**
+ * @author 王葆权
+ * @Title: 文件缓存类
+ * @Package org.jeecg.modules.system.service
+ * @Description: 用于缓存较小的视频、图片等需要频繁通过接口访问的内容
+ * @date 2023/12/7 15:42
+ */
+public interface ISysFileCacheService {
+    byte[] getDefCacheFile(String filePath);
+
+    byte[] getDefCacheFile(File file);
+
+    void clearDefCache();
+
+    LFUFileCache getCacheIfExists(String cacheName);
+
+    LFUFileCache getFileCache(String cacheName);
+
+    LFUFileCache createFileCache(String cacheName, int capacity, int maxFileSize, long timeout);
+
+    LFUFileCache createFileCache(String cacheName, int capacity, int maxFileSize);
+
+    LFUFileCache createFileCache(String cacheName, int maxFileSize);
+
+    LFUFileCache createFileCache(String cacheName);
+
+    LFUFileCache putFileCache(String cacheName, LFUFileCache fileCache);
+
+    LFUFileCache getDefaultLFUFileCache();
+}

jlsb/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysFileCacheServiceImpl.java

@@ -0,0 +1,156 @@
+package org.jeecg.modules.system.service.impl;
+
+import cn.hutool.cache.file.LFUFileCache;
+import org.jeecg.modules.system.service.ISysFileCacheService;
+import org.springframework.stereotype.Service;
+
+import java.io.File;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * @author 王葆权
+ * @Title: 根据使用次数缓存文件
+ * @Package org.jeecg.modules.system.service.impl
+ * @Description: 当缓存满了时会移除使用次数最少的对象
+ *               建议只缓存频繁读取的静态文件
+ * @date 2023/12/7 15:44
+ */
+@Service
+public class SysFileCacheServiceImpl implements ISysFileCacheService {
+
+    public final static ConcurrentHashMap<String, LFUFileCache> fileCacheMap = new ConcurrentHashMap<String, LFUFileCache>();
+    private final LFUFileCache defaultLFUFileCache;
+
+    public final static String DEFAULT_CACHE_NAME = "DEF_FILE_CACHE";
+
+    // 最大文件大小，byte数，决定能缓存至少多少文件，大于这个值不被缓存直接读取
+    public final static Integer MAX_FILE_SIZE = 10 * 1024 * 1024; // 10MB
+    // 缓存容量，能容纳的byte数
+    public final static Integer CAPACITY = MAX_FILE_SIZE * 5;
+    // 默认超时时间，0表示无默认超时
+    public final static Integer TIMEOUT = 0;
+
+    public SysFileCacheServiceImpl() {
+        this.defaultLFUFileCache = new LFUFileCache(CAPACITY, MAX_FILE_SIZE, TIMEOUT);
+        fileCacheMap.put(DEFAULT_CACHE_NAME, this.defaultLFUFileCache);
+    }
+
+    /**
+     * 缓存文件
+     *
+     * @param filePath
+     * @return
+     */
+    @Override
+    public byte[] getDefCacheFile(String filePath) {
+        return this.defaultLFUFileCache.getFileBytes(filePath);
+    }
+
+    /**
+     * 缓存文件
+     *
+     * @param file
+     * @return
+     */
+    @Override
+    public byte[] getDefCacheFile(File file) {
+        return this.defaultLFUFileCache.getFileBytes(file);
+    }
+
+    /**
+     * 清理缓存
+     */
+    @Override
+    public void clearDefCache() {
+        this.defaultLFUFileCache.clear();
+    }
+
+    /**
+     * 获取指定名称的缓存 如果存在
+     *
+     * @param cacheName
+     * @return 存在返回缓存类，不存在返回孔
+     */
+    @Override
+    public LFUFileCache getCacheIfExists(String cacheName) {
+        return fileCacheMap.get(cacheName);
+    }
+
+    /**
+     * 获取指定名称的缓存，不存在则创建
+     * @param cacheName 缓存名
+     * @return 缓存对象
+     */
+    @Override
+    public LFUFileCache getFileCache(String cacheName) {
+        LFUFileCache cacheIfExists = getCacheIfExists(cacheName);
+        if (cacheIfExists == null) {
+            createFileCache(cacheName);
+        }
+        return fileCacheMap.get(cacheName);
+    }
+
+    /**
+     * @param cacheName   缓存名
+     * @param capacity    缓存容量
+     * @param maxFileSize 文件最大大小
+     * @param timeout     默认超时时间，0表示无默认超时
+     * @return
+     */
+    @Override
+    public LFUFileCache createFileCache(String cacheName, int capacity, int maxFileSize, long timeout) {
+        LFUFileCache lfuFileCache = new LFUFileCache(capacity, maxFileSize, timeout);
+        fileCacheMap.put(cacheName, lfuFileCache);
+        return lfuFileCache;
+    }
+
+    /**
+     * 超时时间0
+     * @param cacheName   缓存名
+     * @param capacity    缓存容量
+     * @param maxFileSize 文件最大大小
+     * @return
+     */
+    @Override
+    public LFUFileCache createFileCache(String cacheName, int capacity, int maxFileSize) {
+        return createFileCache(cacheName, capacity, maxFileSize, TIMEOUT);
+    }
+
+    /**
+     * 默认缓存大小10M,超时时间0
+     * @param cacheName   缓存名
+     * @param maxFileSize 文件最大大小
+     * @return
+     */
+    @Override
+    public LFUFileCache createFileCache(String cacheName, int maxFileSize) {
+        return createFileCache(cacheName, CAPACITY/5, maxFileSize, TIMEOUT);
+    }
+
+    /**
+     * 默认缓存大小10M,最大文件大小1M,超时时间0
+     * @param cacheName 缓存名
+     * @return
+     */
+    @Override
+    public LFUFileCache createFileCache(String cacheName) {
+        return createFileCache(cacheName, CAPACITY/5, MAX_FILE_SIZE/10, TIMEOUT);
+    }
+
+    /**
+     * 添加缓存类
+     * @param cacheName 缓存的名字
+     * @param fileCache 缓存类
+     * @return 缓存类
+     */
+    @Override
+    public LFUFileCache putFileCache(String cacheName,LFUFileCache fileCache) {
+        fileCacheMap.put(cacheName, fileCache);
+        return fileCache;
+    }
+
+    @Override
+    public LFUFileCache getDefaultLFUFileCache() {
+        return defaultLFUFileCache;
+    }
+}

jlsb/jeecg-boot-module-system/src/main/resources/application-test.yml

@@ -220,7 +220,7 @@ jeecg :
       # 配置百度地图的AK，申请地址：https://lbs.baidu.com/apiconsole/key?application=key#/home
       baidu: ??
   # 在线预览文件服务器地址配置
-  file-view-domain: 127.0.0.1:8012
+  file-view-domain: 127.0.0.1:9999
   # minio文件上传
   minio:
     minio_url: http://minio.jeecg.com

jlsb/pom.xml

@@ -4,7 +4,7 @@
   <artifactId>jeecg-boot-parent</artifactId>
   <version>3.1.0</version>
   <packaging>pom</packaging>
-  
+
   	<parent>
 	    <groupId>org.springframework.boot</groupId>
 	    <artifactId>spring-boot-starter-parent</artifactId>
@@ -226,6 +226,11 @@
 			<!-- hutool工具类-->
 			<dependency>
 				<groupId>cn.hutool</groupId>
+				<artifactId>hutool-all</artifactId>
+				<version>${hutool.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>cn.hutool</groupId>
 				<artifactId>hutool-core</artifactId>
 				<version>${hutool.version}</version>
 			</dependency>
@@ -429,4 +434,4 @@
             </properties>
         </profile>
     </profiles>
-</project>
+</project>