提交 299ccb35 authored 作者: caifuming's avatar caifuming

cfm_7/17完善后端配置(先写的静态进行功能展示)

上级 58c1d2b9
# MySQL (主机端口: 13306)
MYSQL_HOST=localhost
MYSQL_PORT=13306
MYSQL_ROOT_PASSWORD=root123
MYSQL_DATABASE=studyweb
MYSQL_USER=studyweb
MYSQL_PASSWORD=studyweb123
# Redis (主机端口: 16379)
REDIS_HOST=localhost
REDIS_PORT=16379
REDIS_PASSWORD=studyweb123
# MinIO (主机端口: 19000 API / 19001 Console)
MINIO_ENDPOINT=localhost:19000
MINIO_ROOT_USER=minioadmin
MINIO_ROOT_PASSWORD=minioadmin123
# Loki (主机端口: 13100)
LOKI_HOST=localhost
LOKI_PORT=13100
...@@ -55,7 +55,7 @@ public class DepartmentController { ...@@ -55,7 +55,7 @@ public class DepartmentController {
} }
@PostMapping @PostMapping
@PreAuthorize("hasRole('ADMIN')") @PreAuthorize("hasAuthority('dept:create')")
public ResponseEntity<ApiResponse<Department>> create(@RequestBody Department dept, public ResponseEntity<ApiResponse<Department>> create(@RequestBody Department dept,
HttpServletRequest httpReq) { HttpServletRequest httpReq) {
log.info("[API] POST /api/v1/departments name={}", dept.getName()); log.info("[API] POST /api/v1/departments name={}", dept.getName());
...@@ -65,7 +65,7 @@ public class DepartmentController { ...@@ -65,7 +65,7 @@ public class DepartmentController {
} }
@PutMapping("/{id}") @PutMapping("/{id}")
@PreAuthorize("hasRole('ADMIN')") @PreAuthorize("hasAuthority('dept:update')")
public ResponseEntity<ApiResponse<Department>> update(@PathVariable Long id, public ResponseEntity<ApiResponse<Department>> update(@PathVariable Long id,
@RequestBody Department dept, @RequestBody Department dept,
HttpServletRequest httpReq) { HttpServletRequest httpReq) {
...@@ -81,7 +81,7 @@ public class DepartmentController { ...@@ -81,7 +81,7 @@ public class DepartmentController {
} }
@DeleteMapping("/{id}") @DeleteMapping("/{id}")
@PreAuthorize("hasRole('ADMIN')") @PreAuthorize("hasAuthority('dept:delete')")
public ResponseEntity<Void> delete(@PathVariable Long id, HttpServletRequest httpReq) { public ResponseEntity<Void> delete(@PathVariable Long id, HttpServletRequest httpReq) {
log.info("[API] DELETE /api/v1/departments/{}", id); log.info("[API] DELETE /api/v1/departments/{}", id);
departmentRepository.findById(id) departmentRepository.findById(id)
......
...@@ -59,7 +59,7 @@ public class MenuController { ...@@ -59,7 +59,7 @@ public class MenuController {
// ========== 3.5.2 完整菜单树 ========== // ========== 3.5.2 完整菜单树 ==========
@GetMapping("/tree") @GetMapping("/tree")
@PreAuthorize("hasRole('ADMIN')") @PreAuthorize("hasAuthority('menu:view')")
public ResponseEntity<ApiResponse<List<Map<String, Object>>>> getTree( public ResponseEntity<ApiResponse<List<Map<String, Object>>>> getTree(
@RequestParam(required = false) Integer status, @RequestParam(required = false) Integer status,
HttpServletRequest httpReq) { HttpServletRequest httpReq) {
...@@ -69,7 +69,7 @@ public class MenuController { ...@@ -69,7 +69,7 @@ public class MenuController {
// ========== 3.5.3 菜单详情 ========== // ========== 3.5.3 菜单详情 ==========
@GetMapping("/{id}") @GetMapping("/{id}")
@PreAuthorize("hasRole('ADMIN')") @PreAuthorize("hasAuthority('menu:view')")
public ResponseEntity<ApiResponse<Map<String, Object>>> getMenuById(@PathVariable Long id, public ResponseEntity<ApiResponse<Map<String, Object>>> getMenuById(@PathVariable Long id,
HttpServletRequest httpReq) { HttpServletRequest httpReq) {
log.info("[API] GET /api/v1/menus/{}", id); log.info("[API] GET /api/v1/menus/{}", id);
...@@ -94,7 +94,7 @@ public class MenuController { ...@@ -94,7 +94,7 @@ public class MenuController {
// ========== 3.5.4 创建菜单 ========== // ========== 3.5.4 创建菜单 ==========
@PostMapping @PostMapping
@PreAuthorize("hasRole('ADMIN')") @PreAuthorize("hasAuthority('menu:create')")
public ResponseEntity<ApiResponse<Map<String, Object>>> createMenu( public ResponseEntity<ApiResponse<Map<String, Object>>> createMenu(
@RequestBody MenuRequest request, HttpServletRequest httpReq) { @RequestBody MenuRequest request, HttpServletRequest httpReq) {
log.info("[API] POST /api/v1/menus name={}", request.getName()); log.info("[API] POST /api/v1/menus name={}", request.getName());
...@@ -108,7 +108,7 @@ public class MenuController { ...@@ -108,7 +108,7 @@ public class MenuController {
// ========== 3.5.5 更新菜单 ========== // ========== 3.5.5 更新菜单 ==========
@PutMapping("/{id}") @PutMapping("/{id}")
@PreAuthorize("hasRole('ADMIN')") @PreAuthorize("hasAuthority('menu:update')")
public ResponseEntity<ApiResponse<Void>> updateMenu(@PathVariable Long id, public ResponseEntity<ApiResponse<Void>> updateMenu(@PathVariable Long id,
@RequestBody MenuUpdateRequest request, @RequestBody MenuUpdateRequest request,
HttpServletRequest httpReq) { HttpServletRequest httpReq) {
...@@ -121,7 +121,7 @@ public class MenuController { ...@@ -121,7 +121,7 @@ public class MenuController {
// ========== 3.5.6 删除菜单 ========== // ========== 3.5.6 删除菜单 ==========
@DeleteMapping("/{id}") @DeleteMapping("/{id}")
@PreAuthorize("hasRole('ADMIN')") @PreAuthorize("hasAuthority('menu:delete')")
public ResponseEntity<Void> deleteMenu(@PathVariable Long id, HttpServletRequest httpReq) { public ResponseEntity<Void> deleteMenu(@PathVariable Long id, HttpServletRequest httpReq) {
log.info("[API] DELETE /api/v1/menus/{}", id); log.info("[API] DELETE /api/v1/menus/{}", id);
menuService.delete(id); menuService.delete(id);
......
...@@ -106,7 +106,7 @@ public class RoleController { ...@@ -106,7 +106,7 @@ public class RoleController {
// ========== 3.4.3 创建角色 ========== // ========== 3.4.3 创建角色 ==========
@PostMapping @PostMapping
@PreAuthorize("hasRole('ADMIN')") @PreAuthorize("hasAuthority('role:create')")
public ResponseEntity<ApiResponse<Map<String, Object>>> createRole( public ResponseEntity<ApiResponse<Map<String, Object>>> createRole(
@RequestBody CreateRoleRequest request, HttpServletRequest httpReq) { @RequestBody CreateRoleRequest request, HttpServletRequest httpReq) {
log.info("[API] POST /api/v1/roles roleName={}", request.getRoleName()); log.info("[API] POST /api/v1/roles roleName={}", request.getRoleName());
...@@ -124,7 +124,7 @@ public class RoleController { ...@@ -124,7 +124,7 @@ public class RoleController {
// ========== 3.4.4 更新角色 ========== // ========== 3.4.4 更新角色 ==========
@PutMapping("/{id}") @PutMapping("/{id}")
@PreAuthorize("hasRole('ADMIN')") @PreAuthorize("hasAuthority('role:update')")
public ResponseEntity<ApiResponse<Void>> updateRole(@PathVariable Long id, public ResponseEntity<ApiResponse<Void>> updateRole(@PathVariable Long id,
@RequestBody UpdateRoleRequest request, @RequestBody UpdateRoleRequest request,
HttpServletRequest httpReq) { HttpServletRequest httpReq) {
...@@ -138,7 +138,7 @@ public class RoleController { ...@@ -138,7 +138,7 @@ public class RoleController {
// ========== 3.4.5 删除角色 ========== // ========== 3.4.5 删除角色 ==========
@DeleteMapping("/{id}") @DeleteMapping("/{id}")
@PreAuthorize("hasRole('ADMIN')") @PreAuthorize("hasAuthority('role:delete')")
public ResponseEntity<Void> deleteRole(@PathVariable Long id, HttpServletRequest httpReq) { public ResponseEntity<Void> deleteRole(@PathVariable Long id, HttpServletRequest httpReq) {
log.info("[API] DELETE /api/v1/roles/{}", id); log.info("[API] DELETE /api/v1/roles/{}", id);
if (!isAdmin()) throw new BizException(BizCode.FORBIDDEN); if (!isAdmin()) throw new BizException(BizCode.FORBIDDEN);
...@@ -165,7 +165,7 @@ public class RoleController { ...@@ -165,7 +165,7 @@ public class RoleController {
// ========== 3.5.7 角色分配菜单 ========== // ========== 3.5.7 角色分配菜单 ==========
@PutMapping("/{roleId}/menus") @PutMapping("/{roleId}/menus")
@PreAuthorize("hasRole('ADMIN')") @PreAuthorize("hasAuthority('role:update')")
public ResponseEntity<ApiResponse<Void>> assignMenus(@PathVariable Long roleId, public ResponseEntity<ApiResponse<Void>> assignMenus(@PathVariable Long roleId,
@RequestBody AssignMenusRequest request, @RequestBody AssignMenusRequest request,
HttpServletRequest httpReq) { HttpServletRequest httpReq) {
...@@ -177,7 +177,7 @@ public class RoleController { ...@@ -177,7 +177,7 @@ public class RoleController {
// ========== 4.10 角色分配自定义数据权限部门 ========== // ========== 4.10 角色分配自定义数据权限部门 ==========
@PutMapping("/{roleId}/custom-depts") @PutMapping("/{roleId}/custom-depts")
@PreAuthorize("hasRole('ADMIN')") @PreAuthorize("hasAuthority('role:update')")
public ResponseEntity<ApiResponse<Void>> assignCustomDepts(@PathVariable Long roleId, public ResponseEntity<ApiResponse<Void>> assignCustomDepts(@PathVariable Long roleId,
@RequestBody AssignCustomDeptsRequest request, @RequestBody AssignCustomDeptsRequest request,
HttpServletRequest httpReq) { HttpServletRequest httpReq) {
......
...@@ -10,10 +10,12 @@ import com.platform.backend.common.DataScope; ...@@ -10,10 +10,12 @@ import com.platform.backend.common.DataScope;
import com.platform.backend.dto.ApiResponse; import com.platform.backend.dto.ApiResponse;
import com.platform.backend.dto.UpdatePhoneRequest; import com.platform.backend.dto.UpdatePhoneRequest;
import com.platform.backend.entity.User; import com.platform.backend.entity.User;
import com.platform.backend.repository.RoleRepository;
import com.platform.backend.service.AsyncImportService; import com.platform.backend.service.AsyncImportService;
import com.platform.backend.service.PasswordService; import com.platform.backend.service.PasswordService;
import com.platform.backend.service.UnlockLogService; import com.platform.backend.service.UnlockLogService;
import com.platform.backend.service.UserService; import com.platform.backend.service.UserService;
import com.platform.backend.security.PermissionService;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import lombok.Data; import lombok.Data;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
...@@ -49,6 +51,8 @@ public class UserController { ...@@ -49,6 +51,8 @@ public class UserController {
private final AsyncImportService asyncImportService; private final AsyncImportService asyncImportService;
private final UnlockLogService unlockLogService; private final UnlockLogService unlockLogService;
private final SmsCodeService smsCodeService; private final SmsCodeService smsCodeService;
private final RoleRepository roleRepository;
private final PermissionService permissionService;
private String tid(HttpServletRequest req) { private String tid(HttpServletRequest req) {
Object t = req.getAttribute(AuthConstants.MDC_TRACE_ID); Object t = req.getAttribute(AuthConstants.MDC_TRACE_ID);
...@@ -75,12 +79,15 @@ public class UserController { ...@@ -75,12 +79,15 @@ public class UserController {
} }
log.info("[API] GET /api/v1/users/me username={}", username); log.info("[API] GET /api/v1/users/me username={}", username);
User user = userService.getByUsername(username); User user = userService.getByUsername(username);
return ApiResponseEnvelope.ok(buildUserDetail(user), tid(httpReq)); Map<String, Object> detail = buildUserDetail(user);
// 仅当前用户需要完整权限集合用于前端按钮控制,避免扩大用户列表接口的数据暴露范围。
detail.put("permissions", permissionService.getUserPermissionCodes(user.getId()));
return ApiResponseEnvelope.ok(detail, tid(httpReq));
} }
// ========== 3.3.2 用户详情 ========== // ========== 3.3.2 用户详情 ==========
@GetMapping("/{id}") @GetMapping("/{id}")
@PreAuthorize("hasRole('ADMIN') or #id == authentication.principal.id") @PreAuthorize("hasAuthority('user:view_detail') or @ss.isCurrentUserOrAdmin(#id)")
public ResponseEntity<ApiResponse<Map<String, Object>>> getUserById(@PathVariable Long id, public ResponseEntity<ApiResponse<Map<String, Object>>> getUserById(@PathVariable Long id,
HttpServletRequest httpReq) { HttpServletRequest httpReq) {
log.info("[API] GET /api/v1/users/{}", id); log.info("[API] GET /api/v1/users/{}", id);
...@@ -93,7 +100,7 @@ public class UserController { ...@@ -93,7 +100,7 @@ public class UserController {
// ========== 3.3.3 更新用户信息 ========== // ========== 3.3.3 更新用户信息 ==========
@PutMapping("/{id}") @PutMapping("/{id}")
@PreAuthorize("hasRole('ADMIN') or #id == authentication.principal.id") @PreAuthorize("hasAuthority('user:update') or @ss.isCurrentUserOrAdmin(#id)")
public ResponseEntity<ApiResponse<Map<String, Object>>> updateUser(@PathVariable Long id, public ResponseEntity<ApiResponse<Map<String, Object>>> updateUser(@PathVariable Long id,
@RequestBody UpdateUserRequest request, @RequestBody UpdateUserRequest request,
HttpServletRequest httpReq) { HttpServletRequest httpReq) {
...@@ -106,7 +113,7 @@ public class UserController { ...@@ -106,7 +113,7 @@ public class UserController {
// ========== 更新手机号(需验证码) ========== // ========== 更新手机号(需验证码) ==========
@PutMapping("/{id}/phone") @PutMapping("/{id}/phone")
@PreAuthorize("hasRole('ADMIN') or #id == authentication.principal.id") @PreAuthorize("hasAuthority('user:update') or @ss.isCurrentUserOrAdmin(#id)")
public ResponseEntity<ApiResponse<Void>> updatePhone(@PathVariable Long id, public ResponseEntity<ApiResponse<Void>> updatePhone(@PathVariable Long id,
@RequestBody UpdatePhoneRequest request, @RequestBody UpdatePhoneRequest request,
HttpServletRequest httpReq) { HttpServletRequest httpReq) {
...@@ -121,10 +128,10 @@ public class UserController { ...@@ -121,10 +128,10 @@ public class UserController {
// ========== 3.3.4 修改密码 ========== // ========== 3.3.4 修改密码 ==========
@PutMapping("/{id}/password") @PutMapping("/{id}/password")
@PreAuthorize("hasRole('ADMIN') or #id == authentication.principal.id") @PreAuthorize("hasAuthority('user:update') or @ss.isCurrentUserOrAdmin(#id)")
public ResponseEntity<ApiResponse<Void>> changePassword(@PathVariable Long id, public ResponseEntity<ApiResponse<Void>> changePassword(@PathVariable Long id,
@RequestBody ChangePasswordRequest request, @RequestBody ChangePasswordRequest request,
HttpServletRequest httpReq) { HttpServletRequest httpReq) {
log.info("[API] PUT /api/v1/users/{}/password", id); log.info("[API] PUT /api/v1/users/{}/password", id);
passwordService.changePassword(currentUsername(), id, isAdmin(), passwordService.changePassword(currentUsername(), id, isAdmin(),
request.getOldPassword(), request.getNewPassword()); request.getOldPassword(), request.getNewPassword());
...@@ -133,7 +140,7 @@ public class UserController { ...@@ -133,7 +140,7 @@ public class UserController {
// ========== 3.3.5 用户列表(带数据权限) ========== // ========== 3.3.5 用户列表(带数据权限) ==========
@GetMapping @GetMapping
@PreAuthorize("hasRole('ADMIN')") @PreAuthorize("hasAuthority('user:view_list')")
@DataScope(tableAlias = "root", deptIdColumn = "departmentId", userIdColumn = "id") @DataScope(tableAlias = "root", deptIdColumn = "departmentId", userIdColumn = "id")
public ResponseEntity<ApiResponse<Map<String, Object>>> listUsers( public ResponseEntity<ApiResponse<Map<String, Object>>> listUsers(
@RequestParam(defaultValue = "1") int page, @RequestParam(defaultValue = "1") int page,
...@@ -157,7 +164,7 @@ public class UserController { ...@@ -157,7 +164,7 @@ public class UserController {
// ========== 3.3.6 创建用户 ========== // ========== 3.3.6 创建用户 ==========
@PostMapping @PostMapping
@PreAuthorize("hasRole('ADMIN')") @PreAuthorize("hasAuthority('user:create')")
public ResponseEntity<ApiResponse<Map<String, Object>>> createUser( public ResponseEntity<ApiResponse<Map<String, Object>>> createUser(
@RequestBody CreateUserRequest request, @RequestBody CreateUserRequest request,
HttpServletRequest httpReq) { HttpServletRequest httpReq) {
...@@ -171,7 +178,7 @@ public class UserController { ...@@ -171,7 +178,7 @@ public class UserController {
// ========== 3.3.7 删除用户(软删除) ========== // ========== 3.3.7 删除用户(软删除) ==========
@DeleteMapping("/{id}") @DeleteMapping("/{id}")
@PreAuthorize("hasRole('ADMIN')") @PreAuthorize("hasAuthority('user:delete')")
public ResponseEntity<Void> deleteUser(@PathVariable Long id, HttpServletRequest httpReq) { public ResponseEntity<Void> deleteUser(@PathVariable Long id, HttpServletRequest httpReq) {
log.info("[API] DELETE /api/v1/users/{}", id); log.info("[API] DELETE /api/v1/users/{}", id);
userService.softDelete(id, currentUsername()); userService.softDelete(id, currentUsername());
...@@ -180,7 +187,7 @@ public class UserController { ...@@ -180,7 +187,7 @@ public class UserController {
// ========== 3.3.8 重置用户密码(管理员) ========== // ========== 3.3.8 重置用户密码(管理员) ==========
@PutMapping("/{id}/password/reset") @PutMapping("/{id}/password/reset")
@PreAuthorize("hasRole('ADMIN')") @PreAuthorize("hasAuthority('user:update')")
public ResponseEntity<ApiResponse<Void>> resetPassword(@PathVariable Long id, public ResponseEntity<ApiResponse<Void>> resetPassword(@PathVariable Long id,
@RequestBody ResetPasswordRequest request, @RequestBody ResetPasswordRequest request,
HttpServletRequest httpReq) { HttpServletRequest httpReq) {
...@@ -191,7 +198,7 @@ public class UserController { ...@@ -191,7 +198,7 @@ public class UserController {
// ========== 4.11 用户角色分配 ========== // ========== 4.11 用户角色分配 ==========
@PutMapping("/{id}/roles") @PutMapping("/{id}/roles")
@PreAuthorize("hasRole('ADMIN')") @PreAuthorize("hasAuthority('role:assign_user')")
public ResponseEntity<ApiResponse<Void>> assignRoles(@PathVariable Long id, public ResponseEntity<ApiResponse<Void>> assignRoles(@PathVariable Long id,
@RequestBody AssignRolesRequest request, @RequestBody AssignRolesRequest request,
HttpServletRequest httpReq) { HttpServletRequest httpReq) {
...@@ -202,7 +209,7 @@ public class UserController { ...@@ -202,7 +209,7 @@ public class UserController {
// ========== 4.13 手动解锁 ========== // ========== 4.13 手动解锁 ==========
@PutMapping("/{id}/unlock") @PutMapping("/{id}/unlock")
@PreAuthorize("hasRole('ADMIN')") @PreAuthorize("hasAuthority('user:update')")
public ResponseEntity<ApiResponse<Void>> unlockAccount(@PathVariable Long id, HttpServletRequest httpReq) { public ResponseEntity<ApiResponse<Void>> unlockAccount(@PathVariable Long id, HttpServletRequest httpReq) {
String operator = currentUsername(); String operator = currentUsername();
log.info("[API] PUT /api/v1/users/{}/unlock operator={}", id, operator); log.info("[API] PUT /api/v1/users/{}/unlock operator={}", id, operator);
...@@ -214,7 +221,7 @@ public class UserController { ...@@ -214,7 +221,7 @@ public class UserController {
// ========== 3.3.9 批量导入用户(异步) ========== // ========== 3.3.9 批量导入用户(异步) ==========
@PostMapping("/batch-import") @PostMapping("/batch-import")
@PreAuthorize("hasRole('ADMIN')") @PreAuthorize("hasAuthority('user:create')")
public ResponseEntity<ApiResponse<Map<String, Object>>> batchImport( public ResponseEntity<ApiResponse<Map<String, Object>>> batchImport(
@RequestParam("file") org.springframework.web.multipart.MultipartFile file, @RequestParam("file") org.springframework.web.multipart.MultipartFile file,
HttpServletRequest httpReq) { HttpServletRequest httpReq) {
...@@ -241,7 +248,7 @@ public class UserController { ...@@ -241,7 +248,7 @@ public class UserController {
// ========== 3.3.10 查询导入进度 ========== // ========== 3.3.10 查询导入进度 ==========
@GetMapping("/batch-import/{taskId}") @GetMapping("/batch-import/{taskId}")
@PreAuthorize("hasRole('ADMIN')") @PreAuthorize("hasAuthority('user:create')")
public ResponseEntity<ApiResponse<Map<String, Object>>> getImportProgress( public ResponseEntity<ApiResponse<Map<String, Object>>> getImportProgress(
@PathVariable String taskId, HttpServletRequest httpReq) { @PathVariable String taskId, HttpServletRequest httpReq) {
log.info("[API] GET /api/v1/users/batch-import/{}", taskId); log.info("[API] GET /api/v1/users/batch-import/{}", taskId);
...@@ -295,6 +302,11 @@ public class UserController { ...@@ -295,6 +302,11 @@ public class UserController {
map.put("phone", maskPhone(user.getPhone())); map.put("phone", maskPhone(user.getPhone()));
map.put("avatar", user.getAvatarUrl()); map.put("avatar", user.getAvatarUrl());
map.put("roleId", user.getRoleId()); map.put("roleId", user.getRoleId());
// 获取角色名称
if (user.getRoleId() != null) {
String roleName = roleRepository.findRoleNameById(user.getRoleId());
map.put("roleName", roleName);
}
map.put("departmentId", user.getDepartmentId()); map.put("departmentId", user.getDepartmentId());
map.put("status", user.getStatus()); map.put("status", user.getStatus());
map.put("createdAt", user.getCreatedAt()); map.put("createdAt", user.getCreatedAt());
...@@ -313,4 +325,4 @@ public class UserController { ...@@ -313,4 +325,4 @@ public class UserController {
if (phone == null || phone.length() < 11) return phone; if (phone == null || phone.length() < 11) return phone;
return phone.substring(0, 3) + "****" + phone.substring(7); return phone.substring(0, 3) + "****" + phone.substring(7);
} }
} }
\ No newline at end of file
...@@ -2,6 +2,9 @@ package com.platform.backend.repository; ...@@ -2,6 +2,9 @@ package com.platform.backend.repository;
import com.platform.backend.entity.RolePermission; import com.platform.backend.entity.RolePermission;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import java.util.List; import java.util.List;
...@@ -9,6 +12,14 @@ import java.util.List; ...@@ -9,6 +12,14 @@ import java.util.List;
@Repository @Repository
public interface RolePermissionRepository extends JpaRepository<RolePermission, Long> { public interface RolePermissionRepository extends JpaRepository<RolePermission, Long> {
List<RolePermission> findByRoleId(Long roleId); List<RolePermission> findByRoleId(Long roleId);
void deleteByRoleId(Long roleId); List<RolePermission> findByRoleIdIn(List<Long> roleIds);
/**
* 权限替换前立即执行删除,避免同一角色重复插入时触发唯一索引冲突。
*/
@Modifying(flushAutomatically = true)
@Query("DELETE FROM RolePermission rp WHERE rp.roleId = :roleId")
void deleteByRoleId(@Param("roleId") Long roleId);
long countByRoleId(Long roleId); long countByRoleId(Long roleId);
} }
...@@ -2,6 +2,7 @@ package com.platform.backend.repository; ...@@ -2,6 +2,7 @@ package com.platform.backend.repository;
import com.platform.backend.entity.Role; import com.platform.backend.entity.Role;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import java.util.Optional; import java.util.Optional;
...@@ -9,4 +10,7 @@ import java.util.Optional; ...@@ -9,4 +10,7 @@ import java.util.Optional;
@Repository @Repository
public interface RoleRepository extends JpaRepository<Role, Long> { public interface RoleRepository extends JpaRepository<Role, Long> {
Optional<Role> findByRoleCode(String roleCode); Optional<Role> findByRoleCode(String roleCode);
@Query("SELECT r.roleName FROM Role r WHERE r.id = :id")
String findRoleNameById(Long id);
} }
\ No newline at end of file
...@@ -16,6 +16,7 @@ public interface UserRepository extends JpaRepository<User, Long>, JpaSpecificat ...@@ -16,6 +16,7 @@ public interface UserRepository extends JpaRepository<User, Long>, JpaSpecificat
boolean existsByUsername(String username); boolean existsByUsername(String username);
boolean existsByPhone(String phone); boolean existsByPhone(String phone);
long countByIsDeletedAndRoleId(Integer isDeleted, Long roleId); long countByIsDeletedAndRoleId(Integer isDeleted, Long roleId);
List<User> findByRoleId(Long roleId);
// 分页查询 // 分页查询
List<User> findByIsDeleted(Integer isDeleted); List<User> findByIsDeleted(Integer isDeleted);
......
...@@ -13,6 +13,7 @@ import java.util.List; ...@@ -13,6 +13,7 @@ import java.util.List;
public interface UserRoleRepository extends JpaRepository<UserRole, Long> { public interface UserRoleRepository extends JpaRepository<UserRole, Long> {
List<UserRole> findByUserId(Long userId); List<UserRole> findByUserId(Long userId);
List<UserRole> findByRoleId(Long roleId); List<UserRole> findByRoleId(Long roleId);
List<UserRole> findByUserIdAndRoleId(Long userId, Long roleId);
@Modifying @Modifying
@Query("DELETE FROM UserRole ur WHERE ur.userId = :userId") @Query("DELETE FROM UserRole ur WHERE ur.userId = :userId")
......
...@@ -12,8 +12,13 @@ import org.springframework.security.core.userdetails.UserDetailsService; ...@@ -12,8 +12,13 @@ import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Collections; import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
/**
* 用户详情服务:加载用户信息和权限
*/
@Slf4j @Slf4j
@Service @Service
@RequiredArgsConstructor @RequiredArgsConstructor
...@@ -21,28 +26,38 @@ public class CustomUserDetailsService implements UserDetailsService { ...@@ -21,28 +26,38 @@ public class CustomUserDetailsService implements UserDetailsService {
private final UserRepository userRepository; private final UserRepository userRepository;
private final RoleRepository roleRepository; private final RoleRepository roleRepository;
private final PermissionService permissionService;
@Override @Override
public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
User user = userRepository.findByUsername(username) User user = userRepository.findByUsername(username)
.orElseThrow(() -> new UsernameNotFoundException("用户不存在: " + username)); .orElseThrow(() -> new UsernameNotFoundException("用户不存在: " + username));
String authority = resolveAuthority(user); // 1. 获取角色信息
String roleAuthority = resolveRoleAuthority(user);
List<SimpleGrantedAuthority> authorities = new ArrayList<>();
authorities.add(new SimpleGrantedAuthority(roleAuthority));
// 2. 获取权限信息(从数据库加载,支持缓存)
List<String> permissions = permissionService.getUserPermissions(user.getId());
for (String perm : permissions) {
authorities.add(new SimpleGrantedAuthority(perm));
}
// 3. 构建 UserDetails
return new org.springframework.security.core.userdetails.User( return new org.springframework.security.core.userdetails.User(
user.getUsername(), user.getUsername(),
user.getPassword(), user.getPassword(),
user.getEnabled(), user.getEnabled(),
true, true, true, true, true, true,
Collections.singletonList(new SimpleGrantedAuthority(authority)) authorities
); );
} }
/** /**
* 通过 roleId 在 user_role 字典表里查 role_code,拼装成 Spring Security 的 authority。 * 获取用户的角色 authority(Spring Security 格式)
* 默认 fallback 为 ROLE_USER。
*/ */
private String resolveAuthority(User user) { private String resolveRoleAuthority(User user) {
Long roleId = user.getRoleId(); Long roleId = user.getRoleId();
if (roleId == null) { if (roleId == null) {
log.warn("用户 {} 未关联 roleId,使用默认 ROLE_USER", user.getUsername()); log.warn("用户 {} 未关联 roleId,使用默认 ROLE_USER", user.getUsername());
...@@ -56,4 +71,4 @@ public class CustomUserDetailsService implements UserDetailsService { ...@@ -56,4 +71,4 @@ public class CustomUserDetailsService implements UserDetailsService {
return "ROLE_USER"; return "ROLE_USER";
}); });
} }
} }
\ No newline at end of file
package com.platform.backend.security;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.platform.backend.entity.Permission;
import com.platform.backend.repository.PermissionRepository;
import com.platform.backend.repository.RolePermissionRepository;
import com.platform.backend.repository.UserRoleRepository;
import com.platform.backend.repository.UserRepository;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
import java.time.Duration;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
/**
* 权限服务:从数据库加载用户权限,支持 Redis 缓存
*/
@Slf4j
@Service
@RequiredArgsConstructor
public class PermissionService {
private final PermissionRepository permissionRepository;
private final RolePermissionRepository rolePermissionRepository;
private final UserRoleRepository userRoleRepository;
private final UserRepository userRepository;
private final StringRedisTemplate redisTemplate;
private final ObjectMapper objectMapper;
private static final String CACHE_PREFIX = "user:perm:";
private static final Duration CACHE_TTL = Duration.ofHours(1);
/**
* 获取用户的所有权限码列表
*/
public List<String> getUserPermissions(Long userId) {
String cacheKey = CACHE_PREFIX + userId;
String cached = redisTemplate.opsForValue().get(cacheKey);
if (cached != null) {
try {
return objectMapper.readValue(cached, new TypeReference<List<String>>() {});
} catch (JsonProcessingException e) {
log.warn("解析权限缓存失败 userId={}", userId);
}
}
List<String> permissions = loadUserPermissions(userId);
try {
redisTemplate.opsForValue().set(cacheKey, objectMapper.writeValueAsString(permissions), CACHE_TTL);
} catch (JsonProcessingException e) {
log.warn("序列化权限缓存失败 userId={}", userId);
}
return permissions;
}
/**
* 从数据库加载用户权限
*/
private List<String> loadUserPermissions(Long userId) {
// 获取用户主角色
List<Long> roleIds = new ArrayList<>();
userRepository.findById(userId).ifPresent(user -> {
if (user.getRoleId() != null) {
roleIds.add(user.getRoleId());
}
});
// 获取用户关联的其他角色
userRoleRepository.findByUserId(userId).forEach(ur -> {
if (!roleIds.contains(ur.getRoleId())) {
roleIds.add(ur.getRoleId());
}
});
if (roleIds.isEmpty()) {
log.warn("用户 {} 没有关联任何角色", userId);
return Collections.emptyList();
}
// 获取所有角色关联的权限
List<Long> permissionIds = rolePermissionRepository.findByRoleIdIn(roleIds).stream()
.map(rp -> rp.getPermissionId())
.collect(Collectors.toList());
// 转换为权限码
return permissionRepository.findAllById(permissionIds).stream()
.map(Permission::getPermissionCode)
.collect(Collectors.toList());
}
/**
* 刷新用户权限缓存
*/
public void refreshCache(Long userId) {
String cacheKey = CACHE_PREFIX + userId;
redisTemplate.delete(cacheKey);
log.info("用户 {} 权限缓存已刷新", userId);
}
/**
* 刷新指定角色的所有用户权限缓存
*/
public void refreshCacheByRoleId(Long roleId) {
Set<Long> userIds = new HashSet<>();
userRoleRepository.findByRoleId(roleId).forEach(userRole -> userIds.add(userRole.getUserId()));
// 兼容早期仅写 user.role_id、未写 user_role 关联表的用户数据。
userRepository.findByRoleId(roleId).forEach(user -> userIds.add(user.getId()));
userIds.forEach(this::refreshCache);
}
/**
* 检查用户是否拥有指定权限
*/
public boolean hasPermission(Long userId, String permissionCode) {
return getUserPermissions(userId).contains(permissionCode);
}
/**
* 获取用户的权限码列表(用于前端按钮级权限控制)
*/
public List<String> getUserPermissionCodes(Long userId) {
return getUserPermissions(userId);
}
}
package com.platform.backend.security;
import com.platform.backend.entity.User;
import com.platform.backend.repository.UserRepository;
import lombok.RequiredArgsConstructor;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Component;
import java.util.Optional;
/**
* 自定义权限表达式方法,用于 @PreAuthorize 注解
*/
@Component("ss")
@RequiredArgsConstructor
public class SecurityExpression {
private final UserRepository userRepository;
/**
* 检查当前用户是否是管理员
*/
public boolean isAdmin() {
Authentication auth = SecurityContextHolder.getContext().getAuthentication();
if (auth == null) return false;
return auth.getAuthorities().stream()
.anyMatch(a -> "ROLE_ADMIN".equals(a.getAuthority()));
}
/**
* 检查当前用户是否是本人(用于用户查看/修改自己的信息)
*/
public boolean isCurrentUserOrAdmin(Long userId) {
if (isAdmin()) return true;
Optional<User> currentUser = getCurrentUser();
return currentUser.isPresent() && currentUser.get().getId().equals(userId);
}
/**
* 检查当前用户是否有指定权限
*/
public boolean hasPermission(String permissionCode) {
Authentication auth = SecurityContextHolder.getContext().getAuthentication();
if (auth == null) return false;
return auth.getAuthorities().stream()
.anyMatch(a -> permissionCode.equals(a.getAuthority()));
}
/**
* 获取当前登录用户
*/
public Optional<User> getCurrentUser() {
Authentication auth = SecurityContextHolder.getContext().getAuthentication();
if (auth == null || auth.getName() == null || "anonymousUser".equals(auth.getName())) {
return Optional.empty();
}
return userRepository.findByUsername(auth.getName());
}
/**
* 获取当前用户ID
*/
public Long getCurrentUserId() {
return getCurrentUser().map(User::getId).orElse(null);
}
}
...@@ -12,6 +12,7 @@ import com.platform.backend.repository.MenuRepository; ...@@ -12,6 +12,7 @@ import com.platform.backend.repository.MenuRepository;
import com.platform.backend.repository.RoleMenuRepository; import com.platform.backend.repository.RoleMenuRepository;
import com.platform.backend.repository.UserRepository; import com.platform.backend.repository.UserRepository;
import com.platform.backend.repository.UserRoleRepository; import com.platform.backend.repository.UserRoleRepository;
import com.platform.backend.security.PermissionService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate;
...@@ -38,6 +39,7 @@ public class MenuService { ...@@ -38,6 +39,7 @@ public class MenuService {
private final UserRepository userRepository; private final UserRepository userRepository;
private final StringRedisTemplate redis; private final StringRedisTemplate redis;
private final ObjectMapper objectMapper; private final ObjectMapper objectMapper;
private final PermissionService permissionService;
private static final long MENU_TTL_HOURS = 1; private static final long MENU_TTL_HOURS = 1;
private static final String MENU_CACHE_KEY_PREFIX = "menu:"; private static final String MENU_CACHE_KEY_PREFIX = "menu:";
...@@ -190,6 +192,10 @@ public class MenuService { ...@@ -190,6 +192,10 @@ public class MenuService {
private void refreshAllMenuCache() { private void refreshAllMenuCache() {
incrementMenuCacheVersion(); incrementMenuCacheVersion();
// 清除所有用户权限缓存
userRepository.findAll().forEach(user -> {
permissionService.refreshCache(user.getId());
});
} }
private List<Map<String, Object>> buildTree(List<Menu> all, Long parentId) { private List<Map<String, Object>> buildTree(List<Menu> all, Long parentId) {
......
...@@ -12,6 +12,7 @@ import com.platform.backend.repository.RoleMenuRepository; ...@@ -12,6 +12,7 @@ import com.platform.backend.repository.RoleMenuRepository;
import com.platform.backend.repository.RolePermissionRepository; import com.platform.backend.repository.RolePermissionRepository;
import com.platform.backend.repository.RoleRepository; import com.platform.backend.repository.RoleRepository;
import com.platform.backend.repository.UserRoleRepository; import com.platform.backend.repository.UserRoleRepository;
import com.platform.backend.security.PermissionService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate;
...@@ -36,6 +37,7 @@ public class RoleService { ...@@ -36,6 +37,7 @@ public class RoleService {
private final UserRoleRepository userRoleRepository; private final UserRoleRepository userRoleRepository;
private final RoleCustomDeptRepository roleCustomDeptRepository; private final RoleCustomDeptRepository roleCustomDeptRepository;
private final StringRedisTemplate redis; private final StringRedisTemplate redis;
private final PermissionService permissionService;
public List<Role> list() { public List<Role> list() {
return roleRepository.findAll(); return roleRepository.findAll();
...@@ -79,7 +81,9 @@ public class RoleService { ...@@ -79,7 +81,9 @@ public class RoleService {
Integer dataScope, Integer sort, Integer status, Integer dataScope, Integer sort, Integer status,
List<Long> permissionIds) { List<Long> permissionIds) {
Role role = getById(id); Role role = getById(id);
if (role.getIsPreset() != null && role.getIsPreset() == 1) { boolean isPresetRole = role.getIsPreset() != null && role.getIsPreset() == 1;
// 预置角色的身份定义不可改,但管理员可以调整其权限集合。
if (isPresetRole && (roleName != null || description != null || dataScope != null || sort != null || status != null)) {
throw new BizException(BizCode.ROLE_PRESET); throw new BizException(BizCode.ROLE_PRESET);
} }
if (roleName != null) role.setRoleName(roleName); if (roleName != null) role.setRoleName(roleName);
...@@ -97,6 +101,8 @@ public class RoleService { ...@@ -97,6 +101,8 @@ public class RoleService {
rp.setPermissionId(permId); rp.setPermissionId(permId);
rolePermissionRepository.save(rp); rolePermissionRepository.save(rp);
} }
// 角色权限更新后,确保该角色所有用户的下一次请求立即重新从数据库取权限。
permissionService.refreshCacheByRoleId(id);
} }
return role; return role;
} }
......
差异被折叠。
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑!
请 注册 或者 后发表评论