Merge branch 'pre' into 'master'

Pre

See merge request !264

liquidnet-bus-common/liquidnet-common-service-base/src/main/java/com/liquidnet/service/base/UserPathDto.java

@@ -92,6 +92,6 @@ public class UserPathDto implements Serializable, Cloneable {
         userPathDto.setResult(result);
         userPathDto.setUserAgent(request.getHeader(ServletUtils.HEADER_USER_AGENT));
 
-        return (LOG_NOW_PDK + merchantId).concat(LOG_SEPARATOR).concat(JsonUtils.toJson(instance));
+        return (LOG_NOW_PDK + (StringUtils.isEmpty(merchantId) ? interfaceName : merchantId)).concat(LOG_SEPARATOR).concat(JsonUtils.toJson(userPathDto));
     }
 }

liquidnet-bus-config/liquidnet-config/liquidnet-service-goblin-test.yml

@@ -10,7 +10,7 @@ liquidnet:
     path: /data/logs
     name: service-goblin
     max-history: 7
-    level: info
+    level: debug
   mysql:
     database-name: test_ln_scene
   mongodb: