From a31e79f8a020cdcfa7105a11d907abe7e4e3cfff Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 30 一月 2023 13:35:43 +0800
Subject: [PATCH] wechat store config
---
service-acct/src/main/java/com/java110/acct/smo/impl/QrCodePlutusPaymentAdapt.java | 3 ++-
service-job/src/main/java/com/java110/job/adapt/fee/ReturnPayFeeMoneyAdapt.java | 4 ++--
service-acct/src/main/java/com/java110/acct/payment/adapt/alipay/AliPaymentFactoryAdapt.java | 4 ++--
service-api/src/main/java/com/java110/api/properties/WechatAuthProperties.java | 3 ++-
java110-utils/src/main/java/com/java110/utils/constant/MappingConstant.java | 3 +++
service-acct/src/main/java/com/java110/acct/payment/adapt/icbc/IcbcPaymentFactoryAdapt.java.txt | 4 ++--
service-acct/src/main/java/com/java110/acct/payment/adapt/wechat/WechatPaymentFactoryAdapt.java | 4 ++--
service-acct/src/main/java/com/java110/acct/payment/adapt/plutus/PlutusPaymentFactoryAdapt.java | 4 ++--
service-acct/src/main/java/com/java110/acct/payment/adapt/chinaUms/ChinaUmsPaymentFactoryAdapt.java | 4 ++--
service-acct/src/main/java/com/java110/acct/payment/adapt/pingan/PinganPaymentFactoryAdapt.java | 4 ++--
springboot/src/main/java/com/java110/boot/properties/WechatAuthProperties.java | 5 +++--
service-job/src/main/java/com/java110/job/adapt/fee/ReturnPayFeeToPlutusAdapt.java | 3 ++-
service-acct/src/main/java/com/java110/acct/payment/adapt/fuiou/FuiouPaymentFactoryAdapt.java | 4 ++--
13 files changed, 28 insertions(+), 21 deletions(-)
diff --git a/java110-utils/src/main/java/com/java110/utils/constant/MappingConstant.java b/java110-utils/src/main/java/com/java110/utils/constant/MappingConstant.java
index f6b346a..23f6c5c 100755
--- a/java110-utils/src/main/java/com/java110/utils/constant/MappingConstant.java
+++ b/java110-utils/src/main/java/com/java110/utils/constant/MappingConstant.java
@@ -23,6 +23,9 @@
// 骞冲彴URL
public static final String URL_DOMAIN ="URL_DOMAIN";
+ // 寰俊鍟嗘埛
+ public static final String WECHAT_STORE_DOMAIN ="WECHAT_STORE";
+
public static final String KEY_LOG_ON_OFF = "LOG_ON_OFF";
public static final String KEY_COST_TIME_ON_OFF = "COST_TIME_ON_OFF";
diff --git a/service-acct/src/main/java/com/java110/acct/payment/adapt/alipay/AliPaymentFactoryAdapt.java b/service-acct/src/main/java/com/java110/acct/payment/adapt/alipay/AliPaymentFactoryAdapt.java
index c527fa4..558c58d 100644
--- a/service-acct/src/main/java/com/java110/acct/payment/adapt/alipay/AliPaymentFactoryAdapt.java
+++ b/service-acct/src/main/java/com/java110/acct/payment/adapt/alipay/AliPaymentFactoryAdapt.java
@@ -266,8 +266,8 @@
smallWeChatDto = new SmallWeChatDto();
smallWeChatDto.setAppId(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "appId"));
smallWeChatDto.setAppSecret(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "appSecret"));
- smallWeChatDto.setMchId(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "mchId"));
- smallWeChatDto.setPayPassword(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "key"));
+ smallWeChatDto.setMchId(MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "mchId"));
+ smallWeChatDto.setPayPassword(MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "key"));
return smallWeChatDto;
}
diff --git a/service-acct/src/main/java/com/java110/acct/payment/adapt/chinaUms/ChinaUmsPaymentFactoryAdapt.java b/service-acct/src/main/java/com/java110/acct/payment/adapt/chinaUms/ChinaUmsPaymentFactoryAdapt.java
index 5b3d564..19a32e0 100644
--- a/service-acct/src/main/java/com/java110/acct/payment/adapt/chinaUms/ChinaUmsPaymentFactoryAdapt.java
+++ b/service-acct/src/main/java/com/java110/acct/payment/adapt/chinaUms/ChinaUmsPaymentFactoryAdapt.java
@@ -280,8 +280,8 @@
smallWeChatDto = new SmallWeChatDto();
smallWeChatDto.setAppId(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "appId"));
smallWeChatDto.setAppSecret(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "appSecret"));
- smallWeChatDto.setMchId(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "mchId"));
- smallWeChatDto.setPayPassword(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "key"));
+ smallWeChatDto.setMchId(MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "mchId"));
+ smallWeChatDto.setPayPassword(MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "key"));
return smallWeChatDto;
}
diff --git a/service-acct/src/main/java/com/java110/acct/payment/adapt/fuiou/FuiouPaymentFactoryAdapt.java b/service-acct/src/main/java/com/java110/acct/payment/adapt/fuiou/FuiouPaymentFactoryAdapt.java
index fcd148a..df7db7b 100644
--- a/service-acct/src/main/java/com/java110/acct/payment/adapt/fuiou/FuiouPaymentFactoryAdapt.java
+++ b/service-acct/src/main/java/com/java110/acct/payment/adapt/fuiou/FuiouPaymentFactoryAdapt.java
@@ -294,8 +294,8 @@
smallWeChatDto = new SmallWeChatDto();
smallWeChatDto.setAppId(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "appId"));
smallWeChatDto.setAppSecret(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "appSecret"));
- smallWeChatDto.setMchId(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "mchId"));
- smallWeChatDto.setPayPassword(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "key"));
+ smallWeChatDto.setMchId(MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "mchId"));
+ smallWeChatDto.setPayPassword(MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "key"));
return smallWeChatDto;
}
diff --git a/service-acct/src/main/java/com/java110/acct/payment/adapt/icbc/IcbcPaymentFactoryAdapt.java.txt b/service-acct/src/main/java/com/java110/acct/payment/adapt/icbc/IcbcPaymentFactoryAdapt.java.txt
index 1acf032..e7dd41d 100644
--- a/service-acct/src/main/java/com/java110/acct/payment/adapt/icbc/IcbcPaymentFactoryAdapt.java.txt
+++ b/service-acct/src/main/java/com/java110/acct/payment/adapt/icbc/IcbcPaymentFactoryAdapt.java.txt
@@ -369,8 +369,8 @@
smallWeChatDto = new SmallWeChatDto();
smallWeChatDto.setAppId(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "appId"));
smallWeChatDto.setAppSecret(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "appSecret"));
- smallWeChatDto.setMchId(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "mchId"));
- smallWeChatDto.setPayPassword(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "key"));
+ smallWeChatDto.setMchId(MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "mchId"));
+ smallWeChatDto.setPayPassword(MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "key"));
return smallWeChatDto;
}
diff --git a/service-acct/src/main/java/com/java110/acct/payment/adapt/pingan/PinganPaymentFactoryAdapt.java b/service-acct/src/main/java/com/java110/acct/payment/adapt/pingan/PinganPaymentFactoryAdapt.java
index b439755..25b9d4f 100644
--- a/service-acct/src/main/java/com/java110/acct/payment/adapt/pingan/PinganPaymentFactoryAdapt.java
+++ b/service-acct/src/main/java/com/java110/acct/payment/adapt/pingan/PinganPaymentFactoryAdapt.java
@@ -276,8 +276,8 @@
smallWeChatDto = new SmallWeChatDto();
smallWeChatDto.setAppId(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "appId"));
smallWeChatDto.setAppSecret(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "appSecret"));
- smallWeChatDto.setMchId(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "mchId"));
- smallWeChatDto.setPayPassword(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "key"));
+ smallWeChatDto.setMchId(MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "mchId"));
+ smallWeChatDto.setPayPassword(MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "key"));
return smallWeChatDto;
}
diff --git a/service-acct/src/main/java/com/java110/acct/payment/adapt/plutus/PlutusPaymentFactoryAdapt.java b/service-acct/src/main/java/com/java110/acct/payment/adapt/plutus/PlutusPaymentFactoryAdapt.java
index 3f1543e..6ff2384 100644
--- a/service-acct/src/main/java/com/java110/acct/payment/adapt/plutus/PlutusPaymentFactoryAdapt.java
+++ b/service-acct/src/main/java/com/java110/acct/payment/adapt/plutus/PlutusPaymentFactoryAdapt.java
@@ -279,8 +279,8 @@
smallWeChatDto = new SmallWeChatDto();
smallWeChatDto.setAppId(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "appId"));
smallWeChatDto.setAppSecret(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "appSecret"));
- smallWeChatDto.setMchId(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "mchId"));
- smallWeChatDto.setPayPassword(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "key"));
+ smallWeChatDto.setMchId(MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "mchId"));
+ smallWeChatDto.setPayPassword(MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "key"));
return smallWeChatDto;
}
diff --git a/service-acct/src/main/java/com/java110/acct/payment/adapt/wechat/WechatPaymentFactoryAdapt.java b/service-acct/src/main/java/com/java110/acct/payment/adapt/wechat/WechatPaymentFactoryAdapt.java
index c04f87a..256e14a 100644
--- a/service-acct/src/main/java/com/java110/acct/payment/adapt/wechat/WechatPaymentFactoryAdapt.java
+++ b/service-acct/src/main/java/com/java110/acct/payment/adapt/wechat/WechatPaymentFactoryAdapt.java
@@ -305,8 +305,8 @@
smallWeChatDto = new SmallWeChatDto();
smallWeChatDto.setAppId(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "appId"));
smallWeChatDto.setAppSecret(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "appSecret"));
- smallWeChatDto.setMchId(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "mchId"));
- smallWeChatDto.setPayPassword(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "key"));
+ smallWeChatDto.setMchId(MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "mchId"));
+ smallWeChatDto.setPayPassword(MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "key"));
return smallWeChatDto;
}
diff --git a/service-acct/src/main/java/com/java110/acct/smo/impl/QrCodePlutusPaymentAdapt.java b/service-acct/src/main/java/com/java110/acct/smo/impl/QrCodePlutusPaymentAdapt.java
index 661cf3b..e7e79fe 100644
--- a/service-acct/src/main/java/com/java110/acct/smo/impl/QrCodePlutusPaymentAdapt.java
+++ b/service-acct/src/main/java/com/java110/acct/smo/impl/QrCodePlutusPaymentAdapt.java
@@ -9,6 +9,7 @@
import com.java110.dto.smallWeChat.SmallWeChatDto;
import com.java110.intf.store.ISmallWeChatInnerServiceSMO;
import com.java110.utils.cache.MappingCache;
+import com.java110.utils.constant.MappingConstant;
import com.java110.utils.constant.WechatConstant;
import com.java110.utils.util.PayUtil;
import com.java110.vo.ResultVo;
@@ -72,7 +73,7 @@
shopSmallWeChatDto.setObjId(communityId);
shopSmallWeChatDto.setAppId(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "appId"));
shopSmallWeChatDto.setAppSecret(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "appSecret"));
- shopSmallWeChatDto.setMchId(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "mchId"));
+ shopSmallWeChatDto.setMchId(MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "mchId"));
shopSmallWeChatDto.setPayPassword(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "payPassword"));
} else {
shopSmallWeChatDto = smallWeChatDtos.get(0);
diff --git a/service-api/src/main/java/com/java110/api/properties/WechatAuthProperties.java b/service-api/src/main/java/com/java110/api/properties/WechatAuthProperties.java
index e80ec21..61398fb 100644
--- a/service-api/src/main/java/com/java110/api/properties/WechatAuthProperties.java
+++ b/service-api/src/main/java/com/java110/api/properties/WechatAuthProperties.java
@@ -2,6 +2,7 @@
import com.java110.utils.cache.MappingCache;
+import com.java110.utils.constant.MappingConstant;
import com.java110.utils.constant.WechatConstant;
import com.java110.utils.util.StringUtil;
import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -84,7 +85,7 @@
}
public String getKey() {
- String keyCache = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "key");
+ String keyCache = MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "key");
if (!StringUtil.isEmpty(keyCache)) {
return keyCache;
}
diff --git a/service-job/src/main/java/com/java110/job/adapt/fee/ReturnPayFeeMoneyAdapt.java b/service-job/src/main/java/com/java110/job/adapt/fee/ReturnPayFeeMoneyAdapt.java
index 7171496..438ab11 100644
--- a/service-job/src/main/java/com/java110/job/adapt/fee/ReturnPayFeeMoneyAdapt.java
+++ b/service-job/src/main/java/com/java110/job/adapt/fee/ReturnPayFeeMoneyAdapt.java
@@ -128,9 +128,9 @@
smallWeChatDto.setAppId(onlinePayDtos.get(0).getAppId());
List<SmallWeChatDto> smallWeChatDtos = smallWechatV1InnerServiceSMOImpl.querySmallWechats(smallWeChatDto);
if (smallWeChatDto == null || smallWeChatDtos.size() <= 0) {
- payPassword = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "key");
+ payPassword = MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "key");
certData = MappingCache.getRemark(WechatConstant.WECHAT_DOMAIN, "cert");
- mchPassword = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "mchId");
+ mchPassword = MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "mchId");
} else {
payPassword = smallWeChatDtos.get(0).getPayPassword();
certData = smallWeChatDtos.get(0).getCertPath();
diff --git a/service-job/src/main/java/com/java110/job/adapt/fee/ReturnPayFeeToPlutusAdapt.java b/service-job/src/main/java/com/java110/job/adapt/fee/ReturnPayFeeToPlutusAdapt.java
index b627b13..b615381 100644
--- a/service-job/src/main/java/com/java110/job/adapt/fee/ReturnPayFeeToPlutusAdapt.java
+++ b/service-job/src/main/java/com/java110/job/adapt/fee/ReturnPayFeeToPlutusAdapt.java
@@ -17,6 +17,7 @@
import com.java110.job.adapt.DatabusAdaptImpl;
import com.java110.po.onlinePay.OnlinePayPo;
import com.java110.utils.cache.MappingCache;
+import com.java110.utils.constant.MappingConstant;
import com.java110.utils.constant.WechatConstant;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.PayUtil;
@@ -122,7 +123,7 @@
if (smallWeChatDtos == null || smallWeChatDtos.size() < 1) {
privateKey = MappingCache.getRemark(WechatConstant.WECHAT_DOMAIN, "PLUTUS_PRIVATE_KEY");
devId = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "PLUTUS_DEV_ID");
- payPassword = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "key");
+ payPassword = MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "key");
publicKey = MappingCache.getRemark(WechatConstant.WECHAT_DOMAIN, "PLUTUS_PUBLIC_KEY");
} else {
privateKey = CommunitySettingFactory.getRemark(smallWeChatDtos.get(0).getObjId(), "PLUTUS_PRIVATE_KEY");
diff --git a/springboot/src/main/java/com/java110/boot/properties/WechatAuthProperties.java b/springboot/src/main/java/com/java110/boot/properties/WechatAuthProperties.java
index 91fc580..c0a5131 100644
--- a/springboot/src/main/java/com/java110/boot/properties/WechatAuthProperties.java
+++ b/springboot/src/main/java/com/java110/boot/properties/WechatAuthProperties.java
@@ -2,6 +2,7 @@
import com.java110.utils.cache.MappingCache;
+import com.java110.utils.constant.MappingConstant;
import com.java110.utils.constant.WechatConstant;
import com.java110.utils.util.StringUtil;
import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -84,7 +85,7 @@
}
public String getKey() {
- String keyCache = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "key");
+ String keyCache = MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "key");
if (!StringUtil.isEmpty(keyCache)) {
return keyCache;
}
@@ -97,7 +98,7 @@
}
public String getMchId() {
- String mchIdCache = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "mchId");
+ String mchIdCache = MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "mchId");
if (!StringUtil.isEmpty(mchIdCache)) {
return mchIdCache;
}
--
Gitblit v1.8.0