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 | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 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 4ea4e38..f8166fe 100644
--- a/springboot/src/main/java/com/java110/boot/smo/GetCommunityStoreInfoSMOImpl.java
+++ b/springboot/src/main/java/com/java110/boot/smo/GetCommunityStoreInfoSMOImpl.java
@@ -8,6 +8,7 @@
import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.MappingConstant;
import com.java110.utils.util.Assert;
+import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.http.HttpMethod;
@@ -32,7 +33,18 @@
if (responseEntity.getStatusCode() != HttpStatus.OK) {
throw new IllegalArgumentException(responseEntity.getBody());
}
- return new ResultVo(responseEntity.getStatusCode() == HttpStatus.OK ? ResultVo.CODE_OK : ResultVo.CODE_ERROR, responseEntity.getBody());
+
+ if(!StringUtil.isJsonObject(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());
+ if(paramJson.containsKey("code") && paramJson.getIntValue("code") != 0){
+ throw new IllegalArgumentException(paramJson.getString("msg"));
+ }
+
+ return new ResultVo(responseEntity.getStatusCode() == HttpStatus.OK ? ResultVo.CODE_OK : ResultVo.CODE_ERROR, responseEntity.getBody(),responseEntity.getBody());
}
@Override
@@ -54,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