Merge remote-tracking branch 'origin/develop_master' into develop_master
This commit is contained in:
@@ -61,6 +61,7 @@ spring.rabbitmq.listener.simple.retry.max-attempts= 5
|
|||||||
# 文档存储路径指向
|
# 文档存储路径指向
|
||||||
# ==============================================
|
# ==============================================
|
||||||
file.path=/usr/laws/file/
|
file.path=/usr/laws/file/
|
||||||
|
file.split.path=/usr/laws/file/
|
||||||
|
|
||||||
# 云端OCR识别集成配置参数
|
# 云端OCR识别集成配置参数
|
||||||
#OCR请求识别URL地址
|
#OCR请求识别URL地址
|
||||||
|
|||||||
+3
-1
@@ -57,6 +57,8 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService
|
|||||||
private IAttFileEOService attFileEOService;
|
private IAttFileEOService attFileEOService;
|
||||||
@Value("${file.path}")
|
@Value("${file.path}")
|
||||||
private String filePath;//文件存储路径
|
private String filePath;//文件存储路径
|
||||||
|
@Value("${file.split.path}")
|
||||||
|
private String splitFilePath;//拆分图片存储路径
|
||||||
/**
|
/**
|
||||||
* 文件下载路径
|
* 文件下载路径
|
||||||
*/
|
*/
|
||||||
@@ -480,7 +482,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService
|
|||||||
try {
|
try {
|
||||||
FileOutputStream fos = new FileOutputStream(filepathandname);
|
FileOutputStream fos = new FileOutputStream(filepathandname);
|
||||||
fos.write(bytev);
|
fos.write(bytev);
|
||||||
String path = "uploadPath/img/" + imageName;
|
String path = splitFilePath +"/" + imageName;
|
||||||
String imgCon = "<img class=\'wordImg\' src=\'" + path + "\'>";
|
String imgCon = "<img class=\'wordImg\' src=\'" + path + "\'>";
|
||||||
message.getItemsCondi().add(imgCon);
|
message.getItemsCondi().add(imgCon);
|
||||||
message.setItermsConditions(message.getItermsConditions() + imgCon);
|
message.setItermsConditions(message.getItermsConditions() + imgCon);
|
||||||
|
|||||||
Reference in New Issue
Block a user