mianbin/ops-pro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'temp' of http://1.14.125.6:3000/mianbin/ops-pro into temp

Browse Source
This commit is contained in:
even 2025-05-19 10:44:19 +08:00
commit 5101584b68
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/utils/PageResult.java
View File

@ -1,7 +1,6 @@
package cd.casic.ci.common.pipeline.utils; package cd.casic.ci.common.pipeline.utils;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.PageUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.Data; import lombok.Data;
@ -34,10 +33,10 @@ public class PageResult<T> implements Serializable {
*/ */
private Integer pageSize = 20; private Integer pageSize = 20;
/** // /**
* 总页数 // * 总页数
*/ // */
private Integer totalPage = 0; // private Integer totalPage = 0;
/** /**
* 总记录数 * 总记录数
@ -49,10 +48,10 @@ public class PageResult<T> implements Serializable {
*/ */
private List<T> list; private List<T> list;
/** // /**
* 分页彩虹 // * 分页彩虹
*/ // */
private int[] rainbow; // private int[] rainbow;
public PageResult() { public PageResult() {
} }
@ -68,8 +67,8 @@ public class PageResult<T> implements Serializable {
this.setTotal(Convert.toInt(page.getTotal())); this.setTotal(Convert.toInt(page.getTotal()));
this.setPageNo(Convert.toInt(page.getCurrent())); this.setPageNo(Convert.toInt(page.getCurrent()));
this.setPageSize(Convert.toInt(page.getSize())); this.setPageSize(Convert.toInt(page.getSize()));
this.setRainbow(PageUtil.rainbow(Convert.toInt(page.getCurrent()), // this.setRainbow(PageUtil.rainbow(Convert.toInt(page.getCurrent()),
Convert.toInt(this.getTotalPage()), RAINBOW_NUM)); // Convert.toInt(this.getTotalPage()), RAINBOW_NUM));
} }
/** /**
@ -84,9 +83,9 @@ public class PageResult<T> implements Serializable {
this.setTotal(Convert.toInt(page.getTotal())); this.setTotal(Convert.toInt(page.getTotal()));
this.setPageNo(Convert.toInt(page.getCurrent())); this.setPageNo(Convert.toInt(page.getCurrent()));
this.setPageSize(Convert.toInt(page.getSize())); this.setPageSize(Convert.toInt(page.getSize()));
this.setTotalPage(PageUtil.totalPage(Convert.toInt(page.getTotal()), // this.setTotalPage(PageUtil.totalPage(Convert.toInt(page.getTotal()),
Convert.toInt(page.getSize()))); // Convert.toInt(page.getSize())));
this.setRainbow(PageUtil.rainbow(Convert.toInt(page.getCurrent()), // this.setRainbow(PageUtil.rainbow(Convert.toInt(page.getCurrent()),
Convert.toInt(this.getTotalPage()), RAINBOW_NUM)); // Convert.toInt(this.getTotalPage()), RAINBOW_NUM));
} }
} }

6
ops-server/src/main/resources/application.yaml
View File

@ -177,4 +177,8 @@ ops:
- mail_account - mail_account
- mail_template - mail_template
debug: false debug: false
mybatis-plus:
configuration:
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl