diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 0d88939..de38128 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -23,9 +23,9 @@
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 6833148..ee58f12 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -16,11 +16,21 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityMoneyLog/vue/CityMoneyLogList.vue b/admin-hanhai-vue/src/views/cityMoneyLog/CityMoneyLogList.vue
similarity index 66%
rename from jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityMoneyLog/vue/CityMoneyLogList.vue
rename to admin-hanhai-vue/src/views/cityMoneyLog/CityMoneyLogList.vue
index 2d43070..c3ad481 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityMoneyLog/vue/CityMoneyLogList.vue
+++ b/admin-hanhai-vue/src/views/cityMoneyLog/CityMoneyLogList.vue
@@ -4,6 +4,26 @@
@@ -123,9 +143,10 @@
}
},
{
- title:'金额',
+ title:'创建日期',
align:"center",
- dataIndex: 'intger'
+ sorter: true,
+ dataIndex: 'createTime'
},
{
title:'用户',
@@ -133,15 +154,50 @@
dataIndex: 'userId_dictText'
},
{
- title:'类型0获得1消耗',
+ title:'提现者姓名',
align:"center",
- dataIndex: 'type'
+ dataIndex: 'name'
},
{
- title:'名称',
+ title:'流水备注',
align:"center",
dataIndex: 'title'
},
+ {
+ title:'金额',
+ align:"center",
+ dataIndex: 'price'
+ },
+ {
+ title:'状态',
+ align:"center",
+ dataIndex: 'state_dictText'
+ },
+ {
+ title:'到账时间',
+ align:"center",
+ dataIndex: 'successtime'
+ },
+ {
+ title:'类型',
+ align:"center",
+ dataIndex: 'type_dictText'
+ },
+ {
+ title:'回调',
+ align:"center",
+ dataIndex: 'packageInfo'
+ },
+ {
+ title:'标识',
+ align:"center",
+ dataIndex: 'outBatchNo'
+ },
+ {
+ title:'内容',
+ align:"center",
+ dataIndex: 'batchId'
+ },
{
title: '操作',
dataIndex: 'action',
@@ -176,10 +232,17 @@
},
getSuperFieldList(){
let fieldList=[];
- fieldList.push({type:'BigDecimal',value:'intger',text:'金额',dictCode:''})
+ fieldList.push({type:'datetime',value:'createTime',text:'创建日期'})
fieldList.push({type:'sel_search',value:'userId',text:'用户',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
- fieldList.push({type:'int',value:'type',text:'类型0获得1消耗',dictCode:''})
- fieldList.push({type:'string',value:'title',text:'名称',dictCode:''})
+ fieldList.push({type:'string',value:'name',text:'提现者姓名',dictCode:''})
+ fieldList.push({type:'string',value:'title',text:'流水备注',dictCode:''})
+ fieldList.push({type:'BigDecimal',value:'price',text:'金额',dictCode:''})
+ fieldList.push({type:'int',value:'state',text:'状态',dictCode:'money_pay_state'})
+ fieldList.push({type:'datetime',value:'successtime',text:'到账时间'})
+ fieldList.push({type:'int',value:'type',text:'类型',dictCode:'money_pay'})
+ fieldList.push({type:'Text',value:'packageInfo',text:'回调',dictCode:''})
+ fieldList.push({type:'Text',value:'outBatchNo',text:'标识',dictCode:''})
+ fieldList.push({type:'Text',value:'batchId',text:'内容',dictCode:''})
this.superFieldList = fieldList
}
}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityMoneyLog/vue/modules/CityMoneyLogForm.vue b/admin-hanhai-vue/src/views/cityMoneyLog/modules/CityMoneyLogForm.vue
similarity index 56%
rename from jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityMoneyLog/vue/modules/CityMoneyLogForm.vue
rename to admin-hanhai-vue/src/views/cityMoneyLog/modules/CityMoneyLogForm.vue
index 2a87e24..7ca8a60 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityMoneyLog/vue/modules/CityMoneyLogForm.vue
+++ b/admin-hanhai-vue/src/views/cityMoneyLog/modules/CityMoneyLogForm.vue
@@ -4,23 +4,53 @@
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityMoneyLog/vue/modules/CityMoneyLogModal.Style#Drawer.vue b/admin-hanhai-vue/src/views/cityMoneyLog/modules/CityMoneyLogModal.Style#Drawer.vue
similarity index 100%
rename from jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityMoneyLog/vue/modules/CityMoneyLogModal.Style#Drawer.vue
rename to admin-hanhai-vue/src/views/cityMoneyLog/modules/CityMoneyLogModal.Style#Drawer.vue
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityMoneyLog/vue/modules/CityMoneyLogModal.vue b/admin-hanhai-vue/src/views/cityMoneyLog/modules/CityMoneyLogModal.vue
similarity index 100%
rename from jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityMoneyLog/vue/modules/CityMoneyLogModal.vue
rename to admin-hanhai-vue/src/views/cityMoneyLog/modules/CityMoneyLogModal.vue
diff --git a/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/target/classes/org/jeecg/common/system/api/ISysBaseAPI.class b/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/target/classes/org/jeecg/common/system/api/ISysBaseAPI.class
deleted file mode 100644
index 9497bd6..0000000
Binary files a/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/target/classes/org/jeecg/common/system/api/ISysBaseAPI.class and /dev/null differ
diff --git a/jeecg-boot-base/jeecg-boot-base-core/pom.xml b/jeecg-boot-base/jeecg-boot-base-core/pom.xml
index be7b740..0e44dee 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/pom.xml
+++ b/jeecg-boot-base/jeecg-boot-base-core/pom.xml
@@ -261,6 +261,17 @@
compile
+
+ com.github.wechatpay-apiv3
+ wechatpay-java
+ ${wechatpay-java.version}
+
+
+
+ com.github.wechatpay-apiv3
+ wechatpay-apache-httpclient
+ ${wechatpay-apache-httpclientd.version}
+
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/HttpRequestUtil.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/HttpRequestUtil.java
new file mode 100644
index 0000000..b4cfdfb
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/HttpRequestUtil.java
@@ -0,0 +1,192 @@
+package org.jeecg.config;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
+import org.apache.http.ParseException;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.net.URLDecoder;
+
+/**
+ * Created by null on 2017/2/23.
+ */
+@Slf4j
+public class HttpRequestUtil {
+
+ private static Logger logger = LoggerFactory.getLogger(HttpRequestUtil.class); //日志记录
+
+ /**
+ * post请求
+ * @param url url地址
+ * @param jsonParam 参数
+ * @return
+ */
+ public static String post(String url,String jsonParam){
+ //post请求返回结果
+ DefaultHttpClient httpClient = new DefaultHttpClient();
+ String jsonResult = null;
+ HttpPost method = new HttpPost(url);
+ try {
+ if (null != jsonParam) {
+ //解决中文乱码问题
+ StringEntity entity = new StringEntity(jsonParam.toString(), "utf-8");
+ entity.setContentEncoding("UTF-8");
+ entity.setContentType("application/json");
+ method.setEntity(entity);
+ }
+ HttpResponse result = httpClient.execute(method);
+ url = URLDecoder.decode(url, "UTF-8");
+ /**请求发送成功，并得到响应**/
+ if (result.getStatusLine().getStatusCode() == 200) {
+ String str = "";
+ try {
+ /**读取服务器返回过来的json字符串数据**/
+ str = EntityUtils.toString(result.getEntity());
+ return str;
+ /**把json字符串转换成json对象**/
+// jsonResult = JSONObject.fromObject(str);
+ } catch (Exception e) {
+ logger.error("post请求提交失败:" + url, e);
+ }
+ }
+ } catch (IOException e) {
+ logger.error("post请求提交失败:" + url, e);
+ }
+ return jsonResult;
+ }
+
+ /**
+ * 发送get请求
+ * @param url 路径
+ * @return
+ */
+ public static String get(String url){
+ String responseString = null;
+ try {
+ DefaultHttpClient client = new DefaultHttpClient();
+ //发送get请求
+ HttpGet request = new HttpGet(url);
+ HttpResponse response = client.execute(request);
+
+ /**请求发送成功，并得到响应**/
+ if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
+ /**读取服务器返回过来的json字符串数据**/
+ return EntityUtils.toString(response.getEntity());
+ /**把json字符串转换成json对象**/
+ } else {
+ logger.error("get请求提交失败:" + url);
+ }
+ } catch (IOException e) {
+ logger.error("get请求提交失败:" + url, e);
+ }
+ return responseString;
+ }
+
+
+ /**
+ * 发起批量转账API 批量转账到零钱
+ *
+ * @param requestUrl
+ * @param requestJson 组合参数
+ * @param wechatPayserialNo 商户证书序列号
+ * @param mchID4M 商户号
+ * @param privatekeypath 商户私钥证书路径
+ * @return
+ */
+ public static String postTransBatRequest(
+ String requestUrl,
+ String requestJson,
+ String wechatPayserialNo,
+ String wechatPayserialNo2,
+ String mchID4M,
+ String privatekeypath) {
+ CloseableHttpClient httpclient = HttpClients.createDefault();
+ CloseableHttpResponse response = null;
+ HttpEntity entity = null;
+ try {
+ //商户私钥证书
+ HttpPost httpPost = new HttpPost(requestUrl);
+ // NOTE: 建议指定charset=utf-8。低于4.4.6版本的HttpCore，不能正确的设置字符集，可能导致签名错误
+ httpPost.addHeader("Content-Type", "application/json");
+ httpPost.addHeader("Accept", "application/json");
+ //"55E551E614BAA5A3EA38AE03849A76D8C7DA735A");
+ httpPost.addHeader("Wechatpay-Serial", wechatPayserialNo);
+ //-------------------------核心认证 start-----------------------------------------------------------------
+ String strToken = VechatPayV3Util.getToken("POST",
+ "/v3/fund-app/mch-transfer/transfer-bills",
+ requestJson,mchID4M,wechatPayserialNo2, privatekeypath);
+
+ log.error("微信转账token "+strToken);
+ // 添加认证信息
+ httpPost.addHeader("Authorization",
+ "WECHATPAY2-SHA256-RSA2048" + " "
+ + strToken);
+ //---------------------------核心认证 end---------------------------------------------------------------
+ httpPost.setEntity(new StringEntity(requestJson, "UTF-8"));
+ //发起转账请求
+ response = httpclient.execute(httpPost);
+ entity = response.getEntity();//获取返回的数据
+ log.info("-----getHeaders.Request-ID:"+response.getHeaders("Request-ID"));
+ return EntityUtils.toString(entity,"UTF-8");
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ // 关闭流
+ }
+ return null;
+ }
+
+
+ /**
+ * 发送HTTP_GET请求
+ *
+ * @see 该方法会自动关闭连接,释放资源
+ * @param reqURL
+ * 请求地址(含参数)
+ * @param decodeCharset
+ * 解码字符集,解析响应数据时用之,其为null时默认采用UTF-8解码
+ * @return 远程主机响应正文
+ */
+ public static String sendGetRequest(String reqURL,String auth,String decodeCharset) {
+ long responseLength = 0; // 响应长度
+ String responseContent = null; // 响应内容
+ CloseableHttpClient httpclient = HttpClients.createDefault();
+
+ HttpGet httpGet = new HttpGet(reqURL); // 创建org.apache.http.client.methods.HttpGet
+ httpGet.addHeader("Authorization", auth);
+ httpGet.addHeader("Accept", "application/json");
+ httpGet.addHeader("User-Agent", "https://zh.wikipedia.org/wiki/User_agent");
+ try {
+ HttpResponse response = httpclient.execute(httpGet); // 执行GET请求
+ HttpEntity entity = response.getEntity(); // 获取响应实体
+ if (null != entity) {
+ responseLength = entity.getContentLength();
+ responseContent = EntityUtils.toString(entity, decodeCharset == null ? "UTF-8" : decodeCharset);
+ EntityUtils.consume(entity); // Consume response content
+ }
+ } catch (ClientProtocolException e) {
+ System.out.println("该异常通常是协议错误导致,比如构造HttpGet对象时传入的协议不对(将'http'写成'htp')或者服务器端返回的内容不符合HTTP协议要求等,堆栈信息如下");
+ } catch (ParseException e) {
+ System.out.println(e.getMessage());
+ } catch (IOException e) {
+ System.out.println("该异常通常是网络原因引起的,如HTTP服务器未启动等,堆栈信息如下");
+ } finally {
+ httpclient.getConnectionManager().shutdown(); // 关闭连接,释放资源
+ }
+ return responseContent;
+ }
+
+}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/MoneyUtil.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/MoneyUtil.java
new file mode 100644
index 0000000..8fccc14
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/MoneyUtil.java
@@ -0,0 +1,28 @@
+package org.jeecg.config;
+
+import java.math.BigDecimal;
+
+/**
+ * Created by 廖师兄
+ * 2017-07-02 13:53
+ */
+public class MoneyUtil {
+
+ /**
+ * 元转分
+ * @param yuan
+ * @return
+ */
+ public static Integer Yuan2Fen(Double yuan) {
+ return new BigDecimal(String.valueOf(yuan)).movePointRight(2).intValue();
+ }
+
+ /**
+ * 分转元
+ * @param fen
+ * @return
+ */
+ public static Double Fen2Yuan(Integer fen) {
+ return new BigDecimal(fen).movePointLeft(2).doubleValue();
+ }
+}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/VechatPayV3Util.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/VechatPayV3Util.java
new file mode 100644
index 0000000..aff7fac
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/VechatPayV3Util.java
@@ -0,0 +1,122 @@
+package org.jeecg.config;
+
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.codec.binary.Base64;
+import org.springframework.util.StringUtils;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.security.KeyFactory;
+import java.security.NoSuchAlgorithmException;
+import java.security.PrivateKey;
+import java.security.Signature;
+import java.security.spec.InvalidKeySpecException;
+import java.security.spec.PKCS8EncodedKeySpec;
+import java.util.Random;
+
+/**
+ * @author java996.icu
+ * @title: VechatPayV3Util
+ * @projectName chemu
+ * @description: TODO
+ * @date 2022/12/8 15:00
+ * @Version V1.0
+ */
+@Slf4j
+public class VechatPayV3Util {
+
+ /**
+ *
+ * @param method 请求方法 post
+ * @param canonicalUrl 请求地址
+ * @param body 请求参数
+ * @param merchantId 这里用的商户号
+ * @param certSerialNo 商户证书序列号
+ * @param keyPath 商户证书地址
+ * @return
+ * @throws Exception
+ */
+ public static String getToken(
+ String method,
+ String canonicalUrl,
+ String body,
+ String merchantId,
+ String certSerialNo,
+ String keyPath) throws Exception {
+ String signStr = "";
+ //获取32位随机字符串
+ String nonceStr = getRandomString(32);
+ //当前系统运行时间
+ long timestamp = System.currentTimeMillis() / 1000;
+ if (StringUtils.isEmpty(body)) {
+ body = "";
+ }
+ //签名操作
+ String message = buildMessage(method, canonicalUrl, timestamp, nonceStr, body);
+ //签名操作
+ String signature = sign(message.getBytes("utf-8"), keyPath);
+ //组装参数
+ signStr = "mchid=\"" + merchantId + "\",timestamp=\"" + timestamp+ "\",nonce_str=\"" + nonceStr
+ + "\",serial_no=\"" + certSerialNo + "\",signature=\"" + signature + "\"";
+
+ return signStr;
+ }
+
+ public static String buildMessage(String method, String canonicalUrl, long timestamp, String nonceStr, String body) {
+// String canonicalUrl = url.encodedPath();
+// if (url.encodedQuery() != null) {
+// canonicalUrl += "?" + url.encodedQuery();
+// }
+ return method + "\n" + canonicalUrl + "\n" + timestamp + "\n" + nonceStr + "\n" + body + "\n";
+ }
+
+ public static String sign(byte[] message, String keyPath) throws Exception {
+ Signature sign = Signature.getInstance("SHA256withRSA");
+ sign.initSign(getPrivateKey(keyPath));
+ sign.update(message);
+ return Base64.encodeBase64String(sign.sign());
+ }
+
+ /**
+ * 微信支付-前端唤起支付参数-获取商户私钥
+ *
+ * @param filename 私钥文件路径 (required)
+ * @return 私钥对象
+ */
+ public static PrivateKey getPrivateKey(String filename) throws IOException {
+
+ log.error("签名 证书地址是 "+filename);
+ String content = new String(Files.readAllBytes(Paths.get(filename)), "utf-8");
+ try {
+ String privateKey = content.replace("-----BEGIN PRIVATE KEY-----", "")
+ .replace("-----END PRIVATE KEY-----", "")
+ .replaceAll("\\s+", "");
+ //System.out.println("--------privateKey---------:"+privateKey);
+ KeyFactory kf = KeyFactory.getInstance("RSA");
+ return kf.generatePrivate(
+ new PKCS8EncodedKeySpec(Base64.decodeBase64(privateKey)));
+ } catch (NoSuchAlgorithmException e) {
+ throw new RuntimeException("当前Java环境不支持RSA", e);
+ } catch (InvalidKeySpecException e) {
+ throw new RuntimeException("无效的密钥格式");
+ }
+ }
+ /**
+ * 获取随机位数的字符串
+ * @param length
+ * @return
+ */
+ public static String getRandomString(int length) {
+ String base = "abcdefghijklmnopqrstuvwxyz0123456789";
+ Random random = new Random();
+ StringBuffer sb = new StringBuffer();
+ for (int i = 0; i < length; i++) {
+ int number = random.nextInt(base.length());
+ sb.append(base.charAt(number));
+ }
+ return sb.toString();
+ }
+
+}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/pay/WeChatPayConfig2.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/pay/WeChatPayConfig2.java
new file mode 100644
index 0000000..478ee8b
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/pay/WeChatPayConfig2.java
@@ -0,0 +1,207 @@
+package org.jeecg.config.pay;
+
+import com.wechat.pay.contrib.apache.httpclient.WechatPayHttpClientBuilder;
+import com.wechat.pay.contrib.apache.httpclient.auth.PrivateKeySigner;
+import com.wechat.pay.contrib.apache.httpclient.auth.Verifier;
+import com.wechat.pay.contrib.apache.httpclient.auth.WechatPay2Credentials;
+import com.wechat.pay.contrib.apache.httpclient.auth.WechatPay2Validator;
+import com.wechat.pay.contrib.apache.httpclient.cert.CertificatesManager;
+import com.wechat.pay.contrib.apache.httpclient.exception.HttpCodeException;
+import com.wechat.pay.contrib.apache.httpclient.exception.NotFoundException;
+import com.wechat.pay.contrib.apache.httpclient.util.PemUtil;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.security.GeneralSecurityException;
+import java.security.PrivateKey;
+
+/**
+ * @author java996.icu
+ * @title: WeChatPayConfig2
+ * @projectName chemu
+ * @description: TODO
+ * @date 2022/12/7 16:36
+ * @Version V1.0
+ */
+@Component
+@Data
+@Slf4j
+@ConfigurationProperties(prefix = "wxpay")
+public class WeChatPayConfig2 {
+
+ /**
+ * 应用编号
+ */
+ private String appId;
+ /**
+ * 商户号
+ */
+ private String mchId;
+ /**
+ * 服务商商户号
+ */
+ private String slMchId;
+ /**
+ * APIv2密钥
+ */
+ private String apiKey;
+ /**
+ * APIv3密钥
+ */
+ private String apiV3Key;
+ /**
+ * 支付通知回调地址
+ */
+ private String notifyUrl;
+ /**
+ * 退款回调地址
+ */
+ private String refundNotifyUrl;
+
+ /**
+ * API 证书中的 key.pem
+ */
+ private String keyPemPath;
+
+ /**
+ * 商户序列号
+ */
+ private String serialNo;
+
+ /**
+ * 微信支付V3-url前缀
+ */
+ private String baseUrl;
+
+
+ /**
+ * 获取商户的私钥文件
+ * @param keyPemPath
+ * @return
+ */
+ public PrivateKey getPrivateKey(String keyPemPath){
+
+ InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream(keyPemPath);
+ if(inputStream==null){
+ throw new RuntimeException("私钥文件不存在");
+ }
+ return PemUtil.loadPrivateKey(inputStream);
+ }
+//
+// /**
+// * 获取证书管理器实例
+// * @return
+// */
+// @Bean
+// public Verifier getVerifier() throws GeneralSecurityException, IOException, HttpCodeException, NotFoundException {
+//
+// log.info("获取证书管理器实例");
+//
+// //获取商户私钥
+// PrivateKey privateKey = getPrivateKey(keyPemPath);
+//
+// //私钥签名对象
+// PrivateKeySigner privateKeySigner = new PrivateKeySigner(serialNo, privateKey);
+//
+// //身份认证对象
+// WechatPay2Credentials wechatPay2Credentials = new WechatPay2Credentials(mchId, privateKeySigner);
+//
+// // 使用定时更新的签名验证器，不需要传入证书
+// CertificatesManager certificatesManager = CertificatesManager.getInstance();
+// certificatesManager.putMerchant(mchId,wechatPay2Credentials,apiV3Key.getBytes(StandardCharsets.UTF_8));
+//
+// return certificatesManager.getVerifier(mchId);
+// }
+
+
+
+ @Bean
+ public Verifier getVerifier() throws GeneralSecurityException, IOException, HttpCodeException, NotFoundException {
+ log.info("开始获取微信支付证书管理器实例");
+
+ // 验证关键参数
+ log.debug("商户号: {}", mchId);
+ log.debug("证书序列号: {}", serialNo);
+ log.debug("APIv3密钥长度: {}", apiV3Key.length()); // 不记录具体密钥内容
+
+ // 获取商户私钥
+ PrivateKey privateKey = getPrivateKey(keyPemPath);
+ if (privateKey == null) {
+ throw new IllegalArgumentException("无法从路径加载私钥: " + keyPemPath);
+ }
+
+ // 创建签名器
+ PrivateKeySigner privateKeySigner = new PrivateKeySigner(serialNo, privateKey);
+ WechatPay2Credentials wechatPay2Credentials = new WechatPay2Credentials(mchId, privateKeySigner);
+
+ try {
+ CertificatesManager certificatesManager = CertificatesManager.getInstance();
+
+ // 显式设置域名（如果库需要）
+ // certificatesManager.setDomain("api.mch.weixin.qq.com");
+
+ // 添加商户信息
+ certificatesManager.putMerchant(mchId, wechatPay2Credentials, apiV3Key.getBytes(StandardCharsets.UTF_8));
+
+ // 获取验证器
+ Verifier verifier = certificatesManager.getVerifier(mchId);
+ log.info("成功获取证书管理器实例");
+ return verifier;
+ } catch (HttpCodeException e) {
+ log.error("微信支付API返回错误: "+ e);
+ throw e;
+ } catch (Exception e) {
+ log.error("获取证书管理器实例时发生错误", e);
+ throw e;
+ }
+ }
+
+
+ /**
+ * 获取支付http请求对象
+ * @param verifier
+ * @return
+ */
+ @Bean(name = "wxPayClient")
+ public CloseableHttpClient getWxPayClient(Verifier verifier) {
+
+ //获取商户私钥
+ PrivateKey privateKey = getPrivateKey(keyPemPath);
+
+ WechatPayHttpClientBuilder builder = WechatPayHttpClientBuilder.create()
+ .withMerchant(mchId, serialNo, privateKey)
+ .withValidator(new WechatPay2Validator(verifier));
+
+ // 通过WechatPayHttpClientBuilder构造的HttpClient，会自动的处理签名和验签，并进行证书自动更新
+ return builder.build();
+ }
+
+ /**
+ * 获取HttpClient，无需进行应答签名验证，跳过验签的流程
+ */
+ @Bean(name = "wxPayNoSignClient")
+ public CloseableHttpClient getWxPayNoSignClient(){
+
+ //获取商户私钥
+ PrivateKey privateKey = getPrivateKey(keyPemPath);
+
+ //用于构造HttpClient
+ WechatPayHttpClientBuilder builder = WechatPayHttpClientBuilder.create()
+ //设置商户信息
+ .withMerchant(mchId, serialNo, privateKey)
+ //无需进行签名验证、通过withValidator((response) -> true)实现
+ .withValidator((response) -> true);
+
+ // 通过WechatPayHttpClientBuilder构造的HttpClient，会自动的处理签名和验签，并进行证书自动更新
+ return builder.build();
+ }
+
+
+}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityMoneyLog/cityMoneyLog/CityMoneyLogList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityMoneyLog/cityMoneyLog/CityMoneyLogList.vue
new file mode 100644
index 0000000..c3ad481
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityMoneyLog/cityMoneyLog/CityMoneyLogList.vue
@@ -0,0 +1,253 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+ {{ toggleSearchStatus ? '收起' : '展开' }}
+
+
+
+
+
+
+
+
新增
+
导出
+
+ 导入
+
+
+
+
+
+ 删除
+
+ 批量操作
+
+
+
+
+
+
+
+
+
+
+ 无图片
+ ![]()
+
+
+ 无文件
+
+ 下载
+
+
+
+
+ 编辑
+
+
+
+ 更多
+
+
+ 详情
+
+
+
+ 删除
+
+
+
+
+
+
+
+