|
@@ -77,15 +77,20 @@ public class OauthController {
|
|
|
String password = request.getParameter("password");
|
|
|
String code = request.getParameter("code");
|
|
|
String uuid = request.getParameter("uuid");
|
|
|
- String verifyKey =
|
|
|
- CacheConstants.CAPTCHA_CODE_KEY + StringUtils.nvl(uuid, "");
|
|
|
- String captcha = redisCache.getCacheObject(verifyKey);
|
|
|
- if (captcha == null || !captcha.equals(code))
|
|
|
- // if (false)
|
|
|
- {
|
|
|
- return AjaxResult.warn("验证码错误");
|
|
|
- } else {
|
|
|
- redisCache.deleteObject(verifyKey);
|
|
|
+ String ym= request.getParameter("isYanMa");
|
|
|
+// if(StringUtils.isNotNull(ym)&&ym.equals("yes")){
|
|
|
+//
|
|
|
+// }
|
|
|
+ if(ym.equals("yes")){
|
|
|
+ String verifyKey =
|
|
|
+ CacheConstants.CAPTCHA_CODE_KEY + StringUtils.nvl(uuid, "");
|
|
|
+ String captcha = redisCache.getCacheObject(verifyKey);
|
|
|
+ if (captcha == null || !captcha.equals(code))
|
|
|
+ {
|
|
|
+ return AjaxResult.warn("验证码错误");
|
|
|
+ } else {
|
|
|
+ redisCache.deleteObject(verifyKey);
|
|
|
+ }
|
|
|
}
|
|
|
String endUsername;
|
|
|
// 单点登录
|