Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp

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", "本地环境"),
+	LOCAL("local", "本地环境","http://localhost:8080/api/"),
-	DEV("dev", "开发环境"),
+	DEV("dev", "开发环境","http://192.168.1.130:8080/api/"),
-	TEST("test", "体验环境"),
+	TEST("test", "体验环境","https://epmet-dev.elinkservice.cn/api/"),
-	PROD("prod", "生产环境"),
+	PROD("prod", "生产环境","https://epmet-cloud.elinkservice.cn/api/"),
-	UN_KNOWN("un_known", "未知"),
+	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;
+	}
 }

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);
     }
 
 }

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);
 
 }

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<AppIdInfoResultDTO> 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<String, String> headerMap = new HashMap<>(16);
         headerMap.put("AccessToken", data.getAccessToken());
         headerMap.put("AppId", data.getAppId());