mirror of https://github.com/longtai-cn/hippo4j
Binding a user to a Tenant (#792)
chen.ma
3 years ago
parent
61c1e4d97f
commit
0c3c2f6afb
@ -1,71 +0,0 @@
|
|||||||
/*
|
|
||||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
||||||
* contributor license agreements. See the NOTICE file distributed with
|
|
||||||
* this work for additional information regarding copyright ownership.
|
|
||||||
* The ASF licenses this file to You under the Apache License, Version 2.0
|
|
||||||
* (the "License"); you may not use this file except in compliance with
|
|
||||||
* the License. You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package cn.hippo4j.auth.model;
|
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.FieldFill;
|
|
||||||
import com.baomidou.mybatisplus.annotation.IdType;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableField;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableLogic;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
import java.util.Date;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Role info.
|
|
||||||
*/
|
|
||||||
@Data
|
|
||||||
@TableName("role")
|
|
||||||
public class RoleInfo {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* id
|
|
||||||
*/
|
|
||||||
@TableId(type = IdType.AUTO)
|
|
||||||
private Long id;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* role
|
|
||||||
*/
|
|
||||||
private String role;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* userName
|
|
||||||
*/
|
|
||||||
private String userName;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* gmtCreate
|
|
||||||
*/
|
|
||||||
@TableField(fill = FieldFill.INSERT)
|
|
||||||
private Date gmtCreate;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* gmtModified
|
|
||||||
*/
|
|
||||||
@TableField(fill = FieldFill.INSERT_UPDATE)
|
|
||||||
private Date gmtModified;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* delFlag
|
|
||||||
*/
|
|
||||||
@TableLogic
|
|
||||||
@TableField(fill = FieldFill.INSERT)
|
|
||||||
private Integer delFlag;
|
|
||||||
}
|
|
||||||
@ -1,94 +0,0 @@
|
|||||||
/*
|
|
||||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
||||||
* contributor license agreements. See the NOTICE file distributed with
|
|
||||||
* this work for additional information regarding copyright ownership.
|
|
||||||
* The ASF licenses this file to You under the Apache License, Version 2.0
|
|
||||||
* (the "License"); you may not use this file except in compliance with
|
|
||||||
* the License. You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package cn.hippo4j.auth.service.impl;
|
|
||||||
|
|
||||||
import cn.hippo4j.auth.mapper.RoleMapper;
|
|
||||||
import cn.hippo4j.auth.model.biz.role.RoleQueryPageReqDTO;
|
|
||||||
import cn.hippo4j.auth.model.biz.role.RoleRespDTO;
|
|
||||||
import cn.hippo4j.auth.service.PermissionService;
|
|
||||||
import cn.hippo4j.auth.service.RoleService;
|
|
||||||
import cn.hippo4j.common.toolkit.BeanUtil;
|
|
||||||
import cn.hippo4j.common.toolkit.CollectionUtil;
|
|
||||||
import cn.hippo4j.common.toolkit.StringUtil;
|
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
||||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
||||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
||||||
import cn.hippo4j.auth.model.RoleInfo;
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import org.springframework.stereotype.Service;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Role service impl.
|
|
||||||
*/
|
|
||||||
@Service
|
|
||||||
@AllArgsConstructor
|
|
||||||
public class RoleServiceImpl implements RoleService {
|
|
||||||
|
|
||||||
private final RoleMapper roleMapper;
|
|
||||||
|
|
||||||
private final PermissionService permissionService;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public IPage<RoleRespDTO> listRole(int pageNo, int pageSize) {
|
|
||||||
RoleQueryPageReqDTO queryPage = new RoleQueryPageReqDTO(pageNo, pageSize);
|
|
||||||
IPage<RoleInfo> selectPage = roleMapper.selectPage(queryPage, null);
|
|
||||||
return selectPage.convert(each -> BeanUtil.convert(each, RoleRespDTO.class));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void addRole(String role, String userName) {
|
|
||||||
LambdaQueryWrapper<RoleInfo> queryWrapper = Wrappers.lambdaQuery(RoleInfo.class)
|
|
||||||
.eq(RoleInfo::getRole, role);
|
|
||||||
RoleInfo roleInfo = roleMapper.selectOne(queryWrapper);
|
|
||||||
if (roleInfo != null) {
|
|
||||||
throw new RuntimeException("角色名重复");
|
|
||||||
}
|
|
||||||
RoleInfo insertRole = new RoleInfo();
|
|
||||||
insertRole.setRole(role);
|
|
||||||
insertRole.setUserName(userName);
|
|
||||||
roleMapper.insert(insertRole);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void deleteRole(String role, String userName) {
|
|
||||||
List<String> roleStrList = CollectionUtil.toList(role);
|
|
||||||
if (StringUtil.isBlank(role)) {
|
|
||||||
LambdaQueryWrapper<RoleInfo> queryWrapper = Wrappers.lambdaQuery(RoleInfo.class).eq(RoleInfo::getUserName, userName);
|
|
||||||
roleStrList = roleMapper.selectList(queryWrapper).stream().map(RoleInfo::getRole).collect(Collectors.toList());
|
|
||||||
}
|
|
||||||
LambdaUpdateWrapper<RoleInfo> updateWrapper = Wrappers.lambdaUpdate(RoleInfo.class)
|
|
||||||
.eq(StringUtil.isNotBlank(role), RoleInfo::getRole, role)
|
|
||||||
.eq(StringUtil.isNotBlank(userName), RoleInfo::getUserName, userName);
|
|
||||||
roleMapper.delete(updateWrapper);
|
|
||||||
roleStrList.forEach(each -> permissionService.deletePermission(each, "", ""));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<String> getRoleLike(String role) {
|
|
||||||
LambdaQueryWrapper<RoleInfo> queryWrapper = Wrappers.lambdaQuery(RoleInfo.class)
|
|
||||||
.like(RoleInfo::getRole, role)
|
|
||||||
.select(RoleInfo::getRole);
|
|
||||||
List<RoleInfo> roleInfos = roleMapper.selectList(queryWrapper);
|
|
||||||
List<String> roleNames = roleInfos.stream().map(RoleInfo::getRole).collect(Collectors.toList());
|
|
||||||
return roleNames;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,60 +0,0 @@
|
|||||||
/*
|
|
||||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
||||||
* contributor license agreements. See the NOTICE file distributed with
|
|
||||||
* this work for additional information regarding copyright ownership.
|
|
||||||
* The ASF licenses this file to You under the Apache License, Version 2.0
|
|
||||||
* (the "License"); you may not use this file except in compliance with
|
|
||||||
* the License. You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package cn.hippo4j.console.controller;
|
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
||||||
import cn.hippo4j.auth.model.biz.permission.PermissionRespDTO;
|
|
||||||
import cn.hippo4j.auth.service.PermissionService;
|
|
||||||
import cn.hippo4j.common.web.base.Result;
|
|
||||||
import cn.hippo4j.common.web.base.Results;
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
import org.springframework.web.bind.annotation.PathVariable;
|
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Permission controller.
|
|
||||||
*/
|
|
||||||
@RestController
|
|
||||||
@AllArgsConstructor
|
|
||||||
@RequestMapping("/v1/auth/permissions")
|
|
||||||
public class PermissionController {
|
|
||||||
|
|
||||||
private final PermissionService permissionService;
|
|
||||||
|
|
||||||
@GetMapping("/{pageNo}/{pageSize}")
|
|
||||||
public Result<IPage<PermissionRespDTO>> listPermission(@PathVariable("pageNo") int pageNo, @PathVariable("pageSize") int pageSize) {
|
|
||||||
IPage<PermissionRespDTO> resultPermissionPage = permissionService.listPermission(pageNo, pageSize);
|
|
||||||
return Results.success(resultPermissionPage);
|
|
||||||
}
|
|
||||||
|
|
||||||
@PostMapping("/{role}/{resource}/{action}")
|
|
||||||
public Result<Void> addPermission(@PathVariable("role") String role, @PathVariable("resource") String resource, @PathVariable("action") String action) {
|
|
||||||
permissionService.addPermission(role, resource, action);
|
|
||||||
return Results.success();
|
|
||||||
}
|
|
||||||
|
|
||||||
@DeleteMapping("/{role}/{resource}/{action}")
|
|
||||||
public Result<Void> deleteUser(@PathVariable("role") String role, @PathVariable("resource") String resource, @PathVariable("action") String action) {
|
|
||||||
permissionService.deletePermission(role, resource, action);
|
|
||||||
return Results.success();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,68 +0,0 @@
|
|||||||
/*
|
|
||||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
||||||
* contributor license agreements. See the NOTICE file distributed with
|
|
||||||
* this work for additional information regarding copyright ownership.
|
|
||||||
* The ASF licenses this file to You under the Apache License, Version 2.0
|
|
||||||
* (the "License"); you may not use this file except in compliance with
|
|
||||||
* the License. You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package cn.hippo4j.console.controller;
|
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
||||||
import cn.hippo4j.auth.model.biz.role.RoleRespDTO;
|
|
||||||
import cn.hippo4j.auth.service.RoleService;
|
|
||||||
import cn.hippo4j.common.web.base.Result;
|
|
||||||
import cn.hippo4j.common.web.base.Results;
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
import org.springframework.web.bind.annotation.PathVariable;
|
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Role controller.
|
|
||||||
*/
|
|
||||||
@RestController
|
|
||||||
@AllArgsConstructor
|
|
||||||
@RequestMapping("/v1/auth/roles")
|
|
||||||
public class RoleController {
|
|
||||||
|
|
||||||
private final RoleService roleService;
|
|
||||||
|
|
||||||
@GetMapping("/{pageNo}/{pageSize}")
|
|
||||||
public Result<IPage<RoleRespDTO>> listUser(@PathVariable("pageNo") int pageNo, @PathVariable("pageSize") int pageSize) {
|
|
||||||
IPage<RoleRespDTO> resultRolePage = roleService.listRole(pageNo, pageSize);
|
|
||||||
return Results.success(resultRolePage);
|
|
||||||
}
|
|
||||||
|
|
||||||
@PostMapping("/{role}/{userName}")
|
|
||||||
public Result<Void> addUser(@PathVariable("role") String role, @PathVariable("userName") String userName) {
|
|
||||||
roleService.addRole(role, userName);
|
|
||||||
return Results.success();
|
|
||||||
}
|
|
||||||
|
|
||||||
@DeleteMapping("/{role}/{userName}")
|
|
||||||
public Result<Void> deleteUser(@PathVariable("role") String role, @PathVariable("userName") String userName) {
|
|
||||||
roleService.deleteRole(role, userName);
|
|
||||||
return Results.success();
|
|
||||||
}
|
|
||||||
|
|
||||||
@GetMapping("/search/{role}")
|
|
||||||
public Result<List<String>> searchUsersLikeUserName(@PathVariable("role") String role) {
|
|
||||||
List<String> resultRole = roleService.getRoleLike(role);
|
|
||||||
return Results.success(resultRole);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
Reference in new issue