From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SMSController.java | 95 ++++++++++++++++++++++++++++-------------------
1 files changed, 56 insertions(+), 39 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 24b83a9..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
@@ -11,10 +11,12 @@
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.user.UserInfo;
-import com.yeshi.fanli.exception.SMSException;
+import com.yeshi.fanli.exception.config.SMSException;
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;
@@ -31,18 +33,22 @@
@Resource
private UserInfoService userInfoService;
-
+
@Resource
private ForbiddenUserIdentifyCodeService forbiddenUserIdentifyCodeService;
// 鍙戦�佺煭淇�
+ @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);
}
- @RequestSerializableByKey(key = "key")
public void sendMSM(AcceptData acceptData, String phone, Long uid, Integer type, String key, PrintWriter out) {
try {
if (phone.contains("**") && uid != null && uid > 0) {
@@ -68,10 +74,10 @@
out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
}
}
-
-
+
/**
- * 1.5.3 鐧诲綍鍙戦�佺煭淇�
+ * 1.5.3 鐧诲綍鍙戦�佺煭淇�
+ *
* @param acceptData
* @param phone
* @param uid
@@ -84,82 +90,93 @@
return;
}
phone = phone.replaceAll(" ", "");
-
- sendMSNnew(phone,slideVerify, 1, StringUtil.Md5(phone + "-" + acceptData.getDevice()), out);
+
+ if (Constant.IS_TEST) {
+ out.print(JsonUtil.loadTrueResult("鍙戦�佹垚鍔�"));
+ return;
+ }
+
+ sendMSNnew(phone, slideVerify, 1, StringUtil.Md5(phone + "-" + acceptData.getDevice()), out);
}
-
/**
* 1.5.3 缁戝畾鍙戦�佺煭淇�
+ *
* @param acceptData
* @param phone
* @param uid
* @param out
*/
+ @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;
}
phone = phone.replaceAll(" ", "");
-
+
// 鍒ゆ柇鎵嬫満鍙风爜鏄惁琚皝绂�
-// ForbiddenUserIdentifyCode identifyCode1 = forbiddenUserIdentifyCodeService
-// .listByTypeAndIdentifyCode(ForbiddenUserIdentifyCodeTypeEnum.phone, phone);
-// if (identifyCode1 != null && identifyCode1.getEffective() != null && identifyCode1.getEffective()) {
-// out.print(JsonUtil.loadFalseResult(9001,"璇ョ數璇濆彿鐮佽鍗犵敤"));
-// return;
-// }
-//
+ // ForbiddenUserIdentifyCode identifyCode1 =
+ // forbiddenUserIdentifyCodeService
+ // .listByTypeAndIdentifyCode(ForbiddenUserIdentifyCodeTypeEnum.phone,
+ // phone);
+ // if (identifyCode1 != null && identifyCode1.getEffective() != null &&
+ // identifyCode1.getEffective()) {
+ // out.print(JsonUtil.loadFalseResult(9001,"璇ョ數璇濆彿鐮佽鍗犵敤"));
+ // return;
+ // }
+ //
// 鍒ゆ柇鎵嬫満鍙风爜鏄惁琚皝绂�
UserInfo phoneUser = userInfoService.getEffectiveUserInfoByPhone(phone);
- if (phoneUser != null) {
- out.print(JsonUtil.loadFalseResult(9001,"璇ョ數璇濆彿鐮佽鍗犵敤"));
+ if (phoneUser != null && uid != null) {
+ out.print(JsonUtil.loadFalseResult(9001, "璇ョ數璇濆彿鐮佽鍗犵敤"));
return;
}
-
- sendMSNnew(phone,slideVerify, 2, StringUtil.Md5(phone + "-" + acceptData.getDevice()), out);
+
+ if (Constant.IS_TEST) {
+ out.print(JsonUtil.loadTrueResult("鍙戦�佹垚鍔�"));
+ return;
+ }
+
+ sendMSNnew(phone, slideVerify, 2, StringUtil.Md5(phone + "-" + acceptData.getDevice()), out);
}
-
-
- @RequestSerializableByKey(key = "key")
+
public void sendMSNnew(String phone, boolean slideVerify, int type, String key, PrintWriter out) {
try {
int count = 0;
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) {
- out.print(JsonUtil.loadFalseResult(1,"鍙戦�佸け璐�"));
+ out.print(JsonUtil.loadFalseResult(1, "鍙戦�佸け璐�"));
return;
}
-
+
String cacheValue = redisManager.getCommonString(cachekey);
if (!StringUtil.isNullOrEmpty(cacheValue)) {
count = Integer.parseInt(cacheValue);
// 闄愬埗3娆�
if (count >= 3) {
- out.print(JsonUtil.loadFalseResult(3,"楠岃瘉鐮佹鏁拌秴闄�,璇风◢鍚庡啀璇�"));
+ out.print(JsonUtil.loadFalseResult(3, "楠岃瘉鐮佹鏁拌秴闄�,璇风◢鍚庡啀璇�"));
return;
}
}
-
+
if (count == 2 && !slideVerify) {
- out.print(JsonUtil.loadFalseResult(2,"闇�瑕佹粦鍔ㄩ獙璇�"));
+ out.print(JsonUtil.loadFalseResult(2, "闇�瑕佹粦鍔ㄩ獙璇�"));
return;
- }
+ }
// 缂撳瓨涓�涓皬鏃�
- count ++;
+ count++;
redisManager.cacheCommonString(cachekey, count + "", 60 * 60);
-
-
+
if (type == 1) {
// 鐧诲綍楠岃瘉鐮�
smsService.sendLoginVCode(phone, 4);
@@ -167,9 +184,9 @@
// 缁戝畾楠岃瘉鐮�
smsService.sendBindVCode(phone, 4);
}
-
+
out.print(JsonUtil.loadTrueResult("鍙戦�佹垚鍔�"));
-
+
} catch (SMSException e) {
out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
} catch (Exception e) {
--
Gitblit v1.8.0