Merge remote-tracking branch 'ruoyi-cloud/master'

# Conflicts:
#	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
#	ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java
#	ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java
#	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
#	sql/ry_config_20220114.sql
This commit is contained in:
疯狂的狮子li
2022-01-17 15:58:59 +08:00
5 changed files with 769 additions and 756 deletions

View File

@@ -1,120 +1,120 @@
package com.ruoyi.common.core.constant;
/**
* 通用常量信息
*
* @author Lion Li
*/
public interface Constants {
/**
* UTF-8 字符集
*/
String UTF8 = "UTF-8";
/**
* GBK 字符集
*/
String GBK = "GBK";
/**
* RMI 远程方法调用
*/
String LOOKUP_RMI = "rmi:";
/**
* LDAP 远程方法调用
*/
String LOOKUP_LDAP = "ldap:";
/**
* LDAPS 远程方法调用
*/
String LOOKUP_LDAPS = "ldaps:";
/**
* http请求
*/
String HTTP = "http://";
/**
* https请求
*/
String HTTPS = "https://";
/**
* 成功标记
*/
Integer SUCCESS = 200;
/**
* 失败标记
*/
Integer FAIL = 500;
/**
* 登录成功
*/
String LOGIN_SUCCESS = "Success";
/**
* 注销
*/
String LOGOUT = "Logout";
/**
* 注册
*/
String REGISTER = "Register";
/**
* 登录失败
*/
String LOGIN_FAIL = "Error";
/**
* 当前记录起始索引
*/
String PAGE_NUM = "pageNum";
/**
* 每页显示记录数
*/
String PAGE_SIZE = "pageSize";
/**
* 排序列
*/
String ORDER_BY_COLUMN = "orderByColumn";
/**
* 排序的方向 "desc" 或者 "asc".
*/
String IS_ASC = "isAsc";
/**
* 验证码 redis key
*/
String CAPTCHA_CODE_KEY = "captcha_codes:";
/**
* 验证码有效期(分钟)
*/
long CAPTCHA_EXPIRATION = 2;
/**
* 参数管理 cache key
*/
String SYS_CONFIG_KEY = "sys_config:";
/**
* 字典管理 cache key
*/
String SYS_DICT_KEY = "sys_dict:";
/**
* 资源映射路径 前缀
*/
String RESOURCE_PREFIX = "/profile";
}
package com.ruoyi.common.core.constant;
/**
* 通用常量信息
*
* @author Lion Li
*/
public interface Constants {
/**
* UTF-8 字符集
*/
String UTF8 = "UTF-8";
/**
* GBK 字符集
*/
String GBK = "GBK";
/**
* RMI 远程方法调用
*/
String LOOKUP_RMI = "rmi:";
/**
* LDAP 远程方法调用
*/
String LOOKUP_LDAP = "ldap:";
/**
* LDAPS 远程方法调用
*/
String LOOKUP_LDAPS = "ldaps:";
/**
* http请求
*/
String HTTP = "http://";
/**
* https请求
*/
String HTTPS = "https://";
/**
* 成功标记
*/
Integer SUCCESS = 200;
/**
* 失败标记
*/
Integer FAIL = 500;
/**
* 登录成功
*/
String LOGIN_SUCCESS = "Success";
/**
* 注销
*/
String LOGOUT = "Logout";
/**
* 注册
*/
String REGISTER = "Register";
/**
* 登录失败
*/
String LOGIN_FAIL = "Error";
/**
* 当前记录起始索引
*/
String PAGE_NUM = "pageNum";
/**
* 每页显示记录数
*/
String PAGE_SIZE = "pageSize";
/**
* 排序列
*/
String ORDER_BY_COLUMN = "orderByColumn";
/**
* 排序的方向 "desc" 或者 "asc".
*/
String IS_ASC = "isAsc";
/**
* 验证码 redis key
*/
String CAPTCHA_CODE_KEY = "captcha_codes:";
/**
* 验证码有效期(分钟)
*/
long CAPTCHA_EXPIRATION = 2;
/**
* 参数管理 cache key
*/
String SYS_CONFIG_KEY = "sys_config:";
/**
* 字典管理 cache key
*/
String SYS_DICT_KEY = "sys_dict:";
/**
* 资源映射路径 前缀
*/
String RESOURCE_PREFIX = "/profile";
}