Merge branch 'ap007' into dailyfix

This commit is contained in:
ap007 2022-09-26 10:22:33 +08:00
commit 76e3b244d3
5 changed files with 16 additions and 10 deletions

View File

@ -1,11 +1,14 @@
url=http://192.168.7.72:8081/SunICMS/servlet/RouterServlet
service_ip=192.168.7.72
front_url=https://ontis.ap-leasing.com/SunICMS/servlet/RouterServlet
server_url=http://172.28.1.59:8080/SunICMS/servlet/RouterServlet
ocr_url=http://172.28.1.59:5050/api/v1/
service_ip=172.28.1.59
service_port=8088
license_ip=ret.ap-leasing.com
#\u94FE\u63A5\u6709\u6548\u65F6\u95F4\uFF0C\u5355\u4F4D\u4E3A\u79D2
useful_life=360
#\u4E1A\u52A1\u7CFB\u7EDF\u6388\u6743\u5BC6\u94A5
secret_id=anpeng
secret_key=IU2VHdejDpUFzhoeT7tUSII3
secret_id=Online
secret_key=F5zeG8Q8PVMqegPJODRGy0GR
#\u5F71\u50CF\u7B2C\u4E09\u65B9\u4E0A\u4F20\u65F6\u6253\u5305\u4E34\u65F6\u6587\u4EF6\u8DEF\u5F84
fileSavePathTemp=/Users/simba/data/files/icmsFileTemp
fileSavePathTemp=/data/files/icmsFileTemp

View File

@ -22,7 +22,7 @@ public class ImageOcr {
String responseResult = null;
//图像以base64编码传输方式
try {
responseResult = imagePostBybase64(PropertiesUtil.get("OcrUrl")+ocrType, fileUrl);
responseResult = imagePostBybase64(PropertiesUtil.get("ocr_url")+ocrType, fileUrl);
} catch (Exception e) {
e.printStackTrace();
}

View File

@ -44,7 +44,7 @@ public class ImageUpload extends ImageService {
}
public String doUpload(String zipPath) throws Exception {
String result = "0";
AutoScanApi autoScanApi = new AutoScanApi(PropertiesUtil.get("service_ip"),8088,PropertiesUtil.get("secret_id")+"#"+PropertiesUtil.get("secret_key"));
AutoScanApi autoScanApi = new AutoScanApi(PropertiesUtil.get("service_ip"),Integer.parseInt(PropertiesUtil.get("service_port")),PropertiesUtil.get("secret_id")+"#"+PropertiesUtil.get("secret_key"));
result = autoScanApi.ScanImageFile(appCode, zipPath);
return result;
}

View File

@ -16,6 +16,7 @@ public class ImageInfoService {
private String projectNo;
private String flowNo;
public String getFileUrl(String folderNo ,JBOTransaction tx) throws Exception {
String result = this.getResponseResult(tx);
//APZLJJ000400 APZLJJ000060
@ -58,6 +59,8 @@ public class ImageInfoService {
}
Element page = (Element) root.selectSingleNode("//PAGE[@PAGEID='"+pageId+"']");
String pageUrl = page.attributeValue("PAGE_URL");
pageUrl ="http://172.28.1.59:5051/" + pageUrl.substring(33);
System.out.println("OCRÎļþ·¾¶£º"+pageUrl);
return pageUrl;
}

View File

@ -99,7 +99,7 @@ public abstract class ImageService {
PostMethod postMethod = null;
HttpClient httpClient = null;
try {
postMethod = new PostMethod(PropertiesUtil.get("url"));
postMethod = new PostMethod(PropertiesUtil.get("server_url"));
// ÉèÖøñʽ
postMethod.getParams().setContentCharset("UTF-8");
postMethod.setParameter("data", getRequestParam());
@ -145,7 +145,7 @@ public abstract class ImageService {
}
public String getRequestUrl(){
return PropertiesUtil.get("url");
return PropertiesUtil.get("front_url");
}
public String getRequestParam() throws Exception {