diff --git a/pom.xml b/pom.xml index 8c32008..7d64ed3 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.2.4.RELEASE + 2.7.1 com.yutou @@ -47,7 +47,7 @@ org.springframework.boot spring-boot-starter-web - 2.7.0 + 2.7.1 compile @@ -56,11 +56,11 @@ jedis 4.2.3 - + mysql mysql-connector-java diff --git a/src/main/java/com/yutou/tools/nas/NasManager.java b/src/main/java/com/yutou/tools/nas/NasManager.java index c81fbe4..da53799 100644 --- a/src/main/java/com/yutou/tools/nas/NasManager.java +++ b/src/main/java/com/yutou/tools/nas/NasManager.java @@ -303,7 +303,7 @@ public class NasManager { e.printStackTrace(); } } - @RequestMapping("/nas/door/{*.ts}") + @RequestMapping("/nas/door/*.ts") public void getDoorCCTVOfTs(HttpServletResponse response, HttpServletRequest request, @PathVariable("*.ts") String name){ try { if(!name.endsWith(".ts")){ diff --git a/src/main/java/com/yutou/tools/utils/CorsConfig.java b/src/main/java/com/yutou/tools/utils/CorsConfig.java index 6d93f51..04f0e79 100644 --- a/src/main/java/com/yutou/tools/utils/CorsConfig.java +++ b/src/main/java/com/yutou/tools/utils/CorsConfig.java @@ -11,7 +11,7 @@ public class CorsConfig implements WebMvcConfigurer { //设置允许跨域的路径 registry.addMapping("/**") //设置允许跨域请求的域名 - .allowedOrigins("*") + .allowedOrigins("Access-Control-Allow-Origin") //是否允许证书 不再默认开启 .allowCredentials(true) //设置允许的方法