diff --git a/jianshui-admin/src/main/java/com/jianshui/api/controller/http/invoice/v1/InvoiceController.java b/jianshui-admin/src/main/java/com/jianshui/api/controller/http/invoice/v1/InvoiceController.java index 7053587..8c1777c 100644 --- a/jianshui-admin/src/main/java/com/jianshui/api/controller/http/invoice/v1/InvoiceController.java +++ b/jianshui-admin/src/main/java/com/jianshui/api/controller/http/invoice/v1/InvoiceController.java @@ -1956,7 +1956,7 @@ public class InvoiceController { rawJson.put(k, map.get(k)[0]); } if (StringUtils.isEmpty(rawJson)) { - log.info("[重汽批量开票接口]未获取到请求参数！identity={},e={}", identity); + log.info("[重汽批量开票接口]未获取到请求参数！identity={}", identity); return; } String order = rawJson.getString("order"); diff --git a/jianshui-common/src/main/java/com/jianshui/common/utils/encrypt/AisinoInvoiceDecryptUtil.java b/jianshui-common/src/main/java/com/jianshui/common/utils/encrypt/JianshuiInvoiceDecryptUtil.java similarity index 99% rename from jianshui-common/src/main/java/com/jianshui/common/utils/encrypt/AisinoInvoiceDecryptUtil.java rename to jianshui-common/src/main/java/com/jianshui/common/utils/encrypt/JianshuiInvoiceDecryptUtil.java index 2d793e3..d19ca43 100644 --- a/jianshui-common/src/main/java/com/jianshui/common/utils/encrypt/AisinoInvoiceDecryptUtil.java +++ b/jianshui-common/src/main/java/com/jianshui/common/utils/encrypt/JianshuiInvoiceDecryptUtil.java @@ -11,19 +11,16 @@ import javax.crypto.Cipher; import javax.crypto.spec.GCMParameterSpec; import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.SecretKeySpec; -import javax.xml.bind.DatatypeConverter; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; -import java.security.SecureRandom; -import java.util.Arrays; /** * 功能描述 * 加密常用类 */ -public class AisinoInvoiceDecryptUtil { +public class JianshuiInvoiceDecryptUtil { private static final String ALGORITHM = "AES/GCM/NoPadding"; private static final int KEY_SIZE = 128; // 密钥长度为128位 diff --git a/jianshui-common/src/main/java/com/jianshui/common/utils/encrypt/AisinoInvoiceEncryptUtil.java b/jianshui-common/src/main/java/com/jianshui/common/utils/encrypt/JianshuiInvoiceEncryptUtil.java similarity index 99% rename from jianshui-common/src/main/java/com/jianshui/common/utils/encrypt/AisinoInvoiceEncryptUtil.java rename to jianshui-common/src/main/java/com/jianshui/common/utils/encrypt/JianshuiInvoiceEncryptUtil.java index faa6b55..33eb8f2 100644 --- a/jianshui-common/src/main/java/com/jianshui/common/utils/encrypt/AisinoInvoiceEncryptUtil.java +++ b/jianshui-common/src/main/java/com/jianshui/common/utils/encrypt/JianshuiInvoiceEncryptUtil.java @@ -14,13 +14,12 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; -import java.security.SecureRandom; /** * 功能描述 * 加密常用类 */ -public class AisinoInvoiceEncryptUtil { +public class JianshuiInvoiceEncryptUtil { private static final String ALGORITHM = "AES/GCM/NoPadding"; private static final int IV_LENGTH = 12; // 初始化向量长度为12字节（96位） diff --git a/jianshui-income/src/main/java/com/jianshui/income/service/impl/adapter/request/AisinoIncomeRequestAdapterImpl.java b/jianshui-income/src/main/java/com/jianshui/income/service/impl/adapter/request/AisinoIncomeRequestAdapterImpl.java index 1cdbe9a..325ecd9 100644 --- a/jianshui-income/src/main/java/com/jianshui/income/service/impl/adapter/request/AisinoIncomeRequestAdapterImpl.java +++ b/jianshui-income/src/main/java/com/jianshui/income/service/impl/adapter/request/AisinoIncomeRequestAdapterImpl.java @@ -5,7 +5,7 @@ import com.jianshui.common.core.domain.entity.Companyservice; import com.jianshui.common.enums.ErrorCode; import com.jianshui.common.exception.jianshui.JianshuiParamErrorException; import com.jianshui.common.utils.StringUtils; -import com.jianshui.common.utils.encrypt.AisinoInvoiceDecryptUtil; +import com.jianshui.common.utils.encrypt.JianshuiInvoiceDecryptUtil; import com.jianshui.income.service.IIncomeRequestService; import com.jianshui.system.service.ICompanyserviceService; import lombok.extern.slf4j.Slf4j; @@ -89,7 +89,7 @@ public class AisinoIncomeRequestAdapterImpl implements IIncomeRequestService { // 平台解密 try { - order = AisinoInvoiceDecryptUtil.decrypt(order, JKey); + order = JianshuiInvoiceDecryptUtil.decrypt(order, JKey); } catch (Exception e) { e.printStackTrace(); throw new JianshuiParamErrorException(ErrorCode.DECRYPT_ERROR, companyservice, "income"); diff --git a/jianshui-income/src/main/java/com/jianshui/income/service/impl/adapter/request/ElephentIncomeAuthRequestAdapterImpl.java b/jianshui-income/src/main/java/com/jianshui/income/service/impl/adapter/request/ElephentIncomeAuthRequestAdapterImpl.java index 201eb55..735cf06 100644 --- a/jianshui-income/src/main/java/com/jianshui/income/service/impl/adapter/request/ElephentIncomeAuthRequestAdapterImpl.java +++ b/jianshui-income/src/main/java/com/jianshui/income/service/impl/adapter/request/ElephentIncomeAuthRequestAdapterImpl.java @@ -5,7 +5,7 @@ import com.jianshui.common.core.domain.entity.Companyservice; import com.jianshui.common.enums.ErrorCode; import com.jianshui.common.exception.jianshui.JianshuiParamErrorException; import com.jianshui.common.utils.StringUtils; -import com.jianshui.common.utils.encrypt.AisinoInvoiceDecryptUtil; +import com.jianshui.common.utils.encrypt.JianshuiInvoiceDecryptUtil; import com.jianshui.income.service.IIncomeRequestService; import com.jianshui.system.service.ICompanyserviceService; import lombok.extern.slf4j.Slf4j; @@ -71,7 +71,7 @@ public class ElephentIncomeAuthRequestAdapterImpl implements IIncomeRequestServi // 平台解密 try { - order = AisinoInvoiceDecryptUtil.decrypt(order, JKey); + order = JianshuiInvoiceDecryptUtil.decrypt(order, JKey); } catch (Exception e) { e.printStackTrace(); throw new JianshuiParamErrorException(ErrorCode.DECRYPT_ERROR, companyservice, "income"); diff --git a/jianshui-income/src/main/java/com/jianshui/income/service/impl/adapter/response/AisinoIncomeResponseAdapterImpl.java b/jianshui-income/src/main/java/com/jianshui/income/service/impl/adapter/response/AisinoIncomeResponseAdapterImpl.java index e13d9d0..09ef2d7 100644 --- a/jianshui-income/src/main/java/com/jianshui/income/service/impl/adapter/response/AisinoIncomeResponseAdapterImpl.java +++ b/jianshui-income/src/main/java/com/jianshui/income/service/impl/adapter/response/AisinoIncomeResponseAdapterImpl.java @@ -3,20 +3,14 @@ package com.jianshui.income.service.impl.adapter.response; import com.alibaba.fastjson.JSONObject; import com.jianshui.common.core.domain.AjaxResult; import com.jianshui.common.core.domain.entity.Companyservice; -import com.jianshui.common.enums.ErrorCode; import com.jianshui.common.exception.jianshui.JianshuiParamErrorException; import com.jianshui.common.utils.StringUtils; -import com.jianshui.common.utils.encrypt.AisinoInvoiceDecryptUtil; -import com.jianshui.common.utils.http.HttpHelper; -import com.jianshui.income.service.IIncomeRequestService; import com.jianshui.income.service.IIncomeResponseService; import com.jianshui.system.service.ICompanyserviceService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import javax.servlet.ServletRequest; - /** * @Description * @Author 巩权林 diff --git a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/adapter/request/AisinoIncomeRequestAdapterImpl.java b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/adapter/request/AisinoIncomeRequestAdapterImpl.java index 663d619..7b90db9 100644 --- a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/adapter/request/AisinoIncomeRequestAdapterImpl.java +++ b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/adapter/request/AisinoIncomeRequestAdapterImpl.java @@ -5,7 +5,7 @@ import com.jianshui.common.core.domain.entity.Companyservice; import com.jianshui.common.enums.ErrorCode; import com.jianshui.common.exception.jianshui.JianshuiParamErrorException; import com.jianshui.common.utils.StringUtils; -import com.jianshui.common.utils.encrypt.AisinoInvoiceDecryptUtil; +import com.jianshui.common.utils.encrypt.JianshuiInvoiceDecryptUtil; import com.jianshui.invoiceall.service.IInvoiceAllRequestService; import com.jianshui.system.service.ICompanyserviceService; import lombok.extern.slf4j.Slf4j; @@ -88,7 +88,7 @@ public class AisinoIncomeRequestAdapterImpl implements IInvoiceAllRequestService // 平台解密 try { - order = AisinoInvoiceDecryptUtil.decrypt(order, JKey); + order = JianshuiInvoiceDecryptUtil.decrypt(order, JKey); } catch (Exception e) { e.printStackTrace(); throw new JianshuiParamErrorException(ErrorCode.DECRYPT_ERROR, companyservice, "invoiceall"); diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/adapter/request/AisinoInvoiceRequestAdapterImpl.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/adapter/request/AisinoInvoiceRequestAdapterImpl.java index 952ac35..ed342dd 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/adapter/request/AisinoInvoiceRequestAdapterImpl.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/adapter/request/AisinoInvoiceRequestAdapterImpl.java @@ -1,8 +1,6 @@ package com.jianshui.invoice.service.impl.adapter.request; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONArray; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONObject; @@ -11,7 +9,7 @@ import com.jianshui.common.enums.ErrorCode; import com.jianshui.common.exception.jianshui.JianshuiParamErrorException; import com.jianshui.common.utils.IdcardUtils; import com.jianshui.common.utils.StringUtils; -import com.jianshui.common.utils.encrypt.AisinoInvoiceDecryptUtil; +import com.jianshui.common.utils.encrypt.JianshuiInvoiceDecryptUtil; import com.jianshui.invoice.domain.BillDetail; import com.jianshui.invoice.domain.BillInfo; import com.jianshui.invoice.domain.Redinfo; @@ -22,7 +20,6 @@ import com.jianshui.invoice.domain.dto.adapter.request.aisino_jn.HxBillInfoDTO; import com.jianshui.invoice.domain.dto.adapter.request.aisino_jn.HxRedInfoDTO; import com.jianshui.invoice.domain.dto.adapter.request.aisino_jn.HxRedInfoDetailsDTO; import com.jianshui.invoice.service.IInvoiceRequestService; -import com.jianshui.invoice.utils.elephant.ElephantUtils; import com.jianshui.system.service.ICompanyserviceService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; @@ -107,7 +104,7 @@ public class AisinoInvoiceRequestAdapterImpl implements IInvoiceRequestService { // 平台解密 try { // TODO: 2023/9/20 - order = AisinoInvoiceDecryptUtil.decrypt(order, JKey); + order = JianshuiInvoiceDecryptUtil.decrypt(order, JKey); } catch (Exception e) { e.printStackTrace(); throw new JianshuiParamErrorException(ErrorCode.DECRYPT_ERROR, companyservice, "invoice"); @@ -369,7 +366,7 @@ public class AisinoInvoiceRequestAdapterImpl implements IInvoiceRequestService { // 平台解密 try { // TODO: 2023/9/20 - order = AisinoInvoiceDecryptUtil.decrypt(order, JKey); + order = JianshuiInvoiceDecryptUtil.decrypt(order, JKey); } catch (Exception e) { e.printStackTrace(); throw new JianshuiParamErrorException(ErrorCode.DECRYPT_ERROR, companyservice, "invoice"); diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/adapter/request/Nuonuo2InvoiceRequestAdapterImpl.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/adapter/request/Nuonuo2InvoiceRequestAdapterImpl.java index cfa3cc0..dddb36c 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/adapter/request/Nuonuo2InvoiceRequestAdapterImpl.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/adapter/request/Nuonuo2InvoiceRequestAdapterImpl.java @@ -1,17 +1,13 @@ package com.jianshui.invoice.service.impl.adapter.request; import cn.hutool.core.collection.CollectionUtil; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.jianshui.common.core.domain.AjaxResult; import com.jianshui.common.core.domain.entity.Companyservice; import com.jianshui.common.enums.ErrorCode; import com.jianshui.common.exception.jianshui.JianshuiParamErrorException; import com.jianshui.common.utils.DateUtils; import com.jianshui.common.utils.IdcardUtils; import com.jianshui.common.utils.StringUtils; -import com.jianshui.common.utils.TimeUtil; -import com.jianshui.common.utils.encrypt.AisinoInvoiceDecryptUtil; import com.jianshui.common.utils.http.HttpHelper; import com.jianshui.invoice.domain.BillDetail; import com.jianshui.invoice.domain.BillInfo; @@ -22,12 +18,10 @@ import com.jianshui.invoice.domain.dto.adapter.request.nuonuo2.*; import com.jianshui.invoice.service.IInvoiceRequestService; import com.jianshui.system.service.ICompanyserviceService; import lombok.extern.slf4j.Slf4j; -import nuonuo.open.sdk.NNOpenSDK; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import javax.servlet.ServletRequest; import javax.servlet.http.HttpServletRequest; import java.util.*; diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/IncomeTest.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/IncomeTest.java index 67c97e9..5fa7ecf 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/IncomeTest.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/IncomeTest.java @@ -3,9 +3,8 @@ package com.jianshui.invoice.utils; import cn.hutool.core.date.DateUtil; import cn.hutool.json.JSONUtil; -import com.jianshui.common.utils.DateUtils; import com.jianshui.common.utils.StringUtils; -import com.jianshui.common.utils.encrypt.AisinoInvoiceDecryptUtil; +import com.jianshui.common.utils.encrypt.JianshuiInvoiceDecryptUtil; import com.jianshui.common.utils.uuid.UUID; import java.util.*; @@ -40,7 +39,7 @@ public class IncomeTest { "}\n"; // String order = "{\"jym\":\"165330\",\"fpje\":\"83.07\",\"fpdm\":\"011002100511\",\"kprq\":\"20220209\",\"fphm\":\"41985485\",\"fpzl\":\"10\",\"taxNo\":\"91370100664851254J\"}"; // String order = "{\"jym\":\"356607\",\"fpje\":\"259.23\",\"fpdm\":\"011002000711\",\"kprq\":\"20210111\",\"fphm\":\"66914035\",\"fpzl\":\"01\",\"taxNo\":\"91370102MA3UD2FG21\" }"; - String m = AisinoInvoiceDecryptUtil.encrypt(order, key); + String m = JianshuiInvoiceDecryptUtil.encrypt(order, key); System.out.println("json : " + order); System.out.println(m); System.out.println("------------------------------------------------"); @@ -48,14 +47,14 @@ public class IncomeTest { System.out.println("-------------------批量发票查验-----------------------------"); order = "{\"invoiceList\":[{\"fpdm\":\"3200211130\",\"fphm\":\"49523142\",\"fpje\":\"986359.73\",\"fpzl\":\"01\",\"kprq\":\"20210712\"}],\"pch\":\"761651651651651515151568438476\",\"taxNo\":\"91370102MA3UD2FG21\"}"; System.out.println("json : \n" + order); - m = AisinoInvoiceDecryptUtil.encrypt(order, key); + m = JianshuiInvoiceDecryptUtil.encrypt(order, key); System.out.println(m); System.out.println("------------------------------------------------"); System.out.println("-------------------批量发票查验结果查询-----------------------------"); order = "{\"pch\":\"761651651651651515151568438476\",\"taxNo\":\"91370102MA3UD2FG21\"}"; - m = AisinoInvoiceDecryptUtil.encrypt(order, key); + m = JianshuiInvoiceDecryptUtil.encrypt(order, key); System.out.println("json : \n" + order); System.out.println(m); System.out.println("------------------------------------------------"); @@ -64,7 +63,7 @@ public class IncomeTest { System.out.println("-------------------企业档案查询-----------------------------"); order = "{\"SBH\":\"1403016L1NN5336\",\"taxNo\":\"1403016L1NN5336\"}"; - m = AisinoInvoiceDecryptUtil.encrypt(order, key); + m = JianshuiInvoiceDecryptUtil.encrypt(order, key); System.out.println("json : \n" + order); System.out.println(m); System.out.println("------------------------------------------------"); @@ -99,7 +98,7 @@ public class IncomeTest { order = JSONUtil.toJsonStr(map); - m = AisinoInvoiceDecryptUtil.encrypt(order, key); + m = JianshuiInvoiceDecryptUtil.encrypt(order, key); System.out.println("json : " + order); System.out.println(m); System.out.println("------------------------------------------------"); @@ -107,7 +106,7 @@ public class IncomeTest { System.out.println("-------------------获取认证结果-----------------------------"); // order = "{\"PCH\":\"3eb6645e2fc84b8384ac2db8c3fd78f7\",\"taxNo\":\"9111122223333CKFPT\"}"; order = "{\"PCH\":\"20220020021312341\",\"taxNo\":\"9111122223333CKFPT\"}"; - m = AisinoInvoiceDecryptUtil.encrypt(order, key); + m = JianshuiInvoiceDecryptUtil.encrypt(order, key); System.out.println("json : \n" + order); System.out.println(m); System.out.println("------------------------------------------------"); @@ -118,7 +117,7 @@ public class IncomeTest { order = "{\"GMFSBH\":\"9111122223333CKFPT\",\"PCH\":\""+ "67074fed71cc42da8fc12bdcd2111s99" +"\"," + "\"QRBZ\":\"1\",\"TJSJ\":\"202209\",\"RZSKSSQ\":\"202209\",\"QRMM\":\"123456\",\"taxNo\":\"9111122223333CKFPT\"}"; - m = AisinoInvoiceDecryptUtil.encrypt(order, key); + m = JianshuiInvoiceDecryptUtil.encrypt(order, key); System.out.println("json : \n" + order); System.out.println(m); System.out.println("------------------------------------------------"); @@ -127,7 +126,7 @@ public class IncomeTest { order = "{\"GMFSBH\":\"9111122223333CKFPT\",\"PCH\":\"2d92821a9dfc4f1aaa744bcbd1696ebd\"," + "\"QRBZ\":\"0\",\"TJSJ\":\"202209\",\"taxNo\":\"9111122223333CKFPT\"}"; order = "{\"PCH\":\"67074fed71cc42da8fc12bdcd2111s99\",\"TJSJ\":\"202209\",\"taxNo\":\"9111122223333CKFPT\",\"GMFSBH\":\"9111122223333CKFPT\",\"QRBZ\":\"1\"}"; - m = AisinoInvoiceDecryptUtil.encrypt(order, key); + m = JianshuiInvoiceDecryptUtil.encrypt(order, key); System.out.println("json : \n" + order); System.out.println(m); System.out.println("------------------------------------------------"); @@ -135,21 +134,21 @@ public class IncomeTest { System.out.println("-------------------状态采集-----------------------------"); order = "{\"GMFSBH\":\"9111122223333CKFPT\",\"PCH\":\"0827f998cdfd40b0a5626150520b4dea\"," + "\"ZTBGKSRQ\":\"20190101010120\",\"ZTBGJSRQ\":\"20191001010120\",\"ZTBZ\":\"1\",\"KSHS\":\"1\",\"taxNo\":\"9111122223333CKFPT\"}"; - m = AisinoInvoiceDecryptUtil.encrypt(order, key); + m = JianshuiInvoiceDecryptUtil.encrypt(order, key); System.out.println("json : \n" + order); System.out.println(m); System.out.println("------------------------------------------------"); System.out.println("-------------------设置密码-----------------------------"); order = "{\"SBH\":\"9111122223333CKFPT\",\"YWMM\":\"123456\",\"NEWYWMM\":\"123456\",\"taxNo\":\"9111122223333CKFPT\"}"; - m = AisinoInvoiceDecryptUtil.encrypt(order, key); + m = JianshuiInvoiceDecryptUtil.encrypt(order, key); System.out.println("json : \n" + order); System.out.println(m); System.out.println("------------------------------------------------"); System.out.println("-------------------重置密码-----------------------------"); order = "{\"SBH\":\"9111122223333CKFPT\",\"taxNo\":\"9111122223333CKFPT\"}"; - m = AisinoInvoiceDecryptUtil.encrypt(order, key); + m = JianshuiInvoiceDecryptUtil.encrypt(order, key); System.out.println("json : \n" + order); System.out.println(m); System.out.println("------------------------------------------------"); @@ -169,7 +168,7 @@ public class IncomeTest { " \"FHHS\": \"10\",\n" + // 当该参数有值时，接口按照参数返回发票条数，如果没值时，接口按照默认值返回发票条数 " \"taxNo\": \"9111122223333CKFPT\"\n" + // 测试税号 "}"; - m = AisinoInvoiceDecryptUtil.encrypt(order, key); + m = JianshuiInvoiceDecryptUtil.encrypt(order, key); System.out.println("json : \n" + order); System.out.println(m); System.out.println("------------------------------------------------"); @@ -188,7 +187,7 @@ public class IncomeTest { " \"taxNo\": \"9111122223333CKFPT\"\n" + // 测试税号 "}"; - m = AisinoInvoiceDecryptUtil.encrypt(order, key); + m = JianshuiInvoiceDecryptUtil.encrypt(order, key); System.out.println("json : \n" + order); System.out.println(m); System.out.println("------------------------------------------------"); @@ -199,7 +198,7 @@ public class IncomeTest { " \"RZSKSSQ\": \"202209\",\n" + " \"taxNo\": \"9111122223333CKFPT\"\n" + // 测试税号 "}"; - m = AisinoInvoiceDecryptUtil.encrypt(order, key); + m = JianshuiInvoiceDecryptUtil.encrypt(order, key); System.out.println("json : \n" + order); System.out.println(m); System.out.println("------------------------------------------------"); @@ -213,7 +212,7 @@ public class IncomeTest { " \"RZSKSSQ\": \"202209\",\n" + " \"taxNo\": \"9111122223333CKFPT\"\n" + "}"; - m = AisinoInvoiceDecryptUtil.encrypt(order, key); + m = JianshuiInvoiceDecryptUtil.encrypt(order, key); System.out.println("json : \n" + order); System.out.println(m); System.out.println("------------------------------------------------"); @@ -225,7 +224,7 @@ public class IncomeTest { " \"GMFSBH\": \"9111122223333CKFPT\",\n" + " \"taxNo\": \"9111122223333CKFPT\"\n" + "}"; - m = AisinoInvoiceDecryptUtil.encrypt(order, key); + m = JianshuiInvoiceDecryptUtil.encrypt(order, key); System.out.println("json : \n" + order); System.out.println(m); System.out.println("------------------------------------------------"); diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/InvoiceTest.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/InvoiceTest.java index 6d094cd..89b4973 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/InvoiceTest.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/InvoiceTest.java @@ -2,13 +2,7 @@ package com.jianshui.invoice.utils; import cn.hutool.core.util.IdUtil; -import com.jianshui.common.utils.encrypt.AisinoInvoiceDecryptUtil; -import com.jianshui.common.utils.encrypt.AisinoInvoiceEncryptUtil; -import org.apache.commons.codec.binary.Base64; - -import javax.crypto.KeyGenerator; -import javax.crypto.SecretKey; -import java.security.SecureRandom; +import com.jianshui.common.utils.encrypt.JianshuiInvoiceDecryptUtil; /** * @Description @@ -362,7 +356,7 @@ public class InvoiceTest { System.out.println(order); - String m = AisinoInvoiceDecryptUtil.encrypt(order, key); + String m = JianshuiInvoiceDecryptUtil.encrypt(order, key); System.out.println("-------------------发票开具-----------------------------"); System.out.println(m); System.out.println("------------------------------------------------"); @@ -371,12 +365,12 @@ public class InvoiceTest { System.out.println(query); - m = AisinoInvoiceDecryptUtil.encrypt(query, key); + m = JianshuiInvoiceDecryptUtil.encrypt(query, key); System.out.println(m); System.out.println("------------------------------------------------"); System.out.println("-------------------发票查询（订单号）-----------------------------"); query = "{\"identity\":\"1200\",\"orderno\":[ '00000000005223210916']}"; - m = AisinoInvoiceDecryptUtil.encrypt(query, key); + m = JianshuiInvoiceDecryptUtil.encrypt(query, key); System.out.println(m); System.out.println("------------------------------------------------"); @@ -387,7 +381,7 @@ public class InvoiceTest { " \"fphm\": \"66198156\",\n" + "}"; - m = AisinoInvoiceDecryptUtil.encrypt(query, key); + m = JianshuiInvoiceDecryptUtil.encrypt(query, key); System.out.println(m); System.out.println("------------------------------------------------"); @@ -398,7 +392,7 @@ public class InvoiceTest { " \"sellerTaxnum\": \"110101MYJ2GPQQ4\"\n" + "}"; - m = AisinoInvoiceDecryptUtil.encrypt(query, key); + m = JianshuiInvoiceDecryptUtil.encrypt(query, key); System.out.println(m); System.out.println("------------------------------------------------"); @@ -408,7 +402,7 @@ public class InvoiceTest { " \"dyjmc\": \"\"" + "}"; - m = AisinoInvoiceDecryptUtil.encrypt(query, key); + m = JianshuiInvoiceDecryptUtil.encrypt(query, key); System.out.println(m); System.out.println("------------------------------------------------"); @@ -435,7 +429,7 @@ public class InvoiceTest { " ]\n" + "}"; - m = AisinoInvoiceDecryptUtil.encrypt(query, key); + m = JianshuiInvoiceDecryptUtil.encrypt(query, key); System.out.println(m); System.out.println("------------------------------------------------"); @@ -447,17 +441,17 @@ public class InvoiceTest { "\"invoiceCode\": \"150000020026\"," + "\"invoiceNum\": \"94579496\"" + "}]}"; - m = AisinoInvoiceDecryptUtil.encrypt(query, key); + m = JianshuiInvoiceDecryptUtil.encrypt(query, key); System.out.println(m); System.out.println("------------------------------------------------"); query = ""; - m = AisinoInvoiceDecryptUtil.encrypt(query, key); + m = JianshuiInvoiceDecryptUtil.encrypt(query, key); System.out.println(m); System.out.println("------------------------------------------------"); order = "{\"identity\":\"1131\",\"order\":{\"buye rname\":\"山东爱信诺\",\"taxnum\":\"124511234993295177\",\"phone\":\"0\",\"address\":\"山东省济南市华信路 10\",\"account\":\"\",\"telephone\":\"0\",\"orderno\":\"nuonuo12345631\",\"invoicedate\":\"2018-10 -31 19:16:51\",\"clerk\":\"黄芝\",\"saleaccount\":\"宇宙行 442612010103507108\",\"salephone\":\"0774-7893911\",\"saleaddress\":\"富川瑶族自治县新 永 路 138 号 \",\"saletaxnum\":\"339901999999142\",\"kptype\":\"1\",\"message\":\"\",\"invoiceNow\":\"1\",\"payee\":\"林莉苏\",\"checker\":\"林莉苏\",\"tsfs\":\"-1\",\"email\":\"502192347@qq.com\",\"qdbz\":\"0\",\"qdxmmc\":\"\",\"dkbz\":\" 0\",\"deptid\":\"\",\"clerkid\":\"\",\"invoiceLine\":\"p\",\"cpybz\":\"\",\"detail\":[{\"goodsname\":\"苹果\",\"num\":\"1\",\"price\":\"1\",\"hsbz\":\"1\",\"taxrate\":\"0.13\",\"spec\":\"\",\"unit\":\"吨 \",\"spbm\":\"10101150101\",\"zsbm\":\"\",\"fphxz\":\"0\",\"yhzcbs\":\"0\",\"zzstsgl\":\"\",\"lsl bs\":\"\",\"kce\":\"\"}]}}"; // order="{\"identity\":\"1132\",\"order\":[{\"buyername\":\"浙江爱信诺\",\"taxnum\":\"334511234993295178\",\"phone\":\"0\",\"address\":\" 浙江省杭州市万塘路 \",\"account\":\"\",\"telephone\":\"0\",\"orderno\":\"nuonuo243451234\",\"invoicedate\":\"2018-10-31 19:16:51\",\"clerk\":\"黄芝\",\"saleaccount\":\"宇宙行 442612010103507108\",\"salephone\":\"0774-7893911\",\"saleaddress\":\"富川瑶族自治县新 永路 138 号 \",\"saletaxnum\":\"150301199811285326\",\"kptype\":\"1\",\"message\":\"1\",\"invoiceNow\":\"1\",\"payee\":\"林莉苏 \",\"checker\":\"林莉苏 \",\"tsfs\":\"-1\",\"email\":\"502192347@qq.com\",\"qdbz\":\"0\",\"qdxmmc\":\"\",\"dkbz\":\"0\",\"deptid\":\"\",\"clerkid\":\"\",\"invoiceLine\":\"c\",\"cpybz\":\"\",\"detail\":[{\"goodsname\":\"苹果\",\"num\":\"1\",\"price\":\"1\",\"hsbz\":\"1\",\"taxrate\":\"0.13\",\"spec\":\"111\",\"unit\":\"吨 \",\"spbm\":\"10101150101\",\"zsbm\":\"111\",\"fphxz\":\"0\",\"yhzcbs\":\"0\",\"zzstsgl\":\"1\",\"lslbs\":\"1\",\"kce\":\"0\",\"tax\":\"1.20\",\"spbm\":\"112\",\"taxamt\":\"112\"}]},{\"buyername\":\"浙江爱信诺\",\"taxnum\":\"393511234993295177\",\"phone\":\"0\",\"address\":\" 浙江省杭州市万塘路 \",\"account\":\"\",\"telephone\":\"0\",\"orderno\":\"nuonuo243451243\",\"invoicedate\":\"2018-10-31 19:16:51\",\"clerk\":\"黄芝\",\"saleaccount\":\"宇宙行 442612010103507108\",\"salephone\":\"0774-7893911\",\"saleaddress\":\"富川瑶族自治县新 永路 138 号 \",\"saletaxnum\":\"150301199811285326\",\"kptype\":\"1\",\"message\":\"1\",\"invoiceNow\":\"1\",\"payee\":\"林莉苏 \",\"checker\":\"林莉苏 \",\"tsfs\":\"-1\",\"email\":\"502192347@qq.com\",\"qdbz\":\"0\",\"qdxmmc\":\"\",\"dkbz\":\"0\",\"deptid\":\"\",\"clerkid\":\"\",\"invoiceLine\":\"c\",\"cpybz\":\"\",\"detail\":[{\"goodsname\":\"苹果\",\"num\":\"1\",\"price\":\"1\",\"hsbz\":\"1\",\"taxrate\":\"0.13\",\"spec\":\"111\",\"unit\":\"吨 \",\"spbm\":\"10101150101\",\"zsbm\":\"111\",\"fphxz\":\"0\",\"yhzcbs\":\"0\",\"zzstsgl\":\"1\",\"lslbs\":\"1\",\"kce\":\"0\",\"tax\":\"1.20\",\"spbm\":\"112\",\"taxamt\":\"112\"}]}]}"; - m = AisinoInvoiceDecryptUtil.encrypt(order, key); + m = JianshuiInvoiceDecryptUtil.encrypt(order, key); System.out.println(m); @@ -465,7 +459,7 @@ public class InvoiceTest { query = "{\"FP\":{\"GMFDZDH\":\"山东省潍坊市奎文区胜利东街4778号中央商务区2号楼301号\",\"XHFSBH\":\"91370703334376454N\",\"QDXMMC\":\"销售货物或者提供应税劳务、服务清单\",\"KPRQ\":\"20230331163347\",\"SGBZ\":\"\",\"XHFDZDH\":\"山东省潍坊市寒亭区白云路9号3号楼1-9 15165614885\",\"KPR\":\"庄莹莹\",\"QDBZ\":0,\"FHR\":\"于艺娇\",\"KPLX\":0,\"FPMX\":[{\"XMMC\":\"*设计服务*物料制作费\",\"ZXBM\":\"\",\"DJ\":\"128.712871\",\"ZZSTSGL\":\"\",\"KCE\":\"\",\"SPBM\":\"3040301990000000000\",\"SPSL\":\"1\",\"GGXH\":\"\",\"SE\":\"1.29\",\"DW\":\"批\",\"YHZCBS\":\"0\",\"SL\":\"0.01\",\"JE\":\"128.71\",\"FPHXZ\":0}],\"XHFMC\":\"山东达飞文化传播有限公司\",\"XHFYHZH\":\"潍坊农村商业银行股份有限公司寒亭支行 9070107120142050010911\",\"BZ\":\"\",\"EWM\":\"01,10,037002000311,66223914,128.71,20230331,05834122603484774628,2C6E,\",\"HJJE\":\"128.71\",\"FWM\":\"03-17-*>>1/062*89538-9/2265>975>20477<-/2-149-+4503*/6+3-/<>2+>90523-8><<7*8545668<276-503+9150181/-194>21>1/062*89538-9/2265>975>20477<-/2-149-+4503*/6+3-/<>2+>90523-8><<7*8545668<276-503+9150181/-194>21