Merge remote-tracking branch 'origin/master' into zhc

data-center-business-controller/src/main/java/com/techsor/datacenter/business/configurator/CrosXssFilter.java

@@ -53,7 +53,7 @@ public class CrosXssFilter implements Filter {
                     String requestUri = httpRequest.getRequestURI();
                     // 当 URL 不包含 /common/ 时，校验 Referer
 //                    if (!requestUri.contains("/common/") && !requestUri.contains("swagger")) {
-                    if (!requestUri.contains("/swagger/")) {  
+                    if (!requestUri.contains("/swagger")) {
                         String referer = httpRequest.getHeader("Referer");
                         if (StringUtils.isNotBlank(referer)){
                             if(!"*".equals(accessControlAllowOrigin)){

data-center-business-controller/src/main/resources/db/migration/V63__dashboard_alert_status.sql

@@ -0,0 +1,5 @@
+ALTER TABLE device_rawdata_realtime ADD (
+    `dashboard_status` varchar(255) DEFAULT NULL
+);
+
+update device_rawdata_realtime set dashboard_status = `status`;