From 2dff570ccfa532f8c012bc13829b302dd3e1b9d3 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期六, 29 十二月 2018 15:39:29 +0800
Subject: [PATCH] Merge branch 'master' into div1
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserAccountController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserAccountController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserAccountController.java
index 1c00043..25d76e0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserAccountController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserAccountController.java
@@ -7,10 +7,13 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
+import net.sf.json.JSONObject;
+
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.yeshi.utils.JsonUtil;
+import com.yeshi.fanli.util.Constant;
+import org.yeshi.utils.JsonUtil;
import com.alipay.api.AlipayApiException;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.user.BindingAccount;
@@ -51,8 +54,6 @@
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.account.UserUtil;
import com.yeshi.fanli.util.wx.WXLoginUtil;
-
-import net.sf.json.JSONObject;
/**
* 璐︽埛绯荤粺
@@ -150,7 +151,7 @@
return;
}
- if (loginType == 3)// 楠岃瘉鐭俊楠岃瘉鐮�
+ if (loginType == 3 && !Constant.IS_TEST)// 楠岃瘉鐭俊楠岃瘉鐮�
{
String oldVcode = redisManager.getSMSVCode(phone, SMSHistory.TYPE_LOGIN);
if (StringUtil.isNullOrEmpty(oldVcode) || !oldVcode.equalsIgnoreCase(vcode)) {
--
Gitblit v1.8.0