diff --git a/src/main/java/com/ruoyi/common/utils/AddressUtils.java b/src/main/java/com/ruoyi/common/utils/AddressUtils.java index 03ab3649..056a97d6 100644 --- a/src/main/java/com/ruoyi/common/utils/AddressUtils.java +++ b/src/main/java/com/ruoyi/common/utils/AddressUtils.java @@ -24,7 +24,6 @@ public class AddressUtils public static String getRealAddressByIP(String ip) { - String address = UNKNOWN; // 内网不查询 if (IpUtils.internalIp(ip)) { @@ -50,6 +49,6 @@ public class AddressUtils log.error("获取地理位置异常 {}", e); } } - return address; + return UNKNOWN; } } diff --git a/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java b/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java index 95662037..33e4e05b 100644 --- a/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java +++ b/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java @@ -19,8 +19,7 @@ public class ExceptionUtil { StringWriter sw = new StringWriter(); e.printStackTrace(new PrintWriter(sw, true)); - String str = sw.toString(); - return str; + return sw.toString(); } public static String getRootErrorMessage(Exception e) diff --git a/src/main/java/com/ruoyi/common/utils/Md5Utils.java b/src/main/java/com/ruoyi/common/utils/Md5Utils.java index d709ab17..1ecd82f4 100644 --- a/src/main/java/com/ruoyi/common/utils/Md5Utils.java +++ b/src/main/java/com/ruoyi/common/utils/Md5Utils.java @@ -1,5 +1,6 @@ package com.ruoyi.common.utils; +import java.nio.charset.StandardCharsets; import java.security.MessageDigest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -55,7 +56,7 @@ public class Md5Utils { try { - return new String(toHex(md5(s)).getBytes("UTF-8"), "UTF-8"); + return new String(toHex(md5(s)).getBytes(StandardCharsets.UTF_8), StandardCharsets.UTF_8); } catch (Exception e) { diff --git a/src/main/java/com/ruoyi/common/utils/ServletUtils.java b/src/main/java/com/ruoyi/common/utils/ServletUtils.java index 17a04923..a647a224 100644 --- a/src/main/java/com/ruoyi/common/utils/ServletUtils.java +++ b/src/main/java/com/ruoyi/common/utils/ServletUtils.java @@ -129,13 +129,13 @@ public class ServletUtils public static boolean isAjaxRequest(HttpServletRequest request) { String accept = request.getHeader("accept"); - if (accept != null && accept.indexOf("application/json") != -1) + if (accept != null && accept.contains("application/json")) { return true; } String xRequestedWith = request.getHeader("X-Requested-With"); - if (xRequestedWith != null && xRequestedWith.indexOf("XMLHttpRequest") != -1) + if (xRequestedWith != null && xRequestedWith.contains("XMLHttpRequest")) { return true; } @@ -147,11 +147,7 @@ public class ServletUtils } String ajax = request.getParameter("__ajax"); - if (StringUtils.inStringIgnoreCase(ajax, "json", "xml")) - { - return true; - } - return false; + return StringUtils.inStringIgnoreCase(ajax, "json", "xml"); } /** diff --git a/src/main/java/com/ruoyi/common/utils/TreeUtils.java b/src/main/java/com/ruoyi/common/utils/TreeUtils.java index 8620e9d2..4a980640 100644 --- a/src/main/java/com/ruoyi/common/utils/TreeUtils.java +++ b/src/main/java/com/ruoyi/common/utils/TreeUtils.java @@ -132,6 +132,6 @@ public class TreeUtils */ private static boolean hasChild(List list, Menu t) { - return getChildList(list, t).size() > 0 ? true : false; + return getChildList(list, t).size() > 0; } } diff --git a/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java b/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java index 3827c05e..e3f1eb18 100644 --- a/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java +++ b/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java @@ -2,6 +2,7 @@ package com.ruoyi.common.utils.file; import java.io.File; import java.io.IOException; +import java.util.Objects; import org.apache.commons.io.FilenameUtils; import org.springframework.web.multipart.MultipartFile; import com.ruoyi.common.constant.Constants; @@ -100,7 +101,7 @@ public class FileUploadUtils throws FileSizeLimitExceededException, IOException, FileNameLengthLimitExceededException, InvalidExtensionException { - int fileNamelength = file.getOriginalFilename().length(); + int fileNamelength = Objects.requireNonNull(file.getOriginalFilename()).length(); if (fileNamelength > FileUploadUtils.DEFAULT_FILE_NAME_LENGTH) { throw new FileNameLengthLimitExceededException(FileUploadUtils.DEFAULT_FILE_NAME_LENGTH); @@ -112,8 +113,7 @@ public class FileUploadUtils File desc = getAbsoluteFile(baseDir, fileName); file.transferTo(desc); - String pathFileName = getPathFileName(baseDir, fileName); - return pathFileName; + return getPathFileName(baseDir, fileName); } /** @@ -121,10 +121,7 @@ public class FileUploadUtils */ public static final String extractFilename(MultipartFile file) { - String fileName = file.getOriginalFilename(); - String extension = getExtension(file); - fileName = DateUtils.datePath() + "/" + IdUtils.fastUUID() + "." + extension; - return fileName; + return DateUtils.datePath() + "/" + IdUtils.fastUUID() + "." + getExtension(file); } public static final File getAbsoluteFile(String uploadDir, String fileName) throws IOException @@ -145,8 +142,7 @@ public class FileUploadUtils { int dirLastIndex = RuoYiConfig.getProfile().length() + 1; String currentDir = StringUtils.substring(uploadDir, dirLastIndex); - String pathFileName = Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName; - return pathFileName; + return Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName; } /** @@ -161,7 +157,7 @@ public class FileUploadUtils throws FileSizeLimitExceededException, InvalidExtensionException { long size = file.getSize(); - if (DEFAULT_MAX_SIZE != -1 && size > DEFAULT_MAX_SIZE) + if (size > DEFAULT_MAX_SIZE) { throw new FileSizeLimitExceededException(DEFAULT_MAX_SIZE / 1024 / 1024); } @@ -228,7 +224,7 @@ public class FileUploadUtils String extension = FilenameUtils.getExtension(file.getOriginalFilename()); if (StringUtils.isEmpty(extension)) { - extension = MimeTypeUtils.getExtension(file.getContentType()); + extension = MimeTypeUtils.getExtension(Objects.requireNonNull(file.getContentType())); } return extension; } diff --git a/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java b/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java index e0b6afe1..bb184b23 100644 --- a/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java +++ b/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java @@ -59,7 +59,7 @@ public class ImageUtils /** * 读取文件为字节数据 * - * @param key 地址 + * @param url 地址 * @return 字节数据 */ public static byte[] readFile(String url) diff --git a/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java b/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java index 9cc166c3..1fdb68c6 100644 --- a/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java +++ b/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java @@ -9,6 +9,7 @@ import java.net.ConnectException; import java.net.SocketTimeoutException; import java.net.URL; import java.net.URLConnection; +import java.nio.charset.StandardCharsets; import java.security.cert.X509Certificate; import javax.net.ssl.HostnameVerifier; import javax.net.ssl.HttpsURLConnection; @@ -130,9 +131,8 @@ public class HttpUtils StringBuilder result = new StringBuilder(); try { - String urlNameString = url; - log.info("sendPost - {}", urlNameString); - URL realUrl = new URL(urlNameString); + log.info("sendPost - {}", url); + URL realUrl = new URL(url); URLConnection conn = realUrl.openConnection(); conn.setRequestProperty("accept", "*/*"); conn.setRequestProperty("connection", "Keep-Alive"); @@ -144,7 +144,7 @@ public class HttpUtils out = new PrintWriter(conn.getOutputStream()); out.print(param); out.flush(); - in = new BufferedReader(new InputStreamReader(conn.getInputStream(), "utf-8")); + in = new BufferedReader(new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8)); String line; while ((line = in.readLine()) != null) { @@ -218,7 +218,7 @@ public class HttpUtils { if (ret != null && !ret.trim().equals("")) { - result.append(new String(ret.getBytes("ISO-8859-1"), "utf-8")); + result.append(new String(ret.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8)); } } log.info("recv - {}", result); diff --git a/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java index 68630a11..31b94294 100644 --- a/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java +++ b/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java @@ -1119,7 +1119,7 @@ public class ExcelUtil if (StringUtils.isNotEmpty(excel.targetAttr())) { String target = excel.targetAttr(); - if (target.indexOf(".") > -1) + if (target.contains(".")) { String[] targets = target.split("[.]"); for (String name : targets) @@ -1214,7 +1214,7 @@ public class ExcelUtil for (Object[] os : this.fields) { Excel excel = (Excel) os[1]; - maxHeight = maxHeight > excel.height() ? maxHeight : excel.height(); + maxHeight = Math.max(maxHeight, excel.height()); } return (short) (maxHeight * 20); } diff --git a/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java b/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java index 1591c46d..246a9cfc 100644 --- a/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java +++ b/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java @@ -50,9 +50,9 @@ public class SqlUtil return; } String[] sqlKeywords = StringUtils.split(SQL_REGEX, "\\|"); - for (int i = 0; i < sqlKeywords.length; i++) + for (String sqlKeyword : sqlKeywords) { - if (StringUtils.indexOfIgnoreCase(value, sqlKeywords[i]) > -1) + if (StringUtils.indexOfIgnoreCase(value, sqlKeyword) > -1) { throw new UtilException("参数存在SQL注入风险"); } diff --git a/src/main/java/com/ruoyi/project/monitor/logininfor/service/ILogininforService.java b/src/main/java/com/ruoyi/project/monitor/logininfor/service/ILogininforService.java index 14ccce8f..dd853aa4 100644 --- a/src/main/java/com/ruoyi/project/monitor/logininfor/service/ILogininforService.java +++ b/src/main/java/com/ruoyi/project/monitor/logininfor/service/ILogininforService.java @@ -29,7 +29,7 @@ public interface ILogininforService * 批量删除系统登录日志 * * @param ids 需要删除的数据 - * @return + * @return 结果 */ public int deleteLogininforByIds(String ids); diff --git a/src/main/java/com/ruoyi/project/monitor/logininfor/service/LogininforServiceImpl.java b/src/main/java/com/ruoyi/project/monitor/logininfor/service/LogininforServiceImpl.java index fbed7eae..bb39ec20 100644 --- a/src/main/java/com/ruoyi/project/monitor/logininfor/service/LogininforServiceImpl.java +++ b/src/main/java/com/ruoyi/project/monitor/logininfor/service/LogininforServiceImpl.java @@ -45,7 +45,7 @@ public class LogininforServiceImpl implements ILogininforService * 批量删除系统登录日志 * * @param ids 需要删除的数据 - * @return + * @return 结果 */ @Override public int deleteLogininforByIds(String ids) diff --git a/src/main/java/com/ruoyi/project/system/config/service/ConfigServiceImpl.java b/src/main/java/com/ruoyi/project/system/config/service/ConfigServiceImpl.java index 830226c9..e3e2c1c0 100644 --- a/src/main/java/com/ruoyi/project/system/config/service/ConfigServiceImpl.java +++ b/src/main/java/com/ruoyi/project/system/config/service/ConfigServiceImpl.java @@ -125,7 +125,6 @@ public class ConfigServiceImpl implements IConfigService * 批量删除参数配置对象 * * @param ids 需要删除的数据ID - * @return 结果 */ @Override public void deleteConfigByIds(String ids) diff --git a/src/main/java/com/ruoyi/project/system/config/service/IConfigService.java b/src/main/java/com/ruoyi/project/system/config/service/IConfigService.java index bfc5913f..54c40855 100644 --- a/src/main/java/com/ruoyi/project/system/config/service/IConfigService.java +++ b/src/main/java/com/ruoyi/project/system/config/service/IConfigService.java @@ -54,7 +54,6 @@ public interface IConfigService * 批量删除参数配置信息 * * @param ids 需要删除的数据ID - * @return 结果 */ public void deleteConfigByIds(String ids); diff --git a/src/main/java/com/ruoyi/project/system/dict/service/DictDataServiceImpl.java b/src/main/java/com/ruoyi/project/system/dict/service/DictDataServiceImpl.java index 57f85221..bb7ac4e4 100644 --- a/src/main/java/com/ruoyi/project/system/dict/service/DictDataServiceImpl.java +++ b/src/main/java/com/ruoyi/project/system/dict/service/DictDataServiceImpl.java @@ -61,7 +61,6 @@ public class DictDataServiceImpl implements IDictDataService * 批量删除字典数据 * * @param ids 需要删除的数据 - * @return 结果 */ @Override public void deleteDictDataByIds(String ids) diff --git a/src/main/java/com/ruoyi/project/system/dict/service/DictTypeServiceImpl.java b/src/main/java/com/ruoyi/project/system/dict/service/DictTypeServiceImpl.java index 94f098b1..864cc887 100644 --- a/src/main/java/com/ruoyi/project/system/dict/service/DictTypeServiceImpl.java +++ b/src/main/java/com/ruoyi/project/system/dict/service/DictTypeServiceImpl.java @@ -118,7 +118,6 @@ public class DictTypeServiceImpl implements IDictTypeService * 批量删除字典类型 * * @param ids 需要删除的数据 - * @return 结果 */ @Override public void deleteDictTypeByIds(String ids) diff --git a/src/main/java/com/ruoyi/project/system/dict/service/IDictDataService.java b/src/main/java/com/ruoyi/project/system/dict/service/IDictDataService.java index 86663b94..ba50a804 100644 --- a/src/main/java/com/ruoyi/project/system/dict/service/IDictDataService.java +++ b/src/main/java/com/ruoyi/project/system/dict/service/IDictDataService.java @@ -39,7 +39,6 @@ public interface IDictDataService * 批量删除字典数据 * * @param ids 需要删除的数据 - * @return 结果 */ public void deleteDictDataByIds(String ids); diff --git a/src/main/java/com/ruoyi/project/system/dict/service/IDictTypeService.java b/src/main/java/com/ruoyi/project/system/dict/service/IDictTypeService.java index af827d32..f188ed4f 100644 --- a/src/main/java/com/ruoyi/project/system/dict/service/IDictTypeService.java +++ b/src/main/java/com/ruoyi/project/system/dict/service/IDictTypeService.java @@ -55,8 +55,6 @@ public interface IDictTypeService * 批量删除字典类型 * * @param ids 需要删除的数据 - * @return 结果 - * @throws Exception 异常 */ public void deleteDictTypeByIds(String ids); diff --git a/src/main/java/com/ruoyi/project/system/dict/utils/DictUtils.java b/src/main/java/com/ruoyi/project/system/dict/utils/DictUtils.java index 7cbf1647..10919306 100644 --- a/src/main/java/com/ruoyi/project/system/dict/utils/DictUtils.java +++ b/src/main/java/com/ruoyi/project/system/dict/utils/DictUtils.java @@ -40,8 +40,7 @@ public class DictUtils Object cacheObj = CacheUtils.get(getCacheName(), getCacheKey(key)); if (StringUtils.isNotNull(cacheObj)) { - List DictDatas = StringUtils.cast(cacheObj); - return DictDatas; + return StringUtils.cast(cacheObj); } return null; } @@ -91,7 +90,7 @@ public class DictUtils { if (value.equals(dict.getDictValue())) { - propertyString.append(dict.getDictLabel() + separator); + propertyString.append(dict.getDictLabel()).append(separator); break; } } @@ -141,7 +140,7 @@ public class DictUtils { if (label.equals(dict.getDictLabel())) { - propertyString.append(dict.getDictValue() + separator); + propertyString.append(dict.getDictValue()).append(separator); break; } } diff --git a/src/main/java/com/ruoyi/project/system/post/service/IPostService.java b/src/main/java/com/ruoyi/project/system/post/service/IPostService.java index 93edd60c..ea02e264 100644 --- a/src/main/java/com/ruoyi/project/system/post/service/IPostService.java +++ b/src/main/java/com/ruoyi/project/system/post/service/IPostService.java @@ -46,9 +46,8 @@ public interface IPostService * * @param ids 需要删除的数据ID * @return 结果 - * @throws Exception 异常 */ - public int deletePostByIds(String ids) throws Exception; + public int deletePostByIds(String ids); /** * 新增保存岗位信息 diff --git a/src/main/java/com/ruoyi/project/system/post/service/PostServiceImpl.java b/src/main/java/com/ruoyi/project/system/post/service/PostServiceImpl.java index 865a763b..1f3883a9 100644 --- a/src/main/java/com/ruoyi/project/system/post/service/PostServiceImpl.java +++ b/src/main/java/com/ruoyi/project/system/post/service/PostServiceImpl.java @@ -90,7 +90,7 @@ public class PostServiceImpl implements IPostService * 批量删除岗位信息 * * @param ids 需要删除的数据ID - * @throws Exception + * @return 结果 */ @Override public int deletePostByIds(String ids) diff --git a/src/main/java/com/ruoyi/project/system/role/service/RoleServiceImpl.java b/src/main/java/com/ruoyi/project/system/role/service/RoleServiceImpl.java index f24193d4..9262b057 100644 --- a/src/main/java/com/ruoyi/project/system/role/service/RoleServiceImpl.java +++ b/src/main/java/com/ruoyi/project/system/role/service/RoleServiceImpl.java @@ -396,7 +396,7 @@ public class RoleServiceImpl implements IRoleService * 批量选择授权用户角色 * * @param roleId 角色ID - * @param userIds 需要删除的用户数据ID + * @param userIds 需要授权的用户数据ID * @return 结果 */ @Override diff --git a/src/main/java/com/ruoyi/project/system/user/mapper/UserMapper.java b/src/main/java/com/ruoyi/project/system/user/mapper/UserMapper.java index 5f80b9f6..a1278aa9 100644 --- a/src/main/java/com/ruoyi/project/system/user/mapper/UserMapper.java +++ b/src/main/java/com/ruoyi/project/system/user/mapper/UserMapper.java @@ -19,7 +19,7 @@ public interface UserMapper public List selectUserList(User user); /** - * 根据条件分页查询未已配用户角色列表 + * 根据条件分页查询已配用户角色列表 * * @param user 用户信息 * @return 用户信息集合信息 diff --git a/src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java b/src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java index 25c791bd..00772242 100644 --- a/src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java +++ b/src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java @@ -146,8 +146,7 @@ public class GenUtils { int lastIndex = packageName.lastIndexOf("."); int nameLength = packageName.length(); - String moduleName = StringUtils.substring(packageName, lastIndex + 1, nameLength); - return moduleName; + return StringUtils.substring(packageName, lastIndex + 1, nameLength); } /** @@ -160,8 +159,7 @@ public class GenUtils { int lastIndex = tableName.lastIndexOf("_"); int nameLength = tableName.length(); - String businessName = StringUtils.substring(tableName, lastIndex + 1, nameLength); - return businessName; + return StringUtils.substring(tableName, lastIndex + 1, nameLength); } /** @@ -250,4 +248,4 @@ public class GenUtils return 0; } } -} \ No newline at end of file +} diff --git a/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java b/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java index 6bb46615..7c1c64b1 100644 --- a/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java +++ b/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java @@ -233,8 +233,7 @@ public class VelocityUtils public static String getPackagePrefix(String packageName) { int lastIndex = packageName.lastIndexOf("."); - String basePackage = StringUtils.substring(packageName, 0, lastIndex); - return basePackage; + return StringUtils.substring(packageName, 0, lastIndex); } /** @@ -282,7 +281,7 @@ public class VelocityUtils /** * 获取上级菜单ID字段 * - * @param options 生成其他选项 + * @param paramsObj 生成其他选项 * @return 上级菜单ID字段 */ public static String getParentMenuId(JSONObject paramsObj) @@ -298,7 +297,7 @@ public class VelocityUtils /** * 获取树编码 * - * @param options 生成其他选项 + * @param paramsObj 生成其他选项 * @return 树编码 */ public static String getTreecode(JSONObject paramsObj) @@ -313,7 +312,7 @@ public class VelocityUtils /** * 获取树父编码 * - * @param options 生成其他选项 + * @param paramsObj 生成其他选项 * @return 树父编码 */ public static String getTreeParentCode(JSONObject paramsObj) @@ -328,7 +327,7 @@ public class VelocityUtils /** * 获取树名称 * - * @param options 生成其他选项 + * @param paramsObj 生成其他选项 * @return 树名称 */ public static String getTreeName(JSONObject paramsObj) @@ -366,4 +365,4 @@ public class VelocityUtils } return num; } -} \ No newline at end of file +} diff --git a/src/main/resources/static/ruoyi/js/ry-ui.js b/src/main/resources/static/ruoyi/js/ry-ui.js index 88ae2387..c863683c 100644 --- a/src/main/resources/static/ruoyi/js/ry-ui.js +++ b/src/main/resources/static/ruoyi/js/ry-ui.js @@ -1313,7 +1313,7 @@ var table = { }, // 校验封装处理 validate: { - // 判断返回标识是否唯一 false 不存在 true 存在 + // 判断返回标识是否唯一 false 为存在 true 为不存在 unique: function (value) { if (value == "0") { return true;