Merge branch 'master-auto-pay' into dev

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/weixin/api/WXSuppToUserPay.java

@@ -80,9 +80,6 @@ public class WXSuppToUserPay {
 		try {
 			KeyStore keyStore = KeyStore.getInstance("PKCS12");
 //			FileInputStream instream = new FileInputStream(new File("E:/cert/apiclient_cert.p12"));
-//			String path = Thread.currentThread().getContextClassLoader().getResource("/").getPath();
-//			FileInputStream instream = new FileInputStream(new File(path+"/apiclient_cert.p12"));
-//			InputStream resourceAsStream = this.getClass().getResourceAsStream("apiclient_cert.p12");
 			ClassPathResource classPathResource = new ClassPathResource("apiclient_cert.p12");
 			InputStream instream = classPathResource.getInputStream();
 			try {

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/handler/WithDrawMqHandler.java

@@ -95,7 +95,7 @@ public class WithDrawMqHandler implements InitializingBean {
                 Long count = valueOperations.increment(orderNo);
                 if (count <= MAX_RETRY) {
                     //重新把消息放回队列
-                   // basicNack(channel, message.getMessageProperties().getDeliveryTag(), false, true, pay_way);
+                    basicNack(channel, message.getMessageProperties().getDeliveryTag(), false, true, pay_way);
                     try {
                         channel.basicRecover();
                     }catch (IOException ex){