diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Collect.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Collect.java index a2b642e2476d664e96939b21fe45ce3847d42545..bf95b80e462055cbd3464af81faef92597e493c4 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Collect.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Collect.java @@ -34,6 +34,7 @@ public class Collect extends ConfigObject { public static String ADDRESS_COLLECT_VALIDATE = "/o2_collect_assemble/jaxrs/unit/validate"; public static String ADDRESS_COLLECT_VALIDATE_CODE = "/o2_collect_assemble/jaxrs/unit/validate/codeanswer"; public static String ADDRESS_COLLECT_APPLICATION_LIST = "/o2_collect_assemble/jaxrs/application/list"; + public static String ADDRESS_COLLECT_MARKET = "/market"; public static String ADDRESS_COLLECT_APPLICATION_DOWN = "/o2_collect_assemble/jaxrs/application/download"; public static String COLLECT_TOKEN = "c-token"; public static String ADDRESS_APPPACK_AUTH = "/auth/collect"; diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/connection/ConnectionAction.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/connection/ConnectionAction.java index a594a8339e653d1e44068ad9494af4c767d07322..33ec7e0bf3999ffd679b7e464834d11d0fbb4558 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/connection/ConnectionAction.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/connection/ConnectionAction.java @@ -77,6 +77,14 @@ public class ConnectionAction { connection.setReadTimeout(readTimeout); try { connection.connect(); + int status = connection.getResponseCode(); + if (status == HttpURLConnection.HTTP_MOVED_TEMP || status == HttpURLConnection.HTTP_MOVED_PERM) { + String redirect = connection.getHeaderField("Location"); + if(StringUtils.isNotBlank(redirect)) { + connection.disconnect(); + return getDelete(connectTimeout, readTimeout, redirect, method, heads); + } + } } catch (Exception e) { response.setType(Type.connectFatal); response.setMessage(String.format("%s connect connection error, address: %s, because: %s.", method, address, @@ -188,6 +196,14 @@ public class ConnectionAction { String.format("%s ouput error, address: %s, because: %s.", method, address, e.getMessage())); return response; } + int status = connection.getResponseCode(); + if (status == HttpURLConnection.HTTP_MOVED_TEMP || status == HttpURLConnection.HTTP_MOVED_PERM) { + String redirect = connection.getHeaderField("Location"); + if(StringUtils.isNotBlank(redirect)) { + connection.disconnect(); + return postPut(connectTimeout, readTimeout, redirect, method, heads, body); + } + } return read(response, connection); } @@ -506,4 +522,4 @@ public class ConnectionAction { map.entrySet().forEach((o -> connection.addRequestProperty(o.getKey(), o.getValue()))); } -} \ No newline at end of file +} diff --git a/o2server/x_program_center/src/main/java/com/x/program/center/schedule/CollectMarket.java b/o2server/x_program_center/src/main/java/com/x/program/center/schedule/CollectMarket.java index 80bbb47f0e8a9f5c3c0fd89ce865cc6e519cf6fb..24db7057e11543bb28f33f6b486328cef675f8d3 100644 --- a/o2server/x_program_center/src/main/java/com/x/program/center/schedule/CollectMarket.java +++ b/o2server/x_program_center/src/main/java/com/x/program/center/schedule/CollectMarket.java @@ -44,11 +44,11 @@ public class CollectMarket extends BaseAction { Business business = new Business(emc); String token = business.loginCollect(); if (StringUtils.isNotEmpty(token)) { - logger.debug("start sync market data====="); + logger.info("start sync market data====="); List<Wi> wiList = null; try { ActionResponse response = ConnectionAction.get( - Config.collect().url(Collect.ADDRESS_COLLECT_APPLICATION_LIST), + Config.collect().url(Collect.ADDRESS_COLLECT_MARKET), ListTools.toList(new NameValuePair(Collect.COLLECT_TOKEN, token))); wiList = response.getDataAsList(Wi.class); } catch (Exception e) { @@ -112,7 +112,7 @@ public class CollectMarket extends BaseAction { } emc.commit(); } - logger.debug("end sync market data====="); + logger.info("end sync market data====="); } } } @@ -140,4 +140,15 @@ public class CollectMarket extends BaseAction { } } -} \ No newline at end of file + public static void main(String[] args) throws Exception{ + System.out.println("==========1"); + ActionResponse response1 = ConnectionAction.get( + "http://collect.o2oa.net:20080/market", + ListTools.toList(new NameValuePair(Collect.COLLECT_TOKEN, "DltLNMgB3BaKEeBBjgHVADkfpuTt3sqriL15iT2Cjgk"))); + List<Wi> wiList = response1.getDataAsList(Wi.class); + System.out.println("wait sync market app size锛�"+ wiList.size()); + System.out.println("==========2"); + + } + +}