From f67a8bfa2bd4895806bb1686e25df3a2eab8e771 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 11 八月 2023 17:26:47 +0800
Subject: [PATCH] 优化代码

---
 springboot/src/main/java/com/java110/boot/controller/app/AppController.java |   82 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 82 insertions(+), 0 deletions(-)

diff --git a/springboot/src/main/java/com/java110/boot/controller/app/AppController.java b/springboot/src/main/java/com/java110/boot/controller/app/AppController.java
index 09118ec..b0b3d4e 100644
--- a/springboot/src/main/java/com/java110/boot/controller/app/AppController.java
+++ b/springboot/src/main/java/com/java110/boot/controller/app/AppController.java
@@ -20,9 +20,11 @@
 import com.java110.boot.smo.privilege.IPrivilegeSMO;
 import com.java110.core.base.controller.BaseController;
 import com.java110.core.context.IPageData;
+import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.core.language.Java110Lang;
 import com.java110.core.log.LoggerFactory;
 import com.java110.utils.constant.CommonConstant;
+import com.java110.utils.util.DateUtil;
 import com.java110.vo.ResultVo;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -295,6 +297,83 @@
         return responseEntity;
     }
 
+    /**
+     * 澶栭儴绯荤粺浣跨敤 get
+     * 瀵规帴涓�浜涘ぇ绯荤粺鏃� 浠栦滑涓嶄細鎸夌収HC鐨勮姹�
+     * 鎵�浠ュ皢HC瑕佹眰鐨刟ppId 鏀惧埌璺姴鍦板潃
+     * @param request 璇锋眰瀵硅薄 鏌ヨ澶翠俊鎭� url绛変俊鎭�
+     * @return http status 200 鎴愬姛 鍏朵粬澶辫触
+     */
+
+    @RequestMapping(path = "/ext/{serviceCode}/{appId}", method = RequestMethod.GET)
+    @Java110Lang
+    public ResponseEntity<String> extGet(
+            @PathVariable String serviceCode,
+            @PathVariable String appId,
+            HttpServletRequest request) {
+        ResponseEntity<String> responseEntity = null;
+        Map<String, String> headers = new HashMap<String, String>();
+        try {
+            this.getRequestInfo(request, headers);
+            //todo 琛ュ厖appId淇℃伅
+            headers.put("app-id",appId);
+            headers.put("user-id","-1");
+            headers.put("transaction-id", GenerateCodeFactory.getUUID());
+            headers.put("req-time", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_DEFAULT));
+            headers.put(CommonConstant.HTTP_SERVICE, serviceCode);
+            headers.put(CommonConstant.HTTP_METHOD, CommonConstant.HTTP_METHOD_GET);
+            logger.debug("api锛歿} 璇锋眰鎶ユ枃涓猴細{},header淇℃伅涓猴細{}", "", headers);
+            IPageData pd = (IPageData) request.getAttribute(CommonConstant.CONTEXT_PAGE_DATA);
+            privilegeSMOImpl.hasPrivilege(restTemplate, pd, "/app/" + serviceCode);
+            responseEntity = apiSMOImpl.doApi(JSONObject.toJSONString(getParameterStringMap(request)), headers, request);
+        } catch (Throwable e) {
+            logger.error("璇锋眰get 鏂规硶[" + serviceCode + "]澶辫触锛�", e);
+            responseEntity = ResultVo.error("璇锋眰鍙戠敓寮傚父锛�" + e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
+        }
+        logger.debug("api锛歿} 杩斿洖淇℃伅涓猴細{}", serviceCode, responseEntity);
+
+        return responseEntity;
+    }
+
+    /**
+     * 澶栭儴绯荤粺浣跨敤 post
+     * 瀵规帴涓�浜涘ぇ绯荤粺鏃� 浠栦滑涓嶄細鎸夌収HC鐨勮姹�
+     * 鎵�浠ュ皢HC瑕佹眰鐨刟ppId 鏀惧埌璺姴鍦板潃
+     * @param request 璇锋眰瀵硅薄 鏌ヨ澶翠俊鎭� url绛変俊鎭�
+     * @return http status 200 鎴愬姛 鍏朵粬澶辫触
+     */
+
+    @RequestMapping(path = "/ext/{appId}/{serviceCode}", method = RequestMethod.POST)
+    @Java110Lang
+    public ResponseEntity<String> extPost(
+            @PathVariable String serviceCode,
+            @PathVariable String appId,
+            @RequestBody String postInfo,
+            HttpServletRequest request) {
+        ResponseEntity<String> responseEntity = null;
+        Map<String, String> headers = new HashMap<String, String>();
+        try {
+            this.getRequestInfo(request, headers);
+            //todo 琛ュ厖appId淇℃伅
+            headers.put("app-id",appId);
+            headers.put("user-id","-1");
+            headers.put("transaction-id", GenerateCodeFactory.getUUID());
+            headers.put("req-time", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_DEFAULT));
+            headers.put(CommonConstant.HTTP_SERVICE, serviceCode);
+            headers.put(CommonConstant.HTTP_METHOD, CommonConstant.HTTP_METHOD_POST);
+            logger.debug("api锛歿} 璇锋眰鎶ユ枃涓猴細{},header淇℃伅涓猴細{}", "", headers);
+            IPageData pd = (IPageData) request.getAttribute(CommonConstant.CONTEXT_PAGE_DATA);
+            privilegeSMOImpl.hasPrivilege(restTemplate, pd, "/app/" + serviceCode);
+            responseEntity = apiSMOImpl.doApi(postInfo, headers, request);
+        } catch (Throwable e) {
+            logger.error("璇锋眰get 鏂规硶[" + serviceCode + "]澶辫触锛�", e);
+            responseEntity = ResultVo.error("璇锋眰鍙戠敓寮傚父锛�" + e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
+        }
+        logger.debug("api锛歿} 杩斿洖淇℃伅涓猴細{}", serviceCode, responseEntity);
+
+        return responseEntity;
+    }
+
 
     /**
      * 鑾峰彇璇锋眰淇℃伅
@@ -328,6 +407,9 @@
             if ("userId".equals(key)) {
                 headers.put("user_id", claims.get(key));
             }
+            if("userName".equals(key)){
+                headers.put("userName", "-");
+            }
             headers.put(key, claims.get(key));
         }
     }

--
Gitblit v1.8.0