optimize server

王彬
1 parent 8a86f174
Showing 4 changed files with 78 additions and 12 deletions Show diff stats
src/main/java/com/taover/bazhuayun/analysis/web/module/heartbeat/HeartbeatManagerImpl.java
src/main/java/com/taover/bazhuayun/analysis/web/module/heartbeat/bean/ServerInstance.java
src/main/java/com/taover/bazhuayun/analysis/web/permission/HttpHeaderFilter.java
src/main/java/com/taover/bazhuayun/analysis/web/permission/HttpHeaderFilterConfig.java
@@ -142,7 +142,7 @@ public class HeartbeatManagerImpl implements HeartbeatManager {
 	private void createLog(ServerInstance item) {
 		try {
 			AnalysisHeartbeatLogEntity log = new AnalysisHeartbeatLogEntity();
-			log.setServerUrl(item.getLatestUrlWithParam());
+			log.setServerUrl(item.getInstance().getUrl());
 			log.setInstanceCode(item.getIdentity());
 			if(item.getLatestServerResponse() == null) {
 				log.setResponse("null");			
@@ -281,6 +281,7 @@ public class HeartbeatManagerImpl implements HeartbeatManager {
 		}
 		this.analysisHeartbeatInstanceRepository.updateEntityById(form.getSQLUpdateList(), instance.getId(), null);
 		try {
+			instance = this.analysisHeartbeatInstanceRepository.findEntityByID(instance.getId(), null);
 			if(AnalysisHeartbeatInstanceRepository.STATUS_DISABLE == instance.getStatus().intValue()) {
 				this.unregistryRuntimeInstance(instance);				
 			}else {
@@ -15,16 +15,12 @@ public class ServerInstance implements Instance {
 	private int errorServerResponseCount = 0;
 	private boolean detectNewErrorServerResponse;
 	private boolean isSendNewHeartbeat;
-	private String latestUrlWithParam;
  
 	public ServerInstance(AnalysisHeartbeatInstanceEntity instance) throws Exception {
 		super();
 		if(!instance.getUrl().toLowerCase().startsWith("http")) {
 			throw new Exception("目前只支持http协议的URL");
 		}
-		if(instance.getFixRateSec() < 60) {
-			throw new Exception("固定时间间隔不允许小于60s");
-		}
 		this.instance = instance;
 	}
  
@@ -43,10 +39,9 @@ public class ServerInstance implements Instance {
 		try {
 			this.latestRequestUnixtime = this.serverUnixtimeBaseline;
 			this.isSendNewHeartbeat = true;
-			this.latestUrlWithParam = this.instance.getUrl() + this.getUrlParams();
-			UtilLog.infoForMessage("向code["+this.getIdentity()+"],url["+this.latestUrlWithParam+"]发送心跳请求", ServerInstance.class);
+			UtilLog.infoForMessage("向code["+this.getIdentity()+"],url["+this.instance.getUrl()+"]发送心跳请求", ServerInstance.class);
  
-			this.latestServerResponse = ServerResponse.createByJSONString(UtilHttpByOkHttp.sendGet(this.latestUrlWithParam, null, this.instance.getMaxWaitSec()));
+			this.latestServerResponse = ServerResponse.createByJSONString(UtilHttpByOkHttp.sendGet(this.instance.getUrl(), null, this.instance.getMaxWaitSec()));
 			if(this.latestServerResponse.isCodeOk()) {
 				this.errorServerResponseCount = 0;
 			}
@@ -114,8 +109,4 @@ public class ServerInstance implements Instance {
 	public boolean isSendNewHeartbeat() {
 		return isSendNewHeartbeat;
 	}
-
-	public String getLatestUrlWithParam() {
-		return latestUrlWithParam;
-	}
 }
@@ -0,0 +1,48 @@
+package com.taover.bazhuayun.analysis.web.permission;
+
+import java.io.IOException;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.taover.util.UtilLog;
+
+public class HttpHeaderFilter implements Filter{	
+	@Override
+	public void init(FilterConfig filterConfig) throws ServletException {
+		UtilLog.infoForMessage("HttpHeaderFilter:init", this.getClass());
+	}
+
+	@Override
+	public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
+			throws IOException, ServletException {
+		HttpServletResponse httpResponse = (HttpServletResponse) response;
+		HttpServletRequest httpRequest = (HttpServletRequest) request;
+		
+		httpResponse.setHeader("Access-Control-Allow-Origin", httpRequest.getHeader("Origin"));
+		httpResponse.setHeader("Access-Control-Allow-Credentials", "true");
+		httpResponse.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE, PUT, HEAD");
+		httpResponse.setHeader("Access-Control-Allow-Headers", "Authorization,content-type");
+		httpResponse.setHeader("Access-Control-Expose-Headers", "");
+		httpResponse.setHeader("Access-Control-Max-Age", "1728000");
+		httpResponse.setHeader("Vary", "Origin");
+		httpResponse.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
+				
+		//跨域prelight options请求直接返回
+		if("options".equals(httpRequest.getMethod().toLowerCase())){
+			return;
+		}
+		chain.doFilter(httpRequest, httpResponse);
+	}
+	
+	@Override
+	public void destroy() {
+		UtilLog.infoForMessage("HttpHeaderFilter:destory", this.getClass());
+	}
+}
@@ -0,0 +1,26 @@
+package com.taover.bazhuayun.analysis.web.permission;
+
+import java.util.EnumSet;
+
+import javax.servlet.DispatcherType;
+import javax.servlet.Filter;
+
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class HttpHeaderFilterConfig {
+	public static final int ORDER_HTTP_HEADER_FILTER = 0;
+	
+	@Bean
+	public FilterRegistrationBean<Filter> mySsTokenFilter() {
+		FilterRegistrationBean<Filter> registration = new FilterRegistrationBean<Filter>();
+		registration.setFilter(new HttpHeaderFilter());
+		registration.setEnabled(true);
+		registration.setDispatcherTypes(EnumSet.allOf(DispatcherType.class));
+		registration.setOrder(ORDER_HTTP_HEADER_FILTER);
+		return registration;
+	}
+}
+
...	...	@@ -142,7 +142,7 @@ public class HeartbeatManagerImpl implements HeartbeatManager {
142	142	private void createLog(ServerInstance item) {
143	143	try {
144	144	AnalysisHeartbeatLogEntity log = new AnalysisHeartbeatLogEntity();
145		- log.setServerUrl(item.getLatestUrlWithParam());
	145	+ log.setServerUrl(item.getInstance().getUrl());
146	146	log.setInstanceCode(item.getIdentity());
147	147	if(item.getLatestServerResponse() == null) {
148	148	log.setResponse("null");
...	...	@@ -281,6 +281,7 @@ public class HeartbeatManagerImpl implements HeartbeatManager {
281	281	}
282	282	this.analysisHeartbeatInstanceRepository.updateEntityById(form.getSQLUpdateList(), instance.getId(), null);
283	283	try {
	284	+ instance = this.analysisHeartbeatInstanceRepository.findEntityByID(instance.getId(), null);
284	285	if(AnalysisHeartbeatInstanceRepository.STATUS_DISABLE == instance.getStatus().intValue()) {
285	286	this.unregistryRuntimeInstance(instance);
286	287	}else {
...	...
...	...	@@ -15,16 +15,12 @@ public class ServerInstance implements Instance {
15	15	private int errorServerResponseCount = 0;
16	16	private boolean detectNewErrorServerResponse;
17	17	private boolean isSendNewHeartbeat;
18		- private String latestUrlWithParam;
19	18
20	19	public ServerInstance(AnalysisHeartbeatInstanceEntity instance) throws Exception {
21	20	super();
22	21	if(!instance.getUrl().toLowerCase().startsWith("http")) {
23	22	throw new Exception("目前只支持http协议的URL");
24	23	}
25		- if(instance.getFixRateSec() < 60) {
26		- throw new Exception("固定时间间隔不允许小于60s");
27		- }
28	24	this.instance = instance;
29	25	}
30	26
...	...	@@ -43,10 +39,9 @@ public class ServerInstance implements Instance {
43	39	try {
44	40	this.latestRequestUnixtime = this.serverUnixtimeBaseline;
45	41	this.isSendNewHeartbeat = true;
46		- this.latestUrlWithParam = this.instance.getUrl() + this.getUrlParams();
47		- UtilLog.infoForMessage("向code["+this.getIdentity()+"],url["+this.latestUrlWithParam+"]发送心跳请求", ServerInstance.class);
	42	+ UtilLog.infoForMessage("向code["+this.getIdentity()+"],url["+this.instance.getUrl()+"]发送心跳请求", ServerInstance.class);
48	43
49		- this.latestServerResponse = ServerResponse.createByJSONString(UtilHttpByOkHttp.sendGet(this.latestUrlWithParam, null, this.instance.getMaxWaitSec()));
	44	+ this.latestServerResponse = ServerResponse.createByJSONString(UtilHttpByOkHttp.sendGet(this.instance.getUrl(), null, this.instance.getMaxWaitSec()));
50	45	if(this.latestServerResponse.isCodeOk()) {
51	46	this.errorServerResponseCount = 0;
52	47	}
...	...	@@ -114,8 +109,4 @@ public class ServerInstance implements Instance {
114	109	public boolean isSendNewHeartbeat() {
115	110	return isSendNewHeartbeat;
116	111	}
117		-
118		- public String getLatestUrlWithParam() {
119		- return latestUrlWithParam;
120		- }
121	112	}
...	...
...	...	@@ -0,0 +1,48 @@
	1	+package com.taover.bazhuayun.analysis.web.permission;
	2	+
	3	+import java.io.IOException;
	4	+
	5	+import javax.servlet.Filter;
	6	+import javax.servlet.FilterChain;
	7	+import javax.servlet.FilterConfig;
	8	+import javax.servlet.ServletException;
	9	+import javax.servlet.ServletRequest;
	10	+import javax.servlet.ServletResponse;
	11	+import javax.servlet.http.HttpServletRequest;
	12	+import javax.servlet.http.HttpServletResponse;
	13	+
	14	+import com.taover.util.UtilLog;
	15	+
	16	+public class HttpHeaderFilter implements Filter{
	17	+ @Override
	18	+ public void init(FilterConfig filterConfig) throws ServletException {
	19	+ UtilLog.infoForMessage("HttpHeaderFilter:init", this.getClass());
	20	+ }
	21	+
	22	+ @Override
	23	+ public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
	24	+ throws IOException, ServletException {
	25	+ HttpServletResponse httpResponse = (HttpServletResponse) response;
	26	+ HttpServletRequest httpRequest = (HttpServletRequest) request;
	27	+
	28	+ httpResponse.setHeader("Access-Control-Allow-Origin", httpRequest.getHeader("Origin"));
	29	+ httpResponse.setHeader("Access-Control-Allow-Credentials", "true");
	30	+ httpResponse.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE, PUT, HEAD");
	31	+ httpResponse.setHeader("Access-Control-Allow-Headers", "Authorization,content-type");
	32	+ httpResponse.setHeader("Access-Control-Expose-Headers", "");
	33	+ httpResponse.setHeader("Access-Control-Max-Age", "1728000");
	34	+ httpResponse.setHeader("Vary", "Origin");
	35	+ httpResponse.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
	36	+
	37	+ //跨域prelight options请求直接返回
	38	+ if("options".equals(httpRequest.getMethod().toLowerCase())){
	39	+ return;
	40	+ }
	41	+ chain.doFilter(httpRequest, httpResponse);
	42	+ }
	43	+
	44	+ @Override
	45	+ public void destroy() {
	46	+ UtilLog.infoForMessage("HttpHeaderFilter:destory", this.getClass());
	47	+ }
	48	+}
...	...
...	...	@@ -0,0 +1,26 @@
	1	+package com.taover.bazhuayun.analysis.web.permission;
	2	+
	3	+import java.util.EnumSet;
	4	+
	5	+import javax.servlet.DispatcherType;
	6	+import javax.servlet.Filter;
	7	+
	8	+import org.springframework.boot.web.servlet.FilterRegistrationBean;
	9	+import org.springframework.context.annotation.Bean;
	10	+import org.springframework.context.annotation.Configuration;
	11	+
	12	+@Configuration
	13	+public class HttpHeaderFilterConfig {
	14	+ public static final int ORDER_HTTP_HEADER_FILTER = 0;
	15	+
	16	+ @Bean
	17	+ public FilterRegistrationBean<Filter> mySsTokenFilter() {
	18	+ FilterRegistrationBean<Filter> registration = new FilterRegistrationBean<Filter>();
	19	+ registration.setFilter(new HttpHeaderFilter());
	20	+ registration.setEnabled(true);
	21	+ registration.setDispatcherTypes(EnumSet.allOf(DispatcherType.class));
	22	+ registration.setOrder(ORDER_HTTP_HEADER_FILTER);
	23	+ return registration;
	24	+ }
	25	+}
	26	+
...	...