From 84c77b0b50bdf68185005b7b12e52121755e0e5d Mon Sep 17 00:00:00 2001 From: yulinling <2712495353@qq.com> Date: Mon, 9 Jun 2025 22:08:44 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20-=20=E6=B7=BB=E5=8A=A0=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E6=8F=92=E4=BB=B6=E4=BB=A5=E5=8F=8Axml=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E9=85=8D=E7=BD=AE=20-=20=E6=B7=BB=E5=8A=A0=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=9C=8D=E5=8A=A1=20-=20=E6=B7=BB=E5=8A=A0PageParam?= =?UTF-8?q?=E7=B1=BB=20-=20=E6=B7=BB=E5=8A=A0MyBatisPlusConfig=E7=B1=BB=20?= =?UTF-8?q?-=20=E6=B7=BB=E5=8A=A0/users=E5=88=86=E9=A1=B5=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/.gitignore | 10 --- .idea/dataSources.xml | 18 ----- .idea/encodings.xml | 7 -- .idea/misc.xml | 14 ---- .idea/sqldialects.xml | 10 --- .idea/vcs.xml | 6 -- pom.xml | 5 ++ qodana.yaml | 31 ++++++++ .../workflow/config/MyBatisPlusConfig.java | 32 +++++++++ .../workflow/controller/TestController.java | 12 ++-- .../workflow/dto/request/PageParam.java | 22 ++++++ .../{model => dto/response}/PageResult.java | 39 ++-------- .../yulinling/workflow/mapper/UserMapper.java | 2 - .../workflow/model/vo/user/UserVO.java | 2 +- .../workflow/service/MailService.java | 40 +++++------ .../workflow/service/UserService.java | 10 +-- .../service/impl/MailServiceImpl.java | 42 +++++------ .../service/impl/UserServiceImpl.java | 27 ++++++- .../yulinling/workflow/utils/PageUtils.java | 72 +++++++++++++++++++ src/main/resources/application.properties | 13 +--- .../workflow/mapper/UserMapperTest.java | 9 --- .../workflow/service/UserServiceTest.java | 17 +++-- 22 files changed, 257 insertions(+), 183 deletions(-) delete mode 100644 .idea/.gitignore delete mode 100644 .idea/dataSources.xml delete mode 100644 .idea/encodings.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/sqldialects.xml delete mode 100644 .idea/vcs.xml create mode 100644 qodana.yaml create mode 100644 src/main/java/asia/yulinling/workflow/config/MyBatisPlusConfig.java create mode 100644 src/main/java/asia/yulinling/workflow/dto/request/PageParam.java rename src/main/java/asia/yulinling/workflow/{model => dto/response}/PageResult.java (58%) create mode 100644 src/main/java/asia/yulinling/workflow/utils/PageUtils.java diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 7d05e99..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -# 默认忽略的文件 -/shelf/ -/workspace.xml -# 基于编辑器的 HTTP 客户端请求 -/httpRequests/ -# 依赖于环境的 Maven 主目录路径 -/mavenHomeManager.xml -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml deleted file mode 100644 index 3262045..0000000 --- a/.idea/dataSources.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - mysql.8 - true - com.mysql.cj.jdbc.Driver - jdbc:mysql://122.152.201.90:9912/workflow - - - - - - - $ProjectFileDir$ - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index aa00ffa..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 2f30dbf..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml deleted file mode 100644 index 9bf7c16..0000000 --- a/.idea/sqldialects.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index 3419cac..2df66e8 100644 --- a/pom.xml +++ b/pom.xml @@ -91,6 +91,11 @@ mybatis-plus-boot-starter-test 3.5.12 + + com.baomidou + mybatis-plus-jsqlparser + 3.5.12 + org.springframework.boot spring-boot-starter-test diff --git a/qodana.yaml b/qodana.yaml new file mode 100644 index 0000000..faa34b8 --- /dev/null +++ b/qodana.yaml @@ -0,0 +1,31 @@ +#-------------------------------------------------------------------------------# +# Qodana analysis is configured by qodana.yaml file # +# https://www.jetbrains.com/help/qodana/qodana-yaml.html # +#-------------------------------------------------------------------------------# +version: "1.0" + +#Specify inspection profile for code analysis +profile: + name: qodana.starter + +#Enable inspections +#include: +# - name: + +#Disable inspections +#exclude: +# - name: +# paths: +# - + +projectJDK: "17" #(Applied in CI/CD pipeline) + +#Execute shell command before Qodana execution (Applied in CI/CD pipeline) +#bootstrap: sh ./prepare-qodana.sh + +#Install IDE plugins before Qodana execution (Applied in CI/CD pipeline) +#plugins: +# - id: #(plugin id can be found at https://plugins.jetbrains.com) + +#Specify Qodana linter for analysis (Applied in CI/CD pipeline) +linter: jetbrains/qodana-jvm:2025.1 diff --git a/src/main/java/asia/yulinling/workflow/config/MyBatisPlusConfig.java b/src/main/java/asia/yulinling/workflow/config/MyBatisPlusConfig.java new file mode 100644 index 0000000..21f57ea --- /dev/null +++ b/src/main/java/asia/yulinling/workflow/config/MyBatisPlusConfig.java @@ -0,0 +1,32 @@ +package asia.yulinling.workflow.config; + +import com.baomidou.mybatisplus.annotation.DbType; +import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + *

+ * MybatisPlus配置类 + *

+ * + * @author YLL + * @since 2025/6/9 + */ +@Configuration +@MapperScan("asia.yulinling.workflow.mapper") +public class MyBatisPlusConfig { + + /** + * 添加分页插件 + */ + @Bean + public MybatisPlusInterceptor mybatisPlusInterceptor() { + MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); + interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); // 如果配置多个插件, 切记分页最后添加 + // 如果有多数据源可以不配具体类型, 否则都建议配上具体的 DbType + return interceptor; + } +} diff --git a/src/main/java/asia/yulinling/workflow/controller/TestController.java b/src/main/java/asia/yulinling/workflow/controller/TestController.java index f984ef6..2bee43f 100644 --- a/src/main/java/asia/yulinling/workflow/controller/TestController.java +++ b/src/main/java/asia/yulinling/workflow/controller/TestController.java @@ -1,20 +1,18 @@ package asia.yulinling.workflow.controller; import asia.yulinling.workflow.constant.Status; +import asia.yulinling.workflow.dto.request.PageParam; import asia.yulinling.workflow.exception.JsonException; import asia.yulinling.workflow.exception.PageException; import asia.yulinling.workflow.model.ApiResponse; -import asia.yulinling.workflow.model.PageResult; +import asia.yulinling.workflow.dto.response.PageResult; import asia.yulinling.workflow.model.vo.user.UserVO; import asia.yulinling.workflow.service.UserService; import cn.hutool.core.lang.Dict; import cn.hutool.json.JSONUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.Map; @@ -71,7 +69,7 @@ public class TestController { } @GetMapping("/users") - public ApiResponse> usersPage() { - return userService.getUserList(); + public ApiResponse> usersPage(PageParam pageParam) { + return userService.getUserListByPage(pageParam); } } diff --git a/src/main/java/asia/yulinling/workflow/dto/request/PageParam.java b/src/main/java/asia/yulinling/workflow/dto/request/PageParam.java new file mode 100644 index 0000000..1645cf9 --- /dev/null +++ b/src/main/java/asia/yulinling/workflow/dto/request/PageParam.java @@ -0,0 +1,22 @@ +package asia.yulinling.workflow.dto.request; + +import lombok.Data; + +/** + *

+ * 分页请求参数 + *

+ * + * @author YLL + * @since 2025/6/9 + */ +@Data +public class PageParam { + private int pageNum; + private int pageSize; + + public PageParam() { + this.pageNum = 1; + this.pageSize = 10; + } +} diff --git a/src/main/java/asia/yulinling/workflow/model/PageResult.java b/src/main/java/asia/yulinling/workflow/dto/response/PageResult.java similarity index 58% rename from src/main/java/asia/yulinling/workflow/model/PageResult.java rename to src/main/java/asia/yulinling/workflow/dto/response/PageResult.java index 50eabf5..559c1a5 100644 --- a/src/main/java/asia/yulinling/workflow/model/PageResult.java +++ b/src/main/java/asia/yulinling/workflow/dto/response/PageResult.java @@ -1,4 +1,4 @@ -package asia.yulinling.workflow.model; +package asia.yulinling.workflow.dto.response; import lombok.Data; @@ -27,6 +27,9 @@ public class PageResult { private int from; // 当前页第一条数据在总数据中的位置（从1开始） private int to; // 当前页最后一条数据在总数据中的位置 + // 无参构造器 + public PageResult() {} + // 构造方法（可选传参） public PageResult(long total, int currentPage, int pageSize, List list) { this.total = total; @@ -42,39 +45,5 @@ public class PageResult { this.lastPage = currentPage == totalPage; this.from = (currentPage - 1) * pageSize + 1; this.to = Math.min(currentPage * pageSize, (int) total); - - // 可选：导航页码生成逻辑（需要时可扩展） - navigatePageNums = calculateNavigatePageNumbers(currentPage, totalPage, navigatePages); - } - - private int[] calculateNavigatePageNumbers(int currentPage, int totalPage, int navigatePages) { - int[] navigatePageNums; - int startPage = 1; - int endPage = totalPage; - - // 中间页码计算逻辑 - if (totalPage > navigatePages) { - int half = navigatePages / 2; - startPage = currentPage - half; - endPage = currentPage + half; - - if (startPage < 1) { - startPage = 1; - endPage = navigatePages; - } - - if (endPage > totalPage) { - endPage = totalPage; - startPage = endPage - navigatePages + 1; - if (startPage < 1) startPage = 1; - } - } - - navigatePageNums = new int[endPage - startPage + 1]; - for (int i = 0; i < navigatePageNums.length; i++) { - navigatePageNums[i] = startPage + i; - } - - return navigatePageNums; } } diff --git a/src/main/java/asia/yulinling/workflow/mapper/UserMapper.java b/src/main/java/asia/yulinling/workflow/mapper/UserMapper.java index fa73c3a..9439345 100644 --- a/src/main/java/asia/yulinling/workflow/mapper/UserMapper.java +++ b/src/main/java/asia/yulinling/workflow/mapper/UserMapper.java @@ -7,8 +7,6 @@ import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Component; -import java.util.List; - /** *

* 用户Mapper diff --git a/src/main/java/asia/yulinling/workflow/model/vo/user/UserVO.java b/src/main/java/asia/yulinling/workflow/model/vo/user/UserVO.java index 3911a62..11b2520 100644 --- a/src/main/java/asia/yulinling/workflow/model/vo/user/UserVO.java +++ b/src/main/java/asia/yulinling/workflow/model/vo/user/UserVO.java @@ -4,7 +4,7 @@ import lombok.Data; /** *

- * 用户信息VO + * 用户信息VO *

* * @author YLL diff --git a/src/main/java/asia/yulinling/workflow/service/MailService.java b/src/main/java/asia/yulinling/workflow/service/MailService.java index 5caf3b5..aaf5bb8 100644 --- a/src/main/java/asia/yulinling/workflow/service/MailService.java +++ b/src/main/java/asia/yulinling/workflow/service/MailService.java @@ -4,7 +4,7 @@ import jakarta.mail.MessagingException; /** *

- * 邮件接口 + * 邮件接口 *

* * @author yulinling @@ -14,20 +14,20 @@ public interface MailService { /** * 发送文本邮件 * - * @param to 收件人地址 - * @param subject 邮件主题 - * @param content 邮件内容 - * @param cc 抄送地址 + * @param to 收件人地址 + * @param subject 邮件主题 + * @param content 邮件内容 + * @param cc 抄送地址 */ void sendSimpleMail(String to, String subject, String content, String... cc); /** * 发送HTML邮件 * - * @param to 收件人地址 - * @param subject 邮件主题 - * @param content 邮件内容 - * @param cc 抄送地址 + * @param to 收件人地址 + * @param subject 邮件主题 + * @param content 邮件内容 + * @param cc 抄送地址 * @throws MessagingException 邮件发送异常 */ void sendHtmlMail(String to, String subject, String content, String... cc) throws MessagingException; @@ -36,11 +36,11 @@ public interface MailService { /** * 发送带附件邮件 * - * @param to 收件人地址 - * @param subject 邮件主题 - * @param content 邮件内容 - * @param filePath 附件地址 - * @param cc 抄送地址 + * @param to 收件人地址 + * @param subject 邮件主题 + * @param content 邮件内容 + * @param filePath 附件地址 + * @param cc 抄送地址 * @throws MessagingException 邮件发送异常 */ void sendAttachmentsMail(String to, String subject, String content, String filePath, String... cc) throws MessagingException; @@ -48,12 +48,12 @@ public interface MailService { /** * 发送正文带静态资源的邮件 * - * @param to 收件人地址 - * @param subject 邮件主题 - * @param content 邮件内容 - * @param rscPath 静态资源地址 - * @param rscId 静态资源id - * @param cc 抄送地址 + * @param to 收件人地址 + * @param subject 邮件主题 + * @param content 邮件内容 + * @param rscPath 静态资源地址 + * @param rscId 静态资源id + * @param cc 抄送地址 * @throws MessagingException 邮件发送异常 */ void sendResourceMail(String to, String subject, String content, String rscPath, String rscId, String... cc) throws MessagingException; diff --git a/src/main/java/asia/yulinling/workflow/service/UserService.java b/src/main/java/asia/yulinling/workflow/service/UserService.java index 03c32cf..258a1ac 100644 --- a/src/main/java/asia/yulinling/workflow/service/UserService.java +++ b/src/main/java/asia/yulinling/workflow/service/UserService.java @@ -1,16 +1,14 @@ package asia.yulinling.workflow.service; +import asia.yulinling.workflow.dto.request.PageParam; import asia.yulinling.workflow.model.ApiResponse; -import asia.yulinling.workflow.model.PageResult; -import asia.yulinling.workflow.model.entity.User; +import asia.yulinling.workflow.dto.response.PageResult; import asia.yulinling.workflow.model.vo.user.UserVO; import org.springframework.transaction.annotation.Transactional; -import java.util.List; - /** *

- * 用户接口 + * 用户接口 *

* * @author YLL @@ -20,4 +18,6 @@ import java.util.List; public interface UserService { ApiResponse> getUserList(); + + ApiResponse> getUserListByPage(PageParam pageParam); } diff --git a/src/main/java/asia/yulinling/workflow/service/impl/MailServiceImpl.java b/src/main/java/asia/yulinling/workflow/service/impl/MailServiceImpl.java index 38f2e80..5e26196 100644 --- a/src/main/java/asia/yulinling/workflow/service/impl/MailServiceImpl.java +++ b/src/main/java/asia/yulinling/workflow/service/impl/MailServiceImpl.java @@ -12,11 +12,12 @@ import org.springframework.stereotype.Service; import jakarta.mail.internet.MimeMessage; import jakarta.mail.MessagingException; + import java.io.File; /** *

- * 邮件接口 + * 邮件接口 *

* * @author yulinling @@ -29,13 +30,14 @@ public class MailServiceImpl implements MailService { private final JavaMailSender mailSender; @Value("${spring.mail.username}") private String from; + /** * 发送文本邮件 * - * @param to 收件人地址 - * @param subject 邮件主题 - * @param content 邮件内容 - * @param cc 抄送地址 + * @param to 收件人地址 + * @param subject 邮件主题 + * @param content 邮件内容 + * @param cc 抄送地址 */ @Override public void sendSimpleMail(String to, String subject, String content, String... cc) { @@ -55,10 +57,10 @@ public class MailServiceImpl implements MailService { /** * 发送HTML邮件 * - * @param to 收件人地址 - * @param subject 邮件主题 - * @param content 邮件内容 - * @param cc 抄送地址 + * @param to 收件人地址 + * @param subject 邮件主题 + * @param content 邮件内容 + * @param cc 抄送地址 * @throws MessagingException 邮件发送异常 */ @Override @@ -80,11 +82,11 @@ public class MailServiceImpl implements MailService { /** * 发送带附件邮件 * - * @param to 收件人地址 - * @param subject 邮件主题 - * @param content 邮件内容 - * @param filePath 附件地址 - * @param cc 抄送地址 + * @param to 收件人地址 + * @param subject 邮件主题 + * @param content 邮件内容 + * @param filePath 附件地址 + * @param cc 抄送地址 * @throws MessagingException 邮件发送异常 */ @Override @@ -108,12 +110,12 @@ public class MailServiceImpl implements MailService { /** * 发送正文带静态资源的邮件 * - * @param to 收件人地址 - * @param subject 邮件主题 - * @param content 邮件内容 - * @param rscPath 静态资源地址 - * @param rscId 静态资源id - * @param cc 抄送地址 + * @param to 收件人地址 + * @param subject 邮件主题 + * @param content 邮件内容 + * @param rscPath 静态资源地址 + * @param rscId 静态资源id + * @param cc 抄送地址 * @throws MessagingException 邮件发送异常 */ public void sendResourceMail(String to, String subject, String content, String rscPath, String rscId, String... cc) throws MessagingException { diff --git a/src/main/java/asia/yulinling/workflow/service/impl/UserServiceImpl.java b/src/main/java/asia/yulinling/workflow/service/impl/UserServiceImpl.java index e7bde10..b7e2c42 100644 --- a/src/main/java/asia/yulinling/workflow/service/impl/UserServiceImpl.java +++ b/src/main/java/asia/yulinling/workflow/service/impl/UserServiceImpl.java @@ -1,18 +1,20 @@ package asia.yulinling.workflow.service.impl; +import asia.yulinling.workflow.dto.request.PageParam; import asia.yulinling.workflow.mapper.UserMapper; import asia.yulinling.workflow.model.ApiResponse; -import asia.yulinling.workflow.model.PageResult; +import asia.yulinling.workflow.dto.response.PageResult; import asia.yulinling.workflow.model.entity.User; import asia.yulinling.workflow.model.vo.user.UserVO; import asia.yulinling.workflow.service.UserService; +import asia.yulinling.workflow.utils.PageUtils; import cn.hutool.core.util.ArrayUtil; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import java.util.ArrayList; -import java.util.Collections; import java.util.List; /** @@ -55,4 +57,25 @@ public class UserServiceImpl implements UserService { return ApiResponse.ofSuccess(null); } + + @Override + public ApiResponse> getUserListByPage(PageParam pageParam) { + + Page page = new Page<>(pageParam.getPageNum(), pageParam.getPageSize()); + Page users = userMapper.selectPage(page, null); + List userVOList = new ArrayList<>(); + + if (users.getRecords() != null && !users.getRecords().isEmpty()) { + + for (User user : users.getRecords()) { + UserVO userVO = new UserVO(); + BeanUtils.copyProperties(user, userVO); + userVOList.add(userVO); + } + + } + PageResult pageResult = PageUtils.buildPageResult(users, userVOList); + + return ApiResponse.ofSuccess(pageResult); + } } diff --git a/src/main/java/asia/yulinling/workflow/utils/PageUtils.java b/src/main/java/asia/yulinling/workflow/utils/PageUtils.java new file mode 100644 index 0000000..adfb9fb --- /dev/null +++ b/src/main/java/asia/yulinling/workflow/utils/PageUtils.java @@ -0,0 +1,72 @@ +package asia.yulinling.workflow.utils; + +import asia.yulinling.workflow.dto.response.PageResult; +import com.baomidou.mybatisplus.core.metadata.IPage; + +import java.util.List; + +/** + *

+ * 分页工具类 + *

+ * + * @author YLL + * @since 2025/6/9 + */ +public class PageUtils { + public static PageResult buildPageResult(IPage iPage, List list) { + PageResult result = new PageResult<>(); + + result.setTotal(iPage.getTotal()); + result.setCurrentPage((int) iPage.getCurrent()); + result.setPageSize((int) iPage.getSize()); + result.setTotalPage((int) iPage.getPages()); + result.setList(list); + + // 可选字段 + int navigatePages = 5; + result.setNavigatePages(navigatePages); + result.setNavigatePageNums(calculateNavigatePageNumbers((int) iPage.getCurrent(), (int)iPage.getPages(), navigatePages)); + + result.setHasNext(iPage.getCurrent() < iPage.getPages()); + result.setHasPrev(iPage.getCurrent() > 1); + result.setFirstPage(iPage.getCurrent() == 1); + result.setLastPage(iPage.getCurrent() == iPage.getPages()); + + result.setFrom((int) ((iPage.getCurrent() - 1) * iPage.getSize() + 1)); + result.setTo((int) (Math.min(iPage.getCurrent() * iPage.getSize(), iPage.getTotal()))); + + return result; + } + + private static int[] calculateNavigatePageNumbers(int currentPage, int totalPage, int navigatePages) { + int[] navigatePageNums; + int startPage = 1; + int endPage = totalPage; + + // 中间页码计算逻辑 + if (totalPage > navigatePages) { + int half = navigatePages / 2; + startPage = currentPage - half; + endPage = currentPage + half; + + if (startPage < 1) { + startPage = 1; + endPage = navigatePages; + } + + if (endPage > totalPage) { + endPage = totalPage; + startPage = endPage - navigatePages + 1; + if (startPage < 1) startPage = 1; + } + } + + navigatePageNums = new int[endPage - startPage + 1]; + for (int i = 0; i < navigatePageNums.length; i++) { + navigatePageNums[i] = startPage + i; + } + + return navigatePageNums; + } +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 95dfd64..7d529f7 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,7 +1,6 @@ # ???? server.port=8080 server.servlet.context-path=/demo - # mysql?? spring.datasource.url=jdbc:mysql://122.152.201.90:9912/workflow?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&failOverReadOnly=false&serverTimezone=GMT%2B8 spring.datasource.username=root @@ -11,7 +10,7 @@ spring.sql.init.mode=always spring.sql.init.continue-on-error=true spring.sql.init.schema-locations=classpath:db/schema.sql spring.sql.init.data-locations=classpath:db/data.sql -# ????? +# ??????? spring.datasource.hikari.minimum-idle=5 spring.datasource.hikari.connection-test-query=SELECT 1 spring.datasource.hikari.maximum-pool-size=20 @@ -20,16 +19,9 @@ spring.datasource.hikari.idle-timeout=30000 spring.datasource.hikari.pool-name=MyAppHikariCP spring.datasource.hikari.max-lifetime=300000 spring.datasource.hikari.connection-timeout=30000 - -# mybatis?? -mybatis.configuration.map-underscore-to-camel-case=true -mybatis.mapper-locations=classpath:mapper/*.xml -mybatis.type-aliases-package=asia/yulinling/workflow/entity - # log?? logging.level.asia.yulinling=debug logging.level.asia.yulinling.workflow.mapper=trace - # mail?? spring.mail.host=smtp.qq.com spring.mail.port=587 @@ -43,6 +35,5 @@ spring.mail.properties.mail.smtp.starttls.enable=true spring.mail.properties.mail.smtp.starttls.required=true spring.mail.properties.mail.smtp.ssl.enable=false spring.mail.properties.mail.display.sendmail=spring-boot-demo - -# Jasypt ?? +# Jasypt?? jasypt.encryptor.password=abc \ No newline at end of file diff --git a/src/test/java/asia/yulinling/workflow/mapper/UserMapperTest.java b/src/test/java/asia/yulinling/workflow/mapper/UserMapperTest.java index e38b535..d6a70d6 100644 --- a/src/test/java/asia/yulinling/workflow/mapper/UserMapperTest.java +++ b/src/test/java/asia/yulinling/workflow/mapper/UserMapperTest.java @@ -9,12 +9,10 @@ import com.baomidou.mybatisplus.test.autoconfigure.MybatisPlusTest; import lombok.extern.slf4j.Slf4j; import org.junit.Assert; import org.junit.Test; -import org.junit.jupiter.api.extension.ExtendWith; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; import org.springframework.test.annotation.Rollback; -import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.transaction.annotation.Transactional; @@ -38,13 +36,6 @@ public class UserMapperTest { @Autowired private UserMapper userMapper; -// @Test -// public void selectAllUser() { -// List users = userMapper.selectAllUser(); -// Assert.assertTrue(CollUtil.isNotEmpty(users)); -// log.info("users={}", users); -// } - @Test public void selectAllUser2() { List users = userMapper.selectList(null); diff --git a/src/test/java/asia/yulinling/workflow/service/UserServiceTest.java b/src/test/java/asia/yulinling/workflow/service/UserServiceTest.java index 77eb07d..ac88ad5 100644 --- a/src/test/java/asia/yulinling/workflow/service/UserServiceTest.java +++ b/src/test/java/asia/yulinling/workflow/service/UserServiceTest.java @@ -1,16 +1,14 @@ package asia.yulinling.workflow.service; import asia.yulinling.workflow.WorkFlowMainTests; +import asia.yulinling.workflow.dto.request.PageParam; import asia.yulinling.workflow.model.ApiResponse; -import asia.yulinling.workflow.model.PageResult; -import asia.yulinling.workflow.model.entity.User; +import asia.yulinling.workflow.dto.response.PageResult; import asia.yulinling.workflow.model.vo.user.UserVO; import org.junit.Assert; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; -import java.util.List; - /** *

* 用户测试类 @@ -25,8 +23,15 @@ public class UserServiceTest extends WorkFlowMainTests { @Test public void getUserList() { - ApiResponse> users =userService.getUserList(); + ApiResponse> users = userService.getUserList(); + Assert.assertEquals(200, users.getCode().intValue()); + } - Assert.assertEquals(200,users.getCode().intValue()); + @Test + public void getUserListByPage() { + PageParam pageParam = new PageParam(); + ApiResponse> users = userService.getUserListByPage(pageParam); + + Assert.assertEquals(200, users.getCode().intValue()); } }