diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/IntroduceController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/IntroduceController.java index 42a4a99..03ba39e 100644 --- a/pluss-api-page/src/main/java/cn/pluss/platform/controller/IntroduceController.java +++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/IntroduceController.java @@ -11,6 +11,8 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.Objects; + /** * @author djh * 简介富文本内容 @@ -30,6 +32,13 @@ public class IntroduceController { } AppGuide entity = appGuideService.getByCode(code); - return ResultGenerator.genSuccessResult(entity == null? "": entity.getContent()); + if (!"SHTGKT".equals(code)){ + return ResultGenerator.genSuccessResult(entity == null ? "" : entity.getContent()); + } + if (Objects.equals(entity.getType(), "1")) { + return ResultGenerator.genSuccessResult(entity == null ? "" : entity.getContent()); + }else { + return ResultGenerator.genFailResult(""); + } } } \ No newline at end of file diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/MerchantCashPlaceController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/MerchantCashPlaceController.java index d40474c..5e50b36 100644 --- a/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/MerchantCashPlaceController.java +++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/MerchantCashPlaceController.java @@ -106,6 +106,9 @@ public class MerchantCashPlaceController { return ResultGenerator.genSuccessResult(pageData); } private void size(String character){ + if (character.isEmpty()){ + throw new MsgException("地址或收银点名称不能为空"); + } if (character.length() >= 50){ throw new MsgException("输入内容过长"); } diff --git a/pluss-api-page/src/main/resources/application.yml b/pluss-api-page/src/main/resources/application.yml index cd32618..5e7698a 100644 --- a/pluss-api-page/src/main/resources/application.yml +++ b/pluss-api-page/src/main/resources/application.yml @@ -22,6 +22,6 @@ spring: max-size: 20 server: -# servlet: -# context-path: /api + servlet: + context-path: /api port: 7004 diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/BASE64.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/BASE64.java new file mode 100644 index 0000000..bf7514f --- /dev/null +++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/BASE64.java @@ -0,0 +1,396 @@ +package cn.pluss.platform.util; + +import org.apache.tomcat.util.codec.binary.Base64; +import sun.misc.BASE64Encoder; + +import java.io.File; +import java.io.FileInputStream; +import java.io.InputStream; +import java.io.UnsupportedEncodingException; + +public class BASE64 { + + static private final int BASELENGTH = 128; + static private final int LOOKUPLENGTH = 64; + static private final int TWENTYFOURBITGROUP = 24; + static private final int EIGHTBIT = 8; + static private final int SIXTEENBIT = 16; + static private final int FOURBYTE = 4; + static private final int SIGN = -128; + static private final char PAD = '='; + static private final boolean fDebug = false; + static final private byte[] base64Alphabet = new byte[BASELENGTH]; + static final private char[] lookUpBase64Alphabet = new char[LOOKUPLENGTH]; + + static { + for (int i = 0; i < BASELENGTH; ++i) { + base64Alphabet[i] = -1; + } + for (int i = 'Z'; i >= 'A'; i--) { + base64Alphabet[i] = (byte) (i - 'A'); + } + for (int i = 'z'; i >= 'a'; i--) { + base64Alphabet[i] = (byte) (i - 'a' + 26); + } + + for (int i = '9'; i >= '0'; i--) { + base64Alphabet[i] = (byte) (i - '0' + 52); + } + + base64Alphabet['+'] = 62; + base64Alphabet['/'] = 63; + + for (int i = 0; i <= 25; i++) { + lookUpBase64Alphabet[i] = (char) ('A' + i); + } + + for (int i = 26, j = 0; i <= 51; i++, j++) { + lookUpBase64Alphabet[i] = (char) ('a' + j); + } + + for (int i = 52, j = 0; i <= 61; i++, j++) { + lookUpBase64Alphabet[i] = (char) ('0' + j); + } + lookUpBase64Alphabet[62] = (char) '+'; + lookUpBase64Alphabet[63] = (char) '/'; + + } + + + + + /** + * 将本地图片进行Base64位编码 + * + * @param imgUrl 图片的url路径，如D:\\photo\\1.png + * + * @return + */ + public static String encodeImgageToBase64(File imageFile) { + // 将图片文件转化为字节数组字符串，并对其进行Base64编码处理 + // 其进行Base64编码处理 + byte[] data = null; + // 读取图片字节数组 + try { + InputStream in = new FileInputStream(imageFile); + data = new byte[in.available()]; + in.read(data); + in.close(); + } catch (Exception e) { + e.printStackTrace(); + } + // 对字节数组Base64编码 + BASE64Encoder encoder = new BASE64Encoder(); + // 返回Base64编码过的字节数组字符串 + return encoder.encode(data); + + } + + + private static boolean isWhiteSpace(char octect) { + return (octect == 0x20 || octect == 0xd || octect == 0xa || octect == 0x9); + } + + private static boolean isPad(char octect) { + return (octect == PAD); + } + + private static boolean isData(char octect) { + return (octect < BASELENGTH && base64Alphabet[octect] != -1); + } + + /** + * Encodes hex octects into Base64 + * + * @param binaryData Array containing binaryData + * @return Encoded Base64 array + */ + public static String encode(byte[] binaryData) { + + if (binaryData == null) { + return null; + } + + int lengthDataBits = binaryData.length * EIGHTBIT; + if (lengthDataBits == 0) { + return ""; + } + + int fewerThan24bits = lengthDataBits % TWENTYFOURBITGROUP; + int numberTriplets = lengthDataBits / TWENTYFOURBITGROUP; + int numberQuartet = fewerThan24bits != 0 ? numberTriplets + 1 : numberTriplets; + char encodedData[] = null; + + encodedData = new char[numberQuartet * 4]; + + byte k = 0, l = 0, b1 = 0, b2 = 0, b3 = 0; + + int encodedIndex = 0; + int dataIndex = 0; + if (fDebug) { + System.out.println("number of triplets = " + numberTriplets); + } + + for (int i = 0; i < numberTriplets; i++) { + b1 = binaryData[dataIndex++]; + b2 = binaryData[dataIndex++]; + b3 = binaryData[dataIndex++]; + + if (fDebug) { + System.out.println("b1= " + b1 + ", b2= " + b2 + ", b3= " + b3); + } + + l = (byte) (b2 & 0x0f); + k = (byte) (b1 & 0x03); + + byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte) ((b1) >> 2 ^ 0xc0); + byte val2 = ((b2 & SIGN) == 0) ? (byte) (b2 >> 4) : (byte) ((b2) >> 4 ^ 0xf0); + byte val3 = ((b3 & SIGN) == 0) ? (byte) (b3 >> 6) : (byte) ((b3) >> 6 ^ 0xfc); + + if (fDebug) { + System.out.println("val2 = " + val2); + System.out.println("k4 = " + (k << 4)); + System.out.println("vak = " + (val2 | (k << 4))); + } + + encodedData[encodedIndex++] = lookUpBase64Alphabet[val1]; + encodedData[encodedIndex++] = lookUpBase64Alphabet[val2 | (k << 4)]; + encodedData[encodedIndex++] = lookUpBase64Alphabet[(l << 2) | val3]; + encodedData[encodedIndex++] = lookUpBase64Alphabet[b3 & 0x3f]; + } + + // form integral number of 6-bit groups + if (fewerThan24bits == EIGHTBIT) { + b1 = binaryData[dataIndex]; + k = (byte) (b1 & 0x03); + if (fDebug) { + System.out.println("b1=" + b1); + System.out.println("b1<<2 = " + (b1 >> 2)); + } + byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte) ((b1) >> 2 ^ 0xc0); + encodedData[encodedIndex++] = lookUpBase64Alphabet[val1]; + encodedData[encodedIndex++] = lookUpBase64Alphabet[k << 4]; + encodedData[encodedIndex++] = PAD; + encodedData[encodedIndex++] = PAD; + } else if (fewerThan24bits == SIXTEENBIT) { + b1 = binaryData[dataIndex]; + b2 = binaryData[dataIndex + 1]; + l = (byte) (b2 & 0x0f); + k = (byte) (b1 & 0x03); + + byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte) ((b1) >> 2 ^ 0xc0); + byte val2 = ((b2 & SIGN) == 0) ? (byte) (b2 >> 4) : (byte) ((b2) >> 4 ^ 0xf0); + + encodedData[encodedIndex++] = lookUpBase64Alphabet[val1]; + encodedData[encodedIndex++] = lookUpBase64Alphabet[val2 | (k << 4)]; + encodedData[encodedIndex++] = lookUpBase64Alphabet[l << 2]; + encodedData[encodedIndex++] = PAD; + } + + return new String(encodedData); + } + + /** + * Decodes Base64 data into octects + * + * @param encoded string containing Base64 data + * @return Array containind decoded data. + */ + public static byte[] decode(String encoded) { + + if (encoded == null) { + return null; + } + + char[] base64Data = encoded.toCharArray(); + // remove white spaces + int len = removeWhiteSpace(base64Data); + + if (len % FOURBYTE != 0) { + return null;//should be divisible by four + } + + int numberQuadruple = (len / FOURBYTE); + + if (numberQuadruple == 0) { + return new byte[0]; + } + + byte decodedData[] = null; + byte b1 = 0, b2 = 0, b3 = 0, b4 = 0; + char d1 = 0, d2 = 0, d3 = 0, d4 = 0; + + int i = 0; + int encodedIndex = 0; + int dataIndex = 0; + decodedData = new byte[(numberQuadruple) * 3]; + + for (; i < numberQuadruple - 1; i++) { + + if (!isData((d1 = base64Data[dataIndex++])) || !isData((d2 = base64Data[dataIndex++])) + || !isData((d3 = base64Data[dataIndex++])) + || !isData((d4 = base64Data[dataIndex++]))) { + return null; + }//if found "no data" just return null + + b1 = base64Alphabet[d1]; + b2 = base64Alphabet[d2]; + b3 = base64Alphabet[d3]; + b4 = base64Alphabet[d4]; + + decodedData[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4); + decodedData[encodedIndex++] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf)); + decodedData[encodedIndex++] = (byte) (b3 << 6 | b4); + } + + if (!isData((d1 = base64Data[dataIndex++])) || !isData((d2 = base64Data[dataIndex++]))) { + return null;//if found "no data" just return null + } + + b1 = base64Alphabet[d1]; + b2 = base64Alphabet[d2]; + + d3 = base64Data[dataIndex++]; + d4 = base64Data[dataIndex++]; + if (!isData((d3)) || !isData((d4))) {//Check if they are PAD characters + if (isPad(d3) && isPad(d4)) { + if ((b2 & 0xf) != 0)//last 4 bits should be zero + { + return null; + } + byte[] tmp = new byte[i * 3 + 1]; + System.arraycopy(decodedData, 0, tmp, 0, i * 3); + tmp[encodedIndex] = (byte) (b1 << 2 | b2 >> 4); + return tmp; + } else if (!isPad(d3) && isPad(d4)) { + b3 = base64Alphabet[d3]; + if ((b3 & 0x3) != 0)//last 2 bits should be zero + { + return null; + } + byte[] tmp = new byte[i * 3 + 2]; + System.arraycopy(decodedData, 0, tmp, 0, i * 3); + tmp[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4); + tmp[encodedIndex] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf)); + return tmp; + } else { + return null; + } + } else { //No PAD e.g 3cQl + b3 = base64Alphabet[d3]; + b4 = base64Alphabet[d4]; + decodedData[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4); + decodedData[encodedIndex++] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf)); + decodedData[encodedIndex++] = (byte) (b3 << 6 | b4); + + } + + return decodedData; + } + + /** + * remove WhiteSpace from MIME containing encoded Base64 data. + * + * @param data the byte array of base64 data (with WS) + * @return the new length + */ + private static int removeWhiteSpace(char[] data) { + if (data == null) { + return 0; + } + + // count characters that's not whitespace + int newSize = 0; + int len = data.length; + for (int i = 0; i < len; i++) { + if (!isWhiteSpace(data[i])) { + data[newSize++] = data[i]; + } + } + return newSize; + } + + + /** + * + * 功能描述：Base64加密（将byte[]转换成字符串） 方法。 + *

+ * 创建时间：2017-02-14 + *

+ * 创建人： 董耀明 + * + * @param data byte[]类型 要加密的数据 + * + * @return String类型 加密后结果 + * + */ + public static String encryptBASE64(byte[] data) + { + return Base64.encodeBase64String(data); + //return (new BASE64Encoder()).encodeBuffer(data); + } + + + /** + * + * 功能描述：Base64加密（将byte[]转换成字符串） 方法。 + *

+ * 创建时间：2017-02-14 + *

+ * 创建人： 董耀明 + * + * @param data String类型 要加密的数据 + * + * @return String类型 加密后结果 + * + */ + public static String encryptBASE64(String data) + { + try { + //return (new BASE64Encoder()).encodeBuffer(data.getBytes("UTF-8")); + return Base64.encodeBase64String(data.getBytes("UTF-8")); + } catch (Exception e) { + return null; + } + } + + /** + * + * 功能描述：Base64加密（将byte[]转换成字符串） 方法。 + *

+ * 创建时间：2017-02-14 + *

+ * 创建人： 董耀明 + * + * @param data String类型 要加密的数据 + * + * @param encode String类型 编码类型 + * + * @return String类型 加密后结果 + * + */ + public static String encryptBASE64(String data,String encode) + { + + try + { + if (encode == null || "".equals(encode)) + { + + return Base64.encodeBase64String(data.getBytes()); + + } else + { + return Base64.encodeBase64String(data.getBytes(encode)); + } + + } catch (UnsupportedEncodingException e) + { + // TODO Auto-generated catch block + e.printStackTrace(); + return null; + } + } + +} + diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobV2PushUtilAndroid.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobV2PushUtilAndroid.java index 6861dae..88120b0 100644 --- a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobV2PushUtilAndroid.java +++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobV2PushUtilAndroid.java @@ -114,7 +114,7 @@ public class MobV2PushUtilAndroid { PushMessage pushMessage = new PushMessage(); pushDTO.setPushMessage(pushMessage); //此格式的透传消息由 unipush 做了特殊处理，会自动展示通知栏。开发者也可自定义其它格式，在客户端自己处理。 - //pushMessage.setTransmission(" {title:\"标题\",content:\"内容\",payload:\"快银到账1万元\"}"); + //pushMessage.setTransmission(" {title:\"标题\",content:\"内容\",payload:\"银收客到账1万元\"}"); //pushMessage.setTransmission("{title:" + title + ", content:" + content + ext); diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobV2PushUtilIOS.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobV2PushUtilIOS.java index a077c9b..dc8d3da 100644 --- a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobV2PushUtilIOS.java +++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobV2PushUtilIOS.java @@ -111,7 +111,7 @@ public class MobV2PushUtilIOS { PushMessage pushMessage = new PushMessage(); pushDTO.setPushMessage(pushMessage); //此格式的透传消息由 unipush 做了特殊处理，会自动展示通知栏。开发者也可自定义其它格式，在客户端自己处理。 - //pushMessage.setTransmission(" {title:\"标题\",content:\"内容\",payload:\"快银到账1万元\"}"); + //pushMessage.setTransmission(" {title:\"标题\",content:\"内容\",payload:\"银收客到账1万元\"}"); //pushMessage.setTransmission("{title:" + title + ", content:" + content + ext); diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/RSAEncrypt.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/RSAEncrypt.java new file mode 100644 index 0000000..4ca1565 --- /dev/null +++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/RSAEncrypt.java @@ -0,0 +1,402 @@ +package cn.pluss.platform.util; + +import com.alipay.api.internal.util.codec.Base64; + +import javax.crypto.BadPaddingException; +import javax.crypto.Cipher; +import javax.crypto.IllegalBlockSizeException; +import javax.crypto.NoSuchPaddingException; +import java.security.InvalidKeyException; +import java.security.KeyPair; +import java.security.NoSuchAlgorithmException; +import java.security.interfaces.RSAPrivateKey; +import java.security.interfaces.RSAPublicKey; + +import static cn.hutool.crypto.KeyUtil.getKeyPair; +import static cn.pluss.platform.util.RSASignature.signVerify; +import static cn.pluss.platform.util.RSAUtil.*; + +/** + * @author: zph + * @Date: 2020/7/10 15:28 + * @Description: RSA加密解密工具类 + */ +public class RSAEncrypt { + /** + * 字节数据转字符串专用集合 + */ + private static final char[] HEX_CHAR = { '0', '1', '2', '3', '4', '5', '6', + '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' }; + + + // FTP服务器hostname + public static String HOST = ""; + + // FTP服务器端口 +// public static Integer PORT = ; + + // FTP登录账号 + public static String USERNAME = ""; + + // FTP登录密码 + public static String PASSWORD = ""; + + // FTP上传路径 + public static String INVOICE_BASE_PATH = ""; + /** + * 随机生成密钥对 + */ +// public static void genKeyPair() { +// // KeyPairGenerator类用于生成公钥和私钥对，基于RSA算法生成对象 +// KeyPairGenerator keyPairGen = null; +// try { +// keyPairGen = KeyPairGenerator.getInstance("RSA"); +// } catch (NoSuchAlgorithmException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } +// // 初始化密钥对生成器，密钥大小为96-1024位 +// keyPairGen.initialize(1024,new SecureRandom()); +// // 生成一个密钥对，保存在keyPair中 +// KeyPair keyPair = keyPairGen.generateKeyPair(); +// // 得到私钥 +// RSAPrivateKey privateKey = (RSAPrivateKey) keyPair.getPrivate(); +// // 得到公钥 +// RSAPublicKey publicKey = (RSAPublicKey) keyPair.getPublic(); +// try { +// // 得到公钥字符串 +// String publicKeyString = BASE64.encode(publicKey.getEncoded()); +// // 得到私钥字符串 +// String privateKeyString = BASE64.encode(privateKey.getEncoded()); +// System.err.println(publicKeyString); +// System.err.println(privateKeyString); +// // 将公密钥对写入到文件 +// /*InputStream is = null; +// InputStream is1 = null; +// is = new ByteArrayInputStream(publicKeyString.getBytes()); +// is1 = new ByteArrayInputStream(privateKeyString.getBytes()); +// FTPClient ftpClient = new FTPClient(); +// ftpClient.connect(HOST); +// ftpClient.login(USERNAME,PASSWORD); +// ftpClient.changeWorkingDirectory(INVOICE_BASE_PATH); +// ftpClient.setFileType(FTPClient.LOCAL_FILE_TYPE); +// ftpClient.storeFile(new String("publicKey.keystore".getBytes(),"iso-8859-1"),is); +// ftpClient.storeFile(new String("privateKey.keystore".getBytes(),"iso-8859-1"),is1); +// is.close(); +// is1.close();*/ +// //FileWriter pubfw = new FileWriter(filePath + "/publicKey.keystore"); +// //FileWriter prifw = new FileWriter(filePath + "/privateKey.keystore"); +// /*BufferedWriter pubbw = new BufferedWriter(pubfw); +// BufferedWriter pribw = new BufferedWriter(prifw); +// pubbw.write(publicKeyString); +// pribw.write(privateKeyString); +// pubbw.flush(); +// pubbw.close(); +// pubfw.close(); +// pribw.flush(); +// pribw.close(); +// prifw.close();*/ +// } catch (Exception e) { +// e.printStackTrace(); +// } +// } +// +// /** +// * 从文件中输入流中加载公钥 +// * +// * @param +// * +// * @throws Exception +// * 加载公钥时产生的异常 +// */ +// public static String loadPublicKeyByFile() throws Exception { +// try { +// FTPClient ftpClient = new FTPClient(); +// ftpClient.connect(HOST); +// ftpClient.login(USERNAME,PASSWORD); +// ftpClient.changeWorkingDirectory(INVOICE_BASE_PATH); +// InputStream is = ftpClient.retrieveFileStream("publicKey.keystore"); +// BufferedReader br = new BufferedReader(new InputStreamReader(is,"UTF-8")); +// String readLine = null; +// StringBuilder sb = new StringBuilder(); +// while ((readLine = br.readLine()) != null) { +// sb.append(readLine); +// } +// br.close(); +// return sb.toString(); +// } catch (IOException e) { +// throw new Exception("公钥数据流读取错误"); +// } catch (NullPointerException e) { +// throw new Exception("公钥输入流为空"); +// } +// } +// +// /** +// * 从字符串中加载公钥 +// * +// * @param publicKeyStr +// * 公钥数据字符串 +// * @throws Exception +// * 加载公钥时产生的异常 +// */ +// public static RSAPublicKey loadPublicKeyByStr(String publicKeyStr) +// throws Exception { +// try { +// byte[] buffer = BASE64.decode(publicKeyStr); +// KeyFactory keyFactory = KeyFactory.getInstance("RSA"); +// X509EncodedKeySpec keySpec = new X509EncodedKeySpec(buffer); +// return (RSAPublicKey) keyFactory.generatePublic(keySpec); +// } catch (NoSuchAlgorithmException e) { +// throw new Exception("无此算法"); +// } catch (InvalidKeySpecException e) { +// throw new Exception("公钥非法"); +// } catch (NullPointerException e) { +// throw new Exception("公钥数据为空"); +// } +// } +// +// /** +// * 从文件中加载私钥 +// * +// * @param +// * +// * @return 是否成功 +// * @throws Exception +// */ +// public static String loadPrivateKeyByFile() throws Exception { +// try { +// FTPClient ftpClient = new FTPClient(); +// ftpClient.connect(HOST); +// ftpClient.login(USERNAME,PASSWORD); +// ftpClient.changeWorkingDirectory(INVOICE_BASE_PATH); +// InputStream is = ftpClient.retrieveFileStream("privateKey.keystore"); +// BufferedReader br = new BufferedReader(new InputStreamReader(is,"UTF-8")); +// String readLine = null; +// StringBuilder sb = new StringBuilder(); +// while ((readLine = br.readLine()) != null) { +// sb.append(readLine); +// } +// br.close(); +// return sb.toString(); +// } catch (IOException e) { +// throw new Exception("私钥数据读取错误"); +// } catch (NullPointerException e) { +// throw new Exception("私钥输入流为空"); +// } +// } +// +// public static RSAPrivateKey loadPrivateKeyByStr(String privateKeyStr) +// throws Exception { +// try { +// byte[] buffer = BASE64.decode(privateKeyStr); +// PKCS8EncodedKeySpec keySpec = new PKCS8EncodedKeySpec(buffer); +// KeyFactory keyFactory = KeyFactory.getInstance("RSA"); +// return (RSAPrivateKey) keyFactory.generatePrivate(keySpec); +// } catch (NoSuchAlgorithmException e) { +// throw new Exception("无此算法"); +// } catch (InvalidKeySpecException e) { +// throw new Exception("私钥非法"); +// } catch (NullPointerException e) { +// throw new Exception("私钥数据为空"); +// } +// } + + /** + * 公钥加密过程 + * + * @param publicKey + * 公钥 + * @param plainTextData + * 明文数据 + * @return + * @throws Exception + * 加密过程中的异常信息 + */ + public static byte[] encrypt(RSAPublicKey publicKey, byte[] plainTextData) + throws Exception { + if (publicKey == null) { + throw new Exception("加密公钥为空, 请设置"); + } + Cipher cipher = null; + try { + // 使用默认RSA + cipher = Cipher.getInstance("RSA"); + // cipher= Cipher.getInstance("RSA", new BouncyCastleProvider()); + cipher.init(Cipher.ENCRYPT_MODE, publicKey); + byte[] output = cipher.doFinal(plainTextData); + return output; + } catch (NoSuchAlgorithmException e) { + throw new Exception("无此加密算法"); + } catch (NoSuchPaddingException e) { + e.printStackTrace(); + return null; + } catch (InvalidKeyException e) { + throw new Exception("加密公钥非法,请检查"); + } catch (IllegalBlockSizeException e) { + throw new Exception("明文长度非法"); + } catch (BadPaddingException e) { + throw new Exception("明文数据已损坏"); + } + } + + /** + * 私钥加密过程 + * + * @param privateKey + * 私钥 + * @param plainTextData + * 明文数据 + * @return + * @throws Exception + * 加密过程中的异常信息 + */ + public static byte[] encrypt(RSAPrivateKey privateKey, byte[] plainTextData) + throws Exception { + if (privateKey == null) { + throw new Exception("加密私钥为空, 请设置"); + } + Cipher cipher = null; + try { + // 使用默认RSA + cipher = Cipher.getInstance("RSA"); + cipher.init(Cipher.ENCRYPT_MODE, privateKey); + byte[] output = cipher.doFinal(plainTextData); + return output; + } catch (NoSuchAlgorithmException e) { + throw new Exception("无此加密算法"); + } catch (NoSuchPaddingException e) { + e.printStackTrace(); + return null; + } catch (InvalidKeyException e) { + throw new Exception("加密私钥非法,请检查"); + } catch (IllegalBlockSizeException e) { + throw new Exception("明文长度非法"); + } catch (BadPaddingException e) { + throw new Exception("明文数据已损坏"); + } + } + + /** + * 私钥解密过程 + * + * @param privateKey + * 私钥 + * @param cipherData + * 密文数据 + * @return 明文 + * @throws Exception + * 解密过程中的异常信息 + */ + public static byte[] decrypt(RSAPrivateKey privateKey, byte[] cipherData) + throws Exception { + if (privateKey == null) { + throw new Exception("解密私钥为空, 请设置"); + } + Cipher cipher = null; + try { + // 使用默认RSA + cipher = Cipher.getInstance("RSA"); + // cipher= Cipher.getInstance("RSA", new BouncyCastleProvider()); + cipher.init(Cipher.DECRYPT_MODE, privateKey); + byte[] output = cipher.doFinal(cipherData); + return output; + } catch (NoSuchAlgorithmException e) { + throw new Exception("无此解密算法"); + } catch (NoSuchPaddingException e) { + e.printStackTrace(); + return null; + } catch (InvalidKeyException e) { + throw new Exception("解密私钥非法,请检查"); + } catch (IllegalBlockSizeException e) { + throw new Exception("密文长度非法"); + } catch (BadPaddingException e) { + throw new Exception("密文数据已损坏"); + } + } + + /** + * 公钥解密过程 + * + * @param publicKey + * 公钥 + * @param cipherData + * 密文数据 + * @return 明文 + * @throws Exception + * 解密过程中的异常信息 + */ + public static byte[] decrypt(RSAPublicKey publicKey, byte[] cipherData) + throws Exception { + if (publicKey == null) { + throw new Exception("解密公钥为空, 请设置"); + } + Cipher cipher = null; + try { + // 使用默认RSA + cipher = Cipher.getInstance("RSA"); + // cipher= Cipher.getInstance("RSA", new BouncyCastleProvider()); + cipher.init(Cipher.DECRYPT_MODE, publicKey); + byte[] output = cipher.doFinal(cipherData); + return output; + } catch (NoSuchAlgorithmException e) { + throw new Exception("无此解密算法"); + } catch (NoSuchPaddingException e) { + e.printStackTrace(); + return null; + } catch (InvalidKeyException e) { + throw new Exception("解密公钥非法,请检查"); + } catch (IllegalBlockSizeException e) { + throw new Exception("密文长度非法"); + } catch (BadPaddingException e) { + throw new Exception("密文数据已损坏"); + } + } + + /** + * 字节数据转十六进制字符串 + * + * @param data + * 输入数据 + * @return 十六进制内容 + */ + public static String byteArrayToString(byte[] data) { + StringBuilder stringBuilder = new StringBuilder(); + for (int i = 0; i < data.length; i++) { + // 取出字节的高四位 作为索引得到相应的十六进制标识符 注意无符号右移 + stringBuilder.append(HEX_CHAR[(data[i] & 0xf0) >>> 4]); + // 取出字节的低四位 作为索引得到相应的十六进制标识符 + stringBuilder.append(HEX_CHAR[(data[i] & 0x0f)]); + if (i < data.length - 1) { + stringBuilder.append(' '); + } + } + return stringBuilder.toString(); + } + public static void main(String[] args) { + try { + // 生成密钥对 + +// String privateKey = new String(Base64.encodeBase64(keyPair.getPrivate().getEncoded())); +// String publicKey = new String(Base64.encodeBase64(keyPair.getPublic().getEncoded())); + + // RSA加密 + String data = "{\"ordNo\":\"2017031601582703488262843972\",\"mno\":\"399190513665034\"}"; + System.out.println(data); +// String encryptData = encrypt(data, getPublicKey(publicKey)); +// System.out.println("加密后内容:" + encryptData); + // RSA解密 +// String decryptData = decrypt(encryptData, getPrivateKey(privateKey)); +// System.out.println("解密后内容:" + decryptData); + + // RSA签名 + String sign = RSASignature.sign(data, CERT); + System.out.println(sign); + // RSA验签 + boolean result = signVerify(data, PUBLIC_KEY, sign); + System.out.print("验签结果:" + result); + } catch (Exception e) { + e.printStackTrace(); + System.out.print("加解密异常"); + } + } +} diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/RSAEncryptUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/RSAEncryptUtil.java index 17988a8..755090b 100644 --- a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/RSAEncryptUtil.java +++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/RSAEncryptUtil.java @@ -15,40 +15,73 @@ public class RSAEncryptUtil { private static final String CIPHER_PROVIDER = "SunJCE"; private static final String TRANSFORMATION_PKCS1Paddiing = "RSA/ECB/PKCS1Padding"; private static final String RSA_PKCS1_OAEP_PADDING = "RSA/ECB/OAEPWITHSHA-1ANDMGF1PADDING"; - + private static final String CHAR_ENCODING = "UTF-8";// 固定值，无须修改 - private static final String CERT ="-----BEGIN CERTIFICATE-----\r\n" + - "MIID3DCCAsSgAwIBAgIUTz/ylkJ1ui0tgyC8gYf7PhjSLf4wDQYJKoZIhvcNAQEL\r\n" + - "BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT\r\n" + - "FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg\r\n" + - "Q0EwHhcNMTkwOTE5MDYzOTI4WhcNMjQwOTE3MDYzOTI4WjBuMRgwFgYDVQQDDA9U\r\n" + - "ZW5wYXkuY29tIHNpZ24xEzARBgNVBAoMClRlbnBheS5jb20xHTAbBgNVBAsMFFRl\r\n" + - "bnBheS5jb20gQ0EgQ2VudGVyMQswCQYDVQQGDAJDTjERMA8GA1UEBwwIU2hlblpo\r\n" + - "ZW4wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgVuNIZDy2F7UYQw7+\r\n" + - "QjkWSBLbAimkhZ6Qa6jhquZvUruD1/YpKbtghk/ecxrSDpC8Pqsjl/QjrmkTPWv7\r\n" + - "vNihoAMftuR/nAusmBrTkNlzxEBVvRpf4JRsIHg73wUi5zUJkZn7eAZ7kHVa0zow\r\n" + - "qflsl7w29guTvqUPP1P1+gH+xD3b3fCM1uRINDDqTyFff6p1hM7Fn9wnapKDmcO7\r\n" + - "57QkL8VGNAWknVkBpMYiAmK2R7DlPW5zUleO9M30koNYSIRVwgHiS2Kutd1/gvW7\r\n" + - "g5oC+nDLSgQkwgUoonrXzo1bUkE05icf92v89hDVccaXKzVjGgMP407s88++amNV\r\n" + - "5J65AgMBAAGjgYEwfzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE8DBlBgNVHR8EXjBc\r\n" + - "MFqgWKBWhlRodHRwOi8vZXZjYS5pdHJ1cy5jb20uY24vcHVibGljL2l0cnVzY3Js\r\n" + - "P0NBPTFCRDQyMjBFNTBEQkMwNEIwNkFEMzk3NTQ5ODQ2QzAxQzNFOEVCRDIwDQYJ\r\n" + - "KoZIhvcNAQELBQADggEBAABTz0NLnc0bn7InEDVuYMEebEzZv3BxhHVdnzX6R0gQ\r\n" + - "Ug0QifHdAtbh/qL10E4FjVACyWOOWgPoX/9I1BZjfxddzQgbUib3XybloR6eE0z3\r\n" + - "WUh/B88cCM3GsJU4btaxY0qpTkEjEcqP7K+4ZrJyfCItAfxWqYh6sllGbFVvRSYa\r\n" + - "brlEI+lbdlNVnshrRNegtFZIJ40O8aSpNA/2R0+5lEKPeYiQUO4qYbCE3lkPpY9S\r\n" + - "p0SMyX0UmB9SIwOFAX+BX3KJ6GBKh+zqSmd0hm4NtbCNRmEG9gYQPl845FdYizKJ\r\n" + - "RIk+gkdXBduIpO3/ZkzED/PYMOj/hhJdLNByPe78Ipo=\r\n" + +// private static final String CERT ="-----BEGIN CERTIFICATE-----\r\n" + +// "MIID3DCCAsSgAwIBAgIUTz/ylkJ1ui0tgyC8gYf7PhjSLf4wDQYJKoZIhvcNAQEL\r\n" + +// "BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT\r\n" + +// "FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg\r\n" + +// "Q0EwHhcNMTkwOTE5MDYzOTI4WhcNMjQwOTE3MDYzOTI4WjBuMRgwFgYDVQQDDA9U\r\n" + +// "ZW5wYXkuY29tIHNpZ24xEzARBgNVBAoMClRlbnBheS5jb20xHTAbBgNVBAsMFFRl\r\n" + +// "bnBheS5jb20gQ0EgQ2VudGVyMQswCQYDVQQGDAJDTjERMA8GA1UEBwwIU2hlblpo\r\n" + +// "ZW4wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgVuNIZDy2F7UYQw7+\r\n" + +// "QjkWSBLbAimkhZ6Qa6jhquZvUruD1/YpKbtghk/ecxrSDpC8Pqsjl/QjrmkTPWv7\r\n" + +// "vNihoAMftuR/nAusmBrTkNlzxEBVvRpf4JRsIHg73wUi5zUJkZn7eAZ7kHVa0zow\r\n" + +// "qflsl7w29guTvqUPP1P1+gH+xD3b3fCM1uRINDDqTyFff6p1hM7Fn9wnapKDmcO7\r\n" + +// "57QkL8VGNAWknVkBpMYiAmK2R7DlPW5zUleO9M30koNYSIRVwgHiS2Kutd1/gvW7\r\n" + +// "g5oC+nDLSgQkwgUoonrXzo1bUkE05icf92v89hDVccaXKzVjGgMP407s88++amNV\r\n" + +// "5J65AgMBAAGjgYEwfzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE8DBlBgNVHR8EXjBc\r\n" + +// "MFqgWKBWhlRodHRwOi8vZXZjYS5pdHJ1cy5jb20uY24vcHVibGljL2l0cnVzY3Js\r\n" + +// "P0NBPTFCRDQyMjBFNTBEQkMwNEIwNkFEMzk3NTQ5ODQ2QzAxQzNFOEVCRDIwDQYJ\r\n" + +// "KoZIhvcNAQELBQADggEBAABTz0NLnc0bn7InEDVuYMEebEzZv3BxhHVdnzX6R0gQ\r\n" + +// "Ug0QifHdAtbh/qL10E4FjVACyWOOWgPoX/9I1BZjfxddzQgbUib3XybloR6eE0z3\r\n" + +// "WUh/B88cCM3GsJU4btaxY0qpTkEjEcqP7K+4ZrJyfCItAfxWqYh6sllGbFVvRSYa\r\n" + +// "brlEI+lbdlNVnshrRNegtFZIJ40O8aSpNA/2R0+5lEKPeYiQUO4qYbCE3lkPpY9S\r\n" + +// "p0SMyX0UmB9SIwOFAX+BX3KJ6GBKh+zqSmd0hm4NtbCNRmEG9gYQPl845FdYizKJ\r\n" + +// "RIk+gkdXBduIpO3/ZkzED/PYMOj/hhJdLNByPe78Ipo=\r\n" + +// "-----END CERTIFICATE-----"; +// private static final String PUBLIC_KEY ="-----BEGIN PUBLIC KEY-----\r\n" + +// "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArjSigZVVYy1LzeKmjrJY\r\n" + +// "TVh1pS2mYa07hcXOH0vDGBFp8XY1HlJTedTDmYL9pBH/q6PSAf/mvQrXjEbOgFoa\r\n" + +// "ro2qEr+SLIze47hxXdZKtgHOKdX6XmjJ9zc1VgB1xHGL339fyOsAz9+lYy1aBClw\r\n" + +// "eInkruUBHSudF38dQY43UtHjLoXnrX+CiQCofTqcjbfjVgl/MKcsF6XVajkZ/yOa\r\n" + +// "I3kOaQ+YAxB45lAn8vt7rK+VvdkwEf/A1U0+jxwChpdzNlTGMy9qpIWQiILA1Z4+\r\n" + +// "9PtWq/3EYxGPKJyxG0PCSGT495v/rAbnYHDt37E4PqslBYBskYLlmQOIh4oltVMX\r\n" + +// "wwIDAQAB\r\n" + +// "-----END PUBLIC KEY-----"; + private static final String PUBLIC_KEY ="-----BEGIN PUBLIC KEY-----\\r\\n"+ + "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCA\r\n" + + "QEAkXVO04QyRKrCHYxkHjvuWlr0adiFAyDO8yEg5pl9PvIsVsdOd/KElnPlPheIg01rDJFtYv\r\n" + + "CavCbYXaIWv1IcNRBtkIP5UERtbRyfuJCO1F/GyybHcnv6amW5Q1xn4cu/IeKV4VzWnDepntJL\r\n" + + "bVaBAtw6OSMWBLnk2EuPGa6zNRjvHzdRaZvmAoYu+FZvJLw6oIeeDkR1pGty3CQgnuIe25pQeJ\r\n" + + "cAuOWyvC1+ZKvnRbSaS6Hfi8s5mxCQrEiiHEKXHA/rfPp/bDEwqJzA2e/hdnybIII9bcjjqx3l\r\n" + + "+9XG5jGHsa7trMedPaeJc96OQUJPm62l9rGG0OZc9+MlsVIskwIDAQAB\r\n"+ + "-----END PUBLIC KEY-----"; + private static final String CERT = "-----BEGIN CERTIFICATE-----\r\n"+ + "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgE\r\n" + + "AAoIBAQCRdU7ThDJEqsIdjGQeO+5aWvRp2IUDIM7zISDmmX0+8ixWx0538oSWc+U+F4iDTW\r\n" + + "sMkW1i8Jq8Jthdoha/Uhw1EG2Qg/lQRG1tHJ+4kI7UX8bLJsdye/pqZblDXGfhy78h4pXhX\r\n" + + "NacN6me0kttVoEC3Do5IxYEueTYS48ZrrM1GO8fN1Fpm+YChi74Vm8kvDqgh54ORHWka3Lc\r\n" + + "JCCe4h7bmlB4lwC45bK8LX5kq+dFtJpLod+LyzmbEJCsSKIcQpccD+t8+n9sMTConMDZ7+F2\r\n" + + "fJsggj1tyOOrHeX71cbmMYexru2sx509p4lz3o5BQk+braX2sYbQ5lz34yWxUiyTAgMBAAEC\r\n" + + "ggEAfDRYB+L07Y+Fy6dqgiqYn8zUsWDySzaDoDXkmyPrP4mY9MyhI2kRcEssL7X2mm/L/eJc\r\n" + + "LkTXS9w7mtBibiHV9jW96M3YYILdkXMEq5u8anoSDLxjSE23CY0tAejwx2ysG2oYo2Qb2S7qh\r\n" + + "rR5NbbM2L1mdg2Qqp51W4BBhCOZ4LbNQxPOptPz0hJZAzwzPocmOXM0zP20nBA/Sm/IcjVOcr\r\n" + + "HLHYljFxaGg2SvLRlFN9BvnCCGheEy5NvYN/jqPl4cUxoH7S8rzYF/P7xzESha/oaiIStGrpm\r\n" + + "SirsyFQI+Wl1I9I9FymUvTPsdlr6YcJ8QuZrxf3Y+0s/gxwSU28Uc4QKBgQDBWedvCPnS5T/\r\n" + + "20Y+aZ1wUVAyA1gKQpYzM8Q+5BefaH+Oxpo01wfRWBeFM0oA2w0xaFJuD16lNDOri8qJKNGYoi\r\n" + + "HgiRJ/i39ueYZDYuwnSVgLoqwT6cv4wzSvGOOkY0ljXsuOqB8djRSgmNceHoUKmzMOXFfySsAla\r\n" + + "RsNsPTyOwwKBgQDAlsdcWPaZ9vhkGzTd2VtQvBX34FOQQajlEClD9PAJYdgNc5DKmd6Vzuh8wE2\r\n" + + "5IdWJVBPdNF1j91ZJwcmTeZx5xQd2HLRcZlvoijsNuKPv2ctycVRBZug1ebQWrODC71s8goYHyYd\r\n" + + "/ytKf70E4pbzMwdBpkCT9PHVxcG/uhHKt8QKBgQCF6MsllnTXgBity3OGf2FBXviN3ipGnbGHWs\r\n" + + "kF3rY11nIu3mfcPGkJjub7+qn7w4TEupL+W8WQbIrdBSgq9mFuXx28tgR574o+Bdp4kAl8WD+Jf\r\n" + + "rBi+HNdvys7DL07iKspMGcGon6QHRxyYjq/j4sG1Lf9kqervCmuEWZVN5ASWwKBgDHHx4hLRpLNj6\r\n" + + "7wiV2+zSe1Nkh4J6FmF23+G2yBZ3pFXD892/NCipJWhSmZ2307DaMNpITNAEbSq+8stBn2mUewchl\r\n" + + "JmiU4IBGfiVwmmdlphnjyakDthKAt8SrbTM2WaRLe+h4RLYEOwBqvEUC/NmoGvwRKSgVbF1BXK9ePT\r\n" + + "MVBAoGALyeHwCwOVM6F+CpeHLIvJSni2LmbCyzxxnRdcrMHhxtJWUx0eQTdLqIkVydssphlMDopRR\r\n" + + "0FBFdpA/sqo2f39YjAKoaLm01FymxliPcf8tbXQhqDdD8qmQgb58vV5wSh4fCn3mx5y2D/Vwkq3vk\r\n" + + "Z0BfEzRREXiOpdJhZdUCG1V8=\r\n"+ "-----END CERTIFICATE-----"; - private static final String PUBLIC_KEY ="-----BEGIN PUBLIC KEY-----\r\n" + - "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArjSigZVVYy1LzeKmjrJY\r\n" + - "TVh1pS2mYa07hcXOH0vDGBFp8XY1HlJTedTDmYL9pBH/q6PSAf/mvQrXjEbOgFoa\r\n" + - "ro2qEr+SLIze47hxXdZKtgHOKdX6XmjJ9zc1VgB1xHGL339fyOsAz9+lYy1aBClw\r\n" + - "eInkruUBHSudF38dQY43UtHjLoXnrX+CiQCofTqcjbfjVgl/MKcsF6XVajkZ/yOa\r\n" + - "I3kOaQ+YAxB45lAn8vt7rK+VvdkwEf/A1U0+jxwChpdzNlTGMy9qpIWQiILA1Z4+\r\n" + - "9PtWq/3EYxGPKJyxG0PCSGT495v/rAbnYHDt37E4PqslBYBskYLlmQOIh4oltVMX\r\n" + - "wwIDAQAB\r\n" + - "-----END PUBLIC KEY-----"; /** * 数据加密方法 @@ -85,7 +118,7 @@ public class RSAEncryptUtil { System.out.println(publicKey); return encodeBase64(encryptPkcs1padding(publicKey, Content.getBytes(CHAR_ENCODING))); } - + public static String rsaEncrypt(String Content,String ras) throws Exception { X509Certificate certificate = X509Certificate.getInstance(PUBLIC_KEY.getBytes()); PublicKey publicKey = certificate.getPublicKey(); @@ -94,4 +127,8 @@ public class RSAEncryptUtil { ci.init(Cipher.ENCRYPT_MODE, publicKey); return encodeBase64(ci.doFinal(Content.getBytes(CHAR_ENCODING))); } + + public static void main(String[] args)throws Exception { + System.out.println(rsaEncrypt("orgId=67290416")); + } } diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/RSASignature.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/RSASignature.java new file mode 100644 index 0000000..e7dd67d --- /dev/null +++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/RSASignature.java @@ -0,0 +1,248 @@ +package cn.pluss.platform.util; + +import java.lang.reflect.Field; +import java.security.KeyFactory; +import java.security.PrivateKey; +import java.security.PublicKey; +import java.security.spec.PKCS8EncodedKeySpec; +import java.security.spec.X509EncodedKeySpec; +import java.util.Comparator; +import java.util.HashMap; +import java.util.Map; + +/** + * @author: zph + * @Date: 2020/7/10 15:29 + * @Description: RSA签名验签类 + */ +public class RSASignature{ + + /** + * 签名算法 + */ + public static final String SIGN_ALGORITHMS = "SHA1WithRSA"; + + /** + * RSA签名 + * @param content 待签名数据 + * @param privateKey 商户私钥 + * @param encode 字符集编码 + * @return 签名值 + */ + public static String sign(String content, String privateKey, String encode) + { + try + { + PKCS8EncodedKeySpec priPKCS8 = new PKCS8EncodedKeySpec( BASE64.decode(privateKey) ); + + KeyFactory keyf = KeyFactory.getInstance("RSA"); + PrivateKey priKey = keyf.generatePrivate(priPKCS8); + + java.security.Signature signature = java.security.Signature.getInstance(SIGN_ALGORITHMS); + + signature.initSign(priKey); + signature.update( content.getBytes(encode)); + + byte[] signed = signature.sign(); + + return BASE64.encode(signed); + } + catch (Exception e) + { + e.printStackTrace(); + } + + return null; + } + + /** + * 根据 content 和 私钥 生成签名 + * @param content 按字典顺序排序的内容 + * @param privateKey ftp上保存的私钥 + * @return + */ + public static String sign(String content, String privateKey) + { + try + { + PKCS8EncodedKeySpec priPKCS8 = new PKCS8EncodedKeySpec( BASE64.decode(privateKey) ); + KeyFactory keyf = KeyFactory.getInstance("RSA"); + PrivateKey priKey = keyf.generatePrivate(priPKCS8); + java.security.Signature signature = java.security.Signature.getInstance(SIGN_ALGORITHMS); + signature.initSign(priKey); + signature.update( content.getBytes()); + byte[] signed = signature.sign(); + return BASE64.encode(signed); + } + catch (Exception e) + { + e.printStackTrace(); + } + return null; + } + + /** + * RSA验签名检查 + * @param content 待签名数据 + * @param sign 签名值 + * @param publicKey 分配给开发商公钥 + * @param encode 字符集编码 + * @return 布尔值 + */ + public static boolean doCheck(String content, String sign, String publicKey,String encode) + { + try + { + KeyFactory keyFactory = KeyFactory.getInstance("RSA"); + byte[] encodedKey = BASE64.decode(publicKey); + PublicKey pubKey = keyFactory.generatePublic(new X509EncodedKeySpec(encodedKey)); + + + java.security.Signature signature = java.security.Signature + .getInstance(SIGN_ALGORITHMS); + + signature.initVerify(pubKey); + signature.update( content.getBytes(encode) ); + + boolean bverify = signature.verify( BASE64.decode(sign) ); + return bverify; + + } + catch (Exception e) + { + e.printStackTrace(); + } + + return false; + } + + /** + * RSA验签名检查 + * @param content 待签名数据 + * @param sign 签名值 + * @param publicKey 分配给开发商公钥 + * @return 布尔值 + */ + public static boolean doCheck(String content, String sign, String publicKey) + { + try + { + KeyFactory keyFactory = KeyFactory.getInstance("RSA"); + byte[] encodedKey = BASE64.decode(publicKey); + if (encodedKey==null){ + return false; + } + PublicKey pubKey = keyFactory.generatePublic(new X509EncodedKeySpec(encodedKey)); + + // 用私钥对信息生成数字签名 + java.security.Signature signature = java.security.Signature + .getInstance(SIGN_ALGORITHMS); + + signature.initVerify(pubKey); + signature.update( content.getBytes() ); + // 验证方法 返回true则为比对成功 + boolean bverify = signature.verify( BASE64.decode(sign) ); + return bverify; + + } + catch (Exception e) + { + e.printStackTrace(); + } + + return false; + } + + + /** + * 对象转HashMap + * @param obj + * @return + */ + public static Map objectToMap(Object obj) { + if (obj == null) { + return null; + } + + Map map = new HashMap(); + try { + Field[] declaredFields = obj.getClass().getDeclaredFields(); + for (Field field : declaredFields) { + field.setAccessible(true); + map.put(field.getName(), field.get(obj)); + } + } catch (Exception e) { + + } + + return map; + } + + /** + * @author: zph + * @Date: 2020/7/14 17:45 + * @Description: 将签名的参数内容按参数名的字典顺序进行排序，并拼接为字符串 + */ + public static String getContent(Map map){ + //得到第三方签名 第三方会把sign也放在json里，故转map的时候需要把sign删除 + map.remove("sign"); + map.entrySet().removeIf(entry -> entry.getValue() == null); + // 将签名的参数内容按参数名的字典顺序进行排序，并拼接为字符串 + StringBuilder sb = new StringBuilder(); + map.entrySet().stream().sorted(Comparator.comparing(Map.Entry::getKey)).forEach(entry -> + sb.append(entry.getKey()).append("=").append(entry.getValue()).append("&") + ); + return sb.toString().substring(0, sb.length() - 1); + } + + /** + * 签名方法 + * 因为很多处都需要用，特地封装一下，方便调用 + * @param paramStr 按字典顺序拼接过的字符串 + * @param publicKey 从数据库查询出来的第三方公钥 + * @param sign 第三方签名 + * @return + */ + public static boolean signVerify(String paramStr,String publicKey,String sign){ + System.err.println(paramStr); + try { + //String privateSign = RSASignature.sign(paramStr, RSAEncrypt.loadPrivateKeyByFile()); + // 使用公钥进行验签 + boolean result = RSASignature.doCheck(paramStr, sign, publicKey); + if (result){ + return true; + } + } catch (Exception e) { + e.printStackTrace(); + } + return false; + } +// public static void main(String[] args) { +// try { +// // 生成密钥对 +// KeyPair keyPair = getKeyPair(); +// String privateKey = new String(Base64.encodeBase64(keyPair.getPrivate().getEncoded())); +// String publicKey = new String(Base64.encodeBase64(keyPair.getPublic().getEncoded())); +// System.out.println("私钥:" + privateKey); +// System.out.println("公钥:" + publicKey); +// // RSA加密 +// String data = "待加密的文字内容"; +// String encryptData = encrypt(data, getPublicKey(publicKey)); +// System.out.println("加密后内容:" + encryptData); +// // RSA解密 +// String decryptData = decrypt(encryptData, getPrivateKey(privateKey)); +// System.out.println("解密后内容:" + decryptData); +// +// // RSA签名 +// String sign = sign(data, getPrivateKey(privateKey)); +// // RSA验签 +// boolean result = verify(data, getPublicKey(publicKey), sign); +// System.out.print("验签结果:" + result); +// } catch (Exception e) { +// e.printStackTrace(); +// System.out.print("加解密异常"); +// } +// } + + +} diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/RSAUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/RSAUtil.java new file mode 100644 index 0000000..88f5f0c --- /dev/null +++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/RSAUtil.java @@ -0,0 +1,211 @@ +package cn.pluss.platform.util; + + +import org.apache.tomcat.util.codec.binary.Base64; + +import javax.crypto.Cipher; +import java.security.KeyFactory; +import java.security.KeyPair; +import java.security.KeyPairGenerator; +import java.security.interfaces.RSAPrivateKey; +import java.security.interfaces.RSAPublicKey; +import java.security.spec.PKCS8EncodedKeySpec; +import java.security.spec.X509EncodedKeySpec; + +/** + * @author admin + * @date 2021/4/28 15:02 + */ +public class RSAUtil { + + public static String RSA_ALGORITHM = "SHA1WithRSA"; + public static String UTF8 = "UTF-8"; + + public static final String PUBLIC_KEY ="MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCKjak6oTfMxO3hWZ8CnMgUxDXHtsHQLZf4GgxzbjVYIN93UtuycdHypfUEh18s8sWwHRvBfeJ4mG0QbLazMphUY7ju9ox/qyB+tmJtZO5fCUi1StnSh17fJRw2kBlD9dKtBBKHJw0PXC/d6ATRtbbbFerzgLtUz70SvUxooUQHtQIDAQAB"; + public static final String CERT ="MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAIqNqTqhN8zE7eFZnwKcyBTENce2wdAtl/gaDHNuNVgg33dS27Jx0fKl9QSHXyzyxbAdG8F94niYbRBstrMymFRjuO72jH+rIH62Ym1k7l8JSLVK2dKHXt8lHDaQGUP10q0EEocnDQ9cL93oBNG1ttsV6vOAu1TPvRK9TGihRAe1AgMBAAECgYBmI8KCl0DkcrSOsRvYuC2DqZWf8el1B3eFjeZp3e/zVOCIPYv6Q5ArWg6DVSxjnWEA0KSagqvGjU+xkQMqnXzPcPMhsIS+1wyR/pP+pwiatO2ioHaQpEqHg9eXhxrgA477/xuKVw9zl5GNqaIgd++2NDXnqLh0Y6OR73f0OB5eDQJBAPihEm+UWLOam/Q/k2+k4Lm2dvxJTBur1fslBiJpgMhgcz/PlwRwpL7aPD0AuPv0NqLouuoTiKpq9icnUv12tgsCQQCOqTANw0IErCHUNdinjXewmG3ui1j9XgM41rSn5ZeTrPL4GhZc2zbS/pZT4PBKUL6NLGkfPHmw4rOmNL/Xc5E/AkBqAwQBX5eSvVHSC2mqKPtJNGv3lqlFAzfyJg8/jQzEY5vAkZsq4Xzdg+A7gptdkvvY6rMIK9wSDhl3CGVyfbORAkA1N+g1OiHmnFACWhP4bU25EyPvWQxZeDi7e1zpRTzGWj5JT3IIMb7B9zcdE0yQbI6pG2gbvvOmiOt7lTH7raEBAkBas2gugvR3f0aGqQcqMpyM627pyRppQ2h58/7KBylP3oR2BReqMUcXeiJ8TuBXzbRXpeVQ0DWOva5CWZJmBMdz"; + + /** + * 创建公钥私钥 + * + * @return + * @throws Exception + */ + public static KeyStore createKeys() throws Exception { + KeyPairGenerator keyPairGeno = KeyPairGenerator.getInstance(RSA_ALGORITHM); + keyPairGeno.initialize(1024); + KeyPair keyPair = keyPairGeno.generateKeyPair(); + + RSAPublicKey publicKey = (RSAPublicKey) keyPair.getPublic(); + RSAPrivateKey privateKey = (RSAPrivateKey) keyPair.getPrivate(); + + KeyStore keyStore = new KeyStore(); + keyStore.setPublicKey(Base64.encodeBase64String(publicKey.getEncoded())); + keyStore.setPrivateKey(Base64.encodeBase64String(privateKey.getEncoded())); + return keyStore; + } + + /** + * 获取公钥对象 + * + * @param pubKeyData + * @return + * @throws Exception + */ + public static RSAPublicKey getPublicKey(byte[] pubKeyData) throws Exception { + X509EncodedKeySpec keySpec = new X509EncodedKeySpec(pubKeyData); + KeyFactory keyFactory = KeyFactory.getInstance(RSA_ALGORITHM); + return (RSAPublicKey) keyFactory.generatePublic(keySpec); + } + + /** + * 获取公钥对象 + * + * @param pubKey 公钥 + * @return + * @throws Exception + */ + public static RSAPublicKey getPublicKey(String pubKey) throws Exception { + return getPublicKey(Base64.decodeBase64(pubKey)); + } + + /** + * 获取私钥对象 + * + * @param priKey + * 私钥 + * @return + * @throws Exception + */ + public static RSAPrivateKey getPrivateKey(String priKey) throws Exception { + return getPrivateKey(Base64.decodeBase64(priKey)); + } + + /** + * 通过私钥byte[]将公钥还原，适用于RSA算法 + * + * @param keyBytes + * @return + * @throws Exception + */ + public static RSAPrivateKey getPrivateKey(byte[] keyBytes) throws Exception { + PKCS8EncodedKeySpec keySpec = new PKCS8EncodedKeySpec(keyBytes); + KeyFactory keyFactory = KeyFactory.getInstance(RSA_ALGORITHM); + return (RSAPrivateKey) keyFactory.generatePrivate(keySpec); + + } + + public static String encryptByPublicKey(String data, String publicKey) throws Exception { + return encryptByPublicKey(data, getPublicKey(publicKey)); + } + + /** + * 公钥加密 + * + * @param data + * @param publicKey + * @return + * @throws Exception + */ + public static String encryptByPublicKey(String data, RSAPublicKey publicKey) throws Exception { + Cipher cipher = Cipher.getInstance(RSA_ALGORITHM); + cipher.init(Cipher.ENCRYPT_MODE, publicKey); + byte[] bytes = cipher.doFinal(data.getBytes(UTF8)); + return Base64.encodeBase64String(bytes); + } + + public static String decryptByPublicKey(String data, String rsaPublicKey) throws Exception { + return decryptByPublicKey(data, getPublicKey(rsaPublicKey)); + } + + /** + * 公钥解密 + * + * @param data + * @param rsaPublicKey + * @return + * @throws Exception + */ + public static String decryptByPublicKey(String data, RSAPublicKey rsaPublicKey) throws Exception { + Cipher cipher = Cipher.getInstance(RSA_ALGORITHM); + cipher.init(Cipher.DECRYPT_MODE, rsaPublicKey); + byte[] inputData = Base64.decodeBase64(data); + byte[] bytes = cipher.doFinal(inputData); + return new String(bytes, UTF8); + } + + public static String encryptByPrivateKey(String data, String privateKey) throws Exception { + return encryptByPrivateKey(data, getPrivateKey(privateKey)); + } + + /** + * 私钥加密 + * + * @param data + * @param privateKey + * @return + * @throws Exception + */ + public static String encryptByPrivateKey(String data, RSAPrivateKey privateKey) throws Exception { + Cipher cipher = Cipher.getInstance(RSA_ALGORITHM); + cipher.init(Cipher.ENCRYPT_MODE, privateKey); + byte[] bytes = cipher.doFinal(data.getBytes(UTF8)); + return Base64.encodeBase64String(bytes); + } + + public static String decryptByPrivateKey(String data, String privateKey) throws Exception { + return decryptByPrivateKey(data, getPrivateKey(privateKey)); + } + + /** + * 私钥解密 + * + * @param data + * @param privateKey + * @return + * @throws Exception + */ + public static String decryptByPrivateKey(String data, RSAPrivateKey privateKey) throws Exception { + Cipher cipher = Cipher.getInstance(RSA_ALGORITHM); + cipher.init(Cipher.DECRYPT_MODE, privateKey); + byte[] inputData = Base64.decodeBase64(data); + byte[] bytes = cipher.doFinal(inputData); + return new String(bytes, UTF8); + } + + + public static class KeyStore { + private String publicKey; + private String privateKey; + + public String getPublicKey() { + return publicKey; + } + + public void setPublicKey(String publicKey) { + this.publicKey = publicKey; + } + + public String getPrivateKey() { + return privateKey; + } + + public void setPrivateKey(String privateKey) { + this.privateKey = privateKey; + } + } + + public static void main(String[] args) throws Exception { + //KeyStore keyPair = RSAUtil.createKeys(); +// String publickey=keyPair.getPublicKey(); +// String privateKey=keyPair.getPrivateKey(); + System.out.println("公钥：" + PUBLIC_KEY); + System.out.println("私钥：" + CERT); + String encode=RSAUtil.encryptByPublicKey("1111",PUBLIC_KEY); + System.out.println("加密数据："+encode); + System.out.println("解密数据:"+RSAUtil.decryptByPrivateKey(encode,CERT)); + + +// String privateKey="MIICdAIBADANBgkqhkiG9w0BAQEFAASCAl4wggJaAgEAAoGBAJ81T1tVomxy1ncvqUxP3hAhLf+1Iajaan2j3J3NcwVvI9Mr96wgqg3D4mWQ3ngjRySHf1d7L5wcf4LNgox88ePjTF0i1rsneRsNnYIwt4NCAvDairM6LuRMrcneulVD7q7aoOzjSl4PcRUQbmyRou1LGykEzmbj/bK7aPE/gmMJAgMBAAECgYBRkhTIrQV9HxF3G3pYWQtjpDxXKUzHoLCzEsO0LlFiVWE7julkzY+TYeubMjBpyVloA+xgvALWr1s9f2IF7PZZh3eJO8YrIQCPhz3uX8m/3Yt+t7yu/Ju0EtdwVC9CYcoBx9MaxaPAmviy8Fmt8rFTX5v3AKB1NrydBgkF1j3tSQJBAMvLSYBH8bqd3bN+pajdaqzbA+8hpsyxITEj5fk8lsc34nwiDq7xp9Z2CLDG8FSmRZEUBTaXt6OnFWYSrTl56dcCQQDH/hsJGwwI/8UfV+RmnDTrQGGiXIJUzKKgAJ47GNfeAlNJELYYqtIi5Dj/LMggBWg2F1/ZEwko/q5E3mLkKz4fAkAhIGlRNeCgQhsQm0yYV22IrY1FKMYxTbWkhD5UtjmYJohlPy/91gA/Ry6AdcYJLIHwZD24sw7Bxl4fGngX+K4/Aj8CV/f5I1gAwv6MX3tNuIbmOtrqDCt60usU9OzlxGTDNUPEl22K3HWZ8xK36s5tkaKm/58f7BkvYcypAfImulsCQBRkLBcHXyGhbH0gfjQT9lfWSMBbv3oKfDlrxLDKb0eZr7AtBTDqfubq52yh1cH4kvzkn8eLBVnBTcdKi48gMM0="; +// System.out.println("解密数据:"+RSAUtil.decryptByPrivateKey("fy1w9GHsrpwJzs4RW2KSZhB8gU4B2gJ3Gc1yLi5Hi0aniDiWYF95VwgNw3tjLzuDIEzoCEUDUphxK2rVmWZl4ORU3ooS+57TLhN5xb/WuhEo9RmKwm6CJHUUKxms3RoRUHk6r9hOhA4Irdqp2V/fIWQUlwp0HWytUqx912D53fs=",privateKey)); + } +} diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/TokenUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/TokenUtil.java index d6ac987..f2c420c 100644 --- a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/TokenUtil.java +++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/TokenUtil.java @@ -11,6 +11,8 @@ import javax.crypto.spec.SecretKeySpec; import java.security.SecureRandom; import java.util.*; +import static cn.pluss.platform.util.RSAUtil.encryptByPublicKey; + /** * AES加密工具类 * @@ -27,7 +29,7 @@ public class TokenUtil { private static final String APP_SECRET = "2022bsjZF544GAH"; //sn private static final String SN = "BSJQG01YJ0001"; - + public static final String PUBLIC_KEY ="MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCKjak6oTfMxO3hWZ8CnMgUxDXHtsHQLZf4GgxzbjVYIN93UtuycdHypfUEh18s8sWwHRvBfeJ4mG0QbLazMphUY7ju9ox/qyB+tmJtZO5fCUi1StnSh17fJRw2kBlD9dKtBBKHJw0PXC/d6ATRtbbbFerzgLtUz70SvUxooUQHtQIDAQAB"; /** * 获取TOKEN值 * @param timestamp 时间戳，13位 @@ -56,14 +58,42 @@ public class TokenUtil { finalMap.put("TOKEN", MD5Util.md5(token + APP_SECRET).toUpperCase()); return finalMap; } - - public static void main(String[] args) { + public static Map getToken(String timestamp, String requestId, String appId, String reqData)throws Exception { + String token = ""; + String encode = ""; + System.out.println(timestamp); + System.out.println(requestId); + System.out.println(appId); + System.out.println(reqData); + SortedMap map = new TreeMap(); + map.put("appId", appId); + map.put("timestamp", timestamp); + map.put("requestId", requestId); + map.put("reqData", reqData); + Iterator> iterator = map.entrySet().iterator(); + while (iterator.hasNext()) { + Map.Entry next = iterator.next(); + String key = next.getKey(); + Object value = next.getValue(); + token += key + value; + encode += key + "=" + value + "&"; + } + System.out.println(token); + Map finalMap = new HashMap<>(); + finalMap.put("ENCODE",encode); + finalMap.put("TOKEN", RSASignature.sign(encode, RSAUtil.CERT)); + return finalMap; + } + public static void main(String[] args) throws Exception{ String s = String.valueOf(System.currentTimeMillis()); System.out.println(s); String s1 = UUID.randomUUID().toString(); System.out.println(s1); - Map token = getToken(s, s1,APP_SECRET); + String param = "{\"ordNo\":\"2017031601582703488262843972\",\"mno\":\"399190513665034\"}"; + Map token = getToken(s, s1, APP_SECRET, param); System.out.println(token); + + } } diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/yt/YtCreateOrder.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/yt/YtCreateOrder.java index 7234c2f..850a453 100644 --- a/pluss-common-bundle/src/main/java/cn/pluss/platform/yt/YtCreateOrder.java +++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/yt/YtCreateOrder.java @@ -132,7 +132,7 @@ public class YtCreateOrder implements Serializable { public YtCreateOrder() { - this.senderName = "快银收银客服部"; + this.senderName = "银收客客服部"; this.senderProvinceName = "陕西省"; this.senderCityName = "西安市"; this.senderCountyName = "未央区"; diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/index/index.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/index/index.jsp index e94cc9c..e004b05 100644 --- a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/index/index.jsp +++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/index/index.jsp @@ -36,7 +36,7 @@