Merge branch 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

call-back-service/pom.xml

@@ -20,7 +20,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>sdk-common-base</artifactId>
-            <version>1.3.9-SNAPSHOT</version>
+            <version>1.4.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

order-application-service/src/main/java/cn/freemud/utils/LogUtil.java

@@ -288,14 +288,14 @@ public class LogUtil {
             if (StringUtils.isEmpty(uri) && method != null) {
                 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] : "");
-            }
-            if (StringUtils.isEmpty(uri)) {
-                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] : "");
-            }
-            if (StringUtils.isEmpty(uri)) {
-                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] : "");
+                if (StringUtils.isEmpty(uri)) {
+                    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] : "");
+                }
+                if (StringUtils.isEmpty(uri)) {
+                    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] : "");
+                }
             }
             ThirdPartLogVo thirdPartLogVo = new ThirdPartLogVo();
             thirdPartLogVo.setThirdPartName(serviceName);

shopping-cart-application-service/src/main/java/cn/freemud/utils/LogUtil.java

@@ -297,14 +297,14 @@ public class LogUtil {
             if (method != null) {
                 PostMapping postMapping = AnnotationUtils.getAnnotation(method, PostMapping.class);
                 uri = uriPre + (!Objects.equals(postMapping, null) && postMapping.path().length > 0 ? postMapping.path()[0] : "");
-            }
-            if (StringUtils.isEmpty(uri)) {
-                GetMapping getMapping = AnnotationUtils.getAnnotation(method, GetMapping.class);
-                uri = uriPre + (!Objects.equals(getMapping, null) && getMapping.path().length > 0 ? getMapping.path()[0] : "");
-            }
-            if (StringUtils.isEmpty(uri)) {
-                RequestMapping methodRequestMapping = AnnotationUtils.getAnnotation(method, RequestMapping.class);
-                uri = uriPre + (!Objects.equals(methodRequestMapping, null) && methodRequestMapping.path().length > 0 ? methodRequestMapping.path()[0] : "");
+                if (StringUtils.isEmpty(uri)) {
+                    GetMapping getMapping = AnnotationUtils.getAnnotation(method, GetMapping.class);
+                    uri = uriPre + (!Objects.equals(getMapping, null) && getMapping.path().length > 0 ? getMapping.path()[0] : "");
+                }
+                if (StringUtils.isEmpty(uri)) {
+                    RequestMapping methodRequestMapping = AnnotationUtils.getAnnotation(method, RequestMapping.class);
+                    uri = uriPre + (!Objects.equals(methodRequestMapping, null) && methodRequestMapping.path().length > 0 ? methodRequestMapping.path()[0] : "");
+                }
             }
             ThirdPartLogVo thirdPartLogVo = new ThirdPartLogVo();
             thirdPartLogVo.setThirdPartName(serviceName);