From 0417d31de9980cbc1735daffffb308d050ce35b4 Mon Sep 17 00:00:00 2001
From: wfy <260536420@qq.com>
Date: 星期六, 18 九月 2021 16:47:52 +0800
Subject: [PATCH] Merge branch 'master' into wangfy-dev
---
java110-service/src/main/java/com/java110/service/smo/impl/CmdServiceSMOImpl.java | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/java110-service/src/main/java/com/java110/service/smo/impl/CmdServiceSMOImpl.java b/java110-service/src/main/java/com/java110/service/smo/impl/CmdServiceSMOImpl.java
index 43fbc9e..8ffd4fa 100644
--- a/java110-service/src/main/java/com/java110/service/smo/impl/CmdServiceSMOImpl.java
+++ b/java110-service/src/main/java/com/java110/service/smo/impl/CmdServiceSMOImpl.java
@@ -19,10 +19,10 @@
import com.java110.utils.kafka.KafkaFactory;
import com.java110.utils.log.LoggerEngine;
import com.java110.utils.util.DateUtil;
+import com.java110.vo.ResultVo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
@@ -67,9 +67,6 @@
ResponseEntity<String> responseEntity = null;
- String resJson = "";
-
-
//1.0 鍒涘缓鏁版嵁娴� appId serviceCode
cmdDataFlowContext = DataFlowFactory.newInstance(CmdDataFlow.class).builder(reqJson, headers);
@@ -82,8 +79,7 @@
Date endDate = DateUtil.getCurrentDate();
if (responseEntity == null) {
- //resJson = encrypt(responseJson.toJSONString(),headers);
- responseEntity = new ResponseEntity<String>(resJson, HttpStatus.OK);
+ responseEntity = ResultVo.success();
}
return responseEntity;
}
--
Gitblit v1.8.0