import java.io.ByteArrayOutputStream;\r
import java.io.IOException;\r
import java.io.UnsupportedEncodingException;\r
-import javax.inject.Inject;\r
import org.apache.commons.lang3.StringUtils;\r
import org.apache.http.HttpEntity;\r
import org.apache.http.HttpResponse;\r
import org.apache.http.impl.client.CloseableHttpClient;\r
import org.apache.http.impl.client.HttpClients;\r
import org.jvnet.hk2.annotations.Service;\r
+import org.openo.holmes.common.config.MicroServiceConfig;\r
import org.openo.holmes.common.exception.CorrelationException;\r
import org.openo.holmes.common.utils.I18nProxy;\r
-import org.openo.holmes.rulemgt.RuleAppConfig;\r
import org.openo.holmes.rulemgt.bean.request.CorrelationCheckRule4Engine;\r
import org.openo.holmes.rulemgt.bean.request.CorrelationDeployRule4Engine;\r
import org.openo.holmes.rulemgt.constant.RuleMgtConstant;\r
@Service\r
public class EngineService {\r
\r
- @Inject\r
- private RuleAppConfig ruleAppConfig;\r
-\r
protected HttpResponse delete(String packageName) throws IOException {\r
- return deleteRequest(ruleAppConfig.getMsbServerAddr() + RuleMgtConstant.ENGINE_PATH + "/" + packageName);\r
+ return deleteRequest(MicroServiceConfig.getMsbServerAddr() + RuleMgtConstant.ENGINE_PATH + "/" + packageName);\r
}\r
\r
protected HttpResponse check(CorrelationCheckRule4Engine correlationCheckRule4Engine)\r
throws IOException {\r
ObjectMapper mapper = new ObjectMapper();\r
String content = mapper.writeValueAsString(correlationCheckRule4Engine);\r
- return postRequest(ruleAppConfig.getMsbServerAddr() + RuleMgtConstant.ENGINE_PATH, content);\r
+ return postRequest(MicroServiceConfig.getMsbServerAddr() + RuleMgtConstant.ENGINE_PATH, content);\r
}\r
\r
protected HttpResponse deploy(CorrelationDeployRule4Engine correlationDeployRule4Engine) throws IOException {\r
ObjectMapper mapper = new ObjectMapper();\r
String content = mapper.writeValueAsString(correlationDeployRule4Engine);\r
- return putRequest(ruleAppConfig.getMsbServerAddr() + RuleMgtConstant.ENGINE_PATH, content);\r
+ return putRequest(MicroServiceConfig.getMsbServerAddr() + RuleMgtConstant.ENGINE_PATH, content);\r
}\r
\r
private HttpResponse postRequest(String url, String content) throws IOException {\r