全项目代码格式化

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java

@@ -1,14 +1,14 @@
 package com.ruoyi.system.api;
 
+import com.ruoyi.common.core.constant.ServiceNameConstants;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.system.api.domain.SysFile;
+import com.ruoyi.system.api.factory.RemoteFileFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.multipart.MultipartFile;
-import com.ruoyi.common.core.constant.ServiceNameConstants;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.api.domain.SysFile;
-import com.ruoyi.system.api.factory.RemoteFileFallbackFactory;
 
 /**
  * 文件服务
@@ -16,8 +16,7 @@ import com.ruoyi.system.api.factory.RemoteFileFallbackFactory;
  * @author ruoyi
  */
 @FeignClient(contextId = "remoteFileService", value = ServiceNameConstants.FILE_SERVICE, fallbackFactory = RemoteFileFallbackFactory.class)
-public interface RemoteFileService
+public interface RemoteFileService {
-{
     /**
      * 上传文件
      *
@@ -25,5 +24,5 @@ public interface RemoteFileService
      * @return 结果
      */
     @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    public R<SysFile> upload(@RequestPart(value = "file") MultipartFile file);
+    R<SysFile> upload(@RequestPart(value = "file") MultipartFile file);
 }

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteLogService.java

@@ -1,15 +1,15 @@
 package com.ruoyi.system.api;
 
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
 import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.common.core.constant.ServiceNameConstants;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.system.api.domain.SysLogininfor;
 import com.ruoyi.system.api.domain.SysOperLog;
 import com.ruoyi.system.api.factory.RemoteLogFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
 
 /**
  * 日志服务
@@ -17,8 +17,7 @@ import com.ruoyi.system.api.factory.RemoteLogFallbackFactory;
  * @author ruoyi
  */
 @FeignClient(contextId = "remoteLogService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteLogFallbackFactory.class)
-public interface RemoteLogService
+public interface RemoteLogService {
-{
     /**
      * 保存系统日志
      *
@@ -27,7 +26,7 @@ public interface RemoteLogService
      * @return 结果
      */
     @PostMapping("/operlog")
-    public R<Boolean> saveLog(@RequestBody SysOperLog sysOperLog, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+    R<Boolean> saveLog(@RequestBody SysOperLog sysOperLog, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
     /**
      * 保存访问记录
@@ -37,5 +36,5 @@ public interface RemoteLogService
      * @return 结果
      */
     @PostMapping("/logininfor")
-    public R<Boolean> saveLogininfor(@RequestBody SysLogininfor sysLogininfor, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+    R<Boolean> saveLogininfor(@RequestBody SysLogininfor sysLogininfor, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 }

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java

@@ -1,17 +1,13 @@
 package com.ruoyi.system.api;
 
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
 import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.common.core.constant.ServiceNameConstants;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.system.api.domain.SysUser;
 import com.ruoyi.system.api.factory.RemoteUserFallbackFactory;
 import com.ruoyi.system.api.model.LoginUser;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * 用户服务
@@ -19,8 +15,7 @@ import com.ruoyi.system.api.model.LoginUser;
  * @author ruoyi
  */
 @FeignClient(contextId = "remoteUserService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteUserFallbackFactory.class)
-public interface RemoteUserService
+public interface RemoteUserService {
-{
     /**
      * 通过用户名查询用户信息
      *
@@ -29,7 +24,7 @@ public interface RemoteUserService
      * @return 结果
      */
     @GetMapping("/user/info/{username}")
-    public R<LoginUser> getUserInfo(@PathVariable("username") String username, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+    R<LoginUser> getUserInfo(@PathVariable("username") String username, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
     /**
      * 注册用户信息
@@ -39,5 +34,5 @@ public interface RemoteUserService
      * @return 结果
      */
     @PostMapping("/user/register")
-    public R<Boolean> registerUserInfo(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+    R<Boolean> registerUserInfo(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 }

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDept.java

@@ -1,16 +1,16 @@
 package com.ruoyi.system.api.domain;
 
-import java.util.ArrayList;
+import com.ruoyi.common.core.web.domain.BaseEntity;
-import java.util.List;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
-
+import java.util.ArrayList;
-import lombok.*;
+import java.util.List;
-import lombok.experimental.Accessors;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.core.web.domain.BaseEntity;
 
 /**
  * 部门表 sys_dept

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictData.java

@@ -1,16 +1,16 @@
 package com.ruoyi.system.api.domain;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-
-import lombok.*;
-import lombok.experimental.Accessors;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.annotation.Excel.ColumnType;
 import com.ruoyi.common.core.constant.UserConstants;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
 
 /**
  * 字典数据表 sys_dict_data

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictType.java

@@ -1,15 +1,15 @@
 package com.ruoyi.system.api.domain;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-
-import lombok.*;
-import lombok.experimental.Accessors;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.annotation.Excel.ColumnType;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
 
 /**
  * 字典类型表 sys_dict_type

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysFile.java

@@ -1,9 +1,8 @@
 package com.ruoyi.system.api.domain;
 
-import lombok.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 文件信息

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysLogininfor.java

@@ -1,13 +1,15 @@
 package com.ruoyi.system.api.domain;
 
-import java.util.Date;
-
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.annotation.Excel.ColumnType;
 import com.ruoyi.common.core.web.domain.BaseEntity;
-import lombok.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 /**
  * 系统访问记录表 sys_logininfor
  *
@@ -18,7 +20,6 @@ import lombok.experimental.Accessors;
 @NoArgsConstructor
 @Accessors(chain = true)
 public class SysLogininfor extends BaseEntity {
-    private static final long serialVersionUID = 1L;
 
     /**
      * ID

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysOperLog.java

@@ -1,14 +1,15 @@
 package com.ruoyi.system.api.domain;
 
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.annotation.Excel.ColumnType;
 import com.ruoyi.common.core.web.domain.BaseEntity;
-import lombok.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 /**
  * 操作日志记录表 oper_log
  *
@@ -19,7 +20,6 @@ import lombok.experimental.Accessors;
 @NoArgsConstructor
 @Accessors(chain = true)
 public class SysOperLog extends BaseEntity {
-    private static final long serialVersionUID = 1L;
 
     /**
      * 日志主键

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java

@@ -1,15 +1,15 @@
 package com.ruoyi.system.api.domain;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-
-import lombok.*;
-import lombok.experimental.Accessors;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.annotation.Excel.ColumnType;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
 
 /**
  * 角色表 sys_role
@@ -21,7 +21,6 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
 @NoArgsConstructor
 @Accessors(chain = true)
 public class SysRole extends BaseEntity {
-    private static final long serialVersionUID = 1L;
 
     /**
      * 角色ID

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java

@@ -1,13 +1,5 @@
 package com.ruoyi.system.api.domain;
 
-import java.util.Date;
-import java.util.List;
-import javax.validation.constraints.*;
-
-import lombok.*;
-import lombok.experimental.Accessors;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.annotation.Excel.ColumnType;
@@ -15,6 +7,16 @@ import com.ruoyi.common.core.annotation.Excel.Type;
 import com.ruoyi.common.core.annotation.Excels;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import com.ruoyi.common.core.xss.Xss;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 用户对象 sys_user
@@ -26,7 +28,6 @@ import com.ruoyi.common.core.xss.Xss;
 @NoArgsConstructor
 @Accessors(chain = true)
 public class SysUser extends BaseEntity {
-    private static final long serialVersionUID = 1L;
 
     /**
      * 用户ID
@@ -89,7 +90,9 @@ public class SysUser extends BaseEntity {
     @JsonProperty
     private String password;
 
-    /** 帐号状态（0正常 1停用） */
+    /**
+     * 帐号状态（0正常 1停用）
+     */
     @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
     private String status;
 

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java

@@ -1,14 +1,12 @@
 package com.ruoyi.system.api.factory;
 
-import lombok.extern.slf4j.Slf4j;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-import org.springframework.web.multipart.MultipartFile;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.system.api.RemoteFileService;
 import com.ruoyi.system.api.domain.SysFile;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 文件服务降级处理

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteLogFallbackFactory.java

@@ -1,14 +1,12 @@
 package com.ruoyi.system.api.factory;
 
-import lombok.extern.slf4j.Slf4j;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.system.api.RemoteLogService;
 import com.ruoyi.system.api.domain.SysLogininfor;
 import com.ruoyi.system.api.domain.SysOperLog;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
 
 /**
  * 日志服务降级处理

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java

@@ -1,14 +1,12 @@
 package com.ruoyi.system.api.factory;
 
-import lombok.extern.slf4j.Slf4j;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.system.api.RemoteUserService;
 import com.ruoyi.system.api.domain.SysUser;
 import com.ruoyi.system.api.model.LoginUser;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
 
 /**
  * 用户服务降级处理

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java

@@ -1,12 +1,13 @@
 package com.ruoyi.system.api.model;
 
+import com.ruoyi.system.api.domain.SysUser;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
 import java.io.Serializable;
 import java.util.Set;
 
-import com.ruoyi.system.api.domain.SysUser;
-import lombok.*;
-import lombok.experimental.Accessors;
-
 /**
  * 用户信息
  *

ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java

@@ -1,9 +1,9 @@
 package com.ruoyi.auth;
 
+import com.ruoyi.common.security.annotation.EnableRyFeignClients;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import com.ruoyi.common.security.annotation.EnableRyFeignClients;
 
 /**
  * 认证授权中心
@@ -12,10 +12,8 @@ import com.ruoyi.common.security.annotation.EnableRyFeignClients;
  */
 @EnableRyFeignClients
 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
-public class RuoYiAuthApplication
+public class RuoYiAuthApplication {
-{
+    public static void main(String[] args) {
-    public static void main(String[] args)
-    {
         SpringApplication.run(RuoYiAuthApplication.class, args);
         System.out.println("(♥◠‿◠)ﾉﾞ  认证授权中心启动成功   ლ(´ڡ`ლ)ﾞ  ");
     }

ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java

@@ -1,11 +1,5 @@
 package com.ruoyi.auth.controller;
 
-import javax.servlet.http.HttpServletRequest;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.auth.form.LoginBody;
 import com.ruoyi.auth.form.RegisterBody;
 import com.ruoyi.auth.service.SysLoginService;
@@ -16,24 +10,29 @@ import com.ruoyi.common.security.auth.AuthUtil;
 import com.ruoyi.common.security.service.TokenService;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.model.LoginUser;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
 
 /**
  * token 控制
  *
  * @author ruoyi
  */
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
-public class TokenController
+public class TokenController {
-{
-    @Autowired
-    private TokenService tokenService;
 
-    @Autowired
+    private final TokenService tokenService;
-    private SysLoginService sysLoginService;
+    private final SysLoginService sysLoginService;
 
     @PostMapping("login")
-    public R<?> login(@RequestBody LoginBody form)
+    public R<?> login(@RequestBody LoginBody form) {
-    {
         // 用户登录
         LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword());
         // 获取登录token
@@ -41,11 +40,9 @@ public class TokenController
     }
 
     @DeleteMapping("logout")
-    public R<?> logout(HttpServletRequest request)
+    public R<?> logout(HttpServletRequest request) {
-    {
         String token = SecurityUtils.getToken(request);
-        if (StringUtils.isNotEmpty(token))
+        if (StringUtils.isNotEmpty(token)) {
-        {
             String username = JwtUtils.getUserName(token);
             // 删除用户缓存记录
             AuthUtil.logoutByToken(token);
@@ -56,11 +53,9 @@ public class TokenController
     }
 
     @PostMapping("refresh")
-    public R<?> refresh(HttpServletRequest request)
+    public R<?> refresh(HttpServletRequest request) {
-    {
         LoginUser loginUser = tokenService.getLoginUser(request);
-        if (StringUtils.isNotNull(loginUser))
+        if (StringUtils.isNotNull(loginUser)) {
-        {
             // 刷新令牌有效期
             tokenService.refreshToken(loginUser);
             return R.ok();
@@ -69,8 +64,7 @@ public class TokenController
     }
 
     @PostMapping("register")
-    public R<?> register(@RequestBody RegisterBody registerBody)
+    public R<?> register(@RequestBody RegisterBody registerBody) {
-    {
         // 用户注册
         sysLoginService.register(registerBody.getUsername(), registerBody.getPassword());
         return R.ok();

ruoyi-auth/src/main/java/com/ruoyi/auth/form/LoginBody.java

@@ -1,6 +1,7 @@
 package com.ruoyi.auth.form;
 
-import lombok.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
 /**

ruoyi-auth/src/main/java/com/ruoyi/auth/form/RegisterBody.java

@@ -5,7 +5,6 @@ package com.ruoyi.auth.form;
  *
  * @author ruoyi
  */
-public class RegisterBody extends LoginBody
+public class RegisterBody extends LoginBody {
-{
 
 }

ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java

@@ -1,7 +1,5 @@
 package com.ruoyi.auth.service;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 import com.ruoyi.common.core.constant.Constants;
 import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.common.core.constant.UserConstants;
@@ -17,73 +15,66 @@ import com.ruoyi.system.api.RemoteUserService;
 import com.ruoyi.system.api.domain.SysLogininfor;
 import com.ruoyi.system.api.domain.SysUser;
 import com.ruoyi.system.api.model.LoginUser;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
 
 /**
  * 登录校验方法
  *
  * @author ruoyi
  */
-@Component
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
-public class SysLoginService
+@Service
-{
+public class SysLoginService {
-    @Autowired
-    private RemoteLogService remoteLogService;
 
-    @Autowired
+    private final RemoteLogService remoteLogService;
-    private RemoteUserService remoteUserService;
+    private final RemoteUserService remoteUserService;
 
     /**
      * 登录
      */
-    public LoginUser login(String username, String password)
+    public LoginUser login(String username, String password) {
-    {
         // 用户名或密码为空 错误
-        if (StringUtils.isAnyBlank(username, password))
+        if (StringUtils.isAnyBlank(username, password)) {
-        {
             recordLogininfor(username, Constants.LOGIN_FAIL, "用户/密码必须填写");
             throw new ServiceException("用户/密码必须填写");
         }
         // 密码如果不在指定范围内 错误
         if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
-                || password.length() > UserConstants.PASSWORD_MAX_LENGTH)
+                || password.length() > UserConstants.PASSWORD_MAX_LENGTH) {
-        {
             recordLogininfor(username, Constants.LOGIN_FAIL, "用户密码不在指定范围");
             throw new ServiceException("用户密码不在指定范围");
         }
         // 用户名不在指定范围内 错误
         if (username.length() < UserConstants.USERNAME_MIN_LENGTH
-                || username.length() > UserConstants.USERNAME_MAX_LENGTH)
+                || username.length() > UserConstants.USERNAME_MAX_LENGTH) {
-        {
             recordLogininfor(username, Constants.LOGIN_FAIL, "用户名不在指定范围");
             throw new ServiceException("用户名不在指定范围");
         }
         // 查询用户信息
         R<LoginUser> userResult = remoteUserService.getUserInfo(username, SecurityConstants.INNER);
 
-        if (R.FAIL == userResult.getCode())
+        if (R.FAIL == userResult.getCode()) {
-        {
             throw new ServiceException(userResult.getMsg());
         }
 
-        if (StringUtils.isNull(userResult) || StringUtils.isNull(userResult.getData()))
+        if (StringUtils.isNull(userResult) || StringUtils.isNull(userResult.getData())) {
-        {
             recordLogininfor(username, Constants.LOGIN_FAIL, "登录用户不存在");
             throw new ServiceException("登录用户：" + username + " 不存在");
         }
         LoginUser userInfo = userResult.getData();
         SysUser user = userResult.getData().getSysUser();
-        if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))
+        if (UserStatus.DELETED.getCode().equals(user.getDelFlag())) {
-        {
             recordLogininfor(username, Constants.LOGIN_FAIL, "对不起，您的账号已被删除");
             throw new ServiceException("对不起，您的账号：" + username + " 已被删除");
         }
-        if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
+        if (UserStatus.DISABLE.getCode().equals(user.getStatus())) {
-        {
             recordLogininfor(username, Constants.LOGIN_FAIL, "用户已停用，请联系管理员");
             throw new ServiceException("对不起，您的账号：" + username + " 已停用");
         }
-        if (!SecurityUtils.matchesPassword(password, user.getPassword()))
+        if (!SecurityUtils.matchesPassword(password, user.getPassword())) {
-        {
             recordLogininfor(username, Constants.LOGIN_FAIL, "用户密码错误");
             throw new ServiceException("用户不存在/密码错误");
         }
@@ -91,29 +82,24 @@ public class SysLoginService
         return userInfo;
     }
 
-    public void logout(String loginName)
+    public void logout(String loginName) {
-    {
         recordLogininfor(loginName, Constants.LOGOUT, "退出成功");
     }
 
     /**
      * 注册
      */
-    public void register(String username, String password)
+    public void register(String username, String password) {
-    {
         // 用户名或密码为空 错误
-        if (StringUtils.isAnyBlank(username, password))
+        if (StringUtils.isAnyBlank(username, password)) {
-        {
             throw new ServiceException("用户/密码必须填写");
         }
         if (username.length() < UserConstants.USERNAME_MIN_LENGTH
-                || username.length() > UserConstants.USERNAME_MAX_LENGTH)
+                || username.length() > UserConstants.USERNAME_MAX_LENGTH) {
-        {
             throw new ServiceException("账户长度必须在2到20个字符之间");
         }
         if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
-                || password.length() > UserConstants.PASSWORD_MAX_LENGTH)
+                || password.length() > UserConstants.PASSWORD_MAX_LENGTH) {
-        {
             throw new ServiceException("密码长度必须在5到20个字符之间");
         }
 
@@ -124,8 +110,7 @@ public class SysLoginService
         sysUser.setPassword(SecurityUtils.encryptPassword(password));
         R<?> registerResult = remoteUserService.registerUserInfo(sysUser, SecurityConstants.INNER);
 
-        if (R.FAIL == registerResult.getCode())
+        if (R.FAIL == registerResult.getCode()) {
-        {
             throw new ServiceException(registerResult.getMsg());
         }
         recordLogininfor(username, Constants.REGISTER, "注册成功");
@@ -139,19 +124,15 @@ public class SysLoginService
      * @param message  消息内容
      * @return
      */
-    public void recordLogininfor(String username, String status, String message)
+    public void recordLogininfor(String username, String status, String message) {
-    {
         SysLogininfor logininfor = new SysLogininfor();
         logininfor.setUserName(username);
         logininfor.setIpaddr(IpUtils.getIpAddr(ServletUtils.getRequest()));
         logininfor.setMsg(message);
         // 日志状态
-        if (StringUtils.equalsAny(status, Constants.LOGIN_SUCCESS, Constants.LOGOUT, Constants.REGISTER))
+        if (StringUtils.equalsAny(status, Constants.LOGIN_SUCCESS, Constants.LOGOUT, Constants.REGISTER)) {
-        {
             logininfor.setStatus("0");
-        }
+        } else if (Constants.LOGIN_FAIL.equals(status)) {
-        else if (Constants.LOGIN_FAIL.equals(status))
-        {
             logininfor.setStatus("1");
         }
         remoteLogService.saveLogininfor(logininfor, SecurityConstants.INNER);

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java

@@ -1,11 +1,12 @@
 package com.ruoyi.common.core.annotation;
 
+import com.ruoyi.common.core.utils.poi.ExcelHandlerAdapter;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import java.math.BigDecimal;
-import com.ruoyi.common.core.utils.poi.ExcelHandlerAdapter;
 
 /**
  * 自定义导出Excel数据注解
@@ -14,8 +15,7 @@ import com.ruoyi.common.core.utils.poi.ExcelHandlerAdapter;
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.FIELD)
-public @interface Excel
+public @interface Excel {
-{
     /**
      * 导出时在excel中排序
      */
@@ -116,18 +116,15 @@ public @interface Excel
      */
     public String[] args() default {};
 
-    public enum Align
+    public enum Align {
-    {
         AUTO(0), LEFT(1), CENTER(2), RIGHT(3);
         private final int value;
 
-        Align(int value)
+        Align(int value) {
-        {
             this.value = value;
         }
 
-        public int value()
+        public int value() {
-        {
             return this.value;
         }
     }
@@ -137,34 +134,28 @@ public @interface Excel
      */
     Type type() default Type.ALL;
 
-    public enum Type
+    public enum Type {
-    {
         ALL(0), EXPORT(1), IMPORT(2);
         private final int value;
 
-        Type(int value)
+        Type(int value) {
-        {
             this.value = value;
         }
 
-        public int value()
+        public int value() {
-        {
             return this.value;
         }
     }
 
-    public enum ColumnType
+    public enum ColumnType {
-    {
         NUMERIC(0), STRING(1), IMAGE(2);
         private final int value;
 
-        ColumnType(int value)
+        ColumnType(int value) {
-        {
             this.value = value;
         }
 
-        public int value()
+        public int value() {
-        {
             return this.value;
         }
     }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excels.java

@@ -12,7 +12,6 @@ import java.lang.annotation.Target;
  */
 @Target(ElementType.FIELD)
 @Retention(RetentionPolicy.RUNTIME)
-public @interface Excels
+public @interface Excels {
-{
     Excel[] value();
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/JacksonConfig.java

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import com.ruoyi.common.core.jackson.BigNumberSerializer;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
@@ -22,8 +23,11 @@ import java.time.format.DateTimeFormatter;
 import java.util.TimeZone;
 
 /**
- * JacksonConfig
+ * jackson 配置
+ *
+ * @author Lion Li
  */
+@Slf4j
 @Configuration
 @ConditionalOnClass(ObjectMapper.class)
 @AutoConfigureBefore(JacksonAutoConfiguration.class)
@@ -44,7 +48,7 @@ public class JacksonConfig {
         simpleModule.addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(formatter));
         objectMapper.registerModule(simpleModule);
         objectMapper.setTimeZone(TimeZone.getDefault());
-
+        log.info("初始化 jackson 配置");
         return objectMapper;
     }
 

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java

@@ -3,22 +3,21 @@ package com.ruoyi.common.core.constant;
 /**
  * 缓存的key 常量
  *
- * @author ruoyi
+ * @author Lion Li
  */
-public class CacheConstants
+public interface CacheConstants {
-{
     /**
      * 缓存有效期，默认720（分钟）
      */
-    public final static long EXPIRATION = 720;
+    long EXPIRATION = 720;
 
     /**
      * 缓存刷新时间，默认120（分钟）
      */
-    public final static long REFRESH_TIME = 120;
+    long REFRESH_TIME = 120;
 
     /**
      * 权限缓存前缀
      */
-    public final static String LOGIN_TOKEN_KEY = "login_tokens:";
+    String LOGIN_TOKEN_KEY = "login_tokens:";
 }

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

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

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/GenConstants.java

@@ -3,112 +3,179 @@ package com.ruoyi.common.core.constant;
 /**
  * 代码生成通用常量
  *
- * @author ruoyi
+ * @author Lion Li
  */
-public class GenConstants
+public interface GenConstants {
-{
+    /**
-    /** 单表（增删改查） */
+     * 单表（增删改查）
-    public static final String TPL_CRUD = "crud";
+     */
+    String TPL_CRUD = "crud";
 
-    /** 树表（增删改查） */
+    /**
-    public static final String TPL_TREE = "tree";
+     * 树表（增删改查）
+     */
+    String TPL_TREE = "tree";
 
-    /** 主子表（增删改查） */
+    /**
-    public static final String TPL_SUB = "sub";
+     * 主子表（增删改查）
+     */
+    String TPL_SUB = "sub";
 
-    /** 树编码字段 */
+    /**
-    public static final String TREE_CODE = "treeCode";
+     * 树编码字段
+     */
+    String TREE_CODE = "treeCode";
 
-    /** 树父编码字段 */
+    /**
-    public static final String TREE_PARENT_CODE = "treeParentCode";
+     * 树父编码字段
+     */
+    String TREE_PARENT_CODE = "treeParentCode";
 
-    /** 树名称字段 */
+    /**
-    public static final String TREE_NAME = "treeName";
+     * 树名称字段
+     */
+    String TREE_NAME = "treeName";
 
-    /** 上级菜单ID字段 */
+    /**
-    public static final String PARENT_MENU_ID = "parentMenuId";
+     * 上级菜单ID字段
+     */
+    String PARENT_MENU_ID = "parentMenuId";
 
-    /** 上级菜单名称字段 */
+    /**
-    public static final String PARENT_MENU_NAME = "parentMenuName";
+     * 上级菜单名称字段
+     */
+    String PARENT_MENU_NAME = "parentMenuName";
 
-    /** 数据库字符串类型 */
+    /**
-    public static final String[] COLUMNTYPE_STR = { "char", "varchar", "nvarchar", "varchar2" };
+     * 数据库字符串类型
+     */
+    String[] COLUMNTYPE_STR = {"char", "varchar", "nvarchar", "varchar2"};
 
-    /** 数据库文本类型 */
+    /**
-    public static final String[] COLUMNTYPE_TEXT = { "tinytext", "text", "mediumtext", "longtext" };
+     * 数据库文本类型
+     */
+    String[] COLUMNTYPE_TEXT = {"tinytext", "text", "mediumtext", "longtext"};
 
-    /** 数据库时间类型 */
+    /**
-    public static final String[] COLUMNTYPE_TIME = { "datetime", "time", "date", "timestamp" };
+     * 数据库时间类型
+     */
+    String[] COLUMNTYPE_TIME = {"datetime", "time", "date", "timestamp"};
 
-    /** 数据库数字类型 */
+    /**
-    public static final String[] COLUMNTYPE_NUMBER = { "tinyint", "smallint", "mediumint", "int", "number", "integer",
+     * 数据库数字类型
+     */
+    String[] COLUMNTYPE_NUMBER = {"tinyint", "smallint", "mediumint", "int", "number", "integer",
             "bigint", "float", "double", "decimal"};
 
-    /** 页面不需要编辑字段 */
+    /**
-    public static final String[] COLUMNNAME_NOT_EDIT = { "id", "create_by", "create_time", "del_flag" };
+     * 页面不需要编辑字段
+     */
+    String[] COLUMNNAME_NOT_EDIT = {"id", "create_by", "create_time", "del_flag"};
 
-    /** 页面不需要显示的列表字段 */
+    /**
-    public static final String[] COLUMNNAME_NOT_LIST = { "id", "create_by", "create_time", "del_flag", "update_by",
+     * 页面不需要显示的列表字段
+     */
+    String[] COLUMNNAME_NOT_LIST = {"id", "create_by", "create_time", "del_flag", "update_by",
             "update_time"};
 
-    /** 页面不需要查询字段 */
+    /**
-    public static final String[] COLUMNNAME_NOT_QUERY = { "id", "create_by", "create_time", "del_flag", "update_by",
+     * 页面不需要查询字段
+     */
+    String[] COLUMNNAME_NOT_QUERY = {"id", "create_by", "create_time", "del_flag", "update_by",
             "update_time", "remark"};
 
-    /** Entity基类字段 */
+    /**
-    public static final String[] BASE_ENTITY = { "createBy", "createTime", "updateBy", "updateTime", "remark" };
+     * Entity基类字段
+     */
+    String[] BASE_ENTITY = {"createBy", "createTime", "updateBy", "updateTime", "remark"};
 
-    /** Tree基类字段 */
+    /**
-    public static final String[] TREE_ENTITY = { "parentName", "parentId", "orderNum", "ancestors" };
+     * Tree基类字段
+     */
+    String[] TREE_ENTITY = {"parentName", "parentId", "orderNum", "ancestors"};
 
-    /** 文本框 */
+    /**
-    public static final String HTML_INPUT = "input";
+     * 文本框
+     */
+    String HTML_INPUT = "input";
 
-    /** 文本域 */
+    /**
-    public static final String HTML_TEXTAREA = "textarea";
+     * 文本域
+     */
+    String HTML_TEXTAREA = "textarea";
 
-    /** 下拉框 */
+    /**
-    public static final String HTML_SELECT = "select";
+     * 下拉框
+     */
+    String HTML_SELECT = "select";
 
-    /** 单选框 */
+    /**
-    public static final String HTML_RADIO = "radio";
+     * 单选框
+     */
+    String HTML_RADIO = "radio";
 
-    /** 复选框 */
+    /**
-    public static final String HTML_CHECKBOX = "checkbox";
+     * 复选框
+     */
+    String HTML_CHECKBOX = "checkbox";
 
-    /** 日期控件 */
+    /**
-    public static final String HTML_DATETIME = "datetime";
+     * 日期控件
+     */
+    String HTML_DATETIME = "datetime";
 
-    /** 图片上传控件 */
+    /**
-    public static final String HTML_IMAGE_UPLOAD = "imageUpload";
+     * 图片上传控件
+     */
+    String HTML_IMAGE_UPLOAD = "imageUpload";
 
-    /** 文件上传控件 */
+    /**
-    public static final String HTML_FILE_UPLOAD = "fileUpload";
+     * 文件上传控件
+     */
+    String HTML_FILE_UPLOAD = "fileUpload";
 
-    /** 富文本控件 */
+    /**
-    public static final String HTML_EDITOR = "editor";
+     * 富文本控件
+     */
+    String HTML_EDITOR = "editor";
 
-    /** 字符串类型 */
+    /**
-    public static final String TYPE_STRING = "String";
+     * 字符串类型
+     */
+    String TYPE_STRING = "String";
 
-    /** 整型 */
+    /**
-    public static final String TYPE_INTEGER = "Integer";
+     * 整型
+     */
+    String TYPE_INTEGER = "Integer";
 
-    /** 长整型 */
+    /**
-    public static final String TYPE_LONG = "Long";
+     * 长整型
+     */
+    String TYPE_LONG = "Long";
 
-    /** 浮点型 */
+    /**
-    public static final String TYPE_DOUBLE = "Double";
+     * 浮点型
+     */
+    String TYPE_DOUBLE = "Double";
 
-    /** 高精度计算类型 */
+    /**
-    public static final String TYPE_BIGDECIMAL = "BigDecimal";
+     * 高精度计算类型
+     */
+    String TYPE_BIGDECIMAL = "BigDecimal";
 
-    /** 时间类型 */
+    /**
-    public static final String TYPE_DATE = "Date";
+     * 时间类型
+     */
+    String TYPE_DATE = "Date";
 
-    /** 模糊查询 */
+    /**
-    public static final String QUERY_LIKE = "LIKE";
+     * 模糊查询
+     */
+    String QUERY_LIKE = "LIKE";
 
-    /** 需要 */
+    /**
-    public static final String REQUIRE = "1";
+     * 需要
+     */
+    String REQUIRE = "1";
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/HttpStatus.java

@@ -3,87 +3,86 @@ package com.ruoyi.common.core.constant;
 /**
  * 返回状态码
  *
- * @author ruoyi
+ * @author Lion Li
  */
-public class HttpStatus
+public interface HttpStatus {
-{
     /**
      * 操作成功
      */
-    public static final int SUCCESS = 200;
+    int SUCCESS = 200;
 
     /**
      * 对象创建成功
      */
-    public static final int CREATED = 201;
+    int CREATED = 201;
 
     /**
      * 请求已经被接受
      */
-    public static final int ACCEPTED = 202;
+    int ACCEPTED = 202;
 
     /**
      * 操作已经执行成功，但是没有返回数据
      */
-    public static final int NO_CONTENT = 204;
+    int NO_CONTENT = 204;
 
     /**
      * 资源已被移除
      */
-    public static final int MOVED_PERM = 301;
+    int MOVED_PERM = 301;
 
     /**
      * 重定向
      */
-    public static final int SEE_OTHER = 303;
+    int SEE_OTHER = 303;
 
     /**
      * 资源没有被修改
      */
-    public static final int NOT_MODIFIED = 304;
+    int NOT_MODIFIED = 304;
 
     /**
      * 参数列表错误（缺少，格式不匹配）
      */
-    public static final int BAD_REQUEST = 400;
+    int BAD_REQUEST = 400;
 
     /**
      * 未授权
      */
-    public static final int UNAUTHORIZED = 401;
+    int UNAUTHORIZED = 401;
 
     /**
      * 访问受限，授权过期
      */
-    public static final int FORBIDDEN = 403;
+    int FORBIDDEN = 403;
 
     /**
      * 资源，服务未找到
      */
-    public static final int NOT_FOUND = 404;
+    int NOT_FOUND = 404;
 
     /**
      * 不允许的http方法
      */
-    public static final int BAD_METHOD = 405;
+    int BAD_METHOD = 405;
 
     /**
      * 资源冲突，或者资源被锁
      */
-    public static final int CONFLICT = 409;
+    int CONFLICT = 409;
 
     /**
      * 不支持的数据，媒体类型
      */
-    public static final int UNSUPPORTED_TYPE = 415;
+    int UNSUPPORTED_TYPE = 415;
 
     /**
      * 系统内部错误
      */
-    public static final int ERROR = 500;
+    int ERROR = 500;
 
     /**
      * 接口未实现
      */
-    public static final int NOT_IMPLEMENTED = 501;
+    int NOT_IMPLEMENTED = 501;
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ScheduleConstants.java

@@ -1,50 +0,0 @@
-package com.ruoyi.common.core.constant;
-
-/**
- * 任务调度通用常量
- * 
- * @author ruoyi
- */
-public class ScheduleConstants
-{
-    public static final String TASK_CLASS_NAME = "TASK_CLASS_NAME";
-
-    /** 执行目标key */
-    public static final String TASK_PROPERTIES = "TASK_PROPERTIES";
-
-    /** 默认 */
-    public static final String MISFIRE_DEFAULT = "0";
-
-    /** 立即触发执行 */
-    public static final String MISFIRE_IGNORE_MISFIRES = "1";
-
-    /** 触发一次执行 */
-    public static final String MISFIRE_FIRE_AND_PROCEED = "2";
-
-    /** 不触发立即执行 */
-    public static final String MISFIRE_DO_NOTHING = "3";
-
-    public enum Status
-    {
-        /**
-         * 正常
-         */
-        NORMAL("0"),
-        /**
-         * 暂停
-         */
-        PAUSE("1");
-
-        private String value;
-
-        private Status(String value)
-        {
-            this.value = value;
-        }
-
-        public String getValue()
-        {
-            return value;
-        }
-    }
-}

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/SecurityConstants.java

@@ -3,42 +3,41 @@ package com.ruoyi.common.core.constant;
 /**
  * 权限相关通用常量
  *
- * @author ruoyi
+ * @author Lion Li
  */
-public class SecurityConstants
+public interface SecurityConstants {
-{
     /**
      * 用户ID字段
      */
-    public static final String DETAILS_USER_ID = "user_id";
+    String DETAILS_USER_ID = "user_id";
 
     /**
      * 用户名字段
      */
-    public static final String DETAILS_USERNAME = "username";
+    String DETAILS_USERNAME = "username";
 
     /**
      * 授权信息字段
      */
-    public static final String AUTHORIZATION_HEADER = "authorization";
+    String AUTHORIZATION_HEADER = "authorization";
 
     /**
      * 请求来源
      */
-    public static final String FROM_SOURCE = "from-source";
+    String FROM_SOURCE = "from-source";
 
     /**
      * 内部请求
      */
-    public static final String INNER = "inner";
+    String INNER = "inner";
 
     /**
      * 用户标识
      */
-    public static final String USER_KEY = "user_key";
+    String USER_KEY = "user_key";
 
     /**
      * 登录用户
      */
-    public static final String LOGIN_USER = "login_user";
+    String LOGIN_USER = "login_user";
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java

@@ -3,22 +3,11 @@ package com.ruoyi.common.core.constant;
 /**
  * 服务名称
  *
- * @author ruoyi
+ * @author Lion Li
  */
-public class ServiceNameConstants
+public interface ServiceNameConstants {
-{
-    /**
-     * 认证服务的serviceid
-     */
-    public static final String AUTH_SERVICE = "ruoyi-auth";
 
-    /**
+    String AUTH_SERVICE = "ruoyi-auth";
-     * 系统模块的serviceid
+    String SYSTEM_SERVICE = "ruoyi-system";
-     */
+    String FILE_SERVICE = "ruoyi-file";
-    public static final String SYSTEM_SERVICE = "ruoyi-system";
-
-    /**
-     * 文件服务的serviceid
-     */
-    public static final String FILE_SERVICE = "ruoyi-file";
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/TokenConstants.java

@@ -3,23 +3,22 @@ package com.ruoyi.common.core.constant;
 /**
  * Token的Key常量
  *
- * @author ruoyi
+ * @author Lion Li
  */
-public class TokenConstants
+public interface TokenConstants {
-{
     /**
      * 令牌自定义标识
      */
-    public static final String AUTHENTICATION = "Authorization";
+    String AUTHENTICATION = "Authorization";
 
     /**
      * 令牌前缀
      */
-    public static final String PREFIX = "Bearer ";
+    String PREFIX = "Bearer ";
 
     /**
      * 令牌秘钥
      */
-    public final static String SECRET = "abcdefghijklmnopqrstuvwxyz";
+    String SECRET = "abcdefghijklmnopqrstuvwxyz";
 
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/UserConstants.java

@@ -5,77 +5,110 @@ package com.ruoyi.common.core.constant;
  *
  * @author ruoyi
  */
-public class UserConstants
+public interface UserConstants {
-{
     /**
      * 平台内系统用户的唯一标志
      */
-    public static final String SYS_USER = "SYS_USER";
+    String SYS_USER = "SYS_USER";
 
-    /** 正常状态 */
+    /**
-    public static final String NORMAL = "0";
+     * 正常状态
+     */
+    String NORMAL = "0";
 
-    /** 异常状态 */
+    /**
-    public static final String EXCEPTION = "1";
+     * 异常状态
+     */
+    String EXCEPTION = "1";
 
-    /** 用户封禁状态 */
+    /**
-    public static final String USER_DISABLE = "1";
+     * 用户封禁状态
+     */
+    String USER_DISABLE = "1";
 
-    /** 角色封禁状态 */
+    /**
-    public static final String ROLE_DISABLE = "1";
+     * 角色封禁状态
+     */
+    String ROLE_DISABLE = "1";
 
-    /** 部门正常状态 */
+    /**
-    public static final String DEPT_NORMAL = "0";
+     * 部门正常状态
+     */
+    String DEPT_NORMAL = "0";
 
-    /** 部门停用状态 */
+    /**
-    public static final String DEPT_DISABLE = "1";
+     * 部门停用状态
+     */
+    String DEPT_DISABLE = "1";
 
-    /** 字典正常状态 */
+    /**
-    public static final String DICT_NORMAL = "0";
+     * 字典正常状态
+     */
+    String DICT_NORMAL = "0";
 
-    /** 是否为系统默认（是） */
+    /**
-    public static final String YES = "Y";
+     * 是否为系统默认（是）
+     */
+    String YES = "Y";
 
-    /** 是否菜单外链（是） */
+    /**
-    public static final String YES_FRAME = "0";
+     * 是否菜单外链（是）
+     */
+    String YES_FRAME = "0";
 
-    /** 是否菜单外链（否） */
+    /**
-    public static final String NO_FRAME = "1";
+     * 是否菜单外链（否）
+     */
+    String NO_FRAME = "1";
 
-    /** 菜单类型（目录） */
+    /**
-    public static final String TYPE_DIR = "M";
+     * 菜单类型（目录）
+     */
+    String TYPE_DIR = "M";
 
-    /** 菜单类型（菜单） */
+    /**
-    public static final String TYPE_MENU = "C";
+     * 菜单类型（菜单）
+     */
+    String TYPE_MENU = "C";
 
-    /** 菜单类型（按钮） */
+    /**
-    public static final String TYPE_BUTTON = "F";
+     * 菜单类型（按钮）
+     */
+    String TYPE_BUTTON = "F";
 
-    /** Layout组件标识 */
+    /**
-    public final static String LAYOUT = "Layout";
+     * Layout组件标识
+     */
+    String LAYOUT = "Layout";
 
-    /** ParentView组件标识 */
+    /**
-    public final static String PARENT_VIEW = "ParentView";
+     * ParentView组件标识
+     */
+    String PARENT_VIEW = "ParentView";
 
-    /** InnerLink组件标识 */
+    /**
-    public final static String INNER_LINK = "InnerLink";
+     * InnerLink组件标识
+     */
+    String INNER_LINK = "InnerLink";
 
-    /** 校验返回结果码 */
+    /**
-    public final static String UNIQUE = "0";
+     * 校验返回结果码
+     */
+    String UNIQUE = "0";
 
-    public final static String NOT_UNIQUE = "1";
+    String NOT_UNIQUE = "1";
 
     /**
      * 用户名长度限制
      */
-    public static final int USERNAME_MIN_LENGTH = 2;
+    int USERNAME_MIN_LENGTH = 2;
 
-    public static final int USERNAME_MAX_LENGTH = 20;
+    int USERNAME_MAX_LENGTH = 20;
 
     /**
      * 密码长度限制
      */
-    public static final int PASSWORD_MIN_LENGTH = 5;
+    int PASSWORD_MIN_LENGTH = 5;
 
-    public static final int PASSWORD_MAX_LENGTH = 20;
+    int PASSWORD_MAX_LENGTH = 20;
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/context/SecurityContextHolder.java

@@ -1,11 +1,12 @@
 package com.ruoyi.common.core.context;
 
+import cn.hutool.core.convert.Convert;
+import com.alibaba.ttl.TransmittableThreadLocal;
+import com.ruoyi.common.core.constant.SecurityConstants;
+import com.ruoyi.common.core.utils.StringUtils;
+
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import com.alibaba.ttl.TransmittableThreadLocal;
-import com.ruoyi.common.core.constant.SecurityConstants;
-import com.ruoyi.common.core.text.Convert;
-import com.ruoyi.common.core.utils.StringUtils;
 
 /**
  * 获取当前线程变量中的 用户id、用户名称、Token等信息
@@ -13,76 +14,62 @@ import com.ruoyi.common.core.utils.StringUtils;
  *
  * @author ruoyi
  */
-public class SecurityContextHolder
+public class SecurityContextHolder {
-{
     private static final TransmittableThreadLocal<Map<String, Object>> THREAD_LOCAL = new TransmittableThreadLocal<>();
 
-    public static void set(String key, Object value)
+    public static void set(String key, Object value) {
-    {
         Map<String, Object> map = getLocalMap();
         map.put(key, value == null ? StringUtils.EMPTY : value);
     }
 
-    public static String get(String key)
+    public static String get(String key) {
-    {
         Map<String, Object> map = getLocalMap();
         return Convert.toStr(map.getOrDefault(key, StringUtils.EMPTY));
     }
 
-    public static <T> T get(String key, Class<T> clazz)
+    public static <T> T get(String key, Class<T> clazz) {
-    {
         Map<String, Object> map = getLocalMap();
         return StringUtils.cast(map.getOrDefault(key, null));
     }
 
-    public static Map<String, Object> getLocalMap()
+    public static Map<String, Object> getLocalMap() {
-    {
         Map<String, Object> map = THREAD_LOCAL.get();
-        if (map == null)
+        if (map == null) {
-        {
             map = new ConcurrentHashMap<String, Object>();
             THREAD_LOCAL.set(map);
         }
         return map;
     }
 
-    public static void setLocalMap(Map<String, Object> threadLocalMap)
+    public static void setLocalMap(Map<String, Object> threadLocalMap) {
-    {
         THREAD_LOCAL.set(threadLocalMap);
     }
 
-    public static Long getUserId()
+    public static Long getUserId() {
-    {
         return Convert.toLong(get(SecurityConstants.DETAILS_USER_ID), 0L);
     }
 
-    public static void setUserId(String account)
+    public static void setUserId(String account) {
-    {
         set(SecurityConstants.DETAILS_USER_ID, account);
     }
 
-    public static String getUserName()
+    public static String getUserName() {
-    {
         return get(SecurityConstants.DETAILS_USERNAME);
     }
 
-    public static void setUserName(String username)
+    public static void setUserName(String username) {
-    {
         set(SecurityConstants.DETAILS_USERNAME, username);
     }
 
-    public static String getUserKey()
+    public static String getUserKey() {
-    {
         return get(SecurityConstants.USER_KEY);
     }
 
-    public static void setUserKey(String userKey)
+    public static void setUserKey(String userKey) {
-    {
         set(SecurityConstants.USER_KEY, userKey);
     }
 
-    public static void remove()
+    public static void remove() {
-    {
         THREAD_LOCAL.remove();
     }
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/R.java

@@ -1,11 +1,12 @@
 package com.ruoyi.common.core.domain;
 
-import java.io.Serializable;
-
 import com.ruoyi.common.core.constant.Constants;
-import lombok.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 /**
  * 响应信息主体
  *

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/UserStatus.java

@@ -10,8 +10,7 @@ import lombok.Getter;
  */
 @Getter
 @AllArgsConstructor
-public enum UserStatus
+public enum UserStatus {
-{
     OK("0", "正常"), DISABLE("1", "停用"), DELETED("2", "删除");
 
     private final String code;

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CaptchaException.java

@@ -5,12 +5,10 @@ package com.ruoyi.common.core.exception;
  *
  * @author ruoyi
  */
-public class CaptchaException extends RuntimeException
+public class CaptchaException extends RuntimeException {
-{
     private static final long serialVersionUID = 1L;
 
-    public CaptchaException(String msg)
+    public CaptchaException(String msg) {
-    {
         super(msg);
     }
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CheckedException.java

@@ -5,27 +5,22 @@ package com.ruoyi.common.core.exception;
  *
  * @author ruoyi
  */
-public class CheckedException extends RuntimeException
+public class CheckedException extends RuntimeException {
-{
     private static final long serialVersionUID = 1L;
 
-    public CheckedException(String message)
+    public CheckedException(String message) {
-    {
         super(message);
     }
 
-    public CheckedException(Throwable cause)
+    public CheckedException(Throwable cause) {
-    {
         super(cause);
     }
 
-    public CheckedException(String message, Throwable cause)
+    public CheckedException(String message, Throwable cause) {
-    {
         super(message, cause);
     }
 
-    public CheckedException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace)
+    public CheckedException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
-    {
         super(message, cause, enableSuppression, writableStackTrace);
     }
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/DemoModeException.java

@@ -5,11 +5,9 @@ package com.ruoyi.common.core.exception;
  *
  * @author ruoyi
  */
-public class DemoModeException extends RuntimeException
+public class DemoModeException extends RuntimeException {
-{
     private static final long serialVersionUID = 1L;
 
-    public DemoModeException()
+    public DemoModeException() {
-    {
     }
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/GlobalException.java

@@ -5,8 +5,7 @@ package com.ruoyi.common.core.exception;
  *
  * @author ruoyi
  */
-public class GlobalException extends RuntimeException
+public class GlobalException extends RuntimeException {
-{
 
     private static final long serialVersionUID = 1L;
 
@@ -23,34 +22,28 @@ public class GlobalException extends RuntimeException
     /**
      * 空构造方法，避免反序列化问题
      */
-    public GlobalException()
+    public GlobalException() {
-    {
     }
 
-    public GlobalException(String message)
+    public GlobalException(String message) {
-    {
         this.message = message;
     }
 
-    public String getDetailMessage()
+    public String getDetailMessage() {
-    {
         return detailMessage;
     }
 
-    public GlobalException setDetailMessage(String detailMessage)
+    public GlobalException setDetailMessage(String detailMessage) {
-    {
         this.detailMessage = detailMessage;
         return this;
     }
 
     @Override
-    public String getMessage()
+    public String getMessage() {
-    {
         return message;
     }
 
-    public GlobalException setMessage(String message)
+    public GlobalException setMessage(String message) {
-    {
         this.message = message;
         return this;
     }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/InnerAuthException.java

@@ -5,12 +5,10 @@ package com.ruoyi.common.core.exception;
  *
  * @author ruoyi
  */
-public class InnerAuthException extends RuntimeException
+public class InnerAuthException extends RuntimeException {
-{
     private static final long serialVersionUID = 1L;
 
-    public InnerAuthException(String message)
+    public InnerAuthException(String message) {
-    {
         super(message);
     }
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/PreAuthorizeException.java

@@ -5,11 +5,9 @@ package com.ruoyi.common.core.exception;
  *
  * @author ruoyi
  */
-public class PreAuthorizeException extends RuntimeException
+public class PreAuthorizeException extends RuntimeException {
-{
     private static final long serialVersionUID = 1L;
 
-    public PreAuthorizeException()
+    public PreAuthorizeException() {
-    {
     }
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java

@@ -5,8 +5,7 @@ package com.ruoyi.common.core.exception;
  *
  * @author ruoyi
  */
-public final class ServiceException extends RuntimeException
+public final class ServiceException extends RuntimeException {
-{
     private static final long serialVersionUID = 1L;
 
     /**
@@ -27,44 +26,36 @@ public final class ServiceException extends RuntimeException
     /**
      * 空构造方法，避免反序列化问题
      */
-    public ServiceException()
+    public ServiceException() {
-    {
     }
 
-    public ServiceException(String message)
+    public ServiceException(String message) {
-    {
         this.message = message;
     }
 
-    public ServiceException(String message, Integer code)
+    public ServiceException(String message, Integer code) {
-    {
         this.message = message;
         this.code = code;
     }
 
-    public String getDetailMessage()
+    public String getDetailMessage() {
-    {
         return detailMessage;
     }
 
-    public String getMessage()
+    public String getMessage() {
-    {
         return message;
     }
 
-    public Integer getCode()
+    public Integer getCode() {
-    {
         return code;
     }
 
-    public ServiceException setMessage(String message)
+    public ServiceException setMessage(String message) {
-    {
         this.message = message;
         return this;
     }
 
-    public ServiceException setDetailMessage(String detailMessage)
+    public ServiceException setDetailMessage(String detailMessage) {
-    {
         this.detailMessage = detailMessage;
         return this;
     }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/UtilException.java

@@ -5,22 +5,18 @@ package com.ruoyi.common.core.exception;
  *
  * @author ruoyi
  */
-public class UtilException extends RuntimeException
+public class UtilException extends RuntimeException {
-{
     private static final long serialVersionUID = 8247610319171014183L;
 
-    public UtilException(Throwable e)
+    public UtilException(Throwable e) {
-    {
         super(e.getMessage(), e);
     }
 
-    public UtilException(String message)
+    public UtilException(String message) {
-    {
         super(message);
     }
 
-    public UtilException(String message, Throwable throwable)
+    public UtilException(String message, Throwable throwable) {
-    {
         super(message, throwable);
     }
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotLoginException.java

@@ -5,12 +5,10 @@ package com.ruoyi.common.core.exception.auth;
  *
  * @author ruoyi
  */
-public class NotLoginException extends RuntimeException
+public class NotLoginException extends RuntimeException {
-{
     private static final long serialVersionUID = 1L;
 
-    public NotLoginException(String message)
+    public NotLoginException(String message) {
-    {
         super(message);
     }
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotPermissionException.java

@@ -7,17 +7,14 @@ import org.apache.commons.lang3.StringUtils;
  *
  * @author ruoyi
  */
-public class NotPermissionException extends RuntimeException
+public class NotPermissionException extends RuntimeException {
-{
     private static final long serialVersionUID = 1L;
 
-    public NotPermissionException(String permission)
+    public NotPermissionException(String permission) {
-    {
         super(permission);
     }
 
-    public NotPermissionException(String[] permissions)
+    public NotPermissionException(String[] permissions) {
-    {
         super(StringUtils.join(permissions, ","));
     }
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotRoleException.java

@@ -7,17 +7,14 @@ import org.apache.commons.lang3.StringUtils;
  *
  * @author ruoyi
  */
-public class NotRoleException extends RuntimeException
+public class NotRoleException extends RuntimeException {
-{
     private static final long serialVersionUID = 1L;
 
-    public NotRoleException(String role)
+    public NotRoleException(String role) {
-    {
         super(role);
     }
 
-    public NotRoleException(String[] roles)
+    public NotRoleException(String[] roles) {
-    {
         super(StringUtils.join(roles, ","));
     }
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/base/BaseException.java

@@ -10,8 +10,7 @@ import lombok.Getter;
  */
 @Getter
 @AllArgsConstructor
-public class BaseException extends RuntimeException
+public class BaseException extends RuntimeException {
-{
     private static final long serialVersionUID = 1L;
 
     /**
@@ -34,23 +33,19 @@ public class BaseException extends RuntimeException
      */
     private String defaultMessage;
 
-    public BaseException(String module, String code, Object[] args)
+    public BaseException(String module, String code, Object[] args) {
-    {
         this(module, code, args, null);
     }
 
-    public BaseException(String module, String defaultMessage)
+    public BaseException(String module, String defaultMessage) {
-    {
         this(module, null, null, defaultMessage);
     }
 
-    public BaseException(String code, Object[] args)
+    public BaseException(String code, Object[] args) {
-    {
         this(null, code, args, null);
     }
 
-    public BaseException(String defaultMessage)
+    public BaseException(String defaultMessage) {
-    {
         this(null, null, null, defaultMessage);
     }
 

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileException.java

@@ -7,12 +7,10 @@ import com.ruoyi.common.core.exception.base.BaseException;
  *
  * @author ruoyi
  */
-public class FileException extends BaseException
+public class FileException extends BaseException {
-{
     private static final long serialVersionUID = 1L;
 
-    public FileException(String code, Object[] args)
+    public FileException(String code, Object[] args) {
-    {
         super("file", code, args, null);
     }
 

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileNameLengthLimitExceededException.java

@@ -5,12 +5,10 @@ package com.ruoyi.common.core.exception.file;
  *
  * @author ruoyi
  */
-public class FileNameLengthLimitExceededException extends FileException
+public class FileNameLengthLimitExceededException extends FileException {
-{
     private static final long serialVersionUID = 1L;
 
-    public FileNameLengthLimitExceededException(int defaultFileNameLength)
+    public FileNameLengthLimitExceededException(int defaultFileNameLength) {
-    {
         super("upload.filename.exceed.length", new Object[]{defaultFileNameLength});
     }
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileSizeLimitExceededException.java

@@ -5,12 +5,10 @@ package com.ruoyi.common.core.exception.file;
  *
  * @author ruoyi
  */
-public class FileSizeLimitExceededException extends FileException
+public class FileSizeLimitExceededException extends FileException {
-{
     private static final long serialVersionUID = 1L;
 
-    public FileSizeLimitExceededException(long defaultMaxSize)
+    public FileSizeLimitExceededException(long defaultMaxSize) {
-    {
         super("upload.exceed.maxSize", new Object[]{defaultMaxSize});
     }
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/InvalidExtensionException.java

@@ -1,80 +1,68 @@
 package com.ruoyi.common.core.exception.file;
 
-import java.util.Arrays;
 import org.apache.commons.fileupload.FileUploadException;
 
+import java.util.Arrays;
+
 /**
  * 文件上传 误异常类
  *
  * @author ruoyi
  */
-public class InvalidExtensionException extends FileUploadException
+public class InvalidExtensionException extends FileUploadException {
-{
     private static final long serialVersionUID = 1L;
 
     private String[] allowedExtension;
     private String extension;
     private String filename;
 
-    public InvalidExtensionException(String[] allowedExtension, String extension, String filename)
+    public InvalidExtensionException(String[] allowedExtension, String extension, String filename) {
-    {
         super("filename : [" + filename + "], extension : [" + extension + "], allowed extension : [" + Arrays.toString(allowedExtension) + "]");
         this.allowedExtension = allowedExtension;
         this.extension = extension;
         this.filename = filename;
     }
 
-    public String[] getAllowedExtension()
+    public String[] getAllowedExtension() {
-    {
         return allowedExtension;
     }
 
-    public String getExtension()
+    public String getExtension() {
-    {
         return extension;
     }
 
-    public String getFilename()
+    public String getFilename() {
-    {
         return filename;
     }
 
-    public static class InvalidImageExtensionException extends InvalidExtensionException
+    public static class InvalidImageExtensionException extends InvalidExtensionException {
-    {
         private static final long serialVersionUID = 1L;
 
-        public InvalidImageExtensionException(String[] allowedExtension, String extension, String filename)
+        public InvalidImageExtensionException(String[] allowedExtension, String extension, String filename) {
-        {
             super(allowedExtension, extension, filename);
         }
     }
 
-    public static class InvalidFlashExtensionException extends InvalidExtensionException
+    public static class InvalidFlashExtensionException extends InvalidExtensionException {
-    {
         private static final long serialVersionUID = 1L;
 
-        public InvalidFlashExtensionException(String[] allowedExtension, String extension, String filename)
+        public InvalidFlashExtensionException(String[] allowedExtension, String extension, String filename) {
-        {
             super(allowedExtension, extension, filename);
         }
     }
 
-    public static class InvalidMediaExtensionException extends InvalidExtensionException
+    public static class InvalidMediaExtensionException extends InvalidExtensionException {
-    {
         private static final long serialVersionUID = 1L;
 
-        public InvalidMediaExtensionException(String[] allowedExtension, String extension, String filename)
+        public InvalidMediaExtensionException(String[] allowedExtension, String extension, String filename) {
-        {
             super(allowedExtension, extension, filename);
         }
     }
 
-    public static class InvalidVideoExtensionException extends InvalidExtensionException
+    public static class InvalidVideoExtensionException extends InvalidExtensionException {
-    {
         private static final long serialVersionUID = 1L;
 
-        public InvalidVideoExtensionException(String[] allowedExtension, String extension, String filename)
+        public InvalidVideoExtensionException(String[] allowedExtension, String extension, String filename) {
-        {
             super(allowedExtension, extension, filename);
         }
     }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/job/TaskException.java

@@ -1,34 +0,0 @@
-package com.ruoyi.common.core.exception.job;
-
-/**
- * 计划策略异常
- * 
- * @author ruoyi
- */
-public class TaskException extends Exception
-{
-    private static final long serialVersionUID = 1L;
-
-    private Code code;
-
-    public TaskException(String msg, Code code)
-    {
-        this(msg, code, null);
-    }
-
-    public TaskException(String msg, Code code, Exception nestedEx)
-    {
-        super(msg, nestedEx);
-        this.code = code;
-    }
-
-    public Code getCode()
-    {
-        return code;
-    }
-
-    public enum Code
-    {
-        TASK_EXISTS, NO_TASK_EXISTS, TASK_ALREADY_STARTED, UNKNOWN, CONFIG_ERROR, TASK_NODE_NOT_AVAILABLE
-    }
-}

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/CaptchaExpireException.java

@@ -5,12 +5,10 @@ package com.ruoyi.common.core.exception.user;
  *
  * @author ruoyi
  */
-public class CaptchaExpireException extends UserException
+public class CaptchaExpireException extends UserException {
-{
     private static final long serialVersionUID = 1L;
 
-    public CaptchaExpireException()
+    public CaptchaExpireException() {
-    {
         super("user.jcaptcha.expire", null);
     }
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserException.java

@@ -7,12 +7,10 @@ import com.ruoyi.common.core.exception.base.BaseException;
  *
  * @author ruoyi
  */
-public class UserException extends BaseException
+public class UserException extends BaseException {
-{
     private static final long serialVersionUID = 1L;
 
-    public UserException(String code, Object[] args)
+    public UserException(String code, Object[] args) {
-    {
         super("user", code, args, null);
     }
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserPasswordNotMatchException.java

@@ -5,12 +5,10 @@ package com.ruoyi.common.core.exception.user;
  *
  * @author ruoyi
  */
-public class UserPasswordNotMatchException extends UserException
+public class UserPasswordNotMatchException extends UserException {
-{
     private static final long serialVersionUID = 1L;
 
-    public UserPasswordNotMatchException()
+    public UserPasswordNotMatchException() {
-    {
         super("user.password.not.match", null);
     }
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/CharsetKit.java

@@ -1,86 +0,0 @@
-package com.ruoyi.common.core.text;
-
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import com.ruoyi.common.core.utils.StringUtils;
-
-/**
- * 字符集工具类
- * 
- * @author ruoyi
- */
-public class CharsetKit
-{
-    /** ISO-8859-1 */
-    public static final String ISO_8859_1 = "ISO-8859-1";
-    /** UTF-8 */
-    public static final String UTF_8 = "UTF-8";
-    /** GBK */
-    public static final String GBK = "GBK";
-
-    /** ISO-8859-1 */
-    public static final Charset CHARSET_ISO_8859_1 = StandardCharsets.ISO_8859_1;
-    /** UTF-8 */
-    public static final Charset CHARSET_UTF_8 = StandardCharsets.UTF_8;
-    /** GBK */
-    public static final Charset CHARSET_GBK = Charset.forName(GBK);
-
-    /**
-     * 转换为Charset对象
-     * 
-     * @param charset 字符集，为空则返回默认字符集
-     * @return Charset
-     */
-    public static Charset charset(String charset)
-    {
-        return StringUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset);
-    }
-
-    /**
-     * 转换字符串的字符集编码
-     * 
-     * @param source 字符串
-     * @param srcCharset 源字符集，默认ISO-8859-1
-     * @param destCharset 目标字符集，默认UTF-8
-     * @return 转换后的字符集
-     */
-    public static String convert(String source, String srcCharset, String destCharset)
-    {
-        return convert(source, Charset.forName(srcCharset), Charset.forName(destCharset));
-    }
-
-    /**
-     * 转换字符串的字符集编码
-     * 
-     * @param source 字符串
-     * @param srcCharset 源字符集，默认ISO-8859-1
-     * @param destCharset 目标字符集，默认UTF-8
-     * @return 转换后的字符集
-     */
-    public static String convert(String source, Charset srcCharset, Charset destCharset)
-    {
-        if (null == srcCharset)
-        {
-            srcCharset = StandardCharsets.ISO_8859_1;
-        }
-
-        if (null == destCharset)
-        {
-            destCharset = StandardCharsets.UTF_8;
-        }
-
-        if (StringUtils.isEmpty(source) || srcCharset.equals(destCharset))
-        {
-            return source;
-        }
-        return new String(source.getBytes(srcCharset), destCharset);
-    }
-
-    /**
-     * @return 系统字符集编码
-     */
-    public static String systemCharset()
-    {
-        return Charset.defaultCharset().name();
-    }
-}

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/StrFormatter.java

@@ -1,92 +0,0 @@
-package com.ruoyi.common.core.text;
-
-import com.ruoyi.common.core.utils.StringUtils;
-
-/**
- * 字符串格式化
- * 
- * @author ruoyi
- */
-public class StrFormatter
-{
-    public static final String EMPTY_JSON = "{}";
-    public static final char C_BACKSLASH = '\\';
-    public static final char C_DELIM_START = '{';
-    public static final char C_DELIM_END = '}';
-
-    /**
-     * 格式化字符串<br>
-     * 此方法只是简单将占位符 {} 按照顺序替换为参数<br>
-     * 如果想输出 {} 使用 \\转义 { 即可，如果想输出 {} 之前的 \ 使用双转义符 \\\\ 即可<br>
-     * 例：<br>
-     * 通常使用：format("this is {} for {}", "a", "b") -> this is a for b<br>
-     * 转义{}： format("this is \\{} for {}", "a", "b") -> this is \{} for a<br>
-     * 转义\： format("this is \\\\{} for {}", "a", "b") -> this is \a for b<br>
-     * 
-     * @param strPattern 字符串模板
-     * @param argArray 参数列表
-     * @return 结果
-     */
-    public static String format(final String strPattern, final Object... argArray)
-    {
-        if (StringUtils.isEmpty(strPattern) || StringUtils.isEmpty(argArray))
-        {
-            return strPattern;
-        }
-        final int strPatternLength = strPattern.length();
-
-        // 初始化定义好的长度以获得更好的性能
-        StringBuilder sbuf = new StringBuilder(strPatternLength + 50);
-
-        int handledPosition = 0;
-        int delimIndex;// 占位符所在位置
-        for (int argIndex = 0; argIndex < argArray.length; argIndex++)
-        {
-            delimIndex = strPattern.indexOf(EMPTY_JSON, handledPosition);
-            if (delimIndex == -1)
-            {
-                if (handledPosition == 0)
-                {
-                    return strPattern;
-                }
-                else
-                { // 字符串模板剩余部分不再包含占位符，加入剩余部分后返回结果
-                    sbuf.append(strPattern, handledPosition, strPatternLength);
-                    return sbuf.toString();
-                }
-            }
-            else
-            {
-                if (delimIndex > 0 && strPattern.charAt(delimIndex - 1) == C_BACKSLASH)
-                {
-                    if (delimIndex > 1 && strPattern.charAt(delimIndex - 2) == C_BACKSLASH)
-                    {
-                        // 转义符之前还有一个转义符，占位符依旧有效
-                        sbuf.append(strPattern, handledPosition, delimIndex - 1);
-                        sbuf.append(Convert.utf8Str(argArray[argIndex]));
-                        handledPosition = delimIndex + 2;
-                    }
-                    else
-                    {
-                        // 占位符被转义
-                        argIndex--;
-                        sbuf.append(strPattern, handledPosition, delimIndex - 1);
-                        sbuf.append(C_DELIM_START);
-                        handledPosition = delimIndex + 1;
-                    }
-                }
-                else
-                {
-                    // 正常占位符
-                    sbuf.append(strPattern, handledPosition, delimIndex);
-                    sbuf.append(Convert.utf8Str(argArray[argIndex]));
-                    handledPosition = delimIndex + 2;
-                }
-            }
-        }
-        // 加入最后一个占位符后所有的字符
-        sbuf.append(strPattern, handledPosition, strPattern.length());
-
-        return sbuf.toString();
-    }
-}

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/UUID.java

@@ -1,484 +0,0 @@
-package com.ruoyi.common.core.text;
-
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
-import java.util.Random;
-import java.util.concurrent.ThreadLocalRandom;
-import com.ruoyi.common.core.exception.UtilException;
-
-/**
- * 提供通用唯一识别码（universally unique identifier）（UUID）实现
- *
- * @author ruoyi
- */
-public final class UUID implements java.io.Serializable, Comparable<UUID>
-{
-    private static final long serialVersionUID = -1185015143654744140L;
-
-    /**
-     * SecureRandom 的单例
-     *
-     */
-    private static class Holder
-    {
-        static final SecureRandom numberGenerator = getSecureRandom();
-    }
-
-    /** 此UUID的最高64有效位 */
-    private final long mostSigBits;
-
-    /** 此UUID的最低64有效位 */
-    private final long leastSigBits;
-
-    /**
-     * 私有构造
-     * 
-     * @param data 数据
-     */
-    private UUID(byte[] data)
-    {
-        long msb = 0;
-        long lsb = 0;
-        assert data.length == 16 : "data must be 16 bytes in length";
-        for (int i = 0; i < 8; i++)
-        {
-            msb = (msb << 8) | (data[i] & 0xff);
-        }
-        for (int i = 8; i < 16; i++)
-        {
-            lsb = (lsb << 8) | (data[i] & 0xff);
-        }
-        this.mostSigBits = msb;
-        this.leastSigBits = lsb;
-    }
-
-    /**
-     * 使用指定的数据构造新的 UUID。
-     *
-     * @param mostSigBits 用于 {@code UUID} 的最高有效 64 位
-     * @param leastSigBits 用于 {@code UUID} 的最低有效 64 位
-     */
-    public UUID(long mostSigBits, long leastSigBits)
-    {
-        this.mostSigBits = mostSigBits;
-        this.leastSigBits = leastSigBits;
-    }
-
-    /**
-     * 获取类型 4（伪随机生成的）UUID 的静态工厂。 使用加密的本地线程伪随机数生成器生成该 UUID。
-     * 
-     * @return 随机生成的 {@code UUID}
-     */
-    public static UUID fastUUID()
-    {
-        return randomUUID(false);
-    }
-
-    /**
-     * 获取类型 4（伪随机生成的）UUID 的静态工厂。 使用加密的强伪随机数生成器生成该 UUID。
-     * 
-     * @return 随机生成的 {@code UUID}
-     */
-    public static UUID randomUUID()
-    {
-        return randomUUID(true);
-    }
-
-    /**
-     * 获取类型 4（伪随机生成的）UUID 的静态工厂。 使用加密的强伪随机数生成器生成该 UUID。
-     * 
-     * @param isSecure 是否使用{@link SecureRandom}如果是可以获得更安全的随机码，否则可以得到更好的性能
-     * @return 随机生成的 {@code UUID}
-     */
-    public static UUID randomUUID(boolean isSecure)
-    {
-        final Random ng = isSecure ? Holder.numberGenerator : getRandom();
-
-        byte[] randomBytes = new byte[16];
-        ng.nextBytes(randomBytes);
-        randomBytes[6] &= 0x0f; /* clear version */
-        randomBytes[6] |= 0x40; /* set to version 4 */
-        randomBytes[8] &= 0x3f; /* clear variant */
-        randomBytes[8] |= 0x80; /* set to IETF variant */
-        return new UUID(randomBytes);
-    }
-
-    /**
-     * 根据指定的字节数组获取类型 3（基于名称的）UUID 的静态工厂。
-     *
-     * @param name 用于构造 UUID 的字节数组。
-     *
-     * @return 根据指定数组生成的 {@code UUID}
-     */
-    public static UUID nameUUIDFromBytes(byte[] name)
-    {
-        MessageDigest md;
-        try
-        {
-            md = MessageDigest.getInstance("MD5");
-        }
-        catch (NoSuchAlgorithmException nsae)
-        {
-            throw new InternalError("MD5 not supported");
-        }
-        byte[] md5Bytes = md.digest(name);
-        md5Bytes[6] &= 0x0f; /* clear version */
-        md5Bytes[6] |= 0x30; /* set to version 3 */
-        md5Bytes[8] &= 0x3f; /* clear variant */
-        md5Bytes[8] |= 0x80; /* set to IETF variant */
-        return new UUID(md5Bytes);
-    }
-
-    /**
-     * 根据 {@link #toString()} 方法中描述的字符串标准表示形式创建{@code UUID}。
-     *
-     * @param name 指定 {@code UUID} 字符串
-     * @return 具有指定值的 {@code UUID}
-     * @throws IllegalArgumentException 如果 name 与 {@link #toString} 中描述的字符串表示形式不符抛出此异常
-     *
-     */
-    public static UUID fromString(String name)
-    {
-        String[] components = name.split("-");
-        if (components.length != 5)
-        {
-            throw new IllegalArgumentException("Invalid UUID string: " + name);
-        }
-        for (int i = 0; i < 5; i++)
-        {
-            components[i] = "0x" + components[i];
-        }
-
-        long mostSigBits = Long.decode(components[0]).longValue();
-        mostSigBits <<= 16;
-        mostSigBits |= Long.decode(components[1]).longValue();
-        mostSigBits <<= 16;
-        mostSigBits |= Long.decode(components[2]).longValue();
-
-        long leastSigBits = Long.decode(components[3]).longValue();
-        leastSigBits <<= 48;
-        leastSigBits |= Long.decode(components[4]).longValue();
-
-        return new UUID(mostSigBits, leastSigBits);
-    }
-
-    /**
-     * 返回此 UUID 的 128 位值中的最低有效 64 位。
-     *
-     * @return 此 UUID 的 128 位值中的最低有效 64 位。
-     */
-    public long getLeastSignificantBits()
-    {
-        return leastSigBits;
-    }
-
-    /**
-     * 返回此 UUID 的 128 位值中的最高有效 64 位。
-     *
-     * @return 此 UUID 的 128 位值中最高有效 64 位。
-     */
-    public long getMostSignificantBits()
-    {
-        return mostSigBits;
-    }
-
-    /**
-     * 与此 {@code UUID} 相关联的版本号. 版本号描述此 {@code UUID} 是如何生成的。
-     * <p>
-     * 版本号具有以下含意:
-     * <ul>
-     * <li>1 基于时间的 UUID
-     * <li>2 DCE 安全 UUID
-     * <li>3 基于名称的 UUID
-     * <li>4 随机生成的 UUID
-     * </ul>
-     *
-     * @return 此 {@code UUID} 的版本号
-     */
-    public int version()
-    {
-        // Version is bits masked by 0x000000000000F000 in MS long
-        return (int) ((mostSigBits >> 12) & 0x0f);
-    }
-
-    /**
-     * 与此 {@code UUID} 相关联的变体号。变体号描述 {@code UUID} 的布局。
-     * <p>
-     * 变体号具有以下含意：
-     * <ul>
-     * <li>0 为 NCS 向后兼容保留
-     * <li>2 <a href="http://www.ietf.org/rfc/rfc4122.txt">IETF&nbsp;RFC&nbsp;4122</a>(Leach-Salz), 用于此类
-     * <li>6 保留，微软向后兼容
-     * <li>7 保留供以后定义使用
-     * </ul>
-     *
-     * @return 此 {@code UUID} 相关联的变体号
-     */
-    public int variant()
-    {
-        // This field is composed of a varying number of bits.
-        // 0 - - Reserved for NCS backward compatibility
-        // 1 0 - The IETF aka Leach-Salz variant (used by this class)
-        // 1 1 0 Reserved, Microsoft backward compatibility
-        // 1 1 1 Reserved for future definition.
-        return (int) ((leastSigBits >>> (64 - (leastSigBits >>> 62))) & (leastSigBits >> 63));
-    }
-
-    /**
-     * 与此 UUID 相关联的时间戳值。
-     *
-     * <p>
-     * 60 位的时间戳值根据此 {@code UUID} 的 time_low、time_mid 和 time_hi 字段构造。<br>
-     * 所得到的时间戳以 100 毫微秒为单位，从 UTC（通用协调时间） 1582 年 10 月 15 日零时开始。
-     *
-     * <p>
-     * 时间戳值仅在在基于时间的 UUID（其 version 类型为 1）中才有意义。<br>
-     * 如果此 {@code UUID} 不是基于时间的 UUID，则此方法抛出 UnsupportedOperationException。
-     *
-     * @throws UnsupportedOperationException 如果此 {@code UUID} 不是 version 为 1 的 UUID。
-     */
-    public long timestamp() throws UnsupportedOperationException
-    {
-        checkTimeBase();
-        return (mostSigBits & 0x0FFFL) << 48//
-                | ((mostSigBits >> 16) & 0x0FFFFL) << 32//
-                | mostSigBits >>> 32;
-    }
-
-    /**
-     * 与此 UUID 相关联的时钟序列值。
-     *
-     * <p>
-     * 14 位的时钟序列值根据此 UUID 的 clock_seq 字段构造。clock_seq 字段用于保证在基于时间的 UUID 中的时间唯一性。
-     * <p>
-     * {@code clockSequence} 值仅在基于时间的 UUID（其 version 类型为 1）中才有意义。 如果此 UUID 不是基于时间的 UUID，则此方法抛出
-     * UnsupportedOperationException。
-     *
-     * @return 此 {@code UUID} 的时钟序列
-     *
-     * @throws UnsupportedOperationException 如果此 UUID 的 version 不为 1
-     */
-    public int clockSequence() throws UnsupportedOperationException
-    {
-        checkTimeBase();
-        return (int) ((leastSigBits & 0x3FFF000000000000L) >>> 48);
-    }
-
-    /**
-     * 与此 UUID 相关的节点值。
-     *
-     * <p>
-     * 48 位的节点值根据此 UUID 的 node 字段构造。此字段旨在用于保存机器的 IEEE 802 地址，该地址用于生成此 UUID 以保证空间唯一性。
-     * <p>
-     * 节点值仅在基于时间的 UUID（其 version 类型为 1）中才有意义。<br>
-     * 如果此 UUID 不是基于时间的 UUID，则此方法抛出 UnsupportedOperationException。
-     *
-     * @return 此 {@code UUID} 的节点值
-     *
-     * @throws UnsupportedOperationException 如果此 UUID 的 version 不为 1
-     */
-    public long node() throws UnsupportedOperationException
-    {
-        checkTimeBase();
-        return leastSigBits & 0x0000FFFFFFFFFFFFL;
-    }
-
-    /**
-     * 返回此{@code UUID} 的字符串表现形式。
-     *
-     * <p>
-     * UUID 的字符串表示形式由此 BNF 描述：
-     * 
-     * <pre>
-     * {@code
-     * UUID                   = <time_low>-<time_mid>-<time_high_and_version>-<variant_and_sequence>-<node>
-     * time_low               = 4*<hexOctet>
-     * time_mid               = 2*<hexOctet>
-     * time_high_and_version  = 2*<hexOctet>
-     * variant_and_sequence   = 2*<hexOctet>
-     * node                   = 6*<hexOctet>
-     * hexOctet               = <hexDigit><hexDigit>
-     * hexDigit               = [0-9a-fA-F]
-     * }
-     * </pre>
-     * 
-     * </blockquote>
-     *
-     * @return 此{@code UUID} 的字符串表现形式
-     * @see #toString(boolean)
-     */
-    @Override
-    public String toString()
-    {
-        return toString(false);
-    }
-
-    /**
-     * 返回此{@code UUID} 的字符串表现形式。
-     *
-     * <p>
-     * UUID 的字符串表示形式由此 BNF 描述：
-     * 
-     * <pre>
-     * {@code
-     * UUID                   = <time_low>-<time_mid>-<time_high_and_version>-<variant_and_sequence>-<node>
-     * time_low               = 4*<hexOctet>
-     * time_mid               = 2*<hexOctet>
-     * time_high_and_version  = 2*<hexOctet>
-     * variant_and_sequence   = 2*<hexOctet>
-     * node                   = 6*<hexOctet>
-     * hexOctet               = <hexDigit><hexDigit>
-     * hexDigit               = [0-9a-fA-F]
-     * }
-     * </pre>
-     * 
-     * </blockquote>
-     *
-     * @param isSimple 是否简单模式，简单模式为不带'-'的UUID字符串
-     * @return 此{@code UUID} 的字符串表现形式
-     */
-    public String toString(boolean isSimple)
-    {
-        final StringBuilder builder = new StringBuilder(isSimple ? 32 : 36);
-        // time_low
-        builder.append(digits(mostSigBits >> 32, 8));
-        if (false == isSimple)
-        {
-            builder.append('-');
-        }
-        // time_mid
-        builder.append(digits(mostSigBits >> 16, 4));
-        if (false == isSimple)
-        {
-            builder.append('-');
-        }
-        // time_high_and_version
-        builder.append(digits(mostSigBits, 4));
-        if (false == isSimple)
-        {
-            builder.append('-');
-        }
-        // variant_and_sequence
-        builder.append(digits(leastSigBits >> 48, 4));
-        if (false == isSimple)
-        {
-            builder.append('-');
-        }
-        // node
-        builder.append(digits(leastSigBits, 12));
-
-        return builder.toString();
-    }
-
-    /**
-     * 返回此 UUID 的哈希码。
-     *
-     * @return UUID 的哈希码值。
-     */
-    @Override
-    public int hashCode()
-    {
-        long hilo = mostSigBits ^ leastSigBits;
-        return ((int) (hilo >> 32)) ^ (int) hilo;
-    }
-
-    /**
-     * 将此对象与指定对象比较。
-     * <p>
-     * 当且仅当参数不为 {@code null}、而是一个 UUID 对象、具有与此 UUID 相同的 varriant、包含相同的值（每一位均相同）时，结果才为 {@code true}。
-     *
-     * @param obj 要与之比较的对象
-     *
-     * @return 如果对象相同，则返回 {@code true}；否则返回 {@code false}
-     */
-    @Override
-    public boolean equals(Object obj)
-    {
-        if ((null == obj) || (obj.getClass() != UUID.class))
-        {
-            return false;
-        }
-        UUID id = (UUID) obj;
-        return (mostSigBits == id.mostSigBits && leastSigBits == id.leastSigBits);
-    }
-
-    // Comparison Operations
-
-    /**
-     * 将此 UUID 与指定的 UUID 比较。
-     *
-     * <p>
-     * 如果两个 UUID 不同，且第一个 UUID 的最高有效字段大于第二个 UUID 的对应字段，则第一个 UUID 大于第二个 UUID。
-     *
-     * @param val 与此 UUID 比较的 UUID
-     *
-     * @return 在此 UUID 小于、等于或大于 val 时，分别返回 -1、0 或 1。
-     *
-     */
-    @Override
-    public int compareTo(UUID val)
-    {
-        // The ordering is intentionally set up so that the UUIDs
-        // can simply be numerically compared as two numbers
-        return (this.mostSigBits < val.mostSigBits ? -1 : //
-                (this.mostSigBits > val.mostSigBits ? 1 : //
-                        (this.leastSigBits < val.leastSigBits ? -1 : //
-                                (this.leastSigBits > val.leastSigBits ? 1 : //
-                                        0))));
-    }
-
-    // -------------------------------------------------------------------------------------------------------------------
-    // Private method start
-    /**
-     * 返回指定数字对应的hex值
-     * 
-     * @param val 值
-     * @param digits 位
-     * @return 值
-     */
-    private static String digits(long val, int digits)
-    {
-        long hi = 1L << (digits * 4);
-        return Long.toHexString(hi | (val & (hi - 1))).substring(1);
-    }
-
-    /**
-     * 检查是否为time-based版本UUID
-     */
-    private void checkTimeBase()
-    {
-        if (version() != 1)
-        {
-            throw new UnsupportedOperationException("Not a time-based UUID");
-        }
-    }
-
-    /**
-     * 获取{@link SecureRandom}，类提供加密的强随机数生成器 (RNG)
-     * 
-     * @return {@link SecureRandom}
-     */
-    public static SecureRandom getSecureRandom()
-    {
-        try
-        {
-            return SecureRandom.getInstance("SHA1PRNG");
-        }
-        catch (NoSuchAlgorithmException e)
-        {
-            throw new UtilException(e);
-        }
-    }
-
-    /**
-     * 获取随机数生成器对象<br>
-     * ThreadLocalRandom是JDK 7之后提供并发产生随机数，能够解决多个线程发生的竞争争夺。
-     * 
-     * @return {@link ThreadLocalRandom}
-     */
-    public static ThreadLocalRandom getRandom()
-    {
-        return ThreadLocalRandom.current();
-    }
-}

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java

@@ -1,18 +1,18 @@
 package com.ruoyi.common.core.utils;
 
+import org.apache.commons.lang3.time.DateFormatUtils;
+
 import java.lang.management.ManagementFactory;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import org.apache.commons.lang3.time.DateFormatUtils;
 
 /**
  * 时间工具类
  *
  * @author ruoyi
  */
-public class DateUtils extends org.apache.commons.lang3.time.DateUtils
+public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
-{
     public static String YYYY = "yyyy";
 
     public static String YYYY_MM = "yyyy-MM";
@@ -33,8 +33,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
      *
      * @return Date() 当前日期
      */
-    public static Date getNowDate()
+    public static Date getNowDate() {
-    {
         return new Date();
     }
 
@@ -43,44 +42,34 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
      *
      * @return String
      */
-    public static String getDate()
+    public static String getDate() {
-    {
         return dateTimeNow(YYYY_MM_DD);
     }
 
-    public static final String getTime()
+    public static final String getTime() {
-    {
         return dateTimeNow(YYYY_MM_DD_HH_MM_SS);
     }
 
-    public static final String dateTimeNow()
+    public static final String dateTimeNow() {
-    {
         return dateTimeNow(YYYYMMDDHHMMSS);
     }
 
-    public static final String dateTimeNow(final String format)
+    public static final String dateTimeNow(final String format) {
-    {
         return parseDateToStr(format, new Date());
     }
 
-    public static final String dateTime(final Date date)
+    public static final String dateTime(final Date date) {
-    {
         return parseDateToStr(YYYY_MM_DD, date);
     }
 
-    public static final String parseDateToStr(final String format, final Date date)
+    public static final String parseDateToStr(final String format, final Date date) {
-    {
         return new SimpleDateFormat(format).format(date);
     }
 
-    public static final Date dateTime(final String format, final String ts)
+    public static final Date dateTime(final String format, final String ts) {
-    {
+        try {
-        try
-        {
             return new SimpleDateFormat(format).parse(ts);
-        }
+        } catch (ParseException e) {
-        catch (ParseException e)
-        {
             throw new RuntimeException(e);
         }
     }
@@ -88,8 +77,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 日期路径 即年/月/日 如2018/08/08
      */
-    public static final String datePath()
+    public static final String datePath() {
-    {
         Date now = new Date();
         return DateFormatUtils.format(now, "yyyy/MM/dd");
     }
@@ -97,8 +85,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 日期路径 即年/月/日 如20180808
      */
-    public static final String dateTime()
+    public static final String dateTime() {
-    {
         Date now = new Date();
         return DateFormatUtils.format(now, "yyyyMMdd");
     }
@@ -106,18 +93,13 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 日期型字符串转化为日期 格式
      */
-    public static Date parseDate(Object str)
+    public static Date parseDate(Object str) {
-    {
+        if (str == null) {
-        if (str == null)
-        {
             return null;
         }
-        try
+        try {
-        {
             return parseDate(str.toString(), parsePatterns);
-        }
+        } catch (ParseException e) {
-        catch (ParseException e)
-        {
             return null;
         }
     }
@@ -125,8 +107,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 获取服务器启动时间
      */
-    public static Date getServerStartDate()
+    public static Date getServerStartDate() {
-    {
         long time = ManagementFactory.getRuntimeMXBean().getStartTime();
         return new Date(time);
     }
@@ -134,8 +115,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 计算两个时间差
      */
-    public static String getDatePoor(Date endDate, Date nowDate)
+    public static String getDatePoor(Date endDate, Date nowDate) {
-    {
         long nd = 1000 * 24 * 60 * 60;
         long nh = 1000 * 60 * 60;
         long nm = 1000 * 60;

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ExceptionUtil.java

@@ -1,40 +0,0 @@
-package com.ruoyi.common.core.utils;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import org.apache.commons.lang3.exception.ExceptionUtils;
-
-/**
- * 错误信息处理类。
- *
- * @author ruoyi
- */
-public class ExceptionUtil
-{
-    /**
-     * 获取exception的详细错误信息。
-     */
-    public static String getExceptionMessage(Throwable e)
-    {
-        StringWriter sw = new StringWriter();
-        e.printStackTrace(new PrintWriter(sw, true));
-        String str = sw.toString();
-        return str;
-    }
-
-    public static String getRootErrorMessage(Exception e)
-    {
-        Throwable root = ExceptionUtils.getRootCause(e);
-        root = (root == null ? e : root);
-        if (root == null)
-        {
-            return "";
-        }
-        String msg = root.getMessage();
-        if (msg == null)
-        {
-            return "null";
-        }
-        return StringUtils.defaultString(msg);
-    }
-}

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/IdUtils.java

@@ -1,51 +0,0 @@
-package com.ruoyi.common.core.utils;
-
-import com.ruoyi.common.core.text.UUID;
-
-/**
- * ID生成器工具类
- * 
- * @author ruoyi
- */
-public class IdUtils
-{
-    /**
-     * 获取随机UUID
-     * 
-     * @return 随机UUID
-     */
-    public static String randomUUID()
-    {
-        return UUID.randomUUID().toString();
-    }
-
-    /**
-     * 简化的UUID，去掉了横线
-     * 
-     * @return 简化的UUID，去掉了横线
-     */
-    public static String simpleUUID()
-    {
-        return UUID.randomUUID().toString(true);
-    }
-
-    /**
-     * 获取随机UUID，使用性能更好的ThreadLocalRandom生成UUID
-     * 
-     * @return 随机UUID
-     */
-    public static String fastUUID()
-    {
-        return UUID.fastUUID().toString();
-    }
-
-    /**
-     * 简化的UUID，去掉了横线，使用性能更好的ThreadLocalRandom生成UUID
-     * 
-     * @return 简化的UUID，去掉了横线
-     */
-    public static String fastSimpleUUID()
-    {
-        return UUID.fastUUID().toString(true);
-    }
-}

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/JsonUtils.java

@@ -71,7 +71,8 @@ public class JsonUtils {
             return null;
         }
         try {
-			return objectMapper.readValue(text, new TypeReference<Map<String, T>>() {});
+            return objectMapper.readValue(text, new TypeReference<Map<String, T>>() {
+            });
         } catch (IOException e) {
             throw new RuntimeException(e);
         }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/JwtUtils.java

@@ -1,12 +1,12 @@
 package com.ruoyi.common.core.utils;
 
+import cn.hutool.core.convert.Convert;
 import cn.hutool.json.JSONObject;
 import cn.hutool.jwt.JWTUtil;
 import cn.hutool.jwt.signers.JWTSigner;
 import cn.hutool.jwt.signers.JWTSignerUtil;
 import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.common.core.constant.TokenConstants;
-import com.ruoyi.common.core.text.Convert;
 
 import java.util.Map;
 
@@ -15,8 +15,7 @@ import java.util.Map;
  *
  * @author ruoyi
  */
-public class JwtUtils
+public class JwtUtils {
-{
     public static String secret = TokenConstants.SECRET;
 
     /**
@@ -25,8 +24,7 @@ public class JwtUtils
      * @param claims 数据声明
      * @return 令牌
      */
-    public static String createToken(Map<String, Object> claims)
+    public static String createToken(Map<String, Object> claims) {
-    {
         JWTSigner signer = JWTSignerUtil.hs512(secret.getBytes());
         String token = JWTUtil.createToken(claims, signer);
         return token;
@@ -38,8 +36,7 @@ public class JwtUtils
      * @param token 令牌
      * @return 数据声明
      */
-    public static JSONObject parseToken(String token)
+    public static JSONObject parseToken(String token) {
-    {
         JWTSigner signer = JWTSignerUtil.hs512(secret.getBytes());
         return JWTUtil.parseToken(token).setSigner(signer).getPayload().getClaimsJson();
     }
@@ -50,8 +47,7 @@ public class JwtUtils
      * @param token 令牌
      * @return 用户ID
      */
-    public static String getUserKey(String token)
+    public static String getUserKey(String token) {
-    {
         JSONObject claims = parseToken(token);
         return getValue(claims, SecurityConstants.USER_KEY);
     }
@@ -62,8 +58,7 @@ public class JwtUtils
      * @param claims 身份信息
      * @return 用户ID
      */
-    public static String getUserKey(JSONObject claims)
+    public static String getUserKey(JSONObject claims) {
-    {
         return getValue(claims, SecurityConstants.USER_KEY);
     }
 
@@ -73,8 +68,7 @@ public class JwtUtils
      * @param token 令牌
      * @return 用户ID
      */
-    public static String getUserId(String token)
+    public static String getUserId(String token) {
-    {
         JSONObject claims = parseToken(token);
         return getValue(claims, SecurityConstants.DETAILS_USER_ID);
     }
@@ -85,8 +79,7 @@ public class JwtUtils
      * @param claims 身份信息
      * @return 用户ID
      */
-    public static String getUserId(JSONObject claims)
+    public static String getUserId(JSONObject claims) {
-    {
         return getValue(claims, SecurityConstants.DETAILS_USER_ID);
     }
 
@@ -96,8 +89,7 @@ public class JwtUtils
      * @param token 令牌
      * @return 用户名
      */
-    public static String getUserName(String token)
+    public static String getUserName(String token) {
-    {
         JSONObject claims = parseToken(token);
         return getValue(claims, SecurityConstants.DETAILS_USERNAME);
     }
@@ -108,8 +100,7 @@ public class JwtUtils
      * @param claims 身份信息
      * @return 用户名
      */
-    public static String getUserName(JSONObject claims)
+    public static String getUserName(JSONObject claims) {
-    {
         return getValue(claims, SecurityConstants.DETAILS_USERNAME);
     }
 
@@ -120,8 +111,7 @@ public class JwtUtils
      * @param key    键
      * @return 值
      */
-    public static String getValue(JSONObject claims, String key)
+    public static String getValue(JSONObject claims, String key) {
-    {
         return Convert.toStr(claims.get(key), "");
     }
 }

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

@@ -10,18 +10,15 @@ import com.ruoyi.common.core.web.page.TableSupport;
  *
  * @author ruoyi
  */
-public class PageUtils extends PageHelper
+public class PageUtils extends PageHelper {
-{
     /**
      * 设置请求分页数据
      */
-    public static void startPage()
+    public static void startPage() {
-    {
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Integer pageNum = pageDomain.getPageNum();
         Integer pageSize = pageDomain.getPageSize();
-        if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize))
+        if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)) {
-        {
             String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
             PageHelper.startPage(pageNum, pageSize, orderBy);
         }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ReUtil.java

@@ -1,5 +1,8 @@
 package com.ruoyi.common.core.utils;
 
+
+import cn.hutool.core.convert.Convert;
+
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
@@ -7,18 +10,15 @@ import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import com.ruoyi.common.core.text.Convert;
+public class ReUtil {
-import com.ruoyi.common.core.utils.StringUtils;
-
-public class ReUtil
-{
     public final static Pattern GROUP_VAR = Pattern.compile("\\$(\\d+)");
 
     /**
      * 正则中需要被转义的关键字
      */
     public final static Set<Character> RE_KEYS = new HashSet<>(
-            Arrays.asList('$', '(', ')', '*', '+', '.', '[', ']', '?', '\\', '^', '{', '}', '|'));;
+            Arrays.asList('$', '(', ')', '*', '+', '.', '[', ']', '?', '\\', '^', '{', '}', '|'));
+    ;
 
     /**
      * 正则替换指定值<br>
@@ -38,8 +38,7 @@ public class ReUtil
      * @param replacementTemplate 替换的文本模板，可以使用$1类似的变量提取正则匹配出的内容
      * @return 处理后的文本
      */
-    public static String replaceAll(CharSequence content, String regex, String replacementTemplate)
+    public static String replaceAll(CharSequence content, String regex, String replacementTemplate) {
-    {
         final Pattern pattern = Pattern.compile(regex, Pattern.DOTALL);
         return replaceAll(content, pattern, replacementTemplate);
     }
@@ -54,24 +53,19 @@ public class ReUtil
      * @return 处理后的文本
      * @since 3.0.4
      */
-    public static String replaceAll(CharSequence content, Pattern pattern, String replacementTemplate)
+    public static String replaceAll(CharSequence content, Pattern pattern, String replacementTemplate) {
-    {
+        if (StringUtils.isEmpty(content)) {
-        if (StringUtils.isEmpty(content))
-        {
             return StringUtils.EMPTY;
         }
 
         final Matcher matcher = pattern.matcher(content);
         boolean result = matcher.find();
-        if (result)
+        if (result) {
-        {
             final Set<String> varNums = findAll(GROUP_VAR, replacementTemplate, 1, new HashSet<>());
             final StringBuffer sb = new StringBuffer();
-            do
+            do {
-            {
                 String replacement = replacementTemplate;
-                for (String var : varNums)
+                for (String var : varNums) {
-                {
                     int group = Integer.parseInt(var);
                     replacement = replacement.replace("$" + var, matcher.group(group));
                 }
@@ -96,21 +90,17 @@ public class ReUtil
      * @return 结果集
      */
     public static <T extends Collection<String>> T findAll(Pattern pattern, CharSequence content, int group,
-            T collection)
+                                                           T collection) {
-    {
+        if (null == pattern || null == content) {
-        if (null == pattern || null == content)
-        {
             return null;
         }
 
-        if (null == collection)
+        if (null == collection) {
-        {
             throw new NullPointerException("Null collection param provided!");
         }
 
         final Matcher matcher = pattern.matcher(content);
-        while (matcher.find())
+        while (matcher.find()) {
-        {
             collection.add(matcher.group(group));
         }
         return collection;
@@ -122,11 +112,9 @@ public class ReUtil
      * @param c 字符
      * @return 转义后的文本
      */
-    public static String escape(char c)
+    public static String escape(char c) {
-    {
         final StringBuilder builder = new StringBuilder();
-        if (RE_KEYS.contains(c))
+        if (RE_KEYS.contains(c)) {
-        {
             builder.append('\\');
         }
         builder.append(c);
@@ -139,21 +127,17 @@ public class ReUtil
      * @param content 文本
      * @return 转义后的文本
      */
-    public static String escape(CharSequence content)
+    public static String escape(CharSequence content) {
-    {
+        if (StringUtils.isBlank(content)) {
-        if (StringUtils.isBlank(content))
-        {
             return StringUtils.EMPTY;
         }
 
         final StringBuilder builder = new StringBuilder();
         int len = content.length();
         char current;
-        for (int i = 0; i < len; i++)
+        for (int i = 0; i < len; i++) {
-        {
             current = content.charAt(i);
-            if (RE_KEYS.contains(current))
+            if (RE_KEYS.contains(current)) {
-            {
                 builder.append('\\');
             }
             builder.append(current);

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java

@@ -1,15 +1,8 @@
 package com.ruoyi.common.core.utils;
 
-import java.io.IOException;
+import cn.hutool.core.convert.Convert;
-import java.io.UnsupportedEncodingException;
+import com.ruoyi.common.core.constant.Constants;
-import java.net.URLDecoder;
+import com.ruoyi.common.core.domain.R;
-import java.net.URLEncoder;
-import java.util.Enumeration;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
 import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
@@ -18,77 +11,74 @@ import org.springframework.http.server.reactive.ServerHttpResponse;
 import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import com.ruoyi.common.core.constant.Constants;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.text.Convert;
 import reactor.core.publisher.Mono;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.util.Enumeration;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
 /**
  * 客户端工具类
  *
  * @author ruoyi
  */
-public class ServletUtils
+public class ServletUtils {
-{
     /**
      * 获取String参数
      */
-    public static String getParameter(String name)
+    public static String getParameter(String name) {
-    {
         return getRequest().getParameter(name);
     }
 
     /**
      * 获取String参数
      */
-    public static String getParameter(String name, String defaultValue)
+    public static String getParameter(String name, String defaultValue) {
-    {
         return Convert.toStr(getRequest().getParameter(name), defaultValue);
     }
 
     /**
      * 获取Integer参数
      */
-    public static Integer getParameterToInt(String name)
+    public static Integer getParameterToInt(String name) {
-    {
         return Convert.toInt(getRequest().getParameter(name));
     }
 
     /**
      * 获取Integer参数
      */
-    public static Integer getParameterToInt(String name, Integer defaultValue)
+    public static Integer getParameterToInt(String name, Integer defaultValue) {
-    {
         return Convert.toInt(getRequest().getParameter(name), defaultValue);
     }
 
     /**
      * 获取Boolean参数
      */
-    public static Boolean getParameterToBool(String name)
+    public static Boolean getParameterToBool(String name) {
-    {
         return Convert.toBool(getRequest().getParameter(name));
     }
 
     /**
      * 获取Boolean参数
      */
-    public static Boolean getParameterToBool(String name, Boolean defaultValue)
+    public static Boolean getParameterToBool(String name, Boolean defaultValue) {
-    {
         return Convert.toBool(getRequest().getParameter(name), defaultValue);
     }
 
     /**
      * 获取request
      */
-    public static HttpServletRequest getRequest()
+    public static HttpServletRequest getRequest() {
-    {
+        try {
-        try
-        {
             return getRequestAttributes().getRequest();
-        }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
             return null;
         }
     }
@@ -96,14 +86,10 @@ public class ServletUtils
     /**
      * 获取response
      */
-    public static HttpServletResponse getResponse()
+    public static HttpServletResponse getResponse() {
-    {
+        try {
-        try
-        {
             return getRequestAttributes().getResponse();
-        }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
             return null;
         }
     }
@@ -111,42 +97,32 @@ public class ServletUtils
     /**
      * 获取session
      */
-    public static HttpSession getSession()
+    public static HttpSession getSession() {
-    {
         return getRequest().getSession();
     }
 
-    public static ServletRequestAttributes getRequestAttributes()
+    public static ServletRequestAttributes getRequestAttributes() {
-    {
+        try {
-        try
-        {
             RequestAttributes attributes = RequestContextHolder.getRequestAttributes();
             return (ServletRequestAttributes) attributes;
-        }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
             return null;
         }
     }
 
-    public static String getHeader(HttpServletRequest request, String name)
+    public static String getHeader(HttpServletRequest request, String name) {
-    {
         String value = request.getHeader(name);
-        if (StringUtils.isEmpty(value))
+        if (StringUtils.isEmpty(value)) {
-        {
             return StringUtils.EMPTY;
         }
         return urlDecode(value);
     }
 
-    public static Map<String, String> getHeaders(HttpServletRequest request)
+    public static Map<String, String> getHeaders(HttpServletRequest request) {
-    {
         Map<String, String> map = new LinkedHashMap<>();
         Enumeration<String> enumeration = request.getHeaderNames();
-        if (enumeration != null)
+        if (enumeration != null) {
-        {
+            while (enumeration.hasMoreElements()) {
-            while (enumeration.hasMoreElements())
-            {
                 String key = enumeration.nextElement();
                 String value = request.getHeader(key);
                 map.put(key, value);
@@ -162,17 +138,13 @@ public class ServletUtils
      * @param string   待渲染的字符串
      * @return null
      */
-    public static String renderString(HttpServletResponse response, String string)
+    public static String renderString(HttpServletResponse response, String string) {
-    {
+        try {
-        try
-        {
             response.setStatus(200);
             response.setContentType("application/json");
             response.setCharacterEncoding("utf-8");
             response.getWriter().print(string);
-        }
+        } catch (IOException e) {
-        catch (IOException e)
-        {
             e.printStackTrace();
         }
         return null;
@@ -183,29 +155,24 @@ public class ServletUtils
      *
      * @param request
      */
-    public static boolean isAjaxRequest(HttpServletRequest request)
+    public static boolean isAjaxRequest(HttpServletRequest request) {
-    {
         String accept = request.getHeader("accept");
-        if (accept != null && accept.indexOf("application/json") != -1)
+        if (accept != null && accept.indexOf("application/json") != -1) {
-        {
             return true;
         }
 
         String xRequestedWith = request.getHeader("X-Requested-With");
-        if (xRequestedWith != null && xRequestedWith.indexOf("XMLHttpRequest") != -1)
+        if (xRequestedWith != null && xRequestedWith.indexOf("XMLHttpRequest") != -1) {
-        {
             return true;
         }
 
         String uri = request.getRequestURI();
-        if (StringUtils.inStringIgnoreCase(uri, ".json", ".xml"))
+        if (StringUtils.inStringIgnoreCase(uri, ".json", ".xml")) {
-        {
             return true;
         }
 
         String ajax = request.getParameter("__ajax");
-        if (StringUtils.inStringIgnoreCase(ajax, "json", "xml"))
+        if (StringUtils.inStringIgnoreCase(ajax, "json", "xml")) {
-        {
             return true;
         }
         return false;
@@ -217,14 +184,10 @@ public class ServletUtils
      * @param str 内容
      * @return 编码后的内容
      */
-    public static String urlEncode(String str)
+    public static String urlEncode(String str) {
-    {
+        try {
-        try
-        {
             return URLEncoder.encode(str, Constants.UTF8);
-        }
+        } catch (UnsupportedEncodingException e) {
-        catch (UnsupportedEncodingException e)
-        {
             return StringUtils.EMPTY;
         }
     }
@@ -235,14 +198,10 @@ public class ServletUtils
      * @param str 内容
      * @return 解码后的内容
      */
-    public static String urlDecode(String str)
+    public static String urlDecode(String str) {
-    {
+        try {
-        try
-        {
             return URLDecoder.decode(str, Constants.UTF8);
-        }
+        } catch (UnsupportedEncodingException e) {
-        catch (UnsupportedEncodingException e)
-        {
             return StringUtils.EMPTY;
         }
     }
@@ -254,8 +213,7 @@ public class ServletUtils
      * @param value    响应内容
      * @return Mono<Void>
      */
-    public static Mono<Void> webFluxResponseWriter(ServerHttpResponse response, Object value)
+    public static Mono<Void> webFluxResponseWriter(ServerHttpResponse response, Object value) {
-    {
         return webFluxResponseWriter(response, HttpStatus.OK, value, R.FAIL);
     }
 
@@ -267,8 +225,7 @@ public class ServletUtils
      * @param value    响应内容
      * @return Mono<Void>
      */
-    public static Mono<Void> webFluxResponseWriter(ServerHttpResponse response, Object value, int code)
+    public static Mono<Void> webFluxResponseWriter(ServerHttpResponse response, Object value, int code) {
-    {
         return webFluxResponseWriter(response, HttpStatus.OK, value, code);
     }
 
@@ -281,8 +238,7 @@ public class ServletUtils
      * @param value    响应内容
      * @return Mono<Void>
      */
-    public static Mono<Void> webFluxResponseWriter(ServerHttpResponse response, HttpStatus status, Object value, int code)
+    public static Mono<Void> webFluxResponseWriter(ServerHttpResponse response, HttpStatus status, Object value, int code) {
-    {
         return webFluxResponseWriter(response, MediaType.APPLICATION_JSON_VALUE, status, value, code);
     }
 
@@ -296,8 +252,7 @@ public class ServletUtils
      * @param value       响应内容
      * @return Mono<Void>
      */
-    public static Mono<Void> webFluxResponseWriter(ServerHttpResponse response, String contentType, HttpStatus status, Object value, int code)
+    public static Mono<Void> webFluxResponseWriter(ServerHttpResponse response, String contentType, HttpStatus status, Object value, int code) {
-    {
         response.setStatusCode(status);
         response.getHeaders().add(HttpHeaders.CONTENT_TYPE, contentType);
         R<?> result = R.fail(code, value.toString());

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SpringUtils.java

@@ -1,56 +1,17 @@
 package com.ruoyi.common.core.utils;
 
+import cn.hutool.extra.spring.SpringUtil;
 import org.springframework.aop.framework.AopContext;
-import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
-import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.stereotype.Component;
 
 /**
- * spring工具类 方便在非spring管理环境中获取bean
+ * spring工具类
  *
- * @author ruoyi
+ * @author Lion Li
  */
 @Component
-public final class SpringUtils implements BeanFactoryPostProcessor
+public final class SpringUtils extends SpringUtil {
-{
-    /** Spring应用上下文环境 */
-    private static ConfigurableListableBeanFactory beanFactory;
-
-    @Override
-    public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException
-    {
-        SpringUtils.beanFactory = beanFactory;
-    }
-
-    /**
-     * 获取对象
-     *
-     * @param name
-     * @return Object 一个以所给名字注册的bean的实例
-     * @throws org.springframework.beans.BeansException
-     *
-     */
-    @SuppressWarnings("unchecked")
-    public static <T> T getBean(String name) throws BeansException
-    {
-        return (T) beanFactory.getBean(name);
-    }
-
-    /**
-     * 获取类型为requiredType的对象
-     *
-     * @param clz
-     * @return
-     * @throws org.springframework.beans.BeansException
-     *
-     */
-    public static <T> T getBean(Class<T> clz) throws BeansException
-    {
-        T result = (T) beanFactory.getBean(clz);
-        return result;
-    }
 
     /**
      * 如果BeanFactory包含一个与所给名称匹配的bean定义，则返回true
@@ -58,46 +19,36 @@ public final class SpringUtils implements BeanFactoryPostProcessor
      * @param name
      * @return boolean
      */
-    public static boolean containsBean(String name)
+    public static boolean containsBean(String name) {
-    {
+        return getBeanFactory().containsBean(name);
-        return beanFactory.containsBean(name);
     }
 
     /**
-     * 判断以给定名字注册的bean定义是一个singleton还是一个prototype。 如果与给定名字相应的bean定义没有被找到，将会抛出一个异常（NoSuchBeanDefinitionException）
+     * 判断以给定名字注册的bean定义是一个singleton还是一个prototype。
+     * 如果与给定名字相应的bean定义没有被找到，将会抛出一个异常（NoSuchBeanDefinitionException）
      *
      * @param name
      * @return boolean
-     * @throws org.springframework.beans.factory.NoSuchBeanDefinitionException
-     *
      */
-    public static boolean isSingleton(String name) throws NoSuchBeanDefinitionException
+    public static boolean isSingleton(String name) throws NoSuchBeanDefinitionException {
-    {
+        return getBeanFactory().isSingleton(name);
-        return beanFactory.isSingleton(name);
     }
 
     /**
      * @param name
      * @return Class 注册对象的类型
-     * @throws org.springframework.beans.factory.NoSuchBeanDefinitionException
-     *
      */
-    public static Class<?> getType(String name) throws NoSuchBeanDefinitionException
+    public static Class<?> getType(String name) throws NoSuchBeanDefinitionException {
-    {
+        return getBeanFactory().getType(name);
-        return beanFactory.getType(name);
     }
 
     /**
      * 如果给定的bean名字在bean定义中有别名，则返回这些别名
      *
      * @param name
-     * @return
-     * @throws org.springframework.beans.factory.NoSuchBeanDefinitionException
-     *
      */
-    public static String[] getAliases(String name) throws NoSuchBeanDefinitionException
+    public static String[] getAliases(String name) throws NoSuchBeanDefinitionException {
-    {
+        return getBeanFactory().getAliases(name);
-        return beanFactory.getAliases(name);
     }
 
     /**
@@ -107,8 +58,7 @@ public final class SpringUtils implements BeanFactoryPostProcessor
      * @return
      */
     @SuppressWarnings("unchecked")
-    public static <T> T getAopProxy(T invoker)
+    public static <T> T getAopProxy(T invoker) {
-    {
         return (T) AopContext.currentProxy();
     }
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java

@@ -1,24 +1,24 @@
 package com.ruoyi.common.core.utils;
 
-import java.util.Collection;
+import cn.hutool.core.collection.CollUtil;
-import java.util.List;
+import cn.hutool.core.lang.Validator;
-import java.util.Map;
+import cn.hutool.core.map.MapUtil;
-import org.springframework.util.AntPathMatcher;
+import cn.hutool.core.util.ArrayUtil;
-import com.ruoyi.common.core.constant.Constants;
+import cn.hutool.core.util.ObjectUtil;
-import com.ruoyi.common.core.text.StrFormatter;
+import cn.hutool.core.util.ReUtil;
+import cn.hutool.core.util.StrUtil;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
+import java.util.*;
 
 /**
  * 字符串工具类
  *
- * @author ruoyi
+ * @author Lion Li
  */
-public class StringUtils extends org.apache.commons.lang3.StringUtils
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
-{
+public class StringUtils extends org.apache.commons.lang3.StringUtils {
-    /** 空字符串 */
-    private static final String NULLSTR = "";
-
-    /** 下划线 */
-    private static final char SEPARATOR = '_';
 
 	/**
 	 * 获取参数不为空值
@@ -26,9 +26,18 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
 	 * @param value defaultValue 要判断的value
 	 * @return value 返回值
 	 */
-    public static <T> T nvl(T value, T defaultValue)
+	public static <T> T nvl(T value, T defaultValue) {
-    {
+		return ObjectUtil.defaultIfNull(value, defaultValue);
-        return value != null ? value : defaultValue;
+	}
+
+	/**
+	 * 获取参数不为空值
+	 *
+	 * @param str defaultValue 要判断的value
+	 * @return value 返回值
+	 */
+	public static String blankToDefault(String str, String defaultValue) {
+		return StrUtil.blankToDefault(str, defaultValue);
 	}
 
 	/**
@@ -37,9 +46,8 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
 	 * @param coll 要判断的Collection
 	 * @return true：为空 false：非空
 	 */
-    public static boolean isEmpty(Collection<?> coll)
+	public static boolean isEmpty(Collection<?> coll) {
-    {
+		return CollUtil.isEmpty(coll);
-        return isNull(coll) || coll.isEmpty();
 	}
 
 	/**
@@ -48,8 +56,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
 	 * @param coll 要判断的Collection
 	 * @return true：非空 false：空
 	 */
-    public static boolean isNotEmpty(Collection<?> coll)
+	public static boolean isNotEmpty(Collection<?> coll) {
-    {
 		return !isEmpty(coll);
 	}
 
@@ -59,9 +66,8 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
 	 * @param objects 要判断的对象数组
 	 *                * @return true：为空 false：非空
 	 */
-    public static boolean isEmpty(Object[] objects)
+	public static boolean isEmpty(Object[] objects) {
-    {
+		return ArrayUtil.isEmpty(objects);
-        return isNull(objects) || (objects.length == 0);
 	}
 
 	/**
@@ -70,20 +76,38 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
 	 * @param objects 要判断的对象数组
 	 * @return true：非空 false：空
 	 */
-    public static boolean isNotEmpty(Object[] objects)
+	public static boolean isNotEmpty(Object[] objects) {
-    {
 		return !isEmpty(objects);
 	}
 
+	/**
+	 * * 判断一个对象是否为空
+	 *
+	 * @param object 要判断的对象数组
+	 *                * @return true：为空 false：非空
+	 */
+	public static boolean isEmpty(Object object) {
+		return ObjectUtil.isEmpty(object);
+	}
+
+	/**
+	 * * 判断一个对象是否非空
+	 *
+	 * @param object 要判断的对象数组
+	 * @return true：非空 false：空
+	 */
+	public static boolean isNotEmpty(Object object) {
+		return !isEmpty(object);
+	}
+
 	/**
 	 * * 判断一个Map是否为空
 	 *
 	 * @param map 要判断的Map
 	 * @return true：为空 false：非空
 	 */
-    public static boolean isEmpty(Map<?, ?> map)
+	public static boolean isEmpty(Map<?, ?> map) {
-    {
+		return MapUtil.isEmpty(map);
-        return isNull(map) || map.isEmpty();
 	}
 
 	/**
@@ -92,8 +116,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
 	 * @param map 要判断的Map
 	 * @return true：非空 false：空
 	 */
-    public static boolean isNotEmpty(Map<?, ?> map)
+	public static boolean isNotEmpty(Map<?, ?> map) {
-    {
 		return !isEmpty(map);
 	}
 
@@ -103,9 +126,8 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
 	 * @param str String
 	 * @return true：为空 false：非空
 	 */
-    public static boolean isEmpty(String str)
+	public static boolean isEmpty(String str) {
-    {
+		return StrUtil.isEmpty(str);
-        return isNull(str) || NULLSTR.equals(str.trim());
 	}
 
 	/**
@@ -114,8 +136,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
 	 * @param str String
 	 * @return true：非空串 false：空串
 	 */
-    public static boolean isNotEmpty(String str)
+	public static boolean isNotEmpty(String str) {
-    {
 		return !isEmpty(str);
 	}
 
@@ -125,9 +146,8 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
 	 * @param object Object
 	 * @return true：为空 false：非空
 	 */
-    public static boolean isNull(Object object)
+	public static boolean isNull(Object object) {
-    {
+		return ObjectUtil.isNull(object);
-        return object == null;
 	}
 
 	/**
@@ -136,8 +156,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
 	 * @param object Object
 	 * @return true：非空 false：空
 	 */
-    public static boolean isNotNull(Object object)
+	public static boolean isNotNull(Object object) {
-    {
 		return !isNull(object);
 	}
 
@@ -147,17 +166,15 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
 	 * @param object 对象
 	 * @return true：是数组 false：不是数组
 	 */
-    public static boolean isArray(Object object)
+	public static boolean isArray(Object object) {
-    {
+		return ArrayUtil.isArray(object);
-        return isNotNull(object) && object.getClass().isArray();
 	}
 
 	/**
 	 * 去空格
 	 */
-    public static String trim(String str)
+	public static String trim(String str) {
-    {
+		return StrUtil.trim(str);
-        return (str == null ? "" : str.trim());
 	}
 
 	/**
@@ -167,28 +184,8 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
 	 * @param start 开始
 	 * @return 结果
 	 */
-    public static String substring(final String str, int start)
+	public static String substring(final String str, int start) {
-    {
+		return substring(str, start, str.length());
-        if (str == null)
-        {
-            return NULLSTR;
-        }
-
-        if (start < 0)
-        {
-            start = str.length() + start;
-        }
-
-        if (start < 0)
-        {
-            start = 0;
-        }
-        if (start > str.length())
-        {
-            return NULLSTR;
-        }
-
-        return str.substring(start);
 	}
 
 	/**
@@ -199,66 +196,8 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
 	 * @param end   结束
 	 * @return 结果
 	 */
-    public static String substring(final String str, int start, int end)
+	public static String substring(final String str, int start, int end) {
-    {
+		return StrUtil.sub(str, start, end);
-        if (str == null)
-        {
-            return NULLSTR;
-        }
-
-        if (end < 0)
-        {
-            end = str.length() + end;
-        }
-        if (start < 0)
-        {
-            start = str.length() + start;
-        }
-
-        if (end > str.length())
-        {
-            end = str.length();
-        }
-
-        if (start > end)
-        {
-            return NULLSTR;
-        }
-
-        if (start < 0)
-        {
-            start = 0;
-        }
-        if (end < 0)
-        {
-            end = 0;
-        }
-
-        return str.substring(start, end);
-    }
-
-    /**
-     * 判断是否为空，并且不是空白字符
-     * 
-     * @param str 要判断的value
-     * @return 结果
-     */
-    public static boolean hasText(String str)
-    {
-        return (str != null && !str.isEmpty() && containsText(str));
-    }
-
-    private static boolean containsText(CharSequence str)
-    {
-        int strLen = str.length();
-        for (int i = 0; i < strLen; i++)
-        {
-            if (!Character.isWhitespace(str.charAt(i)))
-            {
-                return true;
-            }
-        }
-        return false;
 	}
 
 	/**
@@ -274,13 +213,8 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
 	 * @param params   参数值
 	 * @return 格式化后的文本
 	 */
-    public static String format(String template, Object... params)
+	public static String format(String template, Object... params) {
-    {
+		return StrUtil.format(template, params);
-        if (isEmpty(params) || isEmpty(template))
-        {
-            return template;
-        }
-        return StrFormatter.format(template, params);
 	}
 
 	/**
@@ -289,58 +223,70 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
 	 * @param link 链接
 	 * @return 结果
 	 */
-    public static boolean ishttp(String link)
+	public static boolean ishttp(String link) {
-    {
+		return Validator.isUrl(link);
-        return StringUtils.startsWithAny(link, Constants.HTTP, Constants.HTTPS);
+	}
+
+	/**
+	 * 字符串转set
+	 *
+	 * @param str 字符串
+	 * @param sep 分隔符
+	 * @return set集合
+	 */
+	public static Set<String> str2Set(String str, String sep) {
+		return new HashSet<>(str2List(str, sep, true, false));
+	}
+
+	/**
+	 * 字符串转list
+	 *
+	 * @param str         字符串
+	 * @param sep         分隔符
+	 * @param filterBlank 过滤纯空白
+	 * @param trim        去掉首尾空白
+	 * @return list集合
+	 */
+	public static List<String> str2List(String str, String sep, boolean filterBlank, boolean trim) {
+		List<String> list = new ArrayList<>();
+		if (isEmpty(str)) {
+			return list;
+		}
+
+		// 过滤空白字符串
+		if (filterBlank && isBlank(str)) {
+			return list;
+		}
+		String[] split = str.split(sep);
+		for (String string : split) {
+			if (filterBlank && isBlank(string)) {
+				continue;
+			}
+			if (trim) {
+				string = trim(string);
+			}
+			list.add(string);
+		}
+
+		return list;
+	}
+
+	/**
+	 * 查找指定字符串是否包含指定字符串列表中的任意一个字符串同时串忽略大小写
+	 *
+	 * @param cs                  指定字符串
+	 * @param searchCharSequences 需要检查的字符串数组
+	 * @return 是否包含任意一个字符串
+	 */
+	public static boolean containsAnyIgnoreCase(CharSequence cs, CharSequence... searchCharSequences) {
+		return StrUtil.containsAnyIgnoreCase(cs, searchCharSequences);
 	}
 
 	/**
 	 * 驼峰转下划线命名
 	 */
-    public static String toUnderScoreCase(String str)
+	public static String toUnderScoreCase(String str) {
-    {
+		return StrUtil.toUnderlineCase(str);
-        if (str == null)
-        {
-            return null;
-        }
-        StringBuilder sb = new StringBuilder();
-        // 前置字符是否大写
-        boolean preCharIsUpperCase = true;
-        // 当前字符是否大写
-        boolean curreCharIsUpperCase = true;
-        // 下一字符是否大写
-        boolean nexteCharIsUpperCase = true;
-        for (int i = 0; i < str.length(); i++)
-        {
-            char c = str.charAt(i);
-            if (i > 0)
-            {
-                preCharIsUpperCase = Character.isUpperCase(str.charAt(i - 1));
-            }
-            else
-            {
-                preCharIsUpperCase = false;
-            }
-
-            curreCharIsUpperCase = Character.isUpperCase(c);
-
-            if (i < (str.length() - 1))
-            {
-                nexteCharIsUpperCase = Character.isUpperCase(str.charAt(i + 1));
-            }
-
-            if (preCharIsUpperCase && curreCharIsUpperCase && !nexteCharIsUpperCase)
-            {
-                sb.append(SEPARATOR);
-            }
-            else if ((i != 0 && !preCharIsUpperCase) && curreCharIsUpperCase)
-            {
-                sb.append(SEPARATOR);
-            }
-            sb.append(Character.toLowerCase(c));
-        }
-
-        return sb.toString();
 	}
 
 	/**
@@ -350,19 +296,8 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
 	 * @param strs 字符串组
 	 * @return 包含返回true
 	 */
-    public static boolean inStringIgnoreCase(String str, String... strs)
+	public static boolean inStringIgnoreCase(String str, String... strs) {
-    {
+		return StrUtil.equalsAnyIgnoreCase(str, strs);
-        if (str != null && strs != null)
-        {
-            for (String s : strs)
-            {
-                if (str.equalsIgnoreCase(trim(s)))
-                {
-                    return true;
-                }
-            }
-        }
-        return false;
 	}
 
 	/**
@@ -371,67 +306,15 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
 	 * @param name 转换前的下划线大写方式命名的字符串
 	 * @return 转换后的驼峰式命名的字符串
 	 */
-    public static String convertToCamelCase(String name)
+	public static String convertToCamelCase(String name) {
-    {
+		return StrUtil.upperFirst(StrUtil.toCamelCase(name));
-        StringBuilder result = new StringBuilder();
-        // 快速检查
-        if (name == null || name.isEmpty())
-        {
-            // 没必要转换
-            return "";
-        }
-        else if (!name.contains("_"))
-        {
-            // 不含下划线，仅将首字母大写
-            return name.substring(0, 1).toUpperCase() + name.substring(1);
-        }
-        // 用下划线将原始字符串分割
-        String[] camels = name.split("_");
-        for (String camel : camels)
-        {
-            // 跳过原始字符串中开头、结尾的下换线或双重下划线
-            if (camel.isEmpty())
-            {
-                continue;
-            }
-            // 首字母大写
-            result.append(camel.substring(0, 1).toUpperCase());
-            result.append(camel.substring(1).toLowerCase());
-        }
-        return result.toString();
 	}
 
 	/**
 	 * 驼峰式命名法 例如：user_name->userName
 	 */
-    public static String toCamelCase(String s)
+	public static String toCamelCase(String s) {
-    {
+		return StrUtil.toCamelCase(s);
-        if (s == null)
-        {
-            return null;
-        }
-        s = s.toLowerCase();
-        StringBuilder sb = new StringBuilder(s.length());
-        boolean upperCase = false;
-        for (int i = 0; i < s.length(); i++)
-        {
-            char c = s.charAt(i);
-
-            if (c == SEPARATOR)
-            {
-                upperCase = true;
-            }
-            else if (upperCase)
-            {
-                sb.append(Character.toUpperCase(c));
-                upperCase = false;
-            }
-            else
-            {
-                sb.append(c);
-            }
-        }
-        return sb.toString();
 	}
 
 	/**
@@ -441,16 +324,12 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
 	 * @param strs 需要检查的字符串数组
 	 * @return 是否匹配
 	 */
-    public static boolean matches(String str, List<String> strs)
+	public static boolean matches(String str, List<String> strs) {
-    {
+		if (isEmpty(str) || isEmpty(strs)) {
-        if (isEmpty(str) || isEmpty(strs))
-        {
 			return false;
 		}
-        for (String pattern : strs)
+		for (String pattern : strs) {
-        {
+			if (isMatch(pattern, str)) {
-            if (isMatch(pattern, str))
-            {
 				return true;
 			}
 		}
@@ -467,15 +346,12 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
 	 * @param url     需要匹配的url
 	 * @return
 	 */
-    public static boolean isMatch(String pattern, String url)
+	public static boolean isMatch(String pattern, String url) {
-    {
+		return ReUtil.isMatch(pattern, url);
-        AntPathMatcher matcher = new AntPathMatcher();
-        return matcher.match(pattern, url);
 	}
 
 	@SuppressWarnings("unchecked")
-    public static <T> T cast(Object obj)
+	public static <T> T cast(Object obj) {
-    {
 		return (T) obj;
 	}
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanUtils.java

@@ -11,15 +11,20 @@ import java.util.regex.Pattern;
  *
  * @author ruoyi
  */
-public class BeanUtils extends org.springframework.beans.BeanUtils
+public class BeanUtils extends org.springframework.beans.BeanUtils {
-{
+    /**
-    /** Bean方法名中属性名开始的下标 */
+     * Bean方法名中属性名开始的下标
+     */
     private static final int BEAN_METHOD_PROP_INDEX = 3;
 
-    /** * 匹配getter方法的正则表达式 */
+    /**
+     * 匹配getter方法的正则表达式
+     */
     private static final Pattern GET_PATTERN = Pattern.compile("get(\\p{javaUpperCase}\\w*)");
 
-    /** * 匹配setter方法的正则表达式 */
+    /**
+     * 匹配setter方法的正则表达式
+     */
     private static final Pattern SET_PATTERN = Pattern.compile("set(\\p{javaUpperCase}\\w*)");
 
     /**
@@ -28,14 +33,10 @@ public class BeanUtils extends org.springframework.beans.BeanUtils
      * @param dest 目标对象
      * @param src  源对象
      */
-    public static void copyBeanProp(Object dest, Object src)
+    public static void copyBeanProp(Object dest, Object src) {
-    {
+        try {
-        try
-        {
             copyProperties(src, dest);
-        }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
             e.printStackTrace();
         }
     }
@@ -46,8 +47,7 @@ public class BeanUtils extends org.springframework.beans.BeanUtils
      * @param obj 对象
      * @return 对象的setter方法列表
      */
-    public static List<Method> getSetterMethods(Object obj)
+    public static List<Method> getSetterMethods(Object obj) {
-    {
         // setter方法列表
         List<Method> setterMethods = new ArrayList<Method>();
 
@@ -56,11 +56,9 @@ public class BeanUtils extends org.springframework.beans.BeanUtils
 
         // 查找setter方法
 
-        for (Method method : methods)
+        for (Method method : methods) {
-        {
             Matcher m = SET_PATTERN.matcher(method.getName());
-            if (m.matches() && (method.getParameterTypes().length == 1))
+            if (m.matches() && (method.getParameterTypes().length == 1)) {
-            {
                 setterMethods.add(method);
             }
         }
@@ -75,18 +73,15 @@ public class BeanUtils extends org.springframework.beans.BeanUtils
      * @return 对象的getter方法列表
      */
 
-    public static List<Method> getGetterMethods(Object obj)
+    public static List<Method> getGetterMethods(Object obj) {
-    {
         // getter方法列表
         List<Method> getterMethods = new ArrayList<Method>();
         // 获取所有方法
         Method[] methods = obj.getClass().getMethods();
         // 查找getter方法
-        for (Method method : methods)
+        for (Method method : methods) {
-        {
             Matcher m = GET_PATTERN.matcher(method.getName());
-            if (m.matches() && (method.getParameterTypes().length == 0))
+            if (m.matches() && (method.getParameterTypes().length == 0)) {
-            {
                 getterMethods.add(method);
             }
         }
@@ -103,8 +98,7 @@ public class BeanUtils extends org.springframework.beans.BeanUtils
      * @return 属性名一样返回true，否则返回false
      */
 
-    public static boolean isMethodPropEquals(String m1, String m2)
+    public static boolean isMethodPropEquals(String m1, String m2) {
-    {
         return m1.substring(BEAN_METHOD_PROP_INDEX).equals(m2.substring(BEAN_METHOD_PROP_INDEX));
     }
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanValidators.java

@@ -1,23 +1,20 @@
 package com.ruoyi.common.core.utils.bean;
 
-import java.util.Set;
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
 import javax.validation.Validator;
+import java.util.Set;
 
 /**
  * bean对象属性验证
  *
  * @author ruoyi
  */
-public class BeanValidators
+public class BeanValidators {
-{
     public static void validateWithException(Validator validator, Object object, Class<?>... groups)
-            throws ConstraintViolationException
+            throws ConstraintViolationException {
-    {
         Set<ConstraintViolation<Object>> constraintViolations = validator.validate(object, groups);
-        if (!constraintViolations.isEmpty())
+        if (!constraintViolations.isEmpty()) {
-        {
             throw new ConstraintViolationException(constraintViolations);
         }
     }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileTypeUtils.java

@@ -1,15 +1,15 @@
 package com.ruoyi.common.core.utils.file;
 
-import java.io.File;
 import org.apache.commons.lang3.StringUtils;
 
+import java.io.File;
+
 /**
  * 文件类型工具类
  *
  * @author ruoyi
  */
-public class FileTypeUtils
+public class FileTypeUtils {
-{
     /**
      * 获取文件类型
      * <p>
@@ -18,10 +18,8 @@ public class FileTypeUtils
      * @param file 文件名
      * @return 后缀（不含".")
      */
-    public static String getFileType(File file)
+    public static String getFileType(File file) {
-    {
+        if (null == file) {
-        if (null == file)
-        {
             return StringUtils.EMPTY;
         }
         return getFileType(file.getName());
@@ -35,11 +33,9 @@ public class FileTypeUtils
      * @param fileName 文件名
      * @return 后缀（不含".")
      */
-    public static String getFileType(String fileName)
+    public static String getFileType(String fileName) {
-    {
         int separatorIndex = fileName.lastIndexOf(".");
-        if (separatorIndex < 0)
+        if (separatorIndex < 0) {
-        {
             return "";
         }
         return fileName.substring(separatorIndex + 1).toLowerCase();
@@ -51,24 +47,16 @@ public class FileTypeUtils
      * @param photoByte 文件字节码
      * @return 后缀（不含".")
      */
-    public static String getFileExtendName(byte[] photoByte)
+    public static String getFileExtendName(byte[] photoByte) {
-    {
         String strFileExtendName = "JPG";
         if ((photoByte[0] == 71) && (photoByte[1] == 73) && (photoByte[2] == 70) && (photoByte[3] == 56)
-                && ((photoByte[4] == 55) || (photoByte[4] == 57)) && (photoByte[5] == 97))
+                && ((photoByte[4] == 55) || (photoByte[4] == 57)) && (photoByte[5] == 97)) {
-        {
             strFileExtendName = "GIF";
-        }
+        } else if ((photoByte[6] == 74) && (photoByte[7] == 70) && (photoByte[8] == 73) && (photoByte[9] == 70)) {
-        else if ((photoByte[6] == 74) && (photoByte[7] == 70) && (photoByte[8] == 73) && (photoByte[9] == 70))
-        {
             strFileExtendName = "JPG";
-        }
+        } else if ((photoByte[0] == 66) && (photoByte[1] == 77)) {
-        else if ((photoByte[0] == 66) && (photoByte[1] == 77))
-        {
             strFileExtendName = "BMP";
-        }
+        } else if ((photoByte[1] == 80) && (photoByte[2] == 78) && (photoByte[3] == 71)) {
-        else if ((photoByte[1] == 80) && (photoByte[2] == 78) && (photoByte[3] == 71))
-        {
             strFileExtendName = "PNG";
         }
         return strFileExtendName;

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java

@@ -1,29 +1,28 @@
 package com.ruoyi.common.core.utils.file;
 
-import java.io.File;
+import com.ruoyi.common.core.utils.StringUtils;
-import java.io.FileInputStream;
+import org.apache.commons.lang3.ArrayUtils;
-import java.io.FileNotFoundException;
+
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.lang3.ArrayUtils;
+import java.io.*;
-import com.ruoyi.common.core.utils.StringUtils;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 
 /**
  * 文件处理工具类
  *
  * @author ruoyi
  */
-public class FileUtils
+public class FileUtils {
-{
+    /**
-    /** 字符常量：斜杠 {@code '/'} */
+     * 字符常量：斜杠 {@code '/'}
+     */
     public static final char SLASH = '/';
 
-    /** 字符常量：反斜杠 {@code '\\'} */
+    /**
+     * 字符常量：反斜杠 {@code '\\'}
+     */
     public static final char BACKSLASH = '\\';
 
     public static String FILENAME_PATTERN = "[a-zA-Z0-9_\\-\\|\\.\\u4e00-\\u9fa5]+";
@@ -35,49 +34,33 @@ public class FileUtils
      * @param os       输出流
      * @return
      */
-    public static void writeBytes(String filePath, OutputStream os) throws IOException
+    public static void writeBytes(String filePath, OutputStream os) throws IOException {
-    {
         FileInputStream fis = null;
-        try
+        try {
-        {
             File file = new File(filePath);
-            if (!file.exists())
+            if (!file.exists()) {
-            {
                 throw new FileNotFoundException(filePath);
             }
             fis = new FileInputStream(file);
             byte[] b = new byte[1024];
             int length;
-            while ((length = fis.read(b)) > 0)
+            while ((length = fis.read(b)) > 0) {
-            {
                 os.write(b, 0, length);
             }
-        }
+        } catch (IOException e) {
-        catch (IOException e)
-        {
             throw e;
-        }
+        } finally {
-        finally
+            if (os != null) {
-        {
+                try {
-            if (os != null)
-            {
-                try
-                {
                     os.close();
-                }
+                } catch (IOException e1) {
-                catch (IOException e1)
-                {
                     e1.printStackTrace();
                 }
             }
-            if (fis != null)
+            if (fis != null) {
-            {
+                try {
-                try
-                {
                     fis.close();
-                }
+                } catch (IOException e1) {
-                catch (IOException e1)
-                {
                     e1.printStackTrace();
                 }
             }
@@ -90,13 +73,11 @@ public class FileUtils
      * @param filePath 文件
      * @return
      */
-    public static boolean deleteFile(String filePath)
+    public static boolean deleteFile(String filePath) {
-    {
         boolean flag = false;
         File file = new File(filePath);
         // 路径为文件且不为空则进行删除
-        if (file.isFile() && file.exists())
+        if (file.isFile() && file.exists()) {
-        {
             file.delete();
             flag = true;
         }
@@ -109,8 +90,7 @@ public class FileUtils
      * @param filename 文件名称
      * @return true 正常 false 非法
      */
-    public static boolean isValidFilename(String filename)
+    public static boolean isValidFilename(String filename) {
-    {
         return filename.matches(FILENAME_PATTERN);
     }
 
@@ -120,17 +100,14 @@ public class FileUtils
      * @param resource 需要下载的文件
      * @return true 正常 false 非法
      */
-    public static boolean checkAllowDownload(String resource)
+    public static boolean checkAllowDownload(String resource) {
-    {
         // 禁止目录上跳级别
-        if (StringUtils.contains(resource, ".."))
+        if (StringUtils.contains(resource, "..")) {
-        {
             return false;
         }
 
         // 检查允许下载的文件规则
-        if (ArrayUtils.contains(MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION, FileTypeUtils.getFileType(resource)))
+        if (ArrayUtils.contains(MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION, FileTypeUtils.getFileType(resource))) {
-        {
             return true;
         }
 
@@ -145,28 +122,20 @@ public class FileUtils
      * @param fileName 文件名
      * @return 编码后的文件名
      */
-    public static String setFileDownloadHeader(HttpServletRequest request, String fileName) throws UnsupportedEncodingException
+    public static String setFileDownloadHeader(HttpServletRequest request, String fileName) throws UnsupportedEncodingException {
-    {
         final String agent = request.getHeader("USER-AGENT");
         String filename = fileName;
-        if (agent.contains("MSIE"))
+        if (agent.contains("MSIE")) {
-        {
             // IE浏览器
             filename = URLEncoder.encode(filename, "utf-8");
             filename = filename.replace("+", " ");
-        }
+        } else if (agent.contains("Firefox")) {
-        else if (agent.contains("Firefox"))
-        {
             // 火狐浏览器
             filename = new String(fileName.getBytes(), "ISO8859-1");
-        }
+        } else if (agent.contains("Chrome")) {
-        else if (agent.contains("Chrome"))
-        {
             // google浏览器
             filename = URLEncoder.encode(filename, "utf-8");
-        }
+        } else {
-        else
-        {
             // 其它浏览器
             filename = URLEncoder.encode(filename, "utf-8");
         }
@@ -179,30 +148,24 @@ public class FileUtils
      * @param filePath 文件
      * @return 文件名
      */
-    public static String getName(String filePath)
+    public static String getName(String filePath) {
-    {
+        if (null == filePath) {
-        if (null == filePath)
-        {
             return null;
         }
         int len = filePath.length();
-        if (0 == len)
+        if (0 == len) {
-        {
             return filePath;
         }
-        if (isFileSeparator(filePath.charAt(len - 1)))
+        if (isFileSeparator(filePath.charAt(len - 1))) {
-        {
             // 以分隔符结尾的去掉结尾分隔符
             len--;
         }
 
         int begin = 0;
         char c;
-        for (int i = len - 1; i > -1; i--)
+        for (int i = len - 1; i > -1; i--) {
-        {
             c = filePath.charAt(i);
-            if (isFileSeparator(c))
+            if (isFileSeparator(c)) {
-            {
                 // 查找最后一个路径分隔符（/或者\）
                 begin = i + 1;
                 break;
@@ -219,8 +182,7 @@ public class FileUtils
      * @param c 字符
      * @return 是否为Windows或者Linux（Unix）文件分隔符
      */
-    public static boolean isFileSeparator(char c)
+    public static boolean isFileSeparator(char c) {
-    {
         return SLASH == c || BACKSLASH == c;
     }
 
@@ -231,8 +193,7 @@ public class FileUtils
      * @param realFileName 真实文件名
      * @return
      */
-    public static void setAttachmentResponseHeader(HttpServletResponse response, String realFileName) throws UnsupportedEncodingException
+    public static void setAttachmentResponseHeader(HttpServletResponse response, String realFileName) throws UnsupportedEncodingException {
-    {
         String percentEncodedFileName = percentEncode(realFileName);
 
         StringBuilder contentDispositionValue = new StringBuilder();
@@ -253,8 +214,7 @@ public class FileUtils
      * @param s 需要百分号编码的字符串
      * @return 百分号编码后的字符串
      */
-    public static String percentEncode(String s) throws UnsupportedEncodingException
+    public static String percentEncode(String s) throws UnsupportedEncodingException {
-    {
         String encode = URLEncoder.encode(s, StandardCharsets.UTF_8.toString());
         return encode.replaceAll("\\+", "%20");
     }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java

@@ -1,52 +1,42 @@
 package com.ruoyi.common.core.utils.file;
 
+import org.apache.poi.util.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.Arrays;
-import org.apache.poi.util.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * 图片处理工具类
  *
  * @author ruoyi
  */
-public class ImageUtils
+public class ImageUtils {
-{
     private static final Logger log = LoggerFactory.getLogger(ImageUtils.class);
 
-    public static byte[] getImage(String imagePath)
+    public static byte[] getImage(String imagePath) {
-    {
         InputStream is = getFile(imagePath);
-        try
+        try {
-        {
             return IOUtils.toByteArray(is);
-        }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
             log.error("图片加载异常 {}", e);
             return null;
-        }
+        } finally {
-        finally
-        {
             IOUtils.closeQuietly(is);
         }
     }
 
-    public static InputStream getFile(String imagePath)
+    public static InputStream getFile(String imagePath) {
-    {
+        try {
-        try
-        {
             byte[] result = readFile(imagePath);
             result = Arrays.copyOf(result, result.length);
             return new ByteArrayInputStream(result);
-        }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
             log.error("获取图片异常 {}", e);
         }
         return null;
@@ -58,12 +48,10 @@ public class ImageUtils
      * @param key 地址
      * @return 字节数据
      */
-    public static byte[] readFile(String url)
+    public static byte[] readFile(String url) {
-    {
         InputStream in = null;
         ByteArrayOutputStream baos = null;
-        try
+        try {
-        {
             // 网络地址
             URL urlObj = new URL(url);
             URLConnection urlConnection = urlObj.openConnection();
@@ -72,14 +60,10 @@ public class ImageUtils
             urlConnection.setDoInput(true);
             in = urlConnection.getInputStream();
             return IOUtils.toByteArray(in);
-        }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
             log.error("访问文件异常 {}", e);
             return null;
-        }
+        } finally {
-        finally
-        {
             IOUtils.closeQuietly(in);
             IOUtils.closeQuietly(baos);
         }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/MimeTypeUtils.java

@@ -5,8 +5,7 @@ package com.ruoyi.common.core.utils.file;
  *
  * @author ruoyi
  */
-public class MimeTypeUtils
+public class MimeTypeUtils {
-{
     public static final String IMAGE_PNG = "image/png";
 
     public static final String IMAGE_JPG = "image/jpg";
@@ -38,10 +37,8 @@ public class MimeTypeUtils
             // pdf
             "pdf"};
 
-    public static String getExtension(String prefix)
+    public static String getExtension(String prefix) {
-    {
+        switch (prefix) {
-        switch (prefix)
-        {
             case IMAGE_PNG:
                 return "png";
             case IMAGE_JPG:

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java

@@ -1,167 +0,0 @@
-package com.ruoyi.common.core.utils.html;
-
-import com.ruoyi.common.core.utils.StringUtils;
-
-/**
- * 转义和反转义工具类
- * 
- * @author ruoyi
- */
-public class EscapeUtil
-{
-    public static final String RE_HTML_MARK = "(<[^<]*?>)|(<[\\s]*?/[^<]*?>)|(<[^<]*?/[\\s]*?>)";
-
-    private static final char[][] TEXT = new char[64][];
-
-    static
-    {
-        for (int i = 0; i < 64; i++)
-        {
-            TEXT[i] = new char[] { (char) i };
-        }
-
-        // special HTML characters
-        TEXT['\''] = "&#039;".toCharArray(); // 单引号
-        TEXT['"'] = "&#34;".toCharArray(); // 双引号
-        TEXT['&'] = "&#38;".toCharArray(); // &符
-        TEXT['<'] = "&#60;".toCharArray(); // 小于号
-        TEXT['>'] = "&#62;".toCharArray(); // 大于号
-    }
-
-    /**
-     * 转义文本中的HTML字符为安全的字符
-     * 
-     * @param text 被转义的文本
-     * @return 转义后的文本
-     */
-    public static String escape(String text)
-    {
-        return encode(text);
-    }
-
-    /**
-     * 还原被转义的HTML特殊字符
-     * 
-     * @param content 包含转义符的HTML内容
-     * @return 转换后的字符串
-     */
-    public static String unescape(String content)
-    {
-        return decode(content);
-    }
-
-    /**
-     * 清除所有HTML标签，但是不删除标签内的内容
-     * 
-     * @param content 文本
-     * @return 清除标签后的文本
-     */
-    public static String clean(String content)
-    {
-        return new HTMLFilter().filter(content);
-    }
-
-    /**
-     * Escape编码
-     * 
-     * @param text 被编码的文本
-     * @return 编码后的字符
-     */
-    private static String encode(String text)
-    {
-        if (StringUtils.isEmpty(text))
-        {
-            return StringUtils.EMPTY;
-        }
-
-        final StringBuilder tmp = new StringBuilder(text.length() * 6);
-        char c;
-        for (int i = 0; i < text.length(); i++)
-        {
-            c = text.charAt(i);
-            if (c < 256)
-            {
-                tmp.append("%");
-                if (c < 16)
-                {
-                    tmp.append("0");
-                }
-                tmp.append(Integer.toString(c, 16));
-            }
-            else
-            {
-                tmp.append("%u");
-                if (c <= 0xfff)
-                {
-                    // issue#I49JU8@Gitee
-                    tmp.append("0");
-                }
-                tmp.append(Integer.toString(c, 16));
-            }
-        }
-        return tmp.toString();
-    }
-
-    /**
-     * Escape解码
-     * 
-     * @param content 被转义的内容
-     * @return 解码后的字符串
-     */
-    public static String decode(String content)
-    {
-        if (StringUtils.isEmpty(content))
-        {
-            return content;
-        }
-
-        StringBuilder tmp = new StringBuilder(content.length());
-        int lastPos = 0, pos = 0;
-        char ch;
-        while (lastPos < content.length())
-        {
-            pos = content.indexOf("%", lastPos);
-            if (pos == lastPos)
-            {
-                if (content.charAt(pos + 1) == 'u')
-                {
-                    ch = (char) Integer.parseInt(content.substring(pos + 2, pos + 6), 16);
-                    tmp.append(ch);
-                    lastPos = pos + 6;
-                }
-                else
-                {
-                    ch = (char) Integer.parseInt(content.substring(pos + 1, pos + 3), 16);
-                    tmp.append(ch);
-                    lastPos = pos + 3;
-                }
-            }
-            else
-            {
-                if (pos == -1)
-                {
-                    tmp.append(content.substring(lastPos));
-                    lastPos = content.length();
-                }
-                else
-                {
-                    tmp.append(content.substring(lastPos, pos));
-                    lastPos = pos;
-                }
-            }
-        }
-        return tmp.toString();
-    }
-
-    public static void main(String[] args)
-    {
-        String html = "<script>alert(1);</script>";
-        String escape = EscapeUtil.escape(html);
-        // String html = "<scr<script>ipt>alert(\"XSS\")</scr<script>ipt>";
-        // String html = "<123";
-        // String html = "123>";
-        System.out.println("clean: " + EscapeUtil.clean(html));
-        System.out.println("escape: " + escape);
-        System.out.println("unescape: " + EscapeUtil.unescape(escape));
-    }
-}

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/HTMLFilter.java

@@ -1,570 +0,0 @@
-package com.ruoyi.common.core.utils.html;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * HTML过滤器，用于去除XSS漏洞隐患。
- *
- * @author ruoyi
- */
-public final class HTMLFilter
-{
-    /**
-     * regex flag union representing /si modifiers in php
-     **/
-    private static final int REGEX_FLAGS_SI = Pattern.CASE_INSENSITIVE | Pattern.DOTALL;
-    private static final Pattern P_COMMENTS = Pattern.compile("<!--(.*?)-->", Pattern.DOTALL);
-    private static final Pattern P_COMMENT = Pattern.compile("^!--(.*)--$", REGEX_FLAGS_SI);
-    private static final Pattern P_TAGS = Pattern.compile("<(.*?)>", Pattern.DOTALL);
-    private static final Pattern P_END_TAG = Pattern.compile("^/([a-z0-9]+)", REGEX_FLAGS_SI);
-    private static final Pattern P_START_TAG = Pattern.compile("^([a-z0-9]+)(.*?)(/?)$", REGEX_FLAGS_SI);
-    private static final Pattern P_QUOTED_ATTRIBUTES = Pattern.compile("([a-z0-9]+)=([\"'])(.*?)\\2", REGEX_FLAGS_SI);
-    private static final Pattern P_UNQUOTED_ATTRIBUTES = Pattern.compile("([a-z0-9]+)(=)([^\"\\s']+)", REGEX_FLAGS_SI);
-    private static final Pattern P_PROTOCOL = Pattern.compile("^([^:]+):", REGEX_FLAGS_SI);
-    private static final Pattern P_ENTITY = Pattern.compile("&#(\\d+);?");
-    private static final Pattern P_ENTITY_UNICODE = Pattern.compile("&#x([0-9a-f]+);?");
-    private static final Pattern P_ENCODE = Pattern.compile("%([0-9a-f]{2});?");
-    private static final Pattern P_VALID_ENTITIES = Pattern.compile("&([^&;]*)(?=(;|&|$))");
-    private static final Pattern P_VALID_QUOTES = Pattern.compile("(>|^)([^<]+?)(<|$)", Pattern.DOTALL);
-    private static final Pattern P_END_ARROW = Pattern.compile("^>");
-    private static final Pattern P_BODY_TO_END = Pattern.compile("<([^>]*?)(?=<|$)");
-    private static final Pattern P_XML_CONTENT = Pattern.compile("(^|>)([^<]*?)(?=>)");
-    private static final Pattern P_STRAY_LEFT_ARROW = Pattern.compile("<([^>]*?)(?=<|$)");
-    private static final Pattern P_STRAY_RIGHT_ARROW = Pattern.compile("(^|>)([^<]*?)(?=>)");
-    private static final Pattern P_AMP = Pattern.compile("&");
-    private static final Pattern P_QUOTE = Pattern.compile("\"");
-    private static final Pattern P_LEFT_ARROW = Pattern.compile("<");
-    private static final Pattern P_RIGHT_ARROW = Pattern.compile(">");
-    private static final Pattern P_BOTH_ARROWS = Pattern.compile("<>");
-
-    // @xxx could grow large... maybe use sesat's ReferenceMap
-    private static final ConcurrentMap<String, Pattern> P_REMOVE_PAIR_BLANKS = new ConcurrentHashMap<>();
-    private static final ConcurrentMap<String, Pattern> P_REMOVE_SELF_BLANKS = new ConcurrentHashMap<>();
-
-    /**
-     * set of allowed html elements, along with allowed attributes for each element
-     **/
-    private final Map<String, List<String>> vAllowed;
-    /**
-     * counts of open tags for each (allowable) html element
-     **/
-    private final Map<String, Integer> vTagCounts = new HashMap<>();
-
-    /**
-     * html elements which must always be self-closing (e.g. "<img />")
-     **/
-    private final String[] vSelfClosingTags;
-    /**
-     * html elements which must always have separate opening and closing tags (e.g. "<b></b>")
-     **/
-    private final String[] vNeedClosingTags;
-    /**
-     * set of disallowed html elements
-     **/
-    private final String[] vDisallowed;
-    /**
-     * attributes which should be checked for valid protocols
-     **/
-    private final String[] vProtocolAtts;
-    /**
-     * allowed protocols
-     **/
-    private final String[] vAllowedProtocols;
-    /**
-     * tags which should be removed if they contain no content (e.g. "<b></b>" or "<b />")
-     **/
-    private final String[] vRemoveBlanks;
-    /**
-     * entities allowed within html markup
-     **/
-    private final String[] vAllowedEntities;
-    /**
-     * flag determining whether comments are allowed in input String.
-     */
-    private final boolean stripComment;
-    private final boolean encodeQuotes;
-    /**
-     * flag determining whether to try to make tags when presented with "unbalanced" angle brackets (e.g. "<b text </b>"
-     * becomes "<b> text </b>"). If set to false, unbalanced angle brackets will be html escaped.
-     */
-    private final boolean alwaysMakeTags;
-
-    /**
-     * Default constructor.
-     */
-    public HTMLFilter()
-    {
-        vAllowed = new HashMap<>();
-
-        final ArrayList<String> a_atts = new ArrayList<>();
-        a_atts.add("href");
-        a_atts.add("target");
-        vAllowed.put("a", a_atts);
-
-        final ArrayList<String> img_atts = new ArrayList<>();
-        img_atts.add("src");
-        img_atts.add("width");
-        img_atts.add("height");
-        img_atts.add("alt");
-        vAllowed.put("img", img_atts);
-
-        final ArrayList<String> no_atts = new ArrayList<>();
-        vAllowed.put("b", no_atts);
-        vAllowed.put("strong", no_atts);
-        vAllowed.put("i", no_atts);
-        vAllowed.put("em", no_atts);
-
-        vSelfClosingTags = new String[] { "img" };
-        vNeedClosingTags = new String[] { "a", "b", "strong", "i", "em" };
-        vDisallowed = new String[] {};
-        vAllowedProtocols = new String[] { "http", "mailto", "https" }; // no ftp.
-        vProtocolAtts = new String[] { "src", "href" };
-        vRemoveBlanks = new String[] { "a", "b", "strong", "i", "em" };
-        vAllowedEntities = new String[] { "amp", "gt", "lt", "quot" };
-        stripComment = true;
-        encodeQuotes = true;
-        alwaysMakeTags = false;
-    }
-
-    /**
-     * Map-parameter configurable constructor.
-     *
-     * @param conf map containing configuration. keys match field names.
-     */
-    @SuppressWarnings("unchecked")
-    public HTMLFilter(final Map<String, Object> conf)
-    {
-
-        assert conf.containsKey("vAllowed") : "configuration requires vAllowed";
-        assert conf.containsKey("vSelfClosingTags") : "configuration requires vSelfClosingTags";
-        assert conf.containsKey("vNeedClosingTags") : "configuration requires vNeedClosingTags";
-        assert conf.containsKey("vDisallowed") : "configuration requires vDisallowed";
-        assert conf.containsKey("vAllowedProtocols") : "configuration requires vAllowedProtocols";
-        assert conf.containsKey("vProtocolAtts") : "configuration requires vProtocolAtts";
-        assert conf.containsKey("vRemoveBlanks") : "configuration requires vRemoveBlanks";
-        assert conf.containsKey("vAllowedEntities") : "configuration requires vAllowedEntities";
-
-        vAllowed = Collections.unmodifiableMap((HashMap<String, List<String>>) conf.get("vAllowed"));
-        vSelfClosingTags = (String[]) conf.get("vSelfClosingTags");
-        vNeedClosingTags = (String[]) conf.get("vNeedClosingTags");
-        vDisallowed = (String[]) conf.get("vDisallowed");
-        vAllowedProtocols = (String[]) conf.get("vAllowedProtocols");
-        vProtocolAtts = (String[]) conf.get("vProtocolAtts");
-        vRemoveBlanks = (String[]) conf.get("vRemoveBlanks");
-        vAllowedEntities = (String[]) conf.get("vAllowedEntities");
-        stripComment = conf.containsKey("stripComment") ? (Boolean) conf.get("stripComment") : true;
-        encodeQuotes = conf.containsKey("encodeQuotes") ? (Boolean) conf.get("encodeQuotes") : true;
-        alwaysMakeTags = conf.containsKey("alwaysMakeTags") ? (Boolean) conf.get("alwaysMakeTags") : true;
-    }
-
-    private void reset()
-    {
-        vTagCounts.clear();
-    }
-
-    // ---------------------------------------------------------------
-    // my versions of some PHP library functions
-    public static String chr(final int decimal)
-    {
-        return String.valueOf((char) decimal);
-    }
-
-    public static String htmlSpecialChars(final String s)
-    {
-        String result = s;
-        result = regexReplace(P_AMP, "&amp;", result);
-        result = regexReplace(P_QUOTE, "&quot;", result);
-        result = regexReplace(P_LEFT_ARROW, "&lt;", result);
-        result = regexReplace(P_RIGHT_ARROW, "&gt;", result);
-        return result;
-    }
-
-    // ---------------------------------------------------------------
-
-    /**
-     * given a user submitted input String, filter out any invalid or restricted html.
-     *
-     * @param input text (i.e. submitted by a user) than may contain html
-     * @return "clean" version of input, with only valid, whitelisted html elements allowed
-     */
-    public String filter(final String input)
-    {
-        reset();
-        String s = input;
-
-        s = escapeComments(s);
-
-        s = balanceHTML(s);
-
-        s = checkTags(s);
-
-        s = processRemoveBlanks(s);
-
-        // s = validateEntities(s);
-
-        return s;
-    }
-
-    public boolean isAlwaysMakeTags()
-    {
-        return alwaysMakeTags;
-    }
-
-    public boolean isStripComments()
-    {
-        return stripComment;
-    }
-
-    private String escapeComments(final String s)
-    {
-        final Matcher m = P_COMMENTS.matcher(s);
-        final StringBuffer buf = new StringBuffer();
-        if (m.find())
-        {
-            final String match = m.group(1); // (.*?)
-            m.appendReplacement(buf, Matcher.quoteReplacement("<!--" + htmlSpecialChars(match) + "-->"));
-        }
-        m.appendTail(buf);
-
-        return buf.toString();
-    }
-
-    private String balanceHTML(String s)
-    {
-        if (alwaysMakeTags)
-        {
-            //
-            // try and form html
-            //
-            s = regexReplace(P_END_ARROW, "", s);
-            // 不追加结束标签
-            s = regexReplace(P_BODY_TO_END, "<$1>", s);
-            s = regexReplace(P_XML_CONTENT, "$1<$2", s);
-
-        }
-        else
-        {
-            //
-            // escape stray brackets
-            //
-            s = regexReplace(P_STRAY_LEFT_ARROW, "&lt;$1", s);
-            s = regexReplace(P_STRAY_RIGHT_ARROW, "$1$2&gt;<", s);
-
-            //
-            // the last regexp causes '<>' entities to appear
-            // (we need to do a lookahead assertion so that the last bracket can
-            // be used in the next pass of the regexp)
-            //
-            s = regexReplace(P_BOTH_ARROWS, "", s);
-        }
-
-        return s;
-    }
-
-    private String checkTags(String s)
-    {
-        Matcher m = P_TAGS.matcher(s);
-
-        final StringBuffer buf = new StringBuffer();
-        while (m.find())
-        {
-            String replaceStr = m.group(1);
-            replaceStr = processTag(replaceStr);
-            m.appendReplacement(buf, Matcher.quoteReplacement(replaceStr));
-        }
-        m.appendTail(buf);
-
-        // these get tallied in processTag
-        // (remember to reset before subsequent calls to filter method)
-        final StringBuilder sBuilder = new StringBuilder(buf.toString());
-        for (String key : vTagCounts.keySet())
-        {
-            for (int ii = 0; ii < vTagCounts.get(key); ii++)
-            {
-                sBuilder.append("</").append(key).append(">");
-            }
-        }
-        s = sBuilder.toString();
-
-        return s;
-    }
-
-    private String processRemoveBlanks(final String s)
-    {
-        String result = s;
-        for (String tag : vRemoveBlanks)
-        {
-            if (!P_REMOVE_PAIR_BLANKS.containsKey(tag))
-            {
-                P_REMOVE_PAIR_BLANKS.putIfAbsent(tag, Pattern.compile("<" + tag + "(\\s[^>]*)?></" + tag + ">"));
-            }
-            result = regexReplace(P_REMOVE_PAIR_BLANKS.get(tag), "", result);
-            if (!P_REMOVE_SELF_BLANKS.containsKey(tag))
-            {
-                P_REMOVE_SELF_BLANKS.putIfAbsent(tag, Pattern.compile("<" + tag + "(\\s[^>]*)?/>"));
-            }
-            result = regexReplace(P_REMOVE_SELF_BLANKS.get(tag), "", result);
-        }
-
-        return result;
-    }
-
-    private static String regexReplace(final Pattern regex_pattern, final String replacement, final String s)
-    {
-        Matcher m = regex_pattern.matcher(s);
-        return m.replaceAll(replacement);
-    }
-
-    private String processTag(final String s)
-    {
-        // ending tags
-        Matcher m = P_END_TAG.matcher(s);
-        if (m.find())
-        {
-            final String name = m.group(1).toLowerCase();
-            if (allowed(name))
-            {
-                if (false == inArray(name, vSelfClosingTags))
-                {
-                    if (vTagCounts.containsKey(name))
-                    {
-                        vTagCounts.put(name, vTagCounts.get(name) - 1);
-                        return "</" + name + ">";
-                    }
-                }
-            }
-        }
-
-        // starting tags
-        m = P_START_TAG.matcher(s);
-        if (m.find())
-        {
-            final String name = m.group(1).toLowerCase();
-            final String body = m.group(2);
-            String ending = m.group(3);
-
-            // debug( "in a starting tag, name='" + name + "'; body='" + body + "'; ending='" + ending + "'" );
-            if (allowed(name))
-            {
-                final StringBuilder params = new StringBuilder();
-
-                final Matcher m2 = P_QUOTED_ATTRIBUTES.matcher(body);
-                final Matcher m3 = P_UNQUOTED_ATTRIBUTES.matcher(body);
-                final List<String> paramNames = new ArrayList<>();
-                final List<String> paramValues = new ArrayList<>();
-                while (m2.find())
-                {
-                    paramNames.add(m2.group(1)); // ([a-z0-9]+)
-                    paramValues.add(m2.group(3)); // (.*?)
-                }
-                while (m3.find())
-                {
-                    paramNames.add(m3.group(1)); // ([a-z0-9]+)
-                    paramValues.add(m3.group(3)); // ([^\"\\s']+)
-                }
-
-                String paramName, paramValue;
-                for (int ii = 0; ii < paramNames.size(); ii++)
-                {
-                    paramName = paramNames.get(ii).toLowerCase();
-                    paramValue = paramValues.get(ii);
-
-                    // debug( "paramName='" + paramName + "'" );
-                    // debug( "paramValue='" + paramValue + "'" );
-                    // debug( "allowed? " + vAllowed.get( name ).contains( paramName ) );
-
-                    if (allowedAttribute(name, paramName))
-                    {
-                        if (inArray(paramName, vProtocolAtts))
-                        {
-                            paramValue = processParamProtocol(paramValue);
-                        }
-                        params.append(' ').append(paramName).append("=\\\"").append(paramValue).append("\"");
-                    }
-                }
-
-                if (inArray(name, vSelfClosingTags))
-                {
-                    ending = " /";
-                }
-
-                if (inArray(name, vNeedClosingTags))
-                {
-                    ending = "";
-                }
-
-                if (ending == null || ending.length() < 1)
-                {
-                    if (vTagCounts.containsKey(name))
-                    {
-                        vTagCounts.put(name, vTagCounts.get(name) + 1);
-                    }
-                    else
-                    {
-                        vTagCounts.put(name, 1);
-                    }
-                }
-                else
-                {
-                    ending = " /";
-                }
-                return "<" + name + params + ending + ">";
-            }
-            else
-            {
-                return "";
-            }
-        }
-
-        // comments
-        m = P_COMMENT.matcher(s);
-        if (!stripComment && m.find())
-        {
-            return "<" + m.group() + ">";
-        }
-
-        return "";
-    }
-
-    private String processParamProtocol(String s)
-    {
-        s = decodeEntities(s);
-        final Matcher m = P_PROTOCOL.matcher(s);
-        if (m.find())
-        {
-            final String protocol = m.group(1);
-            if (!inArray(protocol, vAllowedProtocols))
-            {
-                // bad protocol, turn into local anchor link instead
-                s = "#" + s.substring(protocol.length() + 1);
-                if (s.startsWith("#//"))
-                {
-                    s = "#" + s.substring(3);
-                }
-            }
-        }
-
-        return s;
-    }
-
-    private String decodeEntities(String s)
-    {
-        StringBuffer buf = new StringBuffer();
-
-        Matcher m = P_ENTITY.matcher(s);
-        while (m.find())
-        {
-            final String match = m.group(1);
-            final int decimal = Integer.decode(match).intValue();
-            m.appendReplacement(buf, Matcher.quoteReplacement(chr(decimal)));
-        }
-        m.appendTail(buf);
-        s = buf.toString();
-
-        buf = new StringBuffer();
-        m = P_ENTITY_UNICODE.matcher(s);
-        while (m.find())
-        {
-            final String match = m.group(1);
-            final int decimal = Integer.valueOf(match, 16).intValue();
-            m.appendReplacement(buf, Matcher.quoteReplacement(chr(decimal)));
-        }
-        m.appendTail(buf);
-        s = buf.toString();
-
-        buf = new StringBuffer();
-        m = P_ENCODE.matcher(s);
-        while (m.find())
-        {
-            final String match = m.group(1);
-            final int decimal = Integer.valueOf(match, 16).intValue();
-            m.appendReplacement(buf, Matcher.quoteReplacement(chr(decimal)));
-        }
-        m.appendTail(buf);
-        s = buf.toString();
-
-        s = validateEntities(s);
-        return s;
-    }
-
-    private String validateEntities(final String s)
-    {
-        StringBuffer buf = new StringBuffer();
-
-        // validate entities throughout the string
-        Matcher m = P_VALID_ENTITIES.matcher(s);
-        while (m.find())
-        {
-            final String one = m.group(1); // ([^&;]*)
-            final String two = m.group(2); // (?=(;|&|$))
-            m.appendReplacement(buf, Matcher.quoteReplacement(checkEntity(one, two)));
-        }
-        m.appendTail(buf);
-
-        return encodeQuotes(buf.toString());
-    }
-
-    private String encodeQuotes(final String s)
-    {
-        if (encodeQuotes)
-        {
-            StringBuffer buf = new StringBuffer();
-            Matcher m = P_VALID_QUOTES.matcher(s);
-            while (m.find())
-            {
-                final String one = m.group(1); // (>|^)
-                final String two = m.group(2); // ([^<]+?)
-                final String three = m.group(3); // (<|$)
-                // 不替换双引号为&quot;，防止json格式无效 regexReplace(P_QUOTE, "&quot;", two)
-                m.appendReplacement(buf, Matcher.quoteReplacement(one + two + three));
-            }
-            m.appendTail(buf);
-            return buf.toString();
-        }
-        else
-        {
-            return s;
-        }
-    }
-
-    private String checkEntity(final String preamble, final String term)
-    {
-
-        return ";".equals(term) && isValidEntity(preamble) ? '&' + preamble : "&amp;" + preamble;
-    }
-
-    private boolean isValidEntity(final String entity)
-    {
-        return inArray(entity, vAllowedEntities);
-    }
-
-    private static boolean inArray(final String s, final String[] array)
-    {
-        for (String item : array)
-        {
-            if (item != null && item.equals(s))
-            {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private boolean allowed(final String name)
-    {
-        return (vAllowed.isEmpty() || vAllowed.containsKey(name)) && !inArray(name, vDisallowed);
-    }
-
-    private boolean allowedAttribute(final String name, final String paramName)
-    {
-        return allowed(name) && (vAllowed.isEmpty() || vAllowed.get(name).contains(paramName));
-    }
-}

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java

@@ -1,21 +1,19 @@
 package com.ruoyi.common.core.utils.ip;
 
+import com.ruoyi.common.core.utils.StringUtils;
+
+import javax.servlet.http.HttpServletRequest;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
-import javax.servlet.http.HttpServletRequest;
-import com.ruoyi.common.core.utils.StringUtils;
 
 /**
  * 获取IP方法
  *
  * @author ruoyi
  */
-public class IpUtils
+public class IpUtils {
-{
+    public static String getIpAddr(HttpServletRequest request) {
-    public static String getIpAddr(HttpServletRequest request)
+        if (request == null) {
-    {
-        if (request == null)
-        {
             return null;
         }
 
@@ -23,51 +21,42 @@ public class IpUtils
 
         // X-Forwarded-For：Squid 服务代理
         String ipAddresses = request.getHeader("X-Forwarded-For");
-        if (ipAddresses == null || ipAddresses.length() == 0 || "unknown".equalsIgnoreCase(ipAddresses))
+        if (ipAddresses == null || ipAddresses.length() == 0 || "unknown".equalsIgnoreCase(ipAddresses)) {
-        {
             // Proxy-Client-IP：apache 服务代理
             ipAddresses = request.getHeader("Proxy-Client-IP");
         }
-        if (ipAddresses == null || ipAddresses.length() == 0 || "unknown".equalsIgnoreCase(ipAddresses))
+        if (ipAddresses == null || ipAddresses.length() == 0 || "unknown".equalsIgnoreCase(ipAddresses)) {
-        {
             // WL-Proxy-Client-IP：weblogic 服务代理
             ipAddresses = request.getHeader("WL-Proxy-Client-IP");
         }
-        if (ipAddresses == null || ipAddresses.length() == 0 || "unknown".equalsIgnoreCase(ipAddresses))
+        if (ipAddresses == null || ipAddresses.length() == 0 || "unknown".equalsIgnoreCase(ipAddresses)) {
-        {
             // HTTP_CLIENT_IP：有些代理服务器
             ipAddresses = request.getHeader("HTTP_CLIENT_IP");
         }
-        if (ipAddresses == null || ipAddresses.length() == 0 || "unknown".equalsIgnoreCase(ipAddresses))
+        if (ipAddresses == null || ipAddresses.length() == 0 || "unknown".equalsIgnoreCase(ipAddresses)) {
-        {
             // X-Real-IP：nginx服务代理
             ipAddresses = request.getHeader("X-Real-IP");
         }
 
         // 有些网络通过多层代理，那么获取到的ip就会有多个，一般都是通过逗号（,）分割开来，并且第一个ip为客户端的真实IP
-        if (ipAddresses != null && ipAddresses.length() != 0)
+        if (ipAddresses != null && ipAddresses.length() != 0) {
-        {
             ip = ipAddresses.split(",")[0];
         }
 
         // 还是不能获取到，最后再通过request.getRemoteAddr();获取
-        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ipAddresses))
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ipAddresses)) {
-        {
             ip = request.getRemoteAddr();
         }
         return ip.equals("0:0:0:0:0:0:0:1") ? "127.0.0.1" : ip;
     }
 
-    public static boolean internalIp(String ip)
+    public static boolean internalIp(String ip) {
-    {
         byte[] addr = textToNumericFormatV4(ip);
         return internalIp(addr) || "127.0.0.1".equals(ip);
     }
 
-    private static boolean internalIp(byte[] addr)
+    private static boolean internalIp(byte[] addr) {
-    {
+        if (StringUtils.isNull(addr) || addr.length < 2) {
-        if (StringUtils.isNull(addr) || addr.length < 2)
-        {
             return true;
         }
         final byte b0 = addr[0];
@@ -81,18 +70,15 @@ public class IpUtils
         // 192.168.x.x/16
         final byte SECTION_5 = (byte) 0xC0;
         final byte SECTION_6 = (byte) 0xA8;
-        switch (b0)
+        switch (b0) {
-        {
             case SECTION_1:
                 return true;
             case SECTION_2:
-                if (b1 >= SECTION_3 && b1 <= SECTION_4)
+                if (b1 >= SECTION_3 && b1 <= SECTION_4) {
-                {
                     return true;
                 }
             case SECTION_5:
-                switch (b1)
+                switch (b1) {
-                {
                     case SECTION_6:
                         return true;
                 }
@@ -107,21 +93,17 @@ public class IpUtils
      * @param text IPv4地址
      * @return byte 字节
      */
-    public static byte[] textToNumericFormatV4(String text)
+    public static byte[] textToNumericFormatV4(String text) {
-    {
+        if (text.length() == 0) {
-        if (text.length() == 0)
-        {
             return null;
         }
 
         byte[] bytes = new byte[4];
         String[] elements = text.split("\\.", -1);
-        try
+        try {
-        {
             long l;
             int i;
-            switch (elements.length)
+            switch (elements.length) {
-            {
                 case 1:
                     l = Long.parseLong(elements[0]);
                     if ((l < 0L) || (l > 4294967295L)) {
@@ -147,8 +129,7 @@ public class IpUtils
                     bytes[3] = (byte) (int) (l & 0xFF);
                     break;
                 case 3:
-                    for (i = 0; i < 2; ++i)
+                    for (i = 0; i < 2; ++i) {
-                    {
                         l = Integer.parseInt(elements[i]);
                         if ((l < 0L) || (l > 255L)) {
                             return null;
@@ -163,8 +144,7 @@ public class IpUtils
                     bytes[3] = (byte) (int) (l & 0xFF);
                     break;
                 case 4:
-                    for (i = 0; i < 4; ++i)
+                    for (i = 0; i < 4; ++i) {
-                    {
                         l = Integer.parseInt(elements[i]);
                         if ((l < 0L) || (l > 255L)) {
                             return null;
@@ -175,34 +155,24 @@ public class IpUtils
                 default:
                     return null;
             }
-        }
+        } catch (NumberFormatException e) {
-        catch (NumberFormatException e)
-        {
             return null;
         }
         return bytes;
     }
 
-    public static String getHostIp()
+    public static String getHostIp() {
-    {
+        try {
-        try
-        {
             return InetAddress.getLocalHost().getHostAddress();
-        }
+        } catch (UnknownHostException e) {
-        catch (UnknownHostException e)
-        {
         }
         return "127.0.0.1";
     }
 
-    public static String getHostName()
+    public static String getHostName() {
-    {
+        try {
-        try
-        {
             return InetAddress.getLocalHost().getHostName();
-        }
+        } catch (UnknownHostException e) {
-        catch (UnknownHostException e)
-        {
         }
         return "未知";
     }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelHandlerAdapter.java

@@ -5,14 +5,12 @@ package com.ruoyi.common.core.utils.poi;
  *
  * @author ruoyi
  */
-public interface ExcelHandlerAdapter
+public interface ExcelHandlerAdapter {
-{
     /**
      * 格式化
      *
      * @param value 单元格数据值
      * @param args  excel注解args参数组
-     *
      * @return 处理后的值
      */
     Object format(Object value, String[] args);

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java

@@ -1,40 +1,16 @@
 package com.ruoyi.common.core.utils.poi;
 
-import java.io.IOException;
+import cn.hutool.core.convert.Convert;
-import java.io.InputStream;
+import com.ruoyi.common.core.annotation.Excel;
-import java.lang.reflect.Field;
+import com.ruoyi.common.core.annotation.Excel.ColumnType;
-import java.lang.reflect.Method;
+import com.ruoyi.common.core.annotation.Excel.Type;
-import java.math.BigDecimal;
+import com.ruoyi.common.core.annotation.Excels;
-import java.text.DecimalFormat;
+import com.ruoyi.common.core.utils.DateUtils;
-import java.util.ArrayList;
+import com.ruoyi.common.core.utils.StringUtils;
-import java.util.Arrays;
+import com.ruoyi.common.core.utils.file.FileTypeUtils;
-import java.util.Comparator;
+import com.ruoyi.common.core.utils.file.ImageUtils;
-import java.util.Date;
+import com.ruoyi.common.core.utils.reflect.ReflectUtils;
-import java.util.HashMap;
+import org.apache.poi.ss.usermodel.*;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletResponse;
-import org.apache.poi.ss.usermodel.BorderStyle;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.ClientAnchor;
-import org.apache.poi.ss.usermodel.DataValidation;
-import org.apache.poi.ss.usermodel.DataValidationConstraint;
-import org.apache.poi.ss.usermodel.DataValidationHelper;
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.apache.poi.ss.usermodel.Drawing;
-import org.apache.poi.ss.usermodel.FillPatternType;
-import org.apache.poi.ss.usermodel.Font;
-import org.apache.poi.ss.usermodel.HorizontalAlignment;
-import org.apache.poi.ss.usermodel.IndexedColors;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.VerticalAlignment;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.WorkbookFactory;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.ss.util.CellRangeAddressList;
 import org.apache.poi.util.IOUtils;
@@ -43,24 +19,23 @@ import org.apache.poi.xssf.usermodel.XSSFClientAnchor;
 import org.apache.poi.xssf.usermodel.XSSFDataValidation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import com.ruoyi.common.core.annotation.Excel;
+
-import com.ruoyi.common.core.annotation.Excel.ColumnType;
+import javax.servlet.http.HttpServletResponse;
-import com.ruoyi.common.core.annotation.Excel.Type;
+import java.io.IOException;
-import com.ruoyi.common.core.annotation.Excels;
+import java.io.InputStream;
-import com.ruoyi.common.core.text.Convert;
+import java.lang.reflect.Field;
-import com.ruoyi.common.core.utils.DateUtils;
+import java.lang.reflect.Method;
-import com.ruoyi.common.core.utils.StringUtils;
+import java.math.BigDecimal;
-import com.ruoyi.common.core.utils.file.FileTypeUtils;
+import java.text.DecimalFormat;
-import com.ruoyi.common.core.utils.file.ImageUtils;
+import java.util.*;
-import com.ruoyi.common.core.utils.reflect.ReflectUtils;
+import java.util.stream.Collectors;
 
 /**
  * Excel相关处理
  *
  * @author ruoyi
  */
-public class ExcelUtil<T>
+public class ExcelUtil<T> {
-{
     private static final Logger log = LoggerFactory.getLogger(ExcelUtil.class);
 
     /**
@@ -133,15 +108,12 @@ public class ExcelUtil<T>
      */
     public Class<T> clazz;
 
-    public ExcelUtil(Class<T> clazz)
+    public ExcelUtil(Class<T> clazz) {
-    {
         this.clazz = clazz;
     }
 
-    public void init(List<T> list, String sheetName, String title, Type type)
+    public void init(List<T> list, String sheetName, String title, Type type) {
-    {
+        if (list == null) {
-        if (list == null)
-        {
             list = new ArrayList<T>();
         }
         this.list = list;
@@ -156,10 +128,8 @@ public class ExcelUtil<T>
     /**
      * 创建excel第一行标题
      */
-    public void createTitle()
+    public void createTitle() {
-    {
+        if (StringUtils.isNotEmpty(title)) {
-        if (StringUtils.isNotEmpty(title))
-        {
             Row titleRow = sheet.createRow(rownum == 0 ? rownum++ : 0);
             titleRow.setHeightInPoints(30);
             Cell titleCell = titleRow.createCell(0);
@@ -176,8 +146,7 @@ public class ExcelUtil<T>
      * @param is 输入流
      * @return 转换后集合
      */
-    public List<T> importExcel(InputStream is) throws Exception
+    public List<T> importExcel(InputStream is) throws Exception {
-    {
         return importExcel(is, 0);
     }
 
@@ -188,8 +157,7 @@ public class ExcelUtil<T>
      * @param titleNum 标题占用行数
      * @return 转换后集合
      */
-    public List<T> importExcel(InputStream is, int titleNum) throws Exception
+    public List<T> importExcel(InputStream is, int titleNum) throws Exception {
-    {
         return importExcel(StringUtils.EMPTY, is, titleNum);
     }
 
@@ -201,64 +169,52 @@ public class ExcelUtil<T>
      * @param is        输入流
      * @return 转换后集合
      */
-    public List<T> importExcel(String sheetName, InputStream is, int titleNum) throws Exception
+    public List<T> importExcel(String sheetName, InputStream is, int titleNum) throws Exception {
-    {
         this.type = Type.IMPORT;
         this.wb = WorkbookFactory.create(is);
         List<T> list = new ArrayList<T>();
         // 如果指定sheet名,则取指定sheet中的内容 否则默认指向第1个sheet
         Sheet sheet = StringUtils.isNotEmpty(sheetName) ? wb.getSheet(sheetName) : wb.getSheetAt(0);
-        if (sheet == null)
+        if (sheet == null) {
-        {
             throw new IOException("文件sheet不存在");
         }
 
         // 获取最后一个非空行的行下标，比如总行数为n，则返回的为n-1
         int rows = sheet.getLastRowNum();
 
-        if (rows > 0)
+        if (rows > 0) {
-        {
             // 定义一个map用于存放excel列的序号和field.
             Map<String, Integer> cellMap = new HashMap<String, Integer>();
             // 获取表头
             Row heard = sheet.getRow(titleNum);
-            for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++)
+            for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++) {
-            {
                 Cell cell = heard.getCell(i);
-                if (StringUtils.isNotNull(cell))
+                if (StringUtils.isNotNull(cell)) {
-                {
                     String value = this.getCellValue(heard, i).toString();
                     cellMap.put(value, i);
-                }
+                } else {
-                else
-                {
                     cellMap.put(null, i);
                 }
             }
             // 有数据时才处理 得到类的所有field.
             List<Object[]> fields = this.getFields();
             Map<Integer, Object[]> fieldsMap = new HashMap<Integer, Object[]>();
-            for (Object[] objects : fields)
+            for (Object[] objects : fields) {
-            {
                 Excel attr = (Excel) objects[1];
                 Integer column = cellMap.get(attr.name());
-                if (column != null)
+                if (column != null) {
-                {
                     fieldsMap.put(column, objects);
                 }
             }
-            for (int i = titleNum + 1; i <= rows; i++)
+            for (int i = titleNum + 1; i <= rows; i++) {
-            {
                 // 从第2行开始取数据,默认第一行是表头.
                 Row row = sheet.getRow(i);
                 // 判断当前行是否是空行
-                if (isRowEmpty(row))
+                if (isRowEmpty(row)) {
-                {
                     continue;
                 }
                 T entity = null;
-                for (Map.Entry<Integer, Object[]> entry : fieldsMap.entrySet())
+                for (Map.Entry<Integer, Object[]> entry : fieldsMap.entrySet()) {
-                {
                     Object val = this.getCellValue(row, entry.getKey());
 
                     // 如果不存在实例则新建.
@@ -268,74 +224,44 @@ public class ExcelUtil<T>
                     Excel attr = (Excel) entry.getValue()[1];
                     // 取得类型,并根据对象类型设置值.
                     Class<?> fieldType = field.getType();
-                    if (String.class == fieldType)
+                    if (String.class == fieldType) {
-                    {
                         String s = Convert.toStr(val);
-                        if (StringUtils.endsWith(s, ".0"))
+                        if (StringUtils.endsWith(s, ".0")) {
-                        {
                             val = StringUtils.substringBefore(s, ".0");
-                        }
+                        } else {
-                        else
-                        {
                             String dateFormat = field.getAnnotation(Excel.class).dateFormat();
-                            if (StringUtils.isNotEmpty(dateFormat))
+                            if (StringUtils.isNotEmpty(dateFormat)) {
-                            {
                                 val = DateUtils.parseDateToStr(dateFormat, (Date) val);
-                            }
+                            } else {
-                            else
-                            {
                                 val = Convert.toStr(val);
                             }
                         }
-                    }
+                    } else if ((Integer.TYPE == fieldType || Integer.class == fieldType) && StringUtils.isNumeric(Convert.toStr(val))) {
-                    else if ((Integer.TYPE == fieldType || Integer.class == fieldType) && StringUtils.isNumeric(Convert.toStr(val)))
-                    {
                         val = Convert.toInt(val);
-                    }
+                    } else if (Long.TYPE == fieldType || Long.class == fieldType) {
-                    else if (Long.TYPE == fieldType || Long.class == fieldType)
-                    {
                         val = Convert.toLong(val);
-                    }
+                    } else if (Double.TYPE == fieldType || Double.class == fieldType) {
-                    else if (Double.TYPE == fieldType || Double.class == fieldType)
-                    {
                         val = Convert.toDouble(val);
-                    }
+                    } else if (Float.TYPE == fieldType || Float.class == fieldType) {
-                    else if (Float.TYPE == fieldType || Float.class == fieldType)
-                    {
                         val = Convert.toFloat(val);
-                    }
+                    } else if (BigDecimal.class == fieldType) {
-                    else if (BigDecimal.class == fieldType)
-                    {
                         val = Convert.toBigDecimal(val);
-                    }
+                    } else if (Date.class == fieldType) {
-                    else if (Date.class == fieldType)
+                        if (val instanceof String) {
-                    {
-                        if (val instanceof String)
-                        {
                             val = DateUtils.parseDate(val);
-                        }
+                        } else if (val instanceof Double) {
-                        else if (val instanceof Double)
-                        {
                             val = DateUtil.getJavaDate((Double) val);
                         }
-                    }
+                    } else if (Boolean.TYPE == fieldType || Boolean.class == fieldType) {
-                    else if (Boolean.TYPE == fieldType || Boolean.class == fieldType)
-                    {
                         val = Convert.toBool(val, false);
                     }
-                    if (StringUtils.isNotNull(fieldType))
+                    if (StringUtils.isNotNull(fieldType)) {
-                    {
                         String propertyName = field.getName();
-                        if (StringUtils.isNotEmpty(attr.targetAttr()))
+                        if (StringUtils.isNotEmpty(attr.targetAttr())) {
-                        {
                             propertyName = field.getName() + "." + attr.targetAttr();
-                        }
+                        } else if (StringUtils.isNotEmpty(attr.readConverterExp())) {
-                        else if (StringUtils.isNotEmpty(attr.readConverterExp()))
-                        {
                             val = reverseByExp(Convert.toStr(val), attr.readConverterExp(), attr.separator());
-                        }
+                        } else if (!attr.handler().equals(ExcelHandlerAdapter.class)) {
-                        else if (!attr.handler().equals(ExcelHandlerAdapter.class))
-                        {
                             val = dataFormatHandlerAdapter(val, attr);
                         }
                         ReflectUtils.invokeSetter(entity, propertyName, val);
@@ -356,8 +282,7 @@ public class ExcelUtil<T>
      * @return 结果
      * @throws IOException
      */
-    public void exportExcel(HttpServletResponse response, List<T> list, String sheetName)
+    public void exportExcel(HttpServletResponse response, List<T> list, String sheetName) {
-    {
         exportExcel(response, list, sheetName, StringUtils.EMPTY);
     }
 
@@ -371,8 +296,7 @@ public class ExcelUtil<T>
      * @return 结果
      * @throws IOException
      */
-    public void exportExcel(HttpServletResponse response, List<T> list, String sheetName, String title)
+    public void exportExcel(HttpServletResponse response, List<T> list, String sheetName, String title) {
-    {
         response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
         response.setCharacterEncoding("utf-8");
         this.init(list, sheetName, title, Type.EXPORT);
@@ -391,8 +315,7 @@ public class ExcelUtil<T>
      * @param sheetName 工作表的名称
      * @return 结果
      */
-    public void importTemplateExcel(HttpServletResponse response, String sheetName)
+    public void importTemplateExcel(HttpServletResponse response, String sheetName) {
-    {
         importTemplateExcel(response, sheetName, StringUtils.EMPTY);
     }
 
@@ -403,8 +326,7 @@ public class ExcelUtil<T>
      * @param title     标题
      * @return 结果
      */
-    public void importTemplateExcel(HttpServletResponse response, String sheetName, String title)
+    public void importTemplateExcel(HttpServletResponse response, String sheetName, String title) {
-    {
         response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
         response.setCharacterEncoding("utf-8");
         this.init(null, sheetName, title, Type.IMPORT);
@@ -416,19 +338,13 @@ public class ExcelUtil<T>
      *
      * @return 结果
      */
-    public void exportExcel(HttpServletResponse response)
+    public void exportExcel(HttpServletResponse response) {
-    {
+        try {
-        try
-        {
             writeSheet();
             wb.write(response.getOutputStream());
-        }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
             log.error("导出Excel异常{}", e.getMessage());
-        }
+        } finally {
-        finally
-        {
             IOUtils.closeQuietly(wb);
         }
     }
@@ -436,25 +352,21 @@ public class ExcelUtil<T>
     /**
      * 创建写入数据到Sheet
      */
-    public void writeSheet()
+    public void writeSheet() {
-    {
         // 取出一共有多少个sheet.
         int sheetNo = Math.max(1, (int) Math.ceil(list.size() * 1.0 / sheetSize));
-        for (int index = 0; index < sheetNo; index++)
+        for (int index = 0; index < sheetNo; index++) {
-        {
             createSheet(sheetNo, index);
 
             // 产生一行
             Row row = sheet.createRow(rownum);
             int column = 0;
             // 写入各个字段的列头名称
-            for (Object[] os : fields)
+            for (Object[] os : fields) {
-            {
                 Excel excel = (Excel) os[1];
                 this.createCell(excel, row, column++);
             }
-            if (Type.EXPORT.equals(type))
+            if (Type.EXPORT.equals(type)) {
-            {
                 fillExcelData(index, row);
                 addStatisticsRow();
             }
@@ -467,18 +379,15 @@ public class ExcelUtil<T>
      * @param index 序号
      * @param row   单元格行
      */
-    public void fillExcelData(int index, Row row)
+    public void fillExcelData(int index, Row row) {
-    {
         int startNo = index * sheetSize;
         int endNo = Math.min(startNo + sheetSize, list.size());
-        for (int i = startNo; i < endNo; i++)
+        for (int i = startNo; i < endNo; i++) {
-        {
             row = sheet.createRow(i + 1 + rownum - startNo);
             // 得到导出对象.
             T vo = (T) list.get(i);
             int column = 0;
-            for (Object[] os : fields)
+            for (Object[] os : fields) {
-            {
                 Field field = (Field) os[0];
                 Excel excel = (Excel) os[1];
                 this.addCell(excel, row, vo, field, column++);
@@ -492,8 +401,7 @@ public class ExcelUtil<T>
      * @param wb 工作薄对象
      * @return 样式列表
      */
-    private Map<String, CellStyle> createStyles(Workbook wb)
+    private Map<String, CellStyle> createStyles(Workbook wb) {
-    {
         // 写入各条记录,每条记录对应excel表中的一行
         Map<String, CellStyle> styles = new HashMap<String, CellStyle>();
         CellStyle style = wb.createCellStyle();
@@ -567,8 +475,7 @@ public class ExcelUtil<T>
     /**
      * 创建单元格
      */
-    public Cell createCell(Excel attr, Row row, int column)
+    public Cell createCell(Excel attr, Row row, int column) {
-    {
         // 创建列
         Cell cell = row.createCell(column);
         // 写入列信息
@@ -585,25 +492,17 @@ public class ExcelUtil<T>
      * @param attr  注解相关
      * @param cell  单元格信息
      */
-    public void setCellVo(Object value, Excel attr, Cell cell)
+    public void setCellVo(Object value, Excel attr, Cell cell) {
-    {
+        if (ColumnType.STRING == attr.cellType()) {
-        if (ColumnType.STRING == attr.cellType())
-        {
             cell.setCellValue(StringUtils.isNull(value) ? attr.defaultValue() : value + attr.suffix());
-        }
+        } else if (ColumnType.NUMERIC == attr.cellType()) {
-        else if (ColumnType.NUMERIC == attr.cellType())
+            if (StringUtils.isNotNull(value)) {
-        {
-            if (StringUtils.isNotNull(value))
-            {
                 cell.setCellValue(StringUtils.contains(Convert.toStr(value), ".") ? Convert.toDouble(value) : Convert.toInt(value));
             }
-        }
+        } else if (ColumnType.IMAGE == attr.cellType()) {
-        else if (ColumnType.IMAGE == attr.cellType())
-        {
             ClientAnchor anchor = new XSSFClientAnchor(0, 0, 0, 0, (short) cell.getColumnIndex(), cell.getRow().getRowNum(), (short) (cell.getColumnIndex() + 1), cell.getRow().getRowNum() + 1);
             String imagePath = Convert.toStr(value);
-            if (StringUtils.isNotEmpty(imagePath))
+            if (StringUtils.isNotEmpty(imagePath)) {
-            {
                 byte[] data = ImageUtils.getImage(imagePath);
                 getDrawingPatriarch(cell.getSheet()).createPicture(anchor,
                         cell.getSheet().getWorkbook().addPicture(data, getImageType(data)));
@@ -614,10 +513,8 @@ public class ExcelUtil<T>
     /**
      * 获取画布
      */
-    public static Drawing<?> getDrawingPatriarch(Sheet sheet)
+    public static Drawing<?> getDrawingPatriarch(Sheet sheet) {
-    {
+        if (sheet.getDrawingPatriarch() == null) {
-        if (sheet.getDrawingPatriarch() == null)
-        {
             sheet.createDrawingPatriarch();
         }
         return sheet.getDrawingPatriarch();
@@ -626,15 +523,11 @@ public class ExcelUtil<T>
     /**
      * 获取图片类型,设置图片插入类型
      */
-    public int getImageType(byte[] value)
+    public int getImageType(byte[] value) {
-    {
         String type = FileTypeUtils.getFileExtendName(value);
-        if ("JPG".equalsIgnoreCase(type))
+        if ("JPG".equalsIgnoreCase(type)) {
-        {
             return Workbook.PICTURE_TYPE_JPEG;
-        }
+        } else if ("PNG".equalsIgnoreCase(type)) {
-        else if ("PNG".equalsIgnoreCase(type))
-        {
             return Workbook.PICTURE_TYPE_PNG;
         }
         return Workbook.PICTURE_TYPE_JPEG;
@@ -643,26 +536,20 @@ public class ExcelUtil<T>
     /**
      * 创建表格样式
      */
-    public void setDataValidation(Excel attr, Row row, int column)
+    public void setDataValidation(Excel attr, Row row, int column) {
-    {
+        if (attr.name().indexOf("注：") >= 0) {
-        if (attr.name().indexOf("注：") >= 0)
-        {
             sheet.setColumnWidth(column, 6000);
-        }
+        } else {
-        else
-        {
             // 设置列宽
             sheet.setColumnWidth(column, (int) ((attr.width() + 0.72) * 256));
         }
         // 如果设置了提示信息则鼠标放上去提示.
-        if (StringUtils.isNotEmpty(attr.prompt()))
+        if (StringUtils.isNotEmpty(attr.prompt())) {
-        {
             // 这里默认设了2-101列提示.
             setXSSFPrompt(sheet, "", attr.prompt(), 1, 100, column, column);
         }
         // 如果设置了combo属性则本列只能选择不能输入
-        if (attr.combo().length > 0)
+        if (attr.combo().length > 0) {
-        {
             // 这里默认设了2-101列只能选择不能输入.
             setXSSFValidation(sheet, attr.combo(), 1, 100, column, column);
         }
@@ -671,16 +558,13 @@ public class ExcelUtil<T>
     /**
      * 添加单元格
      */
-    public Cell addCell(Excel attr, Row row, T vo, Field field, int column)
+    public Cell addCell(Excel attr, Row row, T vo, Field field, int column) {
-    {
         Cell cell = null;
-        try
+        try {
-        {
             // 设置行高
             row.setHeight(maxHeight);
             // 根据Excel中设置情况决定是否导出,有些情况需要保持为空,希望用户填写这一列.
-            if (attr.isExport())
+            if (attr.isExport()) {
-            {
                 // 创建cell
                 cell = row.createCell(column);
                 int align = attr.align().value();
@@ -691,32 +575,21 @@ public class ExcelUtil<T>
                 String dateFormat = attr.dateFormat();
                 String readConverterExp = attr.readConverterExp();
                 String separator = attr.separator();
-                if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value))
+                if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value)) {
-                {
                     cell.setCellValue(DateUtils.parseDateToStr(dateFormat, (Date) value));
-                }
+                } else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value)) {
-                else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value))
-                {
                     cell.setCellValue(convertByExp(Convert.toStr(value), readConverterExp, separator));
-                }
+                } else if (value instanceof BigDecimal && -1 != attr.scale()) {
-                else if (value instanceof BigDecimal && -1 != attr.scale())
-                {
                     cell.setCellValue((((BigDecimal) value).setScale(attr.scale(), attr.roundingMode())).toString());
-                }
+                } else if (!attr.handler().equals(ExcelHandlerAdapter.class)) {
-                else if (!attr.handler().equals(ExcelHandlerAdapter.class))
-                {
                     cell.setCellValue(dataFormatHandlerAdapter(value, attr));
-                }
+                } else {
-                else
-                {
                     // 设置列类型
                     setCellVo(value, attr, cell);
                 }
                 addStatisticsData(column, Convert.toStr(value), attr);
             }
-        }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
             log.error("导出Excel失败{}", e);
         }
         return cell;
@@ -734,8 +607,7 @@ public class ExcelUtil<T>
      * @param endCol        结束列
      */
     public void setXSSFPrompt(Sheet sheet, String promptTitle, String promptContent, int firstRow, int endRow,
-            int firstCol, int endCol)
+                              int firstCol, int endCol) {
-    {
         DataValidationHelper helper = sheet.getDataValidationHelper();
         DataValidationConstraint constraint = helper.createCustomConstraint("DD1");
         CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol);
@@ -756,8 +628,7 @@ public class ExcelUtil<T>
      * @param endCol   结束列
      * @return 设置好的sheet.
      */
-    public void setXSSFValidation(Sheet sheet, String[] textlist, int firstRow, int endRow, int firstCol, int endCol)
+    public void setXSSFValidation(Sheet sheet, String[] textlist, int firstRow, int endRow, int firstCol, int endCol) {
-    {
         DataValidationHelper helper = sheet.getDataValidationHelper();
         // 加载下拉列表内容
         DataValidationConstraint constraint = helper.createExplicitListConstraint(textlist);
@@ -766,13 +637,10 @@ public class ExcelUtil<T>
         // 数据有效性对象
         DataValidation dataValidation = helper.createValidation(constraint, regions);
         // 处理Excel兼容性问题
-        if (dataValidation instanceof XSSFDataValidation)
+        if (dataValidation instanceof XSSFDataValidation) {
-        {
             dataValidation.setSuppressDropDownArrow(true);
             dataValidation.setShowErrorBox(true);
-        }
+        } else {
-        else
-        {
             dataValidation.setSuppressDropDownArrow(false);
         }
 
@@ -787,28 +655,20 @@ public class ExcelUtil<T>
      * @param separator     分隔符
      * @return 解析后值
      */
-    public static String convertByExp(String propertyValue, String converterExp, String separator)
+    public static String convertByExp(String propertyValue, String converterExp, String separator) {
-    {
         StringBuilder propertyString = new StringBuilder();
         String[] convertSource = converterExp.split(",");
-        for (String item : convertSource)
+        for (String item : convertSource) {
-        {
             String[] itemArray = item.split("=");
-            if (StringUtils.containsAny(separator, propertyValue))
+            if (StringUtils.containsAny(separator, propertyValue)) {
-            {
+                for (String value : propertyValue.split(separator)) {
-                for (String value : propertyValue.split(separator))
+                    if (itemArray[0].equals(value)) {
-                {
-                    if (itemArray[0].equals(value))
-                    {
                         propertyString.append(itemArray[1] + separator);
                         break;
                     }
                 }
-            }
+            } else {
-            else
+                if (itemArray[0].equals(propertyValue)) {
-            {
-                if (itemArray[0].equals(propertyValue))
-                {
                     return itemArray[1];
                 }
             }
@@ -824,28 +684,20 @@ public class ExcelUtil<T>
      * @param separator     分隔符
      * @return 解析后值
      */
-    public static String reverseByExp(String propertyValue, String converterExp, String separator)
+    public static String reverseByExp(String propertyValue, String converterExp, String separator) {
-    {
         StringBuilder propertyString = new StringBuilder();
         String[] convertSource = converterExp.split(",");
-        for (String item : convertSource)
+        for (String item : convertSource) {
-        {
             String[] itemArray = item.split("=");
-            if (StringUtils.containsAny(separator, propertyValue))
+            if (StringUtils.containsAny(separator, propertyValue)) {
-            {
+                for (String value : propertyValue.split(separator)) {
-                for (String value : propertyValue.split(separator))
+                    if (itemArray[1].equals(value)) {
-                {
-                    if (itemArray[1].equals(value))
-                    {
                         propertyString.append(itemArray[0] + separator);
                         break;
                     }
                 }
-            }
+            } else {
-            else
+                if (itemArray[1].equals(propertyValue)) {
-            {
-                if (itemArray[1].equals(propertyValue))
-                {
                     return itemArray[0];
                 }
             }
@@ -860,16 +712,12 @@ public class ExcelUtil<T>
      * @param excel 数据注解
      * @return
      */
-    public String dataFormatHandlerAdapter(Object value, Excel excel)
+    public String dataFormatHandlerAdapter(Object value, Excel excel) {
-    {
+        try {
-        try
-        {
             Object instance = excel.handler().newInstance();
             Method formatMethod = excel.handler().getMethod("format", new Class[]{Object.class, String[].class});
             value = formatMethod.invoke(instance, value, excel.args());
-        }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
             log.error("不能格式化数据 " + excel.handler(), e.getMessage());
         }
         return Convert.toStr(value);
@@ -878,21 +726,15 @@ public class ExcelUtil<T>
     /**
      * 合计统计信息
      */
-    private void addStatisticsData(Integer index, String text, Excel entity)
+    private void addStatisticsData(Integer index, String text, Excel entity) {
-    {
+        if (entity != null && entity.isStatistics()) {
-        if (entity != null && entity.isStatistics())
-        {
             Double temp = 0D;
-            if (!statistics.containsKey(index))
+            if (!statistics.containsKey(index)) {
-            {
                 statistics.put(index, temp);
             }
-            try
+            try {
-            {
                 temp = Double.valueOf(text);
-            }
+            } catch (NumberFormatException e) {
-            catch (NumberFormatException e)
-            {
             }
             statistics.put(index, statistics.get(index) + temp);
         }
@@ -901,18 +743,15 @@ public class ExcelUtil<T>
     /**
      * 创建统计行
      */
-    public void addStatisticsRow()
+    public void addStatisticsRow() {
-    {
+        if (statistics.size() > 0) {
-        if (statistics.size() > 0)
-        {
             Row row = sheet.createRow(sheet.getLastRowNum() + 1);
             Set<Integer> keys = statistics.keySet();
             Cell cell = row.createCell(0);
             cell.setCellStyle(styles.get("total"));
             cell.setCellValue("合计");
 
-            for (Integer key : keys)
+            for (Integer key : keys) {
-            {
                 cell = row.createCell(key);
                 cell.setCellStyle(styles.get("total"));
                 cell.setCellValue(DOUBLE_FORMAT.format(statistics.get(key)));
@@ -930,22 +769,16 @@ public class ExcelUtil<T>
      * @return 最终的属性值
      * @throws Exception
      */
-    private Object getTargetValue(T vo, Field field, Excel excel) throws Exception
+    private Object getTargetValue(T vo, Field field, Excel excel) throws Exception {
-    {
         Object o = field.get(vo);
-        if (StringUtils.isNotEmpty(excel.targetAttr()))
+        if (StringUtils.isNotEmpty(excel.targetAttr())) {
-        {
             String target = excel.targetAttr();
-            if (target.indexOf(".") > -1)
+            if (target.indexOf(".") > -1) {
-            {
                 String[] targets = target.split("[.]");
-                for (String name : targets)
+                for (String name : targets) {
-                {
                     o = getValue(o, name);
                 }
-            }
+            } else {
-            else
-            {
                 o = getValue(o, target);
             }
         }
@@ -960,10 +793,8 @@ public class ExcelUtil<T>
      * @return value
      * @throws Exception
      */
-    private Object getValue(Object o, String name) throws Exception
+    private Object getValue(Object o, String name) throws Exception {
-    {
+        if (StringUtils.isNotNull(o) && StringUtils.isNotEmpty(name)) {
-        if (StringUtils.isNotNull(o) && StringUtils.isNotEmpty(name))
-        {
             Class<?> clazz = o.getClass();
             Field field = clazz.getDeclaredField(name);
             field.setAccessible(true);
@@ -975,8 +806,7 @@ public class ExcelUtil<T>
     /**
      * 得到所有定义字段
      */
-    private void createExcelField()
+    private void createExcelField() {
-    {
         this.fields = getFields();
         this.fields = this.fields.stream().sorted(Comparator.comparing(objects -> ((Excel) objects[1]).sort())).collect(Collectors.toList());
         this.maxHeight = getRowHeight();
@@ -985,34 +815,27 @@ public class ExcelUtil<T>
     /**
      * 获取字段注解信息
      */
-    public List<Object[]> getFields()
+    public List<Object[]> getFields() {
-    {
         List<Object[]> fields = new ArrayList<Object[]>();
         List<Field> tempFields = new ArrayList<>();
         tempFields.addAll(Arrays.asList(clazz.getSuperclass().getDeclaredFields()));
         tempFields.addAll(Arrays.asList(clazz.getDeclaredFields()));
-        for (Field field : tempFields)
+        for (Field field : tempFields) {
-        {
             // 单注解
-            if (field.isAnnotationPresent(Excel.class))
+            if (field.isAnnotationPresent(Excel.class)) {
-            {
                 Excel attr = field.getAnnotation(Excel.class);
-                if (attr != null && (attr.type() == Type.ALL || attr.type() == type))
+                if (attr != null && (attr.type() == Type.ALL || attr.type() == type)) {
-                {
                     field.setAccessible(true);
                     fields.add(new Object[]{field, attr});
                 }
             }
 
             // 多注解
-            if (field.isAnnotationPresent(Excels.class))
+            if (field.isAnnotationPresent(Excels.class)) {
-            {
                 Excels attrs = field.getAnnotation(Excels.class);
                 Excel[] excels = attrs.value();
-                for (Excel attr : excels)
+                for (Excel attr : excels) {
-                {
+                    if (attr != null && (attr.type() == Type.ALL || attr.type() == type)) {
-                    if (attr != null && (attr.type() == Type.ALL || attr.type() == type))
-                    {
                         field.setAccessible(true);
                         fields.add(new Object[]{field, attr});
                     }
@@ -1025,11 +848,9 @@ public class ExcelUtil<T>
     /**
      * 根据注解获取最大行高
      */
-    public short getRowHeight()
+    public short getRowHeight() {
-    {
         double maxHeight = 0;
-        for (Object[] os : this.fields)
+        for (Object[] os : this.fields) {
-        {
             Excel excel = (Excel) os[1];
             maxHeight = maxHeight > excel.height() ? maxHeight : excel.height();
         }
@@ -1039,8 +860,7 @@ public class ExcelUtil<T>
     /**
      * 创建一个工作簿
      */
-    public void createWorkbook()
+    public void createWorkbook() {
-    {
         this.wb = new SXSSFWorkbook(500);
         this.sheet = wb.createSheet();
         wb.setSheetName(0, sheetName);
@@ -1053,11 +873,9 @@ public class ExcelUtil<T>
      * @param sheetNo sheet数量
      * @param index   序号
      */
-    public void createSheet(int sheetNo, int index)
+    public void createSheet(int sheetNo, int index) {
-    {
         // 设置工作表的名称.
-        if (sheetNo > 1 && index > 0)
+        if (sheetNo > 1 && index > 0) {
-        {
             this.sheet = wb.createSheet();
             this.createTitle();
             wb.setSheetName(index, sheetName + index);
@@ -1071,54 +889,35 @@ public class ExcelUtil<T>
      * @param column 获取单元格列号
      * @return 单元格值
      */
-    public Object getCellValue(Row row, int column)
+    public Object getCellValue(Row row, int column) {
-    {
+        if (row == null) {
-        if (row == null)
-        {
             return row;
         }
         Object val = "";
-        try
+        try {
-        {
             Cell cell = row.getCell(column);
-            if (StringUtils.isNotNull(cell))
+            if (StringUtils.isNotNull(cell)) {
-            {
+                if (cell.getCellType() == CellType.NUMERIC || cell.getCellType() == CellType.FORMULA) {
-                if (cell.getCellType() == CellType.NUMERIC || cell.getCellType() == CellType.FORMULA)
-                {
                     val = cell.getNumericCellValue();
-                    if (DateUtil.isCellDateFormatted(cell))
+                    if (DateUtil.isCellDateFormatted(cell)) {
-                    {
                         val = DateUtil.getJavaDate((Double) val); // POI Excel 日期格式转换
-                    }
+                    } else {
-                    else
+                        if ((Double) val % 1 != 0) {
-                    {
-                        if ((Double) val % 1 != 0)
-                        {
                             val = new BigDecimal(val.toString());
-                        }
+                        } else {
-                        else
-                        {
                             val = new DecimalFormat("0").format(val);
                         }
                     }
-                }
+                } else if (cell.getCellType() == CellType.STRING) {
-                else if (cell.getCellType() == CellType.STRING)
-                {
                     val = cell.getStringCellValue();
-                }
+                } else if (cell.getCellType() == CellType.BOOLEAN) {
-                else if (cell.getCellType() == CellType.BOOLEAN)
-                {
                     val = cell.getBooleanCellValue();
-                }
+                } else if (cell.getCellType() == CellType.ERROR) {
-                else if (cell.getCellType() == CellType.ERROR)
-                {
                     val = cell.getErrorCellValue();
                 }
 
             }
-        }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
             return val;
         }
         return val;
@@ -1130,17 +929,13 @@ public class ExcelUtil<T>
      * @param row 判断的行
      * @return
      */
-    private boolean isRowEmpty(Row row)
+    private boolean isRowEmpty(Row row) {
-    {
+        if (row == null) {
-        if (row == null)
-        {
             return true;
         }
-        for (int i = row.getFirstCellNum(); i < row.getLastCellNum(); i++)
+        for (int i = row.getFirstCellNum(); i < row.getLastCellNum(); i++) {
-        {
             Cell cell = row.getCell(i);
-            if (cell != null && cell.getCellType() != CellType.BLANK)
+            if (cell != null && cell.getCellType() != CellType.BLANK) {
-            {
                 return false;
             }
         }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/reflect/ReflectUtils.java

@@ -1,45 +1,35 @@
 package com.ruoyi.common.core.utils.reflect;
 
 import cn.hutool.core.util.ReflectUtil;
-import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.utils.DateUtils;
+import lombok.AccessLevel;
-import org.apache.commons.lang3.StringUtils;
+import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.Validate;
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import java.lang.reflect.*;
+import java.lang.reflect.Method;
-import java.util.Date;
 
 /**
  * 反射工具类. 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数.
  *
- * @author ruoyi
+ * @author Lion Li
  */
 @SuppressWarnings("rawtypes")
-public class ReflectUtils extends ReflectUtil
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
-{
+public class ReflectUtils extends ReflectUtil {
+
     private static final String SETTER_PREFIX = "set";
 
     private static final String GETTER_PREFIX = "get";
 
-    private static final String CGLIB_CLASS_SEPARATOR = "$$";
-
-    private static Logger logger = LoggerFactory.getLogger(ReflectUtils.class);
-
     /**
      * 调用Getter方法.
      * 支持多级，如：对象名.对象名.方法
      */
     @SuppressWarnings("unchecked")
-    public static <E> E invokeGetter(Object obj, String propertyName)
+    public static <E> E invokeGetter(Object obj, String propertyName) {
-    {
         Object object = obj;
-        for (String name : StringUtils.split(propertyName, "."))
+        for (String name : StringUtils.split(propertyName, ".")) {
-        {
             String getterMethodName = GETTER_PREFIX + StringUtils.capitalize(name);
-            object = invokeMethod(object, getterMethodName, new Class[] {}, new Object[] {});
+            object = invoke(object, getterMethodName);
         }
         return (E) object;
     }
@@ -48,314 +38,19 @@ public class ReflectUtils extends ReflectUtil
      * 调用Setter方法, 仅匹配方法名。
      * 支持多级，如：对象名.对象名.方法
      */
-    public static <E> void invokeSetter(Object obj, String propertyName, E value)
+    public static <E> void invokeSetter(Object obj, String propertyName, E value) {
-    {
         Object object = obj;
         String[] names = StringUtils.split(propertyName, ".");
-        for (int i = 0; i < names.length; i++)
+        for (int i = 0; i < names.length; i++) {
-        {
+            if (i < names.length - 1) {
-            if (i < names.length - 1)
-            {
                 String getterMethodName = GETTER_PREFIX + StringUtils.capitalize(names[i]);
-                object = invokeMethod(object, getterMethodName, new Class[] {}, new Object[] {});
+                object = invoke(object, getterMethodName);
-            }
+            } else {
-            else
-            {
                 String setterMethodName = SETTER_PREFIX + StringUtils.capitalize(names[i]);
-                invokeMethodByName(object, setterMethodName, new Object[] { value });
+                Method method = getMethodByName(object.getClass(), setterMethodName);
+                invoke(object, method, value);
             }
         }
     }
 
-    /**
-     * 直接调用对象方法, 无视private/protected修饰符.
-     * 用于一次性调用的情况，否则应使用getAccessibleMethod()函数获得Method后反复调用.
-     * 同时匹配方法名+参数类型，
-     */
-    @SuppressWarnings("unchecked")
-    public static <E> E invokeMethod(final Object obj, final String methodName, final Class<?>[] parameterTypes,
-            final Object[] args)
-    {
-        if (obj == null || methodName == null)
-        {
-            return null;
-        }
-        Method method = getAccessibleMethod(obj, methodName, parameterTypes);
-        if (method == null)
-        {
-            logger.debug("在 [" + obj.getClass() + "] 中，没有找到 [" + methodName + "] 方法 ");
-            return null;
-        }
-        try
-        {
-            return (E) method.invoke(obj, args);
-        }
-        catch (Exception e)
-        {
-            String msg = "method: " + method + ", obj: " + obj + ", args: " + args + "";
-            throw convertReflectionExceptionToUnchecked(msg, e);
-        }
-    }
-
-    /**
-     * 直接调用对象方法, 无视private/protected修饰符，
-     * 用于一次性调用的情况，否则应使用getAccessibleMethodByName()函数获得Method后反复调用.
-     * 只匹配函数名，如果有多个同名函数调用第一个。
-     */
-    @SuppressWarnings("unchecked")
-    public static <E> E invokeMethodByName(final Object obj, final String methodName, final Object[] args)
-    {
-        Method method = getAccessibleMethodByName(obj, methodName, args.length);
-        if (method == null)
-        {
-            // 如果为空不报错，直接返回空。
-            logger.debug("在 [" + obj.getClass() + "] 中，没有找到 [" + methodName + "] 方法 ");
-            return null;
-        }
-        try
-        {
-            // 类型转换（将参数数据类型转换为目标方法参数类型）
-            Class<?>[] cs = method.getParameterTypes();
-            for (int i = 0; i < cs.length; i++)
-            {
-                if (args[i] != null && !args[i].getClass().equals(cs[i]))
-                {
-                    if (cs[i] == String.class)
-                    {
-                        args[i] = Convert.toStr(args[i]);
-                        if (StringUtils.endsWith((String) args[i], ".0"))
-                        {
-                            args[i] = StringUtils.substringBefore((String) args[i], ".0");
-                        }
-                    }
-                    else if (cs[i] == Integer.class)
-                    {
-                        args[i] = Convert.toInt(args[i]);
-                    }
-                    else if (cs[i] == Long.class)
-                    {
-                        args[i] = Convert.toLong(args[i]);
-                    }
-                    else if (cs[i] == Double.class)
-                    {
-                        args[i] = Convert.toDouble(args[i]);
-                    }
-                    else if (cs[i] == Float.class)
-                    {
-                        args[i] = Convert.toFloat(args[i]);
-                    }
-                    else if (cs[i] == Date.class)
-                    {
-                        if (args[i] instanceof String)
-                        {
-                            args[i] = DateUtils.parseDate(args[i]);
-                        }
-                        else
-                        {
-                            args[i] = DateUtil.getJavaDate((Double) args[i]);
-                        }
-                    }
-                    else if (cs[i] == boolean.class || cs[i] == Boolean.class)
-                    {
-                        args[i] = Convert.toBool(args[i]);
-                    }
-                }
-            }
-            return (E) method.invoke(obj, args);
-        }
-        catch (Exception e)
-        {
-            String msg = "method: " + method + ", obj: " + obj + ", args: " + args + "";
-            throw convertReflectionExceptionToUnchecked(msg, e);
-        }
-    }
-
-    /**
-     * 循环向上转型, 获取对象的DeclaredField, 并强制设置为可访问.
-     * 如向上转型到Object仍无法找到, 返回null.
-     */
-    public static Field getAccessibleField(final Object obj, final String fieldName)
-    {
-        // 为空不报错。直接返回 null
-        if (obj == null)
-        {
-            return null;
-        }
-        Validate.notBlank(fieldName, "fieldName can't be blank");
-        for (Class<?> superClass = obj.getClass(); superClass != Object.class; superClass = superClass.getSuperclass())
-        {
-            try
-            {
-                Field field = superClass.getDeclaredField(fieldName);
-                makeAccessible(field);
-                return field;
-            }
-            catch (NoSuchFieldException e)
-            {
-                continue;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * 循环向上转型, 获取对象的DeclaredMethod,并强制设置为可访问.
-     * 如向上转型到Object仍无法找到, 返回null.
-     * 匹配函数名+参数类型。
-     * 用于方法需要被多次调用的情况. 先使用本函数先取得Method,然后调用Method.invoke(Object obj, Object... args)
-     */
-    public static Method getAccessibleMethod(final Object obj, final String methodName,
-            final Class<?>... parameterTypes)
-    {
-        // 为空不报错。直接返回 null
-        if (obj == null)
-        {
-            return null;
-        }
-        Validate.notBlank(methodName, "methodName can't be blank");
-        for (Class<?> searchType = obj.getClass(); searchType != Object.class; searchType = searchType.getSuperclass())
-        {
-            try
-            {
-                Method method = searchType.getDeclaredMethod(methodName, parameterTypes);
-                makeAccessible(method);
-                return method;
-            }
-            catch (NoSuchMethodException e)
-            {
-                continue;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * 循环向上转型, 获取对象的DeclaredMethod,并强制设置为可访问.
-     * 如向上转型到Object仍无法找到, 返回null.
-     * 只匹配函数名。
-     * 用于方法需要被多次调用的情况. 先使用本函数先取得Method,然后调用Method.invoke(Object obj, Object... args)
-     */
-    public static Method getAccessibleMethodByName(final Object obj, final String methodName, int argsNum)
-    {
-        // 为空不报错。直接返回 null
-        if (obj == null)
-        {
-            return null;
-        }
-        Validate.notBlank(methodName, "methodName can't be blank");
-        for (Class<?> searchType = obj.getClass(); searchType != Object.class; searchType = searchType.getSuperclass())
-        {
-            Method[] methods = searchType.getDeclaredMethods();
-            for (Method method : methods)
-            {
-                if (method.getName().equals(methodName) && method.getParameterTypes().length == argsNum)
-                {
-                    makeAccessible(method);
-                    return method;
-                }
-            }
-        }
-        return null;
-    }
-
-    /**
-     * 改变private/protected的方法为public，尽量不调用实际改动的语句，避免JDK的SecurityManager抱怨。
-     */
-    public static void makeAccessible(Method method)
-    {
-        if ((!Modifier.isPublic(method.getModifiers()) || !Modifier.isPublic(method.getDeclaringClass().getModifiers()))
-                && !method.isAccessible())
-        {
-            method.setAccessible(true);
-        }
-    }
-
-    /**
-     * 改变private/protected的成员变量为public，尽量不调用实际改动的语句，避免JDK的SecurityManager抱怨。
-     */
-    public static void makeAccessible(Field field)
-    {
-        if ((!Modifier.isPublic(field.getModifiers()) || !Modifier.isPublic(field.getDeclaringClass().getModifiers())
-                || Modifier.isFinal(field.getModifiers())) && !field.isAccessible())
-        {
-            field.setAccessible(true);
-        }
-    }
-
-    /**
-     * 通过反射, 获得Class定义中声明的泛型参数的类型, 注意泛型必须定义在父类处
-     * 如无法找到, 返回Object.class.
-     */
-    @SuppressWarnings("unchecked")
-    public static <T> Class<T> getClassGenricType(final Class clazz)
-    {
-        return getClassGenricType(clazz, 0);
-    }
-
-    /**
-     * 通过反射, 获得Class定义中声明的父类的泛型参数的类型.
-     * 如无法找到, 返回Object.class.
-     */
-    public static Class getClassGenricType(final Class clazz, final int index)
-    {
-        Type genType = clazz.getGenericSuperclass();
-
-        if (!(genType instanceof ParameterizedType))
-        {
-            logger.debug(clazz.getSimpleName() + "'s superclass not ParameterizedType");
-            return Object.class;
-        }
-
-        Type[] params = ((ParameterizedType) genType).getActualTypeArguments();
-
-        if (index >= params.length || index < 0)
-        {
-            logger.debug("Index: " + index + ", Size of " + clazz.getSimpleName() + "'s Parameterized Type: "
-                    + params.length);
-            return Object.class;
-        }
-        if (!(params[index] instanceof Class))
-        {
-            logger.debug(clazz.getSimpleName() + " not set the actual class on superclass generic parameter");
-            return Object.class;
-        }
-
-        return (Class) params[index];
-    }
-
-    public static Class<?> getUserClass(Object instance)
-    {
-        if (instance == null)
-        {
-            throw new RuntimeException("Instance must not be null");
-        }
-        Class clazz = instance.getClass();
-        if (clazz != null && clazz.getName().contains(CGLIB_CLASS_SEPARATOR))
-        {
-            Class<?> superClass = clazz.getSuperclass();
-            if (superClass != null && !Object.class.equals(superClass))
-            {
-                return superClass;
-            }
-        }
-        return clazz;
-
-    }
-
-    /**
-     * 将反射时的checked exception转换为unchecked exception.
-     */
-    public static RuntimeException convertReflectionExceptionToUnchecked(String msg, Exception e)
-    {
-        if (e instanceof IllegalAccessException || e instanceof IllegalArgumentException
-                || e instanceof NoSuchMethodException)
-        {
-            return new IllegalArgumentException(msg, e);
-        }
-        else if (e instanceof InvocationTargetException)
-        {
-            return new RuntimeException(msg, ((InvocationTargetException) e).getTargetException());
-        }
-        return new RuntimeException(msg, e);
-    }
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sign/Base64.java

@@ -1,291 +0,0 @@
-package com.ruoyi.common.core.utils.sign;
-
-/**
- * Base64工具类
- * 
- * @author ruoyi
- */
-public final class Base64
-{
-    static private final int     BASELENGTH           = 128;
-    static private final int     LOOKUPLENGTH         = 64;
-    static private final int     TWENTYFOURBITGROUP   = 24;
-    static private final int     EIGHTBIT             = 8;
-    static private final int     SIXTEENBIT           = 16;
-    static private final int     FOURBYTE             = 4;
-    static private final int     SIGN                 = -128;
-    static private final char    PAD                  = '=';
-    static final private byte[]  base64Alphabet       = new byte[BASELENGTH];
-    static final private char[]  lookUpBase64Alphabet = new char[LOOKUPLENGTH];
-
-    static
-    {
-        for (int i = 0; i < BASELENGTH; ++i)
-        {
-            base64Alphabet[i] = -1;
-        }
-        for (int i = 'Z'; i >= 'A'; i--)
-        {
-            base64Alphabet[i] = (byte) (i - 'A');
-        }
-        for (int i = 'z'; i >= 'a'; i--)
-        {
-            base64Alphabet[i] = (byte) (i - 'a' + 26);
-        }
-
-        for (int i = '9'; i >= '0'; i--)
-        {
-            base64Alphabet[i] = (byte) (i - '0' + 52);
-        }
-
-        base64Alphabet['+'] = 62;
-        base64Alphabet['/'] = 63;
-
-        for (int i = 0; i <= 25; i++)
-        {
-            lookUpBase64Alphabet[i] = (char) ('A' + i);
-        }
-
-        for (int i = 26, j = 0; i <= 51; i++, j++)
-        {
-            lookUpBase64Alphabet[i] = (char) ('a' + j);
-        }
-
-        for (int i = 52, j = 0; i <= 61; i++, j++)
-        {
-            lookUpBase64Alphabet[i] = (char) ('0' + j);
-        }
-        lookUpBase64Alphabet[62] = (char) '+';
-        lookUpBase64Alphabet[63] = (char) '/';
-    }
-
-    private static boolean isWhiteSpace(char octect)
-    {
-        return (octect == 0x20 || octect == 0xd || octect == 0xa || octect == 0x9);
-    }
-
-    private static boolean isPad(char octect)
-    {
-        return (octect == PAD);
-    }
-
-    private static boolean isData(char octect)
-    {
-        return (octect < BASELENGTH && base64Alphabet[octect] != -1);
-    }
-
-    /**
-     * Encodes hex octects into Base64
-     *
-     * @param binaryData Array containing binaryData
-     * @return Encoded Base64 array
-     */
-    public static String encode(byte[] binaryData)
-    {
-        if (binaryData == null)
-        {
-            return null;
-        }
-
-        int lengthDataBits = binaryData.length * EIGHTBIT;
-        if (lengthDataBits == 0)
-        {
-            return "";
-        }
-
-        int fewerThan24bits = lengthDataBits % TWENTYFOURBITGROUP;
-        int numberTriplets = lengthDataBits / TWENTYFOURBITGROUP;
-        int numberQuartet = fewerThan24bits != 0 ? numberTriplets + 1 : numberTriplets;
-        char encodedData[] = null;
-
-        encodedData = new char[numberQuartet * 4];
-
-        byte k = 0, l = 0, b1 = 0, b2 = 0, b3 = 0;
-
-        int encodedIndex = 0;
-        int dataIndex = 0;
-
-        for (int i = 0; i < numberTriplets; i++)
-        {
-            b1 = binaryData[dataIndex++];
-            b2 = binaryData[dataIndex++];
-            b3 = binaryData[dataIndex++];
-
-            l = (byte) (b2 & 0x0f);
-            k = (byte) (b1 & 0x03);
-
-            byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte) ((b1) >> 2 ^ 0xc0);
-            byte val2 = ((b2 & SIGN) == 0) ? (byte) (b2 >> 4) : (byte) ((b2) >> 4 ^ 0xf0);
-            byte val3 = ((b3 & SIGN) == 0) ? (byte) (b3 >> 6) : (byte) ((b3) >> 6 ^ 0xfc);
-
-            encodedData[encodedIndex++] = lookUpBase64Alphabet[val1];
-            encodedData[encodedIndex++] = lookUpBase64Alphabet[val2 | (k << 4)];
-            encodedData[encodedIndex++] = lookUpBase64Alphabet[(l << 2) | val3];
-            encodedData[encodedIndex++] = lookUpBase64Alphabet[b3 & 0x3f];
-        }
-
-        // form integral number of 6-bit groups
-        if (fewerThan24bits == EIGHTBIT)
-        {
-            b1 = binaryData[dataIndex];
-            k = (byte) (b1 & 0x03);
-            byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte) ((b1) >> 2 ^ 0xc0);
-            encodedData[encodedIndex++] = lookUpBase64Alphabet[val1];
-            encodedData[encodedIndex++] = lookUpBase64Alphabet[k << 4];
-            encodedData[encodedIndex++] = PAD;
-            encodedData[encodedIndex++] = PAD;
-        }
-        else if (fewerThan24bits == SIXTEENBIT)
-        {
-            b1 = binaryData[dataIndex];
-            b2 = binaryData[dataIndex + 1];
-            l = (byte) (b2 & 0x0f);
-            k = (byte) (b1 & 0x03);
-
-            byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte) ((b1) >> 2 ^ 0xc0);
-            byte val2 = ((b2 & SIGN) == 0) ? (byte) (b2 >> 4) : (byte) ((b2) >> 4 ^ 0xf0);
-
-            encodedData[encodedIndex++] = lookUpBase64Alphabet[val1];
-            encodedData[encodedIndex++] = lookUpBase64Alphabet[val2 | (k << 4)];
-            encodedData[encodedIndex++] = lookUpBase64Alphabet[l << 2];
-            encodedData[encodedIndex++] = PAD;
-        }
-        return new String(encodedData);
-    }
-
-    /**
-     * Decodes Base64 data into octects
-     *
-     * @param encoded string containing Base64 data
-     * @return Array containind decoded data.
-     */
-    public static byte[] decode(String encoded)
-    {
-        if (encoded == null)
-        {
-            return null;
-        }
-
-        char[] base64Data = encoded.toCharArray();
-        // remove white spaces
-        int len = removeWhiteSpace(base64Data);
-
-        if (len % FOURBYTE != 0)
-        {
-            return null;// should be divisible by four
-        }
-
-        int numberQuadruple = (len / FOURBYTE);
-
-        if (numberQuadruple == 0)
-        {
-            return new byte[0];
-        }
-
-        byte decodedData[] = null;
-        byte b1 = 0, b2 = 0, b3 = 0, b4 = 0;
-        char d1 = 0, d2 = 0, d3 = 0, d4 = 0;
-
-        int i = 0;
-        int encodedIndex = 0;
-        int dataIndex = 0;
-        decodedData = new byte[(numberQuadruple) * 3];
-
-        for (; i < numberQuadruple - 1; i++)
-        {
-
-            if (!isData((d1 = base64Data[dataIndex++])) || !isData((d2 = base64Data[dataIndex++]))
-                    || !isData((d3 = base64Data[dataIndex++])) || !isData((d4 = base64Data[dataIndex++])))
-            {
-                return null;
-            } // if found "no data" just return null
-
-            b1 = base64Alphabet[d1];
-            b2 = base64Alphabet[d2];
-            b3 = base64Alphabet[d3];
-            b4 = base64Alphabet[d4];
-
-            decodedData[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4);
-            decodedData[encodedIndex++] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf));
-            decodedData[encodedIndex++] = (byte) (b3 << 6 | b4);
-        }
-
-        if (!isData((d1 = base64Data[dataIndex++])) || !isData((d2 = base64Data[dataIndex++])))
-        {
-            return null;// if found "no data" just return null
-        }
-
-        b1 = base64Alphabet[d1];
-        b2 = base64Alphabet[d2];
-
-        d3 = base64Data[dataIndex++];
-        d4 = base64Data[dataIndex++];
-        if (!isData((d3)) || !isData((d4)))
-        {// Check if they are PAD characters
-            if (isPad(d3) && isPad(d4))
-            {
-                if ((b2 & 0xf) != 0)// last 4 bits should be zero
-                {
-                    return null;
-                }
-                byte[] tmp = new byte[i * 3 + 1];
-                System.arraycopy(decodedData, 0, tmp, 0, i * 3);
-                tmp[encodedIndex] = (byte) (b1 << 2 | b2 >> 4);
-                return tmp;
-            }
-            else if (!isPad(d3) && isPad(d4))
-            {
-                b3 = base64Alphabet[d3];
-                if ((b3 & 0x3) != 0)// last 2 bits should be zero
-                {
-                    return null;
-                }
-                byte[] tmp = new byte[i * 3 + 2];
-                System.arraycopy(decodedData, 0, tmp, 0, i * 3);
-                tmp[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4);
-                tmp[encodedIndex] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf));
-                return tmp;
-            }
-            else
-            {
-                return null;
-            }
-        }
-        else
-        { // No PAD e.g 3cQl
-            b3 = base64Alphabet[d3];
-            b4 = base64Alphabet[d4];
-            decodedData[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4);
-            decodedData[encodedIndex++] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf));
-            decodedData[encodedIndex++] = (byte) (b3 << 6 | b4);
-
-        }
-        return decodedData;
-    }
-
-    /**
-     * remove WhiteSpace from MIME containing encoded Base64 data.
-     *
-     * @param data the byte array of base64 data (with WS)
-     * @return the new length
-     */
-    private static int removeWhiteSpace(char[] data)
-    {
-        if (data == null)
-        {
-            return 0;
-        }
-
-        // count characters that's not whitespace
-        int newSize = 0;
-        int len = data.length;
-        for (int i = 0; i < len; i++)
-        {
-            if (!isWhiteSpace(data[i]))
-            {
-                data[newSize++] = data[i];
-            }
-        }
-        return newSize;
-    }
-}

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sql/SqlUtil.java

@@ -8,8 +8,7 @@ import com.ruoyi.common.core.utils.StringUtils;
  *
  * @author ruoyi
  */
-public class SqlUtil
+public class SqlUtil {
-{
     /**
      * 定义常用的 sql关键字
      */
@@ -23,10 +22,8 @@ public class SqlUtil
     /**
      * 检查字符，防止注入绕过
      */
-    public static String escapeOrderBySql(String value)
+    public static String escapeOrderBySql(String value) {
-    {
+        if (StringUtils.isNotEmpty(value) && !isValidOrderBySql(value)) {
-        if (StringUtils.isNotEmpty(value) && !isValidOrderBySql(value))
-        {
             throw new UtilException("参数不符合规范，不能进行查询");
         }
         return value;
@@ -35,25 +32,20 @@ public class SqlUtil
     /**
      * 验证 order by 语法是否符合规范
      */
-    public static boolean isValidOrderBySql(String value)
+    public static boolean isValidOrderBySql(String value) {
-    {
         return value.matches(SQL_PATTERN);
     }
 
     /**
      * SQL关键字检查
      */
-    public static void filterKeyword(String value)
+    public static void filterKeyword(String value) {
-    {
+        if (StringUtils.isEmpty(value)) {
-        if (StringUtils.isEmpty(value))
-        {
             return;
         }
         String[] sqlKeywords = StringUtils.split(SQL_REGEX, "\\|");
-        for (int i = 0; i < sqlKeywords.length; i++)
+        for (int i = 0; i < sqlKeywords.length; i++) {
-        {
+            if (StringUtils.indexOfIgnoreCase(value, sqlKeywords[i]) > -1) {
-            if (StringUtils.indexOfIgnoreCase(value, sqlKeywords[i]) > -1)
-            {
                 throw new UtilException("参数存在SQL注入风险");
             }
         }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java

@@ -1,20 +1,13 @@
 package com.ruoyi.common.core.web.controller;
 
-import java.beans.PropertyEditorSupport;
-import java.util.Date;
-import java.util.List;
-
-import lombok.extern.slf4j.Slf4j;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.web.bind.WebDataBinder;
-import org.springframework.web.bind.annotation.InitBinder;
 import com.github.pagehelper.PageInfo;
 import com.ruoyi.common.core.constant.HttpStatus;
-import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.PageUtils;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.List;
 
 /**
  * web层通用数据处理
@@ -22,14 +15,12 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
  * @author ruoyi
  */
 @Slf4j
-public class BaseController
+public class BaseController {
-{
 
     /**
      * 设置请求分页数据
      */
-    protected void startPage()
+    protected void startPage() {
-    {
         PageUtils.startPage();
     }
 
@@ -37,8 +28,7 @@ public class BaseController
      * 响应请求分页数据
      */
     @SuppressWarnings({"rawtypes", "unchecked"})
-    protected TableDataInfo getDataTable(List<?> list)
+    protected TableDataInfo getDataTable(List<?> list) {
-    {
         TableDataInfo rspData = new TableDataInfo();
         rspData.setCode(HttpStatus.SUCCESS);
         rspData.setRows(list);
@@ -53,8 +43,7 @@ public class BaseController
      * @param rows 影响行数
      * @return 操作结果
      */
-    protected AjaxResult toAjax(int rows)
+    protected AjaxResult toAjax(int rows) {
-    {
         return rows > 0 ? AjaxResult.success() : AjaxResult.error();
     }
 
@@ -64,40 +53,35 @@ public class BaseController
      * @param result 结果
      * @return 操作结果
      */
-    protected AjaxResult toAjax(boolean result)
+    protected AjaxResult toAjax(boolean result) {
-    {
         return result ? success() : error();
     }
 
     /**
      * 返回成功
      */
-    public AjaxResult success()
+    public AjaxResult success() {
-    {
         return AjaxResult.success();
     }
 
     /**
      * 返回失败消息
      */
-    public AjaxResult error()
+    public AjaxResult error() {
-    {
         return AjaxResult.error();
     }
 
     /**
      * 返回成功消息
      */
-    public AjaxResult success(String message)
+    public AjaxResult success(String message) {
-    {
         return AjaxResult.success(message);
     }
 
     /**
      * 返回失败消息
      */
-    public AjaxResult error(String message)
+    public AjaxResult error(String message) {
-    {
         return AjaxResult.error(message);
     }
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/AjaxResult.java

@@ -1,32 +1,37 @@
 package com.ruoyi.common.core.web.domain;
 
-import java.util.HashMap;
 import com.ruoyi.common.core.constant.HttpStatus;
 import com.ruoyi.common.core.utils.StringUtils;
 
+import java.util.HashMap;
+
 /**
  * 操作消息提醒
  *
  * @author ruoyi
  */
-public class AjaxResult extends HashMap<String, Object>
+public class AjaxResult extends HashMap<String, Object> {
-{
     private static final long serialVersionUID = 1L;
 
-    /** 状态码 */
+    /**
+     * 状态码
+     */
     public static final String CODE_TAG = "code";
 
-    /** 返回内容 */
+    /**
+     * 返回内容
+     */
     public static final String MSG_TAG = "msg";
 
-    /** 数据对象 */
+    /**
+     * 数据对象
+     */
     public static final String DATA_TAG = "data";
 
     /**
      * 初始化一个新创建的 AjaxResult 对象，使其表示一个空消息。
      */
-    public AjaxResult()
+    public AjaxResult() {
-    {
     }
 
     /**
@@ -35,8 +40,7 @@ public class AjaxResult extends HashMap<String, Object>
      * @param code 状态码
      * @param msg  返回内容
      */
-    public AjaxResult(int code, String msg)
+    public AjaxResult(int code, String msg) {
-    {
         super.put(CODE_TAG, code);
         super.put(MSG_TAG, msg);
     }
@@ -48,12 +52,10 @@ public class AjaxResult extends HashMap<String, Object>
      * @param msg  返回内容
      * @param data 数据对象
      */
-    public AjaxResult(int code, String msg, Object data)
+    public AjaxResult(int code, String msg, Object data) {
-    {
         super.put(CODE_TAG, code);
         super.put(MSG_TAG, msg);
-        if (StringUtils.isNotNull(data))
+        if (StringUtils.isNotNull(data)) {
-        {
             super.put(DATA_TAG, data);
         }
     }
@@ -66,8 +68,7 @@ public class AjaxResult extends HashMap<String, Object>
      * @return
      */
     @Override
-    public AjaxResult put(String key, Object value)
+    public AjaxResult put(String key, Object value) {
-    {
         super.put(key, value);
         return this;
     }
@@ -77,8 +78,7 @@ public class AjaxResult extends HashMap<String, Object>
      *
      * @return 成功消息
      */
-    public static AjaxResult success()
+    public static AjaxResult success() {
-    {
         return AjaxResult.success("操作成功");
     }
 
@@ -87,8 +87,7 @@ public class AjaxResult extends HashMap<String, Object>
      *
      * @return 成功消息
      */
-    public static AjaxResult success(Object data)
+    public static AjaxResult success(Object data) {
-    {
         return AjaxResult.success("操作成功", data);
     }
 
@@ -98,8 +97,7 @@ public class AjaxResult extends HashMap<String, Object>
      * @param msg 返回内容
      * @return 成功消息
      */
-    public static AjaxResult success(String msg)
+    public static AjaxResult success(String msg) {
-    {
         return AjaxResult.success(msg, null);
     }
 
@@ -110,8 +108,7 @@ public class AjaxResult extends HashMap<String, Object>
      * @param data 数据对象
      * @return 成功消息
      */
-    public static AjaxResult success(String msg, Object data)
+    public static AjaxResult success(String msg, Object data) {
-    {
         return new AjaxResult(HttpStatus.SUCCESS, msg, data);
     }
 
@@ -120,8 +117,7 @@ public class AjaxResult extends HashMap<String, Object>
      *
      * @return
      */
-    public static AjaxResult error()
+    public static AjaxResult error() {
-    {
         return AjaxResult.error("操作失败");
     }
 
@@ -131,8 +127,7 @@ public class AjaxResult extends HashMap<String, Object>
      * @param msg 返回内容
      * @return 警告消息
      */
-    public static AjaxResult error(String msg)
+    public static AjaxResult error(String msg) {
-    {
         return AjaxResult.error(msg, null);
     }
 
@@ -143,8 +138,7 @@ public class AjaxResult extends HashMap<String, Object>
      * @param data 数据对象
      * @return 警告消息
      */
-    public static AjaxResult error(String msg, Object data)
+    public static AjaxResult error(String msg, Object data) {
-    {
         return new AjaxResult(HttpStatus.ERROR, msg, data);
     }
 
@@ -155,8 +149,7 @@ public class AjaxResult extends HashMap<String, Object>
      * @param msg  返回内容
      * @return 警告消息
      */
-    public static AjaxResult error(int code, String msg)
+    public static AjaxResult error(int code, String msg) {
-    {
         return new AjaxResult(code, msg, null);
     }
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java

@@ -1,10 +1,11 @@
 package com.ruoyi.common.core.web.domain;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
-import lombok.Data;
 
 /**
  * Entity基类
@@ -12,35 +13,46 @@ import lombok.Data;
  * @author ruoyi
  */
 @Data
-public class BaseEntity implements Serializable
+public class BaseEntity implements Serializable {
-{
     private static final long serialVersionUID = 1L;
 
-    /** 搜索值 */
+    /**
+     * 搜索值
+     */
     private String searchValue;
 
-    /** 创建者 */
+    /**
+     * 创建者
+     */
     private String createBy;
 
-    /** 创建时间 */
+    /**
+     * 创建时间
+     */
     private Date createTime;
 
-    /** 更新者 */
+    /**
+     * 更新者
+     */
     private String updateBy;
 
-    /** 更新时间 */
+    /**
+     * 更新时间
+     */
     private Date updateTime;
 
-    /** 备注 */
+    /**
+     * 备注
+     */
     private String remark;
 
-    /** 请求参数 */
+    /**
+     * 请求参数
+     */
     private Map<String, Object> params;
 
-    public Map<String, Object> getParams()
+    public Map<String, Object> getParams() {
-    {
+        if (params == null) {
-        if (params == null)
-        {
             params = new HashMap<>();
         }
         return params;

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/TreeEntity.java

@@ -1,6 +1,7 @@
 package com.ruoyi.common.core.web.domain;
 
-import lombok.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -12,23 +13,32 @@ import java.util.List;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class TreeEntity extends BaseEntity
+public class TreeEntity extends BaseEntity {
-{
     private static final long serialVersionUID = 1L;
 
-    /** 父菜单名称 */
+    /**
+     * 父菜单名称
+     */
     private String parentName;
 
-    /** 父菜单ID */
+    /**
+     * 父菜单ID
+     */
     private Long parentId;
 
-    /** 显示顺序 */
+    /**
+     * 显示顺序
+     */
     private Integer orderNum;
 
-    /** 祖级列表 */
+    /**
+     * 祖级列表
+     */
     private String ancestors;
 
-    /** 子部门 */
+    /**
+     * 子部门
+     */
     private List<?> children = new ArrayList<>();
 
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java

@@ -9,53 +9,53 @@ import lombok.Data;
  * @author ruoyi
  */
 @Data
-public class PageDomain
+public class PageDomain {
-{
+    /**
-    /** 当前记录起始索引 */
+     * 当前记录起始索引
+     */
     private Integer pageNum;
 
-    /** 每页显示记录数 */
+    /**
+     * 每页显示记录数
+     */
     private Integer pageSize;
 
-    /** 排序列 */
+    /**
+     * 排序列
+     */
     private String orderByColumn;
 
-    /** 排序的方向desc或者asc */
+    /**
+     * 排序的方向desc或者asc
+     */
     private String isAsc = "asc";
 
-    /** 分页参数合理化 */
+    /**
+     * 分页参数合理化
+     */
     private Boolean reasonable = true;
 
-    public String getOrderBy()
+    public String getOrderBy() {
-    {
+        if (StringUtils.isEmpty(orderByColumn)) {
-        if (StringUtils.isEmpty(orderByColumn))
-        {
             return "";
         }
         return StringUtils.toUnderScoreCase(orderByColumn) + " " + isAsc;
     }
 
-    public void setIsAsc(String isAsc)
+    public void setIsAsc(String isAsc) {
-    {
+        if (StringUtils.isNotEmpty(isAsc)) {
-        if (StringUtils.isNotEmpty(isAsc))
-        {
             // 兼容前端排序类型
-            if ("ascending".equals(isAsc))
+            if ("ascending".equals(isAsc)) {
-            {
                 isAsc = "asc";
-            }
+            } else if ("descending".equals(isAsc)) {
-            else if ("descending".equals(isAsc))
-            {
                 isAsc = "desc";
             }
             this.isAsc = isAsc;
         }
     }
 
-    public Boolean getReasonable()
+    public Boolean getReasonable() {
-    {
+        if (StringUtils.isNull(reasonable)) {
-        if (StringUtils.isNull(reasonable))
-        {
             return Boolean.TRUE;
         }
         return reasonable;

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableDataInfo.java

@@ -13,20 +13,27 @@ import java.util.List;
  */
 @Data
 @NoArgsConstructor
-public class TableDataInfo implements Serializable
+public class TableDataInfo implements Serializable {
-{
     private static final long serialVersionUID = 1L;
 
-    /** 总记录数 */
+    /**
+     * 总记录数
+     */
     private long total;
 
-    /** 列表数据 */
+    /**
+     * 列表数据
+     */
     private List<?> rows;
 
-    /** 消息状态码 */
+    /**
+     * 消息状态码
+     */
     private int code;
 
-    /** 消息内容 */
+    /**
+     * 消息内容
+     */
     private String msg;
 
     /**
@@ -35,8 +42,7 @@ public class TableDataInfo implements Serializable
      * @param list  列表数据
      * @param total 总记录数
      */
-    public TableDataInfo(List<?> list, int total)
+    public TableDataInfo(List<?> list, int total) {
-    {
         this.rows = list;
         this.total = total;
     }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableSupport.java

@@ -7,8 +7,7 @@ import com.ruoyi.common.core.utils.ServletUtils;
  *
  * @author ruoyi
  */
-public class TableSupport
+public class TableSupport {
-{
     /**
      * 当前记录起始索引
      */
@@ -37,8 +36,7 @@ public class TableSupport
     /**
      * 封装分页对象
      */
-    public static PageDomain getPageDomain()
+    public static PageDomain getPageDomain() {
-    {
         PageDomain pageDomain = new PageDomain();
         pageDomain.setPageNum(ServletUtils.getParameterToInt(PAGE_NUM));
         pageDomain.setPageSize(ServletUtils.getParameterToInt(PAGE_SIZE));
@@ -48,8 +46,7 @@ public class TableSupport
         return pageDomain;
     }
 
-    public static PageDomain buildPageRequest()
+    public static PageDomain buildPageRequest() {
-    {
         return getPageDomain();
     }
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/Xss.java

@@ -15,8 +15,7 @@ import java.lang.annotation.Target;
 @Retention(RetentionPolicy.RUNTIME)
 @Target(value = {ElementType.METHOD, ElementType.FIELD, ElementType.CONSTRUCTOR, ElementType.PARAMETER})
 @Constraint(validatedBy = {XssValidator.class})
-public @interface Xss
+public @interface Xss {
-{
     String message()
 
             default "不允许任何脚本运行";

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/XssValidator.java

@@ -10,18 +10,15 @@ import java.util.regex.Pattern;
  *
  * @author ruoyi
  */
-public class XssValidator implements ConstraintValidator<Xss, String>
+public class XssValidator implements ConstraintValidator<Xss, String> {
-{
     private final String HTML_PATTERN = "<(\\S*?)[^>]*>.*?|<.*? />";
 
     @Override
-    public boolean isValid(String value, ConstraintValidatorContext constraintValidatorContext)
+    public boolean isValid(String value, ConstraintValidatorContext constraintValidatorContext) {
-    {
         return !containsHtml(value);
     }
 
-    public boolean containsHtml(String value)
+    public boolean containsHtml(String value) {
-    {
         Pattern pattern = Pattern.compile(HTML_PATTERN);
         Matcher matcher = pattern.matcher(value);
         return matcher.matches();

ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/annotation/DataScope.java

@@ -1,10 +1,6 @@
 package com.ruoyi.common.datascope.annotation;
 
-import java.lang.annotation.Documented;
+import java.lang.annotation.*;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
 
 /**
  * 数据权限过滤注解
@@ -14,15 +10,15 @@ import java.lang.annotation.Target;
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
-public @interface DataScope
+public @interface DataScope {
-{
+
     /**
      * 部门表的别名
      */
-    public String deptAlias() default "";
+    String deptAlias() default "";
 
     /**
      * 用户表的别名
      */
-    public String userAlias() default "";
+    String userAlias() default "";
 }

ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java

@@ -1,9 +1,5 @@
 package com.ruoyi.common.datascope.aspect;
 
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
-import org.springframework.stereotype.Component;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import com.ruoyi.common.datascope.annotation.DataScope;
@@ -11,6 +7,10 @@ import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.domain.SysRole;
 import com.ruoyi.system.api.domain.SysUser;
 import com.ruoyi.system.api.model.LoginUser;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.springframework.stereotype.Component;
 
 /**
  * 数据过滤处理
@@ -19,8 +19,7 @@ import com.ruoyi.system.api.model.LoginUser;
  */
 @Aspect
 @Component
-public class DataScopeAspect
+public class DataScopeAspect {
-{
     /**
      * 全部数据权限
      */
@@ -52,22 +51,18 @@ public class DataScopeAspect
     public static final String DATA_SCOPE = "dataScope";
 
     @Before("@annotation(controllerDataScope)")
-    public void doBefore(JoinPoint point, DataScope controllerDataScope) throws Throwable
+    public void doBefore(JoinPoint point, DataScope controllerDataScope) throws Throwable {
-    {
         clearDataScope(point);
         handleDataScope(point, controllerDataScope);
     }
 
-    protected void handleDataScope(final JoinPoint joinPoint, DataScope controllerDataScope)
+    protected void handleDataScope(final JoinPoint joinPoint, DataScope controllerDataScope) {
-    {
         // 获取当前的用户
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        if (StringUtils.isNotNull(loginUser))
+        if (StringUtils.isNotNull(loginUser)) {
-        {
             SysUser currentUser = loginUser.getSysUser();
             // 如果是超级管理员，则不过滤数据
-            if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin())
+            if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin()) {
-            {
                 dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(),
                         controllerDataScope.userAlias());
             }
@@ -82,53 +77,37 @@ public class DataScopeAspect
      * @param deptAlias 部门别名
      * @param userAlias 用户别名
      */
-    public static void dataScopeFilter(JoinPoint joinPoint, SysUser user, String deptAlias, String userAlias)
+    public static void dataScopeFilter(JoinPoint joinPoint, SysUser user, String deptAlias, String userAlias) {
-    {
         StringBuilder sqlString = new StringBuilder();
 
-        for (SysRole role : user.getRoles())
+        for (SysRole role : user.getRoles()) {
-        {
             String dataScope = role.getDataScope();
-            if (DATA_SCOPE_ALL.equals(dataScope))
+            if (DATA_SCOPE_ALL.equals(dataScope)) {
-            {
                 sqlString = new StringBuilder();
                 break;
-            }
+            } else if (DATA_SCOPE_CUSTOM.equals(dataScope)) {
-            else if (DATA_SCOPE_CUSTOM.equals(dataScope))
-            {
                 sqlString.append(StringUtils.format(
                         " OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", deptAlias,
                         role.getRoleId()));
-            }
+            } else if (DATA_SCOPE_DEPT.equals(dataScope)) {
-            else if (DATA_SCOPE_DEPT.equals(dataScope))
-            {
                 sqlString.append(StringUtils.format(" OR {}.dept_id = {} ", deptAlias, user.getDeptId()));
-            }
+            } else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope)) {
-            else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope))
-            {
                 sqlString.append(StringUtils.format(
                         " OR {}.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )",
                         deptAlias, user.getDeptId(), user.getDeptId()));
-            }
+            } else if (DATA_SCOPE_SELF.equals(dataScope)) {
-            else if (DATA_SCOPE_SELF.equals(dataScope))
+                if (StringUtils.isNotBlank(userAlias)) {
-            {
-                if (StringUtils.isNotBlank(userAlias))
-                {
                     sqlString.append(StringUtils.format(" OR {}.user_id = {} ", userAlias, user.getUserId()));
-                }
+                } else {
-                else
-                {
                     // 数据权限为仅本人且没有userAlias别名不查询任何数据
                     sqlString.append(" OR 1=0 ");
                 }
             }
         }
 
-        if (StringUtils.isNotBlank(sqlString.toString()))
+        if (StringUtils.isNotBlank(sqlString.toString())) {
-        {
             Object params = joinPoint.getArgs()[0];
-            if (StringUtils.isNotNull(params) && params instanceof BaseEntity)
+            if (StringUtils.isNotNull(params) && params instanceof BaseEntity) {
-            {
                 BaseEntity baseEntity = (BaseEntity) params;
                 baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")");
             }
@@ -138,11 +117,9 @@ public class DataScopeAspect
     /**
      * 拼接权限sql前先清空params.dataScope参数防止注入
      */
-    private void clearDataScope(final JoinPoint joinPoint)
+    private void clearDataScope(final JoinPoint joinPoint) {
-    {
         Object params = joinPoint.getArgs()[0];
-        if (StringUtils.isNotNull(params) && params instanceof BaseEntity)
+        if (StringUtils.isNotNull(params) && params instanceof BaseEntity) {
-        {
             BaseEntity baseEntity = (BaseEntity) params;
             baseEntity.getParams().put(DATA_SCOPE, "");
         }

ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Master.java

@@ -1,12 +1,9 @@
 package com.ruoyi.common.datasource.annotation;
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
 import com.baomidou.dynamic.datasource.annotation.DS;
 
+import java.lang.annotation.*;
+
 /**
  * 主库数据源
  *
@@ -16,7 +13,6 @@ import com.baomidou.dynamic.datasource.annotation.DS;
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 @DS("master")
-public @interface Master
+public @interface Master {
-{
 
 }

ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Slave.java

@@ -1,12 +1,9 @@
 package com.ruoyi.common.datasource.annotation;
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
 import com.baomidou.dynamic.datasource.annotation.DS;
 
+import java.lang.annotation.*;
+
 /**
  * 从库数据源
  *
@@ -16,7 +13,6 @@ import com.baomidou.dynamic.datasource.annotation.DS;
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 @DS("slave")
-public @interface Slave
+public @interface Slave {
-{
 
 }

ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/annotation/Log.java

@@ -1,46 +1,41 @@
 package com.ruoyi.common.log.annotation;
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.log.enums.OperatorType;
 
+import java.lang.annotation.*;
+
 /**
  * 自定义操作日志记录注解
  *
  * @author ruoyi
- *
  */
 @Target({ElementType.PARAMETER, ElementType.METHOD})
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
-public @interface Log
+public @interface Log {
-{
     /**
      * 模块
      */
-    public String title() default "";
+    String title() default "";
 
     /**
      * 功能
      */
-    public BusinessType businessType() default BusinessType.OTHER;
+    BusinessType businessType() default BusinessType.OTHER;
 
     /**
      * 操作人类别
      */
-    public OperatorType operatorType() default OperatorType.MANAGE;
+    OperatorType operatorType() default OperatorType.MANAGE;
 
     /**
      * 是否保存请求的参数
      */
-    public boolean isSaveRequestData() default true;
+    boolean isSaveRequestData() default true;
 
     /**
      * 是否保存响应的参数
      */
-    public boolean isSaveResponseData() default true;
+    boolean isSaveResponseData() default true;
 }

ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java

@@ -1,11 +1,14 @@
 package com.ruoyi.common.log.aspect;
 
-import java.util.Collection;
-import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.ruoyi.common.core.utils.JsonUtils;
+import com.ruoyi.common.core.utils.ServletUtils;
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.utils.ip.IpUtils;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessStatus;
+import com.ruoyi.common.log.service.AsyncLogService;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.api.domain.SysOperLog;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
@@ -16,14 +19,11 @@ import org.springframework.http.HttpMethod;
 import org.springframework.stereotype.Component;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.multipart.MultipartFile;
-import com.ruoyi.common.core.utils.ServletUtils;
+
-import com.ruoyi.common.core.utils.StringUtils;
+import javax.servlet.http.HttpServletRequest;
-import com.ruoyi.common.core.utils.ip.IpUtils;
+import javax.servlet.http.HttpServletResponse;
-import com.ruoyi.common.log.annotation.Log;
+import java.util.Collection;
-import com.ruoyi.common.log.enums.BusinessStatus;
+import java.util.Map;
-import com.ruoyi.common.log.service.AsyncLogService;
-import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.domain.SysOperLog;
 
 /**
  * 操作日志记录处理
@@ -33,8 +33,7 @@ import com.ruoyi.system.api.domain.SysOperLog;
 @Slf4j
 @Aspect
 @Component
-public class LogAspect
+public class LogAspect {
-{
 
     @Autowired
     private AsyncLogService asyncLogService;
@@ -45,8 +44,7 @@ public class LogAspect
      * @param joinPoint 切点
      */
     @AfterReturning(pointcut = "@annotation(controllerLog)", returning = "jsonResult")
-    public void doAfterReturning(JoinPoint joinPoint, Log controllerLog, Object jsonResult)
+    public void doAfterReturning(JoinPoint joinPoint, Log controllerLog, Object jsonResult) {
-    {
         handleLog(joinPoint, controllerLog, null, jsonResult);
     }
 
@@ -57,15 +55,12 @@ public class LogAspect
      * @param e         异常
      */
     @AfterThrowing(value = "@annotation(controllerLog)", throwing = "e")
-    public void doAfterThrowing(JoinPoint joinPoint, Log controllerLog, Exception e)
+    public void doAfterThrowing(JoinPoint joinPoint, Log controllerLog, Exception e) {
-    {
         handleLog(joinPoint, controllerLog, e, null);
     }
 
-    protected void handleLog(final JoinPoint joinPoint, Log controllerLog, final Exception e, Object jsonResult)
+    protected void handleLog(final JoinPoint joinPoint, Log controllerLog, final Exception e, Object jsonResult) {
-    {
+        try {
-        try
-        {
             // *========数据库日志=========*//
             SysOperLog operLog = new SysOperLog();
             operLog.setStatus(BusinessStatus.SUCCESS.ordinal());
@@ -74,13 +69,11 @@ public class LogAspect
             operLog.setOperIp(ip);
             operLog.setOperUrl(ServletUtils.getRequest().getRequestURI());
             String username = SecurityUtils.getUsername();
-            if (StringUtils.isNotBlank(username))
+            if (StringUtils.isNotBlank(username)) {
-            {
                 operLog.setOperName(username);
             }
 
-            if (e != null)
+            if (e != null) {
-            {
                 operLog.setStatus(BusinessStatus.FAIL.ordinal());
                 operLog.setErrorMsg(StringUtils.substring(e.getMessage(), 0, 2000));
             }
@@ -94,9 +87,7 @@ public class LogAspect
             getControllerMethodDescription(joinPoint, controllerLog, operLog, jsonResult);
             // 保存数据库
             asyncLogService.saveSysLog(operLog);
-        }
+        } catch (Exception exp) {
-        catch (Exception exp)
-        {
             // 记录本地异常日志
             log.error("==前置通知异常==");
             log.error("异常信息:{}", exp.getMessage());
@@ -111,8 +102,7 @@ public class LogAspect
      * @param operLog 操作日志
      * @throws Exception
      */
-    public void getControllerMethodDescription(JoinPoint joinPoint, Log log, SysOperLog operLog, Object jsonResult) throws Exception
+    public void getControllerMethodDescription(JoinPoint joinPoint, Log log, SysOperLog operLog, Object jsonResult) throws Exception {
-    {
         // 设置action动作
         operLog.setBusinessType(log.businessType().ordinal());
         // 设置标题
@@ -120,14 +110,12 @@ public class LogAspect
         // 设置操作人类别
         operLog.setOperatorType(log.operatorType().ordinal());
         // 是否需要保存request，参数和值
-        if (log.isSaveRequestData())
+        if (log.isSaveRequestData()) {
-        {
             // 获取参数的信息，传入到数据库中。
             setRequestValue(joinPoint, operLog);
         }
         // 是否需要保存response，参数和值
-        if (log.isSaveResponseData() && StringUtils.isNotNull(jsonResult))
+        if (log.isSaveResponseData() && StringUtils.isNotNull(jsonResult)) {
-        {
             operLog.setJsonResult(StringUtils.substring(JsonUtils.toJsonString(jsonResult), 0, 2000));
         }
     }
@@ -138,11 +126,9 @@ public class LogAspect
      * @param operLog 操作日志
      * @throws Exception 异常
      */
-    private void setRequestValue(JoinPoint joinPoint, SysOperLog operLog) throws Exception
+    private void setRequestValue(JoinPoint joinPoint, SysOperLog operLog) throws Exception {
-    {
         String requestMethod = operLog.getRequestMethod();
-        if (HttpMethod.PUT.name().equals(requestMethod) || HttpMethod.POST.name().equals(requestMethod))
+        if (HttpMethod.PUT.name().equals(requestMethod) || HttpMethod.POST.name().equals(requestMethod)) {
-        {
             String params = argsArrayToString(joinPoint.getArgs());
             operLog.setOperParam(StringUtils.substring(params, 0, 2000));
         }
@@ -151,21 +137,14 @@ public class LogAspect
     /**
      * 参数拼装
      */
-    private String argsArrayToString(Object[] paramsArray)
+    private String argsArrayToString(Object[] paramsArray) {
-    {
         StringBuilder params = new StringBuilder();
-        if (paramsArray != null && paramsArray.length > 0)
+        if (paramsArray != null && paramsArray.length > 0) {
-        {
+            for (Object o : paramsArray) {
-            for (Object o : paramsArray)
+                if (StringUtils.isNotNull(o) && !isFilterObject(o)) {
-            {
+                    try {
-                if (StringUtils.isNotNull(o) && !isFilterObject(o))
-                {
-                    try
-                    {
                         params.append(JsonUtils.toJsonString(o)).append(" ");
-                    }
+                    } catch (Exception e) {
-                    catch (Exception e)
-                    {
                     }
                 }
             }
@@ -180,26 +159,18 @@ public class LogAspect
      * @return 如果是需要过滤的对象，则返回true；否则返回false。
      */
     @SuppressWarnings("rawtypes")
-    public boolean isFilterObject(final Object o)
+    public boolean isFilterObject(final Object o) {
-    {
         Class<?> clazz = o.getClass();
-        if (clazz.isArray())
+        if (clazz.isArray()) {
-        {
             return clazz.getComponentType().isAssignableFrom(MultipartFile.class);
-        }
+        } else if (Collection.class.isAssignableFrom(clazz)) {
-        else if (Collection.class.isAssignableFrom(clazz))
-        {
             Collection collection = (Collection) o;
-            for (Object value : collection)
+            for (Object value : collection) {
-            {
                 return value instanceof MultipartFile;
             }
-        }
+        } else if (Map.class.isAssignableFrom(clazz)) {
-        else if (Map.class.isAssignableFrom(clazz))
-        {
             Map map = (Map) o;
-            for (Object value : map.entrySet())
+            for (Object value : map.entrySet()) {
-            {
                 Map.Entry entry = (Map.Entry) value;
                 return entry.getValue() instanceof MultipartFile;
             }

ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessStatus.java

@@ -4,10 +4,8 @@ package com.ruoyi.common.log.enums;
  * 操作状态
  *
  * @author ruoyi
- *
  */
-public enum BusinessStatus
+public enum BusinessStatus {
-{
     /**
      * 成功
      */

ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessType.java

@@ -5,8 +5,7 @@ package com.ruoyi.common.log.enums;
  *
  * @author ruoyi
  */
-public enum BusinessType
+public enum BusinessType {
-{
     /**
      * 其它
      */