From 657b581f8d99f6d410cc5b0a7cd4930b5512a7bd Mon Sep 17 00:00:00 2001 From: jiangdingxuan Date: Mon, 8 Jan 2024 14:21:37 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=85=A8=E5=B1=80=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../net/rzdata/demo/config/DemoConfig.java | 18 ++++++++++++++++++ ...oot.autoconfigure.AutoConfiguration.imports | 1 + 2 files changed, 19 insertions(+) create mode 100644 common/src/main/java/net/rzdata/demo/config/DemoConfig.java diff --git a/common/src/main/java/net/rzdata/demo/config/DemoConfig.java b/common/src/main/java/net/rzdata/demo/config/DemoConfig.java new file mode 100644 index 0000000..ca96679 --- /dev/null +++ b/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 { +} diff --git a/common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index da71b2a..4781059 100644 --- a/common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1,2 @@ net.rzdata.demo.exception.GlobalExceptionHandler +net.rzdata.demo.config.DemoConfig -- 2.35.1.windows.2 From 9d35b6604189acbd25afa5d606f2c27bdd363889 Mon Sep 17 00:00:00 2001 From: jiangdingxuan Date: Mon, 8 Jan 2024 18:20:10 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20MybatisPlus=20?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rzdata/demo/config/MybatisPlusConfig.java | 25 +++++++++++++++++++ ...ot.autoconfigure.AutoConfiguration.imports | 1 + .../src/main/resources/config/application.yml | 8 ++++++ 3 files changed, 34 insertions(+) create mode 100644 common/src/main/java/net/rzdata/demo/config/MybatisPlusConfig.java diff --git a/common/src/main/java/net/rzdata/demo/config/MybatisPlusConfig.java b/common/src/main/java/net/rzdata/demo/config/MybatisPlusConfig.java new file mode 100644 index 0000000..a826d04 --- /dev/null +++ b/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(); + } +} diff --git a/common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 4781059..5da56b1 100644 --- a/common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,2 +1,3 @@ net.rzdata.demo.exception.GlobalExceptionHandler net.rzdata.demo.config.DemoConfig +net.rzdata.demo.config.MybatisPlusConfig diff --git a/service/system/src/main/resources/config/application.yml b/service/system/src/main/resources/config/application.yml index 8e7d599..1fa46fe 100644 --- a/service/system/src/main/resources/config/application.yml +++ b/service/system/src/main/resources/config/application.yml @@ -19,3 +19,11 @@ spring: maximum-pool-size: 20 idle-timeout: 30000 max-lifetime: 1800000 +mybatis-plus: + configuration: + log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl +logging: + level: + root: info + net.rzdata: debug + com.baomidou.example.mapper: debug -- 2.35.1.windows.2 From 387935247f2bc2a4ed0d75c0f81fe1a399a5b6db Mon Sep 17 00:00:00 2001 From: jiangdingxuan Date: Mon, 8 Jan 2024 18:24:24 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=88=86=E9=A1=B5=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/net/rzdata/demo/trait/GetReq.java | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 common/src/main/java/net/rzdata/demo/trait/GetReq.java diff --git a/common/src/main/java/net/rzdata/demo/trait/GetReq.java b/common/src/main/java/net/rzdata/demo/trait/GetReq.java new file mode 100644 index 0000000..0f14655 --- /dev/null +++ b/common/src/main/java/net/rzdata/demo/trait/GetReq.java @@ -0,0 +1,29 @@ +package net.rzdata.demo.trait; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.metadata.OrderItem; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@ToString +public class GetReq { + + private Integer pageSize = 15; + private Integer pageNum = 1; + private String orderBy; + private Boolean asc = true; + + public IPage into() { + Page page = new Page<>(); + page.setSize(pageSize); + page.setCurrent(pageNum); + if (orderBy != null) { + page.addOrder(this.asc ? OrderItem.asc(orderBy) : OrderItem.desc(orderBy)); + } + return page; + } +} -- 2.35.1.windows.2 From 42b6c95ac2c69e0cd654dcde3c2aab4b1942408d Mon Sep 17 00:00:00 2001 From: jiangdingxuan Date: Mon, 8 Jan 2024 14:16:46 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=80=9A=E8=BF=87=20javadoc=20=E7=94=9F?= =?UTF-8?q?=E6=88=90=20openapi=20=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- service/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/service/pom.xml b/service/pom.xml index a85c73b..9144581 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -54,6 +54,10 @@ org.springframework.boot spring-boot-starter-data-redis + + org.springdoc + springdoc-openapi-starter-webmvc-ui + com.mysql mysql-connector-j -- 2.35.1.windows.2