Merge branch 'fix/调整获取认证token顺序' into 'develop'

Merge of fix/[用户认证]调整获取认证token顺序 to develop

See merge request o2oa/o2oa!214

o2server/x_base_core_project/src/main/java/com/x/base/core/project/http/HttpToken.java

@@ -141,9 +141,6 @@ public class HttpToken {
 	public String getToken(HttpServletRequest request) throws Exception {
 		String token = null;
 		token = URLTools.getQueryStringParameter(request.getQueryString(), X_Token);
-		if (StringUtils.isEmpty(token)) {
-			token = request.getHeader(X_Token);
-		}
 		if (StringUtils.isEmpty(token)) {
 			if (null != request.getCookies()) {
 				for (Cookie c : request.getCookies()) {
@@ -154,6 +151,9 @@ public class HttpToken {
 				}
 			}
 		}
+		if (StringUtils.isEmpty(token)) {
+			token = request.getHeader(X_Token);
+		}
 		if (StringUtils.isEmpty(token)) {
 			token = request.getHeader(X_Authorization);
 		}