root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

整合jwt

Browse Source
This commit is contained in:
DESKTOP-BE1EA0I\14194
2022-09-21 17:50:01 +08:00
parent 98deffce46
commit b623970db8
9 changed files with 79 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
nladmin-system/src/main/java/org/nl/modules/security/config/bean/SecurityProperties.java
View File

@@ -1,74 +0,0 @@
///*
// * Copyright 2019-2020 Zheng Jie
// *
// * Licensed under the Apache License, Version 2.0 (the "License");
// * you may not use this file except in compliance with the License.
// * You may obtain a copy of the License at
// *
// * http://www.apache.org/licenses/LICENSE-2.0
// *
// * Unless required by applicable law or agreed to in writing, software
// * distributed under the License is distributed on an "AS IS" BASIS,
// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// * See the License for the specific language governing permissions and
// * limitations under the License.
// */
//package org.nl.modules.security.config.bean;
//
//import lombok.Data;
//import org.springframework.boot.context.properties.ConfigurationProperties;
//import org.springframework.context.annotation.Configuration;
//
///**
// * Jwt参数配置
// *
// * @author Zheng Jie
// * @date 2019年11月28日
// */
//@Data
//public class SecurityProperties {
//
// /**
// * Request Headers ： Authorization
// */
// private String header;
//
// /**
// * 令牌前缀，最后留个空格 Bearer
// */
// private String tokenStartWith;
//
// /**
// * 必须使用最少88位的Base64对该令牌进行编码
// */
// private String base64Secret;
//
// /**
// * 令牌过期时间 此处单位/毫秒
// */
// private Long tokenValidityInSeconds;
//
// /**
// * 在线用户 key，根据 key 查询 redis 中在线用户的数据
// */
// private String onlineKey;
//
// /**
// * 验证码 key
// */
// private String codeKey;
//
// /**
// * token 续期检查
// */
// private Long detect;
//
// /**
// * 续期时间
// */
// private Long renew;
//
// public String getTokenStartWith() {
// return tokenStartWith + " ";
// }
//}

5
nladmin-system/src/main/java/org/nl/modules/security/rest/AuthorizationController.java
View File

@@ -119,7 +119,7 @@ public class AuthorizationController {
}};
// 保存在线信息
// onlineUserService.save(jwtUserDto, token, request);
onlineUserService.save(userDto, StpUtil.getTokenValue(), request);
return ResponseEntity.ok(authInfo);
}
@@ -160,7 +160,8 @@ public class AuthorizationController {
@AnonymousDeleteMapping(value = "/logout")
public ResponseEntity<Object> logout(HttpServletRequest request) {
StpUtil.getTokenSession().clear(); // 清除session数据
// onlineUserService.logout(tokenProvider.getToken(request));
onlineUserService.logout(StpUtil.getTokenValue());
StpUtil.logout();
return new ResponseEntity<>(HttpStatus.OK);
}
}

14
nladmin-system/src/main/java/org/nl/modules/security/satoken/SaTokenConfigure.java
View File

@@ -1,19 +1,29 @@
package org.nl.modules.security.satoken;
import cn.dev33.satoken.interceptor.SaInterceptor;
import cn.dev33.satoken.jwt.StpLogicJwtForSimple;
import cn.dev33.satoken.stp.StpLogic;
import cn.dev33.satoken.stp.StpUtil;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
/**
* @author: lyd
* @description: sa-token的配置
* @description: sa-token的配置路由拦截
* @Date: 2022-09-20
*/
//@Configuration
@Configuration
public class SaTokenConfigure implements WebMvcConfigurer {
// Sa-Token 整合 jwt (Simple 简单模式)
@Bean
public StpLogic getStpLogicJwt() {
return new StpLogicJwtForSimple();
}
String[] whitelist = new String[]{"/auth/login", "/auth/code", "/swagger-ui.html", "/swagger-resources/**",
"/webjars/**", "/*/api-docs", "/avatar/**", "/file/**", "/druid/**", "/favicon.ico",
"/*.html", "/**/*.html", "/**/*.css", "/**/*.js","/webSocket/**"};

53
nladmin-system/src/main/java/org/nl/modules/security/service/OnlineUserService.java
View File

@@ -18,20 +18,16 @@ package org.nl.modules.security.service;
import cn.hutool.core.util.StrUtil;
import lombok.extern.slf4j.Slf4j;
import org.nl.modules.security.service.dto.OnlineUserDto;
import org.nl.utils.EncryptUtils;
import org.nl.utils.FileUtil;
import org.nl.utils.PageUtil;
import org.nl.utils.RedisUtils;
import org.nl.modules.system.service.dto.UserDto;
import org.nl.utils.*;
import org.springframework.data.domain.Pageable;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
/**
* @author Zheng Jie
@@ -44,34 +40,35 @@ public class OnlineUserService {
// private final SecurityProperties properties;
private final RedisUtils redisUtils;
// public OnlineUserService(SecurityProperties properties, RedisUtils redisUtils) {
// this.properties = properties;
// this.redisUtils = redisUtils;
// }
public OnlineUserService(RedisUtils redisUtils) {
this.redisUtils = redisUtils;
}
// public OnlineUserService(SecurityProperties properties, RedisUtils redisUtils) {
// this.properties = properties;
// this.redisUtils = redisUtils;
// }
/**
* 保存在线用户信息
* @param jwtUserDto /
* @param userDto /
* @param token /
* @param request /
*/
// public void save(UserDto userDto, String token, HttpServletRequest request){
// String dept = userDto.getUser().getDept().getName();
// String ip = StringUtils.getIp(request);
// String browser = StringUtils.getBrowser(request);
// // String address = StringUtils.getCityInfo(ip);
// String address = "局域网";
// OnlineUserDto onlineUserDto = null;
// try {
// onlineUserDto = new OnlineUserDto(userDto.getUsername(), userDto.getUser().getNickName(), dept, browser , ip, address, EncryptUtils.desEncrypt(token), new Date());
// } catch (Exception e) {
// log.error(e.getMessage(),e);
// }
// redisUtils.set(properties.getOnlineKey() + token, onlineUserDto, properties.getTokenValidityInSeconds()/1000);
// }
public void save(UserDto userDto, String token, HttpServletRequest request){
String dept = userDto.getDept().getName();
String ip = StringUtils.getIp(request);
String browser = StringUtils.getBrowser(request);
// String address = StringUtils.getCityInfo(ip);
String address = "局域网";
OnlineUserDto onlineUserDto = null;
try {
onlineUserDto = new OnlineUserDto(userDto.getUsername(), userDto.getNickName(), dept, browser , ip, address, EncryptUtils.desEncrypt(token), new Date());
} catch (Exception e) {
log.error(e.getMessage(),e);
}
redisUtils.set(token, onlineUserDto, 60*60*1000);
}
/**
* 查询全部数据
@@ -125,7 +122,7 @@ public class OnlineUserService {
*/
public void logout(String token) {
// String key = properties.getOnlineKey() + token;
// redisUtils.del(key);
redisUtils.del(token);
}
/**

18
nladmin-system/src/main/java/org/nl/modules/system/service/impl/MonitorServiceImpl.java
View File

@@ -15,24 +15,30 @@
*/
package org.nl.modules.system.service.impl;
import cn.hutool.core.date.BetweenFormater;
import cn.hutool.core.date.BetweenFormatter;
import cn.hutool.core.date.DateUtil;
import org.nl.modules.system.service.MonitorService;
import org.nl.utils.ElAdminConstant;
import org.nl.utils.FileUtil;
import org.nl.utils.StringUtils;
import org.springframework.stereotype.Service;
import oshi.SystemInfo;
import oshi.hardware.*;
import oshi.hardware.CentralProcessor;
import oshi.hardware.GlobalMemory;
import oshi.hardware.HardwareAbstractionLayer;
import oshi.hardware.VirtualMemory;
import oshi.software.os.FileSystem;
import oshi.software.os.OSFileStore;
import oshi.software.os.OperatingSystem;
import oshi.util.FormatUtil;
import oshi.util.Util;
import java.lang.management.ManagementFactory;
import java.text.DecimalFormat;
import java.util.*;
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
/**
* @author Zheng Jie
@@ -172,8 +178,8 @@ public class MonitorServiceImpl implements MonitorService {
// jvm 运行时间
long time = ManagementFactory.getRuntimeMXBean().getStartTime();
Date date = new Date(time);
// 计算项目运行时间
String formatBetween = DateUtil.formatBetween(date, new Date(),BetweenFormater.Level.HOUR);
// 计算项目运行时间 5.4.3:BetweenFormater, 5.7.14改名为BetweenFormatter
String formatBetween = DateUtil.formatBetween(date, new Date(), BetweenFormatter.Level.HOUR);
// 系统信息
systemInfo.put("os", os.toString());
systemInfo.put("day", formatBetween);