From 7cd9cc73b6bbae05e8fa734e29f6cd435e2599ba Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 28 六月 2023 14:27:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 service-api/src/main/java/com/java110/api/smo/GetCommunityStoreInfoSMOImpl.java |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/service-api/src/main/java/com/java110/api/smo/GetCommunityStoreInfoSMOImpl.java b/service-api/src/main/java/com/java110/api/smo/GetCommunityStoreInfoSMOImpl.java
index f5184bf..b5ad7f7 100644
--- a/service-api/src/main/java/com/java110/api/smo/GetCommunityStoreInfoSMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/smo/GetCommunityStoreInfoSMOImpl.java
@@ -9,6 +9,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;
@@ -33,6 +34,17 @@
         if (responseEntity.getStatusCode() != HttpStatus.OK) {
             throw new IllegalArgumentException(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());
     }
 
@@ -51,6 +63,10 @@
         if (responseEntity.getStatusCode() != HttpStatus.OK) {
             throw new IllegalArgumentException(responseEntity.getBody());
         }
+        JSONObject paramOut = JSONObject.parseObject(responseEntity.getBody());
+        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());
     }
 

--
Gitblit v1.8.0