From b2d360d9113b6955287108ca9e90d76a1f3c1419 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期日, 29 九月 2024 15:05:11 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
server/service/src/main/java/com/doumee/core/wx/WxMiniConfig.java | 127 +++++++++++++++--------------------------
1 files changed, 47 insertions(+), 80 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/core/wx/WxMiniConfig.java b/server/service/src/main/java/com/doumee/core/wx/WxMiniConfig.java
index 75eb95e..5b96af3 100644
--- a/server/service/src/main/java/com/doumee/core/wx/WxMiniConfig.java
+++ b/server/service/src/main/java/com/doumee/core/wx/WxMiniConfig.java
@@ -1,94 +1,61 @@
package com.doumee.core.wx;
-//import cn.binarywang.wx.miniapp.api.WxMaService;
-//import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
-//import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
-//import com.doumee.config.mybatis.SpringUtils;
-//import com.github.binarywang.wxpay.config.WxPayConfig;
-//import com.github.binarywang.wxpay.constant.WxPayConstants;
-//import com.github.binarywang.wxpay.service.WxPayService;
-//import com.github.binarywang.wxpay.service.impl.WxPayServiceImpl;
-//import org.apache.commons.lang3.StringUtils;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.context.annotation.Configuration;
-//
-//import javax.annotation.PostConstruct;
+import cn.binarywang.wx.miniapp.api.WxMaService;
+import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
+import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
+import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.config.mybatis.SpringUtils;
+import com.doumee.core.utils.Constants;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+
+import javax.annotation.PostConstruct;
/**
* 寰俊灏忕▼搴忕粍浠�
*/
-//@Configuration
+@Configuration
public class WxMiniConfig {
-// /********寰俊灏忕▼搴忔湇鍔�**********/
-// public static WxMaService wxMaService;
-// /********寰俊灏忕▼搴忔敮浠�**********/
-// public static WxPayService wxPayService;
-// /********寰俊APP鏀粯**********/
-// public static WxPayService wxAppPayService;
-//
-//
-// @Autowired
-// private WxPayProperties wxPayProperties;
-//
-// public static WxMiniConfig me() {
-// return SpringUtils.get().getBean(WxMiniConfig.class);
-// }
-//
-// @PostConstruct
-// void init() {
-// this.load_WxMaService();
-//// this.load_wxPayService();
-//// this.load_wxAppPayService();
-// }
-// /**
-// * 鍒濆鍖栧井淇″皬绋嬪簭
-// */
-// public void load_WxMaService() {
-// WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl();
-// config.setAppid(StringUtils.trimToNull(wxPayProperties.getAppId()));
-// config.setSecret(StringUtils.trimToNull(wxPayProperties.getAppSecret()));
-// config.setMsgDataFormat("JSON");
-// //config.setToken("");
-// //config.setAesKey("");
-// WxMaService wxMaService = new WxMaServiceImpl();
-// wxMaService.setWxMaConfig(config);
-// this.wxMaService = wxMaService;
-// }
+ /********瀹㈡埛绔� 寰俊灏忕▼搴忔湇鍔�**********/
+ public static WxMaService wxCustomerService;
+ /********鍛樺伐绔� 寰俊灏忕▼搴忔湇鍔�**********/
+ public static WxMaService wxPersonnelService;
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
+
+ public static WxMiniConfig me() {
+ return SpringUtils.get().getBean(WxMiniConfig.class);
+ }
+
+ @PostConstruct
+ void init() {
+ this.load_WxCustomerService();
+ this.load_WxPersonnelService();
+ }
/**
- * 鍒濆鍖栧井淇″皬绋嬪簭鏀粯
+ * 鍒濆鍖栧井淇″皬绋嬪簭
*/
-// public void load_wxPayService() {
-// WxPayConfig payConfig = new WxPayConfig();
-// payConfig.setTradeType(WxPayConstants.TradeType.JSAPI);
-// payConfig.setSignType(WxPayConstants.SignType.MD5);
-// payConfig.setAppId(StringUtils.trimToNull(wxPayProperties.getAppId()));
-// payConfig.setMchId(StringUtils.trimToNull(wxPayProperties.getMchId()));
-// payConfig.setMchKey(StringUtils.trimToNull(wxPayProperties.getMchKey()));
-// payConfig.setKeyPath(StringUtils.trimToNull(wxPayProperties.getKeyPath()));
-// payConfig.setNotifyUrl(StringUtils.trimToNull(wxPayProperties.getNotifyUrl()));
-// WxPayService wxPayService = new WxPayServiceImpl();
-// wxPayService.setConfig(payConfig);
-// this.wxPayService = wxPayService;
-// }
+ public void load_WxCustomerService() {
+ WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl();
+ config.setAppid(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_APPID_CUSTOMER).getCode()));
+ config.setSecret(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_SECRET_CUSTOMER).getCode()));
+ config.setMsgDataFormat("JSON");
+ WxMaService wxMaService = new WxMaServiceImpl();
+ wxMaService.setWxMaConfig(config);
+ this.wxCustomerService = wxMaService;
+ }
-// /**
-// * 鍒濆鍖朅pp鏀粯
-// */
-// public void load_wxAppPayService() {
-// WxPayConfig payConfig = new WxPayConfig();
-// payConfig.setTradeType(WxPayConstants.TradeType.APP);
-// payConfig.setSignType(WxPayConstants.SignType.MD5);
-// payConfig.setAppId("");
-// payConfig.setMchId(StringUtils.trimToNull(sysDictService.getSysDictValue(SysDictEnum.WX_MINI_MchId.getCode())));
-// payConfig.setMchKey(StringUtils.trimToNull(sysDictService.getSysDictValue(SysDictEnum.WX_MINI_MchKey.getCode())));
-// payConfig.setKeyPath(StringUtils.trimToNull(sysDictService.getSysDictValue(SysDictEnum.WX_MINI_KeyPath.getCode())));
-// payConfig.setNotifyUrl(StringUtils.trimToNull(sysDictService.getSysDictValue(SysDictEnum.WX_MINI_NotifyUrl.getCode())));
-// WxPayService wxPayService = new WxPayServiceImpl();
-// wxPayService.setConfig(payConfig);
-// this.wxAppPayService = wxPayService;
-// }
-
+ public void load_WxPersonnelService() {
+ WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl();
+ config.setAppid(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_APPID_PERSONNEL).getCode()));
+ config.setSecret(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_SECRET_PERSONNEL).getCode()));
+ config.setMsgDataFormat("JSON");
+ WxMaService wxMaService = new WxMaServiceImpl();
+ wxMaService.setWxMaConfig(config);
+ this.wxPersonnelService = wxMaService;
+ }
}
--
Gitblit v1.9.3