服务端适配日志bug解决

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java

@@ -11,7 +11,6 @@ import com.thoughtworks.xstream.io.xml.PrettyPrintWriter;
 import com.thoughtworks.xstream.io.xml.XppDomDriver;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import java.io.Writer;
 import java.lang.reflect.Field;
 

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java

@@ -122,7 +122,7 @@ public class BlockSoftSwitchEnumUtil {
 
         /* Restful */
         CLIENT_RESTFUL_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.RESTFUL,120001,"Client REST客户端适配器"),
-        SERVER_RESTFUL_IMPP(SUIT_MODE.SERVER,CASE_TYPE.RESTFUL,120001,"Client REST服务端适配器"),
+        SERVER_RESTFUL_IMPP(SUIT_MODE.SERVER,CASE_TYPE.RESTFUL,220001,"Client REST服务端适配器"),
 
         /* Socket */
         SERVER_SOCKET_HELLO(SUIT_MODE.SERVER ,CASE_TYPE.SOCKET,210001,"Socket Server Hello测试服务"),
@@ -216,7 +216,10 @@ public class BlockSoftSwitchEnumUtil {
         SCHEDULE(2,"定时调度"),
         RABBITMQ(3,"MQ 调用"),
         HTTP(4,"接口调用"),
-        CLOUD(5,"Cloud调用");
+        CLOUD(5,"Cloud调用"),
+        REST(6,"REST调用"),
+        WEB_SERVICE(7,"WebService"),
+        SOCKET(8,"socket");
 
         private int value;
         private String description;

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java

@@ -6,7 +6,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-import com.thoughtworks.xstream.annotations.XStreamImplicit;
+import com.thoughtworks.xstream.annotations.XStreamOmitField;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -42,7 +42,7 @@ public class SuitClientModel {
     /**
      * 适配记录
      */
-    @XStreamImplicit
+    @XStreamOmitField
     private BsSuitRecord bsSuitRecord;
 
     /**

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java

@@ -3,10 +3,9 @@ package cn.estsh.i3plus.pojo.model.softswitch;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamImplicit;
+import com.thoughtworks.xstream.annotations.XStreamOmitField;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-
 import java.util.List;
 import java.util.Map;
 
@@ -41,43 +40,40 @@ public class SuitServerModel {
     /**
      * 适配结果信息
      */
-    @XStreamImplicit
     private String suitMessage;
 
     /**
      * 适配状态码
      */
-    @XStreamImplicit
     private String suitCaseStatusCode = ResourceEnumUtil.MESSAGE.SUCCESS.getCode();
 
     /**
      * 适配结果
      */
-    @XStreamImplicit
     private boolean suitSuccess = true;
 
     /**
      * 适配记录
      */
-    @XStreamImplicit
+    @XStreamOmitField
     private BsSuitRecord bsSuitRecord;
 
     /**
      * 适配器信息
      */
-    @XStreamImplicit
+    @XStreamOmitField
     private BsSuitCaseModel bsSuitCaseModel;
 
     /**
      * 请求来源
      */
-    @XStreamImplicit
+    @XStreamOmitField
     private Integer requestSource;
 
     /**
      * 适配方式
      */
-    @XStreamImplicit
+    @XStreamOmitField
     private Integer suitMethodId;
 
     public int getSuitMethodIdVal(){
@@ -87,6 +83,6 @@ public class SuitServerModel {
         return suitMethodId.intValue();
     }
 
-    @XStreamImplicit
+    @XStreamOmitField
     private String analyzeMessage;
 }