From 2cd8f35436fd324431f1ae78196f8140ecb3d8b0 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 14 十一月 2024 11:25:11 +0800
Subject: [PATCH] Merge branch '视频专网' of http://42.193.1.25:9521/r/~qirong/qyspzw into 视频专网
---
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/sync/deleteSync.java | 16 +++++++++++++++-
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/sync/VideoPulSync.java | 8 +++++++-
ruoyi-extend/ruoyi-powerjob-server/src/main/resources/application.properties | 2 ++
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java | 6 +++---
4 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/application.properties b/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/application.properties
index 5b6516c..dc2cdf3 100644
--- a/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/application.properties
+++ b/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
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java
index 9765cf1..0992b74 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java
+++ b/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")) {
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/sync/VideoPulSync.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/sync/VideoPulSync.java
index 2dba841..c5a32aa 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/sync/VideoPulSync.java
+++ b/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());
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/sync/deleteSync.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/sync/deleteSync.java
index f93cf6f..98334b1 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/sync/deleteSync.java
+++ b/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);
+ }
}
--
Gitblit v1.8.0