From be67478cae6bf9308f15949a21e7d0a57a3f0ecb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 16 七月 2020 15:37:31 +0800
Subject: [PATCH] dubbo集成修改

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SMSController.java |   72 +++++++++++++++++++++++++++++++++--
 1 files changed, 67 insertions(+), 5 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 1407f19..d9d8b18 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
@@ -4,6 +4,7 @@
 
 import javax.annotation.Resource;
 
+import com.yeshi.fanli.util.*;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -15,10 +16,6 @@
 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;
 
 @Controller
@@ -128,7 +125,7 @@
 		// }
 		//
 		// 鍒ゆ柇鎵嬫満鍙风爜鏄惁琚皝绂�
-		UserInfo phoneUser = userInfoService.getEffectiveUserInfoByPhone(phone);
+		UserInfo phoneUser = userInfoService.getEffectiveUserInfoByPhone(phone, SystemInfoUtil.getSystem(acceptData.getPlatform(), acceptData.getPackages()));
 		if (phoneUser != null && uid != null) {
 			out.print(JsonUtil.loadFalseResult(9001, "璇ョ數璇濆彿鐮佽鍗犵敤"));
 			return;
@@ -194,4 +191,69 @@
 			e.printStackTrace();
 		}
 	}
+	
+	
+	
+	/**
+	 * 娉ㄩ攢璐︽埛鐭俊楠岃瘉
+	 * @param acceptData
+	 * @param uid
+	 * @param phone
+	 * @param out
+	 */
+	@RequestMapping(value = "sendMSMRemove")
+	public void sendMSMRemove(String callback, AcceptData acceptData, Long uid, String phone, PrintWriter out) {
+		if (Constant.IS_TEST) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鍙戦�佹垚鍔�"));
+			return;
+		}
+		
+		if (uid == null || uid <= 0) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
+			return;
+		}
+		
+		if (phone == null || !StringUtil.isMobile(phone.replaceAll(" ", ""))) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "璇疯緭鍏ユ纭墜鏈哄彿"));
+			return;
+		}
+		phone = phone.replaceAll(" ", "").trim();
+		
+		UserInfo userInfo = userInfoService.selectAvailableByPrimaryKey(uid);
+		if (userInfo == null) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "鐢ㄦ埛涓嶅瓨鍦�"));
+			return;
+		}
+		
+		if (!phone.equals(userInfo.getPhone())) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "璇疯緭鍏ユ纭墜鏈哄彿"));
+			return;
+		}
+		
+		try {
+			int count = 0;
+			String cachekey = RedisKeyEnum.getRedisKey(RedisKeyEnum.SMSBindRemove, phone + "");
+			String cacheValue = redisManager.getCommonString(cachekey);
+			if (!StringUtil.isNullOrEmpty(cacheValue)) {
+				count = Integer.parseInt(cacheValue);
+				// 闄愬埗3娆�
+				if (count >= 3) {
+					JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "楠岃瘉鐮佹鏁拌秴闄�,璇风◢鍚庡啀璇�"));
+					return;
+				}
+			}
+			// 缂撳瓨涓�涓皬鏃�
+			count++;
+			redisManager.cacheCommonString(cachekey, count + "", 60 * 60);
+			// 鍙戦�侀獙璇佺爜
+			smsService.sendRemoveVCode(phone, 4);
+			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鍙戦�佹垚鍔�"));
+		} catch (SMSException e) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
+		} catch (Exception e) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "鍙戦�佸け璐�"));
+			e.printStackTrace();
+		}
+	}
+
 }

--
Gitblit v1.8.0