feat:菜单权限模块功能重构

This commit is contained in:
hxrui 2021-01-27 20:17:15 +08:00
parent 1e5755f43e
commit aff6a82dbf
34 changed files with 52 additions and 54 deletions

View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>mall-oms</artifactId> <artifactId>mall-oms</artifactId>
<groupId>com.youlai</groupId> <groupId>com.youlai</groupId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>youlai-mall</artifactId> <artifactId>youlai-mall</artifactId>
<groupId>com.youlai</groupId> <groupId>com.youlai</groupId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@ -18,7 +18,7 @@
</modules> </modules>
<properties> <properties>
<youlai.version>1.0.0-SNAPSHOT</youlai.version> <youlai.version>1.0.0</youlai.version>
</properties> </properties>
<dependencies> <dependencies>

View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>mall-pms</artifactId> <artifactId>mall-pms</artifactId>
<groupId>com.youlai</groupId> <groupId>com.youlai</groupId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>mall-pms</artifactId> <artifactId>mall-pms</artifactId>
<groupId>com.youlai</groupId> <groupId>com.youlai</groupId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@ -76,7 +76,7 @@
<dependency> <dependency>
<groupId>com.youlai</groupId> <groupId>com.youlai</groupId>
<artifactId>sms-api</artifactId> <artifactId>sms-api</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.0</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>

View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>youlai-mall</artifactId> <artifactId>youlai-mall</artifactId>
<groupId>com.youlai</groupId> <groupId>com.youlai</groupId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@ -19,7 +19,7 @@
</modules> </modules>
<properties> <properties>
<youlai.version>1.0.0-SNAPSHOT</youlai.version> <youlai.version>1.0.0</youlai.version>
</properties> </properties>
<dependencies> <dependencies>

View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>youlai-mall</artifactId> <artifactId>youlai-mall</artifactId>
<groupId>com.youlai</groupId> <groupId>com.youlai</groupId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@ -18,7 +18,7 @@
</modules> </modules>
<properties> <properties>
<youlai.version>1.0.0-SNAPSHOT</youlai.version> <youlai.version>1.0.0</youlai.version>
</properties> </properties>
<dependencies> <dependencies>

View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>mall-sms</artifactId> <artifactId>mall-sms</artifactId>
<groupId>com.youlai</groupId> <groupId>com.youlai</groupId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>youlai-mall</artifactId> <artifactId>youlai-mall</artifactId>
<groupId>com.youlai</groupId> <groupId>com.youlai</groupId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@ -18,7 +18,7 @@
</modules> </modules>
<properties> <properties>
<youlai.version>1.0.0-SNAPSHOT</youlai.version> <youlai.version>1.0.0</youlai.version>
</properties> </properties>
<dependencies> <dependencies>

View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>mall-ums</artifactId> <artifactId>mall-ums</artifactId>
<groupId>com.youlai</groupId> <groupId>com.youlai</groupId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -6,7 +6,7 @@
<groupId>com.youlai</groupId> <groupId>com.youlai</groupId>
<artifactId>youlai-mall</artifactId> <artifactId>youlai-mall</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.0</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<modules> <modules>

View File

@ -5,14 +5,14 @@
<parent> <parent>
<artifactId>youlai-admin</artifactId> <artifactId>youlai-admin</artifactId>
<groupId>com.youlai</groupId> <groupId>com.youlai</groupId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>admin-api</artifactId> <artifactId>admin-api</artifactId>
<properties> <properties>
<youlai.version>1.0.0-SNAPSHOT</youlai.version> <youlai.version>1.0.0</youlai.version>
</properties> </properties>
<dependencies> <dependencies>

View File

@ -1,4 +1,4 @@
package com.youlai.admin.pojo; package com.youlai.admin.pojo.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;

View File

@ -1,4 +1,4 @@
package com.youlai.admin.pojo; package com.youlai.admin.pojo.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;

View File

@ -1,4 +1,4 @@
package com.youlai.admin.pojo; package com.youlai.admin.pojo.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;

View File

@ -1,4 +1,4 @@
package com.youlai.admin.pojo; package com.youlai.admin.pojo.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;

View File

@ -1,8 +1,9 @@
package com.youlai.admin.pojo; package com.youlai.admin.pojo.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import com.youlai.common.core.base.BaseEntity; import com.youlai.common.core.base.BaseEntity;
import lombok.Data; import lombok.Data;
@ -15,27 +16,26 @@ import java.util.List;
*/ */
@Data @Data
@JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonInclude(JsonInclude.Include.NON_EMPTY)
@TableName(value = "sys_menu_test")
public class SysMenu extends BaseEntity { public class SysMenu extends BaseEntity {
@TableId(type = IdType.AUTO) @TableId(type = IdType.AUTO)
private Long id; private Long id;
private String title; private String name;
private Long parentId; private Long parentId;
private String name; private Integer type;
private String path; private String path;
private String redirect;
private String icon; private String icon;
private Integer sort; private Integer sort;
private String component;
private String redirect;
private Integer visible; private Integer visible;
private Integer status; private Integer status;

View File

@ -1,4 +1,4 @@
package com.youlai.admin.pojo; package com.youlai.admin.pojo.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;

View File

@ -1,4 +1,4 @@
package com.youlai.admin.pojo; package com.youlai.admin.pojo.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;

View File

@ -1,4 +1,4 @@
package com.youlai.admin.pojo; package com.youlai.admin.pojo.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;

View File

@ -1,4 +1,4 @@
package com.youlai.admin.pojo; package com.youlai.admin.pojo.entity;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;

View File

@ -1,4 +1,4 @@
package com.youlai.admin.pojo; package com.youlai.admin.pojo.entity;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;

View File

@ -1,4 +1,4 @@
package com.youlai.admin.pojo; package com.youlai.admin.pojo.entity;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;

View File

@ -1,4 +1,4 @@
package com.youlai.admin.pojo; package com.youlai.admin.pojo.entity;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;

View File

@ -12,11 +12,11 @@ public class MenuVO extends BaseEntity {
private Integer id; private Integer id;
private String title; private String name;
private Integer parentId; private Integer parentId;
private String name; private Integer type;
private String path; private String path;
@ -28,8 +28,6 @@ public class MenuVO extends BaseEntity {
private Integer status; private Integer status;
private String component;
private List<MenuVO> children; private List<MenuVO> children;
} }

View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>youlai-mall</artifactId> <artifactId>youlai-mall</artifactId>
<groupId>com.youlai</groupId> <groupId>com.youlai</groupId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@ -18,7 +18,7 @@
</modules> </modules>
<properties> <properties>
<youlai.version>1.0.0-SNAPSHOT</youlai.version> <youlai.version>1.0.0</youlai.version>
</properties> </properties>
<dependencies> <dependencies>

View File

@ -5,14 +5,14 @@
<parent> <parent>
<artifactId>youlai-mall</artifactId> <artifactId>youlai-mall</artifactId>
<groupId>com.youlai</groupId> <groupId>com.youlai</groupId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>youlai-auth</artifactId> <artifactId>youlai-auth</artifactId>
<properties> <properties>
<youlai.version>1.0.0-SNAPSHOT</youlai.version> <youlai.version>1.0.0</youlai.version>
</properties> </properties>
<dependencies> <dependencies>

View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>youlai-common</artifactId> <artifactId>youlai-common</artifactId>
<groupId>com.youlai</groupId> <groupId>com.youlai</groupId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>youlai-common</artifactId> <artifactId>youlai-common</artifactId>
<groupId>com.youlai</groupId> <groupId>com.youlai</groupId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>youlai-common</artifactId> <artifactId>youlai-common</artifactId>
<groupId>com.youlai</groupId> <groupId>com.youlai</groupId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>youlai-common</artifactId> <artifactId>youlai-common</artifactId>
<groupId>com.youlai</groupId> <groupId>com.youlai</groupId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>youlai-common</artifactId> <artifactId>youlai-common</artifactId>
<groupId>com.youlai</groupId> <groupId>com.youlai</groupId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -5,14 +5,14 @@
<parent> <parent>
<artifactId>youlai-common</artifactId> <artifactId>youlai-common</artifactId>
<groupId>com.youlai</groupId> <groupId>com.youlai</groupId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>common-web</artifactId> <artifactId>common-web</artifactId>
<properties> <properties>
<youlai.version>1.0.0-SNAPSHOT</youlai.version> <youlai.version>1.0.0</youlai.version>
</properties> </properties>
<dependencies> <dependencies>

View File

@ -7,7 +7,7 @@
<parent> <parent>
<artifactId>youlai-mall</artifactId> <artifactId>youlai-mall</artifactId>
<groupId>com.youlai</groupId> <groupId>com.youlai</groupId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.0</version>
</parent> </parent>
<artifactId>youlai-common</artifactId> <artifactId>youlai-common</artifactId>
@ -31,7 +31,7 @@
<mybatis-plus.version>3.3.1</mybatis-plus.version> <mybatis-plus.version>3.3.1</mybatis-plus.version>
<redisson.version>3.12.5</redisson.version> <redisson.version>3.12.5</redisson.version>
<common-pools.version>2.8.0</common-pools.version> <common-pools.version>2.8.0</common-pools.version>
<youlai.version>1.0.0-SNAPSHOT</youlai.version> <youlai.version>1.0.0</youlai.version>
<dozer.version>6.2.0</dozer.version> <dozer.version>6.2.0</dozer.version>
</properties> </properties>

View File

@ -8,14 +8,14 @@
<parent> <parent>
<artifactId>youlai-mall</artifactId> <artifactId>youlai-mall</artifactId>
<groupId>com.youlai</groupId> <groupId>com.youlai</groupId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.0</version>
</parent> </parent>
<artifactId>youlai-gateway</artifactId> <artifactId>youlai-gateway</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>
<youlai.version>1.0.0-SNAPSHOT</youlai.version> <youlai.version>1.0.0</youlai.version>
</properties> </properties>
<dependencies> <dependencies>