From ce97969fce786a9a1dc0bc18acad6261bee73a21 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期二, 02 一月 2024 00:39:12 +0800
Subject: [PATCH] 导出功能

---
 user-server/src/main/java/com/yuanchu/mom/controller/UserController.java |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java b/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
index c9a93bc..210b453 100644
--- a/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
+++ b/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
@@ -1,20 +1,25 @@
 package com.yuanchu.mom.controller;
 
-import cn.hutool.json.JSON;
+import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.annotation.ValueAuth;
 import com.yuanchu.mom.common.PrintChina;
 import com.yuanchu.mom.dto.UserPageDto;
 import com.yuanchu.mom.pojo.User;
+import com.yuanchu.mom.service.PowerService;
 import com.yuanchu.mom.service.UserService;
 import com.yuanchu.mom.utils.JackSonUtil;
 import com.yuanchu.mom.utils.Jwt;
 import com.yuanchu.mom.utils.RedisUtil;
+import com.yuanchu.mom.utils.ServletUtils;
 import com.yuanchu.mom.vo.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.DigestUtils;
 import org.springframework.validation.annotation.Validated;
@@ -26,16 +31,18 @@
 @RequestMapping("/user")
 @RestController
 @Api(tags = "鐢ㄦ埛妯″潡")
+@AllArgsConstructor
 public class UserController {
 
-    @Autowired
-    UserService userService;
+    private UserService userService;
 
-    @Autowired
+    private PowerService powerService;
+
     private Jwt jwt;
 
     @ApiOperation(value = "鐧诲綍")
     @PostMapping("/enter")
+    @ValueAuth
     public Result login(String account, String password) {
         User user = userService.selectUserByPwd(account, password);
         if (user == null) return Result.fail("鐧诲綍澶辫触");
@@ -43,15 +50,17 @@
         String jwtReToken = jwt.createJwt(user.getName(), user.getId(), 24 * 60);
         RedisUtil.set("" + user.getId(), jwtToken, 60);
         RedisUtil.set(user.getId() + "Re", jwtReToken, 24 * 60);
-        Map<String, String> map = new HashMap<>();
+        Map<String, Object> map = new HashMap<>();
         map.put("token", jwtToken);
         map.put("reToken", jwtReToken);
         map.put("name", user.getName());
+        map.put("power", powerService.selectPowerByRoleId(user.getRoleId()));
         return Result.success("鐧诲綍鎴愬姛", map);
     }
 
     @ApiOperation(value = "token鍒锋柊")
     @PostMapping("/refresh")
+    @ValueAuth
     public Result refresh(String reToken) throws Exception {
         Map<String, String> map = new Jwt().readJWT(reToken);
         Map<String, String> maps = JackSonUtil.unmarshal(map.get("data"), Map.class);
@@ -98,4 +107,5 @@
         else user.setPassword(DigestUtils.md5DigestAsHex(user.getPassword().getBytes()));
         return Result.success(userService.addUser(user));
     }
+
 }

--
Gitblit v1.9.3