From b7ff8446a58d59e7df8a588104c231c7af7d8573 Mon Sep 17 00:00:00 2001
From: guyue <1721849008@qq.com>
Date: 星期五, 11 七月 2025 14:31:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/linghu/controller/AuthController.java |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/linghu/controller/AuthController.java b/src/main/java/com/linghu/controller/AuthController.java
index 57547b5..6ff8df4 100644
--- a/src/main/java/com/linghu/controller/AuthController.java
+++ b/src/main/java/com/linghu/controller/AuthController.java
@@ -63,15 +63,15 @@
         return ResponseEntity.ok(decrypt);
     }
 
-//    @GetMapping("/getToken")
-//    @ApiOperation(value = "获取token")
-//    public ResponseEntity<?> getToken(@RequestBody User user) {
-//        // 创建用户对
-//
-//        // 创建JwtUtils对象,并生成JWT令牌
-//        OpenCryptUtil openCryptUtil = new OpenCryptUtil();
-//        String decrypt = openCryptUtil.encrypt(user);
-//        // 返回JWT令牌
-//        return ResponseEntity.ok(decrypt);
-//    }
+    @GetMapping("/getToken")
+    @ApiOperation(value = "获取token")
+    public ResponseEntity<?> getToken( String user) {
+        // 创建用户对
+
+        // 创建JwtUtils对象,并生成JWT令牌
+        OpenCryptUtil openCryptUtil = new OpenCryptUtil();
+        String decrypt = openCryptUtil.encrypt(user);
+        // 返回JWT令牌
+        return ResponseEntity.ok(decrypt);
+    }
 }
\ No newline at end of file

--
Gitblit v1.7.1