Merge pull request #117 from erupts/develop

1.10.13
erupts · Sep 4, 2022 · ecc0665 · ecc0665
2 parents 66d3d4d + dc78039
commit ecc0665
Show file tree

Hide file tree

Showing 51 changed files with 328 additions and 142 deletions.
diff --git a/erupt-annotation/pom.xml b/erupt-annotation/pom.xml
@@ -11,16 +11,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.10.12</version>
+        <version>1.10.13</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi</artifactId>
-            <version>5.2.2</version>
-            <optional>true</optional>
-        </dependency>
-    </dependencies>
 </project>
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
@@ -1,6 +1,5 @@
 package xyz.erupt.annotation.fun;
 
-import org.apache.poi.ss.usermodel.Workbook;
 import xyz.erupt.annotation.config.Comment;
 import xyz.erupt.annotation.model.Row;
 import xyz.erupt.annotation.query.Condition;
@@ -63,7 +62,7 @@ default void searchCondition(Map<String, Object> condition) {
     }
 
     @Comment("excel导出")
-    default void excelExport(@Comment("POI文档对象") Workbook wb) {
+    default void excelExport(@Comment("POI文档对象") Object workbook) {
     }
 
     @Deprecated

diff --git a/erupt-annotation/src/main/java/xyz/erupt/annotation/sub_erupt/RowOperation.java b/erupt-annotation/src/main/java/xyz/erupt/annotation/sub_erupt/RowOperation.java
@@ -45,6 +45,9 @@
     @Transient
     Tpl tpl() default @Tpl(path = "");
 
+    @Comment("tpl模板弹出层宽度")
+    String tplWidth() default "";
+
     @Comment("按钮提交时，需要填写的表单信息")
     Class<?> eruptClass() default void.class;
 

diff --git a/erupt-annotation/src/main/java/xyz/erupt/annotation/sub_field/Edit.java b/erupt-annotation/src/main/java/xyz/erupt/annotation/sub_field/Edit.java
@@ -31,7 +31,7 @@
     @EruptProperty(alias = "readOnly")
     Readonly readonly() default @Readonly(add = false, edit = false);
 
-    @Comment("输入字段预期值的提示信息")
+    @Comment("表单提示信息")
     String placeHolder() default "";
 
     @Match("#value.dependField() != ''")

diff --git a/erupt-cloud/erupt-cloud-common/pom.xml b/erupt-cloud/erupt-cloud-common/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.10.12</version>
+        <version>1.10.13</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-cloud/erupt-cloud-node-jpa/pom.xml b/erupt-cloud/erupt-cloud-node-jpa/pom.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>erupt-cloud-node-jpa</artifactId>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>xyz.erupt</groupId>
+        <artifactId>erupt</artifactId>
+        <version>1.10.13</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>xyz.erupt</groupId>
+            <artifactId>erupt-cloud-node</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>xyz.erupt</groupId>
+            <artifactId>erupt-jpa</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>xyz.erupt</groupId>
+            <artifactId>erupt-toolkit</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/erupt-cloud/erupt-cloud-node/pom.xml b/erupt-cloud/erupt-cloud-node/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.10.12</version>
+        <version>1.10.13</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-cloud/erupt-cloud-server/pom.xml b/erupt-cloud/erupt-cloud-server/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.10.12</version>
+        <version>1.10.13</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-core/pom.xml b/erupt-core/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.10.12</version>
+        <version>1.10.13</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -24,6 +24,11 @@
             <artifactId>spring-boot-configuration-processor</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.11.0</version>
+        </dependency>
         <dependency>
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>
@@ -45,23 +50,12 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.9.0</version>
+            <version>2.9.1</version>
         </dependency>
         <dependency>
             <groupId>org.fusesource.jansi</groupId>
             <artifactId>jansi</artifactId>
-            <version>2.3.4</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi</artifactId>
-            <version>5.2.2</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-ooxml</artifactId>
-            <version>5.2.2</version>
+            <version>2.4.0</version>
         </dependency>
         <dependency>
             <groupId>com.github.oshi</groupId>

diff --git a/erupt-core/src/main/java/xyz/erupt/core/config/MvcConfig.java b/erupt-core/src/main/java/xyz/erupt/core/config/MvcConfig.java
@@ -7,13 +7,16 @@
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.GsonHttpMessageConverter;
 import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.config.annotation.PathMatchConfigurer;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistration;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.web.util.UrlPathHelper;
 import xyz.erupt.core.constant.EruptConst;
 import xyz.erupt.core.constant.EruptRestPath;
 import xyz.erupt.core.prop.EruptProp;
 
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
@@ -62,4 +65,12 @@ public void addResourceHandlers(ResourceHandlerRegistry registry) {
         }
     }
 
+    @Override
+    public void configurePathMatch(PathMatchConfigurer configurer) {
+        UrlPathHelper helper = new UrlPathHelper();
+        helper.setUrlDecode(false);
+        helper.setDefaultEncoding(StandardCharsets.UTF_8.name());
+        configurer.setUrlPathHelper(helper);
+    }
+
 }
diff --git a/erupt-core/src/main/java/xyz/erupt/core/service/EruptApplication.java b/erupt-core/src/main/java/xyz/erupt/core/service/EruptApplication.java
@@ -1,6 +1,7 @@
 package xyz.erupt.core.service;
 
 import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
@@ -18,6 +19,7 @@
  * @author YuePeng
  * date 2020-09-09
  */
+@Slf4j
 public class EruptApplication implements ImportBeanDefinitionRegistrar {
 
     private static Class<?> primarySource;
@@ -38,6 +40,11 @@ public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, B
         Class<?> clazz = ClassUtils.forName(importingClassMetadata.getClassName(), ClassUtils.getDefaultClassLoader());
         Optional.ofNullable(clazz.getAnnotation(SpringBootApplication.class)).ifPresent(it -> primarySource = clazz);
         EruptScan eruptScan = clazz.getAnnotation(EruptScan.class);
+        try {
+            Class.forName("org.springframework.boot.devtools.RemoteUrlPropertyExtractor");
+            log.error("spring-boot-devtools 与 erupt 同时存在会出现各种奇怪的问题，建议移除该依赖！！！");
+        } catch (ClassNotFoundException ignored) {
+        }
         if (eruptScan.value().length == 0) {
             scanPackage.add(clazz.getPackage().getName());
         } else {

diff --git a/erupt-core/src/main/java/xyz/erupt/core/view/EruptFieldModel.java b/erupt-core/src/main/java/xyz/erupt/core/view/EruptFieldModel.java
@@ -8,6 +8,7 @@
 import xyz.erupt.annotation.fun.VLModel;
 import xyz.erupt.annotation.sub_field.Edit;
 import xyz.erupt.core.exception.EruptFieldAnnotationException;
+import xyz.erupt.core.exception.ExceptionAnsi;
 import xyz.erupt.core.proxy.AnnotationProxy;
 import xyz.erupt.core.proxy.EruptFieldProxy;
 import xyz.erupt.core.proxy.ProxyContext;
@@ -64,7 +65,11 @@ public EruptFieldModel(Field field) {
             case TAB_TABLE_ADD:
             case TAB_TABLE_REFER:
             case CHECKBOX:
-                this.fieldReturnName = ReflectUtil.getFieldGenericName(field).get(0);
+                try {
+                    this.fieldReturnName = ReflectUtil.getFieldGenericName(field).get(0);
+                } catch (Exception e) {
+                    throw ExceptionAnsi.styleEruptFieldException(this, "Component modification field is incorrect");
+                }
                 break;
         }
         this.eruptField = eruptFieldAnnotationProxy.newProxy(this.getEruptField(), null);

diff --git a/erupt-data/erupt-elasticsearch/pom.xml b/erupt-data/erupt-elasticsearch/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.10.12</version>
+        <version>1.10.13</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-data/erupt-jpa/pom.xml b/erupt-data/erupt-jpa/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.10.12</version>
+        <version>1.10.13</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-data/erupt-jpa/src/main/java/xyz/erupt/jpa/support/CommentIntegrator.java b/erupt-data/erupt-jpa/src/main/java/xyz/erupt/jpa/support/CommentIntegrator.java
@@ -1,5 +1,6 @@
 package xyz.erupt.jpa.support;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.hibernate.boot.Metadata;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
@@ -14,6 +15,7 @@
 
 import javax.persistence.ManyToMany;
 import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
 import java.lang.reflect.Field;
 import java.util.Iterator;
 import java.util.Optional;
@@ -24,6 +26,7 @@
  * @author YuePeng
  * date 2022/8/3 21:42
  */
+@Slf4j
 public class CommentIntegrator implements Integrator {
 
     /**
@@ -79,10 +82,13 @@ private void processComment(Metadata metadata) {
      */
     private void fieldComment(PersistentClass persistentClass, String columnName) {
         try {
-            Field field = ReflectUtil.findClassField(persistentClass.getMappedClass(),columnName);
+            Field field = ReflectUtil.findClassField(persistentClass.getMappedClass(), columnName);
+            if (null == field) return;
             if (field.isAnnotationPresent(EruptField.class)
+                    && !field.isAnnotationPresent(OneToOne.class)
                     && !field.isAnnotationPresent(OneToMany.class)
-                    && !field.isAnnotationPresent(ManyToMany.class)) {
+                    && !field.isAnnotationPresent(ManyToMany.class)
+            ) {
                 EruptField eruptField = field.getAnnotation(EruptField.class);
                 String comment = eruptField.edit().title();
                 if (StringUtils.isBlank(comment) && eruptField.views().length > 0) {
@@ -101,6 +107,8 @@ private void fieldComment(PersistentClass persistentClass, String columnName) {
                 }
             }
         } catch (SecurityException ignored) {
+        } catch (Exception e) {
+            log.warn(e.getMessage());
         }
     }
 

diff --git a/erupt-data/erupt-mongodb/pom.xml b/erupt-data/erupt-mongodb/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.10.12</version>
+        <version>1.10.13</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-excel/pom.xml b/erupt-excel/pom.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>erupt-excel</artifactId>
+    <name>erupt-excel</name>
+    <description>excel module</description>
+
+    <parent>
+        <groupId>xyz.erupt</groupId>
+        <artifactId>erupt</artifactId>
+        <version>1.10.13</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <properties>
+        <poi.version>5.2.2</poi.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>xyz.erupt</groupId>
+            <artifactId>erupt-core</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>${poi.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>${poi.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.transaction</groupId>
+            <artifactId>jakarta.transaction-api</artifactId>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/erupt-excel/src/main/java/xyz/erupt/excel/EruptExcelAutoConfiguration.java b/erupt-excel/src/main/java/xyz/erupt/excel/EruptExcelAutoConfiguration.java
@@ -0,0 +1,21 @@
+package xyz.erupt.excel;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import xyz.erupt.core.module.EruptModule;
+import xyz.erupt.core.module.ModuleInfo;
+
+/**
+ * @author YuePeng
+ * date 2021/3/28 18:51
+ */
+@Configuration
+@ComponentScan
+public class EruptExcelAutoConfiguration implements EruptModule {
+
+    @Override
+    public ModuleInfo info() {
+        return ModuleInfo.builder().name("erupt-excel").build();
+    }
+
+}