sugus/aircraft-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

b端注释

Browse Source
This commit is contained in:
lihongbiao 2025-07-16 12:01:41 +08:00
parent dd6c4d60c5
commit 27e1748457
5 changed files with 198 additions and 203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
aircraft-system/src/main/java/com/aircraft/modules/security/security/TokenProvider.java
View File

@ -18,7 +18,7 @@ package com.aircraft.modules.security.security;
import cn.hutool.core.date.DateField; import cn.hutool.core.date.DateField;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import com.aircraft.modules.security.service.dto.JwtCustomerDto; //import com.aircraft.modules.security.service.dto.JwtCustomerDto;
import io.jsonwebtoken.*; import io.jsonwebtoken.*;
import io.jsonwebtoken.io.Decoders; import io.jsonwebtoken.io.Decoders;
import io.jsonwebtoken.security.Keys; import io.jsonwebtoken.security.Keys;
@ -87,29 +87,29 @@ public class TokenProvider implements InitializingBean {
.compact(); .compact();
} }
/** // /**
* 创建Token 设置永不过期， // * 创建Token 设置永不过期，
* Token 的时间有效性转到Redis 维护 // * Token 的时间有效性转到Redis 维护
* @param user / // * @param user /
* @return / // * @return /
*/ // */
public String createToken(JwtCustomerDto user) { // public String createToken(JwtCustomerDto user) {
// 设置参数 // // 设置参数
Map<String, Object> claims = new HashMap<>(6); // Map<String, Object> claims = new HashMap<>(6);
// 设置用户ID // // 设置用户ID
claims.put(AUTHORITIES_UID_KEY, user.getUser().getId()); // claims.put(AUTHORITIES_UID_KEY, user.getUser().getId());
// 设置UUID，确保每次Token不一样 // // 设置UUID，确保每次Token不一样
claims.put(AUTHORITIES_UUID_KEY, IdUtil.simpleUUID()); // claims.put(AUTHORITIES_UUID_KEY, IdUtil.simpleUUID());
// 直接调用 Jwts.builder() 创建新实例 // // 直接调用 Jwts.builder() 创建新实例
return Jwts.builder() // return Jwts.builder()
// 设置自定义 Claims // // 设置自定义 Claims
.setClaims(claims) // .setClaims(claims)
// 设置主题 // // 设置主题
.setSubject(user.getUsername()) // .setSubject(user.getUsername())
// 使用预生成的签名密钥和算法签名 // // 使用预生成的签名密钥和算法签名
.signWith(signingKey, SignatureAlgorithm.HS512) // .signWith(signingKey, SignatureAlgorithm.HS512)
.compact(); // .compact();
} // }
/** /**
* 依据Token 获取鉴权信息 * 依据Token 获取鉴权信息

38
aircraft-system/src/main/java/com/aircraft/modules/security/service/BOnlineUserService.java
View File

@ -1,19 +1,19 @@
package com.aircraft.modules.security.service; //package com.aircraft.modules.security.service;
//
import com.aircraft.modules.security.service.dto.JwtCustomerDto; //import com.aircraft.modules.security.service.dto.JwtCustomerDto;
import com.aircraft.modules.security.service.dto.JwtUserDto; //import com.aircraft.modules.security.service.dto.JwtUserDto;
import org.springframework.stereotype.Service; //import org.springframework.stereotype.Service;
//
import javax.servlet.http.HttpServletRequest; //import javax.servlet.http.HttpServletRequest;
//
@Service //@Service
public class BOnlineUserService { //public class BOnlineUserService {
public void save(JwtCustomerDto user, String token, HttpServletRequest request) { // public void save(JwtCustomerDto user, String token, HttpServletRequest request) {
// 实现B端在线用户存储逻辑 // // 实现B端在线用户存储逻辑
// 可存入不同redis前缀的键值对 // // 可存入不同redis前缀的键值对
} // }
//
public void kickOutForUsername(String username) { // public void kickOutForUsername(String username) {
// B端踢人逻辑 // // B端踢人逻辑
} // }
} //}

54
aircraft-system/src/main/java/com/aircraft/modules/security/service/BUserDetailsService.java
View File

@ -1,27 +1,27 @@
package com.aircraft.modules.security.service; //package com.aircraft.modules.security.service;
//
import com.aircraft.modules.security.service.dto.JwtCustomerDto; //import com.aircraft.modules.security.service.dto.JwtCustomerDto;
import com.aircraft.modules.security.service.dto.JwtUserDto; //import com.aircraft.modules.security.service.dto.JwtUserDto;
import com.aircraft.modules.system.domain.CnCustomer; //import com.aircraft.modules.system.domain.CnCustomer;
import com.aircraft.modules.system.service.CnCustomerService; //import com.aircraft.modules.system.service.CnCustomerService;
import lombok.RequiredArgsConstructor; //import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; //import lombok.extern.slf4j.Slf4j;
import org.springframework.security.core.userdetails.UserDetailsService; //import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.stereotype.Service; //import org.springframework.stereotype.Service;
//
@Slf4j //@Slf4j
@RequiredArgsConstructor //@RequiredArgsConstructor
@Service("bUserDetailsService") //@Service("bUserDetailsService")
public class BUserDetailsService implements UserDetailsService { //public class BUserDetailsService implements UserDetailsService {
//
private final CnCustomerService cnCustomerService; // private final CnCustomerService cnCustomerService;
//
@Override // @Override
public JwtCustomerDto loadUserByUsername(String phone) { // public JwtCustomerDto loadUserByUsername(String phone) {
// 查询B端用户表（如b_user） // // 查询B端用户表（如b_user）
CnCustomer customer = cnCustomerService.findByphone(phone); // CnCustomer customer = cnCustomerService.findByphone(phone);
// 转换JwtUserDto（包含权限信息） // // 转换JwtUserDto（包含权限信息）
// return convertToJwtUser(customer); //// return convertToJwtUser(customer);
return null; // return null;
} // }
} //}

164
aircraft-system/src/main/java/com/aircraft/modules/security/service/dto/JwtCustomerDto.java
View File

@ -1,82 +1,82 @@
/* ///*
* Copyright 2019-2025 Zheng Jie // * Copyright 2019-2025 Zheng Jie
* // *
* Licensed under the Apache License, Version 2.0 (the "License"); // * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. // * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at // * You may obtain a copy of the License at
* // *
* http://www.apache.org/licenses/LICENSE-2.0 // * http://www.apache.org/licenses/LICENSE-2.0
* // *
* Unless required by applicable law or agreed to in writing, software // * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, // * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and // * See the License for the specific language governing permissions and
* limitations under the License. // * limitations under the License.
*/ // */
package com.aircraft.modules.security.service.dto; //package com.aircraft.modules.security.service.dto;
//
import com.aircraft.modules.system.domain.CnCustomer; //import com.aircraft.modules.system.domain.CnCustomer;
import com.aircraft.modules.system.domain.Dept; //import com.aircraft.modules.system.domain.Dept;
import com.aircraft.modules.system.domain.EmEmployees; //import com.aircraft.modules.system.domain.EmEmployees;
import com.aircraft.utils.enums.UserTypeEnum; //import com.aircraft.utils.enums.UserTypeEnum;
import com.alibaba.fastjson2.annotation.JSONField; //import com.alibaba.fastjson2.annotation.JSONField;
import io.swagger.annotations.ApiModelProperty; //import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; //import lombok.AllArgsConstructor;
import lombok.Getter; //import lombok.Getter;
import org.springframework.security.core.userdetails.UserDetails; //import org.springframework.security.core.userdetails.UserDetails;
//
import java.util.ArrayList; //import java.util.ArrayList;
import java.util.List; //import java.util.List;
import java.util.Set; //import java.util.Set;
import java.util.stream.Collectors; //import java.util.stream.Collectors;
//
/** ///**
* @author Zheng Jie // * @author Zheng Jie
* @date 2018-11-23 // * @date 2018-11-23
*/ // */
@Getter //@Getter
@AllArgsConstructor //@AllArgsConstructor
public class JwtCustomerDto implements UserDetails { //public class JwtCustomerDto implements UserDetails {
//
@ApiModelProperty(value = "用户") // @ApiModelProperty(value = "用户")
private LoginUserDto user; // private LoginUserDto user;
//
@ApiModelProperty(value = "角色") // @ApiModelProperty(value = "角色")
private final List<AuthorityDto> authorities; // private final List<AuthorityDto> authorities;
//
@Override // @Override
@JSONField(serialize = false) // @JSONField(serialize = false)
public String getPassword() { // public String getPassword() {
return user.getPassword(); // return user.getPassword();
} // }
//
@Override // @Override
@JSONField(serialize = false) // @JSONField(serialize = false)
public String getUsername() { // public String getUsername() {
return user.getUsername(); // return user.getUsername();
} // }
//
@JSONField(serialize = false) // @JSONField(serialize = false)
@Override // @Override
public boolean isAccountNonExpired() { // public boolean isAccountNonExpired() {
return true; // return true;
} // }
//
@JSONField(serialize = false) // @JSONField(serialize = false)
@Override // @Override
public boolean isAccountNonLocked() { // public boolean isAccountNonLocked() {
return true; // return true;
} // }
//
@JSONField(serialize = false) // @JSONField(serialize = false)
@Override // @Override
public boolean isCredentialsNonExpired() { // public boolean isCredentialsNonExpired() {
return true; // return true;
} // }
//
@Override // @Override
@JSONField(serialize = false) // @JSONField(serialize = false)
public boolean isEnabled() { // public boolean isEnabled() {
return user.getEnabled(); // return user.getEnabled();
} // }
} //}

97
aircraft-system/src/main/java/com/aircraft/modules/system/controller/CnCustomerController.java
View File

@ -9,13 +9,8 @@ import com.aircraft.modules.security.config.BLoginProperties;
import com.aircraft.modules.security.config.LoginProperties; import com.aircraft.modules.security.config.LoginProperties;
import com.aircraft.modules.security.config.SecurityProperties; import com.aircraft.modules.security.config.SecurityProperties;
import com.aircraft.modules.security.security.TokenProvider; import com.aircraft.modules.security.security.TokenProvider;
import com.aircraft.modules.security.service.BOnlineUserService;
import com.aircraft.modules.security.service.BUserDetailsService;
import com.aircraft.modules.security.service.OnlineUserService; import com.aircraft.modules.security.service.OnlineUserService;
import com.aircraft.modules.security.service.UserDetailsServiceImpl; import com.aircraft.modules.security.service.UserDetailsServiceImpl;
import com.aircraft.modules.security.service.dto.AuthUserDto;
import com.aircraft.modules.security.service.dto.JwtCustomerDto;
import com.aircraft.modules.security.service.dto.JwtUserDto;
import com.aircraft.modules.system.domain.CnCustomer; import com.aircraft.modules.system.domain.CnCustomer;
import com.aircraft.modules.system.service.CnCustomerService; import com.aircraft.modules.system.service.CnCustomerService;
import com.aircraft.utils.PageResult; import com.aircraft.utils.PageResult;
@ -75,9 +70,9 @@ public class CnCustomerController {
private final LoginProperties loginProperties; private final LoginProperties loginProperties;
private final PasswordEncoder passwordEncoder; private final PasswordEncoder passwordEncoder;
private final UserDetailsServiceImpl userDetailsService; private final UserDetailsServiceImpl userDetailsService;
private final BUserDetailsService bUserDetailsService; // private final BUserDetailsService bUserDetailsService;
private final BLoginProperties bLoginProperties; // private final BLoginProperties bLoginProperties;
private final BOnlineUserService bOnlineUserService; // private final BOnlineUserService bOnlineUserService;
@Log("分页查询客户") @Log("分页查询客户")
@ApiOperation(value = "分页查询客户", notes = "分页查询客户") @ApiOperation(value = "分页查询客户", notes = "分页查询客户")
@ -202,48 +197,48 @@ public class CnCustomerController {
// return ResponseEntity.ok(authInfo); // return ResponseEntity.ok(authInfo);
// } // }
@Log("B端用户登录") // @Log("B端用户登录")
@ApiOperation("B端登录授权") // @ApiOperation("B端登录授权")
@AnonymousPostMapping(value = "/b/login") // @AnonymousPostMapping(value = "/b/login")
public ResponseEntity<Object> loginB(@Validated @RequestBody AuthUserDto authUser, // public ResponseEntity<Object> loginB(@Validated @RequestBody AuthUserDto authUser,
HttpServletRequest request) throws Exception { // HttpServletRequest request) throws Exception {
//
// 1. 密码解密（与后台相同） // // 1. 密码解密（与后台相同）
String password = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey, authUser.getPassword()); // String password = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey, authUser.getPassword());
//
// 3. 使用B端专属服务加载用户 ★核心修改★ // // 3. 使用B端专属服务加载用户 ★核心修改★
// 假设：BUserDetailsService 是专门为B端实现的UserDetailsService // // 假设：BUserDetailsService 是专门为B端实现的UserDetailsService
JwtCustomerDto jwtUser = bUserDetailsService.loadUserByUsername(authUser.getUsername()); // JwtCustomerDto jwtUser = bUserDetailsService.loadUserByUsername(authUser.getUsername());
//
// 4. 密码验证（保持相同逻辑） // // 4. 密码验证（保持相同逻辑）
if (!passwordEncoder.matches(password, jwtUser.getPassword())) { // if (!passwordEncoder.matches(password, jwtUser.getPassword())) {
throw new BadRequestException("登录密码错误"); // throw new BadRequestException("登录密码错误");
} // }
//
// 5. 设置认证信息 // // 5. 设置认证信息
Authentication authentication = new UsernamePasswordAuthenticationToken( // Authentication authentication = new UsernamePasswordAuthenticationToken(
jwtUser, null, jwtUser.getAuthorities() // jwtUser, null, jwtUser.getAuthorities()
); // );
SecurityContextHolder.getContext().setAuthentication(authentication); // SecurityContextHolder.getContext().setAuthentication(authentication);
//
// 6. 生成令牌（复用相同机制） // // 6. 生成令牌（复用相同机制）
String token = tokenProvider.createToken(jwtUser); // String token = tokenProvider.createToken(jwtUser);
//
// 7. 返回信息（可调整返回字段） // // 7. 返回信息（可调整返回字段）
Map<String, Object> authInfo = new HashMap<>(2) {{ // Map<String, Object> authInfo = new HashMap<>(2) {{
put("token", properties.getTokenStartWith() + token); // put("token", properties.getTokenStartWith() + token);
put("user", jwtUser); // 返回B端用户信息 // put("user", jwtUser); // 返回B端用户信息
}}; // }};
//
// 8. 单设备登录控制（可选） // // 8. 单设备登录控制（可选）
if (bLoginProperties.isSingleLogin()) { // B端专属配置 // if (bLoginProperties.isSingleLogin()) { // B端专属配置
bOnlineUserService.kickOutForUsername(authUser.getUsername()); // bOnlineUserService.kickOutForUsername(authUser.getUsername());
} // }
//
// 9. 保存B端在线用户 ★核心修改★ // // 9. 保存B端在线用户 ★核心修改★
bOnlineUserService.save(jwtUser, token, request); // bOnlineUserService.save(jwtUser, token, request);
//
return ResponseEntity.ok(authInfo); // return ResponseEntity.ok(authInfo);
} // }
} }