From 2b919980a8c70554a64cb3d03cc95679af4d817f Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期一, 03 七月 2023 00:22:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-api/src/main/java/com/java110/api/smo/GetCommunityStoreInfoSMOImpl.java | 21 +++++++++++++++++++++
1 files changed, 21 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 c24a1cf..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
@@ -4,10 +4,12 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.cache.Java110RedisConfig;
import com.java110.core.context.IPageData;
+import com.java110.core.context.SecureInvocation;
import com.java110.core.factory.CallApiServiceFactory;
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,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());
}
@@ -49,6 +62,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());
}
@@ -81,6 +98,10 @@
JSONArray privileges = data.getJSONArray("privileges");
+ if(!SecureInvocation.secure(this.getClass())){
+ return new ResultVo(ResultVo.CODE_OK,privileges.toJSONString(),ResultVo.EMPTY_ARRAY);
+ }
+
return new ResultVo(responseEntity.getStatusCode() == HttpStatus.OK ? ResultVo.CODE_OK : ResultVo.CODE_ERROR, privileges.toJSONString());
}
--
Gitblit v1.8.0