From 2de0c15754e0734ba39ac5d50bb79160dad15ba8 Mon Sep 17 00:00:00 2001
From: dongxiaoke <1910333201@qq.com>
Date: Fri, 7 Jul 2023 18:10:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E7=94=B5=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/config/WebserviceResponseHandler.java | 64 +++++++++++--------
 .../src/main/resources/application-dev.yml    |  3 +-
 .../elephant/ElephantCompanyserviceUtils.java |  3 +
 .../jianshui/invoice/utils/IncomeTest.java    |  5 +-
 4 files changed, 45 insertions(+), 30 deletions(-)

diff --git a/jianshui-admin/src/main/java/com/jianshui/api/config/WebserviceResponseHandler.java b/jianshui-admin/src/main/java/com/jianshui/api/config/WebserviceResponseHandler.java
index b1a74a1..fccfa7f 100644
--- a/jianshui-admin/src/main/java/com/jianshui/api/config/WebserviceResponseHandler.java
+++ b/jianshui-admin/src/main/java/com/jianshui/api/config/WebserviceResponseHandler.java
@@ -37,10 +37,18 @@ public class WebserviceResponseHandler implements SOAPHandler<SOAPMessageContext
                 Node dataNode = returnNode.getFirstChild();
                 // 修改CDATA标签位置
 //                addCDataToLeafNodes(dataNode);
+
                 CDATASection cdata = dataNode.getOwnerDocument().createCDATASection(XmlUtil.toStr(dataNode,"GBK",false,false));
                 returnNode.removeChild(dataNode);
                 returnNode.appendChild(cdata);
-                addCDataToLeafNodes(dataNode);
+
+//                addCDataToLeafNodes(dataNode);
+
+//                CDATASection cdata = dataNode.getOwnerDocument().createCDATASection(XmlUtil.toStr(dataNode,"GBK",false,false));
+//                returnNode.removeChild(dataNode);
+//                returnNode.appendChild(cdata);
+
+
                 // body.getFirstChild().removeChild(body.getFirstChild().getFirstChild());
                 // CDATASection cdata = Data.getOwnerDocument().createCDATASection(XmlUtil.toStr(fp, "GBK", false, true));
                 // body.setTextContent(XmlUtil.toStr(body.getFirstChild()));
@@ -55,30 +63,32 @@ public class WebserviceResponseHandler implements SOAPHandler<SOAPMessageContext
     }
 
     /**
-    * @Author: kk
-    * @Description: CDATA类
-    * @DateTime: 2023/6/5 19:12
-    * @Params:
-    * @Return
-    */
+     * @Author: kk
+     * @Description: CDATA类
+     * @DateTime: 2023/6/5 19:12
+     * @Params:
+     * @Return
+     */
 
-    public static void addCDataToLeafNodes(Node node) {
-        NodeList childNodes = node.getChildNodes();
-        for (int i = 0; i < childNodes.getLength(); i++) {
-            Node childNode = childNodes.item(i);
-            if (childNode.getNodeType() == Node.ELEMENT_NODE) {
-                addCDataToLeafNodes(childNode);
-            }
-            else if (childNode.getNodeType() == Node.TEXT_NODE) {
-                CDATASection cdata = childNode.getOwnerDocument().createCDATASection(childNode.getNodeValue());
-                node.removeChild(childNode);
-                node.appendChild(cdata);
-            }
-        }
-    }
+//    public static void addCDataToLeafNodes(Node returnNode) {
+//        NodeList childNodes = returnNode.getChildNodes();
+//        for (int i = 0; i < childNodes.getLength(); i++) {
+//            Node childNode = childNodes.item(i);
+//            if (childNode.getNodeType() == Node.ELEMENT_NODE) {
+//                addCDataToLeafNodes(childNode);
+//            } else if (childNode.getNodeType() == Node.TEXT_NODE) {
+//                CDATASection cdata = childNode.getOwnerDocument().createCDATASection(childNode.getNodeValue() + "]]");
+//                cdata.setData(cdata.getTextContent() + " ><![CDATA[");
+//                returnNode.removeChild(childNode);
+//                returnNode.appendChild(cdata);
+//            }
+//        }
+//
+//    }
 
-    // 提到外面的
-    // TODO 未修完成
+    /**
+    * cdate处理
+    */
 //    public static void addCDataToLeafNodes(Node node){
 //        NodeList childNodes = node.getChildNodes();
 //        for (int i = 0; i < childNodes.getLength(); i++){
@@ -88,11 +98,13 @@ public class WebserviceResponseHandler implements SOAPHandler<SOAPMessageContext
 //                    addCDataToLeafNodes(childNode);
 //                }
 //                else if (xiaochildNode!=null&&xiaochildNode.getNodeType() == Node.TEXT_NODE) {
-//                    String cdatameg = "<"+childNode.getNodeName()+">"+"<![CDATA["+xiaochildNode.getNodeValue()+"]]&gt;"+"</"+childNode.getNodeName()+">";
+//                    // 内容为空
+//                    String cdatameg = "<"+childNode.getNodeName()+">"+"<![CDATA["+xiaochildNode.getNodeValue()+"]]]] >><![CDATA["+"</"+childNode.getNodeName()+">";
 //                    CDATASection cdata = childNode.getOwnerDocument().createCDATASection(cdatameg);
 //                    node.replaceChild(cdata,childNode);
 //                }else {
-//                    String cdatameg = "<"+childNode.getNodeName()+">"+"<![CDATA[]]&gt;"+"</"+childNode.getNodeName()+">";
+//                    // 内容不为空
+//                    String cdatameg = "<"+childNode.getNodeName()+">"+"]]]] >><![CDATA["+"</"+childNode.getNodeName()+">";
 //                    CDATASection cdata = childNode.getOwnerDocument().createCDATASection(cdatameg);
 //                    node.replaceChild(cdata,childNode);
 //                }
@@ -100,8 +112,6 @@ public class WebserviceResponseHandler implements SOAPHandler<SOAPMessageContext
 //    }
 
 
-
-
     @Override
     public boolean handleFault(SOAPMessageContext context) {
         return false;
diff --git a/jianshui-admin/src/main/resources/application-dev.yml b/jianshui-admin/src/main/resources/application-dev.yml
index 779b404..8740cf2 100644
--- a/jianshui-admin/src/main/resources/application-dev.yml
+++ b/jianshui-admin/src/main/resources/application-dev.yml
@@ -83,7 +83,8 @@ spring:
         max-active: 8
         # #连接池最大阻塞等待时间（使用负值表示没有限制）
         max-wait: -1ms
-ele_auth_url: https://sandbox.ele-cloud.com/api/
+#ele_auth_url: https://sandbox.ele-cloud.com/api/
+ele_auth_url: https://openapi.zncspt.com/api/
 ele_check_url: https://openapi.zncspt.com/api/
 elephant_entcode_check: 91370102MA3UD2FG21
 logstash:
diff --git a/jianshui-income/src/main/java/com/jianshui/income/utils/elephant/ElephantCompanyserviceUtils.java b/jianshui-income/src/main/java/com/jianshui/income/utils/elephant/ElephantCompanyserviceUtils.java
index 4dffa3a..35df3fa 100644
--- a/jianshui-income/src/main/java/com/jianshui/income/utils/elephant/ElephantCompanyserviceUtils.java
+++ b/jianshui-income/src/main/java/com/jianshui/income/utils/elephant/ElephantCompanyserviceUtils.java
@@ -16,6 +16,7 @@ import com.jianshui.income.constant.elephant.ElephantAuthConstants;
 import com.jianshui.income.constant.elephant.ElephantConstants;
 import com.jianshui.system.domain.CompanyserviceProp;
 import com.jianshui.system.service.ICompanyservicePropService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.env.Environment;
@@ -29,6 +30,7 @@ import java.nio.charset.StandardCharsets;
  * @Author 巩权林
  * @Date 2022-09-19 9:37
  **/
+@Slf4j
 public class ElephantCompanyserviceUtils {
 
 
@@ -70,6 +72,7 @@ public class ElephantCompanyserviceUtils {
 
         //2.请求及解析
         String url = ELE_URL + ElephantAuthConstants.PREFIX + apiName + "?access_token=" + token;
+        log.info("请求大象进项报文=，{}",requestBody);
         String respRaw = HttpUtil.createPost(url).body(requestBody.toString()).execute().body();
         JSONObject resp = JSONObject.parseObject(respRaw, JSONObject.class);
         JSONObject returnStateInfo = resp.getJSONObject("returnStateInfo");
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 5192ba1..2724ca2 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
@@ -23,7 +23,8 @@ public class IncomeTest {
         //----------------------普通电票----------------------------------------------------
 //        String key = "LTEO+oOgWMsuQAOUglqXuQ=="; // 1204
 //        String key = "PzRRv8Gk4LBBWSzE7ZlUzg=="; // 1223  大象进项测试
-         String key = "FIQKraT+UheC1GqQtgDM6g=="; // 1205
+//         String key = "FIQKraT+UheC1GqQtgDM6g=="; // 1205
+         String key = "uIawjnF+dXZa60h8cyI/MA=="; // 1483
         // String key = "zE9+TICzsrejfujj/BXjCQ=="; // 1206
 
         System.out.println("-------------------单个发票查验-----------------------------");
@@ -61,7 +62,7 @@ public class IncomeTest {
         System.out.println("------------------------进项-认证-------------------------------------");
 
         System.out.println("-------------------企业档案查询-----------------------------");
-        order = "{\"SBH\":\"9111122223333CKFPT\",\"taxNo\":\"9111122223333CKFPT\"}";
+        order = "{\"SBH\":\"91370181MA3UQT3180\",\"taxNo\":\"91370181MA3UQT3180\"}";
         m = AisinoInvoiceDecryptUtil.encrypt(order, key);
         System.out.println("json : \n" + order);
         System.out.println(m);