From 8f53335c42239f379a5f8f7ca0e2f9807e3f0aef Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Sat, 23 Jun 2018 11:06:19 +0800
Subject: [PATCH] 更新部分 代码
---
src/main/java/com/moral/common/convert/StringToDateConverter.java | 2 +-
src/main/java/com/moral/common/bean/ResultBean.java | 7 ++++++-
src/main/java/com/moral/security/auth/login/LoginAwareAuthenticationFailureHandler.java | 3 ++-
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/common/bean/ResultBean.java b/src/main/java/com/moral/common/bean/ResultBean.java
index 1e95aed..b3a2ff9 100644
--- a/src/main/java/com/moral/common/bean/ResultBean.java
+++ b/src/main/java/com/moral/common/bean/ResultBean.java
@@ -18,7 +18,12 @@
public ResultBean() {
}
-
+ public static ResultBean success(){
+ return new ResultBean("������������",SUCCESS);
+ }
+ public static ResultBean fail(){
+ return new ResultBean("������������",FAIL);
+ }
public ResultBean(Throwable e) {
this.message = e.toString();
this.code = FAIL;
diff --git a/src/main/java/com/moral/common/convert/StringToDateConverter.java b/src/main/java/com/moral/common/convert/StringToDateConverter.java
index e016349..a564a25 100644
--- a/src/main/java/com/moral/common/convert/StringToDateConverter.java
+++ b/src/main/java/com/moral/common/convert/StringToDateConverter.java
@@ -14,7 +14,7 @@
* @version $Id: StringToDateConverter.java, v 0.1 2015���9���24��� ������7:19:41 byshome Exp $
*/
public class StringToDateConverter implements Converter<String, Date> {
- Logger log = Logger.getLogger(StringToDateConverter.class);
+ private static Logger log = Logger.getLogger(StringToDateConverter.class);
private static final String dateFormat = "yyyy-MM-dd HH:mm:ss";
// private static final String shortDateFormat = "yyyy-MM-dd";
private static SimpleDateFormat simpleDateFormat = new SimpleDateFormat(dateFormat);
diff --git a/src/main/java/com/moral/security/auth/login/LoginAwareAuthenticationFailureHandler.java b/src/main/java/com/moral/security/auth/login/LoginAwareAuthenticationFailureHandler.java
index aeca9fc..35b73c0 100644
--- a/src/main/java/com/moral/security/auth/login/LoginAwareAuthenticationFailureHandler.java
+++ b/src/main/java/com/moral/security/auth/login/LoginAwareAuthenticationFailureHandler.java
@@ -49,8 +49,9 @@
mapper.writeValue(response.getWriter(), ErrorResponse.of("Token has expired", ErrorCode.JWT_TOKEN_EXPIRED, HttpStatus.UNAUTHORIZED));
} else if (e instanceof AuthMethodNotSupportedException) {
mapper.writeValue(response.getWriter(), ErrorResponse.of(e.getMessage(), ErrorCode.AUTHENTICATION, HttpStatus.UNAUTHORIZED));
+ } else {
+ mapper.writeValue(response.getWriter(), ErrorResponse.of(e.getMessage(), ErrorCode.AUTHENTICATION, HttpStatus.OK));
}
// mapper.writeValue(response.getWriter(), ErrorResponse.of("Authentication failed", ErrorCode.AUTHENTICATION, HttpStatus.UNAUTHORIZED));
- mapper.writeValue(response.getWriter(), ErrorResponse.of(e.getMessage(), ErrorCode.AUTHENTICATION, HttpStatus.UNAUTHORIZED));
}
}
--
Gitblit v1.8.0