|
|
@@ -27,19 +27,27 @@ import java.util.Objects;
|
|
|
@Configuration
|
|
|
public class WxConfiguration {
|
|
|
|
|
|
- //企业微信 key=agentId
|
|
|
- public static Map<Integer, WxCpService> cpServices =Maps.newConcurrentMap();
|
|
|
//微信小程序API key = companyWechatId
|
|
|
- public static Map<String,WxMaService> wxMaService = Maps.newConcurrentMap();
|
|
|
+ public static Map<String, WxMaService> wxMaService = Maps.newConcurrentMap();
|
|
|
//微信支付服务 key = companyWechatId
|
|
|
- public static Map<String,WxPayService> wxPayServices = Maps.newConcurrentMap();
|
|
|
+ public static Map<String, WxPayService> wxPayServices = Maps.newConcurrentMap();
|
|
|
//发货模板 key = companyWechatId
|
|
|
- public static Map<String,String> temFhNotice = Maps.newConcurrentMap();
|
|
|
+ public static Map<String, String> temFhNotice = Maps.newConcurrentMap();
|
|
|
|
|
|
@Value("${wechat.payment.notifyUrl}")
|
|
|
private String notifyUrl;
|
|
|
-// @Value("${wechat.payment.refundNotifyUrl}")
|
|
|
+ // @Value("${wechat.payment.refundNotifyUrl}")
|
|
|
// private String refundNotifyUrl;
|
|
|
+ @Value("${wechat.appid}")
|
|
|
+ private String wechatAppid;
|
|
|
+ @Value("${wechat.mch.id}")
|
|
|
+ private String wechatMchId;
|
|
|
+ @Value("${wechat.mch.key}")
|
|
|
+ private String wechatMchKey;
|
|
|
+ @Value("${wechat.sub.appid}")
|
|
|
+ private String wechatSubAppid;
|
|
|
+ @Value("${wechat.sub.secret}")
|
|
|
+ private String wechatSubSecret;
|
|
|
@Value("${wechat.keyPath}")
|
|
|
private String keyPath;
|
|
|
@Autowired
|
|
|
@@ -51,51 +59,31 @@ public class WxConfiguration {
|
|
|
public void initWxServices() {
|
|
|
//查询企业微信配置
|
|
|
List<AdminCompanyWechat> list = adminCompanyWechatService.list();
|
|
|
- reloadWxConfig(list,redisUtil,keyPath,notifyUrl);
|
|
|
+ reloadWxConfig(list, redisUtil, keyPath, notifyUrl);
|
|
|
+ //初始化微信小程序服务
|
|
|
+ initWxMaService(redisUtil, wechatSubAppid, wechatSubSecret);
|
|
|
}
|
|
|
|
|
|
- public static void reloadWxConfig(List<AdminCompanyWechat> list,RedisUtil redisUtil,String keyPath,String notifyUrl){
|
|
|
+ public static void reloadWxConfig(List<AdminCompanyWechat> list, RedisUtil redisUtil, String keyPath, String notifyUrl) {
|
|
|
|
|
|
- cpServices.clear();
|
|
|
wxMaService.clear();
|
|
|
wxPayServices.clear();
|
|
|
|
|
|
- for(AdminCompanyWechat companyWechat : list){
|
|
|
- if(StringUtils.isEmpty(companyWechat.getMchId())||StringUtils.isEmpty(companyWechat.getSubAppId())||StringUtils.isEmpty(companyWechat.getSubSecret())){
|
|
|
+ for (AdminCompanyWechat companyWechat : list) {
|
|
|
+ if (StringUtils.isEmpty(companyWechat.getMchId()) || StringUtils.isEmpty(companyWechat.getSubAppId()) || StringUtils.isEmpty(companyWechat.getSubSecret())) {
|
|
|
continue;
|
|
|
}
|
|
|
- //初始化企业微信服务
|
|
|
- initCpService(companyWechat,redisUtil);
|
|
|
//初始化微信支付服务
|
|
|
- initWxPayService(companyWechat,keyPath,notifyUrl);
|
|
|
- //初始化微信小程序服务
|
|
|
- initWxMaService(companyWechat,redisUtil);
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
- * 初始化企业微信服务
|
|
|
- */
|
|
|
- private static void initCpService(AdminCompanyWechat companyWechat,RedisUtil redisUtil){
|
|
|
- Map<Integer,String> secretMap = new HashMap<>();
|
|
|
- for (Integer agentId : secretMap.keySet()) {
|
|
|
- //初始化企业微信服务
|
|
|
- if (Objects.nonNull(agentId)) {
|
|
|
- val configStorage = new WxCpLettuceRedisConfig(redisUtil);
|
|
|
- configStorage.setAgentId(agentId);
|
|
|
- configStorage.setCorpSecret(secretMap.get(agentId));
|
|
|
- WxCpService wxCpService = new WxCpServiceImpl();
|
|
|
- wxCpService.setWxCpConfigStorage(configStorage);
|
|
|
- cpServices.put(agentId, wxCpService);
|
|
|
- }
|
|
|
+ initWxPayService(companyWechat, keyPath, notifyUrl);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 初始化微信支付服务
|
|
|
+ *
|
|
|
* @param companyWechat
|
|
|
*/
|
|
|
- private static void initWxPayService(AdminCompanyWechat companyWechat,String keyPath,String notifyUrl){
|
|
|
+ private static void initWxPayService(AdminCompanyWechat companyWechat, String keyPath, String notifyUrl) {
|
|
|
|
|
|
String path = keyPath.toLowerCase();
|
|
|
WxPayConfig wxPayConfig = new WxPayConfig();
|
|
|
@@ -108,21 +96,20 @@ public class WxConfiguration {
|
|
|
wxPayConfig.setKeyPath(path);
|
|
|
WxPayService wxPayService = new WxPayServiceImpl();
|
|
|
wxPayService.setConfig(wxPayConfig);
|
|
|
- wxPayServices.put(companyWechat.getCompanyWechatId(),wxPayService);
|
|
|
+ wxPayServices.put(companyWechat.getCompanyWechatId(), wxPayService);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 初始化小程序服务
|
|
|
*/
|
|
|
- private static void initWxMaService(AdminCompanyWechat companyWechat,RedisUtil redisUtil){
|
|
|
+ private static void initWxMaService(RedisUtil redisUtil, String wechatSubAppid, String wechatSubSecret) {
|
|
|
WxMaDefaultConfigImpl config = new WxMaLettuceRedisConfig(redisUtil);
|
|
|
// 使用上面的配置时，需要同时引入jedis-lock的依赖，否则会报类无法找到的异常
|
|
|
- config.setAppid(companyWechat.getSubAppId());
|
|
|
- config.setSecret(companyWechat.getSubSecret());
|
|
|
+ config.setAppid(wechatSubAppid);
|
|
|
+ config.setSecret(wechatSubSecret);
|
|
|
WxMaService service = new WxMaServiceImpl();
|
|
|
service.setWxMaConfig(config);
|
|
|
- wxMaService.put(companyWechat.getCompanyWechatId(),service);
|
|
|
- // temFhNotice.put(companyWechat.getCompanyWechatId(),companyWechat.getTemplate());
|
|
|
+ wxMaService.put(wechatSubAppid, service);
|
|
|
}
|
|
|
|
|
|
|
