zhanghua
2024-11-14 2cd8f35436fd324431f1ae78196f8140ecb3d8b0
Merge branch '视频专网' of http://42.193.1.25:9521/r/~qirong/qyspzw into 视频专网
4个文件已修改
32 ■■■■ 已修改文件
ruoyi-extend/ruoyi-powerjob-server/src/main/resources/application.properties 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/sync/VideoPulSync.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/sync/deleteSync.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-extend/ruoyi-powerjob-server/src/main/resources/application.properties
@@ -27,6 +27,8 @@
# Actuator 监控端点的配置项
spring.application.name: ruoyi-powerjob-server
management.server.port=-1
management.endpoints.enabled-by-default=false
management.endpoints.web.exposure.include=*
management.endpoint.health.show-details=ALWAYS
management.endpoint.logfile.external-file=./logs/ruoyi-powerjob-server.log
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java
@@ -70,7 +70,7 @@
    /**
     * 查询OSS对象存储列表
     */
    @SaCheckPermission("system:oss:list")
//    @SaCheckPermission("system:oss:list")
    @GetMapping("/list")
    public TableDataInfo<SysOssVo> list(@Validated(QueryGroup.class) SysOssBo bo, PageQuery pageQuery) {
        return ossService.queryPageList(bo, pageQuery);
@@ -94,7 +94,7 @@
     *
     * @param file 文件
     */
    @SaCheckPermission("system:oss:upload")
//    @SaCheckPermission("system:oss:upload")
    @Log(title = "OSS对象存储", businessType = BusinessType.INSERT)
    @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
    public R<SysOssUploadVo> upload(@RequestPart("file") MultipartFile file) throws IOException {
@@ -148,7 +148,7 @@
     *
     * @param ossId OSS对象ID
     */
    @SaCheckPermission("system:oss:download")
//    @SaCheckPermission("system:oss:download")
    @GetMapping("/download/{ossId}/{password}")
    public R<String> download(@PathVariable Long ossId, @PathVariable String password, HttpServletResponse response) throws IOException {
        if (String.valueOf(ossId).equals("12345678")) {
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/sync/VideoPulSync.java
@@ -2,6 +2,7 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.DateUtils;
import org.dromara.common.oss.core.OssClient;
@@ -31,6 +32,7 @@
import java.util.HashMap;
import java.util.List;
@Slf4j
@Component
public class VideoPulSync {
@@ -47,11 +49,15 @@
    @Scheduled(cron = "0 0/1 * * * ?")
    public void get() throws IOException {
        System.out.println("同步上传......");
        log.info("同步上传");
        List<String> list = FtpApche.downloadList(ftpConfig);
        if(list.size() == 0){
            log.error("no files in ftp");
            System.out.println("ftp get 0 fileinfo");
            return;
        }
        System.out.println("ftp get all fileinfo:" + list.get(0));
        for (String str : list) {
            String password = str.substring(0, 6);
            String fileName = str.substring(6, str.length());
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/sync/deleteSync.java
@@ -34,9 +34,23 @@
            return;
        }
        for (Long ossId : ids) {
            baseMapper.deleteById(ossId);
            HttpUtils.sendDeleteRequest(boundary.getVideo() + "/resource/synchronization/delete",
                String.valueOf(ossId));
        }
    }
    /**
     * 每小时删除30天之前的文件信息,确保上面的定时任务不会因为停电关机等原因导致文件未被删除
     *
     * @throws IOException
     */
    @Scheduled(cron = "0 0 * * * ?")
    public void removeOssTable() throws IOException {
        System.out.println("每小时定时删除超过30天的数据库文件信息......");
        List<Long> ids = baseMapper.getWillDeleted(LocalDateTime.now().minusDays(30));
        if (ids.size() == 0) {
            return;
        }
        baseMapper.deleteBatchIds(ids);
    }
}