Merge branch 'dev-activity-faw' of...

Merge branch 'dev-activity-faw' of http://gitlab.afanticar.com:13140/java-ms/afanti-open-api into uat

src/main/java/com/afanticar/afantiopenapi/config/TokenInterceptor.java

@@ -36,12 +36,21 @@ public class TokenInterceptor implements HandlerInterceptor {
         }
         String token = request.getHeader("authorization");
         if (StrUtil.isNotBlank(token)) {
-            request.setAttribute("clientId", JWTUtils.getClientId(token));
+            try{
+                String clientId = JWTUtils.getClientId(token);
+                request.setAttribute("clientId", clientId);
+            }catch (Exception e){
+                response.setCharacterEncoding("UTF-8");
+                response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+                response.setContentType("application/json");
+                response.getWriter().append(JSONObject.toJSONString(BaseController.error("401", "认证失败,无效的token")));
+                return false;
+            }
         } else {
             response.setCharacterEncoding("UTF-8");
             response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
             response.setContentType("application/json");
-            response.getWriter().append(JSONObject.toJSONString(BaseController.error("401", "认证失败")));
+            response.getWriter().append(JSONObject.toJSONString(BaseController.error("401", "认证失败,无效的token")));
             return false;
         }
         return true;