msb-public-java
/
RuoYi-Cloud
mirror of https://gitee.com/y_project/RuoYi-Cloud.git
1
0
Code Issues Projects Releases Wiki Activity

修改若依规范化修改

Browse Source
pull/130/head
Lambert 4 years ago
parent efaaacabb0
commit 66d58533b0
26 changed files with 121 additions and 76 deletions
Show Stats Download Patch File Download Diff File

9
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteLogService.java
Unescape View File

@ -1,15 +1,16 @@
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.stereotype.Repository;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
/**
* 日志服务

4
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
Unescape View File

@ -26,10 +26,10 @@ import com.ruoyi.system.api.model.LoginUser;
@Component
public class SysLoginService
{
@Autowired
@Autowired(required = false)
private RemoteLogService remoteLogService;
@Autowired
@Autowired(required = false)
private RemoteUserService remoteUserService;
/**

1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/GlobalException.java
Unescape View File

@ -45,6 +45,7 @@ public class GlobalException extends RuntimeException
return this;
}
@Override
public String getMessage()
{
return message;

1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java
Unescape View File

@ -49,6 +49,7 @@ public final class ServiceException extends RuntimeException
return detailMessage;
}
@Override
public String getMessage()
{
return message;

5
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ExceptionUtil.java
Unescape View File

@ -22,6 +22,11 @@ public class ExceptionUtil
return str;
}
/**
* 获取根错误消息
* @param e
* @return 错误消息
*/
public static String getRootErrorMessage(Exception e)
{
Throwable root = ExceptionUtils.getRootCause(e);

5
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ReUtil.java
Unescape View File

@ -1,5 +1,7 @@
package com.ruoyi.common.core.utils;
import com.ruoyi.common.core.text.Convert;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
@ -7,9 +9,6 @@ import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.core.utils.StringUtils;
public class ReUtil
{
public final static Pattern GROUP_VAR = Pattern.compile("\\$(\\d+)");

11
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java
Unescape View File

@ -130,6 +130,12 @@ public class ServletUtils
}
}
/**
* 获取信息头
* @param request 参数
* @param name 名字
* @return 信息头
*/
public static String getHeader(HttpServletRequest request, String name)
{
String value = request.getHeader(name);
@ -140,6 +146,11 @@ public class ServletUtils
return urlDecode(value);
}
/**
* 获取信息头
* @param request 参数
* @return 信息头
*/
public static Map<String, String> getHeaders(HttpServletRequest request)
{
Map<String, String> map = new LinkedHashMap<>();

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java
Unescape View File

@ -55,7 +55,7 @@ public class ImageUtils
/**
* 读取文件为字节数据
*
* @param key 地址
* @param url 地址
* @return 字节数据
*/
public static byte[] readFile(String url)

97
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java
Unescape View File

@ -3,19 +3,20 @@ package com.ruoyi.common.core.utils.ip;
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 static String getIpAddr(HttpServletRequest request)
{
if (request == null)
{
public class IpUtils {
public static String UNKNOWN = "unknown";
public static String getIpAddr(HttpServletRequest request) {
if (request == null) {
return null;
}
@ -23,51 +24,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)
{
if (StringUtils.isNull(addr) || addr.length < 2)
{
private static boolean internalIp(byte[] addr) {
if (StringUtils.isNull(addr) || addr.length < 2) {
return true;
}
final byte b0 = addr[0];
@ -81,18 +73,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;
}
@ -103,28 +92,24 @@ public class IpUtils
/**
* 将IPv4地址转换成字节
*
*
* @param text IPv4地址
* @return byte 字节
*/
public static byte[] textToNumericFormatV4(String text)
{
if (text.length() == 0)
{
public static byte[] textToNumericFormatV4(String text) {
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)){
if ((l < 0L) || (l > 4294967295L)) {
return null;
}
bytes[0] = (byte) (int) (l >> 24 & 0xFF);
@ -147,8 +132,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 +147,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 +158,24 @@ public class IpUtils
default:
return null;
}
}
catch (NumberFormatException e)
{
} catch (NumberFormatException e) {
return null;
}
return bytes;
}
public static String getHostIp()
{
try
{
public static String getHostIp() {
try {
return InetAddress.getLocalHost().getHostAddress();
}
catch (UnknownHostException e)
{
} catch (UnknownHostException e) {
}
return "127.0.0.1";
}
public static String getHostName()
{
try
{
public static String getHostName() {
try {
return InetAddress.getLocalHost().getHostName();
}
catch (UnknownHostException e)
{
} catch (UnknownHostException e) {
}
return "未知";
}

5
ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java
Unescape View File

@ -58,6 +58,11 @@ public class DataScopeAspect
handleDataScope(point, controllerDataScope);
}
/**
* 处理数据范围
* @param joinPoint JoinPoint
* @param controllerDataScope DataScope
*/
protected void handleDataScope(final JoinPoint joinPoint, DataScope controllerDataScope)
{
// 获取当前的用户

7
ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java
Unescape View File

@ -62,6 +62,13 @@ public class LogAspect
handleLog(joinPoint, controllerLog, e, null);
}
/**
* 处理日志
* @param joinPoint
* @param controllerLog
* @param e
* @param jsonResult
*/
protected void handleLog(final JoinPoint joinPoint, Log controllerLog, final Exception e, Object jsonResult)
{
try

2
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthUtil.java
Unescape View File

@ -27,7 +27,7 @@ public class AuthUtil
/**
* 会话注销，根据指定Token
*
* @param tokenValue 指定token
* @param token 指定token
*/
public static void logoutByToken(String token)
{

8
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/interceptor/HeaderInterceptor.java
Unescape View File

@ -45,6 +45,14 @@ public class HeaderInterceptor implements AsyncHandlerInterceptor
return true;
}
/**
* 完成后的操作
* @param request 参数
* @param response 响应
* @param handler 处理人
* @param ex 参数
* @throws Exception 响应异常
*/
@Override
public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex)
throws Exception

5
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java
Unescape View File

@ -162,6 +162,11 @@ public class TokenService
redisService.setCacheObject(userKey, loginUser, expireTime, TimeUnit.MINUTES);
}
/**
* 获取令牌
* @param token 令牌
* @return 令牌
*/
private String getTokenKey(String token)
{
return ACCESS_TOKEN + token;

2
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobLogMapper.java
Unescape View File

@ -2,12 +2,14 @@ package com.ruoyi.job.mapper;
import java.util.List;
import com.ruoyi.job.domain.SysJobLog;
import org.springframework.stereotype.Service;
/**
* 调度任务日志信息 数据层
*
* @author ruoyi
*/
@Service
public interface SysJobLogMapper
{
/**

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java
Unescape View File

@ -3,12 +3,14 @@ package com.ruoyi.system.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.ruoyi.system.api.domain.SysDictData;
import org.springframework.stereotype.Service;
/**
* 字典表 数据层
*
* @author ruoyi
*/
@Service
public interface SysDictDataMapper
{
/**

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
Unescape View File

@ -3,12 +3,14 @@ package com.ruoyi.system.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.ruoyi.system.domain.SysMenu;
import org.springframework.stereotype.Service;
/**
* 菜单表 数据层
*
* @author ruoyi
*/
@Service
public interface SysMenuMapper
{
/**

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java
Unescape View File

@ -2,12 +2,14 @@ package com.ruoyi.system.mapper;
import java.util.List;
import com.ruoyi.system.domain.SysNotice;
import org.springframework.stereotype.Service;
/**
* 通知公告表 数据层
*
* @author ruoyi
*/
@Service
public interface SysNoticeMapper
{
/**

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java
Unescape View File

@ -2,12 +2,14 @@ package com.ruoyi.system.mapper;
import java.util.List;
import com.ruoyi.system.api.domain.SysOperLog;
import org.springframework.stereotype.Service;
/**
* 操作日志 数据层
*
* @author ruoyi
*/
@Service
public interface SysOperLogMapper
{
/**

5
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java
Unescape View File

@ -1,13 +1,16 @@
package com.ruoyi.system.mapper;
import java.util.List;
import com.ruoyi.system.domain.SysPost;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* 岗位信息 数据层
*
* @author ruoyi
*/
@Mapper
public interface SysPostMapper
{
/**

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java
Unescape View File

@ -2,12 +2,14 @@ package com.ruoyi.system.mapper;
import java.util.List;
import com.ruoyi.system.domain.SysRoleDept;
import org.apache.ibatis.annotations.Mapper;
/**
* 角色与部门关联表 数据层
*
* @author ruoyi
*/
@Mapper
public interface SysRoleDeptMapper
{
/**

5
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java
Unescape View File

@ -1,13 +1,16 @@
package com.ruoyi.system.mapper;
import java.util.List;
import com.ruoyi.system.api.domain.SysRole;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* 角色表 数据层
*
* @author ruoyi
*/
@Mapper
public interface SysRoleMapper
{
/**

5
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java
Unescape View File

@ -1,13 +1,16 @@
package com.ruoyi.system.mapper;
import java.util.List;
import com.ruoyi.system.domain.SysRoleMenu;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* 角色与菜单关联表 数据层
*
* @author ruoyi
*/
@Mapper
public interface SysRoleMenuMapper
{
/**

3
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
Unescape View File

@ -1,6 +1,8 @@
package com.ruoyi.system.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import com.ruoyi.system.api.domain.SysUser;
@ -9,6 +11,7 @@ import com.ruoyi.system.api.domain.SysUser;
*
* @author ruoyi
*/
@Mapper
public interface SysUserMapper
{
/**

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java
Unescape View File

@ -2,12 +2,14 @@ package com.ruoyi.system.mapper;
import java.util.List;
import com.ruoyi.system.domain.SysUserPost;
import org.apache.ibatis.annotations.Mapper;
/**
* 用户与岗位关联表 数据层
*
* @author ruoyi
*/
@Mapper
public interface SysUserPostMapper
{
/**

3
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java
Unescape View File

@ -1,6 +1,8 @@
package com.ruoyi.system.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import com.ruoyi.system.domain.SysUserRole;
@ -9,6 +11,7 @@ import com.ruoyi.system.domain.SysUserRole;
*
* @author ruoyi
*/
@Mapper
public interface SysUserRoleMapper
{
/**

Write Preview
Loading…
Cancel
Save