From fe7f7997a8d3ff32881e018d6c9d5031d4a1b697 Mon Sep 17 00:00:00 2001
From: Yutousama <583819556@qq.com>
Date: Sun, 10 Jul 2022 14:56:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BE=9D=E8=B5=96=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B7=A8=E5=9F=9F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                             | 10 +++++-----
 src/main/java/com/yutou/tools/nas/NasManager.java   |  2 +-
 src/main/java/com/yutou/tools/utils/CorsConfig.java |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8c32008..7d64ed3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.4.RELEASE</version>
+        <version>2.7.1</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.yutou</groupId>
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-            <version>2.7.0</version>
+            <version>2.7.1</version>
             <scope>compile</scope>
         </dependency>
 
@@ -56,11 +56,11 @@
             <artifactId>jedis</artifactId>
             <version>4.2.3</version>
         </dependency>
-        <dependency>
+      <!--  <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-redis</artifactId>
-            <version>2.7.0</version>
-        </dependency>
+            <version>2.7.1</version>
+        </dependency>-->
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
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)
                 //设置允许的方法