From f85b3a58c4535493d41efe71049be1086d62867f Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 11 六月 2024 18:42:05 +0800
Subject: [PATCH] 优化代码
---
service-api/src/main/java/com/java110/api/controller/component/CallComponentController.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/controller/component/CallComponentController.java b/service-api/src/main/java/com/java110/api/controller/component/CallComponentController.java
index 53b080a..44023ce 100644
--- a/service-api/src/main/java/com/java110/api/controller/component/CallComponentController.java
+++ b/service-api/src/main/java/com/java110/api/controller/component/CallComponentController.java
@@ -16,9 +16,11 @@
package com.java110.api.controller.component;
import com.alibaba.fastjson.JSONObject;
+import com.java110.api.smo.DefaultAbstractComponentSMO;
import com.java110.core.base.controller.BaseController;
import com.java110.core.context.IPageData;
import com.java110.core.context.PageData;
+import com.java110.core.language.Java110Lang;
import com.java110.utils.constant.CommonConstant;
import com.java110.utils.exception.SMOException;
import com.java110.utils.factory.ApplicationContextFactory;
@@ -27,7 +29,7 @@
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.java110.core.log.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -49,7 +51,7 @@
* 缁勪欢璋冪敤澶勭悊绫�
*/
@RestController
-public class CallComponentController extends BaseController {
+public class CallComponentController extends DefaultAbstractComponentSMO {
private final static Logger logger = LoggerFactory.getLogger(CallComponentController.class);
private static final String VERSION = "version";
@@ -67,6 +69,7 @@
*/
@RequestMapping(path = "/callComponent/{api}")
+ @Java110Lang
public ResponseEntity<String> callApi(
@PathVariable String api,
//@RequestBody String info,
@@ -79,7 +82,7 @@
Assert.hasLength(api, "鍙傛暟閿欒锛屾湭浼犲叆api缂栫爜");
IPageData pd = (IPageData) request.getAttribute(CommonConstant.CONTEXT_PAGE_DATA);
- pd.setApiUrl("/api/" + api);
+ pd.setApiUrl(api);
//鏉冮檺鏍￠獙
hasPrivilege(restTemplate, pd, "/callComponent/" + api);
@@ -110,7 +113,7 @@
msg = targetEx.getMessage();
}
} else {
- msg = e.getMessage();
+ msg ="璋冪敤寮傚父";
}
responseEntity = new ResponseEntity<>(msg, HttpStatus.INTERNAL_SERVER_ERROR);
} finally {
@@ -137,6 +140,7 @@
*/
@RequestMapping(path = "/callComponent/{componentCode}/{componentMethod}")
+ @Java110Lang
public ResponseEntity<String> callComponent(
@PathVariable String componentCode,
@PathVariable String componentMethod,
@@ -181,7 +185,7 @@
msg = targetEx.getMessage();
}
} else {
- msg = e.getMessage();
+ msg ="璋冪敤寮傚父";
}
responseEntity = new ResponseEntity<>(msg, HttpStatus.INTERNAL_SERVER_ERROR);
} finally {
@@ -209,6 +213,7 @@
*/
@RequestMapping(path = "/callComponent/upload/{componentCode}/{componentMethod}")
+ @Java110Lang
public ResponseEntity<String> callComponentUploadFile(
@PathVariable String componentCode,
@PathVariable String componentMethod,
@@ -253,7 +258,7 @@
msg = targetEx.getMessage();
}
} else {
- msg = e.getMessage();
+ msg ="璋冪敤寮傚父";
}
responseEntity = new ResponseEntity<>(msg, HttpStatus.INTERNAL_SERVER_ERROR);
} finally {
@@ -278,6 +283,7 @@
*/
@RequestMapping(path = "/callComponent/download/{componentCode}/{componentMethod}")
+ @Java110Lang
public ResponseEntity<Object> callComponentDownloadFile(
@PathVariable String componentCode,
@PathVariable String componentMethod,
@@ -315,7 +321,7 @@
msg = targetEx.getMessage();
}
} else {
- msg = e.getMessage();
+ msg ="璋冪敤寮傚父";
}
responseEntity = new ResponseEntity<Object>(msg, HttpStatus.INTERNAL_SERVER_ERROR);
} finally {
@@ -351,7 +357,7 @@
}
IPageData newPd = PageData.newInstance().builder(pd.getUserId(), pd.getUserName(), pd.getToken(),
- reqData, pd.getComponentCode(), pd.getComponentMethod(), "", pd.getSessionId(), "");
+ reqData, pd.getComponentCode(), pd.getComponentMethod(), "", pd.getSessionId(), pd.getAppId());
return newPd;
}
--
Gitblit v1.8.0