支付宝刷脸完善

src/main/java/com/dpkj/modules/scanface/ali/service/impl/AliScanFaceServiceImpl.java

@@ -58,45 +58,52 @@ public class AliScanFaceServiceImpl implements IAliScanFaceService {
     public Result<JSONObject> aliFacePay(AliOrderVo aliOrderVo) {
         try {
             /**
-             * 1、获取刷脸"刷脸去初始化服务"的ftoken返回值
+             * 0、执行ABCP初始化
              */
-            this.iniAbcpAbsolute();
+            Result<Object> result = this.iniAbcpAbsolute();
-            //参数
+            if (result.isSuccess()) {
-            JSONObject zolozConfig = new JSONObject().fluentPut("installAngle", 90);
-            JSONObject params = new JSONObject()
-                    .fluentPut("serviceId", aliFaceConfig.getServiceId())
-                    .fluentPut("zolozConfig", zolozConfig);
-            String json = params.toJSONString();
-            String service_code = AliFaceConstants.SMILEVERIFYNIN_V1; //调用的组件编码:初始化
-            Result<Object> startServiceIniResult = this.startServiceIni(json, service_code);
-            log.info("[AliScanFaceServiceImpl][aliFacePay][72][1、获取刷脸去初始化服务的结果] ：{}", startServiceIniResult.toString());
-            if (startServiceIniResult.isSuccess()) {
-                Map<String, String> res = (Map<String, String>) startServiceIniResult.getResult();
-                String ftoken = res.get("ftoken");
-                log.info("[AliScanFaceServiceImpl][aliFacePay][76][[1、获取刷脸去初始化服务的结果-ftoken值] ：{}", ftoken);
-
                 /**
-                 * 2、调用后端的支付宝统一收单交易支付接口、存入hisPay
+                 * 1、获取刷脸"刷脸去初始化服务"的ftoken返回值
                  */
-                aliOrderVo.setAuthCode(ftoken);//Demo值："fp128d26333fa66e66e7f34c493d30cdh76"
+                //参数
-                JSONObject serverParams = (JSONObject) JSON.toJSON(aliOrderVo);
+                JSONObject zolozConfig = new JSONObject().fluentPut("installAngle", 90);
-                log.info("[AliScanFaceServiceImpl][aliFacePay][83][调用后端的支付宝统一收单交易支付接口参数] ：{}", serverParams.toString());
+                JSONObject params = new JSONObject()
+                        .fluentPut("serviceId", aliFaceConfig.getServiceId())
+                        .fluentPut("zolozConfig", zolozConfig);
+                String json = params.toJSONString();
+                String service_code = AliFaceConstants.SMILEVERIFYNIN_V1; //调用的组件编码:初始化
+                Result<Object> startServiceIniResult = this.startServiceIni(json, service_code);
+                log.info("[AliScanFaceServiceImpl][aliFacePay][72][1、获取刷脸去初始化服务的结果] ：{}", startServiceIniResult.toString());
+                if (startServiceIniResult.isSuccess()) {
+                    Map<String, String> res = (Map<String, String>) startServiceIniResult.getResult();
+                    String ftoken = res.get("ftoken");
+                    log.info("[AliScanFaceServiceImpl][aliFacePay][76][[1、获取刷脸去初始化服务的结果-ftoken值] ：{}", ftoken);
 
-                String url = serverUrl + "openapi/aliPayOrderApi/createOrder";
+                    /**
-                log.info("[AliScanFaceServiceImpl][aliFacePay][86][调用后端的支付宝统一收单交易支付接口路径] ：{}", url);
+                     * 2、调用后端的支付宝统一收单交易支付接口、存入hisPay
-                String req = HttpRequest.post(url)
+                     */
-                        .header(Header.CONTENT_TYPE, ContentType.JSON.toString(CharsetUtil.CHARSET_UTF_8))
+                    aliOrderVo.setAuthCode(ftoken);//Demo值："fp128d26333fa66e66e7f34c493d30cdh76"
-                        .body(serverParams.toJSONString())
+                    JSONObject serverParams = (JSONObject) JSON.toJSON(aliOrderVo);
-                        .execute()
+                    log.info("[AliScanFaceServiceImpl][aliFacePay][83][调用后端的支付宝统一收单交易支付接口参数] ：{}", serverParams.toString());
-                        .body();
-                JSONObject serverResult = JSONObject.parseObject(req);
-                log.info("[AliScanFaceServiceImpl][aliFacePay][93][调用后端的支付宝统一收单交易支付接口结果] ：{}", serverResult.toString());
 
-                return Result.ok(serverResult);
+                    String url = serverUrl + "openapi/aliPayOrderApi/createOrder";
-            } else {
+                    log.info("[AliScanFaceServiceImpl][aliFacePay][86][调用后端的支付宝统一收单交易支付接口路径] ：{}", url);
-                //调用ABCP 刷脸初始化服务失败
+                    String req = HttpRequest.post(url)
-                log.error("[AliScanFaceServiceImpl][aliFacePay][299]调用ABCP 刷脸初始化服务失败 ：{}", startServiceIniResult.getMessage());
+                            .header(Header.CONTENT_TYPE, ContentType.JSON.toString(CharsetUtil.CHARSET_UTF_8))
-                return Result.error(startServiceIniResult.getMessage());
+                            .body(serverParams.toJSONString())
+                            .execute()
+                            .body();
+                    JSONObject serverResult = JSONObject.parseObject(req);
+                    log.info("[AliScanFaceServiceImpl][aliFacePay][93][调用后端的支付宝统一收单交易支付接口结果] ：{}", serverResult.toString());
+
+                    return Result.ok(serverResult);
+                } else {
+                    //调用ABCP 刷脸初始化服务失败
+                    log.error("[AliScanFaceServiceImpl][aliFacePay][299]调用ABCP 刷脸初始化服务失败 ：{}", startServiceIniResult.getMessage());
+                    return Result.error(startServiceIniResult.getMessage());
+                }
+            }else {
+                return Result.error("执行iniAbcpAbsolute初始化失败");
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -132,23 +139,59 @@ public class AliScanFaceServiceImpl implements IAliScanFaceService {
                 //指定支付宝LOT SDK的本地库路径
                 AbcpInvoke.SetAPIPathFile(aliFaceConfig.getDllPath());
 
+                // 使用 CountDownLatch 实现线程同步
+                CountDownLatch latch = new CountDownLatch(1);
+                CountDownLatch latchFinish = new CountDownLatch(1);
+
+                //获取返回数据
+                AtomicReference<Integer> processCode = new AtomicReference<>();
+                AtomicReference<String> processResult = new AtomicReference<>();
+                AtomicReference<Integer> finishCode = new AtomicReference<>();
+                AtomicReference<String> finishResult = new AtomicReference<>();
+
                 //创建回调实例
                 AbcpInvoke.CallbackRsp callbackRsp = new AbcpInvoke.CallbackRsp() {
                     @Override
                     public void OnProcess(int code, String subCode, String subMsg, String result) {
-                        log.info("[AliScanFaceServiceImpl][OnProcess][123][ABCP调用iniAbcpAbsolute][code:{}][subCode:{}][subMsg:{}][result:{}]", code, subCode, subMsg, result);
+                        log.info("[AliScanFaceServiceImpl][OnProcess][155][0、ABCP调用iniAbcpAbsolute-OnProcess][code:{}][subCode:{}][subMsg:{}][result:{}] ", code, subCode, subMsg, result);
+                        try {
+                            processCode.set(code);
+                            processResult.set(result);
+                        } finally {
+                            latch.countDown(); // 确保无论如何都释放锁
+                        }
                     }
 
                     @Override
                     public void OnFinish(int code, String subCode, String subMsg, String result) {
-                        log.info("[AliScanFaceServiceImpl][OnFinish][128][ABCP调用iniAbcpAbsolute][code:{}][subCode:{}][subMsg:{}][result:{}]", code, subCode, subMsg, result);
+                        log.info("[AliScanFaceServiceImpl][OnFinish][167][0、ABCP调用iniAbcpAbsolute-OnFinish][code:{}][subCode:{}][subMsg:{}][result:{}]", code, subCode, subMsg, result);
+                        try {
+                            finishCode.set(code);
+                            finishResult.set(result);
+                        } finally {
+                            latchFinish.countDown(); // 确保无论如何都释放锁
+                        }
                     }
                 };
 
                 //初始化
+                log.info("[AliScanFaceServiceImpl][iniAbcpAbsolute][175][0、ABCP调用iniAbcpAbsolute初始化参数][appId:{}][appVersion:{}][json:{}] ", aliFaceConfig.getAppId(), aliFaceConfig.getAppVersion(), json);
                 AbcpInvoke.AbcpInit(aliFaceConfig.getAppId(), aliFaceConfig.getAppVersion(), json, callbackRsp);
 
-                return Result.ok("支付宝ABCP初始化成功");
+                // 等待finish回调完成（设置超时避免死锁）
+                boolean awaitFinishSuccess = latchFinish.await(120, TimeUnit.SECONDS);
+                if (!awaitFinishSuccess) {
+                    log.info("[AliScanFaceServiceImpl][iniAbcpAbsolute][181] [0、ABCP调用iniAbcpAbsolute初始化-120秒-等待finish回调超时]");
+                    return Result.error("初始化等待finish回调超时");
+                } else {
+                    JSONObject jsonObject = JSONObject.parseObject(finishResult.get());
+                    log.info("[AliScanFaceServiceImpl][iniAbcpAbsolute][184][0、ABCP调用iniAbcpAbsolute初始化-finish回调结果-finishCode ：{}] [返回结果：{}]", finishCode, jsonObject.toString());
+                    if (finishCode.get() == 1000) {
+                        return Result.ok("ABCP调用iniAbcpAbsolute初始化成功");
+                    } else {
+                        return Result.error("ABCP调用刷脸初始化服务finish失败");
+                    }
+                }
             } else {
                 log.info("[AliScanFaceServiceImpl][iniAbcpAbsolute][55][{} :文件不存在]", aliFaceConfig.getDllPath());
                 return Result.error("支付宝ABCP初始化失败：" + aliFaceConfig.getDllPath() + "不存在");