From 04a9fbd79895f489e840ebb0d5dd62457b9ff5a5 Mon Sep 17 00:00:00 2001
From: chengf <2156125618@qq.com>
Date: 星期一, 28 七月 2025 18:28:41 +0800
Subject: [PATCH] 白单流水唯一校验2025/07/28

---
 service-api/src/main/java/com/java110/api/controller/component/CallComponentController.java |   23 ++++++++++++++---------
 1 files changed, 14 insertions(+), 9 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 708a88d..5328190 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
@@ -17,9 +17,10 @@
 
 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.core.log.LoggerFactory;
 import com.java110.utils.constant.CommonConstant;
 import com.java110.utils.exception.SMOException;
 import com.java110.utils.factory.ApplicationContextFactory;
@@ -28,14 +29,10 @@
 import com.java110.utils.util.StringUtil;
 import com.java110.vo.ResultVo;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -68,6 +65,7 @@
      */
 
     @RequestMapping(path = "/callComponent/{api}")
+    @Java110Lang
     public ResponseEntity<String> callApi(
             @PathVariable String api,
             //@RequestBody String info,
@@ -103,6 +101,7 @@
             logger.error("璋冪敤api寮傚父", e);
             responseEntity = new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
         } catch (Exception e) {
+            e.printStackTrace();
             logger.error("璋冪敤api寮傚父", e);
             String msg = "";
             if (e instanceof InvocationTargetException) {
@@ -138,6 +137,7 @@
      */
 
     @RequestMapping(path = "/callComponent/{componentCode}/{componentMethod}")
+    @Java110Lang
     public ResponseEntity<String> callComponent(
             @PathVariable String componentCode,
             @PathVariable String componentMethod,
@@ -171,9 +171,11 @@
         } catch (SMOException e) {
             /*MultiValueMap<String, String> headers = new HttpHeaders();
             headers.add("code", e.getResult().getCode());*/
+            e.printStackTrace();
             logger.error("璋冪敤缁勪欢寮傚父", e);
             responseEntity = new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
         } catch (Exception e) {
+            e.printStackTrace();
             logger.error("璋冪敤缁勪欢寮傚父", e);
             String msg = "";
             if (e instanceof InvocationTargetException) {
@@ -182,7 +184,8 @@
                     msg = targetEx.getMessage();
                 }
             } else {
-                msg = e.getMessage();
+                //msg = e.getMessage();
+                msg ="璋冪敤寮傚父";
             }
             responseEntity = new ResponseEntity<>(msg, HttpStatus.INTERNAL_SERVER_ERROR);
         } finally {
@@ -210,11 +213,12 @@
      */
 
     @RequestMapping(path = "/callComponent/upload/{componentCode}/{componentMethod}")
+    @Java110Lang
     public ResponseEntity<String> callComponentUploadFile(
             @PathVariable String componentCode,
             @PathVariable String componentMethod,
             @RequestParam("uploadFile") MultipartFile uploadFile,
-            //@RequestBody String info,
+            @RequestBody String userId,
             HttpServletRequest request) {
         ResponseEntity<String> responseEntity = null;
         Map formParam = null;
@@ -279,6 +283,7 @@
      */
 
     @RequestMapping(path = "/callComponent/download/{componentCode}/{componentMethod}")
+    @Java110Lang
     public ResponseEntity<Object> callComponentDownloadFile(
             @PathVariable String componentCode,
             @PathVariable String componentMethod,
@@ -352,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