FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop_master' into develop_3

Browse Source
This commit is contained in:
zhaokaiyao@91isoft.com
2021-12-16 10:40:59 +08:00
parent a642c5eaa5 067558303a
commit 440f0323d6
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java
+2
View File
@@ -91,6 +91,8 @@ public class WebMvcConfig implements WebMvcConfigurer {
addInterceptor.excludePathPatterns("/api/lawss/activiti/exportProcessDetailInfo"); addInterceptor.excludePathPatterns("/api/lawss/activiti/exportProcessDetailInfo");
addInterceptor.excludePathPatterns("/api/lawss/activiti/getImg");
// //测试接口使用 // //测试接口使用
// addInterceptor.excludePathPatterns("/api/**"); // addInterceptor.excludePathPatterns("/api/**");
adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java
+4 -4
View File
@@ -399,7 +399,7 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic
String imgContent = itemsValEO.getItemContent(); String imgContent = itemsValEO.getItemContent();
String imgUUIndex = "img" + String.valueOf(imgIndex); String imgUUIndex = "img" + String.valueOf(imgIndex);
if (StringUtils.isNotEmpty(imgContent)){ if (StringUtils.isNotEmpty(imgContent)){
int pathIndex = imgContent.indexOf("src='uploadPath"); int pathIndex = imgContent.indexOf("src='file");
if (pathIndex > -1 && imgContent.length()>(pathIndex+16)) { if (pathIndex > -1 && imgContent.length()>(pathIndex+16)) {
String imgPath = imgContent.substring(pathIndex+16,imgContent.length()-2); String imgPath = imgContent.substring(pathIndex+16,imgContent.length()-2);
String imgName = imgUUIndex + "-" +imgPath.substring(imgPath.lastIndexOf("/")+1,imgPath.length()); 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)); AttFileVo attFileVo = attFileEOService.saveFileInfo(nowfilelist.get(0));
if(attFileVo!=null){ if(attFileVo!=null){
isText = false; isText = false;
String path = "uploadPath" + attFileVo.getFilePath()+attFileVo.getFileName(); String path = "file" + attFileVo.getFilePath()+attFileVo.getFileName();
String imgCon = "<img class=\'wordImg\' src=\'" + path + "\'>"; String imgCon = "<img class=\'wordImg\' src=\'" + path + "\'>";
valEO.setType("IMG"); valEO.setType("IMG");
valEO.setItemContent(imgCon); valEO.setItemContent(imgCon);
@@ -559,7 +559,7 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic
AttFileVo attFileVo = attFileEOService.saveFileInfo(nowfilelist.get(0)); AttFileVo attFileVo = attFileEOService.saveFileInfo(nowfilelist.get(0));
if(attFileVo!=null){ if(attFileVo!=null){
isText = false; isText = false;
String path = "uploadPath" + attFileVo.getFilePath()+attFileVo.getFileName(); String path = "file" + attFileVo.getFilePath()+attFileVo.getFileName();
String imgCon = "<img class=\'wordImg\' src=\'" + path + "\'>"; String imgCon = "<img class=\'wordImg\' src=\'" + path + "\'>";
valEO.setType("IMG"); valEO.setType("IMG");
valEO.setItemContent(imgCon); valEO.setItemContent(imgCon);
@@ -595,7 +595,7 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic
AttFileVo attFileVo = attFileEOService.saveFileInfo(nowfilelist.get(0)); AttFileVo attFileVo = attFileEOService.saveFileInfo(nowfilelist.get(0));
if(attFileVo!=null){ if(attFileVo!=null){
isText = false; isText = false;
String path = "uploadPath" + attFileVo.getFilePath()+attFileVo.getFileName(); String path = "file" + attFileVo.getFilePath()+attFileVo.getFileName();
String imgCon = "<img class=\'wordImg\' src=\'" + path + "\'>"; String imgCon = "<img class=\'wordImg\' src=\'" + path + "\'>";
valEO.setType("IMG"); valEO.setType("IMG");
valEO.setItemContent(imgCon); valEO.setItemContent(imgCon);
adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java
+1 -1
View File
@@ -293,7 +293,7 @@ public class AttFileEOController {
if (!newFile.exists()) { if (!newFile.exists()) {
Files.copy(oldFile.toPath(), newFile.toPath()); Files.copy(oldFile.toPath(), newFile.toPath());
} }
filePathResult = "uploadPath/phoneLoadFiles/" + timeStr + "/" + fileOldName; filePathResult = "file/phoneLoadFiles/" + timeStr + "/" + fileOldName;
return Result.success(filePathResult); return Result.success(filePathResult);
} else { } else {
return Result.error("获取文件信息失败"); return Result.error("获取文件信息失败");
adc-da-sys/src/main/java/com/adc/da/att/controller/UeditorController.java
+2 -2
View File
@@ -69,9 +69,9 @@ public class UeditorController {
AttFileVo attFileVo= attFileEOService.saveFileInfo(uploadFile); AttFileVo attFileVo= attFileEOService.saveFileInfo(uploadFile);
String picUrlPath =""; String picUrlPath ="";
if(StringUtils.isNotEmpty(referer)){ if(StringUtils.isNotEmpty(referer)){
picUrlPath=referer+"uploadPath"+ attFileVo.getFilePath()+attFileVo.getFileName(); picUrlPath=referer+"file"+ attFileVo.getFilePath()+attFileVo.getFileName();
}else{ }else{
picUrlPath="uploadPath"+attFileVo.getFilePath()+attFileVo.getFileName(); picUrlPath="file"+attFileVo.getFilePath()+attFileVo.getFileName();
} }
log.info("Ueditor 上传图片返回路径："+picUrlPath); log.info("Ueditor 上传图片返回路径："+picUrlPath);
image.setState("SUCCESS"); image.setState("SUCCESS");