From e2446ab51f8a9c1f0f35d6572d9d3086f8e541d5 Mon Sep 17 00:00:00 2001
From: qiaowei <jov123@163.com>
Date: Wed, 7 Aug 2019 16:36:42 +0800
Subject: [PATCH] =?utf8?q?=E4=BF=AE=E6=94=B9mobileapi=E8=AE=A4=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../main/kotlin/com/supwisdom/oauth/oauth.kt   |  1 -
 oauth/src/main/resources/templates/login.html  |  2 ++
 .../supwisdom/dlpay/mobile/AuthLoginHandler.kt |  1 +
 .../com/supwisdom/dlpay/mobile/MobileApi.kt    |  6 +++++-
 .../kotlin/com/supwisdom/dlpay/security.kt     | 18 +++++++++++++++++-
 5 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/oauth/src/main/kotlin/com/supwisdom/oauth/oauth.kt b/oauth/src/main/kotlin/com/supwisdom/oauth/oauth.kt
index 79acca55..60255ad1 100644
--- a/oauth/src/main/kotlin/com/supwisdom/oauth/oauth.kt
+++ b/oauth/src/main/kotlin/com/supwisdom/oauth/oauth.kt
@@ -67,7 +67,6 @@ class WebMainController {
 }
 
 
-
 class OAuthDetailService : ClientDetailsService {
     @Autowired
     private lateinit var apiClientDao: ApiClientDao
diff --git a/oauth/src/main/resources/templates/login.html b/oauth/src/main/resources/templates/login.html
index c6660ad8..8993b297 100644
--- a/oauth/src/main/resources/templates/login.html
+++ b/oauth/src/main/resources/templates/login.html
@@ -6,6 +6,8 @@
     <meta name="_csrf" th:content="${_csrf.token}"/>
     <!-- default header name is X-CSRF-TOKEN -->
     <meta name="_csrf_header" th:content="${_csrf.headerName}"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1,user-scalable=no">
     <link rel="stylesheet" type="text/css" th:href="@{/css/weui.min.css}"/>
     <link rel="stylesheet" type="text/css" th:href="@{/css/jquery-weui.css}"/>
 </head>
diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/AuthLoginHandler.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/AuthLoginHandler.kt
index 0f66df74..882695e0 100644
--- a/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/AuthLoginHandler.kt
+++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/AuthLoginHandler.kt
@@ -97,6 +97,7 @@ class AuthLoginSuccessHandler : SimpleUrlAuthenticationSuccessHandler() {
                     ?.put("now",System.currentTimeMillis())
                     ?.put("tenantid", "mobile")
                     ?.put("name", name)
+                    ?.put("uid", user.uid)
                     ?.put("phone", StringUtil.phoneReplace(user.phone))
                     ?.put("paypwdset",payseted)
                     ?.put("signed", signed)
diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/MobileApi.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/MobileApi.kt
index b929beae..bd499105 100644
--- a/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/MobileApi.kt
+++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/MobileApi.kt
@@ -274,7 +274,9 @@ class ApiV1 {
         val p = SecurityContextHolder.getContext().authentication
         mobileApiService.findUserById(p.name)
                 ?: return JsonResult.error("用户不存在，请注册")
-        return JsonResult.ok("OK").put("now", System.currentTimeMillis())!!
+        return JsonResult.ok("OK").put("now", System.currentTimeMillis())
+                ?.put("version","1")
+                ?.put("minversion","1")!!
     }
 
     /**
@@ -575,6 +577,8 @@ class ApiV1 {
                 ?.put("name", name)
                 ?.put("needrebind", needrebind)
                 ?.put("signed", signed)
+                ?.put("version","1")
+                ?.put("minversion","1")
                 ?.put("userid", if (user.userid.isNullOrEmpty()) "" else user.userid)!!.put("t", t)!!
     }
 
diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/security.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/security.kt
index 154dee4d..b3e1fac0 100644
--- a/payapi/src/main/kotlin/com/supwisdom/dlpay/security.kt
+++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/security.kt
@@ -149,7 +149,23 @@ class MobileSecurityFilter : OncePerRequestFilter() {
     }
 
     override fun doFilterInternal(request: HttpServletRequest, response: HttpServletResponse, filterChain: FilterChain) {
-
+        var context: String? = request.contextPath
+        if (context == null || "" == context.trim { it <= ' ' }) {
+            context = "/"
+        }
+        if (request.requestURI.isEmpty()) {
+            filterChain.doFilter(request, response)
+            return
+        }
+        var url = request.requestURI
+        if ("/" != context) {
+            url = url.replace(context, "")
+        }
+        logger.info(url)
+        if (!url.startsWith("/mobileapi/v1/")) {
+            filterChain.doFilter(request, response)
+            return
+        }
         request.getHeader(jwtConfig.header)?.let { authHeader ->
             try {
                 val jwt = if (authHeader.startsWith(jwtConfig.tokenHeader)) {
-- 
2.17.1