From 0fea532b07be89978343cb4aede3693af99f5656 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 25 七月 2023 23:04:41 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
springboot/src/main/java/com/java110/boot/smo/GetCommunityStoreInfoSMOImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/springboot/src/main/java/com/java110/boot/smo/GetCommunityStoreInfoSMOImpl.java b/springboot/src/main/java/com/java110/boot/smo/GetCommunityStoreInfoSMOImpl.java
index 0cf117d..f8166fe 100644
--- a/springboot/src/main/java/com/java110/boot/smo/GetCommunityStoreInfoSMOImpl.java
+++ b/springboot/src/main/java/com/java110/boot/smo/GetCommunityStoreInfoSMOImpl.java
@@ -35,7 +35,8 @@
}
if(!StringUtil.isJsonObject(responseEntity.getBody())){
- return new ResultVo(responseEntity.getStatusCode() == HttpStatus.OK ? ResultVo.CODE_OK : ResultVo.CODE_ERROR, responseEntity.getBody());
+ //return new ResultVo(responseEntity.getStatusCode() == HttpStatus.OK ? ResultVo.CODE_OK : ResultVo.CODE_ERROR, responseEntity.getBody());
+ throw new IllegalArgumentException(responseEntity.getBody());
}
JSONObject paramJson = JSONObject.parseObject(responseEntity.getBody());
@@ -43,7 +44,7 @@
throw new IllegalArgumentException(paramJson.getString("msg"));
}
- return new ResultVo(responseEntity.getStatusCode() == HttpStatus.OK ? ResultVo.CODE_OK : ResultVo.CODE_ERROR, responseEntity.getBody());
+ return new ResultVo(responseEntity.getStatusCode() == HttpStatus.OK ? ResultVo.CODE_OK : ResultVo.CODE_ERROR, responseEntity.getBody(),responseEntity.getBody());
}
@Override
@@ -65,7 +66,7 @@
if(paramOut.containsKey("code") && ResultVo.CODE_OK != paramOut.getIntValue("code")){
throw new IllegalArgumentException(paramOut.getString("msg"));
}
- return new ResultVo(responseEntity.getStatusCode() == HttpStatus.OK ? ResultVo.CODE_OK : ResultVo.CODE_ERROR, responseEntity.getBody());
+ return new ResultVo(paramOut.getIntValue("code"), paramOut.getString("msg"), paramOut.get("data"));
}
@Override
--
Gitblit v1.8.0