From 68cd67d3e57e8672723adfa35ca5d22ba9c65716 Mon Sep 17 00:00:00 2001 From: HopeLi <1278288511@qq.com> Date: Mon, 19 May 2025 10:38:20 +0800 Subject: [PATCH] 0519 ljc --- .../ci/common/pipeline/utils/PageResult.java | 29 +++++++++---------- .../src/main/resources/application.yaml | 6 +++- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/utils/PageResult.java b/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/utils/PageResult.java index 82c2dd4f..37b5bdab 100644 --- a/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/utils/PageResult.java +++ b/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/utils/PageResult.java @@ -1,7 +1,6 @@ package cd.casic.ci.common.pipeline.utils; import cn.hutool.core.convert.Convert; -import cn.hutool.core.util.PageUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.Data; @@ -34,10 +33,10 @@ public class PageResult implements Serializable { */ private Integer pageSize = 20; - /** - * 总页数 - */ - private Integer totalPage = 0; +// /** +// * 总页数 +// */ +// private Integer totalPage = 0; /** * 总记录数 @@ -49,10 +48,10 @@ public class PageResult implements Serializable { */ private List list; - /** - * 分页彩虹 - */ - private int[] rainbow; +// /** +// * 分页彩虹 +// */ +// private int[] rainbow; public PageResult() { } @@ -68,8 +67,8 @@ public class PageResult implements Serializable { this.setTotal(Convert.toInt(page.getTotal())); this.setPageNo(Convert.toInt(page.getCurrent())); this.setPageSize(Convert.toInt(page.getSize())); - this.setRainbow(PageUtil.rainbow(Convert.toInt(page.getCurrent()), - Convert.toInt(this.getTotalPage()), RAINBOW_NUM)); +// this.setRainbow(PageUtil.rainbow(Convert.toInt(page.getCurrent()), +// Convert.toInt(this.getTotalPage()), RAINBOW_NUM)); } /** @@ -84,9 +83,9 @@ public class PageResult implements Serializable { this.setTotal(Convert.toInt(page.getTotal())); this.setPageNo(Convert.toInt(page.getCurrent())); this.setPageSize(Convert.toInt(page.getSize())); - this.setTotalPage(PageUtil.totalPage(Convert.toInt(page.getTotal()), - Convert.toInt(page.getSize()))); - this.setRainbow(PageUtil.rainbow(Convert.toInt(page.getCurrent()), - Convert.toInt(this.getTotalPage()), RAINBOW_NUM)); +// this.setTotalPage(PageUtil.totalPage(Convert.toInt(page.getTotal()), +// Convert.toInt(page.getSize()))); +// this.setRainbow(PageUtil.rainbow(Convert.toInt(page.getCurrent()), +// Convert.toInt(this.getTotalPage()), RAINBOW_NUM)); } } diff --git a/ops-server/src/main/resources/application.yaml b/ops-server/src/main/resources/application.yaml index 08c41447..8c60b6aa 100644 --- a/ops-server/src/main/resources/application.yaml +++ b/ops-server/src/main/resources/application.yaml @@ -177,4 +177,8 @@ ops: - mail_account - mail_template -debug: false \ No newline at end of file +debug: false + +mybatis-plus: + configuration: + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl