From e1ad32d0ed3af48a521888e8751e32507e03d7c5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 16 十月 2024 15:54:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java | 68 +++++++++++++++++----------------
1 files changed, 35 insertions(+), 33 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
index 0d7e426..3ba05db 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSONObject;
import com.doumee.core.haikang.model.param.request.CarPictureRequest;
+import com.doumee.core.haikang.model.param.request.FacePictureCheckRequest;
import com.doumee.core.haikang.service.HKService;
import com.doumee.dao.business.model.InterfaceLog;
import com.doumee.service.business.InterfaceLogService;
@@ -28,11 +29,12 @@
public static void main(String[] args) throws Exception {
- ArtemisConfig.host = "10.50.60.253";
- ArtemisConfig.appKey = "27786546";
- ArtemisConfig.appSecret = "kC5dohxU7CvEqgGhVt4R";
+ ArtemisConfig.host = "10.50.250.253:1443";
+
+ ArtemisConfig.appKey = "23154099";
+ ArtemisConfig.appSecret = "88wFsg3xfn7o8QMsWEO2";
HKConstants.https = "https://";
- CarPictureRequest param = new CarPictureRequest();
+ /* CarPictureRequest param = new CarPictureRequest();
param.setPicUri( "HKIMG=/pic?0dd400=4c40ip-feo831-933*9o4=3=2109*2l0001893117*0t7=6*2ps==014b*=787d*069d70361-95754d-9*l108od0b192=001");
param.setAswSyscode("3fa3e5e3-db3e-41ba-97fc-39c948778dfe");
InputStream is = HKService.getCarPicture(param);
@@ -51,7 +53,11 @@
outStream.close(); //鍐欏叆鏁版嵁
} catch ( Exception e) {
throw new RuntimeException(e);
- }
+ }*/
+
+ FacePictureCheckRequest param = new FacePictureCheckRequest();
+ param.setFacePicUrl("http://10.50.250.253:8088/file/member/20241016/d0cded86-a55d-43be-bc01-4f628a1400cf.jpg");
+ System.out.println(facePictureCheck(JSONObject.toJSONString(param)));
}
public static InterfaceLogService interfaceLogService = null;
@@ -234,26 +240,15 @@
Map<String, String> path = getPath(HKConstants.InterfacePath.facePicture[0]);
//鍙傛暟鏍规嵁鎺ュ彛瀹為檯鎯呭喌璁剧疆
- log.error("=========================ArtemisConfig.host***********************************"+ ArtemisConfig.host);
- log.error("=========================ArtemisConfig.key********************************"+ArtemisConfig.appKey);
- try {
- log.error("-------------------------ArtemisConfig.host***********************************"+ ArtemisConfig.host);
- log.error("-------------------------ArtemisConfig.key********************************"+ArtemisConfig.appKey);
- HttpResponse resp = ArtemisHttpUtil.doPostStringImgArtemis( path, body, null, null,"application/json",null);
- if (200==resp.getStatusLine().getStatusCode()) {
- HttpEntity entity = resp.getEntity();
- InputStream in = entity.getContent();
- return in;
- }else{
- log.error("浜鸿劯涓嬭浇鍑洪敊");
- throw new Exception("浜鸿劯涓嬭浇鍑洪敊");
- }
- }catch (Exception e){
- e.printStackTrace();
+ HttpResponse resp = ArtemisHttpUtil.doPostStringImgArtemis( path, body, null, null,"application/json",null);
+ if (200==resp.getStatusLine().getStatusCode()) {
+ HttpEntity entity = resp.getEntity();
+ InputStream in = entity.getContent();
+ return in;
+ }else{
+ log.error("浜鸿劯涓嬭浇鍑洪敊");
+ throw new Exception("浜鸿劯涓嬭浇鍑洪敊");
}
- log.error("+++++++++++++++++++++++++ArtemisConfig.host***********************************"+ ArtemisConfig.host);
- log.error("+++++++++++++++++++++++++ArtemisConfig.key********************************"+ArtemisConfig.appKey);
- return null;
}
/**
* 鑾峰彇璁垮璁板綍涓殑鍥剧墖
@@ -308,6 +303,14 @@
}else{
throw new Exception("鏌ヨ杞﹁締鎶撴媿鍥剧墖涓嬭浇鍑洪敊");
}
+ }
+ /**
+ * 鍒嗛〉鑾峰彇寰呭姙鍒楄〃
+ * @param body
+ * @return
+ */
+ public static String getTodoListPage(Map<String, String> body) throws Exception{
+ return startDoGetStringArtemis(HKConstants.InterfacePath.getTodoListPage,body);
}
/**
* 鑾峰彇闂ㄧ鐐瑰垪琛�
@@ -375,15 +378,7 @@
return startDoPostStringArtemis(HKConstants.InterfacePath.visitCancel,body);
}
- public static String startDoGetStringArtemis(String[] pathStr,Map<String,String> body ){
- Map<String, String> path = getPath(pathStr[0]);
- Map<String, String> header = new HashMap<>();
- header.put("tagId", UUID.randomUUID().toString().replace("-", ""));
- String result = ArtemisHttpUtil.doGetArtemis(path, body, null, "application/json", header);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(JSONObject.toJSONString(body),result,path,pathStr[1]);
- return result;
- }
public static String startDoPostStringArtemis(String[] pathStr,String body ){
Map<String, String> path = getPath(pathStr[0]);
Map<String, String> header = new HashMap<>();
@@ -391,7 +386,14 @@
String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", header);// post璇锋眰application/json绫诲瀷鍙傛暟
saveInterfaceLog(body,result,path,pathStr[1]);
return result;
-
+ }
+ public static String startDoGetStringArtemis(String[] pathStr,Map<String,String> body ){
+ Map<String, String> path = getPath(pathStr[0]);
+ Map<String, String> header = new HashMap<>();
+ header.put("tagId", UUID.randomUUID().toString().replace("-", ""));
+ String result = ArtemisHttpUtil.doGetArtemis(path, body, null, null, header);
+ saveInterfaceLog(JSONObject.toJSONString(body),result,path,pathStr[1]);
+ return result;
}
public static String startDoPostStringArtemis(String[] pathStr,String param,String body ){
Map<String, String> path = getPath(pathStr[0]+StringUtils.defaultString(param,""));
--
Gitblit v1.9.3