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) {