bug修复

admin

2022-05-10 2922e51a7a8e657a8467c818ae16700e41ddac77

 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;
@@ -16,7 +17,7 @@
public class Constant {

    //是否需要验证验证码
    public final static boolean VERIFY_VCODE = false;
    public final static boolean VERIFY_VCODE = true;


    public static AlipayConfig alipayConfig;
@@ -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);
    }


}