Commit 374f6736 authored by liyang's avatar liyang
Browse files

1.微信退款协议问题解决

2.新增微信小程序消息推送配置
parent 7d79dfc6
...@@ -3,7 +3,7 @@ package org.linlinjava.litemall.core.config; ...@@ -3,7 +3,7 @@ package org.linlinjava.litemall.core.config;
import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.api.WxMaService;
import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl; import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
import cn.binarywang.wx.miniapp.config.WxMaConfig; import cn.binarywang.wx.miniapp.config.WxMaConfig;
import cn.binarywang.wx.miniapp.config.WxMaInMemoryConfig; import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
import com.github.binarywang.wxpay.config.WxPayConfig; import com.github.binarywang.wxpay.config.WxPayConfig;
import com.github.binarywang.wxpay.service.WxPayService; import com.github.binarywang.wxpay.service.WxPayService;
import com.github.binarywang.wxpay.service.impl.WxPayServiceImpl; import com.github.binarywang.wxpay.service.impl.WxPayServiceImpl;
...@@ -18,9 +18,11 @@ public class WxConfig { ...@@ -18,9 +18,11 @@ public class WxConfig {
@Bean @Bean
public WxMaConfig wxMaConfig() { public WxMaConfig wxMaConfig() {
WxMaInMemoryConfig config = new WxMaInMemoryConfig(); WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl();
config.setAppid(properties.getAppId()); config.setAppid(properties.getAppId());
config.setSecret(properties.getAppSecret()); config.setSecret(properties.getAppSecret());
config.setToken(properties.getToken());
config.setAesKey(properties.getAesKey());
return config; return config;
} }
......
...@@ -19,6 +19,26 @@ public class WxProperties { ...@@ -19,6 +19,26 @@ public class WxProperties {
private String keyPath; private String keyPath;
private String token;
private String aesKey;
public String getToken() {
return token;
}
public void setToken(String token) {
this.token = token;
}
public String getAesKey() {
return aesKey;
}
public void setAesKey(String aesKey) {
this.aesKey = aesKey;
}
public String getNotifyUrl() { public String getNotifyUrl() {
return notifyUrl; return notifyUrl;
} }
......
...@@ -9,6 +9,10 @@ litemall: ...@@ -9,6 +9,10 @@ litemall:
# 商户证书文件路径 # 商户证书文件路径
# 请参考“商户证书”一节 https://pay.weixin.qq.com/wiki/doc/api/wxa/wxa_api.php?chapter=4_3 # 请参考“商户证书”一节 https://pay.weixin.qq.com/wiki/doc/api/wxa/wxa_api.php?chapter=4_3
key-path: xxxxx key-path: xxxxx
# 消息推送配置token
token:
# 消息推送配置AesKey
aes-key:
#通知相关配置 #通知相关配置
notify: notify:
......
...@@ -98,13 +98,13 @@ ...@@ -98,13 +98,13 @@
<dependency> <dependency>
<groupId>com.github.binarywang</groupId> <groupId>com.github.binarywang</groupId>
<artifactId>weixin-java-pay</artifactId> <artifactId>weixin-java-pay</artifactId>
<version>3.3.0</version> <version>4.1.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.binarywang</groupId> <groupId>com.github.binarywang</groupId>
<artifactId>weixin-java-miniapp</artifactId> <artifactId>weixin-java-miniapp</artifactId>
<version>3.3.0</version> <version>4.1.0</version>
</dependency> </dependency>
<dependency> <dependency>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment