diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/CallEasServices.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/CallEasServices.java index cae320b..39320df 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/CallEasServices.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/CallEasServices.java @@ -5,6 +5,7 @@ package com.weaver.seconddev.interfaces.easoa; import com.weaver.seconddev.interfaces.prop.ConfigProp; +import org.apache.axis2.kernel.http.HTTPConstants; import org.apache.axis2.transport.http.HttpTransportProperties; //import com.weaver.seconddev.interfaces.easoa.SI_HTOAPayControl_OUTServiceStub.*; import com.weaver.common.i18n.tool.util.I18nContextUtil; @@ -51,6 +52,8 @@ public class CallEasServices extends BaseBean { easStub = new PayControlServiceStub(url); easStub._getServiceClient().getOptions().setProperty("__CHUNKED__", Boolean.FALSE); easStub._getServiceClient().getOptions().setTimeOutInMilliSeconds(300000); + easStub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT,300000); + easStub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT,300000); HttpTransportPropertiesImpl.Authenticator auth = new HttpTransportPropertiesImpl.Authenticator(); auth.setUsername("pouser"); auth.setPassword("654321"); @@ -89,6 +92,8 @@ public class CallEasServices extends BaseBean { easStub = new PayControlServiceStub(url); easStub._getServiceClient().getOptions().setProperty("__CHUNKED__", Boolean.FALSE); easStub._getServiceClient().getOptions().setTimeOutInMilliSeconds(300000); + easStub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT,300000); + easStub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT,300000); HttpTransportPropertiesImpl.Authenticator auth = new HttpTransportPropertiesImpl.Authenticator(); auth.setUsername("pouser"); auth.setPassword("654321"); @@ -187,6 +192,8 @@ public class CallEasServices extends BaseBean { easStub = new PayControlServiceStub(url); easStub._getServiceClient().getOptions().setProperty("__CHUNKED__", Boolean.FALSE); easStub._getServiceClient().getOptions().setTimeOutInMilliSeconds(300000); + easStub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT,300000); + easStub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT,300000); HttpTransportPropertiesImpl.Authenticator auth = new HttpTransportPropertiesImpl.Authenticator(); auth.setUsername("pouser"); auth.setPassword("654321"); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/CallSieOAVoucherService.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/CallSieOAVoucherService.java index 20ccb89..644e96c 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/CallSieOAVoucherService.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/CallSieOAVoucherService.java @@ -1,6 +1,8 @@ package com.weaver.seconddev.interfaces.easoa; import java.lang.*; + +import org.apache.axis2.kernel.http.HTTPConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.weaver.verupgrade.general.BaseBean; @@ -35,6 +37,8 @@ public class CallSieOAVoucherService extends BaseBean { SieOaVoucherServiceStub stub = new SieOaVoucherServiceStub(url); stub._getServiceClient().getOptions().setProperty("__CHUNKED__", Boolean.FALSE); stub._getServiceClient().getOptions().setTimeOutInMilliSeconds(300000); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT,300000); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT,300000); SieOaVoucherServiceStub.SieOaVoucherServiceResponse response = stub.sieOaVoucherService(input); logger_89eeb72f.error(String.valueOf("------- do webservice success -------")); SieOaVoucherServiceStub.ResultInfoOA resultInfo = response.get_return(); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/CallTravelApplyService.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/CallTravelApplyService.java index 1aa51d6..8a8cebb 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/CallTravelApplyService.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/CallTravelApplyService.java @@ -1,6 +1,7 @@ package com.weaver.seconddev.interfaces.easoa; import com.weaver.seconddev.interfaces.prop.ConfigProp; +import org.apache.axis2.kernel.http.HTTPConstants; import org.apache.axis2.transport.http.HttpTransportProperties; import java.rmi.RemoteException; import com.weaver.common.i18n.tool.util.I18nContextUtil; @@ -36,6 +37,8 @@ public class CallTravelApplyService { SI_BusinessTripApplicationSync_OUTServiceStub stub = new SI_BusinessTripApplicationSync_OUTServiceStub(url); stub._getServiceClient().getOptions().setProperty("__CHUNKED__", Boolean.FALSE); stub._getServiceClient().getOptions().setTimeOutInMilliSeconds(300000); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT,300000); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT,300000); HttpTransportPropertiesImpl.Authenticator auth = new HttpTransportPropertiesImpl.Authenticator(); auth.setUsername("pouser"); auth.setPassword("654321"); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/DelayDateService.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/DelayDateService.java index 94cfa0e..53a3baf 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/DelayDateService.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/DelayDateService.java @@ -5,6 +5,7 @@ import com.weaver.seconddev.interfaces.easoa.DelayDateSyncServiceStub.DelayDate import com.weaver.seconddev.interfaces.easoa.DelayDateSyncServiceStub.SyncDelayDateInfo; import com.weaver.common.i18n.tool.util.I18nContextUtil; import com.weaver.seconddev.interfaces.prop.ConfigProp; +import org.apache.axis2.kernel.http.HTTPConstants; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import java.lang.*; @@ -30,6 +31,8 @@ public class DelayDateService extends BaseBean { DelayDateSyncServiceStub stub = new DelayDateSyncServiceStub(url); stub._getServiceClient().getOptions().setProperty("__CHUNKED__", Boolean.FALSE); stub._getServiceClient().getOptions().setTimeOutInMilliSeconds(300000); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT,300000); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT,300000); DelayDateSyncService req = new DelayDateSyncService(); req.setSyncDelayDateInfo(param); DelayDateSyncServiceResponse res = stub.delayDateSyncService(req); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/EASIntermediarySyncService.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/EASIntermediarySyncService.java index 7f965d0..ad5ce3d 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/EASIntermediarySyncService.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/EASIntermediarySyncService.java @@ -1,6 +1,7 @@ package com.weaver.seconddev.interfaces.easoa; import com.weaver.seconddev.interfaces.prop.ConfigProp; +import org.apache.axis2.kernel.http.HTTPConstants; import org.apache.axis2.transport.http.HttpTransportProperties; import com.weaver.seconddev.interfaces.easoa.SI_FiAgncyAssetApplicationSync_OUTServiceStub.*; import com.weaver.common.i18n.tool.util.I18nContextUtil; @@ -30,6 +31,8 @@ public class EASIntermediarySyncService extends BaseBean { SI_FiAgncyAssetApplicationSync_OUTServiceStub stub = new SI_FiAgncyAssetApplicationSync_OUTServiceStub(url); stub._getServiceClient().getOptions().setProperty("__CHUNKED__", Boolean.FALSE); stub._getServiceClient().getOptions().setTimeOutInMilliSeconds(300000); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT,300000); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT,300000); // HttpTransportProperties.Authenticator auth = new HttpTransportProperties.Authenticator(); //// auth.setUsername(Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.po_user")).trim()); //// auth.setPassword(Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.po_password")).trim()); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/FeeApplicationService.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/FeeApplicationService.java index c670be4..62019d4 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/FeeApplicationService.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/FeeApplicationService.java @@ -1,6 +1,7 @@ package com.weaver.seconddev.interfaces.easoa; import com.weaver.seconddev.interfaces.prop.ConfigProp; +import org.apache.axis2.kernel.http.HTTPConstants; import org.apache.axis2.transport.http.HttpTransportProperties; import com.weaver.seconddev.interfaces.easoa.SI_FeeApplicationSync_OUTServiceStub.CostStandardHead; import com.weaver.seconddev.interfaces.easoa.SI_FeeApplicationSync_OUTServiceStub.CostStandardSynchronization; @@ -31,6 +32,8 @@ public class FeeApplicationService extends BaseBean { // stub._getServiceClient().getOptions().setProperty(org.apache.axis2.transport.http.HTTPConstants.CHUNKED, Boolean.FALSE); stub._getServiceClient().getOptions().setProperty("__CHUNKED__", Boolean.FALSE); stub._getServiceClient().getOptions().setTimeOutInMilliSeconds(300000); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT,300000); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT,300000); // HttpTransportProperties.Authenticator auth = new HttpTransportProperties.Authenticator(); //// auth.setUsername(Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.po_user")).trim()); //// auth.setPassword(Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.po_password")).trim()); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/eipoa/AccountService.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/eipoa/AccountService.java index 8f10866..f33a104 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/eipoa/AccountService.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/eipoa/AccountService.java @@ -5,6 +5,7 @@ import com.weaver.seconddev.interfaces.eipoa.SI_HTPortalUAMGMT2_OUTServiceStub.U import com.weaver.seconddev.interfaces.prop.ConfigProp; import com.weaver.verupgrade.general.BaseBean; import com.weaver.verupgrade.general.Util; +import org.apache.axis2.kernel.http.HTTPConstants; import org.apache.axis2.transport.http.HttpTransportProperties; import org.apache.axis2.transport.http.impl.httpclient4.HttpTransportPropertiesImpl; import org.slf4j.Logger; @@ -30,6 +31,8 @@ public class AccountService extends BaseBean { SI_HTPortalUAMGMT2_OUTServiceStub stub = new SI_HTPortalUAMGMT2_OUTServiceStub(url); stub._getServiceClient().getOptions().setProperty("__CHUNKED__", Boolean.FALSE); stub._getServiceClient().getOptions().setTimeOutInMilliSeconds(300000); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT,300000); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT,300000); // HttpTransportProperties.Authenticator auth = new HttpTransportProperties.Authenticator(); // auth.setUsername(Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.po_user")).trim()); // auth.setPassword(Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.po_password")).trim()); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/eipoa/MesAccountService.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/eipoa/MesAccountService.java index 67ce6f7..3f3d98b 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/eipoa/MesAccountService.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/eipoa/MesAccountService.java @@ -7,6 +7,7 @@ import com.weaver.seconddev.interfaces.eipoa.SI_HTPortalFuncSync_OUTServiceStub. import com.weaver.seconddev.interfaces.prop.ConfigProp; import com.weaver.verupgrade.general.BaseBean; import com.weaver.verupgrade.general.Util; +import org.apache.axis2.kernel.http.HTTPConstants; import org.apache.axis2.transport.http.HttpTransportProperties; import org.apache.axis2.transport.http.impl.httpclient4.HttpTransportPropertiesImpl; import org.slf4j.Logger; @@ -30,6 +31,8 @@ public class MesAccountService extends BaseBean { SI_HTPortalFuncSync_OUTServiceStub stub = new SI_HTPortalFuncSync_OUTServiceStub(url); stub._getServiceClient().getOptions().setProperty("__CHUNKED__", Boolean.FALSE); stub._getServiceClient().getOptions().setTimeOutInMilliSeconds(300000); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT,300000); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT,300000); // HttpTransportProperties.Authenticator auth = new HttpTransportProperties.Authenticator(); // auth.setUsername(Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.po_user")).trim()); // auth.setPassword(Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.po_password")).trim()); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/eipoa/PortalPlanService.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/eipoa/PortalPlanService.java index fec0178..384e0b8 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/eipoa/PortalPlanService.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/eipoa/PortalPlanService.java @@ -5,6 +5,7 @@ import com.weaver.seconddev.interfaces.eipoa.SI_HTPortalPlan_OUTServiceStub.*; import com.weaver.seconddev.interfaces.prop.ConfigProp; import com.weaver.verupgrade.general.BaseBean; import com.weaver.verupgrade.general.Util; +import org.apache.axis2.kernel.http.HTTPConstants; import org.apache.axis2.transport.http.HttpTransportProperties; import org.apache.axis2.transport.http.impl.httpclient4.HttpTransportPropertiesImpl; import org.slf4j.Logger; @@ -67,6 +68,8 @@ public class PortalPlanService extends BaseBean { SI_HTPortalPlan_OUTServiceStub stub = new SI_HTPortalPlan_OUTServiceStub(url); stub._getServiceClient().getOptions().setProperty("__CHUNKED__", Boolean.FALSE); stub._getServiceClient().getOptions().setTimeOutInMilliSeconds(300000); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT,300000); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT,300000); // HttpTransportProperties.Authenticator auth = new HttpTransportProperties.Authenticator(); // auth.setUsername(Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.po_user")).trim()); // auth.setPassword(Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.po_password")).trim()); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/gdwmsoa/ZMES_OA_SUBMIT_SERVICE.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/gdwmsoa/ZMES_OA_SUBMIT_SERVICE.java index cb46612..e813c45 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/gdwmsoa/ZMES_OA_SUBMIT_SERVICE.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/gdwmsoa/ZMES_OA_SUBMIT_SERVICE.java @@ -2,6 +2,7 @@ package com.weaver.seconddev.interfaces.gdwmsoa; import com.weaver.common.i18n.tool.util.I18nContextUtil; import com.weaver.seconddev.interfaces.prop.ConfigProp; +import org.apache.axis2.kernel.http.HTTPConstants; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import java.lang.*; @@ -32,6 +33,8 @@ public class ZMES_OA_SUBMIT_SERVICE extends BaseBean { ZMES_OA_SUBMIT_SERVICEStub stub = new ZMES_OA_SUBMIT_SERVICEStub(url); stub._getServiceClient().getOptions().setProperty("__CHUNKED__", Boolean.FALSE); stub._getServiceClient().getOptions().setTimeOutInMilliSeconds(300000); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT,300000); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT,300000); ZMES_OA_SUBMIT_SERVICEStub.ZMES_OA_SUBMIT req = new ZMES_OA_SUBMIT_SERVICEStub.ZMES_OA_SUBMIT(); ZMES_OA_SUBMIT_SERVICEStub.ZMES_OA_SUBMIT_HEADER_TYPE header = new ZMES_OA_SUBMIT_SERVICEStub.ZMES_OA_SUBMIT_HEADER_TYPE(); header.setITFID(""); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/k3/ApprovalResultService.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/k3/ApprovalResultService.java index e76e432..1701edb 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/k3/ApprovalResultService.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/k3/ApprovalResultService.java @@ -1,6 +1,7 @@ package com.weaver.seconddev.interfaces.k3; import com.weaver.seconddev.interfaces.prop.ConfigProp; +import org.apache.axis2.kernel.http.HTTPConstants; import org.apache.axis2.transport.http.HttpTransportProperties; import com.weaver.seconddev.interfaces.k3.SI_HTOAPurreqAPPROSync_OUTServiceStub.OAPRResultItemIn; import com.weaver.common.i18n.tool.util.I18nContextUtil; @@ -28,6 +29,8 @@ public class ApprovalResultService extends BaseBean { SI_HTOAPurreqAPPROSync_OUTServiceStub stub = new SI_HTOAPurreqAPPROSync_OUTServiceStub(url); stub._getServiceClient().getOptions().setProperty("__CHUNKED__", Boolean.FALSE); stub._getServiceClient().getOptions().setTimeOutInMilliSeconds(300000); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT,300000); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT,300000); // HttpTransportProperties.Authenticator auth = new HttpTransportProperties.Authenticator(); // auth.setUsername(Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.po_user")).trim()); // auth.setPassword(Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.po_password")).trim()); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/k3/CallK3CustomerService.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/k3/CallK3CustomerService.java index 4761418..73769d8 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/k3/CallK3CustomerService.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/k3/CallK3CustomerService.java @@ -3,6 +3,7 @@ package com.weaver.seconddev.interfaces.k3; import com.alibaba.csp.sentinel.command.annotation.CommandMapping; import com.weaver.common.i18n.tool.util.I18nContextUtil; import com.weaver.seconddev.interfaces.prop.ConfigProp; +import org.apache.axis2.kernel.http.HTTPConstants; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import java.lang.*; @@ -34,6 +35,8 @@ public class CallK3CustomerService extends BaseBean { CustomerServiceStub stub = new CustomerServiceStub(url); stub._getServiceClient().getOptions().setProperty("__CHUNKED__", Boolean.FALSE); stub._getServiceClient().getOptions().setTimeOutInMilliSeconds(300000); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT,300000); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT,300000); // HttpTransportProperties.Authenticator auth = new HttpTransportProperties.Authenticator(); // auth.setUsername(Util.null2String(getPropValue("htportaloaUrl", "po_user")).trim()); // auth.setPassword(Util.null2String(getPropValue("htportaloaUrl", "po_password")).trim()); @@ -62,6 +65,8 @@ public class CallK3CustomerService extends BaseBean { CustomerServiceStub stub = new CustomerServiceStub(url); stub._getServiceClient().getOptions().setProperty("__CHUNKED__", Boolean.FALSE); stub._getServiceClient().getOptions().setTimeOutInMilliSeconds(300000); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT,300000); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT,300000); // HttpTransportProperties.Authenticator auth = new HttpTransportProperties.Authenticator(); // auth.setUsername(Util.null2String(getPropValue("htportaloaUrl", "po_user")).trim()); // auth.setPassword(Util.null2String(getPropValue("htportaloaUrl", "po_password")).trim()); @@ -91,6 +96,8 @@ public class CallK3CustomerService extends BaseBean { CustomerServiceStub stub = new CustomerServiceStub(url); stub._getServiceClient().getOptions().setProperty("__CHUNKED__", Boolean.FALSE); stub._getServiceClient().getOptions().setTimeOutInMilliSeconds(300000); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT,300000); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT,300000); // HttpTransportProperties.Authenticator auth = new HttpTransportProperties.Authenticator(); // auth.setUsername(Util.null2String(getPropValue("htportaloaUrl", "po_user")).trim()); // auth.setPassword(Util.null2String(getPropValue("htportaloaUrl", "po_password")).trim()); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/k3/CallK3SupplierServices.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/k3/CallK3SupplierServices.java index ca3b5bb..8db6064 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/k3/CallK3SupplierServices.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/k3/CallK3SupplierServices.java @@ -2,6 +2,7 @@ package com.weaver.seconddev.interfaces.k3; import com.weaver.common.i18n.tool.util.I18nContextUtil; import com.weaver.seconddev.interfaces.prop.ConfigProp; +import org.apache.axis2.kernel.http.HTTPConstants; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import java.lang.*; @@ -33,6 +34,8 @@ public class CallK3SupplierServices extends BaseBean { SupplierServiceStub stub = new SupplierServiceStub(url); stub._getServiceClient().getOptions().setProperty("__CHUNKED__", Boolean.FALSE); stub._getServiceClient().getOptions().setTimeOutInMilliSeconds(300000); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT,300000); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT,300000); // HttpTransportProperties.Authenticator auth = new HttpTransportProperties.Authenticator(); // auth.setUsername(Util.null2String(getPropValue("htportaloaUrl", "po_user")).trim()); // auth.setPassword(Util.null2String(getPropValue("htportaloaUrl", "po_password")).trim()); @@ -62,6 +65,8 @@ public class CallK3SupplierServices extends BaseBean { SupplierServiceStub stub = new SupplierServiceStub(url); stub._getServiceClient().getOptions().setProperty("__CHUNKED__", Boolean.FALSE); stub._getServiceClient().getOptions().setTimeOutInMilliSeconds(300000); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT,300000); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT,300000); // HttpTransportProperties.Authenticator auth = new HttpTransportProperties.Authenticator(); // auth.setUsername(Util.null2String(getPropValue("htportaloaUrl", "po_user")).trim()); // auth.setPassword(Util.null2String(getPropValue("htportaloaUrl", "po_password")).trim()); @@ -86,6 +91,8 @@ public class CallK3SupplierServices extends BaseBean { SupplierServiceStub stub = new SupplierServiceStub(url); stub._getServiceClient().getOptions().setProperty("__CHUNKED__", Boolean.FALSE); stub._getServiceClient().getOptions().setTimeOutInMilliSeconds(300000); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT,300000); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT,300000); // HttpTransportProperties.Authenticator auth = new HttpTransportProperties.Authenticator(); // auth.setUsername(Util.null2String(getPropValue("htportaloaUrl", "po_user")).trim()); // auth.setPassword(Util.null2String(getPropValue("htportaloaUrl", "po_password")).trim()); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/k3/CallPORequestService.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/k3/CallPORequestService.java index dfd3330..48cf1de 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/k3/CallPORequestService.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/k3/CallPORequestService.java @@ -2,6 +2,7 @@ package com.weaver.seconddev.interfaces.k3; import com.weaver.common.i18n.tool.util.I18nContextUtil; import com.weaver.seconddev.interfaces.prop.ConfigProp; +import org.apache.axis2.kernel.http.HTTPConstants; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import java.lang.*; @@ -27,6 +28,8 @@ public class CallPORequestService extends BaseBean { PORequestServiceStub stub = new PORequestServiceStub(url); stub._getServiceClient().getOptions().setProperty("__CHUNKED__", Boolean.FALSE); stub._getServiceClient().getOptions().setTimeOutInMilliSeconds(300000); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT,300000); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT,300000); // HttpTransportProperties.Authenticator auth = new HttpTransportProperties.Authenticator(); // auth.setUsername(Util.null2String(getPropValue("htportaloaUrl", "po_user")).trim()); // auth.setPassword(Util.null2String(getPropValue("htportaloaUrl", "po_password")).trim()); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/k3/GiftQtyService.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/k3/GiftQtyService.java index 639bb19..d6b5235 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/k3/GiftQtyService.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/k3/GiftQtyService.java @@ -6,6 +6,7 @@ import java.util.HashMap; import java.util.Map; import com.weaver.common.i18n.tool.util.I18nContextUtil; import com.weaver.seconddev.interfaces.prop.ConfigProp; +import org.apache.axis2.kernel.http.HTTPConstants; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import java.lang.*; @@ -35,6 +36,8 @@ public class GiftQtyService extends BaseBean { GiftQtyServiceStub stub = new GiftQtyServiceStub(url); stub._getServiceClient().getOptions().setProperty("__CHUNKED__", Boolean.FALSE); stub._getServiceClient().getOptions().setTimeOutInMilliSeconds(300000); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT,300000); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT,300000); GiftStockReq req = new GiftStockReq(); req.setUser("oa"); req.setPwd("k3cloud_htgd"); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/k3/TransferBillService.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/k3/TransferBillService.java index 44d93d2..6f5d79b 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/k3/TransferBillService.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/k3/TransferBillService.java @@ -6,6 +6,7 @@ import com.weaver.seconddev.interfaces.k3.TransferBillServiceStub.TransferBillR import com.weaver.seconddev.interfaces.k3.TransferBillServiceStub.TransferBillRes; import com.weaver.common.i18n.tool.util.I18nContextUtil; import com.weaver.seconddev.interfaces.prop.ConfigProp; +import org.apache.axis2.kernel.http.HTTPConstants; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import java.lang.*; @@ -30,6 +31,8 @@ public class TransferBillService extends BaseBean { TransferBillServiceStub stub = new TransferBillServiceStub(url); stub._getServiceClient().getOptions().setProperty("__CHUNKED__", Boolean.FALSE); stub._getServiceClient().getOptions().setTimeOutInMilliSeconds(300000); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT,300000); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT,300000); BuildTransferBill req = new BuildTransferBill(); req.setObj(param); TransferBillServiceStub.BuildTransferBillResponse res = stub.buildTransferBill(req); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/oames/ReturnMesWLPS_SYService.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/oames/ReturnMesWLPS_SYService.java index f321244..0a76b45 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/oames/ReturnMesWLPS_SYService.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/oames/ReturnMesWLPS_SYService.java @@ -1,6 +1,7 @@ package com.weaver.seconddev.interfaces.oames; import com.weaver.seconddev.interfaces.prop.ConfigProp; +import org.apache.axis2.kernel.http.HTTPConstants; import org.apache.axis2.transport.http.HttpTransportProperties; import com.weaver.seconddev.interfaces.oames.SI_OA_HTOAApproFlowSync_OUTServiceStub.SendReq; import com.weaver.seconddev.interfaces.oames.SI_OA_HTOAApproFlowSync_OUTServiceStub.WLPS_SY_Request; @@ -30,6 +31,8 @@ public class ReturnMesWLPS_SYService extends BaseBean { SI_OA_HTOAApproFlowSync_OUTServiceStub stub = new SI_OA_HTOAApproFlowSync_OUTServiceStub(url); stub._getServiceClient().getOptions().setProperty("__CHUNKED__", Boolean.FALSE); stub._getServiceClient().getOptions().setTimeOutInMilliSeconds(300000); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT,300000); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT,300000); // HttpTransportProperties.Authenticator auth = new HttpTransportProperties.Authenticator(); // auth.setUsername(Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.po_user")).trim()); // auth.setPassword(Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.po_password")).trim()); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/OaSrmVenMatExtService.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/OaSrmVenMatExtService.java index 6c8e12e..0acb73c 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/OaSrmVenMatExtService.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/OaSrmVenMatExtService.java @@ -1,6 +1,7 @@ package com.weaver.seconddev.interfaces.srmoa; import com.weaver.seconddev.interfaces.prop.ConfigProp; +import org.apache.axis2.kernel.http.HTTPConstants; import org.apache.axis2.transport.http.HttpTransportProperties; import com.weaver.seconddev.interfaces.srmoa.SI_GoodsSupplyExpanding_OUTServiceStub.*; import com.weaver.common.i18n.tool.util.I18nContextUtil; @@ -32,6 +33,8 @@ public class OaSrmVenMatExtService extends BaseBean { logger_333d882d.error("stub--" + stub); stub._getServiceClient().getOptions().setProperty("__CHUNKED__", Boolean.FALSE); stub._getServiceClient().getOptions().setTimeOutInMilliSeconds(300000); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT,300000); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT,300000); logger_333d882d.error("stub--" + stub); // HttpTransportProperties.Authenticator auth = new HttpTransportProperties.Authenticator(); // auth.setUsername(Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.po_user")).trim()); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasWhiteListAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasWhiteListAction.java index 4ca2af1..dabf5ca 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasWhiteListAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasWhiteListAction.java @@ -1,5 +1,6 @@ package com.weaver.seconddev.interfaces.workflow.action; +import org.apache.axis2.kernel.http.HTTPConstants; import org.apache.axis2.transport.http.HttpTransportProperties; import com.weaver.seconddev.interfaces.easoa.SI_WhitelistSync_OUTServiceStub; import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; @@ -172,6 +173,8 @@ public class EasWhiteListAction extends BaseBean implements Action, EsbServerles SI_WhitelistSync_OUTServiceStub stub = new SI_WhitelistSync_OUTServiceStub(uri); stub._getServiceClient().getOptions().setProperty("__CHUNKED__", Boolean.FALSE); stub._getServiceClient().getOptions().setTimeOutInMilliSeconds(300000); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT,300000); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT,300000); // HttpTransportProperties.Authenticator auth = new HttpTransportProperties.Authenticator(); HttpTransportPropertiesImpl.Authenticator auth = new HttpTransportPropertiesImpl.Authenticator(); auth.setUsername("pouser"); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZZ_GDFileUploadAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZZ_GDFileUploadAction.java index 5fefc53..072cddf 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZZ_GDFileUploadAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZZ_GDFileUploadAction.java @@ -149,7 +149,7 @@ public class ZZ_GDFileUploadAction extends BaseBean implements Action, EsbServer mJson.put("businessType", businessType); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); JSONArray fileVOListArr = new JSONArray(); - if (!"".equals(fileIds) && !"4814".equals(workFlowId)) { + if (!"".equals(fileIds) && !"100003460000004814".equals(workFlowId)) { String[] docs = fileIds.split(","); for (int i = 0; i < docs.length; i++) { String docid = docs[i]; diff --git a/secondev-ht-njwebservice/src/main/java/com/weaver/custom/configcenter/htwsaccountConfig.java b/secondev-ht-njwebservice/src/main/java/com/weaver/custom/configcenter/htwsaccountConfig.java new file mode 100644 index 0000000..61aa9ef --- /dev/null +++ b/secondev-ht-njwebservice/src/main/java/com/weaver/custom/configcenter/htwsaccountConfig.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-htwsaccount.properties", + group = "DEFAULT_GROUP", + refresh = "true") +}) +public class htwsaccountConfig { + + +} diff --git a/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/DiscountedInvoiceApplicationService.java b/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/DiscountedInvoiceApplicationService.java index 04924d8..74148ce 100644 --- a/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/DiscountedInvoiceApplicationService.java +++ b/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/DiscountedInvoiceApplicationService.java @@ -5,6 +5,7 @@ import com.weaver.common.hrm.util.Util; import com.weaver.common.i18n.tool.util.I18nContextUtil; import com.weaver.seconddev.njwebservice.entity.DiscountedInvoiceInfoReq; import com.weaver.seconddev.njwebservice.entity.ResponseInfo; +import com.weaver.seconddev.njwebservice.prop.ConfigProp; import com.weaver.verupgrade.conn.CONN_TYPE; import com.weaver.verupgrade.conn.RecordSet; import org.slf4j.Logger; @@ -32,6 +33,9 @@ public class DiscountedInvoiceApplicationService { @Autowired private AutoCreateWorkflowService autoCreateWorkflowService; + @Autowired + private ConfigProp configProp; //注入 + public ResponseInfo discountedInvoiceApplicate(DiscountedInvoiceInfoReq param) { log.error("DiscountedInvoiceApplicationService:"+param.toString()); ResponseInfo res = new ResponseInfo(); @@ -80,7 +84,7 @@ public class DiscountedInvoiceApplicationService { //String gscode = Util.null2String(getPropValue("htwsaccount", "ZWZDYW")).trim(); //todo 配置文件未建立 - String gscode = ""; + String gscode = configProp.getZWZDYW(); List list = Arrays.asList(gscode.split(",")); String workflowId = "100003460000004207";//e10 100003460000004207 e9 4207 diff --git a/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/prop/ConfigProp.java b/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/prop/ConfigProp.java new file mode 100644 index 0000000..13a453a --- /dev/null +++ b/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/prop/ConfigProp.java @@ -0,0 +1,18 @@ +package com.weaver.seconddev.njwebservice.prop; + + +import lombok.Data; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.cloud.context.config.annotation.RefreshScope; +import org.springframework.context.annotation.Configuration; + +@Data +@Configuration +@RefreshScope +public class ConfigProp { + //htcmsoasync + @Value("${ZWZDYW}") + private String ZWZDYW; + + +} diff --git a/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/util/WfUtil.java b/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/util/WfUtil.java index 0fddb45..90c31de 100644 --- a/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/util/WfUtil.java +++ b/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/util/WfUtil.java @@ -160,7 +160,7 @@ public class WfUtil { field3 = Util.null2String(rs.getString("field3")); } if("".equals(field3)||"mgl".equals(field3)){ - field3="HTJT"; + field3="htjt"; } return field3; }