接入日志

authorize-api-service/src/main/java/com/xy/entity/SysRoleMenu.java

@@ -30,10 +30,6 @@ public class SysRoleMenu extends BaseEntity<SysRoleMenu> {
      */
     private Long menuId;
 
-    /**
-     * 管理员数据查询权限
-     */
-    private Boolean selectIsAdmin;
     /**
      * 系统ID
      */

authorize-api-service/src/main/java/com/xy/redis/RedisCache.java

@@ -1,7 +1,5 @@
 package com.xy.redis;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.xy.collections.list.JArrayList;
 import com.xy.collections.list.JList;
 import com.xy.collections.map.JMap;
@@ -90,7 +88,6 @@ public class RedisCache extends AuthorizeUtils {
                 .eq(SysMenu::getStatus, true)
                 .innerJoin(SysRoleMenu.class, SysRoleMenu::getMenuId, SysMenu::getId)
                 .selectAs(cb -> cb
-                        .add(SysRoleMenu::getSelectIsAdmin)
                         .add(SysRoleMenu::getRoleId)
                 )
                 .in(SysRoleMenu::getRoleId, sysRoleIds)
@@ -132,21 +129,4 @@ public class RedisCache extends AuthorizeUtils {
         return request.getRequestURI();
     }
 
-    /**
-     * 判断数据查询权限
-     *
-     * @param lambdaQueryWrapper 查询构造器
-     * @param function           普通查询权限时，条件lambda引用字段
-     * @return true=管理员数据查询权限 false=普通查询权限
-     */
-    public static <T> boolean getDataAuth(Long systemId, LambdaQueryWrapper<T> lambdaQueryWrapper, SFunction<T, ?> function) {
-        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
-        boolean dataAuth = authByData(systemId, request.getRequestURI());
-        if (!dataAuth) {
-            lambdaQueryWrapper.eq(function, getLoginId(Long.class));
-            return false;
-        }
-        return true;
-    }
-
 }

authorize-api-service/src/main/java/com/xy/service/impl/AuthorizeServiceImpl.java

@@ -76,13 +76,6 @@ public class AuthorizeServiceImpl implements AuthorizeService {
         return R.ok(b);
     }
 
-    @Override
-    @ApiOperation("数据鉴权")
-    public R<Boolean> authByData(AuthorizeDto authorizeDto) {
-        boolean b = RedisCache.authByData(authorizeDto.getSystemId(), authorizeDto.getUri());
-        return R.ok(b);
-    }
-
     @Override
     @ApiOperation("获取登录id")
     public R<Object> getLoginId() {

authorize-api-service/src/main/java/com/xy/service/impl/SysDeptServiceImpl.java

@@ -108,8 +108,6 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
         String deptName = sysDeptListDto.getName();
         LambdaQueryWrapper<SysDept> lambdaQueryWrapper = Wrappers.<SysDept>lambdaQuery().eq(SysDept::getSysId, sysId)
                 .likeRight(StrUtil.isNotBlank(deptName), SysDept::getName, deptName);
-        RedisCache.getDataAuth(sysId, lambdaQueryWrapper, SysDept::getCreateUser);
-
         List<Tree<Long>> deptTree = getDeptTree(this.list(lambdaQueryWrapper), 0L);
         return R.ok(deptTree);
     }

authorize-api-service/src/main/java/com/xy/service/impl/SysMenuServiceImpl.java

@@ -101,8 +101,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
         SysRoleMenu sysRoleMenu = new SysRoleMenu()
                 .createId()
                 .setMenuId(sysMenu.getId())
-                .setRoleId(sysRole.getId())
-                .setSelectIsAdmin(true);
+                .setRoleId(sysRole.getId());
         sysRoleMenuMapper.insert(sysRoleMenu);
         return R.ok();
     }

authorize-api-service/src/main/java/com/xy/service/impl/SysWorkUserServiceImpl.java

@@ -216,15 +216,18 @@ public class SysWorkUserServiceImpl extends ServiceImpl<SysWorkUserMapper, SysWo
         if (!Emptys.check(page.getOrders())) {
             joinLambdaWrapper.orderByDesc(SysWorkUser::getCreateTime);
         }
-        //数据鉴权
-        boolean authByData = RedisCache.authByData(RedisCache.getSystemId(), RedisCache.getUri());
-        if (!authByData) {
-            joinLambdaWrapper.eq(SysWorkUser::getCreateUser, RedisCache.getLoginId(Long.class));
-        }
         //查询数据
         IPage<SysWorkVo> sysWorkUserIPage = baseMapper.joinSelectPage(toIPage(page), joinLambdaWrapper, SysWorkVo.class);
         List<SysWorkVo> records = sysWorkUserIPage.getRecords();
         records.forEach(sysWorkVo -> sysWorkVo.setPassword(null));
         return R.ok(toPageBean(sysWorkUserIPage));
     }
+
+    @ApiOperation("根据创建人分页查询")
+    @PostMapping("pageByCreateUser")
+    public R<PageBean<SysWorkVo>> pageByCreateUser(@RequestBody PageDto pageDto) {
+        Long loginId = RedisCache.getLoginId(Long.class);
+        pageDto.setCreateUser(loginId);
+        return page(pageDto);
+    }
 }

authorize-api/src/main/java/com/xy/dto/SysWorkUser/PageDto.java

@@ -42,6 +42,9 @@ public class PageDto {
     @ApiModelProperty(value = "部门ID")
     private Long deptId;
 
+    @ApiModelProperty(value = "创建人")
+    private Long createUser;
+
     @JsonFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "创建时间-起")
     private LocalDate beginCreateTime;

authorize-api/src/main/java/com/xy/service/AuthorizeService.java

@@ -83,14 +83,6 @@ public interface AuthorizeService {
     @PostMapping("authByInterface")
     R<Boolean> authByInterface(@RequestBody AuthorizeDto authorizeDto);
 
-    /**
-     * 数据鉴权
-     *
-     * @return
-     */
-    @PostMapping("authByData")
-    R<Boolean> authByData(@RequestBody AuthorizeDto authorizeDto);
-
     /**
      * 获取登录id
      *

authorize-sdk/src/main/java/com/xy/entity/SysMenuJoinSysRoleMenu.java

@@ -23,11 +23,6 @@ public class SysMenuJoinSysRoleMenu implements Serializable {
      */
     private Long roleId;
 
-    /**
-     * 管理员数据查询权限
-     */
-    private Boolean selectIsAdmin;
-
     /**
      * 子级集合
      */

authorize-sdk/src/main/java/com/xy/utils/AuthorizeUtils.java

@@ -523,56 +523,6 @@ public class AuthorizeUtils {
         return authByInterface(getToken(), systemId, uri);
     }
 
-    /**
-     * 数据鉴权
-     *
-     * @param token    token
-     * @param systemId 系统id
-     * @param uri      接口uri
-     * @return
-     */
-    public static boolean authByData(String token, Long systemId, String uri) {
-        {
-            //远程调用
-            AuthorizeConfig authorizeConfig = getAuthorizeConfig();
-            if (!authorizeConfig.getIsNative()) {
-                JSONObject jsonObject = new JSONObject().set("systemId", systemId).set("uri", uri);
-                Object obj = send("/authorize/authByData", token, jsonObject);
-                if (obj == null) {
-                    return false;
-                }
-                return Boolean.valueOf(obj.toString());
-            }
-        }
-        //获取redis缓存
-        List<AuthorizeUtils.CacheEntity> cacheEntities = getRedisService().getMap(getKey(getLoginId(token, Long.class)), systemId.toString());
-        if (!Emptys.check(cacheEntities)) {
-            return false;
-        }
-        //遍历角色
-        for (AuthorizeUtils.CacheEntity cacheEntity : cacheEntities) {
-            //根据 接口uri和管理员数据查询权限=true 查找角色菜单，找到则有管理员数据查询权限，反之普通查询权限
-            SysMenuJoinSysRoleMenu sysMenuJoinSysRoleMenu = new JArrayList<>(cacheEntity.getList()).filter()
-                    .eq(SysMenuJoinSysRoleMenu::getInterfaceUri, uri)
-                    .eq(SysMenuJoinSysRoleMenu::getSelectIsAdmin, true)
-                    .object();
-            if (sysMenuJoinSysRoleMenu != null) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * 数据鉴权
-     *
-     * @param uri
-     * @return
-     */
-    public static boolean authByData(Long systemId, String uri) {
-        return authByData(getToken(), systemId, uri);
-    }
-
     @Data
     @Accessors(chain = true)
     public static class CacheEntity implements Serializable {

doc/init.sql

@@ -94,67 +94,67 @@ values(28, 24, 1, 'system_value_edit', '编辑系统属性', 2, '/sys-system-val
 
 -- 新增角色菜单关联
 delete from sys_role_menu where id in(10000, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 100, 101, 300);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
-values(10000, 1, 10000, true, 1);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
-values(1, 1, 1, true, 1);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
-values(2, 1, 2, true, 1);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
-values(3, 1, 3, true, 1);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
-values(4, 1, 4, true, 1);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
-values(5, 1, 5, true, 1);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
-values(6, 1, 6, true, 1);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
-values(7, 1, 7, true, 1);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
-values(8, 1, 8, true, 1);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
-values(9, 1, 9, true, 1);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
-values(10, 1, 10, true, 1);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
-values(11, 1, 11, true, 1);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
-values(12, 1, 12, true, 1);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
-values(13, 1, 13, true, 1);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
-values(14, 1, 14, true, 1);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
-values(15, 1, 15, true, 1);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
-values(16, 1, 16, true, 1);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
-values(17, 1, 17, true, 1);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
-values(18, 1, 18, true, 1);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
-values(19, 1, 19, true, 1);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
-values(20, 1, 20, true, 1);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
-values(21, 1, 21, true, 1);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
-values(22, 1, 22, true, 1);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
-values(23, 1, 23, true, 1);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
-values(24, 1, 24, true, 1);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
-values(25, 1, 25, true, 1);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
-values(26, 1, 26, true, 1);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
-values(27, 1, 27, true, 1);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
-values(28, 1, 28, true, 1);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
-values(100, 1, 100, true, 1);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
-values(101, 1, 101, true, 1);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
-values(300, 1, 300, true, 1);
+insert into sys_role_menu(id, role_id, menu_id, sys_id)
+values(10000, 1, 10000, 1);
+insert into sys_role_menu(id, role_id, menu_id, sys_id)
+values(1, 1, 1, 1);
+insert into sys_role_menu(id, role_id, menu_id, sys_id)
+values(2, 1, 2, 1);
+insert into sys_role_menu(id, role_id, menu_id, sys_id)
+values(3, 1, 3, 1);
+insert into sys_role_menu(id, role_id, menu_id, sys_id)
+values(4, 1, 4, 1);
+insert into sys_role_menu(id, role_id, menu_id, sys_id)
+values(5, 1, 5, 1);
+insert into sys_role_menu(id, role_id, menu_id, sys_id)
+values(6, 1, 6, 1);
+insert into sys_role_menu(id, role_id, menu_id, sys_id)
+values(7, 1, 7, 1);
+insert into sys_role_menu(id, role_id, menu_id, sys_id)
+values(8, 1, 8, 1);
+insert into sys_role_menu(id, role_id, menu_id, sys_id)
+values(9, 1, 9, 1);
+insert into sys_role_menu(id, role_id, menu_id, sys_id)
+values(10, 1, 10, 1);
+insert into sys_role_menu(id, role_id, menu_id, sys_id)
+values(11, 1, 11, 1);
+insert into sys_role_menu(id, role_id, menu_id, sys_id)
+values(12, 1, 12, 1);
+insert into sys_role_menu(id, role_id, menu_id, sys_id)
+values(13, 1, 13, 1);
+insert into sys_role_menu(id, role_id, menu_id, sys_id)
+values(14, 1, 14, 1);
+insert into sys_role_menu(id, role_id, menu_id, sys_id)
+values(15, 1, 15, 1);
+insert into sys_role_menu(id, role_id, menu_id, sys_id)
+values(16, 1, 16, 1);
+insert into sys_role_menu(id, role_id, menu_id, sys_id)
+values(17, 1, 17, 1);
+insert into sys_role_menu(id, role_id, menu_id, sys_id)
+values(18, 1, 18, 1);
+insert into sys_role_menu(id, role_id, menu_id, sys_id)
+values(19, 1, 19, 1);
+insert into sys_role_menu(id, role_id, menu_id, sys_id)
+values(20, 1, 20, 1);
+insert into sys_role_menu(id, role_id, menu_id, sys_id)
+values(21, 1, 21, 1);
+insert into sys_role_menu(id, role_id, menu_id, sys_id)
+values(22, 1, 22, 1);
+insert into sys_role_menu(id, role_id, menu_id, sys_id)
+values(23, 1, 23, 1);
+insert into sys_role_menu(id, role_id, menu_id, sys_id)
+values(24, 1, 24, 1);
+insert into sys_role_menu(id, role_id, menu_id, sys_id)
+values(25, 1, 25, 1);
+insert into sys_role_menu(id, role_id, menu_id, sys_id)
+values(26, 1, 26, 1);
+insert into sys_role_menu(id, role_id, menu_id, sys_id)
+values(27, 1, 27, 1);
+insert into sys_role_menu(id, role_id, menu_id, sys_id)
+values(28, 1, 28, 1);
+insert into sys_role_menu(id, role_id, menu_id, sys_id)
+values(100, 1, 100, 1);
+insert into sys_role_menu(id, role_id, menu_id, sys_id)
+values(101, 1, 101, 1);
+insert into sys_role_menu(id, role_id, menu_id, sys_id)
+values(300, 1, 300, 1);