Tenlion/wg-basic
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整权限

Browse Source
This commit is contained in:
WenG 2021-02-25 09:27:57 +08:00
parent f00c289402
commit 11d312332a
18 changed files with 32 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -20,7 +20,7 @@
<module>service-role</module> <module>service-role</module>
<module>module-file</module> <module>module-file</module>
<module>module-dictionary</module> <module>module-dictionary</module>
<module>module-permission</module> <module>service-permission</module>
<module>service-menu</module> <module>service-menu</module>
<module>service-oauth-client</module> <module>service-oauth-client</module>
<module>service-group</module> <module>service-group</module>

2
module-permission/pom.xml → service-permission/pom.xml
View File

@ -9,7 +9,7 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>module-permission</artifactId> <artifactId>service-permission</artifactId>
<description>权限模块</description> <description>权限模块</description>
<dependencies> <dependencies>

13
module-permission/src/main/java/ink/wgink/module/permission/controller/api/PermissionController.java → service-permission/src/main/java/ink/wgink/service/permission/controller/api/PermissionController.java
View File

@ -1,11 +1,9 @@
package ink.wgink.module.permission.controller.api; package ink.wgink.service.permission.controller.api;
import ink.wgink.annotation.CheckRequestBodyAnnotation; import ink.wgink.annotation.CheckRequestBodyAnnotation;
import ink.wgink.common.base.DefaultBaseController; import ink.wgink.common.base.DefaultBaseController;
import ink.wgink.common.component.SecurityComponent;
import ink.wgink.exceptions.ParamsException; import ink.wgink.exceptions.ParamsException;
import ink.wgink.interfaces.consts.ISystemConstant; import ink.wgink.interfaces.consts.ISystemConstant;
import ink.wgink.module.permission.pojo.vos.SystemApiVO;
import ink.wgink.pojo.ListPage; import ink.wgink.pojo.ListPage;
import ink.wgink.pojo.dtos.permission.PermissionDTO; import ink.wgink.pojo.dtos.permission.PermissionDTO;
import ink.wgink.pojo.dtos.permission.PermissionGroupDTO; import ink.wgink.pojo.dtos.permission.PermissionGroupDTO;
@ -13,12 +11,12 @@ import ink.wgink.pojo.result.ErrorResult;
import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResult;
import ink.wgink.pojo.result.SuccessResultData; import ink.wgink.pojo.result.SuccessResultData;
import ink.wgink.pojo.result.SuccessResultList; import ink.wgink.pojo.result.SuccessResultList;
import ink.wgink.module.permission.pojo.vos.PermissionVO; import ink.wgink.service.permission.pojo.vos.PermissionVO;
import ink.wgink.module.permission.service.IPermissionService; import ink.wgink.service.permission.pojo.vos.SystemApiVO;
import ink.wgink.service.permission.service.IPermissionService;
import io.swagger.annotations.*; import io.swagger.annotations.*;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.AntPathMatcher;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.Arrays; import java.util.Arrays;
@ -39,9 +37,6 @@ public class PermissionController extends DefaultBaseController {
@Autowired @Autowired
private IPermissionService permissionService; private IPermissionService permissionService;
@Autowired
private SecurityComponent securityComponent;
private AntPathMatcher antPathMatcher = new AntPathMatcher();
@ApiOperation(value = "新增权限", notes = "新增权限接口") @ApiOperation(value = "新增权限", notes = "新增权限接口")
@ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})

2
module-permission/src/main/java/ink/wgink/module/permission/controller/route/PermissionRouteController.java → service-permission/src/main/java/ink/wgink/service/permission/controller/route/PermissionRouteController.java
View File

@ -1,4 +1,4 @@
package ink.wgink.module.permission.controller.route; package ink.wgink.service.permission.controller.route;
import ink.wgink.interfaces.consts.ISystemConstant; import ink.wgink.interfaces.consts.ISystemConstant;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;

2
module-permission/src/main/java/ink/wgink/module/permission/dao/IPermissionDao.java → service-permission/src/main/java/ink/wgink/service/permission/dao/IPermissionDao.java
View File

@ -1,4 +1,4 @@
package ink.wgink.module.permission.dao; package ink.wgink.service.permission.dao;
import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.RemoveException;
import ink.wgink.exceptions.SaveException; import ink.wgink.exceptions.SaveException;

2
module-permission/src/main/java/ink/wgink/module/permission/enums/PermissionTypeEnum.java → service-permission/src/main/java/ink/wgink/service/permission/enums/PermissionTypeEnum.java
View File

@ -1,4 +1,4 @@
package ink.wgink.module.permission.enums; package ink.wgink.service.permission.enums;
/** /**
* When you feel like quitting. Think about why you started * When you feel like quitting. Think about why you started

4
module-permission/src/main/java/ink/wgink/module/permission/pojo/vos/PermissionVO.java → service-permission/src/main/java/ink/wgink/service/permission/pojo/vos/PermissionVO.java
View File

@ -1,8 +1,8 @@
package ink.wgink.module.permission.pojo.vos; package ink.wgink.service.permission.pojo.vos;
import ink.wgink.annotation.CheckEmptyAnnotation; import ink.wgink.annotation.CheckEmptyAnnotation;
import ink.wgink.annotation.CheckNumberAnnotation; import ink.wgink.annotation.CheckNumberAnnotation;
import ink.wgink.module.permission.service.IPermissionService; import ink.wgink.service.permission.service.IPermissionService;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;

2
module-permission/src/main/java/ink/wgink/module/permission/pojo/vos/SystemApiVO.java → service-permission/src/main/java/ink/wgink/service/permission/pojo/vos/SystemApiVO.java
View File

@ -1,4 +1,4 @@
package ink.wgink.module.permission.pojo.vos; package ink.wgink.service.permission.pojo.vos;
import ink.wgink.annotation.CheckEmptyAnnotation; import ink.wgink.annotation.CheckEmptyAnnotation;
import ink.wgink.annotation.CheckListAnnotation; import ink.wgink.annotation.CheckListAnnotation;

6
module-permission/src/main/java/ink/wgink/module/permission/service/IPermissionService.java → service-permission/src/main/java/ink/wgink/service/permission/service/IPermissionService.java
View File

@ -1,13 +1,13 @@
package ink.wgink.module.permission.service; package ink.wgink.service.permission.service;
import ink.wgink.interfaces.permission.IPermissionCheckService; import ink.wgink.interfaces.permission.IPermissionCheckService;
import ink.wgink.module.permission.pojo.vos.SystemApiVO; import ink.wgink.service.permission.pojo.vos.SystemApiVO;
import ink.wgink.pojo.ListPage; import ink.wgink.pojo.ListPage;
import ink.wgink.pojo.dtos.permission.PermissionDTO; import ink.wgink.pojo.dtos.permission.PermissionDTO;
import ink.wgink.pojo.dtos.permission.PermissionGroupDTO; import ink.wgink.pojo.dtos.permission.PermissionGroupDTO;
import ink.wgink.pojo.result.SuccessResultData; import ink.wgink.pojo.result.SuccessResultData;
import ink.wgink.pojo.result.SuccessResultList; import ink.wgink.pojo.result.SuccessResultList;
import ink.wgink.module.permission.pojo.vos.PermissionVO; import ink.wgink.service.permission.pojo.vos.PermissionVO;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;

11
module-permission/src/main/java/ink/wgink/module/permission/service/impl/PermissionServiceImpl.java → service-permission/src/main/java/ink/wgink/service/permission/service/impl/PermissionServiceImpl.java
View File

@ -1,22 +1,21 @@
package ink.wgink.module.permission.service.impl; package ink.wgink.service.permission.service.impl;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import ink.wgink.common.base.DefaultBaseService; import ink.wgink.common.base.DefaultBaseService;
import ink.wgink.module.permission.pojo.vos.SystemApiVO; import ink.wgink.service.permission.pojo.vos.SystemApiVO;
import ink.wgink.pojo.ListPage; import ink.wgink.pojo.ListPage;
import ink.wgink.pojo.dtos.permission.PermissionDTO; import ink.wgink.pojo.dtos.permission.PermissionDTO;
import ink.wgink.pojo.dtos.permission.PermissionGroupDTO; import ink.wgink.pojo.dtos.permission.PermissionGroupDTO;
import ink.wgink.pojo.result.SuccessResultData; import ink.wgink.pojo.result.SuccessResultData;
import ink.wgink.pojo.result.SuccessResultList; import ink.wgink.pojo.result.SuccessResultList;
import ink.wgink.module.permission.dao.IPermissionDao; import ink.wgink.service.permission.dao.IPermissionDao;
import ink.wgink.module.permission.pojo.vos.PermissionVO; import ink.wgink.service.permission.pojo.vos.PermissionVO;
import ink.wgink.module.permission.service.IPermissionService; import ink.wgink.service.permission.service.IPermissionService;
import ink.wgink.util.UUIDUtil; import ink.wgink.util.UUIDUtil;
import ink.wgink.util.map.HashMapUtil; import ink.wgink.util.map.HashMapUtil;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.parameters.P;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList; import java.util.ArrayList;

9
module-permission/src/main/java/ink/wgink/module/permission/startup/ModulePermissionStartUp.java → service-permission/src/main/java/ink/wgink/service/permission/startup/ServicePermissionStartUp.java
View File

@ -1,6 +1,7 @@
package ink.wgink.module.permission.startup; package ink.wgink.service.permission.startup;
import ink.wgink.service.permission.dao.IPermissionDao;
import ink.wgink.module.permission.dao.IPermissionDao;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -19,9 +20,9 @@ import org.springframework.stereotype.Component;
* @Version: 1.0 * @Version: 1.0
*/ */
@Component @Component
public class ModulePermissionStartUp implements ApplicationRunner { public class ServicePermissionStartUp implements ApplicationRunner {
private static final Logger LOG = LoggerFactory.getLogger(ModulePermissionStartUp.class); private static final Logger LOG = LoggerFactory.getLogger(ServicePermissionStartUp.class);
@Autowired @Autowired
private IPermissionDao permissionDao; private IPermissionDao permissionDao;

2
module-permission/src/main/resources/mybatis/mapper/permission-mapper.xml → service-permission/src/main/resources/mybatis/mapper/permission-mapper.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="ink.wgink.module.permission.dao.IPermissionDao"> <mapper namespace="ink.wgink.service.permission.dao.IPermissionDao">
<cache flushInterval="3600000"/> <cache flushInterval="3600000"/>

0
module-permission/src/main/resources/templates/permission/list.html → service-permission/src/main/resources/templates/permission/list.html
View File

0
module-permission/src/main/resources/templates/permission/save-quick.html → service-permission/src/main/resources/templates/permission/save-quick.html
View File

0
module-permission/src/main/resources/templates/permission/save.html → service-permission/src/main/resources/templates/permission/save.html
View File

0
module-permission/src/main/resources/templates/permission/update.html → service-permission/src/main/resources/templates/permission/update.html
View File

7
service-role/pom.xml
View File

@ -15,7 +15,12 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>ink.wgink</groupId> <groupId>ink.wgink</groupId>
<artifactId>module-permission</artifactId> <artifactId>service-menu</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>ink.wgink</groupId>
<artifactId>service-permission</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>

4
service-role/src/main/java/ink/wgink/service/role/service/impl/RolePermissionServiceImpl.java
View File

@ -1,17 +1,13 @@
package ink.wgink.service.role.service.impl; package ink.wgink.service.role.service.impl;
import ink.wgink.common.base.DefaultBaseService; import ink.wgink.common.base.DefaultBaseService;
import ink.wgink.pojo.dtos.permission.PermissionDTO;
import ink.wgink.pojo.dtos.role.RolePermissionDTO; import ink.wgink.pojo.dtos.role.RolePermissionDTO;
import ink.wgink.module.permission.service.IPermissionService;
import ink.wgink.service.role.dao.IRolePermissionDao; import ink.wgink.service.role.dao.IRolePermissionDao;
import ink.wgink.service.role.pojo.vos.RolePermissionVO; import ink.wgink.service.role.pojo.vos.RolePermissionVO;
import ink.wgink.service.role.service.IRolePermissionService; import ink.wgink.service.role.service.IRolePermissionService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;