修改mobileapi认证
diff --git a/oauth/src/main/kotlin/com/supwisdom/oauth/oauth.kt b/oauth/src/main/kotlin/com/supwisdom/oauth/oauth.kt
index 79acca5..60255ad 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 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 c6660ad..8993b29 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 0f66df7..882695e 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 @@
?.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 b929bea..bd49910 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 @@
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 @@
?.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 154dee4..b3e1fac 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 @@
}
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)) {