Merge remote-tracking branch 'origin/master' into jxl_220622_nft_buy

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/volunteers/edit.html

@@ -87,7 +87,7 @@
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">自我介绍：</label>
             <div class="col-sm-8">
-                <input name="introduce" class="form-control" type="text" th:value="*{introduce}" readonly required>
+                <textarea name="introduce" class="form-control" type="text" th:text="*{introduce}" readonly required></textarea>
             </div>
         </div>
         <div class="form-group">

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:

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/utils/XmlUtil.java

@@ -66,6 +66,7 @@ public class XmlUtil{
     public static <T> T  toBean(String xmlStr,Class<T> cls){
         //注意：不是new Xstream(); 否则报错：java.lang.NoClassDefFoundError: org/xmlpull/v1/XmlPullParserFactory
         XStream xstream=new XStream(new DomDriver());
+        xstream.ignoreUnknownElements();
         xstream.processAnnotations(cls);
         T obj=(T)xstream.fromXML(xmlStr);
         return obj;

liquidnet-bus-service/liquidnet-service-notify/liquidnet-service-notify-impl/src/main/java/com/liquidnet/service/dragon/utils/XmlUtil.java

@@ -66,6 +66,7 @@ public class XmlUtil{
     public static <T> T  toBean(String xmlStr,Class<T> cls){
         //注意：不是new Xstream(); 否则报错：java.lang.NoClassDefFoundError: org/xmlpull/v1/XmlPullParserFactory
         XStream xstream=new XStream(new DomDriver());
+        xstream.ignoreUnknownElements();
         xstream.processAnnotations(cls);
         T obj=(T)xstream.fromXML(xmlStr);
         return obj;