diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/controller/ApiController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/controller/ApiController.java index 115941d..ddb2451 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/controller/ApiController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/controller/ApiController.java @@ -63,11 +63,13 @@ public class ApiController { private TaskService taskService; @Value("${spring.profiles.active}") private String profiles; + @Value("${system.project.wlyCallback}") + private String wlyCallback; @ApiOperation(value = "通用识别") @RequestMapping("/identify") @Transactional @ResponseBody - @AutoLog(value = "api接口-通用识别",logType = CommonConstant.OPERATE_TYPE_1) + @AutoLog(value = "api接口-通用识别",logType = CommonConstant.LOG_TYPE_2,operateType=CommonConstant.OPERATE_TYPE_1) public Result pushSemantic(@RequestBody JSONObject requestBody) throws InterruptedException { // if (!"test".equals(profiles)) { // return Result.error("当前环境不支持该功能,请访问测试环境"); @@ -265,7 +267,7 @@ public class ApiController { Map configRuleMap = ocrRuleCheckVo.getConfigRuleMap();*/ OcrIdentifyDTO identifyDTO = ocrIdentifyService.findById("1702560400245035009"); List identifyDetailList = ocrIdentifyDetailService.listByIdentifyId(identifyDTO.getId()); - CallBackWlyUtils.callbackWly(identifyDTO,identifyDetailList); + CallBackWlyUtils.callbackWly(wlyCallback,identifyDTO,identifyDetailList); return Result.OK(""); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrIdentifyServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrIdentifyServiceImpl.java index bf33cb6..c17560f 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrIdentifyServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrIdentifyServiceImpl.java @@ -66,7 +66,8 @@ public class OcrIdentifyServiceImpl extends ServiceImpl identifyDetailList = ocrIdentifyDetailService.listByIdentifyId(ocrIdentifyId); ocrIdentifyCallbackLog.setStartTime(date); - boolean b = CallBackWlyUtils.callbackWly(ocrIdentify, identifyDetailList); + boolean b = CallBackWlyUtils.callbackWly(wlyCallback,ocrIdentify, identifyDetailList); ocrIdentifyCallbackLog.setStatus(b?1:0);//0-失败,1-成功 ocrIdentifyCallbackLog.setEndTime(new Date()); ocrIdentifyCallbackLogService.save(ocrIdentifyCallbackLog); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/utils/CallBackWlyUtils.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/utils/CallBackWlyUtils.java index 5072313..5cdef29 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/utils/CallBackWlyUtils.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/utils/CallBackWlyUtils.java @@ -27,7 +27,9 @@ import java.util.List; @Slf4j public class CallBackWlyUtils { - public static boolean callbackWly(OcrIdentify ocrIdentify, List identifyDetails) { + + + public static boolean callbackWly(String url,OcrIdentify ocrIdentify, List identifyDetails) { String requestId = ocrIdentify.getRequestId(); log.info("数据准备:{}",requestId); //请求对象 @@ -91,7 +93,7 @@ public class CallBackWlyUtils { System.out.println("============================================="); System.out.println(JSONObject.toJSONString(callBackWlyRequestBody)); System.out.println("============================================="); - semanticResponseJson = RestUtil.post("https://192.168.1.100:8894/api/task/image/ocr/callback", JSONObject.parseObject(JSONObject.toJSONString(callBackWlyRequestBody, SerializerFeature.WriteNullStringAsEmpty))); + semanticResponseJson = RestUtil.post(url, JSONObject.parseObject(JSONObject.toJSONString(callBackWlyRequestBody, SerializerFeature.WriteNullStringAsEmpty))); } catch (org.springframework.web.client.ResourceAccessException e) { log.error("请求无量云回调接口失败-拒绝连接 (Connection refused)"); log.error(e.getMessage()); 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 9a86f11..10b730c 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 @@ -301,4 +301,5 @@ system: project: env: customer_test enableHandleTask: true - fileReviewUrlPrefix: http://localhost:8071/files \ No newline at end of file + fileReviewUrlPrefix: http://localhost:8071/files + wlyCallback: https://hyycsozs.prevailcloud.com/api/task/image/ocr/callback \ No newline at end of file