From 50c82578604f83a2f050d89b6a4f2d0e148fec58 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 04 八月 2020 14:03:46 +0800
Subject: [PATCH] 优化代码
---
service-front/src/main/java/com/java110/front/controller/CallComponentController.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/controller/CallComponentController.java b/service-front/src/main/java/com/java110/front/controller/CallComponentController.java
index 3ccf5e6..fd9ee11 100644
--- a/service-front/src/main/java/com/java110/front/controller/CallComponentController.java
+++ b/service-front/src/main/java/com/java110/front/controller/CallComponentController.java
@@ -64,7 +64,7 @@
IPageData pd = (IPageData) request.getAttribute(CommonConstant.CONTEXT_PAGE_DATA);
pd.setApiUrl("/api/" + api);
//鏉冮檺鏍￠獙
- hasPrivilege(restTemplate, pd, "/" + api);
+ hasPrivilege(restTemplate, pd, "/callComponent/" + api);
Object componentInstance = ApplicationContextFactory.getBean(componentCode);
@@ -130,7 +130,7 @@
IPageData pd = (IPageData) request.getAttribute(CommonConstant.CONTEXT_PAGE_DATA);
//鏉冮檺鏍￠獙
- hasPrivilege(restTemplate, pd, "/" + componentCode + "/" + componentMethod);
+ hasPrivilege(restTemplate, pd, "/callComponent/" + componentCode + "/" + componentMethod);
Object componentInstance = ApplicationContextFactory.getBean(componentCode);
@@ -164,6 +164,14 @@
responseEntity = new ResponseEntity<>(msg, HttpStatus.INTERNAL_SERVER_ERROR);
} finally {
logger.debug("缁勪欢璋冪敤杩斿洖淇℃伅涓簕}", responseEntity);
+ if (responseEntity.getStatusCode() == HttpStatus.OK) {
+ return responseEntity;
+ }
+ String version = request.getParameter(VERSION);
+ //褰� 鎺ュ彛鐗堟湰鍙蜂负2.0鏃� 杩斿洖閿欒澶勭悊
+ if (!StringUtil.isEmpty(version) && VERSION_2.equals(version)) {
+ return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, responseEntity.getBody());
+ }
return responseEntity;
}
}
@@ -193,7 +201,7 @@
pd = freshPageDate(request);
//鏉冮檺鏍￠獙
- hasPrivilege(restTemplate, pd, "/" + componentCode + "/" + componentMethod);
+ hasPrivilege(restTemplate, pd, "/callComponent/" + componentCode + "/" + componentMethod);
Object componentInstance = ApplicationContextFactory.getBean(componentCode);
@@ -227,6 +235,14 @@
responseEntity = new ResponseEntity<>(msg, HttpStatus.INTERNAL_SERVER_ERROR);
} finally {
logger.debug("缁勪欢璋冪敤杩斿洖淇℃伅涓簕}", responseEntity);
+ if (responseEntity.getStatusCode() == HttpStatus.OK) {
+ return responseEntity;
+ }
+ String version = request.getParameter(VERSION);
+ //褰� 鎺ュ彛鐗堟湰鍙蜂负2.0鏃� 杩斿洖閿欒澶勭悊
+ if (!StringUtil.isEmpty(version) && VERSION_2.equals(version)) {
+ return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, responseEntity.getBody());
+ }
return responseEntity;
}
}
@@ -252,7 +268,7 @@
Assert.hasLength(componentMethod, "鍙傛暟閿欒锛屾湭浼犲叆璋冪敤缁勪欢鏂规硶");
pd = freshPageDate(request);
- hasPrivilege(restTemplate, pd, "/" + componentCode + "/" + componentMethod);
+ hasPrivilege(restTemplate, pd, "/callComponent/download/" + componentCode + "/" + componentMethod);
Object componentInstance = ApplicationContextFactory.getBean(componentCode);
--
Gitblit v1.8.0