diff --git a/jyjz-common/jyjz-common-base/src/main/java/cn/jyjz/xiaoyao/common/base/util/requestFormat/SearchQuery.java b/jyjz-common/jyjz-common-base/src/main/java/cn/jyjz/xiaoyao/common/base/util/requestFormat/SearchQuery.java index 6d7fb60b..1eef9ec5 100644 --- a/jyjz-common/jyjz-common-base/src/main/java/cn/jyjz/xiaoyao/common/base/util/requestFormat/SearchQuery.java +++ b/jyjz-common/jyjz-common-base/src/main/java/cn/jyjz/xiaoyao/common/base/util/requestFormat/SearchQuery.java @@ -154,6 +154,17 @@ public class SearchQuery implements java.io.Serializable{ public void addLessEqual(String field,Date value){ addQuery(field,value, SearchQueryConstant.SEARCH_LESS_EQUAL); } + + public void addRulesOp(String field,String rulesOp){ + SearchQueryForm searchQueryForm = new SearchQueryForm(); + if(query.get(field)!=null){ + searchQueryForm = (SearchQueryForm) query.get(field); + searchQueryForm.setRulesOp(rulesOp); + return; + } + searchQueryForm.setRulesOp(rulesOp); + query.put(field,searchQueryForm); + } /** * * @param field 字段名称 @@ -177,11 +188,15 @@ public class SearchQuery implements java.io.Serializable{ log.error("【添加搜索条件】对象-value-错误，value不能为空"); return; } - if(null != query.get(field)){ - log.error("【添加搜索条件】-query-错误，query已经存在数据,field={}",field); - return; - } +// if(null != query.get(field)){ +// log.error("【添加搜索条件】-query-错误，query已经存在数据,field={}",field); +// return; +// } SearchQueryForm lf = new SearchQueryForm(); + if(query.get(field)!=null){ + lf = (SearchQueryForm) query.get(field); + } + lf.setField(field); lf.setDataOp(SearchQueryUtil.filterMap.get(filter)); lf.setOp(filter); diff --git a/jyjz-common/jyjz-common-base/src/main/java/cn/jyjz/xiaoyao/common/base/util/requestFormat/SearchQueryForm.java b/jyjz-common/jyjz-common-base/src/main/java/cn/jyjz/xiaoyao/common/base/util/requestFormat/SearchQueryForm.java index 77849648..f42daa7c 100644 --- a/jyjz-common/jyjz-common-base/src/main/java/cn/jyjz/xiaoyao/common/base/util/requestFormat/SearchQueryForm.java +++ b/jyjz-common/jyjz-common-base/src/main/java/cn/jyjz/xiaoyao/common/base/util/requestFormat/SearchQueryForm.java @@ -8,10 +8,10 @@ import java.io.Serializable; */ public class SearchQueryForm implements Serializable { private static final long serialVersionUID = 1L; - private String field;// 字段名称 - private String op;// 比对条件 - private Object value;// 比对内容 - private String type;// 类型 + private String field;// 字段名称 username and t1.username = %111%(vachar) + private String op;// 比对条件 = + private Object value;// 比对内容 111 + private String type;// 类型 () private String rulesOp;// 搜索条件的关联方式，或/与（and/or） private String tablenameother = "";// 数据表别名 private String dataOp;// 数据库中的比较条件,根据op属性获取 diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java index c4b7735d..be787e23 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java @@ -564,6 +564,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask jsonObject.put("sendTime", System.currentTimeMillis()); jsonObject.put("fromId", model.getId().toString()); jsonObject.put("taskName", model.getFromtaskname()); + jsonObject.put("pictureId", model.getPictureid()); jsonObject.put("packageId", model.getPackageid()); msg.setBusJson(jsonObject.toJSONString()); msg.setCreateBy(Long.valueOf(userToken.getUserid())); diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/entity/PictureSourceResult.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/entity/PictureSourceResult.java index d6a4e2e6..0f81ed0c 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/entity/PictureSourceResult.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/entity/PictureSourceResult.java @@ -159,9 +159,9 @@ public class PictureSourceResult { */ String companyDepartment; /** - * 生产基地 + * 厂商 */ - String manufacturer; + Map manufacturer; /** * 拜访小节 diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/impl/PrevailCloudApiImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/impl/PrevailCloudApiImpl.java index b9b5ab43..93e4d870 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/impl/PrevailCloudApiImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/impl/PrevailCloudApiImpl.java @@ -86,6 +86,7 @@ public class PrevailCloudApiImpl implements PrevailCloudApi { //组装请求参数 String url = apiConfig.getInterfaceDomain()+pictureSourceUrl; String requestBodyJson = JSONObject.toJSONString(requestData); +// String requestBodyJson = "{\"accessKey\":\"7390F0221A1A73D8E13F8C8BB96F33B0\",\"data\":\"gzUtN5Mt24_fbDDMK3wLop8Tgu68xLCVy3Wzp9BcXnkxnCiPg_D2TNEXnQ68-Y-GhGYYcD7Iwg8juZTx1m5v4NkDvKvEwdvjQvZnMDTRYbqtHrwgVLAvUGotIMTckDY67yo2Ku52vWedjYpzzDseHwiIGVcIl-u1CljEbyjLzJzIf6oXfD7qKjOYnxKjfjp11k0IlvsPdS-mgNXTHcBei5jOFrYmZrE2y4v9bI5n1QE\",\"signature\":\"0bmIbhhybDcGeyX4ao5gSPZQeaY8G2JRh3nRt7NC7qw\",\"tenantCode\":\"1673196576094806016\",\"timestamp\":1711971774448}"; //入参 System.out.println("入参数据:"+requestBodyJson); HttpParamers httpParamers = new HttpParamers(HttpMethod.POST); diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/ApiTestController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/ApiTestController.java index 37f577f0..4dceb371 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/ApiTestController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/ApiTestController.java @@ -37,18 +37,18 @@ public class ApiTestController { String pageNo = request.getParameter("pageNo"); PictureSourceParameter pictureSourceParameter = new PictureSourceParameter(); -// DateTime dateTime = DateUtil.parse(beginStr+" 00:00:00","yyyy-MM-dd HH:mm:ss"); - DateTime dateTime = DateUtil.parse("2024-03-31 07:00:000","yyyy-MM-dd HH:mm:ss"); + DateTime dateTime = DateUtil.parse(beginStr+" 00:00:00","yyyy-MM-dd HH:mm:ss"); +// DateTime dateTime = DateUtil.parse("2024-03-31 07:00:000","yyyy-MM-dd HH:mm:ss"); Instant binstant = dateTime.toInstant(); -// DateTime dateTime1 = DateUtil.parse(" 00:00:00","yyyy-MM-dd HH:mm:ss"); - DateTime dateTime1 = DateUtil.parse("2024-03-31 09:00:00","yyyy-MM-dd HH:mm:ss"); + DateTime dateTime1 = DateUtil.parse(endStr+" 00:00:00","yyyy-MM-dd HH:mm:ss"); +// DateTime dateTime1 = DateUtil.parse("2024-03-31 09:00:00","yyyy-MM-dd HH:mm:ss"); Instant einstant = dateTime1.toInstant(); pictureSourceParameter.setStartTime(Date.from(binstant)); pictureSourceParameter.setEndTime(Date.from(einstant)); pictureSourceParameter.setPageNo(Integer.parseInt(pageNo)); pictureSourceParameter.setPageSize(Integer.parseInt(pageSize)); pictureSourceParameter.setTenantNo(1714548920583360512L); - pictureSourceParameter.setAccountNo(1714559587755397120L); + pictureSourceParameter.setAccountNo(1714887674875514880L); try { ApiPage apiPage = prevailCloudApi.pullPictureSource(pictureSourceParameter); List listResult= apiPage.getRecords(); diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java index 8992eed5..257a487a 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java @@ -283,9 +283,9 @@ public class OcrPictureController extends BaseController { String orderByTime = req.getParameter("orderByTime"); if (StringUtils.isNotBlank(orderByTime)) { if (orderByTime.equals("asc")) { - queryWrapper.orderByAsc("create_time"); + queryWrapper.orderByAsc("submit_date_timestamp"); } else { - queryWrapper.orderByDesc("create_time"); + queryWrapper.orderByDesc("submit_date_timestamp"); } } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildDubiousFileController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildDubiousFileController.java index cdc22016..adbcfa9d 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildDubiousFileController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildDubiousFileController.java @@ -1,5 +1,6 @@ package cn.jyjz.xiaoyao.ocr.controller; +import cn.hutool.core.collection.CollUtil; import cn.jyjz.xiaoyao.common.base.service.UserTokenService; import cn.jyjz.xiaoyao.common.base.util.RequestBaseUtil; import cn.jyjz.xiaoyao.common.base.vo.ResultVo; @@ -13,6 +14,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -31,11 +34,12 @@ import java.util.Map; import java.util.stream.Collectors; /** - * ocr控制器 + * ocr可疑文件控制器 * * @author 你的肉 * @Date 2024-03-21 19:00:57 */ +@Api(tags="ocr可疑文件控制器") @RestController @RequestMapping("/ocr/dubiousfile") public class OcrTaskchildDubiousFileController { @@ -58,8 +62,9 @@ public class OcrTaskchildDubiousFileController { * @param request * @return */ + @ApiOperation(value="可疑文件列表查询", notes="可疑文件列表查询") @RequestMapping(value = "/dubiousfilelist", method = RequestMethod.GET) - public ResultVo dubiousfilelist(HttpServletRequest request, + public ResultVo> dubiousfilelist(HttpServletRequest request, @RequestParam(value = "pageNo", required = false, defaultValue = "0") Integer pageNo, @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize, @RequestParam(value = "orderbyname", required = true, defaultValue = "asc") String orderbyname) { @@ -103,6 +108,7 @@ public class OcrTaskchildDubiousFileController { * @param request * @return */ + @ApiOperation(value="可疑文件列表移除", notes="可疑文件列表移除") @RequestMapping(value = "/dubiousfileyc", method = RequestMethod.GET) public ResultVo dubiousfileyc(HttpServletRequest request, @RequestParam(value = "pictureid", required = true) String pictureid) { @@ -114,28 +120,39 @@ public class OcrTaskchildDubiousFileController { List fileList = new ArrayList<>(); for (String childpictureid : cps) { OcrPicture ocrPicture = ocrpictureservice.selectDtoById(Long.parseLong(childpictureid)); + if(ocrPicture != null){ ocrPicture.setSuspiciousfile(0); ocrPicture.setUpdateTime(System.currentTimeMillis()); saveList.add(ocrPicture); + } QueryWrapper dubiouswrapper = new QueryWrapper<>(); dubiouswrapper.eq("userid",userToken.getUserid()).eq("picture_id",childpictureid); + + OcrTaskchildDubiousFile one = ocrTaskchildDubiousFileService.getOne(dubiouswrapper); - fileList.add(one); + if(one != null){ + fileList.add(one); + } } + //无对应图片信息 + if(CollUtil.isEmpty(saveList)){ + return ResultVoUtil.error("可疑文件不存在！"); + } ocrpictureservice.updateBatchById(saveList); //根据具体情况 判断 是否需要 进行数据返回， 默认不返回数据 - return ocrTaskchildDubiousFileService.removeByIds(fileList)?ResultVoUtil.success():ResultVoUtil.error(); + return ocrTaskchildDubiousFileService.removeByIds(fileList)?ResultVoUtil.success():ResultVoUtil.error("可疑文件不存在！"); } /** * 添加 * @param request * @return */ + @ApiOperation(value="可疑文件列表添加", notes="可疑文件列表添加") @RequestMapping(value = "/dubiousfileyd", method = RequestMethod.GET) public ResultVo dubiousfileyd(HttpServletRequest request, @RequestParam(value = "pictureid", required = true) String pictureid) { diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java index 69b54030..e266f691 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java @@ -363,6 +363,10 @@ public class OcrPicture implements BaseDto, java.io.Serializable { @TableField(exist = false) private Integer historyStates; + @ApiModelProperty(value = "节点状态") + @TableField(exist = false) + private String taskId; + //保存当前登录用户的数据权限范围的搜索条件 @TableField(exist = false) @JsonIgnore diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrCheckDuplicateServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrCheckDuplicateServiceImpl.java index 1e8f8bd1..d4b694cf 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrCheckDuplicateServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrCheckDuplicateServiceImpl.java @@ -450,9 +450,12 @@ public class OcrCheckDuplicateServiceImpl extends ServiceImpl ocrCheckDuplicateResults = checkDuplicateResultService.selectListByCheckDuplicateNo(checkDuplicateNo, tenantId); //调用查询参数解析方法，解析为queryWrapper List picIdList = new ArrayList<>(); + + Map picMaxScoreMap = new HashMap<>(); if(CollUtil.isNotEmpty(ocrCheckDuplicateResults)){ for (OcrCheckDuplicateResult ocrCheckDuplicateResult : ocrCheckDuplicateResults) { picIdList.add(ocrCheckDuplicateResult.getPictureId()); + picMaxScoreMap.put(ocrCheckDuplicateResult.getPictureId(),ocrCheckDuplicateResult.getMaxSimilarity()); } } if(CollUtil.isEmpty(picIdList)){ @@ -467,7 +470,17 @@ public class OcrCheckDuplicateServiceImpl extends ServiceImpl page = new Page(pageNo, pageSize); IPage pageList = pictureService.page(page, queryWrapper); - return pageList; + + List records = pageList.getRecords(); + records.forEach(picture ->picture.setSimilarityscore(picMaxScoreMap.get(picture.getId()).intValue())); + List collect = records.stream().sorted(Comparator.comparing(OcrPicture::getSimilarityscore).reversed()).collect(Collectors.toList()); + + + Page pageVO = new Page(pageNo, pageSize); + pageVO.setRecords(collect); + pageVO.setTotal(records.size()); + + return pageVO; } } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java index 5d1c673c..cd11baa2 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java @@ -673,7 +673,7 @@ public class OcrPictureServiceImpl extends BaseServiceImpl counts = new HashMap<>(); counts.put("total", approvedCount + pendingApprovalCount + notGoCount); counts.put("treat", pendingApprovalCount); - counts.put("approvedCount", approvedCount); + counts.put("approvedCount", approvedCount+notGoCount); resultVo.setCode("OK"); resultVo.setMessage("成功"); resultVo.setData(counts); diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrUsersearchchildServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrUsersearchchildServiceImpl.java index ad032b4e..e083dc30 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrUsersearchchildServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrUsersearchchildServiceImpl.java @@ -44,11 +44,10 @@ public class OcrUsersearchchildServiceImpl extends BaseServiceImpl list = ocrUsersearchchildService.selectByMainId(userSearchId); + SearchConditionVO vo = new SearchConditionVO(); List conditionVOList = new ArrayList<>(); for (OcrUsersearchchild ocrUsersearchchild : list) { - SearchConditionVO vo = new SearchConditionVO(); - String searchfield = ocrUsersearchchild.getSearchfield();//解析对应字段 if(SearchConfigEnum.PROJECT.getId().equals(searchfield)){ @@ -109,13 +108,8 @@ public class OcrUsersearchchildServiceImpl extends BaseServiceImpl ocrPictureList = new ArrayList<>(); + int index =0; for (Map map : livePhoto) { + if(index>0){ + continue; + } //检查图片地址是否为空 if(map.get("imgUrl")!=null && !StringUtils.isEmpty(map.get("imgUrl").toString())){ //判断该任务是否存在，判断依据是任务ID相同，提报时间不同则可以插入 @@ -113,7 +117,7 @@ public class PictureDisposeTask implements Runnable{ //所属任务名称 picture.setTaskname(pictureSourceResult.getTaskName()); //任务来源名称 - picture.setField4(pictureSourceResult.getTaskName()); + picture.setField4("无量云2.0"); //所属任务状态 if(pictureSourceResult.getTenantStatus()!=null) { picture.setTaskstatus(pictureSourceResult.getTenantStatus().toString()); @@ -182,18 +186,24 @@ public class PictureDisposeTask implements Runnable{ picture.setField9(pictureSourceResult.getProductName().get("name").toString()); } } + + //厂商 + if(pictureSourceResult.getManufacturer()!=null){ + if(pictureSourceResult.getManufacturer().get("name")!=null){ + picture.setField5(pictureSourceResult.getManufacturer().get("name").toString()); + } + } //拜访科室 picture.setField7(pictureSourceResult.getCompanyDepartment()); - //生产基地 - picture.setField5(pictureSourceResult.getManufacturer()); + //拜访小结 picture.setField8(pictureSourceResult.getDiscoveredIssues()); //拜访日期 picture.setField11(pictureSourceResult.getVisitDate()); //提报日期时间戳 -// picture.setSubmitDateTimestamp(pictureSourceResult.getSubmitTime()); - picture.setSubmitDateTimestamp(System.currentTimeMillis()); + picture.setSubmitDateTimestamp(pictureSourceResult.getSubmitTime()); +// picture.setSubmitDateTimestamp(System.currentTimeMillis()); picture.setPhotoDateTimestamp(System.currentTimeMillis()); System.out.println("SubmitDateTimestamp1=================>>>>>>>"+pictureSourceResult.getSubmitTime()); @@ -212,6 +222,7 @@ public class PictureDisposeTask implements Runnable{ //默认为创建人为admin picture.setCreateBy("1"); ocrPictureList.add(picture); + index++; } } diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml index bcee1f1e..a07d7083 100644 --- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml +++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml @@ -68,6 +68,7 @@ + @@ -224,7 +225,7 @@ diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml index 5a91ecc4..93e5def9 100644 --- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml +++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml @@ -18,7 +18,7 @@ diff --git a/runstart/src/main/resources/application-dev.yml b/runstart/src/main/resources/application-dev.yml index 9872525c..b2a8e8d7 100644 --- a/runstart/src/main/resources/application-dev.yml +++ b/runstart/src/main/resources/application-dev.yml @@ -276,7 +276,7 @@ debugger_tools: true ocr: api: wly: - interface-domain: https://b-dr.prevailcloud.com #接口域名 + interface-domain: https://b-test.prevailcloud.com #接口域名 accessKey: 7390F0221A1A73D8E13F8C8BB96F33B0 #秘钥 accessCode: ED6F7B39768AF95E87AEA8ACCCC71A6F #秘钥编码 connectTimeout: 5000 #请求超时时间 毫秒 diff --git a/runstart/src/main/resources/application-pro.yml b/runstart/src/main/resources/application-pro.yml index bd2ceb84..b14dcc68 100644 --- a/runstart/src/main/resources/application-pro.yml +++ b/runstart/src/main/resources/application-pro.yml @@ -280,7 +280,7 @@ debugger_tools: true ocr: api: wly: - interface-domain: https://b-dr.prevailcloud.com #接口域名 + interface-domain: https://b-test.prevailcloud.com #接口域名 accessKey: 7390F0221A1A73D8E13F8C8BB96F33B0 #秘钥 accessCode: ED6F7B39768AF95E87AEA8ACCCC71A6F #秘钥编码 connectTimeout: 5000 #请求超时时间 毫秒 @@ -289,4 +289,4 @@ ocr: image: similarityPath: http://127.0.0.1:8000/api/similarity/ classifyPath: http://127.0.0.1:8000/api/classify/ - serverUrl: http://47.93.59.251/api/image/ \ No newline at end of file + serverUrl: http://47.93.59.251/api/image/