From 2922e51a7a8e657a8467c818ae16700e41ddac77 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 10 五月 2022 19:45:58 +0800
Subject: [PATCH] bug修复
---
app/src/main/java/com/yeshi/makemoney/app/utils/Constant.java | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/app/src/main/java/com/yeshi/makemoney/app/utils/Constant.java b/app/src/main/java/com/yeshi/makemoney/app/utils/Constant.java
index 0f3c171..f1c6a14 100644
--- a/app/src/main/java/com/yeshi/makemoney/app/utils/Constant.java
+++ b/app/src/main/java/com/yeshi/makemoney/app/utils/Constant.java
@@ -1,5 +1,6 @@
package com.yeshi.makemoney.app.utils;
+import com.google.gson.Gson;
import com.yeshi.makemoney.app.dto.config.AlipayConfig;
import com.yeshi.makemoney.app.dto.config.WXTransferConfig;
import org.yeshi.utils.annotation.MapUtil;
@@ -24,17 +25,16 @@
public static WXTransferConfig wxTransferConfig;
static {
- //TODO
-// if (alipayConfig == null) {
-// Properties ps = org.yeshi.utils.PropertiesUtil
-// .getProperties(Constant.class.getClassLoader().getResourceAsStream("alipay.properties"));
-// alipayConfig = (AlipayConfig) MapUtil.parseMap(AlipayConfig.class, ps);
-// }
-// if (wxTransferConfig == null) {
-// Properties ps = org.yeshi.utils.PropertiesUtil
-// .getProperties(Constant.class.getClassLoader().getResourceAsStream("wx_transfer.properties"));
-// wxTransferConfig = (WXTransferConfig) MapUtil.parseMap(WXTransferConfig.class, ps);
-// }
+ if (alipayConfig == null) {
+ Properties ps = org.yeshi.utils.PropertiesUtil
+ .getProperties(Constant.class.getClassLoader().getResourceAsStream("alipay.properties"));
+ alipayConfig = (AlipayConfig) MapUtil.parseMapByJson(AlipayConfig.class, ps, null);
+ }
+ if (wxTransferConfig == null) {
+ Properties ps = org.yeshi.utils.PropertiesUtil
+ .getProperties(Constant.class.getClassLoader().getResourceAsStream("wx_transfer.properties"));
+ wxTransferConfig = (WXTransferConfig) MapUtil.parseMapByJson(WXTransferConfig.class, ps, null);
+ }
}
@@ -44,4 +44,10 @@
public final static BigDecimal EXTRACT_LITTLE_MONEY_LIMIT = new BigDecimal(1);
+ public static void main(String[] args) {
+ AlipayConfig config = Constant.alipayConfig;
+ System.out.println(config);
+ }
+
+
}
--
Gitblit v1.8.0