diff --git a/mall-oms/oms-api/pom.xml b/mall-oms/oms-api/pom.xml
index 3a26a1205..519fbe464 100644
--- a/mall-oms/oms-api/pom.xml
+++ b/mall-oms/oms-api/pom.xml
@@ -5,7 +5,7 @@
mall-oms
com.youlai
- 1.0.0-SNAPSHOT
+ 1.0.0
4.0.0
diff --git a/mall-oms/pom.xml b/mall-oms/pom.xml
index 9aee6a31a..73df08035 100644
--- a/mall-oms/pom.xml
+++ b/mall-oms/pom.xml
@@ -5,7 +5,7 @@
youlai-mall
com.youlai
- 1.0.0-SNAPSHOT
+ 1.0.0
4.0.0
@@ -18,7 +18,7 @@
- 1.0.0-SNAPSHOT
+ 1.0.0
diff --git a/mall-pms/pms-api/pom.xml b/mall-pms/pms-api/pom.xml
index a4bf1849f..eb7c5dc7e 100644
--- a/mall-pms/pms-api/pom.xml
+++ b/mall-pms/pms-api/pom.xml
@@ -5,7 +5,7 @@
mall-pms
com.youlai
- 1.0.0-SNAPSHOT
+ 1.0.0
4.0.0
diff --git a/mall-pms/pms-search/pom.xml b/mall-pms/pms-search/pom.xml
index 1c0248a5e..d7bb9e791 100644
--- a/mall-pms/pms-search/pom.xml
+++ b/mall-pms/pms-search/pom.xml
@@ -5,7 +5,7 @@
mall-pms
com.youlai
- 1.0.0-SNAPSHOT
+ 1.0.0
4.0.0
@@ -76,7 +76,7 @@
com.youlai
sms-api
- 1.0.0-SNAPSHOT
+ 1.0.0
compile
diff --git a/mall-pms/pom.xml b/mall-pms/pom.xml
index 9ed98666c..ecd1bacb0 100644
--- a/mall-pms/pom.xml
+++ b/mall-pms/pom.xml
@@ -5,7 +5,7 @@
youlai-mall
com.youlai
- 1.0.0-SNAPSHOT
+ 1.0.0
4.0.0
@@ -19,7 +19,7 @@
- 1.0.0-SNAPSHOT
+ 1.0.0
diff --git a/mall-sms/pom.xml b/mall-sms/pom.xml
index 6131dd409..1d2f2604a 100644
--- a/mall-sms/pom.xml
+++ b/mall-sms/pom.xml
@@ -5,7 +5,7 @@
youlai-mall
com.youlai
- 1.0.0-SNAPSHOT
+ 1.0.0
4.0.0
@@ -18,7 +18,7 @@
- 1.0.0-SNAPSHOT
+ 1.0.0
diff --git a/mall-sms/sms-api/pom.xml b/mall-sms/sms-api/pom.xml
index cfb5c613d..506abb43c 100644
--- a/mall-sms/sms-api/pom.xml
+++ b/mall-sms/sms-api/pom.xml
@@ -5,7 +5,7 @@
mall-sms
com.youlai
- 1.0.0-SNAPSHOT
+ 1.0.0
4.0.0
diff --git a/mall-ums/pom.xml b/mall-ums/pom.xml
index 5bd5a466e..9fce65c1e 100644
--- a/mall-ums/pom.xml
+++ b/mall-ums/pom.xml
@@ -5,7 +5,7 @@
youlai-mall
com.youlai
- 1.0.0-SNAPSHOT
+ 1.0.0
4.0.0
@@ -18,7 +18,7 @@
- 1.0.0-SNAPSHOT
+ 1.0.0
diff --git a/mall-ums/ums-api/pom.xml b/mall-ums/ums-api/pom.xml
index 64c651597..32a012836 100644
--- a/mall-ums/ums-api/pom.xml
+++ b/mall-ums/ums-api/pom.xml
@@ -5,7 +5,7 @@
mall-ums
com.youlai
- 1.0.0-SNAPSHOT
+ 1.0.0
4.0.0
diff --git a/pom.xml b/pom.xml
index 141df70ca..c64c6495b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
com.youlai
youlai-mall
- 1.0.0-SNAPSHOT
+ 1.0.0
pom
diff --git a/youlai-admin/admin-api/pom.xml b/youlai-admin/admin-api/pom.xml
index 9c9708214..4198e75d9 100644
--- a/youlai-admin/admin-api/pom.xml
+++ b/youlai-admin/admin-api/pom.xml
@@ -5,14 +5,14 @@
youlai-admin
com.youlai
- 1.0.0-SNAPSHOT
+ 1.0.0
4.0.0
admin-api
- 1.0.0-SNAPSHOT
+ 1.0.0
diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/OauthClientDetails.java b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/OauthClientDetails.java
similarity index 96%
rename from youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/OauthClientDetails.java
rename to youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/OauthClientDetails.java
index cd31b2ca2..f49ecebe9 100644
--- a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/OauthClientDetails.java
+++ b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/OauthClientDetails.java
@@ -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.TableId;
diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysDept.java b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysDept.java
similarity index 93%
rename from youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysDept.java
rename to youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysDept.java
index 1e84cb092..49e74856b 100644
--- a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysDept.java
+++ b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysDept.java
@@ -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.TableId;
diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysDict.java b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysDict.java
similarity index 93%
rename from youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysDict.java
rename to youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysDict.java
index 0d6b560a7..e914c14a1 100644
--- a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysDict.java
+++ b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysDict.java
@@ -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.TableId;
diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysDictType.java b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysDictType.java
similarity index 91%
rename from youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysDictType.java
rename to youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysDictType.java
index eb1db4020..71b0a20ca 100644
--- a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysDictType.java
+++ b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysDictType.java
@@ -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.TableId;
diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysMenu.java b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysMenu.java
similarity index 83%
rename from youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysMenu.java
rename to youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysMenu.java
index ce921bc01..fcaa27513 100644
--- a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysMenu.java
+++ b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysMenu.java
@@ -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.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.youlai.common.core.base.BaseEntity;
import lombok.Data;
@@ -15,27 +16,26 @@ import java.util.List;
*/
@Data
@JsonInclude(JsonInclude.Include.NON_EMPTY)
+@TableName(value = "sys_menu_test")
public class SysMenu extends BaseEntity {
@TableId(type = IdType.AUTO)
private Long id;
- private String title;
+ private String name;
private Long parentId;
- private String name;
+ private Integer type;
private String path;
+ private String redirect;
+
private String icon;
private Integer sort;
- private String component;
-
- private String redirect;
-
private Integer visible;
private Integer status;
diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysPermission.java b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysPermission.java
similarity index 93%
rename from youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysPermission.java
rename to youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysPermission.java
index a237d6d8c..535f26232 100644
--- a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysPermission.java
+++ b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysPermission.java
@@ -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.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysResource.java b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysResource.java
similarity index 93%
rename from youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysResource.java
rename to youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysResource.java
index 87d3e5bab..ef9487cea 100644
--- a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysResource.java
+++ b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysResource.java
@@ -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.TableField;
diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysRole.java b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysRole.java
similarity index 94%
rename from youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysRole.java
rename to youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysRole.java
index 35d80ac9d..276db25d1 100644
--- a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysRole.java
+++ b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysRole.java
@@ -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.TableField;
diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysRoleMenu.java b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysRoleMenu.java
similarity index 81%
rename from youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysRoleMenu.java
rename to youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysRoleMenu.java
index 856724108..a4ed58cde 100644
--- a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysRoleMenu.java
+++ b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysRoleMenu.java
@@ -1,4 +1,4 @@
-package com.youlai.admin.pojo;
+package com.youlai.admin.pojo.entity;
import lombok.Data;
import lombok.experimental.Accessors;
diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysRolePermission.java b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysRolePermission.java
similarity index 82%
rename from youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysRolePermission.java
rename to youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysRolePermission.java
index 5abd7f251..0efc47ef4 100644
--- a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysRolePermission.java
+++ b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysRolePermission.java
@@ -1,4 +1,4 @@
-package com.youlai.admin.pojo;
+package com.youlai.admin.pojo.entity;
import lombok.Data;
import lombok.experimental.Accessors;
diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysUser.java b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysUser.java
similarity index 95%
rename from youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysUser.java
rename to youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysUser.java
index 43b77d873..9d05e2ef7 100644
--- a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysUser.java
+++ b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysUser.java
@@ -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.TableId;
diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysUserRole.java b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysUserRole.java
similarity index 81%
rename from youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysUserRole.java
rename to youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysUserRole.java
index 22db1d080..f6cc90eb2 100644
--- a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysUserRole.java
+++ b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysUserRole.java
@@ -1,4 +1,4 @@
-package com.youlai.admin.pojo;
+package com.youlai.admin.pojo.entity;
import lombok.Data;
import lombok.experimental.Accessors;
diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/vo/MenuVO.java b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/vo/MenuVO.java
index 27f6606c0..89a6c94dc 100644
--- a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/vo/MenuVO.java
+++ b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/vo/MenuVO.java
@@ -12,11 +12,11 @@ public class MenuVO extends BaseEntity {
private Integer id;
- private String title;
+ private String name;
private Integer parentId;
- private String name;
+ private Integer type;
private String path;
@@ -28,8 +28,6 @@ public class MenuVO extends BaseEntity {
private Integer status;
- private String component;
-
private List children;
}
diff --git a/youlai-admin/pom.xml b/youlai-admin/pom.xml
index f04cb5b77..19be89aa9 100644
--- a/youlai-admin/pom.xml
+++ b/youlai-admin/pom.xml
@@ -5,7 +5,7 @@
youlai-mall
com.youlai
- 1.0.0-SNAPSHOT
+ 1.0.0
4.0.0
@@ -18,7 +18,7 @@
- 1.0.0-SNAPSHOT
+ 1.0.0
diff --git a/youlai-auth/pom.xml b/youlai-auth/pom.xml
index a3f75f2d8..a8128f267 100644
--- a/youlai-auth/pom.xml
+++ b/youlai-auth/pom.xml
@@ -5,14 +5,14 @@
youlai-mall
com.youlai
- 1.0.0-SNAPSHOT
+ 1.0.0
4.0.0
youlai-auth
- 1.0.0-SNAPSHOT
+ 1.0.0
diff --git a/youlai-common/common-core/pom.xml b/youlai-common/common-core/pom.xml
index 1ffecfa1a..2ebe09f2a 100644
--- a/youlai-common/common-core/pom.xml
+++ b/youlai-common/common-core/pom.xml
@@ -5,7 +5,7 @@
youlai-common
com.youlai
- 1.0.0-SNAPSHOT
+ 1.0.0
4.0.0
diff --git a/youlai-common/common-knife4j/pom.xml b/youlai-common/common-knife4j/pom.xml
index 7e743cd3a..1828e6173 100644
--- a/youlai-common/common-knife4j/pom.xml
+++ b/youlai-common/common-knife4j/pom.xml
@@ -5,7 +5,7 @@
youlai-common
com.youlai
- 1.0.0-SNAPSHOT
+ 1.0.0
4.0.0
diff --git a/youlai-common/common-mybatis/pom.xml b/youlai-common/common-mybatis/pom.xml
index 3cd1976fd..7a362bf9d 100644
--- a/youlai-common/common-mybatis/pom.xml
+++ b/youlai-common/common-mybatis/pom.xml
@@ -5,7 +5,7 @@
youlai-common
com.youlai
- 1.0.0-SNAPSHOT
+ 1.0.0
4.0.0
diff --git a/youlai-common/common-rabbitmq/pom.xml b/youlai-common/common-rabbitmq/pom.xml
index 32cc141d0..cbffe5cdc 100644
--- a/youlai-common/common-rabbitmq/pom.xml
+++ b/youlai-common/common-rabbitmq/pom.xml
@@ -5,7 +5,7 @@
youlai-common
com.youlai
- 1.0.0-SNAPSHOT
+ 1.0.0
4.0.0
diff --git a/youlai-common/common-redis/pom.xml b/youlai-common/common-redis/pom.xml
index 3fb96320d..4a88b93a4 100644
--- a/youlai-common/common-redis/pom.xml
+++ b/youlai-common/common-redis/pom.xml
@@ -5,7 +5,7 @@
youlai-common
com.youlai
- 1.0.0-SNAPSHOT
+ 1.0.0
4.0.0
diff --git a/youlai-common/common-web/pom.xml b/youlai-common/common-web/pom.xml
index 6d5ff110c..c968029a9 100644
--- a/youlai-common/common-web/pom.xml
+++ b/youlai-common/common-web/pom.xml
@@ -5,14 +5,14 @@
youlai-common
com.youlai
- 1.0.0-SNAPSHOT
+ 1.0.0
4.0.0
common-web
- 1.0.0-SNAPSHOT
+ 1.0.0
diff --git a/youlai-common/pom.xml b/youlai-common/pom.xml
index ede886d49..304e0b77f 100644
--- a/youlai-common/pom.xml
+++ b/youlai-common/pom.xml
@@ -7,7 +7,7 @@
youlai-mall
com.youlai
- 1.0.0-SNAPSHOT
+ 1.0.0
youlai-common
@@ -31,7 +31,7 @@
3.3.1
3.12.5
2.8.0
- 1.0.0-SNAPSHOT
+ 1.0.0
6.2.0
diff --git a/youlai-gateway/pom.xml b/youlai-gateway/pom.xml
index 2271d0ee9..9b06db924 100644
--- a/youlai-gateway/pom.xml
+++ b/youlai-gateway/pom.xml
@@ -8,14 +8,14 @@
youlai-mall
com.youlai
- 1.0.0-SNAPSHOT
+ 1.0.0
youlai-gateway
jar
- 1.0.0-SNAPSHOT
+ 1.0.0