diff --git a/common/src/main/java/com/storeroom/utils/StringUtils.java b/common/src/main/java/com/storeroom/utils/StringUtils.java index c003a62..eba540b 100644 --- a/common/src/main/java/com/storeroom/utils/StringUtils.java +++ b/common/src/main/java/com/storeroom/utils/StringUtils.java @@ -24,7 +24,7 @@ import java.util.Date; import java.util.Enumeration; -public class StringUtils extends org.apache.commons.lang3.StringUtils{ +public class StringUtils extends org.apache.commons.lang3.StringUtils { private static final Logger log = LoggerFactory.getLogger(StringUtils.class); private static boolean ipLocal = false; @@ -178,6 +178,15 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils{ } } + /** + * 获取端口号 + * @param request + * @return + */ + public static String getPort(HttpServletRequest request) { + return request.getLocalPort() + ""; + } + /** * 根据ip获取详细地址 */ @@ -237,10 +246,10 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils{ try { InetAddress candidateAddress = null; // 遍历所有的网络接口 - for (Enumeration interfaces = NetworkInterface.getNetworkInterfaces(); interfaces.hasMoreElements();) { + for (Enumeration interfaces = NetworkInterface.getNetworkInterfaces(); interfaces.hasMoreElements(); ) { NetworkInterface anInterface = interfaces.nextElement(); // 在所有的接口下再遍历IP - for (Enumeration inetAddresses = anInterface.getInetAddresses(); inetAddresses.hasMoreElements();) { + for (Enumeration inetAddresses = anInterface.getInetAddresses(); inetAddresses.hasMoreElements(); ) { InetAddress inetAddr = inetAddresses.nextElement(); // 排除loopback类型地址 if (!inetAddr.isLoopbackAddress()) { diff --git a/logging/src/main/java/com/storeroom/annotation/Log.java b/logging/src/main/java/com/storeroom/annotation/Log.java index 3266944..333a6ad 100644 --- a/logging/src/main/java/com/storeroom/annotation/Log.java +++ b/logging/src/main/java/com/storeroom/annotation/Log.java @@ -10,4 +10,6 @@ import java.lang.annotation.Target; @Retention(RetentionPolicy.RUNTIME) public @interface Log { String value() default ""; + + String apiAddress() default ""; } diff --git a/logging/src/main/java/com/storeroom/aspect/LogAspect.java b/logging/src/main/java/com/storeroom/aspect/LogAspect.java index c91c67b..a02f677 100644 --- a/logging/src/main/java/com/storeroom/aspect/LogAspect.java +++ b/logging/src/main/java/com/storeroom/aspect/LogAspect.java @@ -50,10 +50,12 @@ public class LogAspect { Object result; currentTime.set(System.currentTimeMillis()); result = joinPoint.proceed(); - Log log = new Log("INFO",System.currentTimeMillis() - currentTime.get()); + Log log = new Log("INFO", System.currentTimeMillis() - currentTime.get()); currentTime.remove(); HttpServletRequest request = RequestHolder.getHttpServletRequest(); - logService.save(getUsername(), StringUtils.getBrowser(request), StringUtils.getIp(request),joinPoint, log); + //获取端口号 + log.setPort(StringUtils.getPort(request)); + logService.save(getUsername(), StringUtils.getBrowser(request), StringUtils.getIp(request), joinPoint, log); return result; } @@ -61,21 +63,21 @@ public class LogAspect { * 配置异常通知 * * @param joinPoint join point for advice - * @param e exception + * @param e exception */ @AfterThrowing(pointcut = "logPointcut()", throwing = "e") public void logAfterThrowing(JoinPoint joinPoint, Throwable e) { - Log log = new Log("ERROR",System.currentTimeMillis() - currentTime.get()); + Log log = new Log("ERROR", System.currentTimeMillis() - currentTime.get()); currentTime.remove(); log.setExceptionDetail(ThrowableUtil.getStackTrace(e).getBytes()); HttpServletRequest request = RequestHolder.getHttpServletRequest(); - logService.save(getUsername(), StringUtils.getBrowser(request), StringUtils.getIp(request), (ProceedingJoinPoint)joinPoint, log); + logService.save(getUsername(), StringUtils.getBrowser(request), StringUtils.getIp(request), (ProceedingJoinPoint) joinPoint, log); } public String getUsername() { try { return SecurityUtils.getCurrentUsername(); - }catch (Exception e){ + } catch (Exception e) { return ""; } } diff --git a/logging/src/main/java/com/storeroom/domain/Log.java b/logging/src/main/java/com/storeroom/domain/Log.java index 955f165..1faf60a 100644 --- a/logging/src/main/java/com/storeroom/domain/Log.java +++ b/logging/src/main/java/com/storeroom/domain/Log.java @@ -36,6 +36,12 @@ public class Log implements Serializable { /** 日志类型 */ private String logType; + /** 端口号 **/ + private String port; + + /**接口名称**/ + private String ApiName; + /** 请求ip */ private String requestIp; diff --git a/logging/src/main/java/com/storeroom/service/impl/LogServiceImpl.java b/logging/src/main/java/com/storeroom/service/impl/LogServiceImpl.java index d852572..4f83585 100644 --- a/logging/src/main/java/com/storeroom/service/impl/LogServiceImpl.java +++ b/logging/src/main/java/com/storeroom/service/impl/LogServiceImpl.java @@ -71,7 +71,7 @@ public class LogServiceImpl implements LogService { // 描述 log.setDescription(aopLog.value()); - + log.setApiName(aopLog.apiAddress()); log.setRequestIp(ip); log.setAddress(StringUtils.getCityInfo(log.getRequestIp())); log.setMethod(methodName); diff --git a/storeroom/pom.xml b/storeroom/pom.xml index 973c5b8..d986a5a 100644 --- a/storeroom/pom.xml +++ b/storeroom/pom.xml @@ -41,6 +41,11 @@ 5.8.3 + + com.storeroom + logging + 1.0 + \ No newline at end of file diff --git a/storeroom/src/main/java/com/storeroom/modules/storeroom3d/controller/AlarmInfoController.java b/storeroom/src/main/java/com/storeroom/modules/storeroom3d/controller/AlarmInfoController.java index 4705e20..b564f17 100644 --- a/storeroom/src/main/java/com/storeroom/modules/storeroom3d/controller/AlarmInfoController.java +++ b/storeroom/src/main/java/com/storeroom/modules/storeroom3d/controller/AlarmInfoController.java @@ -3,6 +3,7 @@ package com.storeroom.modules.storeroom3d.controller; import com.storeroom.annotaion.rest.AnonymousGetMapping; import com.storeroom.annotaion.rest.AnonymousPostMapping; +import com.storeroom.annotation.Log; import com.storeroom.exception.BaseException; import com.storeroom.modules.storeroom3d.domain.GetCurAlarm; import com.storeroom.modules.storeroom3d.service.AlarmInfoService; @@ -37,6 +38,7 @@ public class AlarmInfoController { + @Log(value = "报警处理",apiAddress = "/api/alarm") @AnonymousGetMapping("info") public ApiResponse queryStoreroomId(@RequestParam String storeroomId) { if (StringUtils.isEmpty(storeroomId)) {