Merge remote-tracking branch 'origin/master'

src/main/java/com/jkcredit/invoice/util/Base64Utils.java

@@ -0,0 +1,168 @@
+package com.jkcredit.invoice.util;
+
+import org.apache.commons.lang3.StringUtils;
+import java.io.*;
+import java.util.Base64;
+
+public class Base64Utils {
+
+    // Base64 编码与解码
+    private static final Base64.Decoder DECODER_64 = Base64.getDecoder();
+    private static final Base64.Encoder ENCODER_64 = Base64.getEncoder();
+
+    // dpi越大转换后的图片越清晰，相对转换速度越慢
+    private static final Integer DPI = 200;
+
+    // 编码、解码格式
+    private static final String CODE_FORMATE = "UTF-8";
+
+    /**
+     * 1. text明文 转 Base64字符串
+     * @param text  明文
+     * @return      Base64 字符串
+     */
+    public static String textToBase64Str(String text) {
+        if (StringUtils.isBlank(text)) {
+            return text;
+        }
+        String encodedToStr = null;
+        try {
+            encodedToStr = ENCODER_64.encodeToString(text.getBytes(CODE_FORMATE));
+        } catch (UnsupportedEncodingException e) {
+            e.getMessage();
+        }
+        return encodedToStr;
+    }
+
+    /**
+     * 2. text的Base64字符串 转 明文
+     * @param base64Str text的Base64字符串
+     * @return          text明文
+     */
+    public static String base64StrToText(String base64Str) {
+        if (StringUtils.isBlank(base64Str)) {
+            return base64Str;
+        }
+        String byteToText = null;
+        try {
+            byteToText = new String(DECODER_64.decode(base64Str), CODE_FORMATE);
+        } catch (UnsupportedEncodingException e) {
+            e.getMessage();
+        }
+        return byteToText;
+    }
+
+    /**
+     * 3. 文件（图片、pdf） 转 Base64字符串
+     * @param file  需要转Base64的文件
+     * @return      Base64 字符串
+     */
+    public static String fileToBase64Str(File file){
+        String base64Str = null;
+        FileInputStream fin = null;
+        BufferedInputStream bin = null;
+        ByteArrayOutputStream baos = null;
+        BufferedOutputStream bout = null;
+        try {
+            fin = new FileInputStream(file);
+            bin = new BufferedInputStream(fin);
+            baos = new ByteArrayOutputStream();
+            bout = new BufferedOutputStream(baos);
+            // io
+            byte[] buffer = new byte[1024];
+            int len = bin.read(buffer);
+            while(len != -1){
+                bout.write(buffer, 0, len);
+                len = bin.read(buffer);
+            }
+            // 刷新此输出流，强制写出所有缓冲的输出字节
+            bout.flush();
+            byte[] bytes = baos.toByteArray();
+            // Base64字符编码
+            base64Str = ENCODER_64.encodeToString(bytes).trim();
+        } catch (IOException e) {
+            e.getMessage();
+        } finally{
+            try {
+                fin.close();
+                bin.close();
+                bout.close();
+            } catch (IOException e) {
+                e.getMessage();
+            }
+        }
+        return base64Str;
+    }
+
+    /**
+     * 4. Base64字符串 转 文件（图片、pdf） -- 多用于测试
+     * @param base64Content Base64 字符串
+     * @param filePath      存放路径
+     */
+    public static void base64ContentToFile(String base64Content, String filePath) throws IOException{
+        BufferedInputStream bis = null;
+        FileOutputStream fos = null;
+        BufferedOutputStream bos = null;
+        try {
+            // Base64解码到字符数组
+            byte[] bytes =  DECODER_64.decode(base64Content);
+            ByteArrayInputStream byteInputStream = new ByteArrayInputStream(bytes);
+            bis = new BufferedInputStream(byteInputStream);
+            File file = new File(filePath);
+            File path = file.getParentFile();
+            if(!path.exists()){
+                path.mkdirs();
+            }
+            fos = new FileOutputStream(file);
+            bos = new BufferedOutputStream(fos);
+            // io
+            byte[] buffer = new byte[1024];
+            int length = bis.read(buffer);
+            while(length != -1){
+                bos.write(buffer, 0, length);
+                length = bis.read(buffer);
+            }
+            // 刷新此输出流，强制写出所有缓冲的输出字节
+            bos.flush();
+        } catch (IOException e) {
+            e.getMessage();
+        }finally{
+            try {
+                bis.close();
+                fos.close();
+                bos.close();
+            } catch (IOException e) {
+                e.getMessage();
+            }
+        }
+    }
+
+
+    // 测试
+    public static void main(String args[]){
+        // 1.测试：text明文 转 Base64字符串
+        String text = "这是一串需要编码的明文，可以是URL、图片、文件或其他。";
+        String result_1 = Base64Utils.textToBase64Str(text);
+        System.out.println("text明文 转 Base64字符串：" + text + " → 经Base64编码后 → " + result_1);
+
+        // 2.测试：text的Base64字符串 转 明文
+        String base64Str = "6L+Z5piv5LiA5Liy6ZyA6KaB57yW56CB55qE5piO5paH77yM5Y+v5Lul5pivVVJM44CB5Zu+54mH44CB5paH5Lu25oiW5YW25LuW44CC";
+        String result_2 = Base64Utils.base64StrToText(base64Str);
+        System.out.println("text的Base64字符串 转 明文：" + base64Str + " → 经Base64解码后 → " + result_2);
+
+        // 3.测试：文件 转 Base64
+        // 4.测试：Base64 转 文件
+        try {
+            File filePath = new File("D:\\downloads\\test.pdf");
+            String tempBase64Str = Base64Utils.fileToBase64Str(filePath);
+            System.out.println("文件 转 Base64，完成，使用方法【4】反转验证。");
+            Base64Utils.base64ContentToFile(tempBase64Str, "D:\\downloads\\test_4.pdf");
+        } catch (IOException e) {
+            e.getMessage();
+        }
+        System.out.println("文件与Base64互转，完成，方法【4】通常用于测试。");
+
+
+
+    }
+}

src/main/java/com/jkcredit/invoice/util/QueryDemo_Test.java

@@ -20,13 +20,13 @@ public class QueryDemo_Test {
 	/**
 	 * 测试地址
 	 */
-	//private static final String URL = "http://127.0.0.1:18081/gateway?api=credit.sec.data";
+		private static final String URL = "http://etc.jkcredit.com:9999/api/rest";
 	 	//private static final String URL = "http://110.88.150.74:80/credit?api=credit.sec.data_test";
 	  	//private static final String URL = "http://110.88.150.74/credit?api=credit.sec.data";
 		//private static final String URL = "http://123.57.186.204/gateway?api=credit.sec.data_test";
 		//private static final String URL = "http://123.57.186.204/gateway?api=credit.sec.data";
-	//	private static final String URL = "http://www1.h11.site/gateway?api=credit.sec.data";
-		private static final String URL = "http://110.88.150.68:8000/gateway?api=credit.sec.data";
+		//private static final String URL = "http://www1.h11.site/gateway?api=credit.sec.data";
+	 	//private static final String URL = "http://110.88.150.68:8000/gateway?api=credit.sec.data";
 		//private static final String URL = "http://60.205.114.163:8000/gateway?api=credit.sec.data";
 	 	//private static final String URL = " http://45.126.120.88/gateway?api=credit.sec.data"; 
 		//private static final String URL = "http://119.18.195.163/gateway?api=credit.sec.data";
@@ -36,7 +36,7 @@ public class QueryDemo_Test {
 	 */
 	 	//private static final String appKey = "junxin_test";
 	
-		private static final String appKey = "DATA_TEST";
+		private static final String appKey = "jkxy";
 	 	//private static final String appKey = "ccx";
 
 	/**
@@ -75,11 +75,11 @@ public class QueryDemo_Test {
 		 * 基本参数
 		 */
 		JSONObject paramJsonObj = new JSONObject();
-		paramJsonObj.put("api", "CMCC_3RD_DETAIL_V15");//CTCC_3RD_DETAIL_V11//CTCC_STATUS_CHECK_V11//CUCC_STATUS_CHECK_V11//CMCC_3RD_DETAIL_V15//CMCC_3RD_V2//CTCC_3RD_DETAIL_V11//
-		 //paramJsonObj.put("api", "MSISDNMD5TOIMEI");//MOBILE_CHECK_V1//CMCC_3RD_VERIFY_V4//CTCC_CHECK_V1
+		paramJsonObj.put("api", "PROTOCOL_ADD_V1");//CMCC_MOBILE_CHECK_V8//CMCC_3RD_V2//CMCC_3RD_DETAIL_V1//
+		//paramJsonObj.put("api", "MSISDNMD5TOIMEI");//MOBILE_CHECK_V1//CMCC_3RD_VERIFY_V4//CTCC_CHECK_V1
 		paramJsonObj.put("appKey", appKey);
 	    paramJsonObj.put("appSecret",
-		"C41DF125F0C23FBBB83E461F5045A30ACB3FF55A");
+		"7697CE9BB9D5A856CFDDE738320AD34EA53E483C");
 		//"84C1CE24EDF361F28072E313BD87EAB24CC727CF");
 	    
 	   
@@ -104,16 +104,16 @@ public class QueryDemo_Test {
 		 * 具体业务参数放在data中
 		 */
 		  JSONObject dataJson = new JSONObject();
-          dataJson.put("name", "王同");
-	      dataJson.put("id_number","371081198911276112");
-	      dataJson.put("mobile","15562139518");
-
-		/* dataJson.put("companyNum", "10004849");operator
-	      dataJson.put("serviceStartTime","2022-04-22T17:30:37");
-	      dataJson.put("serviceEndTime","2023-04-22T21:30:37");
-	      dataJson.put("contractFileName","马圣毅测试了啊.pdf");
+          /*dataJson.put("name", SHA256Utils.String2SHA256("高峰明"));
+	      dataJson.put("id_number",SHA256Utils.String2SHA256("152322196311063719"));
+	      dataJson.put("mobile",SHA256Utils.String2SHA256("13104866236"));
+	      dataJson.put("encrypt","SHA256");*/
+		  dataJson.put("companyNum", "11188342");
+	      dataJson.put("serviceStartTime","2022-05-11T11:30:37");
+	      dataJson.put("serviceEndTime","2023-05-11T21:30:37");
+	      dataJson.put("contractFileName","马圣毅测试20220511.pdf");
 	      dataJson.put("serviceType","3");
-	      dataJson.put("base64Str",Base64Util.getPDFBinary(new File("C:\\Users\\msy\\Desktop\\服务及承诺函.pdf")));
+	      dataJson.put("base64Str",Base64Utils.fileToBase64Str(new File("/Users/mashengyi/Desktop/spring高级源码笔记.pdf")));
 		 /* List<String> list = new ArrayList<>();
 			list.add("13752639577");
 	        dataJson.put("msisdnmd5list",list);*/
@@ -167,7 +167,7 @@ public class QueryDemo_Test {
 	public static String convertStreamToString(InputStream is) {
 		BufferedReader reader = new BufferedReader(new InputStreamReader(is));
 		StringBuilder builder = new StringBuilder();
-		String line = null;
+		 String line = null;
 		try {
 			while ((line = reader.readLine()) != null) {
 				builder.append(line + "\n");