From 977ada2c8a9753e744613e8c55786d0e1b9dd162 Mon Sep 17 00:00:00 2001
From: qiaozhanwei <qiaozhanwei@outlook.com>
Date: Mon, 14 Oct 2019 19:15:49 +0800
Subject: [PATCH] request url variables replace (#1015)

* add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml

* .escheduler_env.sh to dolphinscheduler_env.sh

* dao yml assembly to conf directory

* table name modify

* entity title table  name modify

* logback log name modify

* running through the big process

* running through the big process error modify

* logback log name modify

* data_source.properties rename

* logback log name modify

* install.sh optimization

* install.sh optimization

* command count modify

* command state update

* countCommandState sql update

* countCommandState sql update

* remove application.yml file

* master.properties modify

* install.sh modify

* install.sh modify

* api server startup modify

* the current user quits and the session is completely emptied. bug fix

* remove pom package resources

* checkQueueNameExist method update

* checkQueueExist

* install.sh error output update

* signOut error update

* ProcessDao is null bug fix

* install.sh add mail.user

* request url variables replace
---
 .../dolphinscheduler/server/worker/task/http/HttpTask.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/http/HttpTask.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/http/HttpTask.java
index 47f6f8315..3a56abaf3 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/http/HttpTask.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/http/HttpTask.java
@@ -137,7 +137,8 @@ public class HttpTask extends AbstractTask {
             }
         }
         addRequestParams(builder,httpPropertyList);
-        HttpUriRequest request = builder.setUri(httpParameters.getUrl()).build();
+        String requestUrl = ParameterUtils.convertParameterPlaceholders(httpParameters.getUrl(),ParamUtils.convert(paramsMap));
+        HttpUriRequest request = builder.setUri(requestUrl).build();
         setHeaders(request,httpPropertyList);
         return client.execute(request);
     }
-- 
GitLab