From c73f9b50d47fc20d961e546eac78c265c0532cdc Mon Sep 17 00:00:00 2001
From: zj <1376702416@qq.com>
Date: Wed, 15 Dec 2021 19:54:18 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?=
=?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=BB=98=E8=AE=A4=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/impl/SarFileSplitItemsEOServiceImpl.java | 8 ++++----
.../com/adc/da/att/controller/AttFileEOController.java | 2 +-
.../java/com/adc/da/att/controller/UeditorController.java | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java
index 5ec05134..19cf6cf5 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java
@@ -399,7 +399,7 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic
String imgContent = itemsValEO.getItemContent();
String imgUUIndex = "img" + String.valueOf(imgIndex);
if (StringUtils.isNotEmpty(imgContent)){
- int pathIndex = imgContent.indexOf("src='uploadPath");
+ int pathIndex = imgContent.indexOf("src='file");
if (pathIndex > -1 && imgContent.length()>(pathIndex+16)) {
String imgPath = imgContent.substring(pathIndex+16,imgContent.length()-2);
String imgName = imgUUIndex + "-" +imgPath.substring(imgPath.lastIndexOf("/")+1,imgPath.length());
@@ -525,7 +525,7 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic
AttFileVo attFileVo = attFileEOService.saveFileInfo(nowfilelist.get(0));
if(attFileVo!=null){
isText = false;
- String path = "uploadPath" + attFileVo.getFilePath()+attFileVo.getFileName();
+ String path = "file" + attFileVo.getFilePath()+attFileVo.getFileName();
String imgCon = "![](\'")
";
valEO.setType("IMG");
valEO.setItemContent(imgCon);
@@ -559,7 +559,7 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic
AttFileVo attFileVo = attFileEOService.saveFileInfo(nowfilelist.get(0));
if(attFileVo!=null){
isText = false;
- String path = "uploadPath" + attFileVo.getFilePath()+attFileVo.getFileName();
+ String path = "file" + attFileVo.getFilePath()+attFileVo.getFileName();
String imgCon = "";
valEO.setType("IMG");
valEO.setItemContent(imgCon);
@@ -595,7 +595,7 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic
AttFileVo attFileVo = attFileEOService.saveFileInfo(nowfilelist.get(0));
if(attFileVo!=null){
isText = false;
- String path = "uploadPath" + attFileVo.getFilePath()+attFileVo.getFileName();
+ String path = "file" + attFileVo.getFilePath()+attFileVo.getFileName();
String imgCon = "";
valEO.setType("IMG");
valEO.setItemContent(imgCon);
diff --git a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java
index 475d5f7d..ce965718 100644
--- a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java
+++ b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java
@@ -293,7 +293,7 @@ public class AttFileEOController {
if (!newFile.exists()) {
Files.copy(oldFile.toPath(), newFile.toPath());
}
- filePathResult = "uploadPath/phoneLoadFiles/" + timeStr + "/" + fileOldName;
+ filePathResult = "file/phoneLoadFiles/" + timeStr + "/" + fileOldName;
return Result.success(filePathResult);
} else {
return Result.error("获取文件信息失败");
diff --git a/adc-da-sys/src/main/java/com/adc/da/att/controller/UeditorController.java b/adc-da-sys/src/main/java/com/adc/da/att/controller/UeditorController.java
index f566df77..888609b8 100644
--- a/adc-da-sys/src/main/java/com/adc/da/att/controller/UeditorController.java
+++ b/adc-da-sys/src/main/java/com/adc/da/att/controller/UeditorController.java
@@ -69,9 +69,9 @@ public class UeditorController {
AttFileVo attFileVo= attFileEOService.saveFileInfo(uploadFile);
String picUrlPath ="";
if(StringUtils.isNotEmpty(referer)){
- picUrlPath=referer+"uploadPath"+ attFileVo.getFilePath()+attFileVo.getFileName();
+ picUrlPath=referer+"file"+ attFileVo.getFilePath()+attFileVo.getFileName();
}else{
- picUrlPath="uploadPath"+attFileVo.getFilePath()+attFileVo.getFileName();
+ picUrlPath="file"+attFileVo.getFilePath()+attFileVo.getFileName();
}
log.info("Ueditor 上传图片返回路径："+picUrlPath);
image.setState("SUCCESS");
From fef874c5cec1936bd57086832eb9d423fb06c9c4 Mon Sep 17 00:00:00 2001
From: zj <1376702416@qq.com>
Date: Thu, 16 Dec 2021 09:48:16 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=8E=B7=E5=8F=96?=
=?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=9B=BE=E7=89=87=E5=9C=B0=E5=9D=80=E8=BF=87?=
=?UTF-8?q?=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/java/com/adc/da/login/security/WebMvcConfig.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java
index 492c5ea8..88eba4da 100644
--- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java
+++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java
@@ -91,6 +91,8 @@ public class WebMvcConfig implements WebMvcConfigurer {
addInterceptor.excludePathPatterns("/api/lawss/activiti/exportProcessDetailInfo");
+ addInterceptor.excludePathPatterns("/api/lawss/activiti/getImg");
+
// //测试接口使用
// addInterceptor.excludePathPatterns("/api/**");