From 86abfc7d0a96f627853273256db4bfb501b866da Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期三, 05 三月 2025 17:40:56 +0800
Subject: [PATCH] feat: 增加上传目录参数、新增图片回显接口
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TencentCosUtil.java | 84 ++++++++++++++-------------
ruoyi-admin/src/main/resources/application-test.yml | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/COSController.java | 39 +++++++++++--
ruoyi-admin/src/main/resources/application-prod.yml | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/BankOutController.java | 5 +
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java | 2
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java | 2
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/WordUtil.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/PdfUtils.java | 2
10 files changed, 89 insertions(+), 53 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/BankOutController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/BankOutController.java
index c474d4d..bcb7af3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/BankOutController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/BankOutController.java
@@ -29,7 +29,10 @@
return result.getBack();
}
-
+ @PostMapping(value = "bills")
+ public @ResponseBody String bills(HttpServletRequest request){
+ return "";
+ }
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/COSController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/COSController.java
index dad3be4..6aa9856 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/COSController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/COSController.java
@@ -2,7 +2,9 @@
import com.alibaba.fastjson2.JSON;
import com.ruoyi.common.config.FileUploadConfig;
+import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.model.TFile;
@@ -68,7 +70,7 @@
String token = tokenService.getLoginUser().getToken();
StringBuffer url = new StringBuffer();
url.append(getLocalUrlPrefix())
- .append("/cos/get/").append(fileId).append("&s=").append(URLEncoder.encode(token))
+ .append("/cos/get/").append(fileId).append("?s=").append(URLEncoder.encode(token))
;
return url.toString();
}
@@ -99,7 +101,8 @@
}
}
-
+ @Autowired
+ private RedisCache redisCache;
@GetMapping("get/{fileId}")
public void get(@PathVariable("fileId") String fileid,@RequestParam("s") String s){
@@ -111,6 +114,11 @@
failResponse("token不能为空");
return;
}
+ Object object = redisCache.getCacheObject(CacheConstants.LOGIN_TOKEN_KEY + s);
+ if (object==null){
+ failResponse("用户登录已失效");
+ return;
+ }
TFile file = sysFileService.getById(fileid);
if (file==null){
failResponse("图片不存在");
@@ -119,8 +127,27 @@
tencentCosUtil.download(file);
}
+
+ @GetMapping("get/file")
+ public void getFile(@RequestParam("fileUrl") String fileUrl,@RequestParam("s") String s){
+ if (StringUtils.isEmpty(fileUrl)){
+ failResponse("文件路径不能为空");
+ return;
+ }
+ if (StringUtils.isEmpty(s)){
+ failResponse("token不能为空");
+ return;
+ }
+ Object object = redisCache.getCacheObject(CacheConstants.LOGIN_TOKEN_KEY + s);
+ if (object==null){
+ failResponse("用户登录已失效");
+ return;
+ }
+ tencentCosUtil.download(fileUrl);
+ }
+
/**
- *
+ * 新上传接口，下一版更新
* @param file
* @param folder 上传到cos的文件目录：如/contract/
* @return
@@ -130,7 +157,7 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "文件", name = "file", dataType = "MultipartFile", required = true)
})
- public R<TFile> upload(@RequestParam("file") MultipartFile file, @RequestParam("folder") String folder) {
+ public R<TFile> uploadnew(@RequestParam("file") MultipartFile file, @RequestParam("folder") String folder) {
TFile tFile = tencentCosUtil.upload(file,folder);
tFile.setFileUrl(getLocalFileUrlPrefix(tFile.getId()));
return R.ok(tFile);
@@ -147,8 +174,8 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "文件", name = "file", dataType = "MultipartFile", required = true)
})
- public R<String> upload(@RequestParam("file") MultipartFile file) {
- String url = tencentCosUtil.upLoadFile(file);
+ public R<String> upload(@RequestParam("file") MultipartFile file,@RequestParam("folder") String folder) {
+ String url = tencentCosUtil.upLoadFile(file,folder);
return R.ok(url, url);
}
@PostMapping("/downloadImg")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/PdfUtils.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/PdfUtils.java
index 71c5a6c..c786d9b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/PdfUtils.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/PdfUtils.java
@@ -50,7 +50,7 @@
//上传图片
byte2File(stream.toByteArray(),filePath + "/pdf",fileName.substring(0,fileName.lastIndexOf(".")) + ".pdf");
MultipartFile multipartFile = convertToMultipartFile(stream,fileName.substring(0,fileName.lastIndexOf(".")) );
- String s = tencentCosUtil.upLoadFile(multipartFile);
+ String s = tencentCosUtil.upLoadFile(multipartFile,"/wordToPdf");
stream.close();
inputStream.close();
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TencentCosUtil.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TencentCosUtil.java
index d74cf21..3834733 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TencentCosUtil.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TencentCosUtil.java
@@ -60,7 +60,7 @@
/**
* 上传文件，并存入sys_file,返回文件的主键ID
* @param file
- * @param folder
+ * @param folder 格式：/xxxxx,/xxxx/xxxx ，最后不用加斜杠
* @return
*/
public TFile upload(MultipartFile file, String folder){
@@ -75,12 +75,11 @@
String fileType = originalFilename.substring(originalFilename.lastIndexOf("."));
//使用UUID工具 创建唯一名称，放置文件重名被覆盖，在拼接上上命令获取的文件类型
String fileName = UUID.randomUUID() + fileType;
-
- String name = (StringUtils.isNotEmpty(folder)?
+ String filePath = (StringUtils.isNotEmpty(folder)?
folder+"/"
:"/default/") + DateUtil.format(new Date(),NORM_DATE_FORMAT)+"/"+fileName;
// 指定文件上传到 COS 上的路径，即对象键。最终文件会传到存储桶名字中的images文件夹下的fileName名字
- String key = cosConfig.getLocation()+"/" + fileName;
+ filePath = cosConfig.getLocation() + filePath;
// 创建上传Object的Metadata
ObjectMetadata objectMetadata = new ObjectMetadata();
// - 使用输入流存储，需要设置请求长度
@@ -90,12 +89,12 @@
// - 设置Content-Type
objectMetadata.setContentType(fileType);
//上传文件
- cosClient.putObject(cosConfig.getBucketName(), key, inputStream, objectMetadata);
+ cosClient.putObject(cosConfig.getBucketName(), filePath, inputStream, objectMetadata);
TFile tFile = new TFile();
- tFile.setFileName(name);
+ tFile.setFileName(filePath);
tFile.setRealName(originalFilename);
tFile.setFileType(fileType);
- tFile.setUrl(cosConfig.getRootSrc()+key);
+ tFile.setUrl(cosConfig.getRootSrc()+filePath);
tFile.setContentType(file.getContentType());
tFile.setFileSize(file.getSize());
sysFileService.save(tFile);
@@ -113,7 +112,7 @@
* @param file
* @return 返回文件的浏览全路径
*/
- public String upLoadFile(MultipartFile file) {
+ public String upLoadFile(MultipartFile file,String folder) {
try {
// 获取上传的文件的输入流
InputStream inputStream = file.getInputStream();
@@ -124,7 +123,11 @@
//使用UUID工具 创建唯一名称，放置文件重名被覆盖，在拼接上上命令获取的文件类型
String fileName = UUID.randomUUID() + fileType;
// 指定文件上传到 COS 上的路径，即对象键。最终文件会传到存储桶名字中的images文件夹下的fileName名字
- String key = cosConfig.getLocation()+"/" + fileName;
+ String filePath = (StringUtils.isNotEmpty(folder)?
+ folder+"/"
+ :"/default/") + DateUtil.format(new Date(),NORM_DATE_FORMAT)+"/"+fileName;
+
+ filePath = cosConfig.getLocation()+"/" + filePath;
// 创建上传Object的Metadata
ObjectMetadata objectMetadata = new ObjectMetadata();
// - 使用输入流存储，需要设置请求长度
@@ -134,9 +137,9 @@
// - 设置Content-Type
objectMetadata.setContentType(fileType);
//上传文件
- PutObjectResult putResult = cosClient.putObject(cosConfig.getBucketName(), key, inputStream, objectMetadata);
+ PutObjectResult putResult = cosClient.putObject(cosConfig.getBucketName(), filePath, inputStream, objectMetadata);
// 创建文件的网络访问路径
- String url = cosConfig.getRootSrc() + key;
+ String url = cosConfig.getRootSrc() + filePath;
return url;
} catch (Exception e) {
e.printStackTrace();
@@ -155,15 +158,6 @@
HttpServletResponse response = WebUtils.response();
String replace = file.replace(cosConfig.getRootSrc(), "");
response.setHeader("Access-Control-Expose-Headers","File-Type");
- COSCredentials cred = new BasicCOSCredentials(
- cosConfig.getSecretId(),
- cosConfig.getSecretKey());
- // 2.1 设置存储桶的地域（上文获得）
- Region region = new Region(cosConfig.getBucketAddr());
- ClientConfig clientConfig = new ClientConfig(region);
- // 2.2 使用https协议传输
- clientConfig.setHttpProtocol(HttpProtocol.https);
- COSClient cosClient = new COSClient(cred, clientConfig);
try {
// 5. 下载文件并获取输入流
InputStream inputStream = cosClient.getObject(cosConfig.getBucketName(), replace).getObjectContent();
@@ -184,15 +178,6 @@
public String downLoadFileImg(String file) {
byte[] data = null;
String replace = file.replace(cosConfig.getRootSrc(), "");
- COSCredentials cred = new BasicCOSCredentials(
- cosConfig.getSecretId(),
- cosConfig.getSecretKey());
- // 2.1 设置存储桶的地域（上文获得）
- Region region = new Region(cosConfig.getBucketAddr());
- ClientConfig clientConfig = new ClientConfig(region);
- // 2.2 使用https协议传输
- clientConfig.setHttpProtocol(HttpProtocol.https);
- COSClient cosClient = new COSClient(cred, clientConfig);
try {
// 5. 下载文件并获取输入流
InputStream inputStream = cosClient.getObject(cosConfig.getBucketName(), replace).getObjectContent();
@@ -213,22 +198,39 @@
return Base64.getEncoder().encodeToString(data);
}
- public void download(TFile file) {
+ public void download(String fileUrl) {
HttpServletResponse response = WebUtils.response();
- COSCredentials cred = new BasicCOSCredentials(
- cosConfig.getSecretId(),
- cosConfig.getSecretKey());
- // 2.1 设置存储桶的地域（上文获得）
- Region region = new Region(cosConfig.getBucketAddr());
- ClientConfig clientConfig = new ClientConfig(region);
- // 2.2 使用https协议传输
- clientConfig.setHttpProtocol(HttpProtocol.https);
- COSClient cosClient = new COSClient(cred, clientConfig);
+ fileUrl = fileUrl.replace(cosConfig.getRootSrc(), "");
+
// 5. 下载文件并获取输入流
- COSObject object = cosClient.getObject(cosConfig.getBucketName(), file.getUrl());
+ COSObject object = cosClient.getObject(cosConfig.getBucketName(),fileUrl);
try (
InputStream is = object.getObjectContent();
OutputStream os = response.getOutputStream()
+ ) {
+ String fileName = fileUrl.substring(fileUrl.lastIndexOf("/"));
+ response.setContentType(object.getObjectMetadata().getContentType() + ";charset=utf-8");
+ String filename = new String(fileName.getBytes("UTF-8"), "ISO-8859-1");
+ response.addHeader("Content-Disposition", "attachment;filename=" + filename);
+ response.addHeader("Content-Length", "" + object.getObjectMetadata().getContentLength());
+ int len = 0;
+ byte[] buffer = new byte[2048];
+ while ((len = is.read(buffer)) > 0) {
+ os.write(buffer, 0, len);
+ }
+ os.flush();
+ } catch (IOException e) {
+ log.error("读取cos图片发生异常", e);
+ }
+ }
+
+ public void download(TFile file) {
+ HttpServletResponse response = WebUtils.response();
+ // 5. 下载文件并获取输入流
+ COSObject object = cosClient.getObject(cosConfig.getBucketName(), file.getFileName());
+ try (
+ InputStream is = object.getObjectContent();
+ OutputStream os = response.getOutputStream()
) {
response.setContentType(file.getContentType() + ";charset=utf-8");
String filename = new String(file.getRealName().getBytes("UTF-8"), "ISO-8859-1");
@@ -244,4 +246,6 @@
log.error("读取cos图片发生异常", e);
}
}
+
+
}
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/WordUtil.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/WordUtil.java
index 85a55ce..ce14b96 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/WordUtil.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/WordUtil.java
@@ -101,7 +101,7 @@
fis.read(fileContent);
}
MultipartFile mockMultipartFile = new MockMultipartFile(encodedFileName+".doc", fileContent);
- String s = tencentCosUtil.upLoadFile(mockMultipartFile);
+ String s = tencentCosUtil.upLoadFile(mockMultipartFile,"/wordGenerate");
return s;
} catch (IOException | TemplateException e) {
log.error("生成Word文档异常，异常原因：{}", e.getMessage(), e);
diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
index caf8b52..99a087e 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -213,4 +213,4 @@
bucket: xzgttest-1305134071
bucketAddr: ap-chengdu
rootSrc: https://xzgttest-1305134071.cos.ap-chengdu.myqcloud.com/
- location: xizang
\ No newline at end of file
+ location: /xizang
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/application-test.yml b/ruoyi-admin/src/main/resources/application-test.yml
index c876dc8..f4b61c4 100644
--- a/ruoyi-admin/src/main/resources/application-test.yml
+++ b/ruoyi-admin/src/main/resources/application-test.yml
@@ -221,7 +221,7 @@
bucket: xzgttest-1305134071
bucketAddr: ap-chengdu
rootSrc: https://xzgttest-1305134071.cos.ap-chengdu.myqcloud.com/
- location: xizang
+ location: /xizang
sms:
enable: true
appId: 1400957506
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
index 5f90047..b4118dc 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
@@ -119,7 +119,7 @@
"/operations/getBySingleNum/**",
"/user/getUserInfoByNumber/**",
"/wxLogin/**",
- "/open/**"
+ "/open/**","/cos/get/**"
).permitAll()
// 静态资源，可匿名访问
.antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
index 90ab01b..206c1a4 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
@@ -208,6 +208,8 @@
public boolean verifyToken(String token)
{
+ Claims claims = parseToken(token);
+
return true;
}
/**
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java
index 2d778f6..ecc4884 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java
@@ -252,7 +252,7 @@
throw new ServiceException("实付金额不能高于于流水可抵扣剩余金额");
}
//如果实付金额大于欠费金额
- if (dto.getAmount().compareTo(bill.getOutstandingMoney())>=0){
+ if (dto.getAmount().compareTo(bill.getOutstandingMoney())>0){
throw new ServiceException("实付金额不能高于该账单欠费金额");
}
--
Gitblit v1.7.1