From 1780beba7b2febe2b069f1ea9b8c641e3e65f1bb Mon Sep 17 00:00:00 2001 From: guo Date: Thu, 14 Dec 2023 17:40:15 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/xml/SmartBeamFieldMakeBeamPedestalMapper.xml | 4 ++-- src/main/java/com/zhgd/xmgl/security/JwtTokenProvider.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/mapper/xml/SmartBeamFieldMakeBeamPedestalMapper.xml b/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/mapper/xml/SmartBeamFieldMakeBeamPedestalMapper.xml index 743a4c883..3ee5fe5ed 100644 --- a/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/mapper/xml/SmartBeamFieldMakeBeamPedestalMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/mapper/xml/SmartBeamFieldMakeBeamPedestalMapper.xml @@ -14,9 +14,9 @@ select mbp.*, group_concat(p.process_name ORDER BY mbptp.id) pedestalProcess,if(sbfpltmbp.id is null,0,1) bindByProductionLine from smart_beam_field_make_beam_pedestal mbp - join smart_beam_field_make_beam_pedestal_to_process mbptp on mbptp.smart_beam_field_make_beam_pedestal_id = + left join smart_beam_field_make_beam_pedestal_to_process mbptp on mbptp.smart_beam_field_make_beam_pedestal_id = mbp.id - join smart_beam_field_process p on mbptp.smart_beam_field_process_id = p.id + left join smart_beam_field_process p on mbptp.smart_beam_field_process_id = p.id left join smart_beam_field_production_line_to_make_beam_pedestal sbfpltmbp on mbp.id = sbfpltmbp.smart_beam_field_make_beam_pedestal_id ${ew.customSqlSegment} diff --git a/src/main/java/com/zhgd/xmgl/security/JwtTokenProvider.java b/src/main/java/com/zhgd/xmgl/security/JwtTokenProvider.java index dda1c68a0..d71bd2fea 100644 --- a/src/main/java/com/zhgd/xmgl/security/JwtTokenProvider.java +++ b/src/main/java/com/zhgd/xmgl/security/JwtTokenProvider.java @@ -100,7 +100,8 @@ public class JwtTokenProvider { public boolean validateToken(String token) { try { - Jws claims = Jwts.parser().setSigningKey(secretKey).parseClaimsJws(token); + JwtParser jwtParser = Jwts.parser().setSigningKey(secretKey); + Jws claims = jwtParser.parseClaimsJws(token); Claims body = claims.getBody(); if (body.getExpiration().before(new Date())) { return false;