From ae2d62b53182de3b7976186a8566f2ec829fc334 Mon Sep 17 00:00:00 2001
From: qiaowei <jov123@163.com>
Date: Wed, 26 Jun 2019 16:15:14 +0800
Subject: [PATCH] =?utf8?q?=E4=BF=AE=E6=94=B9401=E8=BF=94=E5=9B=9E=E7=8A=B6?=
 =?utf8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../kotlin/com/supwisdom/dlpay/mobile/AuthLoginHandler.kt    | 3 ++-
 src/main/kotlin/com/supwisdom/dlpay/security.kt              | 5 ++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/kotlin/com/supwisdom/dlpay/mobile/AuthLoginHandler.kt b/src/main/kotlin/com/supwisdom/dlpay/mobile/AuthLoginHandler.kt
index d401fa08..6a441fc9 100644
--- a/src/main/kotlin/com/supwisdom/dlpay/mobile/AuthLoginHandler.kt
+++ b/src/main/kotlin/com/supwisdom/dlpay/mobile/AuthLoginHandler.kt
@@ -71,7 +71,8 @@ class AuthLoginSuccessHandler : SimpleUrlAuthenticationSuccessHandler() {
             mobileUserDao.save(user)
             response.status = HttpStatus.OK.value()
             response.contentType = "application/json;charset=UTF-8"
-            response.writer.write(objectMapper.writeValueAsString(JsonResult.ok().put("token", token.jwtToken)))
+            response.writer.write(objectMapper.writeValueAsString(JsonResult.ok().put("token", token.jwtToken)
+                    ?.put("tenantid", "mobile")))
         }else{
             throw UserLoginFailException("登录错误")
         }
diff --git a/src/main/kotlin/com/supwisdom/dlpay/security.kt b/src/main/kotlin/com/supwisdom/dlpay/security.kt
index 7762e9f7..8cf8e9fc 100644
--- a/src/main/kotlin/com/supwisdom/dlpay/security.kt
+++ b/src/main/kotlin/com/supwisdom/dlpay/security.kt
@@ -132,12 +132,11 @@ class ApiJwtAuthenticationFilter : OncePerRequestFilter() {
                     // jwt 过期后返回 401
                     apiJwtRepository.deleteById(e.jwtContext.jwtClaims.jwtId)
                 }
-                response.sendError(HttpStatus.UNAUTHORIZED.value(), e.message)
-                return
+                response.status=HttpStatus.UNAUTHORIZED.value()
             } catch (e: JoseException) {
                 SecurityContextHolder.clearContext()
                 // jwt 失效后返回 401
-                response.sendError(HttpStatus.UNAUTHORIZED.value(), e.message)
+                response.status=HttpStatus.UNAUTHORIZED.value()
                 response.contentType = "application/json;charset=UTF-8"
                 return
             }
-- 
2.17.1