[新增功能](develop): 调整

pom.xml

@@ -69,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>
 

spring-boot-dependencies/pom.xml

@@ -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>

spring-boot-mybatis-plus/mybatis-plus-extensions/mybatis-plus-extensions-task-autoconfigure/src/main/java/in/hocg/boot/mybatis/plus/extensions/task/autoconfiguration/TaskMybatisPlusExtAutoConfiguration.java

@@ -23,17 +23,17 @@
 @Slf4j
 @EnableAsync
 @Configuration
-@ConditionalOnProperty(prefix = TaskProperties.PREFIX, name = "enabled", matchIfMissing = true)
-@EnableConfigurationProperties(TaskProperties.class)
+@ConditionalOnProperty(prefix = TaskMybatisPlusExtProperties.PREFIX, name = "enabled", matchIfMissing = true)
+@EnableConfigurationProperties(TaskMybatisPlusExtProperties.class)
 @ComponentScan(TaskMpe.PACKAGE)
 @RequiredArgsConstructor(onConstructor = @__(@Lazy))
 public class TaskMybatisPlusExtAutoConfiguration {
-    private final TaskProperties properties;
+    private final TaskMybatisPlusExtProperties properties;
     public static final String EXECUTOR_NAME = "bootAsyncTaskExecutor";
 
     @Bean(TaskMybatisPlusExtAutoConfiguration.EXECUTOR_NAME)
     public Executor bootAsyncTaskExecutor() {
-        TaskProperties.Executor executor = properties.getExecutor();
+        TaskMybatisPlusExtProperties.Executor executor = properties.getExecutor();
         ThreadPoolTaskExecutor taskExecutor = new ThreadPoolTaskExecutor();
         taskExecutor.setCorePoolSize(executor.getCorePoolSize());
         taskExecutor.setMaxPoolSize(executor.getMaxPoolSize());

spring-boot-mybatis-plus/mybatis-plus-extensions/mybatis-plus-extensions-task-autoconfigure/src/main/java/in/hocg/boot/mybatis/plus/extensions/task/autoconfiguration/TaskProperties.java → spring-boot-mybatis-plus/mybatis-plus-extensions/mybatis-plus-extensions-task-autoconfigure/src/main/java/in/hocg/boot/mybatis/plus/extensions/task/autoconfiguration/TaskMybatisPlusExtProperties.java

@@ -14,8 +14,8 @@
  */
 @Getter
 @Setter
-@ConfigurationProperties(TaskProperties.PREFIX)
-public class TaskProperties {
+@ConfigurationProperties(TaskMybatisPlusExtProperties.PREFIX)
+public class TaskMybatisPlusExtProperties {
     public static final String PREFIX = MyBatisPlusExtensionsConstants.PROPERTIES_PREFIX + ".task";
 
     /**

spring-boot-mybatis-plus/mybatis-plus-extensions/mybatis-plus-extensions-tpl-autoconfigure/src/main/java/in/hocg/boot/mybatis/plus/extensions/tpl/autoconfiguration/TplMybatisPlusExtAutoConfiguration.java

@@ -1,7 +1,13 @@
 package in.hocg.boot.mybatis.plus.extensions.tpl.autoconfiguration;
 
+import in.hocg.boot.mybatis.plus.extensions.tpl.TplMpe;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;
 
 /**
  * Created by hocgin on 2022/3/24
@@ -11,5 +17,9 @@
  */
 @Slf4j
 @Configuration
+@ConditionalOnProperty(prefix = TplMybatisPlusExtProperties.PREFIX, name = "enabled", matchIfMissing = true)
+@EnableConfigurationProperties(TplMybatisPlusExtProperties.class)
+@ComponentScan(TplMpe.PACKAGE)
+@RequiredArgsConstructor(onConstructor = @__(@Lazy))
 public class TplMybatisPlusExtAutoConfiguration {
 }

spring-boot-mybatis-plus/mybatis-plus-extensions/mybatis-plus-extensions-tpl-autoconfigure/src/main/java/in/hocg/boot/mybatis/plus/extensions/tpl/autoconfiguration/TplMybatisPlusExtProperties.java

@@ -0,0 +1,20 @@
+package in.hocg.boot.mybatis.plus.extensions.tpl.autoconfiguration;
+
+import in.hocg.boot.mybatis.plus.extensions.context.constants.MyBatisPlusExtensionsConstants;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * Created by hocgin on 2020/8/15
+ * email: hocgin@gmail.com
+ *
+ * @author hocgin
+ */
+@Getter
+@Setter
+@ConfigurationProperties(TplMybatisPlusExtProperties.PREFIX)
+public class TplMybatisPlusExtProperties {
+    public static final String PREFIX = MyBatisPlusExtensionsConstants.PROPERTIES_PREFIX + ".tpl";
+
+}

spring-boot-mybatis-plus/mybatis-plus-extensions/mybatis-plus-extensions-webmagic-autoconfigure/src/main/java/in/hocg/boot/mybatis/plus/extensions/webmagic/TplMpe.java → spring-boot-mybatis-plus/mybatis-plus-extensions/mybatis-plus-extensions-webmagic-autoconfigure/src/main/java/in/hocg/boot/mybatis/plus/extensions/webmagic/WebmagicMpe.java

@@ -1,13 +1,15 @@
 package in.hocg.boot.mybatis.plus.extensions.webmagic;
 
 
+import in.hocg.boot.mybatis.plus.extensions.context.constants.MyBatisPlusExtensionsConstants;
+
 /**
  * Created by hocgin on 2022/3/24
  * email: hocgin@gmail.com
  *
  * @author hocgin
  */
-public class TplMpe {
+public class WebmagicMpe {
     public static final String PACKAGE = MyBatisPlusExtensionsConstants.PACKAGE_PREFIX + ".webmagic";
-    public static final String MAPPER_PACKAGE = TplMpe.PACKAGE + ".mapper";
+    public static final String MAPPER_PACKAGE = WebmagicMpe.PACKAGE + ".mapper";
 }

spring-boot-mybatis-plus/mybatis-plus-extensions/mybatis-plus-extensions-webmagic-autoconfigure/src/main/java/in/hocg/boot/mybatis/plus/extensions/webmagic/autoconfiguration/WebmagicMybatisPlusExtAutoConfiguration.java

@@ -0,0 +1,25 @@
+package in.hocg.boot.mybatis.plus.extensions.webmagic.autoconfiguration;
+
+import in.hocg.boot.mybatis.plus.extensions.webmagic.WebmagicMpe;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;
+
+/**
+ * Created by hocgin on 2022/3/24
+ * email: hocgin@gmail.com
+ *
+ * @author hocgin
+ */
+@Slf4j
+@Configuration
+@ConditionalOnProperty(prefix = WebmagicMybatisPlusExtProperties.PREFIX, name = "enabled", matchIfMissing = true)
+@EnableConfigurationProperties(WebmagicMybatisPlusExtProperties.class)
+@ComponentScan(WebmagicMpe.PACKAGE)
+@RequiredArgsConstructor(onConstructor = @__(@Lazy))
+public class WebmagicMybatisPlusExtAutoConfiguration {
+}

spring-boot-mybatis-plus/mybatis-plus-extensions/mybatis-plus-extensions-webmagic-autoconfigure/src/main/java/in/hocg/boot/mybatis/plus/extensions/webmagic/autoconfiguration/WebmagicMybatisPlusExtProperties.java

@@ -0,0 +1,20 @@
+package in.hocg.boot.mybatis.plus.extensions.webmagic.autoconfiguration;
+
+import in.hocg.boot.mybatis.plus.extensions.context.constants.MyBatisPlusExtensionsConstants;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * Created by hocgin on 2020/8/15
+ * email: hocgin@gmail.com
+ *
+ * @author hocgin
+ */
+@Getter
+@Setter
+@ConfigurationProperties(WebmagicMybatisPlusExtProperties.PREFIX)
+public class WebmagicMybatisPlusExtProperties {
+    public static final String PREFIX = MyBatisPlusExtensionsConstants.PROPERTIES_PREFIX + ".webmagic";
+
+}

spring-boot-mybatis-plus/mybatis-plus-extensions/mybatis-plus-extensions-webmagic-autoconfigure/src/main/java/in/hocg/boot/mybatis/plus/extensions/webmagic/controller/WebmagicController.java

@@ -0,0 +1,28 @@
+package in.hocg.boot.mybatis.plus.extensions.webmagic.controller;
+
+
+import io.swagger.annotations.Api;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.context.annotation.Lazy;
+import lombok.RequiredArgsConstructor;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * [BOOT] 爬虫采集表 前端控制器
+ * </p>
+ *
+ * @author hocgin
+ * @since 2022-06-16
+ */
+@Api(tags = "[BOOT] 爬虫采集表")
+@Validated
+@RestController
+@RequiredArgsConstructor(onConstructor = @__(@Lazy))
+@RequestMapping("/webmagic")
+public class WebmagicController {
+
+}
+

spring-boot-mybatis-plus/mybatis-plus-extensions/mybatis-plus-extensions-webmagic-autoconfigure/src/main/java/in/hocg/boot/mybatis/plus/extensions/webmagic/entity/Webmagic.java

@@ -0,0 +1,52 @@
+package in.hocg.boot.mybatis.plus.extensions.webmagic.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+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 io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * [BOOT] 爬虫采集表
+ * </p>
+ *
+ * @author hocgin
+ * @since 2022-06-16
+ */
+@Getter
+@Setter
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName(MyBatisPlusExtensionsConstants.TABLE_PREFIX + "webmagic")
+public class Webmagic extends CommonEntity<Webmagic> {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("类型")
+    @TableField("type")
+    private String type;
+    @ApiModelProperty("完成状态")
+    @TableField("status")
+    private String status;
+    @ApiModelProperty("失败原因")
+    @TableField("fail_reason")
+    private String failReason;
+    @ApiModelProperty("拉取的地址")
+    @TableField("pull_url")
+    private String pullUrl;
+    @ApiModelProperty("拉取的数据")
+    @TableField("pull_data")
+    private String pullData;
+    @ApiModelProperty("完成时间")
+    @TableField("finished_at")
+    private LocalDateTime finishedAt;
+
+
+}

spring-boot-mybatis-plus/mybatis-plus-extensions/mybatis-plus-extensions-webmagic-autoconfigure/src/main/java/in/hocg/boot/mybatis/plus/extensions/webmagic/enums/Status.java

@@ -0,0 +1,21 @@
+package in.hocg.boot.mybatis.plus.extensions.webmagic.enums;
+
+import in.hocg.boot.utils.enums.ICode;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * Created by hocgin on 2022/6/16
+ * email: hocgin@gmail.com
+ *
+ * @author hocgin
+ */
+@Getter
+@RequiredArgsConstructor
+public enum Status implements ICode {
+    Progress("progress", "进行中"),
+    Fail("fail", "失败"),
+    Done("done", "完成");
+    private final String code;
+    private final String name;
+}