From 2fccb11d764f568deb207a457c19d7ac25369c18 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 23 Oct 2020 15:12:50 +0800 Subject: [PATCH] =?UTF-8?q?backDoor=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/commons/tools/enums/EnvEnum.java | 18 ++++++++++++------ .../backdoor/BackDoorController.java | 3 ++- .../service/backdoor/BackDoorService.java | 2 +- .../backdoor/impl/BackDoorServiceImpl.java | 5 +++-- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/EnvEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/EnvEnum.java index ed782790e8..d0df724665 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/EnvEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/EnvEnum.java @@ -11,21 +11,23 @@ import org.springframework.core.env.Environment; * @date 2020-07-03 11:14 **/ public enum EnvEnum { - LOCAL("local", "本地环境"), - DEV("dev", "开发环境"), - TEST("test", "体验环境"), - PROD("prod", "生产环境"), - UN_KNOWN("un_known", "未知"), + LOCAL("local", "本地环境","http://localhost:8080/api/"), + DEV("dev", "开发环境","http://192.168.1.130:8080/api/"), + TEST("test", "体验环境","https://epmet-dev.elinkservice.cn/api/"), + PROD("prod", "生产环境","https://epmet-cloud.elinkservice.cn/api/"), + UN_KNOWN("un_known", "未知","https://epmet-dev.elinkservice.cn/api/"), ; private String code; private String name; + private String url; - EnvEnum(String code, String name) { + EnvEnum(String code, String name, String url) { this.code = code; this.name = name; + this.url = url; } public static EnvEnum getEnum(String code) { @@ -59,4 +61,8 @@ public enum EnvEnum { public String getName() { return name; } + + public String getUrl(){ + return url; + } } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/backdoor/BackDoorController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/backdoor/BackDoorController.java index 723d1e9735..e8b373f1b1 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/backdoor/BackDoorController.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/backdoor/BackDoorController.java @@ -28,9 +28,10 @@ public class BackDoorController { */ @PostMapping("redirect/external") public Object backDoor(@RequestHeader(value = "Data-Type", defaultValue = "real", required = false) String dataType, + @RequestHeader(value = "env", defaultValue = "test", required = false) String env, @RequestHeader("AppId") String appId, @RequestHeader("target") String target, @RequestBody(required = false) Object targetParam) { - return backDoorService.redirect(dataType, appId, target, targetParam); + return backDoorService.redirect(dataType, appId, target, targetParam,env); } } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/backdoor/BackDoorService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/backdoor/BackDoorService.java index afb5fc93bc..381d3874a1 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/backdoor/BackDoorService.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/backdoor/BackDoorService.java @@ -6,6 +6,6 @@ package com.epmet.datareport.service.backdoor; */ public interface BackDoorService { - Object redirect(String dataType, String appId, String target, Object o); + Object redirect(String dataType, String appId, String target, Object o,String env); } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/backdoor/impl/BackDoorServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/backdoor/impl/BackDoorServiceImpl.java index 79f42baaa2..639d39526f 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/backdoor/impl/BackDoorServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/backdoor/impl/BackDoorServiceImpl.java @@ -1,6 +1,7 @@ package com.epmet.datareport.service.backdoor.impl; import com.alibaba.fastjson.JSON; +import com.epmet.commons.tools.enums.EnvEnum; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.utils.HttpClientManager; import com.epmet.commons.tools.utils.Result; @@ -27,13 +28,13 @@ public class BackDoorServiceImpl implements BackDoorService { private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient; @Override - public Object redirect(String dataType, String appId, String target, Object targetParam) { + public Object redirect(String dataType, String appId, String target, Object targetParam, String env) { Result appIdInfoResultDTOResult = commonServiceOpenFeignClient.appIdInfo(appId); if (!appIdInfoResultDTOResult.success()) { throw new RenException("获取accessToken失败......"); } AppIdInfoResultDTO data = appIdInfoResultDTOResult.getData(); - String url = FactConstant.URL.concat(target); + String url = EnvEnum.getEnum(env).getUrl().concat(target); Map headerMap = new HashMap<>(16); headerMap.put("AccessToken", data.getAccessToken()); headerMap.put("AppId", data.getAppId());