QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 车型项目导入

Browse Source
This commit is contained in:
mzaxd
2024-08-01 09:25:18 +08:00
parent af71b90c28
commit 78286d7c53
8 changed files with 213 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-module-system/src/main/java/com/jero/modules/oss/service/IOSSFileService.java
+10 -4
View File
@@ -1,13 +1,14 @@
package com.jero.modules.oss.service;
import java.io.File;
import java.io.IOException;
import java.util.List;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.common.api.vo.Result;
import com.jero.modules.oss.entity.OSSFile;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.util.List;
public interface IOSSFileService extends IService<OSSFile> {
void upload(MultipartFile multipartFile) throws IOException;
@@ -27,4 +28,9 @@ public interface IOSSFileService extends IService<OSSFile> {
void updateFileInfo(List<OSSFile> ossFileList);
OSSFile uploadLocalOfCos(MultipartFile mf, String bizPath, String state, String cut);
Result<OSSFile> outUpload(HttpServletRequest request);
Result<OSSFile> commonUpload(MultipartFile file, String bizPath);
}
laws-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java
+70
View File
@@ -2,11 +2,14 @@ package com.jero.modules.oss.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.api.vo.Result;
import com.jero.common.constant.CommonConstant;
import com.jero.common.constant.enums.LanguageEnum;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.CommonUtils;
import com.jero.common.util.MinioUtil;
import com.jero.common.util.oConvertUtils;
import com.jero.common.util.obs.ObsBootUtil;
import com.jero.common.util.oss.OssBootUtil;
import com.jero.modules.oss.entity.OSSFile;
@@ -19,7 +22,9 @@ import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.util.*;
@@ -29,6 +34,11 @@ public class OSSFileServiceImpl extends ServiceImpl<OSSFileMapper, OSSFile> impl
private String uploadpath;
@Value(value = "${jero.path.uploadCos}")
private String uploadCospath;
/**
* 本地：local minio：minio 阿里：alioss
*/
@Value(value = "${jero.uploadType}")
private String uploadType;
/**
* 文件后缀黑名单
*/
@@ -335,4 +345,64 @@ public class OSSFileServiceImpl extends ServiceImpl<OSSFileMapper, OSSFile> impl
oSSFile.setUrl(null);
return oSSFile;
}
@Override
public Result<OSSFile> outUpload(HttpServletRequest request) {
Result<OSSFile> result = new Result<>();
String savePath = "";
String bizPath = request.getParameter("biz");
//sys/common/upload接口存在任意文件上传漏洞
if (oConvertUtils.isNotEmpty(bizPath) && (bizPath.contains("../") || bizPath.contains("..\\"))) {
throw new JeroBootException("上传目录bizPath，格式非法！");
}
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
// 获取上传文件对象
MultipartFile file = multipartRequest.getFile("file");
if (file == null) {
return result;
}
return commonUpload(file, bizPath);
}
@Override
public Result<OSSFile> commonUpload(MultipartFile file, String bizPath) {
Result<OSSFile> result = new Result<>();
String savePath = "";
// 文件类型是否处于黑名单
if (CommonUtils.limitFileSuffix(file.getOriginalFilename(), fileSuffixLimits)) {
result.setMessage("该文件类型不允许上传");
result.setSuccess(false);
result.setCode(0);
return result;
}
if (oConvertUtils.isEmpty(bizPath)) {
bizPath = "";
}
if (CommonConstant.UPLOAD_TYPE_LOCAL.equals(uploadType)) {
// 本地上传
savePath = CommonUtils.uploadLocal(file, bizPath, uploadpath);
} else {
// minio上传
savePath = CommonUtils.upload(file, bizPath, uploadType);
}
if (oConvertUtils.isNotEmpty(savePath)) {
//上传成功 进行数据库存储
OSSFile ossFile = new OSSFile();
// 文件名
String fileName = file.getOriginalFilename();
fileName = CommonUtils.getFileName(fileName);
ossFile.setFileName(fileName);
ossFile.setUrl(savePath);
this.save(ossFile);
result.setMessage(savePath);
result.setResult(ossFile);
result.setSuccess(true);
} else {
result.setMessage("上传失败！");
result.setSuccess(false);
}
return result;
}
}
laws-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java
+5 -55
View File
@@ -1,7 +1,5 @@
package com.jero.modules.system.controller;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -9,12 +7,14 @@ import com.jero.common.api.vo.Result;
import com.jero.common.constant.CommonConstant;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.util.*;
import com.jero.common.util.MinioUtil;
import com.jero.common.util.RestUtil;
import com.jero.common.util.TokenUtils;
import com.jero.common.util.oConvertUtils;
import com.jero.common.util.obs.ObsBootUtil;
import com.jero.modules.oss.entity.OSSFile;
import com.jero.modules.oss.service.IOSSFileService;
import com.jero.modules.system.util.SysWaterMarkUtil;
import com.jero.modules.system.util.UserUtils;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -25,8 +25,6 @@ import org.springframework.http.ResponseEntity;
import org.springframework.http.server.ServletServerHttpRequest;
import org.springframework.util.AntPathMatcher;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.HandlerMapping;
import org.springframework.web.servlet.ModelAndView;
@@ -95,55 +93,7 @@ public class CommonController {
*/
@PostMapping(value = "/upload")
public Result<OSSFile> upload(HttpServletRequest request, HttpServletResponse response) {
Result<OSSFile> result = new Result<>();
String savePath = "";
String bizPath = request.getParameter("biz");
//sys/common/upload接口存在任意文件上传漏洞
if (oConvertUtils.isNotEmpty(bizPath) && (bizPath.contains("../") || bizPath.contains("..\\"))) {
throw new JeroBootException("上传目录bizPath，格式非法！");
}
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
// 获取上传文件对象
MultipartFile file = multipartRequest.getFile("file");
if (file == null) {
return result;
}
// 文件类型是否处于黑名单
if (CommonUtils.limitFileSuffix(file.getOriginalFilename(), fileSuffixLimits)) {
result.setMessage("该文件类型不允许上传");
result.setSuccess(false);
result.setCode(0);
return result;
}
if (oConvertUtils.isEmpty(bizPath)) {
bizPath = "";
}
if (CommonConstant.UPLOAD_TYPE_LOCAL.equals(uploadType)) {
// 本地上传
savePath = CommonUtils.uploadLocal(file, bizPath, uploadpath);
} else {
// minio上传
savePath = CommonUtils.upload(file, bizPath, uploadType);
}
if (oConvertUtils.isNotEmpty(savePath)) {
//上传成功 进行数据库存储
OSSFile ossFile = new OSSFile();
// 文件名
String fileName = file.getOriginalFilename();
fileName = CommonUtils.getFileName(fileName);
ossFile.setFileName(fileName);
ossFile.setUrl(savePath);
ossFileService.save(ossFile);
result.setMessage(savePath);
result.setResult(ossFile);
result.setSuccess(true);
} else {
result.setMessage("上传失败！");
result.setSuccess(false);
}
return result;
return ossFileService.outUpload(request);
}