From 52eb245619265f31dbc78ec2f7a948537b9f4b2c Mon Sep 17 00:00:00 2001 From: qijirenjian Date: Tue, 10 Dec 2024 10:43:59 +0800 Subject: [PATCH] =?UTF-8?q?config=20=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crmoa/CRM_SyncTempUnfreeze.java | 8 ++++-- .../crmoa/CRM_syncUnFreezeTimes.java | 9 ++++++- .../interfaces/easoa/CallEasServices.java | 10 ++++++-- .../easoa/CallTravelApplyService.java | 8 +++++- .../interfaces/easoa/DelayDateService.java | 8 ++++-- .../easoa/EASIntermediarySyncService.java | 7 +++++- .../easoa/EAS_YszxfpApplyResult.java | 5 +++- .../easoa/FeeApplicationService.java | 5 +++- .../interfaces/easoa/InterLoanService.java | 5 +++- .../interfaces/eipoa/AccountService.java | 5 +++- .../interfaces/eipoa/GetSystemList.java | 5 +++- .../interfaces/eipoa/MesAccountService.java | 5 +++- .../interfaces/eipoa/PortalPlanService.java | 5 +++- .../gdwmsoa/ZMES_OA_SUBMIT_SERVICE.java | 5 +++- .../interfaces/k3/ApprovalResultService.java | 5 +++- .../interfaces/k3/CallK3CustomerService.java | 5 +++- .../interfaces/k3/CallK3SupplierServices.java | 5 +++- .../interfaces/k3/CallPORequestService.java | 5 +++- .../interfaces/k3/GiftQtyService.java | 5 +++- .../interfaces/k3/TransferBillService.java | 5 +++- .../seconddev/interfaces/oactrip/OaCtrip.java | 5 +++- .../seconddev/interfaces/prop/ConfigProp.java | 25 +++++++++++++++++-- .../interfaces/scfoa/GetApproveResult.java | 5 +++- .../srmoa/CallSrmCheckMallServices.java | 5 +++- .../srmoa/CallSrmCheckPriceServices.java | 5 +++- .../srmoa/OaSrmVenMatExtService.java | 5 +++- .../interfaces/swfa/sl/CallDTtripService.java | 5 +++- .../interfaces/swfa/sl/CallSLServices.java | 5 +++- .../workflow/action/CheckEmailAction.java | 2 ++ 29 files changed, 150 insertions(+), 32 deletions(-) diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/crmoa/CRM_SyncTempUnfreeze.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/crmoa/CRM_SyncTempUnfreeze.java index 8127be4..ec81802 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/crmoa/CRM_SyncTempUnfreeze.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/crmoa/CRM_SyncTempUnfreeze.java @@ -25,8 +25,12 @@ public class CRM_SyncTempUnfreeze extends BaseBean { stub._getServiceClient().getOptions().setProperty(org.apache.axis2.transport.http.HTTPConstants.CHUNKED, Boolean.FALSE); stub._getServiceClient().getOptions().setTimeOutInMilliSeconds(300000); HttpTransportProperties.Authenticator auth = new HttpTransportProperties.Authenticator(); - auth.setUsername(Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htportaloaUrl.po_user")).trim()); - auth.setPassword(Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htportaloaUrl.po_password")).trim()); +// auth.setUsername(Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htportaloaUrl.po_user")).trim()); +// auth.setPassword(Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htportaloaUrl.po_password")).trim()); + + auth.setUsername(configProp.getPo_user()); + auth.setPassword(configProp.getPo_password()); + stub._getServiceClient().getOptions().setProperty(org.apache.axis2.transport.http.HTTPConstants.AUTHENTICATE, auth); CRM_OA_SyncTempUnfreezeList req = new CRM_OA_SyncTempUnfreezeList(); ArrayOfCRM_TEMPUNFREEZE_HEAD array = new ArrayOfCRM_TEMPUNFREEZE_HEAD(); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/crmoa/CRM_syncUnFreezeTimes.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/crmoa/CRM_syncUnFreezeTimes.java index 61226f8..1cc7ab7 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/crmoa/CRM_syncUnFreezeTimes.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/crmoa/CRM_syncUnFreezeTimes.java @@ -4,9 +4,11 @@ // Source File Name: ZOA_MM_AFNAM_SYNC.java package com.weaver.seconddev.interfaces.crmoa; +import com.weaver.seconddev.interfaces.prop.ConfigProp; import org.apache.axis2.AxisFault; import java.rmi.RemoteException; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import java.lang.*; import org.slf4j.Logger; @@ -28,6 +30,9 @@ public class CRM_syncUnFreezeTimes extends BaseBean { time = times; } + @Autowired + private ConfigProp configProp; + public String[] call() throws RemoteException { String[] as = new String[3]; try { @@ -35,7 +40,9 @@ public class CRM_syncUnFreezeTimes extends BaseBean { logger_38dddf66.info(String.valueOf("------- do webservice CRM_syncUnFreezeTimes start -------")); CRM_SyncUnFreezeTimesStub stub = null; // String s2= "http://10.6.6.77:8070/CRM_SyncUnFreezeTimes.asmx"; - String s2 = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htcrmoasync.times")).trim(); +// String s2 = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htcrmoasync.times")).trim(); + String s2 = configProp.getTimes(); + stub = new CRM_SyncUnFreezeTimesStub(s2); stub._getServiceClient().getOptions().setProperty("__CHUNKED__", Boolean.FALSE); // 设置超时时间 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 aa3f640..3b42a06 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 @@ -4,9 +4,11 @@ // Source File Name: CallEasServices.java package com.weaver.seconddev.interfaces.easoa; +import com.weaver.seconddev.interfaces.prop.ConfigProp; import org.apache.axis2.transport.http.HttpTransportProperties; import com.weaver.seconddev.interfaces.easoa.SI_HTOAPayControl_OUTServiceStub.*; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import java.lang.*; import org.slf4j.Logger; @@ -17,17 +19,21 @@ import com.weaver.verupgrade.general.Util; // Referenced classes of package com.weaver.seconddev.interfaces.easoa: // CallEasServices public class CallEasServices extends BaseBean { - + @Autowired + private ConfigProp configProp; private static final org.slf4j.Logger logger_814f159c = LoggerFactory.getLogger(CallEasServices.class); // private static String url = "http://10.6.2.35:7001/easws/services/PayControlService?wsdl"; // private static String url = "http://10.6.34.83:8080/easws/services/PayControlService?wsdl"; - private String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("hteasoasync.url")).trim(); +// private String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("hteasoasync.url")).trim(); + private String url =configProp.getUrl(); // private String url = "http://sappod.hengtong.com:50000/XISOAPAdapter/MessageServlet?senderParty=&senderService=BS_OA&receiverParty=&receiverService=&interface=SI_HTOAPayControl_OUT&interfaceNamespace=http://hengtong.com/OA/HTOAPayControl"; public CallEasServices() { } + + /** * 获取上线公司信息 提交OA流程requestId：1362923 * @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 91794a4..3bcb57a 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,8 +1,10 @@ package com.weaver.seconddev.interfaces.easoa; +import com.weaver.seconddev.interfaces.prop.ConfigProp; import org.apache.axis2.transport.http.HttpTransportProperties; import java.rmi.RemoteException; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -19,10 +21,14 @@ public class CallTravelApplyService { this.input = resultIn; } + @Autowired + private ConfigProp configProp; + public String[] call() throws RemoteException { String[] result = new String[5]; // String url = "http://10.6.2.35:7001/easws/services/syncTravelApplyService?wsdl"; - String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("hteasoasync.TravelApply")).trim(); +// String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("hteasoasync.TravelApply")).trim(); + String url =configProp.getTravelApply(); // String url = "http://sappod.hengtong.com:50000/XISOAPAdapter/MessageServlet?senderParty=&senderService=BS_OA&receiverParty=&receiverService=&interface=SI_BusinessTripApplicationSync_OUT&interfaceNamespace=http://hengtong.com/OA/BusinessTripApplicationSync"; SI_BusinessTripApplicationSync_OUTServiceStub stub = new SI_BusinessTripApplicationSync_OUTServiceStub(url); stub._getServiceClient().getOptions().setProperty(org.apache.axis2.transport.http.HTTPConstants.CHUNKED, Boolean.FALSE); 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 a13809a..0eebc74 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 @@ -4,6 +4,8 @@ import com.weaver.seconddev.interfaces.easoa.DelayDateSyncServiceStub.DelayDate import com.weaver.seconddev.interfaces.easoa.DelayDateSyncServiceStub.DelayDateSyncServiceResponse; 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.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import java.lang.*; import org.slf4j.Logger; @@ -14,9 +16,11 @@ import com.weaver.verupgrade.general.Util; public class DelayDateService extends BaseBean { private static final org.slf4j.Logger logger_cf6b843f = LoggerFactory.getLogger(DelayDateService.class); - + @Autowired + private ConfigProp configProp; public String[] callService(SyncDelayDateInfo param) { - String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("hteasoasync.DelayDateSync")).trim(); +// String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("hteasoasync.DelayDateSync")).trim(); + String url = configProp.getDelayDateSync(); String[] str = new String[2]; try { logger_cf6b843f.info(String.valueOf("DelayDateService--start")); 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 eaa8eb2..33ac2c4 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,8 +1,10 @@ package com.weaver.seconddev.interfaces.easoa; +import com.weaver.seconddev.interfaces.prop.ConfigProp; import org.apache.axis2.transport.http.HttpTransportProperties; import com.weaver.seconddev.interfaces.easoa.SI_FiAgncyAssetApplicationSync_OUTServiceStub.*; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import java.lang.*; import org.slf4j.Logger; @@ -14,9 +16,12 @@ public class EASIntermediarySyncService extends BaseBean { private static final org.slf4j.Logger logger_cd0192cf = LoggerFactory.getLogger(EASIntermediarySyncService.class); + @Autowired + private ConfigProp configProp; public String[] call(IntermediaryApplication info) { String[] str = new String[2]; - String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("hteasoasync.intermediarysync")).trim(); +// String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("hteasoasync.intermediarysync")).trim(); + String url =configProp.getIntermediarysync(); try { logger_cd0192cf.info(String.valueOf("调用报账系统中介同步接口开始")); SI_FiAgncyAssetApplicationSync_OUTServiceStub stub = new SI_FiAgncyAssetApplicationSync_OUTServiceStub(url); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/EAS_YszxfpApplyResult.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/EAS_YszxfpApplyResult.java index 11b9448..b04c85e 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/EAS_YszxfpApplyResult.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/EAS_YszxfpApplyResult.java @@ -1,6 +1,7 @@ package com.weaver.seconddev.interfaces.easoa; 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,6 +14,7 @@ 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; /** * oa->eas 报账系统，应收折现发票申请返回接口 @@ -20,7 +22,8 @@ import com.weaver.verupgrade.general.Util; public class EAS_YszxfpApplyResult extends BaseBean { private static final org.slf4j.Logger logger_683a4c66 = LoggerFactory.getLogger(EAS_YszxfpApplyResult.class); - + @Autowired + private ConfigProp configProp; public String getApproveResult(JSONObject returnJson, String type) { HttpPost post = null; String result = "E"; 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 700ca69..9b01138 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,11 +1,13 @@ package com.weaver.seconddev.interfaces.easoa; +import com.weaver.seconddev.interfaces.prop.ConfigProp; 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; import com.weaver.seconddev.interfaces.easoa.SI_FeeApplicationSync_OUTServiceStub.CostStandardSynchronizationService; import com.weaver.seconddev.interfaces.easoa.SI_FeeApplicationSync_OUTServiceStub.CostStandardSynchronizationServiceResponse; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import java.lang.*; import org.slf4j.Logger; @@ -16,7 +18,8 @@ import com.weaver.verupgrade.general.Util; public class FeeApplicationService extends BaseBean { private static final org.slf4j.Logger logger_2817d3b0 = LoggerFactory.getLogger(FeeApplicationService.class); - + @Autowired + private ConfigProp configProp; public CostStandardSynchronizationServiceResponse call(CostStandardHead param) throws Exception { String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("hteasoasync.FeeApplication")).trim(); logger_2817d3b0.info(String.valueOf("调用报账系统话费交通费接口开始")); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/InterLoanService.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/InterLoanService.java index e5935ee..3bcbd32 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/InterLoanService.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/InterLoanService.java @@ -1,5 +1,6 @@ package com.weaver.seconddev.interfaces.easoa; +import com.weaver.seconddev.interfaces.prop.ConfigProp; import org.apache.axis2.transport.http.HttpTransportProperties; import com.weaver.seconddev.interfaces.easoa.SI_InterLoanApplicationSync_OUTServiceStub.InternalBorrowing; import com.weaver.seconddev.interfaces.easoa.SI_InterLoanApplicationSync_OUTServiceStub.InternalBorrowingService; @@ -7,6 +8,7 @@ import com.weaver.seconddev.interfaces.easoa.SI_InterLoanApplicationSync_OUTSer import com.weaver.seconddev.interfaces.easoa.SI_InterLoanApplicationSync_OUTServiceStub.ResultInfo; import com.weaver.seconddev.interfaces.easoa.SI_InterLoanApplicationSync_OUTServiceStub.ResultInfoLines; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import java.lang.*; import org.slf4j.Logger; @@ -17,7 +19,8 @@ import com.weaver.verupgrade.general.Util; public class InterLoanService extends BaseBean { private static final org.slf4j.Logger logger_9c1a93c4 = LoggerFactory.getLogger(InterLoanService.class); - + @Autowired + private ConfigProp configProp; public String[] call(InternalBorrowing[] info) { String[] str = new String[2]; String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("hteasoasync.InterLoan")).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 f5d787f..885c50a 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 @@ -2,17 +2,20 @@ package com.weaver.seconddev.interfaces.eipoa; import com.weaver.common.i18n.tool.util.I18nContextUtil; import com.weaver.seconddev.interfaces.eipoa.SI_HTPortalUAMGMT2_OUTServiceStub.UserSyncInfo; +import com.weaver.seconddev.interfaces.prop.ConfigProp; import com.weaver.verupgrade.general.BaseBean; import com.weaver.verupgrade.general.Util; import org.apache.axis2.transport.http.HttpTransportProperties; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; public class AccountService extends BaseBean { private static final Logger logger_18cc50ce = LoggerFactory.getLogger(AccountService.class); - + @Autowired + private ConfigProp configProp; public String[] account(String sendid, UserSyncInfo[] arr) { String[] array = new String[2]; String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htportaloaUrl.accountUrl")).trim(); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/eipoa/GetSystemList.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/eipoa/GetSystemList.java index d137231..310ebb2 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/eipoa/GetSystemList.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/eipoa/GetSystemList.java @@ -2,6 +2,7 @@ package com.weaver.seconddev.interfaces.eipoa; import com.alibaba.fastjson.JSONObject; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.seconddev.interfaces.prop.ConfigProp; import com.weaver.verupgrade.general.BaseBean; import com.weaver.verupgrade.general.Util; import org.apache.http.HttpResponse; @@ -13,12 +14,14 @@ import org.apache.http.protocol.HTTP; import org.apache.http.util.EntityUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; public class GetSystemList extends BaseBean { private static final Logger logger_a4ce8d9d = LoggerFactory.getLogger(GetSystemList.class); - + @Autowired + private ConfigProp configProp; public String getList(String uid) { HttpPost post = null; String result = "E"; 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 731582b..89927f4 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 @@ -4,17 +4,20 @@ import com.weaver.common.i18n.tool.util.I18nContextUtil; import com.weaver.seconddev.interfaces.eipoa.SI_HTPortalFuncSync_OUTServiceStub.UserOaAccount; import com.weaver.seconddev.interfaces.eipoa.SI_HTPortalFuncSync_OUTServiceStub.UserOaAccountResponse; import com.weaver.seconddev.interfaces.eipoa.SI_HTPortalFuncSync_OUTServiceStub.UserSyncInfo; +import com.weaver.seconddev.interfaces.prop.ConfigProp; import com.weaver.verupgrade.general.BaseBean; import com.weaver.verupgrade.general.Util; import org.apache.axis2.transport.http.HttpTransportProperties; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; public class MesAccountService extends BaseBean { private static final Logger logger_8f904fbd = LoggerFactory.getLogger(MesAccountService.class); - + @Autowired + private ConfigProp configProp; public String[] account(UserSyncInfo[] param) { String[] array = new String[2]; String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htportaloaUrl.mesaccountUrl")).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 a9616e5..d3ef5f3 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 @@ -2,17 +2,20 @@ package com.weaver.seconddev.interfaces.eipoa; import com.weaver.common.i18n.tool.util.I18nContextUtil; 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.transport.http.HttpTransportProperties; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; public class PortalPlanService extends BaseBean { private static final Logger logger_c9c5c87a = LoggerFactory.getLogger(PortalPlanService.class); - + @Autowired + private ConfigProp configProp; public String[] insertPlan(InsertPlan insertData) { String[] insertReturn = new String[2]; try { 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 f21790a..9dab2ba 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 @@ -1,6 +1,8 @@ package com.weaver.seconddev.interfaces.gdwmsoa; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.seconddev.interfaces.prop.ConfigProp; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import java.lang.*; import org.slf4j.Logger; @@ -11,7 +13,8 @@ import com.weaver.verupgrade.general.Util; public class ZMES_OA_SUBMIT_SERVICE extends BaseBean { private static final org.slf4j.Logger logger_b6665baf = LoggerFactory.getLogger(ZMES_OA_SUBMIT_SERVICE.class); - + @Autowired + private ConfigProp configProp; public String[] call(ZMES_OA_SUBMIT_SERVICEStub.ArrayOfZMES_OA_SUBMIT_ITEM_TYPE param, String requestid, String cfxt) { String[] str = new String[2]; try { 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 d342f8f..f23543d 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,8 +1,10 @@ package com.weaver.seconddev.interfaces.k3; +import com.weaver.seconddev.interfaces.prop.ConfigProp; 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; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import java.lang.*; import org.slf4j.Logger; @@ -13,7 +15,8 @@ import com.weaver.verupgrade.general.Util; public class ApprovalResultService extends BaseBean { private static final org.slf4j.Logger logger_ff0d1f05 = LoggerFactory.getLogger(ApprovalResultService.class); - + @Autowired + private ConfigProp configProp; public String[] returnResult(OAPRResultItemIn in) { String[] str = new String[2]; try { 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 3b31a1c..c2620af 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 @@ -1,6 +1,8 @@ package com.weaver.seconddev.interfaces.k3; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.seconddev.interfaces.prop.ConfigProp; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import java.lang.*; import org.slf4j.Logger; @@ -14,7 +16,8 @@ import com.weaver.verupgrade.general.Util; public class CallK3CustomerService extends BaseBean { private static final org.slf4j.Logger logger_1a80d0a1 = LoggerFactory.getLogger(CallK3CustomerService.class); - + @Autowired + private ConfigProp configProp; /** * 校验 * @return 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 3dabfe9..21937c2 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 @@ -1,6 +1,8 @@ package com.weaver.seconddev.interfaces.k3; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.seconddev.interfaces.prop.ConfigProp; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import java.lang.*; import org.slf4j.Logger; @@ -14,7 +16,8 @@ import com.weaver.verupgrade.general.Util; public class CallK3SupplierServices extends BaseBean { private static final org.slf4j.Logger logger_8469efe0 = LoggerFactory.getLogger(CallK3SupplierServices.class); - + @Autowired + private ConfigProp configProp; /** * 校验 * @return 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 1895615..e462ede 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 @@ -1,6 +1,8 @@ package com.weaver.seconddev.interfaces.k3; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.seconddev.interfaces.prop.ConfigProp; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import java.lang.*; import org.slf4j.Logger; @@ -11,7 +13,8 @@ import com.weaver.verupgrade.general.Util; public class CallPORequestService extends BaseBean { private static final org.slf4j.Logger logger_7febacb3 = LoggerFactory.getLogger(CallPORequestService.class); - + @Autowired + private ConfigProp configProp; public PORequestServiceStub.PORequestRes buildPORequest(PORequestServiceStub.PORequestReq req) { PORequestServiceStub.PORequestRes result = new PORequestServiceStub.PORequestRes(); try { 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 fb75944..b16c46e 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 @@ -5,6 +5,8 @@ import java.lang.String; 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.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import java.lang.*; import org.slf4j.Logger; @@ -15,7 +17,8 @@ import com.weaver.verupgrade.general.Util; public class GiftQtyService extends BaseBean { private static final org.slf4j.Logger logger_a44d19bf = LoggerFactory.getLogger(GiftQtyService.class); - + @Autowired + private ConfigProp configProp; public Map call(ArrayOfGiftStockDt param) { String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htk3oasync.lplysl_url")).trim(); Map map = new HashMap(); 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 b300d2e..41b025a 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 @@ -5,6 +5,8 @@ import com.weaver.seconddev.interfaces.k3.TransferBillServiceStub.BuildTransfer import com.weaver.seconddev.interfaces.k3.TransferBillServiceStub.TransferBillReq; 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.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import java.lang.*; import org.slf4j.Logger; @@ -15,7 +17,8 @@ import com.weaver.verupgrade.general.Util; public class TransferBillService extends BaseBean { private static final org.slf4j.Logger logger_8574e473 = LoggerFactory.getLogger(TransferBillService.class); - + @Autowired + private ConfigProp configProp; public String[] call(TransferBillReq param) { String[] str = new String[4]; try { diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/oactrip/OaCtrip.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/oactrip/OaCtrip.java index fd8bbaf..027922c 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/oactrip/OaCtrip.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/oactrip/OaCtrip.java @@ -1,6 +1,7 @@ package com.weaver.seconddev.interfaces.oactrip; import com.alibaba.fastjson.JSONObject; +import com.weaver.seconddev.interfaces.prop.ConfigProp; import corp.openapicalls.contract.Authentification; import corp.openapicalls.contract.setapproval.request.*; import corp.openapicalls.contract.setapproval.response.SetApprovalResponse; @@ -13,6 +14,7 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.Date; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,7 +36,8 @@ public class OaCtrip extends BaseBean { public void setGWPassengerDetails(ArrayList gwdetails) { this.gwpassengerdetails = gwdetails; } - + @Autowired + private ConfigProp configProp; public String[] call(String approvalnumber, String employeeid, String expiredtime, Date begindate, Date enddate, String lx) throws ParseException { String[] rtInfo = new String[3]; // 出差类型0国内，1国外 diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/prop/ConfigProp.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/prop/ConfigProp.java index 28ccc46..0393870 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/prop/ConfigProp.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/prop/ConfigProp.java @@ -24,9 +24,30 @@ public class ConfigProp { //CRM_SyncTempUnfreeze @Value("${TempUnfreeze}") private String TempUnfreeze; + @Value("${po_user}") + private String po_user; + @Value("${po_password}") + private String po_password; -// @Value("${TempUnfreeze}") -// private String TempUnfreeze; + //CRM_syncUnFreezeTimes + @Value("${times}") + private String times; + + /** + * easoa + */ + //CallEasServices + @Value("${url}") + private String url; + //CallTravelApplyService + @Value("${TravelApply}") + private String TravelApply; + //DelayDateService + @Value("${DelayDateSync}") + private String DelayDateSync; + //EASIntermediarySyncService + @Value("${intermediarysync}") + private String intermediarysync; diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/scfoa/GetApproveResult.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/scfoa/GetApproveResult.java index ac147e6..3c19e7e 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/scfoa/GetApproveResult.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/scfoa/GetApproveResult.java @@ -1,6 +1,7 @@ package com.weaver.seconddev.interfaces.scfoa; 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; @@ -9,6 +10,7 @@ import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.protocol.HTTP; import org.apache.http.util.EntityUtils; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import java.lang.*; import org.slf4j.Logger; @@ -22,7 +24,8 @@ import com.weaver.verupgrade.general.Util; public class GetApproveResult extends BaseBean { private static final org.slf4j.Logger logger_8692c990 = LoggerFactory.getLogger(GetApproveResult.class); - + @Autowired + private ConfigProp configProp; public String getApproveResult(JSONObject returnJson) { HttpPost post = null; String result = "E"; diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/CallSrmCheckMallServices.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/CallSrmCheckMallServices.java index f65e615..914d2d3 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/CallSrmCheckMallServices.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/CallSrmCheckMallServices.java @@ -1,5 +1,6 @@ package com.weaver.seconddev.interfaces.srmoa; +import com.weaver.seconddev.interfaces.prop.ConfigProp; import org.apache.axis2.AxisFault; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; @@ -12,6 +13,7 @@ import java.util.HashMap; import java.util.Map.Entry; import java.util.Set; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import java.lang.*; import org.slf4j.Logger; @@ -28,7 +30,8 @@ public class CallSrmCheckMallServices extends BaseBean { public void setOainput(MallPurReqChkServiceServiceStub.MallPurReqIN oasrm) { this.resultin = oasrm; } - + @Autowired + private ConfigProp configProp; public String[] call() throws RemoteException { logger_a0ca618e.info(String.valueOf("调用接口------------------------开始")); MallPurReqChkServiceServiceStub stub = null; diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/CallSrmCheckPriceServices.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/CallSrmCheckPriceServices.java index 36b30b0..7377947 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/CallSrmCheckPriceServices.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/CallSrmCheckPriceServices.java @@ -1,5 +1,6 @@ package com.weaver.seconddev.interfaces.srmoa; +import com.weaver.seconddev.interfaces.prop.ConfigProp; import org.apache.axis2.AxisFault; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; @@ -12,6 +13,7 @@ import java.util.HashMap; import java.util.Map.Entry; import java.util.Set; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import java.lang.*; import org.slf4j.Logger; @@ -28,7 +30,8 @@ public class CallSrmCheckPriceServices extends BaseBean { public void setOainput(RfqCheckPriceHandlerServiceServiceStub.CheckPriceResultIn oasrm) { this.resultin = oasrm; } - + @Autowired + private ConfigProp configProp; public String[] call() throws RemoteException { logger_dac3f14b.info(String.valueOf("调用接口------------------------开始")); RfqCheckPriceHandlerServiceServiceStub stub = null; 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 7581270..4e732cf 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,8 +1,10 @@ package com.weaver.seconddev.interfaces.srmoa; +import com.weaver.seconddev.interfaces.prop.ConfigProp; import org.apache.axis2.transport.http.HttpTransportProperties; import com.weaver.seconddev.interfaces.srmoa.SI_GoodsSupplyExpanding_OUTServiceStub.*; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import java.lang.*; import org.slf4j.Logger; @@ -13,7 +15,8 @@ import com.weaver.verupgrade.general.Util; public class OaSrmVenMatExtService extends BaseBean { private static final org.slf4j.Logger logger_333d882d = LoggerFactory.getLogger(OaSrmVenMatExtService.class); - + @Autowired + private ConfigProp configProp; public String[] call(SRM_OA_VENMATEXT_RESULT param) { String[] str = new String[3]; String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htsrmoasync.SrmVenMatExt")).trim(); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/swfa/sl/CallDTtripService.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/swfa/sl/CallDTtripService.java index 8867926..ed24a0b 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/swfa/sl/CallDTtripService.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/swfa/sl/CallDTtripService.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; //TODO config //import com.cloudstore.dev.api.util.Util_DataCache; +import com.weaver.seconddev.interfaces.prop.ConfigProp; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpPost; import org.apache.http.entity.StringEntity; @@ -17,6 +18,7 @@ import java.util.Map; import java.util.UUID; import java.lang.*; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,7 +32,8 @@ public class CallDTtripService extends BaseBean { private static CloseableHttpClient httpClient = HttpClients.createDefault(); private static HttpPost httpPost; - + @Autowired + private ConfigProp configProp; public String[] optForDTtrip(Map param) { String[] str = new String[3]; try { diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/swfa/sl/CallSLServices.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/swfa/sl/CallSLServices.java index 4786b4b..4f95cbe 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/swfa/sl/CallSLServices.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/swfa/sl/CallSLServices.java @@ -1,5 +1,6 @@ package com.weaver.seconddev.interfaces.swfa.sl; +import com.weaver.seconddev.interfaces.prop.ConfigProp; import net.sf.json.JSONObject; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; @@ -13,6 +14,7 @@ import java.util.Map.Entry; import java.util.Set; import com.weaver.common.i18n.tool.util.I18nContextUtil; import com.weaver.verupgrade.conn.CONN_TYPE; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import java.lang.*; import org.slf4j.Logger; @@ -60,7 +62,8 @@ public class CallSLServices extends BaseBean { public void setMapString(HashMap extInfo) { this.extInfo = extInfo; } - + @Autowired + private ConfigProp configProp; // 调用中兴接口 public String[] call() throws RemoteException { CreateBillSrvStub stub = null; diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CheckEmailAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CheckEmailAction.java index 353fc76..add99f8 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CheckEmailAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CheckEmailAction.java @@ -38,6 +38,8 @@ public class CheckEmailAction extends BaseBean implements Action, EsbServerlessR public CheckEmailAction() { } + + public WeaResult> execute(Map requestInfoMap) { Map weaverResultMap = new HashMap<>(); Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1)));