From ce950dea4aef933a12e78e4fe1f535ba9a83c3df Mon Sep 17 00:00:00 2001
From: leesam <leesam@leesam.cn>
Date: 星期三, 10 四月 2024 22:18:40 +0800
Subject: [PATCH] Merge branch 'refs/heads/master' into develop-add-api-key

---
 src/main/java/com/genersoft/iot/vmp/web/gb28181/AuthController.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/web/gb28181/AuthController.java b/src/main/java/com/genersoft/iot/vmp/web/gb28181/AuthController.java
index abefa42..4e0b056 100644
--- a/src/main/java/com/genersoft/iot/vmp/web/gb28181/AuthController.java
+++ b/src/main/java/com/genersoft/iot/vmp/web/gb28181/AuthController.java
@@ -5,7 +5,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-@CrossOrigin
+
 @RestController
 @RequestMapping(value = "/auth")
 public class AuthController {
@@ -13,7 +13,7 @@
     @Autowired
     private IUserService userService;
 
-    @RequestMapping("/login")
+    @GetMapping("/login")
     public String devices(String name, String passwd){
         User user = userService.getUser(name, passwd);
         if (user != null) {

--
Gitblit v1.8.0