|
@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
|
|
import cn.hutool.json.JSONUtil;
|
|
import cn.hutool.json.JSONUtil;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.logosdata.security.SM2;
|
|
import com.logosdata.security.SM2;
|
|
|
|
+import com.qunzhixinxi.hnqz.common.core.util.Base64Utils;
|
|
import com.qunzhixinxi.hnqz.common.taxhelper.annotation.TaxHelper;
|
|
import com.qunzhixinxi.hnqz.common.taxhelper.annotation.TaxHelper;
|
|
import com.qunzhixinxi.hnqz.common.taxhelper.common.CommonConstants;
|
|
import com.qunzhixinxi.hnqz.common.taxhelper.common.CommonConstants;
|
|
import com.qunzhixinxi.hnqz.common.taxhelper.config.TaxHelperConfig;
|
|
import com.qunzhixinxi.hnqz.common.taxhelper.config.TaxHelperConfig;
|
|
@@ -35,6 +36,7 @@ import com.qunzhixinxi.hnqz.common.taxhelper.entity.model.TaxHelperLoginModel;
|
|
import com.qunzhixinxi.hnqz.common.taxhelper.entity.request.TaxHelperRequest;
|
|
import com.qunzhixinxi.hnqz.common.taxhelper.entity.request.TaxHelperRequest;
|
|
import com.qunzhixinxi.hnqz.common.taxhelper.entity.request.TaxHelperSettlementRequest;
|
|
import com.qunzhixinxi.hnqz.common.taxhelper.entity.request.TaxHelperSettlementRequest;
|
|
import com.qunzhixinxi.hnqz.common.taxhelper.entity.request.TaxHelperUserAgreementAuthorizationRequest;
|
|
import com.qunzhixinxi.hnqz.common.taxhelper.entity.request.TaxHelperUserAgreementAuthorizationRequest;
|
|
|
|
+import com.qunzhixinxi.hnqz.common.taxhelper.entity.request.TaxHelperUserAgreementAuthorizationRequestV2;
|
|
import com.qunzhixinxi.hnqz.common.taxhelper.entity.response.TaxHelperResponse;
|
|
import com.qunzhixinxi.hnqz.common.taxhelper.entity.response.TaxHelperResponse;
|
|
import com.logosdata.security.util.SignUtils;
|
|
import com.logosdata.security.util.SignUtils;
|
|
import com.qunzhixinxi.hnqz.common.taxhelper.util.HttpUtils;
|
|
import com.qunzhixinxi.hnqz.common.taxhelper.util.HttpUtils;
|
|
@@ -289,6 +291,25 @@ public class TaxHelperService {
|
|
return response;
|
|
return response;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 回传用户协议授权信息接口(含手签)
|
|
|
|
+ *
|
|
|
|
+ * @param request 请求
|
|
|
|
+ * @return 结果字符串
|
|
|
|
+ * @throws Exception
|
|
|
|
+ */
|
|
|
|
+ @TaxHelper(value = "userAgreementAuthorization")
|
|
|
|
+ public TaxHelperResponse userAgreementAuthorizationV2(TaxHelperUserAgreementAuthorizationRequestV2 request) {
|
|
|
|
+ TaxHelperResponse response = null;
|
|
|
|
+ try {
|
|
|
|
+ response = process(request);
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
+ log.error("税邦云用户协议内容获取失败:{}", e.getMessage());
|
|
|
|
+ response = customResponse(e.getMessage());
|
|
|
|
+ }
|
|
|
|
+ return response;
|
|
|
|
+ }
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 自定义响应结果
|
|
* 自定义响应结果
|
|
*
|
|
*
|
|
@@ -462,17 +483,17 @@ public class TaxHelperService {
|
|
// taxHelperConfig.setQueryUrl("https://test.taxhelpor.com:8883");
|
|
// taxHelperConfig.setQueryUrl("https://test.taxhelpor.com:8883");
|
|
// // taxHelperConfig.setQueryUrl("http://114.248.76.210:8883/");
|
|
// // taxHelperConfig.setQueryUrl("http://114.248.76.210:8883/");
|
|
//
|
|
//
|
|
- // TaxHelperLoginModel taxHelperLoginModel = new TaxHelperLoginModel(taxHelperConfig);
|
|
|
|
- // TaxHelperLoginRequest loginRequest = new TaxHelperLoginRequest(taxHelperLoginModel);
|
|
|
|
|
|
+ // // TaxHelperLoginModel taxHelperLoginModel = new TaxHelperLoginModel(taxHelperConfig);
|
|
|
|
+ // // TaxHelperLoginRequest loginRequest = new TaxHelperLoginRequest(taxHelperLoginModel);
|
|
// String randomKey = "UVKVZfHcTRYgTZpV";
|
|
// String randomKey = "UVKVZfHcTRYgTZpV";
|
|
- // // String randomKey = RandomStringUtils.randomAlphabetic(16);
|
|
|
|
- // System.out.println(randomKey);
|
|
|
|
- // loginRequest.setKey(randomKey);
|
|
|
|
- //
|
|
|
|
- // TaxHelperResponse s1 = service.login(loginRequest);
|
|
|
|
- // System.out.println(s1.success());
|
|
|
|
- // System.out.println(s1);
|
|
|
|
- // System.out.println("7d301043970be6b51fd6a89cc245c936d72ea4ac3560585136d5dd8af10e06cb".length());
|
|
|
|
|
|
+ // // // String randomKey = RandomStringUtils.randomAlphabetic(16);
|
|
|
|
+ // // System.out.println(randomKey);
|
|
|
|
+ // // loginRequest.setKey(randomKey);
|
|
|
|
+ // //
|
|
|
|
+ // // TaxHelperResponse s1 = service.login(loginRequest);
|
|
|
|
+ // // System.out.println(s1.success());
|
|
|
|
+ // // System.out.println(s1);
|
|
|
|
+ // // System.out.println("7d301043970be6b51fd6a89cc245c936d72ea4ac3560585136d5dd8af10e06cb".length());
|
|
//
|
|
//
|
|
//
|
|
//
|
|
// // System.out.println("====================================================");
|
|
// // System.out.println("====================================================");
|
|
@@ -485,59 +506,73 @@ public class TaxHelperService {
|
|
// // System.out.println(userAgreement.getData());
|
|
// // System.out.println(userAgreement.getData());
|
|
//
|
|
//
|
|
//
|
|
//
|
|
- // System.out.println("====================================================");
|
|
|
|
- // TaxHelperUserAgreementAuthorizationModel model1 = new TaxHelperUserAgreementAuthorizationModel(taxHelperConfig);
|
|
|
|
- // model1.setEnterpriseCode("91430181MA4RJ12345");
|
|
|
|
- // model1.setIdCard("110227200001010570");
|
|
|
|
|
|
+ // // System.out.println("====================================================");
|
|
|
|
+ // // TaxHelperUserAgreementAuthorizationModel model1 = new TaxHelperUserAgreementAuthorizationModel(taxHelperConfig);
|
|
|
|
+ // // model1.setEnterpriseCode("91430181MA4RJ12345");
|
|
|
|
+ // // model1.setIdCard("110227200001010570");
|
|
|
|
+ // //
|
|
|
|
+ // // model1.setAuthorizationTime("2021-08-09 12:56:12");
|
|
|
|
+ // //
|
|
|
|
+ // // TaxHelperUserAgreementAuthorizationRequest rq1 = new TaxHelperUserAgreementAuthorizationRequest(model1);
|
|
|
|
+ // // rq1.setKey(randomKey);
|
|
|
|
+ // // TaxHelperResponse response1 = service.userAgreementAuthorization(rq1);
|
|
|
|
+ // // System.out.println(response1);
|
|
//
|
|
//
|
|
- // model1.setAuthorizationTime("2021-08-09 12:56:12");
|
|
|
|
//
|
|
//
|
|
- // TaxHelperUserAgreementAuthorizationRequest rq1 = new TaxHelperUserAgreementAuthorizationRequest(model1);
|
|
|
|
- // rq1.setKey(randomKey);
|
|
|
|
- // TaxHelperResponse response1 = service.userAgreementAuthorization(rq1);
|
|
|
|
- // System.out.println(response1);
|
|
|
|
|
|
+ // // System.out.println("====================================================");
|
|
|
|
+ // // TaxHelperUserAgreementAuthorizationModel model1 = new TaxHelperUserAgreementAuthorizationModel(taxHelperConfig);
|
|
|
|
+ // // model1.setEnterpriseCode("91430181MA4RJ12345");
|
|
|
|
+ // // model1.setIdCard("110227200001010570");
|
|
|
|
+ // // model1.setAuthorizationTime("2021-08-09 12:56:12");
|
|
|
|
+ // // String encodeImage = Base64Utils.encodeImage("/Users/jimmy/Downloads/BigBangTheory-Howard.jpg");
|
|
|
|
+ // // model1.setSignatureHandwriting(encodeImage);
|
|
|
|
+ // //
|
|
|
|
+ // // TaxHelperUserAgreementAuthorizationRequestV2 rq1 = new TaxHelperUserAgreementAuthorizationRequestV2(model1);
|
|
|
|
+ // // rq1.setKey(randomKey);
|
|
|
|
+ // // TaxHelperResponse response1 = service.userAgreementAuthorizationV2(rq1);
|
|
|
|
+ // // System.out.println(response1);
|
|
//
|
|
//
|
|
// }
|
|
// }
|
|
|
|
|
|
- // System.out.println("================================================================================================================");
|
|
|
|
- // TaxHelperAddMemberModel addMemberModel = new TaxHelperAddMemberModel(taxHelperConfig);
|
|
|
|
- // addMemberModel.setEnterpriseCode("91430181MA4RJ12345");
|
|
|
|
- // addMemberModel.setName("张大三");
|
|
|
|
- // addMemberModel.setIdCard("110227200001010570");
|
|
|
|
- // addMemberModel.setPhone("13388889999");
|
|
|
|
- // addMemberModel.setNotifyUrl("https://localhost:8080/notify");
|
|
|
|
- // TaxHelperAddMemberRequest addMemberRequest = new TaxHelperAddMemberRequest(addMemberModel);
|
|
|
|
- // addMemberRequest.setKey(loginRequest.getKey());
|
|
|
|
- // TaxHelperResponse s3 = service.addMembers(addMemberRequest);
|
|
|
|
- // System.out.println(s3.success());
|
|
|
|
- // System.out.println(s3);
|
|
|
|
- // System.out.println("================================================================================================================");
|
|
|
|
- //
|
|
|
|
- // log.warn(">>>>>>>>>>>>>>获取eid token");
|
|
|
|
- //
|
|
|
|
- // TaxHelperEidTokenModel eidTokenModel = new TaxHelperEidTokenModel(taxHelperConfig);
|
|
|
|
- // eidTokenModel.setIdCard("110227200001010570");
|
|
|
|
- // TaxHelperEidTokenRequest eidTokenRequest = new TaxHelperEidTokenRequest(eidTokenModel);
|
|
|
|
- // eidTokenRequest.setKey(loginRequest.getKey());
|
|
|
|
- // TaxHelperResponse eRes = service.getEidToken(eidTokenRequest);
|
|
|
|
- // System.out.println(eRes.success());
|
|
|
|
- // System.out.println(JSONUtil.toJsonStr(eRes));
|
|
|
|
- // System.out.println("================================================================================================================");
|
|
|
|
- //
|
|
|
|
- // log.warn(">>>>>>>>>>>>>>echeck token");
|
|
|
|
- //
|
|
|
|
- // TaxHelperECheckModel eCheckModel = new TaxHelperECheckModel(taxHelperConfig);
|
|
|
|
- // eCheckModel.setToken(eRes.getMessage());
|
|
|
|
- // TaxHelperECheckRequest eCheckRequest = new TaxHelperECheckRequest(eCheckModel);
|
|
|
|
- // eCheckRequest.setKey(loginRequest.getKey());
|
|
|
|
- // TaxHelperResponse echeck = service.ECheckFace(eCheckRequest);
|
|
|
|
- // System.out.println(echeck.success());
|
|
|
|
- // System.out.println(JSONUtil.toJsonStr(echeck));
|
|
|
|
- //
|
|
|
|
- //
|
|
|
|
- // System.out.println("================================================================================================================");
|
|
|
|
- // }
|
|
|
|
- //
|
|
|
|
|
|
+ // System.out.println("================================================================================================================");
|
|
|
|
+ // TaxHelperAddMemberModel addMemberModel = new TaxHelperAddMemberModel(taxHelperConfig);
|
|
|
|
+ // addMemberModel.setEnterpriseCode("91430181MA4RJ12345");
|
|
|
|
+ // addMemberModel.setName("张大三");
|
|
|
|
+ // addMemberModel.setIdCard("110227200001010570");
|
|
|
|
+ // addMemberModel.setPhone("13388889999");
|
|
|
|
+ // addMemberModel.setNotifyUrl("https://localhost:8080/notify");
|
|
|
|
+ // TaxHelperAddMemberRequest addMemberRequest = new TaxHelperAddMemberRequest(addMemberModel);
|
|
|
|
+ // addMemberRequest.setKey(loginRequest.getKey());
|
|
|
|
+ // TaxHelperResponse s3 = service.addMembers(addMemberRequest);
|
|
|
|
+ // System.out.println(s3.success());
|
|
|
|
+ // System.out.println(s3);
|
|
|
|
+ // System.out.println("================================================================================================================");
|
|
|
|
+ //
|
|
|
|
+ // log.warn(">>>>>>>>>>>>>>获取eid token");
|
|
|
|
+ //
|
|
|
|
+ // TaxHelperEidTokenModel eidTokenModel = new TaxHelperEidTokenModel(taxHelperConfig);
|
|
|
|
+ // eidTokenModel.setIdCard("110227200001010570");
|
|
|
|
+ // TaxHelperEidTokenRequest eidTokenRequest = new TaxHelperEidTokenRequest(eidTokenModel);
|
|
|
|
+ // eidTokenRequest.setKey(loginRequest.getKey());
|
|
|
|
+ // TaxHelperResponse eRes = service.getEidToken(eidTokenRequest);
|
|
|
|
+ // System.out.println(eRes.success());
|
|
|
|
+ // System.out.println(JSONUtil.toJsonStr(eRes));
|
|
|
|
+ // System.out.println("================================================================================================================");
|
|
|
|
+ //
|
|
|
|
+ // log.warn(">>>>>>>>>>>>>>echeck token");
|
|
|
|
+ //
|
|
|
|
+ // TaxHelperECheckModel eCheckModel = new TaxHelperECheckModel(taxHelperConfig);
|
|
|
|
+ // eCheckModel.setToken(eRes.getMessage());
|
|
|
|
+ // TaxHelperECheckRequest eCheckRequest = new TaxHelperECheckRequest(eCheckModel);
|
|
|
|
+ // eCheckRequest.setKey(loginRequest.getKey());
|
|
|
|
+ // TaxHelperResponse echeck = service.ECheckFace(eCheckRequest);
|
|
|
|
+ // System.out.println(echeck.success());
|
|
|
|
+ // System.out.println(JSONUtil.toJsonStr(echeck));
|
|
|
|
+ //
|
|
|
|
+ //
|
|
|
|
+ // System.out.println("================================================================================================================");
|
|
|
|
+ }
|
|
|
|
+
|
|
// // log.warn(">>>>>>>>>>>>>>>>>>>获取token");
|
|
// // log.warn(">>>>>>>>>>>>>>>>>>>获取token");
|
|
//
|
|
//
|
|
// TaxHelperAppletBizTokenModel taxHelperAppletBizTokenModel = new TaxHelperAppletBizTokenModel(taxHelperConfig);
|
|
// TaxHelperAppletBizTokenModel taxHelperAppletBizTokenModel = new TaxHelperAppletBizTokenModel(taxHelperConfig);
|
|
@@ -604,4 +639,4 @@ public class TaxHelperService {
|
|
// TaxHelperResponse s6 = service.settlement(taxHelperSettlementRequest);
|
|
// TaxHelperResponse s6 = service.settlement(taxHelperSettlementRequest);
|
|
// System.out.println(s6);
|
|
// System.out.println(s6);
|
|
// }
|
|
// }
|
|
-}
|
|
|
|
|
|
+// }
|