Change the Way to Invoke HTTP Requests

Issue-ID: HOLMES-50

Change-Id: Ib2998d3ac61977ecd1e7a21bb8bd71699d929990
Signed-off-by: youbowu <wu.youbo@zte.com.cn>

1 files changed, 5 insertions, 5 deletions

diff --git a/rulemgt/src/main/java/org/openo/holmes/rulemgt/bolt/enginebolt/EngineService.java b/rulemgt/src/main/java/org/openo/holmes/rulemgt/bolt/enginebolt/EngineService.java
index ac381d1..e792fbf 100644
--- a/rulemgt/src/main/java/org/openo/holmes/rulemgt/bolt/enginebolt/EngineService.java
+++ b/rulemgt/src/main/java/org/openo/holmes/rulemgt/bolt/enginebolt/EngineService.java
@@ -26,6 +26,7 @@ import javax.ws.rs.core.Response;
 import lombok.extern.slf4j.Slf4j;

 import org.glassfish.jersey.client.ClientConfig;

 import org.jvnet.hk2.annotations.Service;

+import org.openo.holmes.common.config.MicroServiceConfig;

 import org.openo.holmes.rulemgt.bean.request.CorrelationCheckRule4Engine;

 import org.openo.holmes.rulemgt.bean.request.CorrelationDeployRule4Engine;

 import org.openo.holmes.rulemgt.constant.RuleMgtConstant;

@@ -34,11 +35,10 @@ import org.openo.holmes.rulemgt.constant.RuleMgtConstant;
 @Service

 public class EngineService {

 

-    String url = "http://10.250.0.3:9102";

-

     protected Response delete(String packageName) throws IOException {

         Client client = createClient();

-        WebTarget webTarget = client.target(url + RuleMgtConstant.ENGINE_PATH + "/" + packageName);

+        WebTarget webTarget = client

+                .target(MicroServiceConfig.getMsbServerAddr() + RuleMgtConstant.ENGINE_PATH + "/" + packageName);

         return webTarget.request(MediaType.APPLICATION_JSON).delete();

     }

 

@@ -52,7 +52,7 @@ public class EngineService {
         Client client = createClient();

         ObjectMapper mapper = new ObjectMapper();

         String content = mapper.writeValueAsString(correlationCheckRule4Engine);

-        WebTarget webTarget = client.target(url + RuleMgtConstant.ENGINE_PATH);

+        WebTarget webTarget = client.target(MicroServiceConfig.getMsbServerAddr() + RuleMgtConstant.ENGINE_PATH);

         return webTarget.request(MediaType.APPLICATION_JSON).post(Entity.entity(content, MediaType.APPLICATION_JSON));

     }

 

@@ -60,7 +60,7 @@ public class EngineService {
         Client client = createClient();

         ObjectMapper mapper = new ObjectMapper();

         String content = mapper.writeValueAsString(correlationDeployRule4Engine);

-        WebTarget webTarget = client.target(url + RuleMgtConstant.ENGINE_PATH);

+        WebTarget webTarget = client.target(MicroServiceConfig.getMsbServerAddr() + RuleMgtConstant.ENGINE_PATH);

         return webTarget.request(MediaType.APPLICATION_JSON).put(Entity.entity(content, MediaType.APPLICATION_JSON));

     }

 }