Merge remote-tracking branch 'origin/ht' into ht

secondev-history-action/src/main/java/com/weaver/custom/configcenter/htiuroasyncConfig.java

@@ -0,0 +1,18 @@
+package com.weaver.custom.configcenter;
+
+import com.weaver.framework.client.annotation.WeaverConfigCenter;
+import lombok.Data;
+import org.springframework.stereotype.Component;
+
+@Data
+@Component
+@WeaverConfigCenter(sources = {
+        @WeaverConfigCenter.ConfigProperty(
+                dataId = "weaver-secondev-htiuroasync.properties",
+                group = "DEFAULT_GROUP",
+                refresh = "true")
+})
+public class htiuroasyncConfig {
+
+
+}

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/iuroa/SyncDataService.java

@@ -1,6 +1,7 @@
 package com.weaver.seconddev.interfaces.iuroa;
 
 import com.alibaba.fastjson.JSONObject;
+import com.weaver.seconddev.interfaces.prop.ConfigProp;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpPost;
@@ -13,9 +14,14 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import com.weaver.verupgrade.general.BaseBean;
 import com.weaver.verupgrade.general.Util;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
+@Component
 public class SyncDataService extends BaseBean {
 
+    @Autowired
+    private ConfigProp configProp;
     private static final org.slf4j.Logger logger_4014b7c4 = LoggerFactory.getLogger(SyncDataService.class);
 
     public String[] call(JSONObject data, String link) {
@@ -24,7 +30,9 @@ public class SyncDataService extends BaseBean {
         try {
             HttpClient client = new DefaultHttpClient();
 //            String url = Util.null2String(getPropValue("htiuroasync", link)).trim();
-            String url = "";
+
+            String url = configProp.getSyncProject();
+            logger_4014b7c4.error(String.valueOf("url = " + url));
             post = new HttpPost(url);
             post.setHeader(HTTP.CONTENT_TYPE, "application/json; charset=UTF-8");
             StringEntity entity = new StringEntity(data.toString(), "UTF-8");

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/prop/ConfigProp.java

@@ -10,6 +10,11 @@ import org.springframework.context.annotation.Configuration;
 @Configuration
 @RefreshScope
 public class ConfigProp {
+
+    //htiuroasync
+    @Value("${syncProject}")
+    private String syncProject;
+
     //htcmsoasync
     @Value("${htcmsoasync-appKey}")
     private String htcmsoasync_appKey;

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/Iur_syncProject.java

@@ -30,6 +30,9 @@ public class Iur_syncProject extends BaseBean implements Action, EsbServerlessRp
     @Autowired
     private RequestInfo requestInfoTemp;
 
+    @Autowired
+    private SyncDataService service;
+
     private static final Logger logger_72949ae6 = LoggerFactory.getLogger(Iur_syncProject.class);
 
     @Override
@@ -69,7 +72,7 @@ public class Iur_syncProject extends BaseBean implements Action, EsbServerlessRp
                 }
                 map.put("state", "0");
                 map.put("requestId", requestid);
-                SyncDataService service = new SyncDataService();
+//                SyncDataService service = new SyncDataService();
                 String[] result = service.call(map, "syncProject");
                 logger_72949ae6.error(requestid + "--Iur_syncProject--data:" + map.toString());
                 logger_72949ae6.error(String.valueOf(requestid + "--Iur_syncProject--info:[" + result[0] + "|" + result[1] + "]"));

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SAPConn.java

@@ -145,8 +145,8 @@ public class SAPConn {
             init();
             destination = JCoDestinationManager.getDestination(ABAP_AS);
             destination.ping();
-            logger_cb5e740f.error("ABAP_AS 	Attributes:");
-            logger_cb5e740f.error(String.valueOf(destination.getAttributes()));
+//            logger_cb5e740f.error("ABAP_AS 	Attributes:");
+//            logger_cb5e740f.error(String.valueOf(destination.getAttributes()));
             destination = JCoDestinationManager.getDestination(ABAP_AS_POOLED);
             destination.ping();
 //            logger_cb5e740f.error(String.valueOf("ABAP_AS_POOLED	Attributes:"));