From 459ab1cdf21d5cdbd1f3868509fe4ea45f181cce Mon Sep 17 00:00:00 2001 From: xiangwbs Date: Mon, 26 Mar 2018 21:15:29 +0800 Subject: [PATCH] merge --- .../xwbing/service/other/WxPayService.java | 10 +++---- .../java/com/xwbing/util/PassWordUtil.java | 2 +- .../util/{RandomUtil.java => RadomUtil.java} | 2 +- .../com/xwbing/util/payWxpay/RandomKit.java | 30 +++++++++++++++++++ 4 files changed, 37 insertions(+), 7 deletions(-) rename boot-service/src/main/java/com/xwbing/util/{RandomUtil.java => RadomUtil.java} (96%) create mode 100644 boot-service/src/main/java/com/xwbing/util/payWxpay/RandomKit.java diff --git a/boot-service/src/main/java/com/xwbing/service/other/WxPayService.java b/boot-service/src/main/java/com/xwbing/service/other/WxPayService.java index abe358e..6bc51f7 100644 --- a/boot-service/src/main/java/com/xwbing/service/other/WxPayService.java +++ b/boot-service/src/main/java/com/xwbing/service/other/WxPayService.java @@ -3,8 +3,8 @@ package com.xwbing.service.other; import com.xwbing.domain.entity.wxpay.*; import com.xwbing.exception.BusinessException; import com.xwbing.exception.PayException; -import com.xwbing.util.RandomUtil; import com.xwbing.util.payWxpay.ClientCustomSSL; +import com.xwbing.util.payWxpay.RandomKit; import com.xwbing.util.payWxpay.WxSignKit; import com.xwbing.util.payWxpay.XmlUtil; import org.apache.commons.lang3.StringUtils; @@ -369,7 +369,7 @@ public class WxPayService { Map params = new HashMap(); params.put("appid", appId); params.put("mch_id", mchId); - String nonce_str = RandomUtil.buildRandom(32); + String nonce_str = RandomKit.buildRandom(32); params.put("nonce_str", nonce_str); params.put("body", param.getBody()); params.put("out_trade_no", param.getOutTradeNo()); @@ -401,7 +401,7 @@ public class WxPayService { Map params = new HashMap(); params.put("appid", appId); params.put("mch_id", mchId); - String nonce_str = RandomUtil.buildRandom(32); + String nonce_str = RandomKit.buildRandom(32); params.put("nonce_str", nonce_str); if (StringUtils.isEmpty(param.getTransactionId()) && StringUtils.isEmpty(param.getOutTradeNo())) { throw new PayException("商户订单号和微信订单号不能同时为空!"); @@ -450,7 +450,7 @@ public class WxPayService { if (StringUtils.isNotEmpty(outTradeNo)) { params.put("out_trade_no", outTradeNo); } - String nonce_str = RandomUtil.buildRandom(32); + String nonce_str = RandomKit.buildRandom(32); params.put("nonce_str", nonce_str); //签名放最后的 String sign = WxSignKit.buildSign(params, apiKey); @@ -494,7 +494,7 @@ public class WxPayService { if (StringUtils.isNotEmpty(refundid)) { params.put("refund_id", refundid); } - String nonce_str = RandomUtil.buildRandom(32); + String nonce_str = RandomKit.buildRandom(32); params.put("nonce_str", nonce_str); //签名放最后的 String sign = WxSignKit.buildSign(params, apiKey); diff --git a/boot-service/src/main/java/com/xwbing/util/PassWordUtil.java b/boot-service/src/main/java/com/xwbing/util/PassWordUtil.java index a934b03..a8075fa 100644 --- a/boot-service/src/main/java/com/xwbing/util/PassWordUtil.java +++ b/boot-service/src/main/java/com/xwbing/util/PassWordUtil.java @@ -35,7 +35,7 @@ public class PassWordUtil { public static String[] getUserSecret(String password, String pwdSalt) { String[] str = new String[3]; if (StringUtils.isEmpty(password)) { - password = RandomUtil.buildRandom(PWD_LENGTH); + password = RadomUtil.buildRandom(PWD_LENGTH); } // 密码盐值 byte[] salt; diff --git a/boot-service/src/main/java/com/xwbing/util/RandomUtil.java b/boot-service/src/main/java/com/xwbing/util/RadomUtil.java similarity index 96% rename from boot-service/src/main/java/com/xwbing/util/RandomUtil.java rename to boot-service/src/main/java/com/xwbing/util/RadomUtil.java index 13a485c..a730195 100644 --- a/boot-service/src/main/java/com/xwbing/util/RandomUtil.java +++ b/boot-service/src/main/java/com/xwbing/util/RadomUtil.java @@ -8,7 +8,7 @@ import java.util.Random; * 说明:生成随机码 * 作者: xiangwb */ -public class RandomUtil { +public class RadomUtil { public static String buildRandom(int length) { if (length < 1) { throw new UtilException("参数异常!!!"); diff --git a/boot-service/src/main/java/com/xwbing/util/payWxpay/RandomKit.java b/boot-service/src/main/java/com/xwbing/util/payWxpay/RandomKit.java new file mode 100644 index 0000000..fda3a9a --- /dev/null +++ b/boot-service/src/main/java/com/xwbing/util/payWxpay/RandomKit.java @@ -0,0 +1,30 @@ +package com.xwbing.util.payWxpay; + +import java.util.Random; + +/** + * Created by drore-wzm on 2015/11/23. + */ +public class RandomKit { + static String[] la_arrs={"A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","S","X","Y","Z","0","1","2","3","4","5","6","7","8","9"}; + + /**** + * 生成len个长度的随机字符 + * @param len + * @return + */ + public static synchronized String buildRandom(int len){ + if (len<=0) { + throw new RuntimeException("参数异常!!!"); + } + StringBuffer random=new StringBuffer(); + for (int i = 0; i < len; i++) { + random.append(la_arrs[new Random().nextInt(la_arrs.length)]); + } + return random.toString(); + } + public static void main(String[] args) { + System.out.println(buildRandom(32)); + } + +}