From a508ea94371670d9584d255ec3852d21bd082199 Mon Sep 17 00:00:00 2001 From: hayu <1604366271@qq.com> Date: Tue, 8 Jul 2025 11:43:19 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backstage/entity/CarNeedPlanVo.java | 2 ++ .../security/UserAuthenticationProvider.java | 4 ++-- .../business/backstage/DispatchCarMapper.xml | 1 + .../business/backstage/SupDispatchCarMapper.xml | 17 ++++++++++++++--- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/bonus/gzcar/business/backstage/entity/CarNeedPlanVo.java b/src/main/java/com/bonus/gzcar/business/backstage/entity/CarNeedPlanVo.java index 65df8fb..6388c9a 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/entity/CarNeedPlanVo.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/entity/CarNeedPlanVo.java @@ -184,5 +184,7 @@ public class CarNeedPlanVo extends ParentVo { */ private String delFile; + private String outId; + } diff --git a/src/main/java/com/bonus/gzcar/manager/security/UserAuthenticationProvider.java b/src/main/java/com/bonus/gzcar/manager/security/UserAuthenticationProvider.java index 0d86443..7e3b976 100644 --- a/src/main/java/com/bonus/gzcar/manager/security/UserAuthenticationProvider.java +++ b/src/main/java/com/bonus/gzcar/manager/security/UserAuthenticationProvider.java @@ -41,11 +41,11 @@ public class UserAuthenticationProvider implements AuthenticationProvider { if (userInfo == null) { throw new UsernameNotFoundException("用户名不存在"); } - /* //密码加密 + //密码加密 String daya= Md5Utils.createPwdEncrypt(userName,password.toUpperCase(),userInfo.getSalt()); if(!Md5Utils.validatePasswordBast64(daya, userInfo.getPassword())){ throw new BadCredentialsException("密码不正确"); - }*/ + } // 我们还要判断密码是否正确，这里我们的密码使用BCryptPasswordEncoder进行加密的 diff --git a/src/main/resources/mappers/business/backstage/DispatchCarMapper.xml b/src/main/resources/mappers/business/backstage/DispatchCarMapper.xml index d155333..e45e84d 100644 --- a/src/main/resources/mappers/business/backstage/DispatchCarMapper.xml +++ b/src/main/resources/mappers/business/backstage/DispatchCarMapper.xml @@ -137,6 +137,7 @@ order by cpa.create_time desc + \ No newline at end of file From f64f225878dfb5e2dbb38e6bd0c1467117c66788 Mon Sep 17 00:00:00 2001 From: syruan <15555146157@163.com> Date: Wed, 9 Jul 2025 15:12:21 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat(system):=20=E5=AE=A1=E8=AE=A1=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E6=B7=BB=E5=8A=A0=E6=93=8D=E4=BD=9C=E4=BA=BA=E6=98=B5?= =?UTF-8?q?=E7=A7=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 AuditRecordMapper.xml 中增加获取操作人昵称的 SQL 查询 - 在 AuditRecordVo.java 中添加 nikeName 字段用于存储操作人昵称 - 移除了 JwtAuthenticationTokenFilter.java 中的 TODO 注释 - 删除了 SpringThreadPoolConfig.java 中的多余描述 - 移除了 StringHelper.java 中的无用注释和异常处理 --- .../bonus/gzcar/business/system/entity/AuditRecordVo.java | 5 +++++ .../com/bonus/gzcar/manager/common/util/StringHelper.java | 2 -- .../bonus/gzcar/manager/config/SpringThreadPoolConfig.java | 1 - .../manager/security/jwt/JwtAuthenticationTokenFilter.java | 2 +- .../resources/mappers/business/system/AuditRecordMapper.xml | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/bonus/gzcar/business/system/entity/AuditRecordVo.java b/src/main/java/com/bonus/gzcar/business/system/entity/AuditRecordVo.java index 83486ad..e345587 100644 --- a/src/main/java/com/bonus/gzcar/business/system/entity/AuditRecordVo.java +++ b/src/main/java/com/bonus/gzcar/business/system/entity/AuditRecordVo.java @@ -44,6 +44,11 @@ public class AuditRecordVo extends ParentVo { */ private String userName; + /** + * 操作人昵称 + */ + private String nikeName; + private String times; private String phone; diff --git a/src/main/java/com/bonus/gzcar/manager/common/util/StringHelper.java b/src/main/java/com/bonus/gzcar/manager/common/util/StringHelper.java index 780fe0b..9f4053e 100644 --- a/src/main/java/com/bonus/gzcar/manager/common/util/StringHelper.java +++ b/src/main/java/com/bonus/gzcar/manager/common/util/StringHelper.java @@ -69,7 +69,6 @@ public class StringHelper { pfp.print(args); pfp.close(); } catch (FileNotFoundException e) { - // TODO Auto-generated catch block e.printStackTrace(); } @@ -102,7 +101,6 @@ public class StringHelper { try { return new String(content.getBytes("ISO_8859_1"), "UTF-8"); } catch (UnsupportedEncodingException e) { - // TODO Auto-generated catch block e.printStackTrace(); } return content; diff --git a/src/main/java/com/bonus/gzcar/manager/config/SpringThreadPoolConfig.java b/src/main/java/com/bonus/gzcar/manager/config/SpringThreadPoolConfig.java index ce711d0..d180453 100644 --- a/src/main/java/com/bonus/gzcar/manager/config/SpringThreadPoolConfig.java +++ b/src/main/java/com/bonus/gzcar/manager/config/SpringThreadPoolConfig.java @@ -9,7 +9,6 @@ import java.util.concurrent.ThreadPoolExecutor; /** * @author cw chen - * @description TODO * @date 2022-08-22 14:42 */ @EnableAsync diff --git a/src/main/java/com/bonus/gzcar/manager/security/jwt/JwtAuthenticationTokenFilter.java b/src/main/java/com/bonus/gzcar/manager/security/jwt/JwtAuthenticationTokenFilter.java index 2d8596e..a41815a 100644 --- a/src/main/java/com/bonus/gzcar/manager/security/jwt/JwtAuthenticationTokenFilter.java +++ b/src/main/java/com/bonus/gzcar/manager/security/jwt/JwtAuthenticationTokenFilter.java @@ -81,7 +81,7 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter { // 验证令牌有效期，相差不足10分钟，自动刷新缓存 tokenService.verifyToken(loginUser); //存入SecurityContextHolder - //TODO 获取权限信息封装到Authentication中 + // 获取权限信息封装到Authentication中 UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(loginUser,null, loginUser.getAuthorities()); SecurityContextHolder.getContext().setAuthentication(authenticationToken); diff --git a/src/main/resources/mappers/business/system/AuditRecordMapper.xml b/src/main/resources/mappers/business/system/AuditRecordMapper.xml index b314e32..9108123 100644 --- a/src/main/resources/mappers/business/system/AuditRecordMapper.xml +++ b/src/main/resources/mappers/business/system/AuditRecordMapper.xml @@ -13,7 +13,7 @@