From e23c8975e6bb0934cb5db46a94d0f83c9739d9ab Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sun, 20 Mar 2022 16:33:17 +0800
Subject: [PATCH] 重构：套餐项目
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/WeChatApiTools.java | 51 +++++++++++++++++++++++++++++++--------------------
1 files changed, 31 insertions(+), 20 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/WeChatApiTools.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/WeChatApiTools.java
index 8940122..e002b34 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/WeChatApiTools.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/WeChatApiTools.java
@@ -3,18 +3,30 @@
import com.matrix.component.tools.HttpRequest;
import com.matrix.component.tools.HttpResponse;
import com.matrix.core.tools.LogUtil;
-import com.matrix.core.tools.PropertiesUtil;
import com.matrix.system.common.bean.BusParameterSettings;
import com.matrix.system.common.constance.AppConstance;
import com.matrix.system.common.dao.BusParameterSettingsDao;
import net.sf.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.io.IOException;
@Service
public class WeChatApiTools {
+
+
+
+ @Value("${wechar_login_url}")
+ private String wecharLoginUrl;
+
+ @Value("${xcx_manager_appid}")
+ private String xcxManagerAppid;
+
+ @Value("${xcx_manager_secret}")
+ private String xcxManagerSecret;
+
@Autowired
private BusParameterSettingsDao busParameterSettingsDao;
@@ -45,12 +57,24 @@
* @param code
* @return
*/
- public String getXcxLoginUrl(String code,Long companyId, String type) {
- String wechatLoginUrl = PropertiesUtil.getString(WECHAT_LOGIN_URL);
- if (AppConstance.MINIPROGRAM_APPID.equals(type)) {
- return String.format(wechatLoginUrl, getAppid(companyId), getSecret(companyId), code);
- } else {
- return String.format(wechatLoginUrl, getManagerAppId(companyId), getManagerSecret(companyId), code); }
+ public String getXcxLoginUrl(String code,Long companyId) {
+ String wechatLoginUrl =wecharLoginUrl;
+
+ return String.format(wechatLoginUrl, getAppid(companyId), getSecret(companyId), code);
+ }
+
+ /**
+ * 获取管理端小程序登录地址
+ *
+ * @param code
+ * @return
+ */
+ public String getManagerXcxLoginUrl(String code) {
+ String wechatLoginUrl = wecharLoginUrl;
+ String appId =xcxManagerAppid;
+ String secret = xcxManagerSecret;
+
+ return String.format(wechatLoginUrl, appId, secret, code);
}
/**
@@ -70,19 +94,6 @@
BusParameterSettings secret = busParameterSettingsDao.selectCompanyParamByCode(AppConstance.MINIPROGRAM_SECRET, companyId);
return secret.getParamValue();
}
-
- public String getManagerAppId(Long companyId) {
- BusParameterSettings appId = busParameterSettingsDao.selectCompanyParamByCode(AppConstance.MINI_PROGRAM_MANAGER_APP_ID, companyId);
- return appId.getParamValue();
- }
-
- public String getManagerSecret(Long companyId){
- BusParameterSettings secret = busParameterSettingsDao.selectCompanyParamByCode(AppConstance.MINI_PROGRAM_MANAGER_SECRET, companyId);
- return secret.getParamValue();
- }
-
-
-
/**
* 清空token
--
Gitblit v1.9.1