jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 格式化代码结构 统一编码格式

Browse Source
This commit is contained in:
phanes
2022-01-16 16:51:23 +08:00
committed by 疯狂的狮子Li
parent 3fef2b68dc
commit 868942e202
74 changed files with 203 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
View File

@ -28,9 +28,9 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
private static String[] parsePatterns = {
"yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM",
"yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM",
"yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"};
"yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM",
"yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM",
"yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"};
/**
* 获取当前Date型日期

11
ruoyi-common/src/main/java/com/ruoyi/common/utils/LoginUtils.java
View File

@ -6,6 +6,8 @@ import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.enums.DeviceType;
import com.ruoyi.common.enums.UserType;
import com.ruoyi.common.exception.UtilException;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
/**
* 登录鉴权工具
@ -13,13 +15,15 @@ import com.ruoyi.common.exception.UtilException;
*
* @author Lion Li
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class LoginUtils {
private final static String LOGIN_USER_KEY = "loginUser";
private static final String LOGIN_USER_KEY = "loginUser";
/**
* 登录系统
* 针对两套用户体系
*
* @param loginUser 登录用户信息
*/
public static void login(LoginUser loginUser, UserType userType) {
@ -30,6 +34,7 @@ public class LoginUtils {
/**
* 登录系统 基于 设备类型
* 针对一套用户体系
*
* @param loginUser 登录用户信息
*/
public static void loginByDevice(LoginUser loginUser, UserType userType, DeviceType deviceType) {
@ -62,7 +67,7 @@ public class LoginUtils {
String replace = "";
if (StringUtils.contains(loginId, UserType.SYS_USER.getUserType())) {
userId = StringUtils.replace(loginId, UserType.SYS_USER.getUserType(), replace);
} else if (StringUtils.contains(loginId, UserType.APP_USER.getUserType())){
} else if (StringUtils.contains(loginId, UserType.APP_USER.getUserType())) {
userId = StringUtils.replace(loginId, UserType.APP_USER.getUserType(), replace);
} else {
throw new UtilException("登录用户: LoginId异常 => " + loginId);
@ -97,7 +102,7 @@ public class LoginUtils {
public static UserType getUserType(Object loginId) {
if (StringUtils.contains(loginId.toString(), UserType.SYS_USER.getUserType())) {
return UserType.SYS_USER;
} else if (StringUtils.contains(loginId.toString(), UserType.APP_USER.getUserType())){
} else if (StringUtils.contains(loginId.toString(), UserType.APP_USER.getUserType())) {
return UserType.APP_USER;
} else {
throw new UtilException("登录用户: LoginId异常 => " + loginId);

10
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
View File

@ -29,11 +29,11 @@ public class FileUtils extends FileUtil {
StringBuilder contentDispositionValue = new StringBuilder();
contentDispositionValue.append("attachment; filename=")
.append(percentEncodedFileName)
.append(";")
.append("filename*=")
.append("utf-8''")
.append(percentEncodedFileName);
.append(percentEncodedFileName)
.append(";")
.append("filename*=")
.append("utf-8''")
.append(percentEncodedFileName);
response.addHeader("Access-Control-Allow-Origin", "*");
response.addHeader("Access-Control-Expose-Headers", "Content-Disposition,download-filename");

6
ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java
View File

@ -41,9 +41,9 @@ public class AddressUtils {
if (RuoYiConfig.isAddressEnabled()) {
try {
String rspStr = HttpUtil.createGet(IP_URL)
.body("ip=" + ip + "&json=true", Constants.GBK)
.execute()
.body();
.body("ip=" + ip + "&json=true", Constants.GBK)
.execute()
.body();
if (StringUtils.isEmpty(rspStr)) {
log.error("获取地理位置异常 {}", ip);
return UNKNOWN;

8
ruoyi-common/src/main/java/com/ruoyi/common/utils/redis/RedisUtils.java
View File

@ -130,7 +130,7 @@ public class RedisUtils {
/**
* 注册对象监听器
*
* <p>
* key 监听器需开启 `notify-keyspace-events` 等 redis 相关配置
*
* @param key 缓存的键值
@ -223,7 +223,7 @@ public class RedisUtils {
/**
* 注册List监听器
*
* <p>
* key 监听器需开启 `notify-keyspace-events` 等 redis 相关配置
*
* @param key 缓存的键值
@ -259,7 +259,7 @@ public class RedisUtils {
/**
* 注册Set监听器
*
* <p>
* key 监听器需开启 `notify-keyspace-events` 等 redis 相关配置
*
* @param key 缓存的键值
@ -296,7 +296,7 @@ public class RedisUtils {
/**
* 注册Map监听器
*
* <p>
* key 监听器需开启 `notify-keyspace-events` 等 redis 相关配置
*
* @param key 缓存的键值

2
ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java
View File

@ -16,7 +16,7 @@ public class SqlUtil {
/**
* 定义常用的 sql关键字
*/
public static String SQL_REGEX = "select |insert |delete |update |drop |count |exec |chr |mid |master |truncate |char |and |declare ";
public static final String SQL_REGEX = "select |insert |delete |update |drop |count |exec |chr |mid |master |truncate |char |and |declare ";
/**
* 仅支持字母、数字、下划线、空格、逗号、小数点（支持多个字段排序）