From 774c8b2ee14eef5fd10bbd46d85a180e7b19ab21 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Fri, 22 Mar 2024 14:34:12 +0800
Subject: [PATCH] 查询过滤优化
---
src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java | 80 +++++++++++++++++++++++++++++++++++++--
1 files changed, 75 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java b/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
index 4f1b37e..c40fa1e 100644
--- a/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
+++ b/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
@@ -16,9 +16,14 @@
*/
package org.springblade.modules.resource.endpoint;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.JSONPObject;
import io.swagger.annotations.Api;
import lombok.AllArgsConstructor;
import lombok.SneakyThrows;
+import org.springblade.common.utils.ImageUtils;
+import org.springblade.common.utils.WeiXinSecurityUtil;
import org.springblade.core.launch.constant.AppConstant;
import org.springblade.core.oss.model.BladeFile;
import org.springblade.core.oss.model.OssFile;
@@ -28,11 +33,23 @@
import org.springblade.core.tool.constant.RoleConstant;
import org.springblade.core.tool.utils.FileUtil;
import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.ImageUtil;
import org.springblade.modules.resource.builder.oss.OssBuilder;
import org.springblade.modules.resource.entity.Attach;
+import org.springblade.modules.resource.entity.AttachData;
+import org.springblade.modules.resource.service.IAttachDataService;
import org.springblade.modules.resource.service.IAttachService;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.BufferedReader;
+import java.io.DataOutputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
/**
* 对象存储端点
@@ -55,6 +72,11 @@
* 附件表服务
*/
private final IAttachService attachService;
+
+ /**
+ * 附件数据表服务
+ */
+ private final IAttachDataService attachDataService;
/**
* 创建存储桶
@@ -149,7 +171,7 @@
// 修改link
changeLink(bladeFile);
// 返回
- return R.data(bladeFile);
+ return R.data(200,bladeFile,"");
}
/**
@@ -218,15 +240,27 @@
*
* @param file 文件
* @param prefixPath 文件
+ * @param isCheck 是否校验
* @return ObjectStat
*/
@SneakyThrows
@PostMapping("/put-file-by-prefix-path")
- public R<BladeFile> putFileByPrefixPath(@RequestParam MultipartFile file,@RequestParam(required = false) String prefixPath) {
+ public R<BladeFile> putFileByPrefixPath(@RequestParam MultipartFile file,
+ @RequestParam(required = false) String prefixPath,
+ @RequestParam(required = false) Integer isCheck) {
+ // 不传默认不检验
+ if(null!=isCheck){
+ String checkResult = WeiXinSecurityUtil.checkImg(file);
+ JSONObject jsonObject = JSONObject.parseObject(checkResult);
+ Integer errorCode = Integer.parseInt(jsonObject.getString("errcode"));
+ if (errorCode!=0){
+ return R.data(201,null,"图片存在敏感内容，请更换其他图片!");
+ }
+ }
BladeFile bladeFile = ossBuilder.templateByPrefixPath(prefixPath).putFile(file.getOriginalFilename(), file.getInputStream());
// 修改link
changeLink(bladeFile);
- return R.data(bladeFile);
+ return R.data(200,bladeFile,"");
}
/**
@@ -234,18 +268,31 @@
*
* @param file 文件
* @param prefixPath 文件
+ * @param isCheck 是否校验
* @return ObjectStat
*/
@SneakyThrows
@PostMapping("/put-file-attach-by-prefix-path")
- public R<BladeFile> putFileAttachByPrefixPath(@RequestParam MultipartFile file,@RequestParam(required = false) String prefixPath) {
+ public R<BladeFile> putFileAttachByPrefixPath(@RequestParam MultipartFile file,
+ @RequestParam(required = false) String prefixPath,
+ @RequestParam(required = false) Integer isCheck) {
+ // 不传默认不检验
+ if(null!=isCheck){
+ String checkResult = WeiXinSecurityUtil.checkImg(file);
+ JSONObject jsonObject = JSONObject.parseObject(checkResult);
+ Integer errorCode = Integer.parseInt(jsonObject.getString("errcode"));
+ if (errorCode!=0){
+ return R.data(201,null,"图片存在敏感内容，请更换其他图片!");
+ }
+ }
String fileName = file.getOriginalFilename();
BladeFile bladeFile = ossBuilder.templateByPrefixPath(prefixPath).putFile(file.getOriginalFilename(), file.getInputStream());
Long attachId = buildAttach(fileName, file.getSize(), bladeFile);
+ buildAttachData(attachId,fileName, file.getSize(), bladeFile,file);
bladeFile.setAttachId(attachId);
// 修改link
changeLink(bladeFile);
- return R.data(bladeFile);
+ return R.data(200,bladeFile,"");
}
/**
@@ -266,6 +313,28 @@
attach.setAttachSize(fileSize);
attach.setExtension(fileExtension);
attachService.save(attach);
+ return attach.getId();
+ }
+
+ /**
+ * 构建附件数据表
+ *
+ * @param attachId 附件id
+ * @param fileName 文件名
+ * @param fileSize 文件大小
+ * @param bladeFile 对象存储文件
+ * @return attachId
+ */
+ private Long buildAttachData(Long attachId,String fileName, Long fileSize, BladeFile bladeFile,MultipartFile file) {
+ String fileExtension = FileUtil.getFileExtension(fileName);
+ AttachData attach = new AttachData();
+ attach.setAttachId(attachId);
+ attach.setName(bladeFile.getName());
+ attach.setOriginalName(bladeFile.getOriginalName());
+ attach.setSize(fileSize);
+ attach.setExtension(fileExtension);
+ attach.setData(ImageUtils.mulToBase64(file));
+ attachDataService.save(attach);
return attach.getId();
}
@@ -297,4 +366,5 @@
return R.success("操作成功");
}
+
}
--
Gitblit v1.9.3