admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
guo 2023-12-14 17:40:15 +08:00
parent 7c1ce3d46e
commit 1780beba7b
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/zhgd/xmgl/modules/smartbeamfield/mapper/xml/SmartBeamFieldMakeBeamPedestalMapper.xml
View File

@ -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}

3
src/main/java/com/zhgd/xmgl/security/JwtTokenProvider.java
View File

@ -100,7 +100,8 @@ public class JwtTokenProvider {
public boolean validateToken(String token) {
try {
Jws<Claims> claims = Jwts.parser().setSigningKey(secretKey).parseClaimsJws(token);
JwtParser jwtParser = Jwts.parser().setSigningKey(secretKey);
Jws<Claims> claims = jwtParser.parseClaimsJws(token);
Claims body = claims.getBody();
if (body.getExpiration().before(new Date())) {
return false;