From 284a5897876f1db918a413398d0d79fbaf5ecb09 Mon Sep 17 00:00:00 2001
From: huangxin <huangxin@cmhi.chinamobile.com>
Date: Fri, 27 Mar 2020 18:04:25 +0800
Subject: [PATCH] =?UTF-8?q?OCT=20REM:=201.=20=E6=B7=BB=E5=8A=A0.gitignore?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=202.=20=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E5=8D=8F=E8=AE=AE=EF=BC=8C=E5=B0=86=E5=8D=8F=E8=AE=AE=E8=AF=A6?=
 =?UTF-8?q?=E7=BB=86=E5=86=85=E5=AE=B9=E6=94=B9=E4=B8=BA=E5=AD=97=E7=AC=A6?=
 =?UTF-8?q?=E4=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                                    | 1 +
 .../com/cmcc/hy/phoenix/controller/ProtocolController.java    | 2 +-
 src/main/java/com/cmcc/hy/phoenix/vo/ProtocolResp.java        | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5aa63ef8..afa7d7ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -111,3 +111,4 @@ buildNumber.properties
 
 /phoenix-data.iml
 /phoenix-boot.iml
+/logs/
diff --git a/src/main/java/com/cmcc/hy/phoenix/controller/ProtocolController.java b/src/main/java/com/cmcc/hy/phoenix/controller/ProtocolController.java
index 85d2747f..afec8a6c 100644
--- a/src/main/java/com/cmcc/hy/phoenix/controller/ProtocolController.java
+++ b/src/main/java/com/cmcc/hy/phoenix/controller/ProtocolController.java
@@ -85,6 +85,6 @@ public class ProtocolController {
                 .cryptoType(mr.getCryptoType())
                 .timeStamp(System.currentTimeMillis())
                 .code(Resp.SUCCESS.getCode())
-                .msgContent(new String[] {msgCtx}).build();
+                .msgContent(msgCtx).build();
     }
 }
diff --git a/src/main/java/com/cmcc/hy/phoenix/vo/ProtocolResp.java b/src/main/java/com/cmcc/hy/phoenix/vo/ProtocolResp.java
index f77969b1..97c881f0 100644
--- a/src/main/java/com/cmcc/hy/phoenix/vo/ProtocolResp.java
+++ b/src/main/java/com/cmcc/hy/phoenix/vo/ProtocolResp.java
@@ -40,14 +40,14 @@ public class ProtocolResp {
             "保存该cmdId命令相关的详细内容，\n" +
             "具体每个cmdId命令的详细内容参看对应的命令协议定义", required = false,
             example = "{}")
-    private String[] msgContent;
+    private String msgContent;
 
     @ApiModelProperty(value="服务器返回状态码", required = false,
             example = "200")
     private int code;
 
     public static ProtocolResp result(Resp resp) {
-        return ProtocolResp.builder().code(resp.getCode()).msgContent(new String[] {resp.getMsg()}).build();
+        return ProtocolResp.builder().code(resp.getCode()).msgContent(resp.getMsg()).build();
     }
 
     public static ProtocolResp result(Resp resp, ProtocolResp obj) {