From e71bd87b3f06a7357ee5142c8f538736e7ef1efa Mon Sep 17 00:00:00 2001
From: qirong <2032486488@qq.com>
Date: 星期三, 28 二月 2024 10:00:17 +0800
Subject: [PATCH] 修改
---
ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java | 2
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/sync/deleteSync.java | 2
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/sync/VideoPulSync.java | 14 +++++--
pom.xml | 2
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java | 66 ++++++++++++++++----------------
5 files changed, 46 insertions(+), 40 deletions(-)
diff --git a/pom.xml b/pom.xml
index f3498eb..0f814ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
<hutool.version>5.8.22</hutool.version>
<okhttp.version>4.10.0</okhttp.version>
<spring-boot-admin.version>3.1.7</spring-boot-admin.version>
- <redisson.version>3.24.1</redisson.version>
+ <redisson.version>3.24.2</redisson.version>
<lock4j.version>2.2.5</lock4j.version>
<dynamic-ds.version>4.2.0</dynamic-ds.version>
<alibaba-ttl.version>2.14.2</alibaba-ttl.version>
diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java b/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java
index 45810dd..e0ef425 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java
@@ -78,7 +78,7 @@
SysUserVo sysUserVo = userMapper.selectUserByUserName(username);
SysUserRole userRole = new SysUserRole();
userRole.setUserId(sysUserVo.getUserId());
- userRole.setRoleId(Long.valueOf(RoleType.POLICE.getType()));
+ userRole.setRoleId(Long.valueOf(RoleType.VIDEO.getType()));
userRoleMapper.insert(userRole);
recordLogininfor(tenantId, username, Constants.REGISTER, MessageUtils.message("user.register.success"));
}
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 ceed063..a5b58ae 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
@@ -55,7 +55,7 @@
* @author Lion Li
*/
@Slf4j
-//@SaIgnore
+@SaIgnore
@Validated
@RequiredArgsConstructor
@RestController
@@ -89,47 +89,47 @@
return R.ok(list);
}
- /**
- * 涓婁紶OSS瀵硅薄瀛樺偍 瑙嗛涓撶綉
- *
- * @param file 鏂囦欢
- */
- @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 {
-
- if (ObjectUtil.isNull(file)) {
- return R.fail("涓婁紶鏂囦欢涓嶈兘涓虹┖");
- }
- SysOssVo oss = ossService.upload(file);
-
- SysOssUploadVo uploadVo = new SysOssUploadVo();
- uploadVo.setUrl(oss.getUrl());
- uploadVo.setFileName(oss.getOriginalName());
- uploadVo.setOssId(oss.getOssId().toString());
- uploadVo.setPassword(oss.getPassword());
-
- return R.ok(uploadVo);
- }
-
// /**
-// * 涓婁紶OSS瀵硅薄瀛樺偍 浜掕仈缃�
+// * 涓婁紶OSS瀵硅薄瀛樺偍 瑙嗛涓撶綉
// *
// * @param file 鏂囦欢
// */
// @SaCheckPermission("system:oss:upload")
// @Log(title = "OSS瀵硅薄瀛樺偍", businessType = BusinessType.INSERT)
// @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-// public R<String> upload(@RequestPart("file") MultipartFile file) throws IOException {
-// String originalfileName = file.getOriginalFilename();
-// long l = System.currentTimeMillis();
-// String password = PasswordUtil.randomPassword(6);
-// String suffix = StringUtils.substring(originalfileName, originalfileName.lastIndexOf("."), originalfileName.length());
-// FtpApche.uploadFile(ftpConfig, file, password + String.valueOf(l) + suffix);
-// return R.ok(password);
+// public R<SysOssUploadVo> upload(@RequestPart("file") MultipartFile file) throws IOException {
+//
+// if (ObjectUtil.isNull(file)) {
+// return R.fail("涓婁紶鏂囦欢涓嶈兘涓虹┖");
+// }
+// SysOssVo oss = ossService.upload(file);
+//
+// SysOssUploadVo uploadVo = new SysOssUploadVo();
+// uploadVo.setUrl(oss.getUrl());
+// uploadVo.setFileName(oss.getOriginalName());
+// uploadVo.setOssId(oss.getOssId().toString());
+// uploadVo.setPassword(oss.getPassword());
+//
+// return R.ok(uploadVo);
// }
+ /**
+ * 涓婁紶OSS瀵硅薄瀛樺偍 浜掕仈缃�
+ *
+ * @param file 鏂囦欢
+ */
+ @SaCheckPermission("system:oss:upload")
+ @Log(title = "OSS瀵硅薄瀛樺偍", businessType = BusinessType.INSERT)
+ @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+ public R<String> upload(@RequestPart("file") MultipartFile file) throws IOException {
+ String originalfileName = file.getOriginalFilename();
+ long l = System.currentTimeMillis();
+ String password = PasswordUtil.randomPassword(6);
+ String suffix = StringUtils.substring(originalfileName, originalfileName.lastIndexOf("."), originalfileName.length());
+ FtpApche.uploadFile(ftpConfig, file, password + String.valueOf(l) + suffix);
+ return R.ok(password);
+ }
+
private String post(VideoRequest request) throws IOException {
HashMap<String, String> headers = new HashMap<>(3);
String requestUrl = boundary.getChief() + "/resource/synchronization/uploadTwo";
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 192eda8..5209940 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 org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.DateUtils;
import org.dromara.common.oss.core.OssClient;
import org.dromara.common.oss.entity.SynchronousRequest;
@@ -59,11 +60,16 @@
InputStream input = FtpApche.downloadFileFromDailyDir(str);
byte[] fileBytesByName = FtpApche.getFileBytesByName(input);
OssClient storage = OssFactory.instance();
- UploadResult uploadResult = storage.upload(input,getPath(fileName),fileName.substring(14,fileName.length()));
- FtpApche.deleteFile(str);
MultipartFile file = new MockMultipartFile(fileName,fileName, fileName.substring(14,fileName.length()), input);
- buildResultEntity(fileName, fileName.substring(14,fileName.length()), "minio", uploadResult, file,
- password, fileBytesByName);
+// UploadResult uploadResult = storage.upload(input,getPath(fileName),"multipart/form-data; charset=ISO-8859-1");
+ UploadResult uploadResult;
+// try {
+ uploadResult = storage.uploadSuffix2(fileBytesByName, getPath(fileName), "multipart/form-data; charset=ISO-8859-1");
+
+ FtpApche.deleteFile(str);
+ input.close();
+// buildResultEntity(fileName, fileName.substring(14,fileName.length()), "minio", uploadResult, file,
+// password, fileBytesByName);
}
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 a7a9066..7a3a047 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
@@ -25,7 +25,7 @@
}
-// @Scheduled(cron = "0 */10 * * * ?")
+ @Scheduled(cron = "0 */10 * * * ?")
public void remove() throws IOException {
System.out.println("鍚屾鍒犻櫎......");
List<SysOssVo> list = baseMapper.selectVoList(new LambdaQueryWrapper<SysOss>()
--
Gitblit v1.8.0