From 6fc1e7f179acaeec4df755f72895b3b4fb50d4bb Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 14 一月 2022 13:15:59 +0800
Subject: [PATCH] Merge branch 'renhequ' into dev
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/WxMaConfiguration.java | 40 ++++++++++++++++++++++++++++++++++++----
1 files changed, 36 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/WxMaConfiguration.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/WxMaConfiguration.java
index d5faf08..ba7845b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/WxMaConfiguration.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/WxMaConfiguration.java
@@ -2,6 +2,11 @@
import javax.annotation.Resource;
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.user.SysAppConfigVO;
+import com.panzhihua.common.service.user.UserService;
+import com.panzhihua.common.utlis.StringUtils;
import org.springframework.stereotype.Component;
import cn.binarywang.wx.miniapp.api.WxMaService;
@@ -25,11 +30,28 @@
@Resource
private WxH5Properties wxH5Properties;
- public WxMaService getMaService() {
+ @Resource
+ private WxMaRHProperties wxMaRHProperties;
+
+ @Resource
+ private UserService userService;
+
+ public WxMaService getMaService(String appid) {
WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl();
- config.setAppid(properties.getAppid());
- config.setSecret(properties.getSecret());
- config.setMsgDataFormat(properties.getMsgDataFormat());
+ if(StringUtils.isNotEmpty(appid)){
+ R<SysAppConfigVO> r=userService.selectByAppid(appid);
+ if(R.isOk(r)){
+ SysAppConfigVO sysAppConfigVO= r.getData();
+ config.setAppid(sysAppConfigVO.getAppId());
+ config.setSecret(sysAppConfigVO.getSecret());
+ config.setMsgDataFormat(properties.getMsgDataFormat());
+ }
+ }
+ else{
+ config.setAppid(properties.getAppid());
+ config.setSecret(properties.getSecret());
+ config.setMsgDataFormat(properties.getMsgDataFormat());
+ }
WxMaService wxMaService = new WxMaServiceImpl();
wxMaService.setWxMaConfig(config);
return wxMaService;
@@ -44,4 +66,14 @@
wxMaService.setWxMaConfig(config);
return wxMaService;
}
+
+ public WxMaService getMaRhService() {
+ WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl();
+ config.setAppid(wxMaRHProperties.getAppid());
+ config.setSecret(wxMaRHProperties.getSecret());
+ config.setMsgDataFormat(wxMaRHProperties.getMsgDataFormat());
+ WxMaService wxMaService = new WxMaServiceImpl();
+ wxMaService.setWxMaConfig(config);
+ return wxMaService;
+ }
}
--
Gitblit v1.7.1