Skip to content

O
order-group
Commit b2b597be by dingkai
Options

Merge branch 'feature/1.9.17-Exception-20200325-dingkai' into qa

parents 7c317dd4 6204a0cb
Showing with 3 additions and 3 deletions
call-back-service/pom.xml
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<dependency> <dependency>
<groupId>com.freemud.application.service.sdk</groupId> <groupId>com.freemud.application.service.sdk</groupId>
<artifactId>sdk-common-base</artifactId> <artifactId>sdk-common-base</artifactId>
<version>1.3.9-SNAPSHOT</version> <version>1.4.1.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
......
order-application-service/src/main/java/cn/freemud/utils/LogUtil.java
...@@ -288,7 +288,6 @@ public class LogUtil { ...@@ -288,7 +288,6 @@ public class LogUtil {
if (StringUtils.isEmpty(uri) && method != null) { if (StringUtils.isEmpty(uri) && method != null) {
PostMapping postMapping = AnnotationUtils.getAnnotation(method, PostMapping.class); PostMapping postMapping = AnnotationUtils.getAnnotation(method, PostMapping.class);
uri = uriPre + (!Objects.equals(postMapping, null) && !Objects.equals(postMapping.path(), null) && postMapping.path().length > 0 ? postMapping.path()[0] : ""); uri = uriPre + (!Objects.equals(postMapping, null) && !Objects.equals(postMapping.path(), null) && postMapping.path().length > 0 ? postMapping.path()[0] : "");
}
if (StringUtils.isEmpty(uri)) { if (StringUtils.isEmpty(uri)) {
GetMapping getMapping = AnnotationUtils.getAnnotation(method, GetMapping.class); GetMapping getMapping = AnnotationUtils.getAnnotation(method, GetMapping.class);
uri = uriPre + (!Objects.equals(getMapping, null) && !Objects.equals(getMapping.path(), null) && getMapping.path().length > 0 ? getMapping.path()[0] : ""); uri = uriPre + (!Objects.equals(getMapping, null) && !Objects.equals(getMapping.path(), null) && getMapping.path().length > 0 ? getMapping.path()[0] : "");
...@@ -297,6 +296,7 @@ public class LogUtil { ...@@ -297,6 +296,7 @@ public class LogUtil {
RequestMapping methodRequestMapping = AnnotationUtils.getAnnotation(method, RequestMapping.class); RequestMapping methodRequestMapping = AnnotationUtils.getAnnotation(method, RequestMapping.class);
uri = uriPre + (!Objects.equals(methodRequestMapping, null) && !Objects.equals(methodRequestMapping.path(), null) && methodRequestMapping.path().length > 0 ? methodRequestMapping.path()[0] : ""); uri = uriPre + (!Objects.equals(methodRequestMapping, null) && !Objects.equals(methodRequestMapping.path(), null) && methodRequestMapping.path().length > 0 ? methodRequestMapping.path()[0] : "");
} }
}
ThirdPartLogVo thirdPartLogVo = new ThirdPartLogVo(); ThirdPartLogVo thirdPartLogVo = new ThirdPartLogVo();
thirdPartLogVo.setThirdPartName(serviceName); thirdPartLogVo.setThirdPartName(serviceName);
thirdPartLogVo.setUri(uri); thirdPartLogVo.setUri(uri);
......
shopping-cart-application-service/src/main/java/cn/freemud/utils/LogUtil.java
...@@ -297,7 +297,6 @@ public class LogUtil { ...@@ -297,7 +297,6 @@ public class LogUtil {
if (method != null) { if (method != null) {
PostMapping postMapping = AnnotationUtils.getAnnotation(method, PostMapping.class); PostMapping postMapping = AnnotationUtils.getAnnotation(method, PostMapping.class);
uri = uriPre + (!Objects.equals(postMapping, null) && postMapping.path().length > 0 ? postMapping.path()[0] : ""); uri = uriPre + (!Objects.equals(postMapping, null) && postMapping.path().length > 0 ? postMapping.path()[0] : "");
}
if (StringUtils.isEmpty(uri)) { if (StringUtils.isEmpty(uri)) {
GetMapping getMapping = AnnotationUtils.getAnnotation(method, GetMapping.class); GetMapping getMapping = AnnotationUtils.getAnnotation(method, GetMapping.class);
uri = uriPre + (!Objects.equals(getMapping, null) && getMapping.path().length > 0 ? getMapping.path()[0] : ""); uri = uriPre + (!Objects.equals(getMapping, null) && getMapping.path().length > 0 ? getMapping.path()[0] : "");
...@@ -306,6 +305,7 @@ public class LogUtil { ...@@ -306,6 +305,7 @@ public class LogUtil {
RequestMapping methodRequestMapping = AnnotationUtils.getAnnotation(method, RequestMapping.class); RequestMapping methodRequestMapping = AnnotationUtils.getAnnotation(method, RequestMapping.class);
uri = uriPre + (!Objects.equals(methodRequestMapping, null) && methodRequestMapping.path().length > 0 ? methodRequestMapping.path()[0] : ""); uri = uriPre + (!Objects.equals(methodRequestMapping, null) && methodRequestMapping.path().length > 0 ? methodRequestMapping.path()[0] : "");
} }
}
ThirdPartLogVo thirdPartLogVo = new ThirdPartLogVo(); ThirdPartLogVo thirdPartLogVo = new ThirdPartLogVo();
thirdPartLogVo.setThirdPartName(serviceName); thirdPartLogVo.setThirdPartName(serviceName);
thirdPartLogVo.setUri(uri); thirdPartLogVo.setUri(uri);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment