diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrIdentifyDetailController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrIdentifyDetailController.java index 813774f..dbce764 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrIdentifyDetailController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrIdentifyDetailController.java @@ -41,6 +41,8 @@ public class OcrIdentifyDetailController extends JeecgController ocrResultDTOList, String fieldName, String field, String inputText, String ocrText, Double ocrPrecisionRate, String imgPath, String failureReason, Boolean ruleValidation, Double d, String ruleValidationValue) { + public void ocrResultAdd(List ocrResultDTOList, String fieldName, String field, String inputText, String ocrText, Double ocrPrecisionRate, String imgPath, String failureReason, Boolean ruleValidation, Double d, String ruleValidationValue) { OcrResultDTO ocrResultDTO = new OcrResultDTO(); ocrResultDTO.setTag(field); ocrResultDTO.setTagName(fieldName); @@ -471,7 +474,7 @@ public class OcrIdentifyServiceImpl extends ServiceImpl ocrResultDTOList, String fieldName, String field, String inputText, String ocrText, Double ocrPrecisionRate, String imgPath, String failureReason, Boolean ruleValidation, String ruleValidationValue) { + public void ocrResultAdd(List ocrResultDTOList, String fieldName, String field, String inputText, String ocrText, Double ocrPrecisionRate, String imgPath, String failureReason, Boolean ruleValidation, String ruleValidationValue) { if (ruleValidation) { ocrResultAdd(ocrResultDTOList, fieldName, field, inputText, ocrText, ocrPrecisionRate, imgPath, failureReason, ruleValidation, 100d,ruleValidationValue); } else { diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/CommonController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/CommonController.java index e60373a..1352920 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/CommonController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/CommonController.java @@ -51,6 +51,8 @@ public class CommonController { */ @Value(value="${jeecg.uploadType}") private String uploadType; + @Value("${system.project.fileReviewUrlPrefix") + private String fileReviewUrlPrefix; /** * @Author 政辉 @@ -120,7 +122,7 @@ public class CommonController { if(oConvertUtils.isNotEmpty(savePath)){ /*result.setMessage(savePath); result.setSuccess(true);*/ - return Result.OK(savePath, OcrConstant.FILE_REVIEW_URL_PREFIX+uploadpath+"/"+savePath); + return Result.OK(savePath, fileReviewUrlPrefix+uploadpath+"/"+savePath); }else { result.setMessage("上传失败!"); result.setSuccess(false); diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml b/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml index b7af88c..fc82474 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml +++ b/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml @@ -299,4 +299,5 @@ third-app: system: project: env: customer_test - enableHandleTask: false \ No newline at end of file + enableHandleTask: false + fileReviewUrlPrefix: http://47.103.213.109:8072/files \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml b/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml index 0f6f5fe..50a8d0e 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml +++ b/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml @@ -303,4 +303,5 @@ third-app: agent-id: ?? system: project: - env: customer_prod \ No newline at end of file + env: customer_prod + fileReviewUrlPrefix: http://47.103.213.109:8072/files \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml b/jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml index 9fea26c..adbf4df 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml +++ b/jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml @@ -148,8 +148,8 @@ spring: #redis 配置 redis: database: 3 - #host: 127.0.0.1 - host: 47.103.213.109 + host: 127.0.0.1 +# host: 47.103.213.109 port: 6379 password: '' #mybatis plus 设置 @@ -300,4 +300,5 @@ third-app: system: project: env: customer_test - enableHandleTask: true \ No newline at end of file + enableHandleTask: true + fileReviewUrlPrefix: http://172.16.0.132:8072/files \ No newline at end of file