diff --git a/.gitee/pull_request_template.md b/.gitee/pull_request_template.md
index c500d1ebf..960748ce3 100644
--- a/.gitee/pull_request_template.md
+++ b/.gitee/pull_request_template.md
@@ -1,10 +1,5 @@
#### 说明
-1. 请确认你提交的PR是到 'develop' 分支,否则我会手动修改代码并关闭PR。
-2. 请确认没有更改代码风格(如tab缩进)
-3. 新特性添加请确认注释完备,如有必要,请在src/test/java下添加Junit测试用例
+前往 github 提交PR,否则可能出现提交后不在贡献者列表出现的BUG
-### 修改描述(包括说明bug修复或者添加新特性)
-
-1. [bug修复] balabala……
-2. [新特性] balabala……
\ No newline at end of file
+https://github.com/erupts/erupt
diff --git a/erupt-annotation/pom.xml b/erupt-annotation/pom.xml
index ec0a89112..f9eab739b 100644
--- a/erupt-annotation/pom.xml
+++ b/erupt-annotation/pom.xml
@@ -11,7 +11,7 @@
xyz.erupt
erupt
- 1.10.13
+ 1.10.14
../pom.xml
\ No newline at end of file
diff --git a/erupt-annotation/src/main/java/xyz/erupt/annotation/fun/DataProxy.java b/erupt-annotation/src/main/java/xyz/erupt/annotation/fun/DataProxy.java
index 7f1d8eb3f..cd0145af1 100644
--- a/erupt-annotation/src/main/java/xyz/erupt/annotation/fun/DataProxy.java
+++ b/erupt-annotation/src/main/java/xyz/erupt/annotation/fun/DataProxy.java
@@ -61,13 +61,12 @@ default void searchCondition(Map condition) {
}
- @Comment("excel导出")
+ @Comment("excel导出,参数需要强转为WorkBook对象")
default void excelExport(@Comment("POI文档对象") Object workbook) {
}
- @Deprecated
- @Comment("excel导入,请使用beforeAdd代替该方法")
- default void excelImport(MODEL model) {
+ @Comment("excel导入,参数需要强转为WorkBook对象")
+ default void excelImport(@Comment("POI文档对象") Object workbook) {
}
@Comment("自定义行,可实现行计算等能力")
diff --git a/erupt-annotation/src/main/java/xyz/erupt/annotation/sub_field/ViewType.java b/erupt-annotation/src/main/java/xyz/erupt/annotation/sub_field/ViewType.java
index 34f43dff0..4ecb6f018 100644
--- a/erupt-annotation/src/main/java/xyz/erupt/annotation/sub_field/ViewType.java
+++ b/erupt-annotation/src/main/java/xyz/erupt/annotation/sub_field/ViewType.java
@@ -29,7 +29,7 @@ public enum ViewType {
LINK_DIALOG,
@Comment("下载")
DOWNLOAD,
- @Comment("在新标签页中查看,不同于下载,特殊mine类型可以在网页中直接预览,如:pdf,mp4,svg,png等")
+ @Comment("在新标签页中查看,不同于下载,特殊mime类型可以在网页中直接预览,如:pdf,mp4,svg,png等")
ATTACHMENT,
@Comment("对话框方式展示附件")
ATTACHMENT_DIALOG,
diff --git a/erupt-cloud/erupt-cloud-common/pom.xml b/erupt-cloud/erupt-cloud-common/pom.xml
index 2ac36ad49..3851335a7 100644
--- a/erupt-cloud/erupt-cloud-common/pom.xml
+++ b/erupt-cloud/erupt-cloud-common/pom.xml
@@ -9,7 +9,7 @@
xyz.erupt
erupt
- 1.10.13
+ 1.10.14
../../pom.xml
diff --git a/erupt-cloud/erupt-cloud-node-jpa/pom.xml b/erupt-cloud/erupt-cloud-node-jpa/pom.xml
index 604e0210b..ca78e767c 100644
--- a/erupt-cloud/erupt-cloud-node-jpa/pom.xml
+++ b/erupt-cloud/erupt-cloud-node-jpa/pom.xml
@@ -9,7 +9,7 @@
xyz.erupt
erupt
- 1.10.13
+ 1.10.14
../../pom.xml
diff --git a/erupt-cloud/erupt-cloud-node/pom.xml b/erupt-cloud/erupt-cloud-node/pom.xml
index 85215d920..925be4dac 100644
--- a/erupt-cloud/erupt-cloud-node/pom.xml
+++ b/erupt-cloud/erupt-cloud-node/pom.xml
@@ -9,7 +9,7 @@
xyz.erupt
erupt
- 1.10.13
+ 1.10.14
../../pom.xml
diff --git a/erupt-cloud/erupt-cloud-server/pom.xml b/erupt-cloud/erupt-cloud-server/pom.xml
index e32cea4bb..efe9a3239 100644
--- a/erupt-cloud/erupt-cloud-server/pom.xml
+++ b/erupt-cloud/erupt-cloud-server/pom.xml
@@ -9,7 +9,7 @@
xyz.erupt
erupt
- 1.10.13
+ 1.10.14
../../pom.xml
diff --git a/erupt-core/pom.xml b/erupt-core/pom.xml
index 2ae92d434..fd20fc6cf 100644
--- a/erupt-core/pom.xml
+++ b/erupt-core/pom.xml
@@ -10,7 +10,7 @@
xyz.erupt
erupt
- 1.10.13
+ 1.10.14
../pom.xml
@@ -24,11 +24,6 @@
spring-boot-configuration-processor
true
-
- commons-io
- commons-io
- 2.11.0
-
com.zaxxer
HikariCP
@@ -47,6 +42,11 @@
org.apache.commons
commons-lang3
+
+ commons-io
+ commons-io
+ 2.11.0
+
com.google.code.gson
gson
diff --git a/erupt-core/src/main/java/xyz/erupt/core/component/ChoiceComponent.java b/erupt-core/src/main/java/xyz/erupt/core/component/ChoiceComponent.java
deleted file mode 100644
index 52054139a..000000000
--- a/erupt-core/src/main/java/xyz/erupt/core/component/ChoiceComponent.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package xyz.erupt.core.component;
-
-import xyz.erupt.annotation.sub_field.sub_edit.ChoiceType;
-
-/**
- * @author YuePeng
- * date 2021/3/20 19:40
- */
-public class ChoiceComponent implements IEruptComponent {
-
- @Override
- public void validate(ChoiceType annotation, Object value) {
-
- }
-
-}
diff --git a/erupt-core/src/main/java/xyz/erupt/core/component/IEruptComponent.java b/erupt-core/src/main/java/xyz/erupt/core/component/IEruptComponent.java
deleted file mode 100644
index 3a5470398..000000000
--- a/erupt-core/src/main/java/xyz/erupt/core/component/IEruptComponent.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package xyz.erupt.core.component;
-
-import java.lang.annotation.Annotation;
-
-/**
- * @author YuePeng
- * date 2021/3/20 19:40
- */
-public interface IEruptComponent {
-
- //验证参数值
- default void validate(A annotation, Object value) {
-
- }
-
-}
diff --git a/erupt-core/src/main/java/xyz/erupt/core/component/InputComponent.java b/erupt-core/src/main/java/xyz/erupt/core/component/InputComponent.java
deleted file mode 100644
index 183efbf45..000000000
--- a/erupt-core/src/main/java/xyz/erupt/core/component/InputComponent.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package xyz.erupt.core.component;
-
-import xyz.erupt.annotation.sub_field.sub_edit.InputType;
-
-/**
- * @author YuePeng
- * date 2021/4/5 23:13
- */
-public class InputComponent implements IEruptComponent {
-
- @Override
- public void validate(InputType annotation, Object value) {
-
- }
-
-}
diff --git a/erupt-core/src/main/java/xyz/erupt/core/constant/MenuTypeEnum.java b/erupt-core/src/main/java/xyz/erupt/core/constant/MenuTypeEnum.java
index af06d9b8d..fa6379f97 100644
--- a/erupt-core/src/main/java/xyz/erupt/core/constant/MenuTypeEnum.java
+++ b/erupt-core/src/main/java/xyz/erupt/core/constant/MenuTypeEnum.java
@@ -11,14 +11,15 @@
@Getter
public enum MenuTypeEnum {
- TABLE("table", "表格", "填erupt类名"),
- TREE("tree", "树", "填erupt类名"),
- BUTTON("button", "按钮", null),
- LINK("link", "链接", "互联网地址"),
- NEW_WINDOW("newWindow", "新页签", "互联网地址"),
+ TABLE("table", "表格视图", "填erupt类名"),
+ TREE("tree", "树状视图", "填erupt类名"),
+ BUTTON("button", "功能按钮", null),
API("api", "接口名称", null),
+ LINK("link", "框架内打开链接", "互联网地址"),
+ NEW_WINDOW("newWindow", "新窗口打开链接", "互联网地址"),
+ THIS_WINDOW("selfWindow", "本窗口打开链接", "互联网地址"),
FILL("fill", "充满屏幕", "需要充满屏幕的路由地址"),
- ROUTER("router", "页面路由", null);
+ ROUTER("router", "页面路由", "前端开发时的路由地址");
private final String code;
private final String name;
diff --git a/erupt-core/src/main/java/xyz/erupt/core/controller/EruptApi.java b/erupt-core/src/main/java/xyz/erupt/core/controller/EruptApi.java
index 9e2ba86dc..ce334f558 100644
--- a/erupt-core/src/main/java/xyz/erupt/core/controller/EruptApi.java
+++ b/erupt-core/src/main/java/xyz/erupt/core/controller/EruptApi.java
@@ -7,7 +7,6 @@
import oshi.SystemInfo;
import oshi.hardware.HardwareAbstractionLayer;
import xyz.erupt.core.constant.EruptRestPath;
-import xyz.erupt.core.prop.EruptAppProp;
import xyz.erupt.core.util.EruptInformation;
import xyz.erupt.core.util.MD5Util;
@@ -20,20 +19,11 @@
@RequiredArgsConstructor
public class EruptApi {
- private final EruptAppProp eruptAppProp;
-
@GetMapping("/version")
public String version() {
return EruptInformation.getEruptVersion();
}
- @GetMapping("/erupt-app")
- public EruptAppProp eruptApp() {
- eruptAppProp.setHash(this.hashCode());
- eruptAppProp.setVersion(EruptInformation.getEruptVersion());
- return eruptAppProp;
- }
-
@GetMapping(value = "/erupt-machine-code")
public String eruptMachineCode() {
//CPU序列号 + 操作系统序列号 + 硬件UUID
diff --git a/erupt-core/src/main/java/xyz/erupt/core/controller/EruptComponentController.java b/erupt-core/src/main/java/xyz/erupt/core/controller/EruptComponentController.java
index d817e9d1d..50fc0eb83 100644
--- a/erupt-core/src/main/java/xyz/erupt/core/controller/EruptComponentController.java
+++ b/erupt-core/src/main/java/xyz/erupt/core/controller/EruptComponentController.java
@@ -52,7 +52,7 @@ public List