token

.idea/workspace.xml

@@ -4,15 +4,9 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="46b159bd-08ca-42f0-b80f-41d4944a8a29" name="Changes" comment="使用手册模块更新">
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2024_2_22_10_24_[Changes]/shelved.patch" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2024_2_22_10_24__Changes_.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2024_2_26_19_11_[Changes]/shelved.patch" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2024_2_26_19_11__Changes_.xml" beforeDir="false" />
+    <list default="true" id="46b159bd-08ca-42f0-b80f-41d4944a8a29" name="Changes" comment="视频上传修正">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/om/controller/admin/UtilController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/om/controller/admin/UtilController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-dev.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/om/controller/admin/EmployeeController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/om/controller/admin/EmployeeController.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -209,7 +203,7 @@
       <workItem from="1709043200200" duration="1433000" />
       <workItem from="1709105595721" duration="585000" />
       <workItem from="1709597538938" duration="1349000" />
-      <workItem from="1709599670703" duration="2260000" />
+      <workItem from="1709599670703" duration="7522000" />
     </task>
     <task id="LOCAL-00001" summary="管理员登录">
       <option name="closed" value="true" />
@@ -313,7 +307,15 @@
       <option name="project" value="LOCAL" />
       <updated>1709086749430</updated>
     </task>
-    <option name="localTasksCounter" value="14" />
+    <task id="LOCAL-00014" summary="视频上传修正">
+      <option name="closed" value="true" />
+      <created>1709604133381</created>
+      <option name="number" value="00014" />
+      <option name="presentableId" value="LOCAL-00014" />
+      <option name="project" value="LOCAL" />
+      <updated>1709604133381</updated>
+    </task>
+    <option name="localTasksCounter" value="15" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -340,6 +342,7 @@
     <MESSAGE value="用户角色权限更新" />
     <MESSAGE value="refined" />
     <MESSAGE value="使用手册模块更新" />
-    <option name="LAST_COMMIT_MESSAGE" value="使用手册模块更新" />
+    <MESSAGE value="视频上传修正" />
+    <option name="LAST_COMMIT_MESSAGE" value="视频上传修正" />
   </component>
 </project>

src/main/java/com/om/controller/admin/EmployeeController.java

@@ -8,6 +8,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.om.constant.RedisConstant;
 import com.om.entity.dto.EmployeeDto;
 import com.om.entity.dto.LoginDto;
 import com.om.entity.dto.UpdatePassDTO;
@@ -16,6 +17,7 @@ import com.om.service.IDepartmentService;
 import com.om.service.IEmployeeService;
 import com.om.service.IMenuService;
 import com.om.utils.Constants;
+import com.om.utils.JwtUtils;
 import com.om.utils.Result;
 import com.om.utils.TokenUtils;
 import io.swagger.annotations.Api;
@@ -27,12 +29,11 @@ import org.springframework.ui.ModelMap;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
@@ -45,16 +46,19 @@ public class EmployeeController {
     RedisTemplate redisTemplate;
     IMenuService menuService;
 
+    static JwtUtils jwtUtils;
 
     @Autowired
     public EmployeeController(IEmployeeService employeeService,
                               IDepartmentService departmentService,
                               RedisTemplate redisTemplate,
-                              IMenuService menuService) {
+                              IMenuService menuService,
+                              JwtUtils jwtUtils) {
         this.employeeService = employeeService;
         this.departmentService = departmentService;
         this.redisTemplate = redisTemplate;
         this.menuService = menuService;
+        this.jwtUtils = jwtUtils;
     }
 
     /**
@@ -85,9 +89,15 @@ public class EmployeeController {
     static void copyObject(@RequestBody @Validated LoginDto loginDto, Employee employee,
                            RedisTemplate redisTemplate, IMenuService menuService) {
         BeanUtil.copyProperties(employee, loginDto, true);
-        String jwt = TokenUtils.genToken(employee.getEmployeeid().toString(), employee.getPassword());
-        redisTemplate.opsForValue().set("JWT_" + jwt, JSON.toJSON(employee), 2, TimeUnit.HOURS);
-        loginDto.setToken(jwt);
+
+        //生成token
+        Map<String, Object> claims = new HashMap<>();
+        claims.put("a_id",employee.getEmployeeid());
+        String token = jwtUtils.generateToken(claims);
+        //把token存入到redis中
+        String key = RedisConstant.ADMIN_TOKEN_PREFIX + employee.getEmployeeid();
+        redisTemplate.opsForValue().set(key,token,RedisConstant.ADMIN_TOKEN_TTL, TimeUnit.SECONDS);
+        loginDto.setToken(token);
         loginDto.setMenus(menuService.getRoleMenu(employee.getRole()));
     }