From e0395c5454534e7cf657b10045d00e4042dc7e71 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Mon, 28 Sep 2020 15:51:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pay_master' into pay_master
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/weixin/MyConfig.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/weixin/MyConfig.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/weixin/MyConfig.java
similarity index 79%
rename from kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/weixin/MyConfig.java
rename to kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/weixin/MyConfig.java
index ab08742..3021519 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/weixin/MyConfig.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/weixin/MyConfig.java
@@ -1,8 +1,6 @@
-package com.kidgrow.oprationcenter.config.weixin;
+package com.kidgrow.oprationcenter.weixin;
import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
import java.io.InputStream;
public class MyConfig extends WXPayConfig{
@@ -15,14 +13,17 @@
private byte[] certData;
- public MyConfig() throws Exception {
- String certPath = "D:\\develop\\chengxu\\houtai\\3cc.txt";
- File file = new File(certPath);
- InputStream certStream = new FileInputStream(file);
- this.certData = new byte[(int) file.length()];
- certStream.read(this.certData);
- certStream.close();
+ public MyConfig() {
+
}
+// public MyConfig() throws Exception {
+// String certPath = "D:\\develop\\chengxu\\houtai\\3cc.txt";
+// File file = new File(certPath);
+// InputStream certStream = new FileInputStream(file);
+// this.certData = new byte[(int) file.length()];
+// certStream.read(this.certData);
+// certStream.close();
+// }
//wx84c77dcda51c612c
@Override
public String getAppID() {
--
Gitblit v1.8.0