From dd028e18a12ad9ae7c43ed09b15ddd6bde1a43e9 Mon Sep 17 00:00:00 2001
From: guyue <1721849008@qq.com>
Date: 星期三, 03 九月 2025 11:27:50 +0800
Subject: [PATCH] 采集中状态修改提前,统计数据合并

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

diff --git a/src/main/java/com/linghu/controller/AuthController.java b/src/main/java/com/linghu/controller/AuthController.java
index aa7f072..430a340 100644
--- a/src/main/java/com/linghu/controller/AuthController.java
+++ b/src/main/java/com/linghu/controller/AuthController.java
@@ -1,73 +1,38 @@
 package com.linghu.controller;
 
-import java.util.HashMap;
-import java.util.Map;
 
+import com.linghu.model.common.ResponseResult;
+import com.linghu.model.dto.TokenRequest;
+import com.linghu.service.AuthService;
 import com.linghu.utils.OpenCryptUtil;
-import org.springframework.beans.factory.annotation.Value;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
-import com.linghu.model.entity.User;
-import com.linghu.utils.JwtUtils;
+
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+
+import javax.validation.Valid;
 
 @Api(value = "认证接口", tags = "认证管理")
 @RestController
 @RequestMapping("/auth")
 public class AuthController {
-    @Value("${jwt.secret}")
-    private String secretKey;
 
-    @PostMapping("/login")
-    @ApiOperation(value = "外部登录")
-    public ResponseEntity<?> externalLogin(
-            @RequestBody User user) {
+    @Autowired
+    private AuthService authService;
 
-        // 生成JWT令牌
-        JwtUtils jwtUtils = new JwtUtils(secretKey, 3600);
-        String token = jwtUtils.generateToken(user);
-
-        Map<String, String> response = new HashMap<>();
-        response.put("token", token);
-        // 返回JWT令牌
-        return ResponseEntity.ok(response);
-    }
-
-    // 获取用户信息
-    @PostMapping("/getUserInfo")
-    @ApiOperation(value = "获取用户信息")
-    public ResponseEntity<?> getUserInfo(@RequestParam String token) {
-        // 解析JWT令牌,获取用户信息
-        JwtUtils jwtUtils = new JwtUtils(secretKey, 3600);
-        User user = jwtUtils.parseToken(token);
-        // 返回用户信息
-        return ResponseEntity.ok(user);
-    }
     //open-crypt解析token
-    @GetMapping("/parseToken")
+    @PostMapping("/parseToken")
     @ApiOperation(value = "解析token")
-    public ResponseEntity<?> parseToken(@RequestParam String token) {
-        if (token == null || "".equals(token)){
-            return ResponseEntity.ok("token为空");
-        }
-        // 解析token,获取用户信息
-        OpenCryptUtil openCryptUtil = new OpenCryptUtil();
-        String decrypt = openCryptUtil.decrypt(token);
-        System.out.println(decrypt);
-        System.out.println("----------------");
-
-        // 返回用户信息
-        return ResponseEntity.ok(decrypt);
+    public ResponseResult<?> parseToken(@Valid @RequestBody TokenRequest tokenRequest) {
+        return authService.parseTokenAuth(tokenRequest);
     }
-
     @GetMapping("/getToken")
     @ApiOperation(value = "获取token")
-    public ResponseEntity<?> getToken(@RequestBody User user) {
-        // 创建用户对
-
+    public ResponseEntity<?> getToken(@RequestParam(value = "user" ) String user) {
         // 创建JwtUtils对象,并生成JWT令牌
         OpenCryptUtil openCryptUtil = new OpenCryptUtil();
         String decrypt = openCryptUtil.encrypt(user);

--
Gitblit v1.7.1