diff --git a/README.md b/README.md index e4c039cc3..4d2d61b7c 100644 --- a/README.md +++ b/README.md @@ -30,8 +30,15 @@ ---

- Erupt Cloud【分布式多维配置中心】   |   - Erupt Flow 【工作流】 + Erupt Cloud【分布式云配置】   |   + Erupt BI 【数据分析】   |   + Erupt Tenant 【多租户】 +

+ +--- + +

+

--- diff --git a/erupt-sample/pom.xml b/erupt-sample/pom.xml index bf54049e3..7b35de7f4 100644 --- a/erupt-sample/pom.xml +++ b/erupt-sample/pom.xml @@ -11,9 +11,7 @@ erupt-sample - 0.0.1-SNAPSHOT - erupt-sample - erupt-sample + 1.8 true @@ -29,6 +27,7 @@ erupt-web ${project.parent.version} + xyz.erupt @@ -53,38 +52,20 @@ - - - src/main/resources - - - lib - BOOT-INF/lib/ - - *.jar - - - org.springframework.boot spring-boot-maven-plugin - true - true - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - true - true - ${java.version} - ${java.version} + xyz.erupt.sample.EruptSampleApplication + + + + repackage + + + diff --git a/erupt-sample/src/main/java/xyz/erupt/upms/model/EruptMenu.java b/erupt-sample/src/main/java/xyz/erupt/upms/model/EruptMenu.java index a4de4a9a8..6ec42d083 100644 --- a/erupt-sample/src/main/java/xyz/erupt/upms/model/EruptMenu.java +++ b/erupt-sample/src/main/java/xyz/erupt/upms/model/EruptMenu.java @@ -1,6 +1,7 @@ package xyz.erupt.upms.model; import lombok.Getter; +import lombok.NoArgsConstructor; import lombok.Setter; import xyz.erupt.annotation.Erupt; import xyz.erupt.annotation.EruptField; @@ -41,10 +42,9 @@ @EruptI18n @Getter @Setter +@NoArgsConstructor public class EruptMenu extends MetaModel { - public static final String CODE = "code"; - @EruptField( views = @View(title = "名称"), edit = @Edit( @@ -125,9 +125,6 @@ public class EruptMenu extends MetaModel { ) private String param; - public EruptMenu() { - } - public EruptMenu(String code, String name, String type, String value, Integer status, Integer sort, String icon, EruptMenu parentMenu) { this.code = code; this.name = name; @@ -151,6 +148,20 @@ public EruptMenu(String code, String name, String type, String value, EruptMenu this.setCreateTime(LocalDateTime.now()); } + public MetaMenu toMetaMenu() { + MetaMenu metaMenu = new MetaMenu(); + metaMenu.setId(this.getId()); + metaMenu.setCode(this.getCode()); + metaMenu.setName(this.getName()); + metaMenu.setType(this.getType()); + metaMenu.setValue(this.getValue()); + metaMenu.setStatus(null != this.getStatus() ? MenuStatus.valueOf(this.getStatus()) : MenuStatus.OPEN); + metaMenu.setSort(this.getSort()); + metaMenu.setIcon(this.getIcon()); + metaMenu.setParentMenu(null == this.getParentMenu() ? null : this.getParentMenu().toMetaMenu()); + return metaMenu; + } + public static EruptMenu fromMetaMenu(MetaMenu metaMenu) { if (null == metaMenu) return null; EruptMenu eruptMenu = new EruptMenu(metaMenu.getCode(),