From e5bf0d08d05f5c58224fe28cdf743a1bae88e3f0 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 30 十一月 2023 16:48:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-platform/src/main/java/com/ycl/config/YclSecurityConfig.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/config/YclSecurityConfig.java b/ycl-platform/src/main/java/com/ycl/config/YclSecurityConfig.java
index 6d9367d..d41c7e5 100644
--- a/ycl-platform/src/main/java/com/ycl/config/YclSecurityConfig.java
+++ b/ycl-platform/src/main/java/com/ycl/config/YclSecurityConfig.java
@@ -1,9 +1,11 @@
package com.ycl.config;
import com.ycl.component.DynamicSecurityService;
-import com.ycl.entity.platform.user.UmsResource;
-import com.ycl.service.platform.user.UmsAdminService;
-import com.ycl.service.platform.user.UmsResourceService;
+import com.ycl.entity.user.UmsMenu;
+import com.ycl.entity.user.UmsResource;
+import com.ycl.service.user.UmsAdminService;
+import com.ycl.service.user.UmsMenuService;
+import com.ycl.service.user.UmsResourceService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -24,7 +26,7 @@
@Autowired
private UmsAdminService adminService;
@Autowired
- private UmsResourceService resourceService;
+ private UmsMenuService umsMenuService;
@Bean
public UserDetailsService userDetailsService() {
@@ -38,9 +40,9 @@
@Override
public Map<String, ConfigAttribute> loadDataSource() {
Map<String, ConfigAttribute> map = new ConcurrentHashMap<>();
- List<UmsResource> resourceList = resourceService.list();
- for (UmsResource resource : resourceList) {
- map.put(resource.getUrl(), new org.springframework.security.access.SecurityConfig(resource.getId() + ":" + resource.getName()));
+ List<UmsMenu> resourceList = umsMenuService.list();
+ for (UmsMenu resource : resourceList) {
+ map.put(resource.getTitle(), new org.springframework.security.access.SecurityConfig(resource.getId() + ":" + resource.getTitle()));
}
return map;
}
--
Gitblit v1.8.0