Merge branch 'dev_group_code' into dev_temp

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpContextUtils.java

@@ -69,6 +69,11 @@ public class HttpContextUtils {
 
 	public static String getRequestServerNameAndPort() {
 		HttpServletRequest request = getHttpServletRequest();
-		return String.format("%s://%s:%s", request.getScheme(), request.getServerName(), request.getServerPort());
+		//X-Forwarded-Scheme是nginx中添加的一个header，用于获取真实的$scheme
+		String scheme = request.getHeader("X-Forwarded-Scheme");
+		if (StringUtils.isBlank(scheme)) {
+			scheme = "http";
+		}
+		return String.format("%s://%s:%s", scheme, request.getServerName(), request.getServerPort());
 	}
 }