mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-21 19:45:09 +08:00
Merge branch 'electricbicycles' into merger
This commit is contained in:
@@ -16,7 +16,7 @@ import java.util.Map;
|
||||
|
||||
@Slf4j
|
||||
@Component
|
||||
@Order(1)
|
||||
@Order(2)
|
||||
public class InitializeAdapayConfig implements CommandLineRunner {
|
||||
|
||||
@Value("${adapay.debugFlag}")
|
||||
@@ -36,7 +36,6 @@ public class InitializeAdapayConfig implements CommandLineRunner {
|
||||
|
||||
@Override
|
||||
public void run(String... args) throws Exception {
|
||||
log.info(">>>>>>>>>>>>>>>服务启动执行,执行加载数据等操作 InitializeAdapayConfig order 1 <<<<<<<<<<<<<");
|
||||
/*
|
||||
单商户
|
||||
*/
|
||||
@@ -47,6 +46,7 @@ public class InitializeAdapayConfig implements CommandLineRunner {
|
||||
目前有jsowell和xixiao
|
||||
*/
|
||||
multiMerchant();
|
||||
log.info(">>>>>>>>>>>>>>>服务启动执行,执行加载数据等操作 InitializeAdapayConfig order 2 <<<<<<<<<<<<<");
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -11,7 +11,7 @@ import org.springframework.stereotype.Component;
|
||||
|
||||
@Slf4j
|
||||
@Component
|
||||
@Order(2)
|
||||
@Order(4)
|
||||
public class AliPayConfig implements CommandLineRunner {
|
||||
@Value("${alipay.gatewayHost}")
|
||||
private String gatewayHost;
|
||||
@@ -33,7 +33,6 @@ public class AliPayConfig implements CommandLineRunner {
|
||||
|
||||
@Override
|
||||
public void run(String... args) throws Exception {
|
||||
log.info(">>>>>>>>>>>>>>>服务启动执行,执行加载数据等操作 AliPayConfig order 2 <<<<<<<<<<<<<");
|
||||
// 设置参数(全局只需设置一次)
|
||||
Config config = new Config();
|
||||
config.protocol = Constants.HTTPS;
|
||||
@@ -57,5 +56,6 @@ public class AliPayConfig implements CommandLineRunner {
|
||||
// 可设置AES密钥,调用AES加解密相关接口时需要(可选)
|
||||
config.encryptKey = encryptKey;
|
||||
Factory.setOptions(config);
|
||||
log.info(">>>>>>>>>>>>>>>服务启动执行,执行加载数据等操作 AliPayConfig order 4 <<<<<<<<<<<<<");
|
||||
}
|
||||
}
|
||||
@@ -3,13 +3,15 @@ package com.jsowell.wxpay.config;
|
||||
|
||||
import com.jsowell.wxpay.common.WeChatPayParameter;
|
||||
import com.jsowell.wxpay.utils.WechatPayUtils;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.boot.CommandLineRunner;
|
||||
import org.springframework.core.annotation.Order;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
@Order(3)
|
||||
@Slf4j
|
||||
@Component
|
||||
@Order(5)
|
||||
public class WechatPayConfig implements CommandLineRunner {
|
||||
/**
|
||||
* 公众号appid
|
||||
@@ -78,7 +80,6 @@ public class WechatPayConfig implements CommandLineRunner {
|
||||
|
||||
@Override
|
||||
public void run(String... args) throws Exception {
|
||||
System.out.println(">>>>>>>>>>>>>>>服务启动执行,执行加载数据等操作 WechatPayConfig order 3 <<<<<<<<<<<<<");
|
||||
//微信支付
|
||||
WeChatPayParameter.mchId = wechatMchId;
|
||||
WeChatPayParameter.appId = wechatAppId;
|
||||
@@ -94,5 +95,6 @@ public class WechatPayConfig implements CommandLineRunner {
|
||||
WeChatPayParameter.mchSerialNo = mchSerialNo;
|
||||
//获取平台证书
|
||||
WeChatPayParameter.certificateMap = WechatPayUtils.refreshCertificate();
|
||||
log.info(">>>>>>>>>>>>>>>服务启动执行,执行加载数据等操作 WechatPayConfig order 5 <<<<<<<<<<<<<");
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user