From b7ab5bb0771b4c221c47a61f04aa2920509e4c4c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 16 七月 2020 18:27:10 +0800
Subject: [PATCH] dubbo修复
---
fanli/src/main/java/com/yeshi/fanli/util/Constant.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
index 7b147d4..f75fd00 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
@@ -5,11 +5,13 @@
import java.util.Properties;
import java.util.Set;
+import org.yeshi.utils.TimeUtil;
import org.yeshi.utils.annotation.MapUtil;
import org.yeshi.utils.entity.wx.WXAPPInfo;
import com.yeshi.fanli.dto.wx.WXAccountInfoDTO;
import com.yeshi.fanli.entity.config.AlipayConfig;
+import com.yeshi.fanli.entity.config.AlipayWapConfig;
import com.yeshi.fanli.entity.config.ConstantConfig;
import com.yeshi.fanli.entity.config.SMSConfig;
import com.yeshi.fanli.entity.config.SystemCommonConfig;
@@ -91,6 +93,10 @@
public static final String TAOBAO_AUTH_APPSECRET = "e0a2e05deabf5ce039b52e5b492d5382";
public static final String TAOBAO_RELATION_PID_DEFAULT = "mm_124933865_56750082_87140050199";
public static final String TAOBAO_SPECIAL_PID_DEFAULT = "mm_124933865_56750082_89555600043";
+
+
+ //浼樻儬鐙椾簯鍙戝崟缇ゅ敜璧峰叧閿瘝
+ public static final String YHG_CLOUD_GROUP_AWAKEN_KEY="蹇渷鐖嗘鎺ㄨ崘";
// 濂栧姳鍒告渶楂樻瘮渚�
public static final BigDecimal MAX_REWARD_RATE = new BigDecimal("0.31");
@@ -108,7 +114,7 @@
// 鏉ユ簮-鎷煎澶�
public static final int SOURCE_TYPE_PDD = 3;
// 鏉ユ簮-鍞搧浼�
- public static final int SOURCE_TYPE_WPH = 4;
+ public static final int SOURCE_TYPE_VIP = 4;
// 鏉ユ簮-鑻忓畞
public static final int SOURCE_TYPE_SUNING = 5;
// 鏉ユ簮-楗夸簡涔�
@@ -197,6 +203,8 @@
public static SystemCommonConfig systemCommonConfig;
public static AlipayConfig alipayConfig;
+
+ public static AlipayWapConfig alipayWapConfig;
public static ZNXConfig znxConfig;
@@ -298,6 +306,13 @@
.getProperties(TaoBaoUtil.class.getClassLoader().getResourceAsStream("alipay.properties"));
alipayConfig = (AlipayConfig) MapUtil.parseMap(AlipayConfig.class, ps);
}
+
+ if (alipayWapConfig == null) {
+ Properties ps = org.yeshi.utils.PropertiesUtil
+ .getProperties(TaoBaoUtil.class.getClassLoader().getResourceAsStream("alipay_wap.properties"));
+ alipayWapConfig = (AlipayWapConfig) MapUtil.parseMap(AlipayWapConfig.class, ps);
+ }
+
if (znxConfig == null) {
Properties ps = org.yeshi.utils.PropertiesUtil
@@ -332,7 +347,7 @@
return "浜笢";
case SOURCE_TYPE_PDD:
return "鎷煎澶�";
- case SOURCE_TYPE_WPH:
+ case SOURCE_TYPE_VIP:
return "鍞搧浼�";
case SOURCE_TYPE_SUNING:
return "鑻忓畞";
--
Gitblit v1.8.0