新增了资源管理页面

Author: dongweibh

auth/authentication-server/src/main/java/com/springboot/cloud/auth/authentication/rest/AuthenticationController.java

@@ -27,8 +27,10 @@ public class AuthenticationController {
     @ApiResponses(@ApiResponse(code = 200, message = "处理成功", response = Result.class))
     @PostMapping(value = "/auth/permission")
     public Result decide(@RequestParam String url, @RequestParam String method, HttpServletRequest request) {
+        log.debug("权限验证->url:{},method:{}",url,method);
         boolean decide = authenticationService.decide(new HttpServletRequestAuthWrapper(request, url, method));
+        log.debug("权限验证结果->{}",decide);
         return Result.success(decide);
     }
 
-}
+}

auth/authentication-server/src/main/java/com/springboot/cloud/auth/authentication/service/impl/AuthenticationService.java

@@ -30,13 +30,21 @@ public class AuthenticationService implements IAuthenticationService {
      */
     @Override
     public boolean decide(HttpServletRequest authRequest) {
-        log.debug("正在访问的url是:{}，method:{}", authRequest.getServletPath(), authRequest.getMethod());
+        log.debug("正在访问的url是:{}，method:{}，ip{}，port{}",
+                authRequest.getServletPath(),
+                authRequest.getMethod(),
+                authRequest.getRemoteHost(),
+                authRequest.getRemotePort());
         //获取用户认证信息
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+        log.debug("authentication:",authentication.toString());
         //获取此url，method访问对应的权限资源信息
         ConfigAttribute urlConfigAttribute = resourceService.findConfigAttributesByUrl(authRequest);
-        if (NONEXISTENT_URL.equals(urlConfigAttribute.getAttribute()))
+        log.debug("urlConfigAttribute.toString()");
+        log.debug(urlConfigAttribute.toString());
+        if (NONEXISTENT_URL.equals(urlConfigAttribute.getAttribute())) {
             log.debug("url未在资源池中找到，拒绝访问");
+        }
         //获取此访问用户所有角色拥有的权限资源
         Set<Resource> userResources = findResourcesByUsername(authentication.getName());
         //用户拥有权限资源 与 url要求的资源进行对比

auth/authentication-server/src/main/java/com/springboot/cloud/auth/authentication/service/impl/ResourceService.java

@@ -70,6 +70,11 @@ public synchronized void loadResource() {
 
     @Override
     public ConfigAttribute findConfigAttributesByUrl(HttpServletRequest authRequest) {
+
+        log.debug("========findConfigAttributesByUrl==============");
+        log.debug(resourceConfigAttributes.toString());
+        log.debug("===============================================");
+
         return resourceConfigAttributes.keySet().stream()
                 .filter(requestMatcher -> requestMatcher.matches(authRequest))
                 .map(requestMatcher -> resourceConfigAttributes.get(requestMatcher))
@@ -94,4 +99,4 @@ public Set<Resource> queryByUsername(String username) {
     private MvcRequestMatcher newMvcRequestMatcher(String url, String method) {
         return new NewMvcRequestMatcher(mvcHandlerMappingIntrospector, url, method);
     }
-}
+}

auth/authorization-server/src/main/java/com/springboot/auth/authorization/oauth2/CustomUserDetailsService.java

@@ -28,7 +28,7 @@ public class CustomUserDetailsService implements UserDetailsService {
     public UserDetails loadUserByUsername(String uniqueId) {
 
         User user = userService.getByUniqueId(uniqueId);
-        log.info("load user by username :{}", user.toString());
+        log.info("load user by username :{}", user.getId().toString());
 
         return new org.springframework.security.core.userdetails.User(
                 user.getUsername(),

common/core/src/main/java/com/springboot/cloud/common/core/constants/CommonConstants.java

@@ -0,0 +1,19 @@
+package com.springboot.cloud.common.core.constants;
+
+/**
+ * @author: dongwei
+ * @date: 2020/08/15 15:18
+ * @description:
+ */
+public interface CommonConstants {
+
+    /**
+     * 树的根节点值
+     */
+    Integer TREE_ROOT = -1;
+
+    String SPRINGCLOUD_REDIS_LIST_LEY = "springcloud_client_id_to_access:cloud";
+
+
+
+}

common/core/src/main/java/com/springboot/cloud/common/core/enums/DataStatusEnum.java

@@ -0,0 +1,30 @@
+package com.springboot.cloud.common.core.enums;
+
+/**
+ * @author: dongwei
+ * @date: 2020/08/15 10:41
+ * @description: 用户状态枚举
+ */
+public enum DataStatusEnum {
+
+    NORMAL("0", "正常"),
+    LOCK("1","删除");
+
+
+    private String code;
+
+    private String message;
+
+    DataStatusEnum(String code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+}

common/core/src/main/java/com/springboot/cloud/common/core/enums/ResourceTypeEnum.java

@@ -0,0 +1,29 @@
+package com.springboot.cloud.common.core.enums;
+
+/**
+ * @author: dongwei
+ * @date: 2020/08/15 16:03
+ * @description: 资源类型枚举
+ */
+public enum ResourceTypeEnum {
+    MENU("0", "菜单"),
+    BUTTON("1","按钮");
+
+
+    private String code;
+
+    private String message;
+
+    ResourceTypeEnum(String code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+}

sysadmin/organization/src/main/java/com/springboot/cloud/sysadmin/organization/entity/dto/SysResourceTree.java

@@ -0,0 +1,102 @@
+package com.springboot.cloud.sysadmin.organization.entity.dto;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * @author: dongwei
+ * @date: 2020/08/15 13:35
+ * @description: 资源树
+ */
+@Data
+public class SysResourceTree {
+
+    /**
+     * 子节点
+     */
+    private List<SysResourceTree> children;
+
+
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 资源名称
+     */
+    private String name;
+
+    /**
+     * 资源类型 0-菜单 1-按钮
+     */
+    private String type;
+
+    /**
+     * 前端url
+     */
+    private String path;
+
+    /**
+     * 按钮权限资源标识
+     */
+    private String code;
+
+    /**
+     * 颜色
+     */
+    private String color;
+
+    /**
+     * 父资源id
+     */
+    private Integer parentId;
+
+    /**
+     * 图标
+     */
+    private String icon;
+
+    /**
+     * 组件路径
+     */
+    private String component;
+
+    /**
+     * 排序权重
+     */
+    private Integer sort;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime modifyTime;
+
+    /**
+     * 是否删除 1-删除，0-未删除
+     */
+    private String delFlag;
+
+    /**
+     * 后台请求url
+     */
+    private String url;
+
+
+    /**
+     * 请求方式
+     */
+    private String method;
+
+    public void addChildren(SysResourceTree tree) {
+        this.children.add(tree);
+    }
+
+}

sysadmin/organization/src/main/java/com/springboot/cloud/sysadmin/organization/entity/dto/SysRoleDTO.java

@@ -0,0 +1,52 @@
+package com.springboot.cloud.sysadmin.organization.entity.dto;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * @author: dongwei
+ * @date: 2020/08/15 13:35
+ * 权限
+ */
+@Data
+public class SysRoleDTO {
+
+
+    /**
+     * 主键
+     */
+    private Integer roleId;
+
+    /**
+     * 角色code用于springsecurity角色标识码
+     */
+    private String roleCode;
+
+    /**
+     * 角色名称
+     */
+    private String roleName;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime modifyTime;
+
+    /**
+     * 是否删除 1-删除，0-未删除
+     */
+    private String delFlag;
+
+    /**
+     * 绑定的资源id集合
+     */
+    private List<Integer> sysResourceIds;
+
+}

sysadmin/organization/src/main/java/com/springboot/cloud/sysadmin/organization/entity/dto/SysUserInfoDTO.java

@@ -0,0 +1,20 @@
+package com.springboot.cloud.sysadmin.organization.entity.dto;
+
+import com.springboot.cloud.sysadmin.organization.entity.po.User;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author: dongwei
+ * @date: 2020/08/15 13:35
+ */
+@Data
+public class SysUserInfoDTO {
+
+    private User sysUser;
+
+    private List<String> roles;
+
+    private List<String> permissions;
+}