Browse Source

登录未获取验证码提示修改

wangmh 7 years ago
parent
commit
b558082573

+ 1 - 0
sso-server/src/main/java/com/uas/sso/controller/LoginController.java

@@ -704,6 +704,7 @@ public class LoginController extends BaseController {
         }
 
         // 校验token
+        Assert.hasText(token, "请先获取验证码");
         Token existToken = tokenService.findOne(token);
         if (existToken == null || existToken.isExpired()) {
             return error("验证码已过期,请重新获取");

+ 1 - 1
sso-server/src/main/java/com/uas/sso/web/advice/ExceptionHandlerAdvice.java

@@ -39,7 +39,7 @@ public class ExceptionHandlerAdvice {
 	 * @return
 	 */
 	@ExceptionHandler({VisibleError.class, IllegalArgumentException.class})
-	public ResponseEntity<ModelMap> handleVisibleError(VisibleError ex) {
+	public ResponseEntity<ModelMap> handleVisibleError(RuntimeException ex) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		return new ResponseEntity<ModelMap>(error(ex.getMessage()), headers, HttpStatus.OK);