Merge remote-tracking branch 'upstream/develop' into develop

# Conflicts:
#	service/system/src/main/resources/config/application.yml

common/src/main/java/net/rzdata/demo/config/DemoConfig.java

@@ -0,0 +1,18 @@
+package net.rzdata.demo.config;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 全局配置
+ */
+@Configuration
+@ConfigurationProperties(prefix = "demo")
+@Getter
+@Setter
+@ToString
+public class DemoConfig {
+}

common/src/main/java/net/rzdata/demo/config/MybatisPlusConfig.java

@@ -0,0 +1,25 @@
+package net.rzdata.demo.config;
+
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class MybatisPlusConfig {
+
+    /**
+     * 添加插件
+     */
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        // 分页插件
+        interceptor.addInnerInterceptor(paginationInnerInterceptor());
+        return interceptor;
+    }
+
+    public PaginationInnerInterceptor paginationInnerInterceptor() {
+        return new PaginationInnerInterceptor();
+    }
+}

common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1 +1,3 @@
 net.rzdata.demo.exception.GlobalExceptionHandler
+net.rzdata.demo.config.DemoConfig
+net.rzdata.demo.config.MybatisPlusConfig

service/pom.xml

@@ -54,6 +54,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springdoc</groupId>
+            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.mysql</groupId>
             <artifactId>mysql-connector-j</artifactId>