From e04f81915e100107eca5fe16ba44898f3a0dbd55 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 04 七月 2020 18:48:06 +0800
Subject: [PATCH] redis指定数据库
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java | 33 +++++++++++++++------------------
1 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java
index 236573e..e530d7d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java
@@ -96,6 +96,7 @@
import com.yeshi.fanli.vo.user.UserVipRateVO;
import net.sf.json.JSONObject;
+import org.yeshi.utils.entity.ProxyIP;
/**
* 璐︽埛绯荤粺
@@ -258,12 +259,12 @@
UserInfo userInfo = null;
// 鎵嬫満鐧诲綍
if (loginType == 1) {
- userInfo = userAccountService.loginPhone(request, loginType, vcode, phone, system.getAppid());
+ userInfo = userAccountService.loginPhone(new ProxyIP(request.getRemoteHost(),request.getRemotePort()),acceptData, loginType, vcode, phone, system.getAppid());
}
// 寰俊鐧诲綍
if (loginType == 2) {
- userInfo = userAccountService.loginWeiXinNew(request, acceptData, loginType, code, system.getAppid());
+ userInfo = userAccountService.loginWeiXinNew(new ProxyIP(request.getRemoteHost(),request.getRemotePort()), acceptData, loginType, code, system.getAppid());
}
if (userInfo == null) {
@@ -377,7 +378,7 @@
}
try {
- UserInfo userInfo = userAccountService.bindPhoneToLogin(phone, key, system.getAppid(), request);
+ UserInfo userInfo = userAccountService.bindPhoneToLogin(new ProxyIP(request.getRemoteHost(),request.getRemotePort()),acceptData, phone, key);
JSONObject data = new JSONObject();
data.put("userInfo", UserUtil.filterForClientUser(userInfo));
@@ -389,14 +390,14 @@
}
}
-
/**
* 缁戝畾寰俊V2.1.3 鐢佃瘽鍙风爜 鐧诲綍
- *
* @param acceptData
- * @param vcode
- * @param phone
+ * @param uid
+ * @param code
+ * @param key
+ * @param request
* @param out
*/
@RequestSerializableByKey(key = "'bindWXLogin-'+#code")
@@ -421,7 +422,7 @@
}
try {
- UserInfo userInfo = userAccountService.bindWXToLogin(request, acceptData, code, system.getAppid(), key);
+ UserInfo userInfo = userAccountService.bindWXToLogin(new ProxyIP(request.getRemoteHost(),request.getRemotePort()), acceptData, code, system.getAppid(), key);
JSONObject data = new JSONObject();
data.put("userInfo", UserUtil.filterForClientUser(userInfo));
out.print(JsonUtil.loadTrueResult(data));
@@ -431,14 +432,11 @@
}
-
-
+
/**
* 缁戝畾鐢佃瘽鍙风爜 V2.0.1 寰俊鐧诲綍
- *
* @param acceptData
- * @param vcode
- * @param phone
+ * @param uid
* @param out
*/
@RequestMapping(value = "recordBind")
@@ -447,7 +445,6 @@
out.print(JsonUtil.loadFalseResult("鐢ㄦ埛id涓虹┖"));
return;
}
-
bindRemindService.addBindPhone(uid);
out.print(JsonUtil.loadTrueResult("璁板綍鎴愬姛"));
}
@@ -480,7 +477,7 @@
vo.setNickName(userInfo.getNickName());
vo.setPortrait(userInfo.getPortrait());
vo.setHelpLink(userVipConfigService.getValueByKey("help_link_vip_h5"));
- vo.setCsdLink(configService.get(ConfigKeyEnum.customerServiceLink.getKey()));
+ vo.setCsdLink(configService.getValue(ConfigKeyEnum.customerServiceLink.getKey(),acceptData.getSystem()));
Date now = new Date();
Date start = new Date(0);
@@ -763,7 +760,7 @@
}
json.put("tearcherWX", tearcherWX);
json.put("tearcherTip", "鎴戞槸浣犵殑瀵煎笀锛屼负浣犲湪鐪佽禋杩囩▼涓В闅剧瓟鐤戯紝瀵逛綘涓�瀵逛竴杈呭锛屽�惧惉浣犵殑闇�姹傛�荤粨骞跺弽棣堢粰鏉挎牀蹇渷瀹樻柟杩愯惀鍥㈤槦锛屽揩鏉ユ坊鍔犳垜鍚с��");
- json.put("newerGongLue", configService.get(ConfigKeyEnum.newerGonglue.getKey()));
+ json.put("newerGongLue", configService.getValue(ConfigKeyEnum.newerGonglue.getKey(),acceptData.getSystem()));
// 宸插畬鎴�
json.put("doneOrder", doneOrder);
@@ -781,7 +778,7 @@
json.put("superVIP", jsonrRed3);
// 浜哄伐瀹㈡湇閾炬帴
- json.put("csdLink", configService.get(ConfigKeyEnum.customerServiceLink.getKey()));
+ json.put("csdLink", configService.getValue(ConfigKeyEnum.customerServiceLink.getKey(),acceptData.getSystem()));
UserVIPInfo userVIPInfo = userVIPInfoService.selectByUid(uid);
String leftTime = "";
@@ -987,7 +984,7 @@
data.put("totalMoney", totalMoney.setScale(2, BigDecimal.ROUND_DOWN));
data.put("monthMoney", monthMoney.setScale(2, BigDecimal.ROUND_DOWN));
data.put("lastMoney", lastMoney.setScale(2, BigDecimal.ROUND_DOWN));
- data.put("link", configService.get(ConfigKeyEnum.accountLogoutProtocolLink.getKey()));
+ data.put("link", configService.getValue(ConfigKeyEnum.accountLogoutProtocolLink.getKey(),acceptData.getSystem()));
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
}
--
Gitblit v1.8.0