dromara/RuoYi-Cloud-Plus
1
0
Fork 0
mirror of https://gitee.com/dromara/RuoYi-Cloud-Plus.git synced 2025-09-07 04:50:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud

Browse Source 
 Conflicts:
	README.md
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
	ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java
	ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/ScheduleUtils.java
This commit is contained in:
疯狂的狮子li
2022-01-07 15:36:16 +08:00
parent e1c06d97d8 ca5d3e3556
commit 3efd7c7bd4
7 changed files with 44 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
View File

@@ -19,12 +19,17 @@ public interface Constants {
/**
* RMI 远程方法调用
*/
String LOOKUP_RMI = "rmi://";
String LOOKUP_RMI = "rmi:";
/**
* LDAP 远程方法调用
*/
String LOOKUP_LDAP = "ldap://";
String LOOKUP_LDAP = "ldap:";
/**
* LDAPS 远程方法调用
*/
String LOOKUP_LDAPS = "ldaps:";
/**
* http请求

3
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/PageUtils.java
View File

@@ -20,7 +20,8 @@ public class PageUtils extends PageHelper {
Integer pageSize = pageDomain.getPageSize();
if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)) {
String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
PageHelper.startPage(pageNum, pageSize, orderBy);
Boolean reasonable = pageDomain.getReasonable();
PageHelper.startPage(pageNum, pageSize, orderBy).setReasonable(reasonable);
}
}
}