haozq
/
ah_jjzhgd_service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增手环接口

This commit is contained in:
haozq 2024-06-20 09:09:32 +08:00
parent f8566dadb2
commit e2954efa07
4 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
securitycontrol-auth/src/main/java/com/securitycontrol/auth/controller/TokenController.java
View File

@ -79,20 +79,24 @@ public class TokenController {
@PostMapping("login")
public Result<?> login(@RequestBody LoginBody form) {
String osName = System.getProperty("os.name").toLowerCase();
if (osName.contains("windows")) {
LoginUser userInfo2 = sysLoginService.login(form.getUsername(),form.getPassword(), form.getLoginType(), null);
// 获取登录token
return Result.ok(tokenService.createToken(userInfo2), "登录成功");
}
Map<String,Object> map=getIscLogin(form.getUsername(), form.getPassword());
iscLogin(form.getUsername(), form.getPassword());
List<SysMenu> menu= (List) map.get("menu");
String password=map.get("pwd").toString();
log.info("密码====>{}",password);
LoginUser userInfo2 = sysLoginService.login(form.getUsername(),password, form.getLoginType(), menu);
LoginUser userInfo2 = sysLoginService.login(form.getUsername(),form.getPassword(), form.getLoginType(), null);
// 获取登录token
return Result.ok(tokenService.createToken(userInfo2), "登录成功");
// String osName = System.getProperty("os.name").toLowerCase();
// if (osName.contains("windows")) {
//// LoginUser userInfo2 = sysLoginService.login(form.getUsername(),form.getPassword(), form.getLoginType(), null);
//// // 获取登录token
//// return Result.ok(tokenService.createToken(userInfo2), "登录成功");
// }
// Map<String,Object> map=getIscLogin(form.getUsername(), form.getPassword());
// iscLogin(form.getUsername(), form.getPassword());
// List<SysMenu> menu= (List) map.get("menu");
// String password=map.get("pwd").toString();
// log.info("密码====>{}",password);
// LoginUser userInfo2 = sysLoginService.login(form.getUsername(),password, form.getLoginType(), menu);
// // 获取登录token
// return Result.ok(tokenService.createToken(userInfo2), "登录成功");
}
private Map<String, Object> getIscLogin(String username, String password) {

11
securitycontrol-auth/src/main/java/com/securitycontrol/auth/service/SysLoginService.java
View File

@ -121,11 +121,16 @@ public class SysLoginService
user.setJumpType(loginType);
userInfo.getSysUser().setMenus(list);
String hisIp=redisUtil.getVal(username);
if(ip.equals(hisIp)){
redisUtil.set("username",ip,times);
if(StringHelper.isNotEmpty(hisIp)){
if(ip.equals(hisIp)){
redisUtil.set("username",ip,times);
}else{
recordLogService.errorLogs(username,user.getUserId(),"用户登录","IP异常",1,1,"{'username':'"+username+"'",startTime);
}
}else{
recordLogService.errorLogs(username,user.getUserId(),"用户登录","IP异常",1,1,"{'username':'"+username+"'",startTime);
redisUtil.set("username",ip,times);
}
recordLogService.recordLogininfor(username,user.getUserId(), "用户登录", "登录成功",1,1,"{'username':'"+username+"'",startTime);
remoteUserService.updateUserLogin(user.getUserId(),SecurityConstants.INNER);
return userInfo;

11
securitycontrol-gateway/src/main/java/com/securitycontrol/gateway/filter/AuthFilter.java
View File

@ -78,13 +78,10 @@ public class AuthFilter implements GlobalFilter, Ordered
String iscUser=(String) claims1.get(SecurityConstants.DETAILS_ISC_USER_ID);
String userName=(String) claims1.get(SecurityConstants.DETAILS_USERNAME);
int times =60*30;
String urls="/proteam/pot/api/getTeamEvaList";
if(!Objects.equals(urls,url)){
redisService.set("token:"+jwtToken,jwtToken,times);
redisService.set("userId::"+userId,jwtToken,times);
redisService.set("ISCUserId:"+jwtToken,iscUser,times);
redisService.set("userName:"+jwtToken,userName,times);
}
redisService.set("token:"+jwtToken,jwtToken,times);
redisService.set("userId::"+userId,jwtToken,times);
redisService.set("ISCUserId:"+jwtToken,iscUser,times);
redisService.set("userName:"+jwtToken,userName,times);
String userid = JwtUtils.getUserId(claims);
String username = JwtUtils.getUserName(claims);

16
securitycontrol-model/securitycontrol-files/src/main/resources/bootstrap.yml
View File

@ -17,15 +17,15 @@ spring:
cloud:
nacos:
discovery:
server-addr: 10.138.225.233:18848
server-addr: 127.0.0.1:8848
namespace: jjzhgd
username: nacos
password: ENC(wWlpFR+8AaCssOqxTnS8HUnBMiNEqQcQTTnzcTEARFuYUINaDpp1O6cgpSCLLAxi)
password: Jjsp@nacos2023
config:
server-addr: 10.138.225.233:18848
server-addr: 127.0.0.1:8848
namespace: jjzhgd
username: nacos
password: ENC(wWlpFR+8AaCssOqxTnS8HUnBMiNEqQcQTTnzcTEARFuYUINaDpp1O6cgpSCLLAxi)
password: Jjsp@nacos2023
# 配置文件格式
file-extension: yml
# 共享配置
@ -33,11 +33,11 @@ spring:
- vsc-dev.yml
data:
mongodb:
host: 10.138.225.233
host: 192.168.0.56
port: 27017
database: admin
username: admin
password: ENC(1BsclN67XI9pe6j66tVVfBhx4iwyYoxmNrKtlleNlRO3ssKquVNOGIlfVrF5+1pd)
database: zhgd
username: zhgd
password: Bonus@admin123
# data:
# mongodb:
# host: 47.115.207.135