From eda623f37c3260f4b4657e34a8a39798c72432b1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期日, 28 六月 2020 15:49:14 +0800
Subject: [PATCH] 搜索接口增加小黄条返回
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SMSController.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SMSController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SMSController.java
index 1395019..1407f19 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SMSController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SMSController.java
@@ -15,6 +15,8 @@
import com.yeshi.fanli.service.inter.user.ForbiddenUserIdentifyCodeService;
import com.yeshi.fanli.service.inter.user.SMSService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
+import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.RedisKeyEnum;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.annotation.RequestSerializableByKey;
@@ -40,6 +42,10 @@
@RequestSerializableByKey(key = "#phone+'-'+#uid+'-'+#type")
@RequestMapping(value = "sendSMS", method = RequestMethod.POST)
public void sendMSM(AcceptData acceptData, String phone, Long uid, Integer type, PrintWriter out) {
+ if (Constant.IS_TEST) {
+ out.print(JsonUtil.loadTrueResult("鍙戦�佹垚鍔�"));
+ return;
+ }
sendMSM(acceptData, phone, uid, type, StringUtil.Md5(phone + "-" + "-" + uid + "-" + type), out);
}
@@ -85,6 +91,11 @@
}
phone = phone.replaceAll(" ", "");
+ if (Constant.IS_TEST) {
+ out.print(JsonUtil.loadTrueResult("鍙戦�佹垚鍔�"));
+ return;
+ }
+
sendMSNnew(phone, slideVerify, 1, StringUtil.Md5(phone + "-" + acceptData.getDevice()), out);
}
@@ -98,7 +109,7 @@
*/
@RequestSerializableByKey(key = "#acceptData.device+'-'+#phone")
@RequestMapping(value = "sendMSMBind", method = RequestMethod.POST)
- public void sendMSMBind(AcceptData acceptData, String phone, boolean slideVerify, PrintWriter out) {
+ public void sendMSMBind(AcceptData acceptData, String phone, boolean slideVerify, Long uid, PrintWriter out) {
if (phone == null || !StringUtil.isMobile(phone.replaceAll(" ", ""))) {
out.print(JsonUtil.loadFalseResult(1, "鎵嬫満鍙疯緭鍏ユ湁璇紝璇蜂慨鏀�"));
return;
@@ -118,8 +129,13 @@
//
// 鍒ゆ柇鎵嬫満鍙风爜鏄惁琚皝绂�
UserInfo phoneUser = userInfoService.getEffectiveUserInfoByPhone(phone);
- if (phoneUser != null) {
+ if (phoneUser != null && uid != null) {
out.print(JsonUtil.loadFalseResult(9001, "璇ョ數璇濆彿鐮佽鍗犵敤"));
+ return;
+ }
+
+ if (Constant.IS_TEST) {
+ out.print(JsonUtil.loadTrueResult("鍙戦�佹垚鍔�"));
return;
}
@@ -132,10 +148,10 @@
String cachekey = null;
if (type == 1) {
// 鐧诲綍楠岃瘉鐮�
- cachekey = "sendMSNLoginCount" + phone;
+ cachekey = RedisKeyEnum.getRedisKey(RedisKeyEnum.SMSLoginCount, phone + "");
} else if (type == 2) {
// 缁戝畾楠岃瘉鐮�
- cachekey = "sendMSNBindCount" + phone;
+ cachekey = RedisKeyEnum.getRedisKey(RedisKeyEnum.SMSBindCount, phone + "");
}
if (cachekey == null) {
--
Gitblit v1.8.0