|
|
@@ -31,6 +31,16 @@ public class WxConfiguration {
|
|
|
|
|
|
@Value("${wechat.payment.notifyUrl}")
|
|
|
private String notifyUrl;
|
|
|
+ @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
|
|
|
@@ -44,6 +54,8 @@ public class WxConfiguration {
|
|
|
//查询企业微信配置
|
|
|
List<AdminCompanyWechat> list = AdminCompanyWechatService.list();
|
|
|
reloadWxConfig(list, redisUtil, keyPath, notifyUrl);
|
|
|
+ //初始化微信小程序服务
|
|
|
+ initWxMaService(redisUtil, wechatSubAppid, wechatSubSecret);
|
|
|
}
|
|
|
|
|
|
public static void reloadWxConfig(List<AdminCompanyWechat> list, RedisUtil redisUtil, String keyPath, String notifyUrl) {
|
|
|
@@ -57,8 +69,6 @@ public class WxConfiguration {
|
|
|
}
|
|
|
//初始化微信支付服务
|
|
|
initWxPayService(companyWechat, keyPath, notifyUrl);
|
|
|
- //初始化微信小程序服务
|
|
|
- initWxMaService(companyWechat, redisUtil);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -86,14 +96,14 @@ public class WxConfiguration {
|
|
|
/**
|
|
|
* 初始化小程序服务
|
|
|
*/
|
|
|
- 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);
|
|
|
+ wxMaService.put(wechatSubAppid, service);
|
|
|
}
|
|
|
|
|
|
|
