edge游览器兼容问题，大客流记录接口和图片放行url

ljq
1 parent 0109100b
Showing 6 changed files with 63 additions and 3 deletions
src/main/java/com/bsth/common/Constants.java
src/main/java/com/bsth/data/zndd/OutEntrance.java
src/main/java/com/bsth/filter/BaseFilter.java
src/main/java/com/bsth/security/WebSecurityConfig.java
src/main/java/com/bsth/security/filter/LoginInterceptor.java
src/main/java/com/bsth/util/DateUtils.java
@@ -48,6 +48,8 @@ public class Constants {
 	public static final String OUT_URL = "/out/**";
 	public static final String DIFYINTER_URL = "/difyinter/**";
 	public static final String NOTICE_URL = "/notice/**";
+
+	public static final String PROFILE = "/profile/**";
 	/**
 	 * 解除调度指令和班次的外键约束
 	 */
@@ -13,6 +13,7 @@ import com.bsth.entity.zndd.StationSignsLogger;
 import com.bsth.entity.zndd.znddStatus;
 import com.bsth.repository.zndd.ZnddStatusRepository;
 import com.bsth.service.DKLInfoService;
+import com.bsth.util.DateUtils;
 import com.bsth.util.HttpClientUtils;
 import com.bsth.util.SignUtils;
 import com.bsth.websocket.handler.SendUtils;
@@ -367,7 +368,22 @@ public class OutEntrance {
         return rtn;
     }
+    @RequestMapping(value="/dklinfoList",method = RequestMethod.GET)
+    public Map dklinfoList(@RequestBody Map nmap){
+        Map m = new HashMap();
+        Map map = new HashMap();
+        String date = nmap.get("date").toString();
+        if(!SignUtils.validation(Long.parseLong(nmap.get("timestamp").toString()),nmap.get("sign").toString())){
+            map.put("status", "验证失败");
+            return map;
+        }
+        m.put("createDate_ge",date);
+        m.put("createDate_le", DateUtils.yit_date(date));
+        map.put("status",ResponseCode.SUCCESS);
+        map.put("date",(List<DKLInfo>) dklInfoService.list(m));
+        return map;
+    }
     /**
@@ -20,7 +20,7 @@ public abstract class BaseFilter implements Filter {
 			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.LOGIN, Constants.LOGIN_FAILURE,
 			Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.XD_REAL_GPS, Constants.UP_RFID_URL,
 			Constants.STATION_AND_SECTION_COUNT, Constants.ACTUATOR_MANAGEMENT_HEALTH, Constants.VEHICLE_DATA_SYNC_URL,
-			Constants.FILE_AUTH,Constants.OUT_URL,Constants.NOTICE_URL,Constants.DIFYINTER_URL};
+			Constants.FILE_AUTH,Constants.OUT_URL,Constants.NOTICE_URL,Constants.DIFYINTER_URL,Constants.PROFILE};
 	@Override
 	public void destroy() {
@@ -38,7 +38,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
     public void configure(WebSecurity web) throws Exception {
         // 白名单
         web.ignoring().antMatchers(Constants.LOGIN_PAGE, Constants.LOGIN, Constants.ORIGINAL_LOGIN_PAGE, Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.CAPTCHA,
-                Constants.SERVICE_INTERFACE, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES,
+                Constants.PROFILE,Constants.SERVICE_INTERFACE, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES,
                 Constants.UP_RFID_URL, Constants.STATION_AND_SECTION_COUNT, Constants.FILE_AUTH,Constants.OUT_URL,Constants.NOTICE_URL,Constants.DIFYINTER_URL);
     }
@@ -70,6 +70,10 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                 .expiredUrl(Constants.LOGIN_PAGE + "?error=true")
                 .maxSessionsPreventsLogin(false)//让之前的登录过期
                 .sessionRegistry(sessionRegistry());
+        //edge游览器地图和轨迹播放不行的问题
+        http.headers().contentSecurityPolicy(
+                "script-src 'unsafe-inline' 'unsafe-eval' http: https:; worker-src blob:;"
+        );
         http.addFilterBefore(new LoginInterceptor(), FilterSecurityInterceptor.class);
         http.addFilter(filterSecurityInterceptor());
@@ -35,7 +35,8 @@ public class LoginInterceptor implements Filter {
 	private String[] whiteListURLs = { Constants.LOGIN_PAGE,Constants.CAPTCHA, Constants.ORIGINAL_LOGIN_PAGE, Constants.SERVICE_INTERFACE,
 			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.LOGIN,
 			Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.UP_RFID_URL,
-			Constants.STATION_AND_SECTION_COUNT, Constants.VEHICLE_DATA_SYNC_URL, Constants.FILE_AUTH ,Constants.OUT_URL,Constants.NOTICE_URL,Constants.DIFYINTER_URL};
+			Constants.STATION_AND_SECTION_COUNT, Constants.VEHICLE_DATA_SYNC_URL, Constants.FILE_AUTH ,Constants.OUT_URL,
+			Constants.NOTICE_URL,Constants.DIFYINTER_URL,Constants.PROFILE};
 	@Override
@@ -170,4 +170,41 @@ public class DateUtils {
 		}
 		return rq;
 	}
+
+	//后一天
+	public static String yit_date(String dateStr) {
+
+		// 创建SimpleDateFormat对象，指定日期格式
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+
+		try {
+			// 解析日期字符串为Date对象
+			Date dateObj = sdf.parse(dateStr);
+
+			// 创建Calendar对象，并将Date对象设置为时间
+			Calendar calendar = Calendar.getInstance();
+			calendar.setTime(dateObj);
+
+			// 计算下一天的日期
+			calendar.add(Calendar.DAY_OF_MONTH, 1);
+
+			// 获取下一天的Date对象
+			Date nextDayDate = calendar.getTime();
+
+			// 将下一天的Date对象格式化为字符串
+			String nextDayStr = sdf.format(nextDayDate);
+
+			// 输出结果
+			System.out.println("给定日期: " + dateStr);
+			System.out.println("下一天日期: " + nextDayStr);
+
+			return nextDayStr;
+		} catch (ParseException e) {
+			// 解析日期字符串时发生异常
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+
 }