Merge pull request #107 from hocgin/develop

Develop
hocgin · Jun 18, 2022 · 0f81fca · 0f81fca
2 parents 42d402e + 10cc347
commit 0f81fca
Show file tree

Hide file tree

Showing 152 changed files with 2,354 additions and 468 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ target/
 *.iml
 *.ipr
 .flattened-pom.xml
+.DS_Store
diff --git a/pom.xml b/pom.xml
@@ -18,11 +18,9 @@
   <properties>
     <revision>1.0.33</revision>
 
-    <java.version>17</java.version>
-    <java.source.version>17</java.source.version>
-    <java.target.version>17</java.target.version>
-    <maven.compiler.source>17</maven.compiler.source>
-    <maven.compiler.target>17</maven.compiler.target>
+    <java.version>11</java.version>
+    <java.source.version>11</java.source.version>
+    <java.target.version>11</java.target.version>
     <!-- Maven plugins -->
     <maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
     <maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
@@ -71,6 +69,7 @@
     <module>spring-boot-arthas</module>
     <module>spring-boot-javacv</module>
     <module>spring-boot-ws</module>
+    <module>spring-boot-notify</module>
     <module>spring-boot-tpl</module>
   </modules>
 

diff --git a/...gure/src/main/java/in/hocg/boot/arthas/autoconfiguration/properties/ArthasProperties.java b/...gure/src/main/java/in/hocg/boot/arthas/autoconfiguration/properties/ArthasProperties.java
@@ -1,6 +1,7 @@
 package in.hocg.boot.arthas.autoconfiguration.properties;
 
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
@@ -9,7 +10,8 @@
  *
  * @author hocgin
  */
-@Data
+@Getter
+@Setter
 @ConfigurationProperties(ArthasProperties.PREFIX)
 public class ArthasProperties extends com.alibaba.arthas.spring.ArthasProperties {
     public static final String PREFIX = "boot.arthas";

diff --git a/.../src/main/java/in/hocg/boot/cache/autoconfiguration/properties/BloomFilterProperties.java b/.../src/main/java/in/hocg/boot/cache/autoconfiguration/properties/BloomFilterProperties.java
@@ -1,6 +1,7 @@
 package in.hocg.boot.cache.autoconfiguration.properties;
 
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
@@ -9,7 +10,8 @@
  *
  * @author hocgin
  */
-@Data
+@Getter
+@Setter
 @ConfigurationProperties(BloomFilterProperties.PREFIX)
 public class BloomFilterProperties {
     public static final String PREFIX = "boot.bloom";

diff --git a/...figure/src/main/java/in/hocg/boot/cache/autoconfiguration/properties/CacheProperties.java b/...figure/src/main/java/in/hocg/boot/cache/autoconfiguration/properties/CacheProperties.java
@@ -1,7 +1,8 @@
 package in.hocg.boot.cache.autoconfiguration.properties;
 
 import in.hocg.boot.utils.StringPoolUtils;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 
@@ -15,7 +16,8 @@
  *
  * @author hocgin
  */
-@Data
+@Getter
+@Setter
 @RefreshScope
 @ConfigurationProperties(CacheProperties.PREFIX)
 public class CacheProperties {
@@ -27,7 +29,8 @@ public class CacheProperties {
      */
     private List<CacheName> names = Collections.emptyList();
 
-    @Data
+    @Getter
+    @Setter
     public static class CacheName {
         private String name;
         private Duration ttl;

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
@@ -37,7 +37,7 @@
     <xxl-job.version>2.2.0</xxl-job.version>
     <aliyun-schedulerx-spring-boot-starter.version>1.2.4.3</aliyun-schedulerx-spring-boot-starter.version>
     <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
-    <webmagic.version>0.7.4</webmagic.version>
+    <webmagic.version>0.7.5</webmagic.version>
     <typetools.version>0.6.3</typetools.version>
     <easyexcel.version>3.0.5</easyexcel.version>
     <jackson-mapper-asl.version>1.9.4</jackson-mapper-asl.version>
@@ -71,6 +71,16 @@
         <artifactId>tpl-spring-boot-starter</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>notify-spring-boot-autoconfigure</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>notify-spring-boot-starter</artifactId>
+        <version>${project.version}</version>
+      </dependency>
       <!-- data-audit -->
       <dependency>
         <groupId>${project.groupId}</groupId>
@@ -762,11 +772,11 @@
         <artifactId>javacv-platform</artifactId>
         <version>${javacv.version}</version>
       </dependency>
-<!--      <dependency>-->
-<!--        <groupId>com.github.ulisesbocchio</groupId>-->
-<!--        <artifactId>jasypt-spring-boot-starter</artifactId>-->
-<!--        <version>${jasypt-spring-boot-starter.version}</version>-->
-<!--      </dependency>-->
+      <!--      <dependency>-->
+      <!--        <groupId>com.github.ulisesbocchio</groupId>-->
+      <!--        <artifactId>jasypt-spring-boot-starter</artifactId>-->
+      <!--        <version>${jasypt-spring-boot-starter.version}</version>-->
+      <!--      </dependency>-->
     </dependencies>
   </dependencyManagement>
 

diff --git a/...figure/src/main/java/in/hocg/boot/excel/autoconfiguration/properties/ExcelProperties.java b/...figure/src/main/java/in/hocg/boot/excel/autoconfiguration/properties/ExcelProperties.java
@@ -1,6 +1,7 @@
 package in.hocg.boot.excel.autoconfiguration.properties;
 
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
@@ -9,7 +10,8 @@
  *
  * @author hocgin
  */
-@Data
+@Getter
+@Setter
 @ConfigurationProperties(ExcelProperties.PREFIX)
 public class ExcelProperties {
     public static final String PREFIX = "boot.excel";

diff --git a/...gure/src/main/java/in/hocg/boot/flyway/autoconfiguration/properties/FlywayProperties.java b/...gure/src/main/java/in/hocg/boot/flyway/autoconfiguration/properties/FlywayProperties.java
@@ -1,6 +1,7 @@
 package in.hocg.boot.flyway.autoconfiguration.properties;
 
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
@@ -9,7 +10,8 @@
  *
  * @author hocgin
  */
-@Data
+@Getter
+@Setter
 @ConfigurationProperties(FlywayProperties.PREFIX)
 public class FlywayProperties {
     public static final String PREFIX = "boot.flyway";

diff --git a/...gure/src/main/java/in/hocg/boot/javacv/autoconfiguration/properties/JavaCvProperties.java b/...gure/src/main/java/in/hocg/boot/javacv/autoconfiguration/properties/JavaCvProperties.java
@@ -1,6 +1,7 @@
 package in.hocg.boot.javacv.autoconfiguration.properties;
 
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
@@ -9,7 +10,8 @@
  *
  * @author hocgin
  */
-@Data
+@Getter
+@Setter
 @ConfigurationProperties(JavaCvProperties.PREFIX)
 public class JavaCvProperties {
     public static final String PREFIX = "boot.java-cv";

diff --git a/...main/java/in/hocg/boot/knife/gateway/autoconfigure/properties/KnifeGatewayProperties.java b/...main/java/in/hocg/boot/knife/gateway/autoconfigure/properties/KnifeGatewayProperties.java
@@ -1,6 +1,7 @@
 package in.hocg.boot.knife.gateway.autoconfigure.properties;
 
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
@@ -9,7 +10,8 @@
  *
  * @author hocgin
  */
-@Data
+@Getter
+@Setter
 @ConfigurationProperties(prefix = KnifeGatewayProperties.PREFIX)
 public class KnifeGatewayProperties {
     public static final String PREFIX = "boot.knife.gateway";

diff --git a/...main/java/in/hocg/boot/knife/service/autoconfigure/properties/KnifeServiceProperties.java b/...main/java/in/hocg/boot/knife/service/autoconfigure/properties/KnifeServiceProperties.java
@@ -1,6 +1,7 @@
 package in.hocg.boot.knife.service.autoconfigure.properties;
 
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import springfox.documentation.service.Contact;
 
@@ -10,7 +11,8 @@
  *
  * @author hocgin
  */
-@Data
+@Getter
+@Setter
 @ConfigurationProperties(prefix = KnifeServiceProperties.PREFIX)
 public class KnifeServiceProperties {
     public static final String PREFIX = "boot.knife.service";

diff --git a/...-autoconfigure/src/main/java/in/hocg/boot/logging/autoconfiguration/core/LoggerEvent.java b/...-autoconfigure/src/main/java/in/hocg/boot/logging/autoconfiguration/core/LoggerEvent.java
@@ -1,14 +1,14 @@
 package in.hocg.boot.logging.autoconfiguration.core;
 
 import cn.hutool.json.JSONUtil;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import lombok.experimental.Accessors;
 import org.springframework.core.io.Resource;
 import org.springframework.http.ResponseEntity;
 
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
@@ -20,7 +20,8 @@
  *
  * @author hocgin
  */
-@Data
+@Getter
+@Setter
 @Accessors(chain = true)
 public class LoggerEvent {
     /**

diff --git a/...re/src/main/java/in/hocg/boot/logging/autoconfiguration/properties/LoggingProperties.java b/...re/src/main/java/in/hocg/boot/logging/autoconfiguration/properties/LoggingProperties.java
@@ -1,6 +1,7 @@
 package in.hocg.boot.logging.autoconfiguration.properties;
 
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
@@ -9,7 +10,8 @@
  *
  * @author hocgin
  */
-@Data
+@Getter
+@Setter
 @ConfigurationProperties(LoggingProperties.PREFIX)
 public class LoggingProperties {
     public static final String PREFIX = "boot.logging";

diff --git a/...utoconfigure/src/main/java/in/hocg/boot/mail/autoconfigure/properties/MailProperties.java b/...utoconfigure/src/main/java/in/hocg/boot/mail/autoconfigure/properties/MailProperties.java
@@ -1,7 +1,8 @@
 package in.hocg.boot.mail.autoconfigure.properties;
 
 
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -12,7 +13,8 @@
  *
  * @author hocgin
  */
-@Data
+@Getter
+@Setter
 @Accessors(chain = true)
 @ToString
 @ConfigurationProperties(prefix = MailProperties.PREFIX)

diff --git a/...figure/src/main/java/in/hocg/boot/message/autoconfigure/properties/MessageProperties.java b/...figure/src/main/java/in/hocg/boot/message/autoconfigure/properties/MessageProperties.java
@@ -1,6 +1,7 @@
 package in.hocg.boot.message.autoconfigure.properties;
 
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
@@ -9,7 +10,8 @@
  *
  * @author hocgin
  */
-@Data
+@Getter
+@Setter
 @ConfigurationProperties(MessageProperties.PREFIX)
 public class MessageProperties {
     public static final String PREFIX = "boot.message";

diff --git a/...re/src/main/java/in/hocg/boot/monitor/autoconfiguration/properties/MonitorProperties.java b/...re/src/main/java/in/hocg/boot/monitor/autoconfiguration/properties/MonitorProperties.java
@@ -1,6 +1,7 @@
 package in.hocg.boot.monitor.autoconfiguration.properties;
 
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
@@ -9,7 +10,8 @@
  *
  * @author hocgin
  */
-@Data
+@Getter
+@Setter
 @ConfigurationProperties(MonitorProperties.PREFIX)
 public class MonitorProperties {
     public static final String PREFIX = "boot.monitor";

diff --git a/...configure/src/main/java/in/hocg/boot/mybatis/plus/extensions/changelog/entity/Change.java b/...configure/src/main/java/in/hocg/boot/mybatis/plus/extensions/changelog/entity/Change.java
@@ -4,8 +4,9 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import in.hocg.boot.mybatis.plus.autoconfiguration.core.struct.basic.enhance.CommonEntity;
 import in.hocg.boot.mybatis.plus.extensions.context.constants.MyBatisPlusExtensionsConstants;
-import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
 import lombok.experimental.Accessors;
 
 /**
@@ -14,7 +15,8 @@
  *
  * @author hocgin
  */
-@Data
+@Getter
+@Setter
 @TableName(Change.TABLE_NAME)
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)

diff --git a/...gure/src/main/java/in/hocg/boot/mybatis/plus/extensions/changelog/entity/ChangeField.java b/...gure/src/main/java/in/hocg/boot/mybatis/plus/extensions/changelog/entity/ChangeField.java
@@ -4,8 +4,9 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import in.hocg.boot.mybatis.plus.autoconfiguration.core.struct.basic.enhance.CommonEntity;
 import in.hocg.boot.mybatis.plus.extensions.context.constants.MyBatisPlusExtensionsConstants;
-import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
 import lombok.experimental.Accessors;
 
 /**
@@ -14,7 +15,8 @@
  *
  * @author hocgin
  */
-@Data
+@Getter
+@Setter
 @TableName(ChangeField.TABLE_NAME)
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)

diff --git a/...e/src/main/java/in/hocg/boot/mybatis/plus/extensions/changelog/pojo/dto/ChangeLogDto.java b/...e/src/main/java/in/hocg/boot/mybatis/plus/extensions/changelog/pojo/dto/ChangeLogDto.java
@@ -2,7 +2,8 @@
 
 import in.hocg.boot.mybatis.plus.extensions.changelog.enums.ChangeType;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
@@ -15,7 +16,8 @@
  *
  * @author hocgin
  */
-@Data
+@Getter
+@Setter
 @Accessors(chain = true)
 public class ChangeLogDto implements Serializable {
     @ApiModelProperty("日志类型:[订单]")