From fcb11f578bda815c521c0bd7ad049c03a2ac62d8 Mon Sep 17 00:00:00 2001 From: qijirenjian Date: Tue, 17 Dec 2024 16:18:38 +0800 Subject: [PATCH] configpro --- .../interfaces/crmoa/CRM_SyncTempUnfreeze.java | 6 +++--- .../crmoa/CRM_syncUnFreezeTimes.java | 2 +- .../interfaces/easoa/CallEasServices.java | 2 +- .../easoa/CallTravelApplyService.java | 2 +- .../interfaces/easoa/DelayDateService.java | 2 +- .../easoa/EASIntermediarySyncService.java | 6 +++--- .../easoa/FeeApplicationService.java | 6 +++--- .../interfaces/easoa/InterLoanService.java | 6 +++--- .../interfaces/eipoa/AccountService.java | 6 +++--- .../interfaces/eipoa/GetSystemList.java | 4 ++-- .../interfaces/eipoa/MesAccountService.java | 6 +++--- .../interfaces/eipoa/PortalPlanService.java | 6 +++--- .../gdwmsoa/ZMES_OA_SUBMIT_SERVICE.java | 4 ++-- .../interfaces/k3/ApprovalResultService.java | 6 +++--- .../interfaces/k3/CallK3CustomerService.java | 6 +++--- .../interfaces/k3/CallK3SupplierServices.java | 6 +++--- .../interfaces/k3/CallPORequestService.java | 2 +- .../interfaces/k3/GiftQtyService.java | 2 +- .../interfaces/k3/TransferBillService.java | 2 +- .../seconddev/interfaces/oactrip/OaCtrip.java | 4 ++-- .../oames/CallMesChuMenZhengService.java | 2 +- .../oames/ReturnMesWLPS_SYService.java | 6 +++--- .../seconddev/interfaces/pmoa/PMService.java | 6 +++--- .../seconddev/interfaces/prop/ConfigProp.java | 15 +++++++++++++-- .../interfaces/scfoa/GetApproveResult.java | 4 ++-- .../srmoa/CallSrmCheckMallServices.java | 2 +- .../srmoa/CallSrmCheckPriceServices.java | 2 +- .../srmoa/OaSrmVenMatExtService.java | 6 +++--- .../interfaces/swfa/sl/CallDTtripService.java | 10 +++++----- .../interfaces/swfa/sl/CallSLServices.java | 6 +++--- .../action/ARSPaymentRecepitAction.java | 4 ++-- .../workflow/action/AccommodationAction.java | 12 ++++++------ .../workflow/action/CarApplyInfoAction.java | 10 +++++----- .../workflow/action/CheckEmailAction.java | 12 ++++++------ .../workflow/action/CustomTeAction.java | 2 +- .../workflow/action/EASCarRepairAction.java | 6 ++++-- .../workflow/action/EASJiuCanSynAction.java | 10 +++++++--- .../workflow/action/EASRobotAction.java | 7 +++++-- .../workflow/action/EASZhuSuSynAction.java | 4 ++-- .../workflow/action/EAS_DZDAApproveAction.java | 2 +- .../action/EAS_VoucherModifyAction.java | 2 +- .../action/EasTzlbzdApproveResult.java | 8 ++++++-- .../workflow/action/EasTzlhtApplyResult.java | 4 ++-- .../action/GJB_DeliveryApproveAction.java | 4 ++-- .../action/HTGD_MES_ZG04ReturnAction.java | 2 +- .../action/ISO_ExternalFilesApproveAction.java | 8 ++++---- .../action/ISO_FileAddOrReviseAction.java | 4 ++-- .../action/ISO_FilePermissionAction.java | 2 +- .../workflow/action/ISO_FileReissueAction.java | 7 +++++-- .../workflow/action/ISO_FileToVoidAction.java | 7 +++++-- .../action/ISO_FileTransferAction.java | 7 +++++-- .../ISO_ProjectFileAddOrReviseAction.java | 10 +++++++--- .../ISO_ProjectFilePermissionAction.java | 2 +- .../action/ISO_ProjectFileReissueAction.java | 2 +- .../workflow/action/OaCrmZDYWFPAction.java | 6 +++--- .../action/OaSrmVendorPunishCommitAction.java | 2 +- .../action/OaSrmVendorPunishConfirmAction.java | 7 +++++-- .../OaSrmVendorQualityConfirmAction.java | 7 +++++-- .../action/OperateEmailAccountAction.java | 12 ++++++------ .../workflow/action/RemindForCarAction.java | 2 +- .../workflow/action/SendPostRequest_PO.java | 2 +- .../action/WuJangGiftStorageAction.java | 2 +- .../action/ZOA_MM_PR_CREATE_YFFY_ZjAction.java | 2 +- .../workflow/action/ZOA_SL_GNCC_Action.java | 2 +- .../workflow/action/ZOA_SL_GN_Action.java | 2 +- .../workflow/action/ZOA_SL_GWCC_Action.java | 2 +- .../workflow/action/ZOA_SL_GW_Action.java | 7 +++++-- .../action/ZWZX_CG_FileUploadAction.java | 6 +++--- .../action/ZZ_DZDAFDApproveAction.java | 7 +++++-- .../workflow/action/ZZ_GDFileUploadAction.java | 7 +++++-- .../action/ZZ_Ten_GDFileUploadAction.java | 2 +- .../interfaces/workflow/entity/Meeting.java | 18 +++++++++--------- 72 files changed, 215 insertions(+), 163 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 e6c334e..a2fe98f 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 @@ -21,7 +21,7 @@ public class CRM_SyncTempUnfreeze extends BaseBean { private static final org.slf4j.Logger logger_8493e3b4 = LoggerFactory.getLogger(CRM_SyncTempUnfreeze.class); public CRM_TEMPUNFREEZE_RETURN[] call(CRM_TEMPUNFREEZE_HEAD[] param) throws Exception { -// String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htcrmoasync.TempUnfreeze")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htcrmoasync.TempUnfreeze")).trim(); logger_8493e3b4.info(" param ---" + param); String url = configProp.getTempUnfreeze(); logger_8493e3b4.info(" url ---" + url); @@ -31,8 +31,8 @@ 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(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.po_user")).trim()); +// auth.setPassword(Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.po_password")).trim()); auth.setUsername(configProp.getPo_user()); auth.setPassword(configProp.getPo_password()); 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 1cc7ab7..dea7da1 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 @@ -40,7 +40,7 @@ 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(I18nContextUtilcus.getBean(Environment.class).getProperty("htcrmoasync.times")).trim(); String s2 = configProp.getTimes(); stub = new CRM_SyncUnFreezeTimesStub(s2); 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 3b42a06..97cd7a4 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 @@ -25,7 +25,7 @@ public class CallEasServices extends BaseBean { // 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(I18nContextUtilcus.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"; 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 3bcb57a..fd20f0c 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 @@ -27,7 +27,7 @@ public class CallTravelApplyService { 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(I18nContextUtilcus.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); 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 1adacd1..d932b95 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 @@ -21,7 +21,7 @@ public class DelayDateService extends BaseBean { @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(I18nContextUtilcus.getBean(Environment.class).getProperty("hteasoasync.DelayDateSync")).trim(); String url = configProp.getDelayDateSync(); logger_cf6b843f.info("url = " + url ); String[] str = new String[2]; 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 e727c67..2e576a9 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 @@ -22,7 +22,7 @@ public class EASIntermediarySyncService extends BaseBean { 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(I18nContextUtilcus.getBean(Environment.class).getProperty("hteasoasync.intermediarysync")).trim(); String url =configProp.getIntermediarysync(); try { logger_cd0192cf.info(String.valueOf("调用报账系统中介同步接口开始 --- " + url )); @@ -30,8 +30,8 @@ public class EASIntermediarySyncService 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(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.po_user")).trim()); +// auth.setPassword(Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.po_password")).trim()); auth.setUsername(configProp.getPo_user()); auth.setPassword(configProp.getPo_password()); 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 5687689..24facc8 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 @@ -23,15 +23,15 @@ public class FeeApplicationService extends BaseBean { @Autowired private ConfigProp configProp; public CostStandardSynchronizationServiceResponse call(CostStandardHead param) throws Exception { -// String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("hteasoasync.FeeApplication")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("hteasoasync.FeeApplication")).trim(); String url = configProp.getFeeApplication(); logger_2817d3b0.info(String.valueOf("调用报账系统话费交通费接口开始"+ url)); SI_FeeApplicationSync_OUTServiceStub stub = new SI_FeeApplicationSync_OUTServiceStub(url); 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(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.po_user")).trim()); +// auth.setPassword(Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.po_password")).trim()); auth.setUsername(configProp.getPo_user()); auth.setPassword(configProp.getPo_password()); 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 0cedb16..dcda021 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 @@ -23,7 +23,7 @@ public class InterLoanService extends BaseBean { 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(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("hteasoasync.InterLoan")).trim(); String url = configProp.getInterLoan(); try { logger_9c1a93c4.info(String.valueOf("调用报账系统内部借款接口开始")); @@ -31,8 +31,8 @@ public class InterLoanService 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(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.po_user")).trim()); +// auth.setPassword(Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.po_password")).trim()); auth.setUsername(configProp.getPo_user()); auth.setPassword(configProp.getPo_password()); 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 05c5e2a..6a35aae 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 @@ -20,7 +20,7 @@ public class AccountService extends BaseBean { 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(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.accountUrl")).trim(); String url = configProp.getAccountUrl(); try { logger_18cc50ce.info(String.valueOf("开始调用批量开户销户接口")); @@ -28,8 +28,8 @@ public class AccountService 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(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.po_user")).trim()); +// auth.setPassword(Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.po_password")).trim()); auth.setUsername(configProp.getPo_user()); auth.setPassword(configProp.getPo_password()); 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 c8560cc..c2824a8 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 @@ -29,12 +29,12 @@ public class GetSystemList extends BaseBean { String result = "E"; try { HttpClient client = new DefaultHttpClient(); -// String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htportaloaUrl.getSystemListUrl")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.getSystemListUrl")).trim(); String url =configProp.getGetSystemListUrl(); post = new HttpPost(url); post.setHeader(HTTP.CONTENT_TYPE, "application/json; charset=UTF-8"); post.setHeader("Accept", "application/json; charset=UTF-8"); -// post.setHeader("Authorization", Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htportaloaUrl.url_password")).trim()); +// post.setHeader("Authorization", Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.url_password")).trim()); post.setHeader("Authorization", configProp.getUrl_password()); JSONObject returnJson = new JSONObject(); returnJson.put("doAction", "listSystem"); 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 ba8f6de..1d0f4c8 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 @@ -20,7 +20,7 @@ public class MesAccountService extends BaseBean { 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(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.mesaccountUrl")).trim(); String url = configProp.getMesaccountUrl(); try { logger_8f904fbd.info(String.valueOf("开始调用门户金思维MES批量开户销户接口")); @@ -28,8 +28,8 @@ public class MesAccountService 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(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.po_user")).trim()); +// auth.setPassword(Util.null2String(I18nContextUtilcus.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); 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 4bd0cab..3070040 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 @@ -59,14 +59,14 @@ public class PortalPlanService extends BaseBean { } public SI_HTPortalPlan_OUTServiceStub getStub() throws Exception { -// String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htportaloaUrl.plan_url")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.plan_url")).trim(); String url = configProp.getPlan_url(); SI_HTPortalPlan_OUTServiceStub stub = new SI_HTPortalPlan_OUTServiceStub(url); 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(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.po_user")).trim()); +// auth.setPassword(Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.po_password")).trim()); auth.setUsername(configProp.getPo_user()); auth.setPassword(configProp.getPo_password()); 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 6cadbec..3786f4e 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 @@ -20,10 +20,10 @@ public class ZMES_OA_SUBMIT_SERVICE extends BaseBean { try { String url = ""; if ("1".equals(cfxt)) { -// url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htwmsoasync.wllynmg_url")).trim(); +// url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htwmsoasync.wllynmg_url")).trim(); url = configProp.getWllynmg_url(); } else { -// url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htwmsoasync.wlly_url")).trim(); +// url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htwmsoasync.wlly_url")).trim(); url = configProp.getWlly_url(); } logger_b6665baf.info(String.valueOf(requestid + " url:" + url)); 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 a8c72c8..3e76cd6 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 @@ -20,14 +20,14 @@ public class ApprovalResultService extends BaseBean { public String[] returnResult(OAPRResultItemIn in) { String[] str = new String[2]; try { -// String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htk3oasync.approval_url")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htk3oasync.approval_url")).trim(); String url = configProp.getApproval_url(); SI_HTOAPurreqAPPROSync_OUTServiceStub stub = new SI_HTOAPurreqAPPROSync_OUTServiceStub(url); 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(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.po_user")).trim()); +// auth.setPassword(Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.po_password")).trim()); auth.setUsername(configProp.getPo_user()); auth.setPassword(configProp.getPo_password()); 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 4adc8b8..7132750 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 @@ -26,7 +26,7 @@ public class CallK3CustomerService extends BaseBean { // String[] resultArray = new String[2]; CustomerServiceStub.CustomerSearchRes result = new CustomerServiceStub.CustomerSearchRes(); try { -// String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htk3oasync.customer_url")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htk3oasync.customer_url")).trim(); String url = configProp.getCustomer_url(); CustomerServiceStub stub = new CustomerServiceStub(url); stub._getServiceClient().getOptions().setProperty(org.apache.axis2.transport.http.HTTPConstants.CHUNKED, Boolean.FALSE); @@ -54,7 +54,7 @@ public class CallK3CustomerService extends BaseBean { public CustomerServiceStub.CustomerReturn getCustomer(CustomerServiceStub.CustomerSearchReq req) { CustomerServiceStub.CustomerReturn result = new CustomerServiceStub.CustomerReturn(); try { -// String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htk3oasync.customer_url")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htk3oasync.customer_url")).trim(); String url = configProp.getCustomer_url(); CustomerServiceStub stub = new CustomerServiceStub(url); stub._getServiceClient().getOptions().setProperty(org.apache.axis2.transport.http.HTTPConstants.CHUNKED, Boolean.FALSE); @@ -83,7 +83,7 @@ public class CallK3CustomerService extends BaseBean { // String[] resultArray = new String[2]; CustomerServiceStub.CustomerRes result = new CustomerServiceStub.CustomerRes(); try { -// String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htk3oasync.customer_url")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htk3oasync.customer_url")).trim(); String url = configProp.getCustomer_url(); CustomerServiceStub stub = new CustomerServiceStub(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/k3/CallK3SupplierServices.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/k3/CallK3SupplierServices.java index d52687e..075a673 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 @@ -26,7 +26,7 @@ public class CallK3SupplierServices extends BaseBean { // String[] resultArray = new String[2]; SupplierServiceStub.SupplierSearchRes result = new SupplierServiceStub.SupplierSearchRes(); try { -// String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htk3oasync.supplier_url")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htk3oasync.supplier_url")).trim(); String url = configProp.getSupplier_url(); SupplierServiceStub stub = new SupplierServiceStub(url); stub._getServiceClient().getOptions().setProperty(org.apache.axis2.transport.http.HTTPConstants.CHUNKED, Boolean.FALSE); @@ -55,7 +55,7 @@ public class CallK3SupplierServices extends BaseBean { // // String[] resultArray = new String[2]; SupplierServiceStub.SupplierReturn result = new SupplierServiceStub.SupplierReturn(); try { -// String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htk3oasync.supplier_url")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htk3oasync.supplier_url")).trim(); String url = configProp.getSupplier_url(); SupplierServiceStub stub = new SupplierServiceStub(url); stub._getServiceClient().getOptions().setProperty(org.apache.axis2.transport.http.HTTPConstants.CHUNKED, Boolean.FALSE); @@ -79,7 +79,7 @@ public class CallK3SupplierServices extends BaseBean { // String[] resultArray = new String[2]; SupplierServiceStub.SupplierRes result = new SupplierServiceStub.SupplierRes(); try { -// String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htk3oasync.supplier_url")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htk3oasync.supplier_url")).trim(); String url = configProp.getSupplier_url(); SupplierServiceStub stub = new SupplierServiceStub(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/k3/CallPORequestService.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/k3/CallPORequestService.java index af1dcf9..ad06a02 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 @@ -18,7 +18,7 @@ public class CallPORequestService extends BaseBean { public PORequestServiceStub.PORequestRes buildPORequest(PORequestServiceStub.PORequestReq req) { PORequestServiceStub.PORequestRes result = new PORequestServiceStub.PORequestRes(); try { -// String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htk3oasync.porequest_url")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htk3oasync.porequest_url")).trim(); String url = configProp.getPorequest_url(); PORequestServiceStub stub = new PORequestServiceStub(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/k3/GiftQtyService.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/k3/GiftQtyService.java index 6fe63a1..9309c03 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 @@ -22,7 +22,7 @@ public class GiftQtyService extends BaseBean { @Autowired private ConfigProp configProp; public Map call(ArrayOfGiftStockDt param) { -// String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htk3oasync.lplysl_url")).trim(); +// String url = Util.null2String(I18nContextUtilcus.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 cd8896a..80702fd 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 @@ -23,7 +23,7 @@ public class TransferBillService extends BaseBean { String[] str = new String[4]; try { logger_8574e473.info(String.valueOf("TransferBillService--start")); -// String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htk3oasync.lplyhtk_url")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htk3oasync.lplyhtk_url")).trim(); String url = configProp.getLplysl_url(); TransferBillServiceStub stub = new TransferBillServiceStub(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/oactrip/OaCtrip.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/oactrip/OaCtrip.java index c9a6c00..6d7522e 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 @@ -67,8 +67,8 @@ public class OaCtrip extends BaseBean { // 测试环境测试完成后注释账号密码 // TicketResponse ticketResponse=CorpTicketService.getOrderAuditTicket("","", "1.0"); -// String appKey = I18nContextUtil.getBean(Environment.class).getProperty("htctripmt.appkey"); -// String appsecurity = I18nContextUtil.getBean(Environment.class).getProperty("htctripmt.appsecurity"); +// String appKey = I18nContextUtilcus.getBean(Environment.class).getProperty("htctripmt.appkey"); +// String appsecurity = I18nContextUtilcus.getBean(Environment.class).getProperty("htctripmt.appsecurity"); String appKey = configProp.getWeaver_secondev_htctripmt_appkey(); String appsecurity = configProp.getWeaver_secondev_htctripmt_appsecurity(); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/oames/CallMesChuMenZhengService.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/oames/CallMesChuMenZhengService.java index 678ef97..a9d9e8e 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/oames/CallMesChuMenZhengService.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/oames/CallMesChuMenZhengService.java @@ -25,7 +25,7 @@ public class CallMesChuMenZhengService extends BaseBean { public String[] call() throws RemoteException { logger_742486d.info(String.valueOf("调用接口------------------------开始")); OA_CMZ_SERVICEStub stub = null; -// String wsdlLocation = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("MesInterfaceAddr.WsdlLocation")).trim(); +// String wsdlLocation = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("MesInterfaceAddr.WsdlLocation")).trim(); String wsdlLocation = configProp.getWsdlLocation(); stub = new OA_CMZ_SERVICEStub(wsdlLocation); 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/oames/ReturnMesWLPS_SYService.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/oames/ReturnMesWLPS_SYService.java index 3553178..727186f 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 @@ -20,7 +20,7 @@ public class ReturnMesWLPS_SYService extends BaseBean { public String[] returnRes(WLPS_SY_Request param) { String[] message = new String[2]; -// String url = (I18nContextUtil.getBean(Environment.class).getProperty("htmesoasync.A040WLPS")).trim(); +// String url = (I18nContextUtilcus.getBean(Environment.class).getProperty("htmesoasync.A040WLPS")).trim(); String url = configProp.getA040WLPS(); try { logger_d5127138.info(String.valueOf("开始调用ReturnMesWLPS_SYService接口")); @@ -28,8 +28,8 @@ public class ReturnMesWLPS_SYService 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(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.po_user")).trim()); +// auth.setPassword(Util.null2String(I18nContextUtilcus.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); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/pmoa/PMService.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/pmoa/PMService.java index 0dfa967..a9054b3 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/pmoa/PMService.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/pmoa/PMService.java @@ -28,9 +28,9 @@ public class PMService extends BaseBean { String result = "E"; try { CloseableHttpClient httpClient = HttpClients.createDefault(); -// String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htpmoasync.projectConclusion")).trim(); -// String account = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htpmoasync.account")).trim(); -// String password = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htpmoasync.password")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htpmoasync.projectConclusion")).trim(); +// String account = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htpmoasync.account")).trim(); +// String password = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htpmoasync.password")).trim(); String url = configProp.getProjectConclusion(); String account = configProp.getAccount(); String password = configProp.getPassword(); 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 492fde9..bebb85c 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 @@ -40,6 +40,7 @@ public class ConfigProp { @Value("${weaver-secondev-htctripmt-appsecurity}") private String weaver_secondev_htctripmt_appsecurity; + @Value("${isneedxzsl}") private String isneedxzsl; @@ -86,8 +87,18 @@ public class ConfigProp { @Value("${OA_Golden_Rewrite}") private String OA_Golden_Rewrite; - @Value("${appKey}") - private String appKey; + @Value("${hteasoasync_appKey}") + private String hteasoasync_appKey; + + @Value("${rpaLimitPay}") + private String rpaLimitPay; + + @Value("${getApproveResultUrl}") + private String getApproveResultUrl; + + @Value("${dzdafd_zz_url}") + private String dzdafd_zz_url; + @Value("${isoresulturl}") private String isoresulturl; 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 1b9d5b3..3f2cf7c 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 @@ -31,12 +31,12 @@ public class GetApproveResult extends BaseBean { String result = "E"; try { HttpClient client = new DefaultHttpClient(); -// String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htscfoasync.approvalResult")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htscfoasync.approvalResult")).trim(); String url = configProp.getApprovalResult(); post = new HttpPost(url); post.setHeader(HTTP.CONTENT_TYPE, "application/json; charset=UTF-8"); post.setHeader("Accept", "application/json; charset=UTF-8"); -// post.setHeader("Authorization", Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htportaloaUrl.url_password")).trim()); +// post.setHeader("Authorization", Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.url_password")).trim()); post.setHeader("Authorization", configProp.getUrl_password()); StringEntity entity = new StringEntity(returnJson.toString(), "UTF-8"); post.setEntity(entity); 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 b4c49fd..bb166d8 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 @@ -37,7 +37,7 @@ public class CallSrmCheckMallServices extends BaseBean { MallPurReqChkServiceServiceStub stub = null; String wsdlLocation = ""; // wsdlLocation = "http://10.6.6.151:8088/srm/services/OaSrmCheckPriceService?wsdl"; -// wsdlLocation = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htsrmoasync.htshop")).trim(); +// wsdlLocation = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htsrmoasync.htshop")).trim(); wsdlLocation = configProp.getHtshop(); stub = new MallPurReqChkServiceServiceStub(wsdlLocation); 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/srmoa/CallSrmCheckPriceServices.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/CallSrmCheckPriceServices.java index 7ef64d9..f09e690 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 @@ -37,7 +37,7 @@ public class CallSrmCheckPriceServices extends BaseBean { RfqCheckPriceHandlerServiceServiceStub stub = null; String wsdlLocation = ""; // wsdlLocation = "http://10.6.6.151:8088/srm/services/OaSrmCheckPriceService?wsdl"; -// wsdlLocation = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htsrmoasync.bjdsp")).trim(); +// wsdlLocation = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htsrmoasync.bjdsp")).trim(); wsdlLocation = configProp.getBjdsp(); stub = new RfqCheckPriceHandlerServiceServiceStub(wsdlLocation); 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 d78003f..bfdf4fe 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 @@ -19,7 +19,7 @@ public class OaSrmVenMatExtService extends BaseBean { 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(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htsrmoasync.SrmVenMatExt")).trim(); String url = configProp.getSrmVenMatExtnew(); try { logger_333d882d.info(String.valueOf("调用SRM供应商货源关系接口开始")); @@ -27,8 +27,8 @@ public class OaSrmVenMatExtService 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(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.po_user")).trim()); +// auth.setPassword(Util.null2String(I18nContextUtilcus.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); 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 d5eebcb..963684e 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 @@ -37,7 +37,7 @@ public class CallDTtripService extends BaseBean { public String[] optForDTtrip(Map param) { String[] str = new String[3]; try { -// String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htsloasync.dttrip_orderUrl")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htsloasync.dttrip_orderUrl")).trim(); String url = configProp.getDttrip_orderUrl(); JSONObject jsonObject = new JSONObject(); jsonObject.put("isEncrypt", false); @@ -94,9 +94,9 @@ public class CallDTtripService extends BaseBean { String token = ""; if (token == null) { String result = ""; -// String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htsloasync.dttrip_tokenUrl")).trim(); -// String account = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htsloasync.dttrip_account")).trim(); -// String password = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htsloasync.dttrip_password")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htsloasync.dttrip_tokenUrl")).trim(); +// String account = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htsloasync.dttrip_account")).trim(); +// String password = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htsloasync.dttrip_password")).trim(); String url = configProp.getDttrip_tokenUrl(); String account = configProp.getDttrip_account(); String password = configProp.getDttrip_password(); @@ -140,7 +140,7 @@ public class CallDTtripService extends BaseBean { } public String getSign(String postJson) { -// String secret = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htsloasync.dttrip_secret")).trim(); +// String secret = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htsloasync.dttrip_secret")).trim(); String secret = configProp.getDttrip_secret(); String postData_md5 = SecureUtil.md5(postJson).toLowerCase(); String finallySign = SecureUtil.md5(postData_md5 + secret).toLowerCase(); 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 57d7a71..ada93bb 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 @@ -68,7 +68,7 @@ public class CallSLServices extends BaseBean { public String[] call() throws RemoteException { CreateBillSrvStub stub = null; // String wsdlLocation = GetServicesURL(); -// String wsdlLocation = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htsloasync.ServicesURL")).trim(); +// String wsdlLocation = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htsloasync.ServicesURL")).trim(); String wsdlLocation = configProp.getServicesURL(); stub = new CreateBillSrvStub(wsdlLocation); stub._getServiceClient().getOptions().setProperty(org.apache.axis2.transport.http.HTTPConstants.CHUNKED, Boolean.FALSE); @@ -245,8 +245,8 @@ public class CallSLServices extends BaseBean { // 设置日期格式 SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Date da = new Date(); -// String username = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htsloasync.UserName")).trim(); -// String key = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htsloasync.Key")).trim(); +// String username = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htsloasync.UserName")).trim(); +// String key = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htsloasync.Key")).trim(); String username = configProp.getUserName(); String key = configProp.getKey(); createBillRequest.setCurrentTime(df.format(da)); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ARSPaymentRecepitAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ARSPaymentRecepitAction.java index 05ef02b..ba9e80b 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ARSPaymentRecepitAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ARSPaymentRecepitAction.java @@ -127,8 +127,8 @@ public class ARSPaymentRecepitAction extends BaseBean implements Action, EsbServ logger_c29b3679.info(" obj " + obj.toJSONString()); HttpClient client = new DefaultHttpClient(); -// String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htcrmoasync.CreateBilling")).trim(); -// String appkey = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htcrmoasync.appkey")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htcrmoasync.CreateBilling")).trim(); +// String appkey = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htcrmoasync.appkey")).trim(); String url = configProp.getCreateBilling(); String appkey = configProp.getAppkey(); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/AccommodationAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/AccommodationAction.java index 9c65bb5..8a4ff3a 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/AccommodationAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/AccommodationAction.java @@ -70,7 +70,7 @@ public class AccommodationAction extends BaseBean implements Action, EsbServerle String itemId = "SYS006" + util.getWorkcode(sqr) + sdf.parse(map.get("SQRQ") + " 08:00:00").getTime() + requestid; // 测试环境-101，正式环境-41 String type = "41"; -// String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htportaloaUrl.pc_url")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.pc_url")).trim(); String url = configProp.getPc_url(); String startDate = map.get("JDRQ") + " 00:00:00"; String endDate = map.get("JDRQ") + " 23:59:59"; @@ -83,7 +83,7 @@ public class AccommodationAction extends BaseBean implements Action, EsbServerle ptryxm = res.getLastnames(map.get("PTRY1")) + "," + ptryxm; } // 测试环境-"59573",正式环境-Util.null2String(this.getPropValue("htportaloaUrl", "JCZS_ycsdid")).trim() -// String title = com.getSubCompanyname(map.get("SQDW")) + "，" + map.get("ZRS") + "人，" + ptryxm + "，" + util.getselectName(map.get("YCSD"), Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htportaloaUrl.JCZS_ycsdid")).trim()).trim(); +// String title = com.getSubCompanyname(map.get("SQDW")) + "，" + map.get("ZRS") + "人，" + ptryxm + "，" + util.getselectName(map.get("YCSD"), Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.JCZS_ycsdid")).trim()).trim(); String title = com.getSubCompanyname(map.get("SQDW")) + "，" + map.get("ZRS") + "人，" + ptryxm + "，" + configProp.getJCZS_ycsdid(); if (!"1".equals(map.get("JDLB"))) { content.append("就餐地点："); @@ -119,7 +119,7 @@ public class AccommodationAction extends BaseBean implements Action, EsbServerle } // getPropValue("htportaloaUrl","JCZS_jdbzid") // 接待等级 -// title = title + "，" + util.getselectName(map.get("JDBZ"), I18nContextUtil.getBean(Environment.class).getProperty("htportaloaUrl.JCZS_jdbzid")).substring(0, 1); +// title = title + "，" + util.getselectName(map.get("JDBZ"), I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.JCZS_jdbzid")).substring(0, 1); title = title + "，" + util.getselectName(map.get("JDBZ"),configProp.getJCZS_jdbzid() ).substring(0, 1); } // 包厢号 @@ -131,13 +131,13 @@ public class AccommodationAction extends BaseBean implements Action, EsbServerle String mobile_url = "/mobile/plugin/1/view.jsp?requestid=" + requestid + "&_workflowid=" + workflowid + "&_workflowtype=&isovertime=0"; String otherids = ""; if ("0".equals(map.get("JDQY"))) { -// otherids = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htportaloaUrl.JCZS_WJYQTZR")).trim(); +// otherids = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.JCZS_WJYQTZR")).trim(); otherids = configProp.getJCZS_WJYQTZR(); } else if ("1".equals(map.get("JDQY"))) { -// otherids = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htportaloaUrl.JCZS_QDYQTZR")).trim(); +// otherids = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.JCZS_QDYQTZR")).trim(); otherids = configProp.getJCZS_QDYQTZR(); } else if ("2".equals(map.get("JDQY"))) { -// otherids = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htportaloaUrl.JCZS_CSYQTZR")).trim(); +// otherids = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.JCZS_CSYQTZR")).trim(); otherids =configProp.getJCZS_CSYQTZR(); } String userid = ""; diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CarApplyInfoAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CarApplyInfoAction.java index 00d9d53..f5485e4 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CarApplyInfoAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CarApplyInfoAction.java @@ -65,7 +65,7 @@ public class CarApplyInfoAction extends BaseBean implements Action, EsbServerles String startDate = map.get("CFRQ") + " " + map.get("CFSJ") + ":00"; String endDate = map.get("DDRQ") + " " + map.get("YJFHSJ") + ":59"; String sqr = map.get("SQR"); -// String title = com.getSubCompanyname(map.get("SQDW")) + "，" + res.getLastnames(map.get("CCRY")) + "，" + util.getselectName(map.get("PCFS"), Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htportaloaUrl.YC_pcfsid")).trim()); +// String title = com.getSubCompanyname(map.get("SQDW")) + "，" + res.getLastnames(map.get("CCRY")) + "，" + util.getselectName(map.get("PCFS"), Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.YC_pcfsid")).trim()); String title = com.getSubCompanyname(map.get("SQDW")) + "，" + res.getLastnames(map.get("CCRY")) + "，" + util.getselectName(map.get("PCFS"), configProp.getYC_pcfsid()); // 测试环境-"61279"，正式环境-Util.null2String(this.getPropValue("htportaloaUrl", "YC_pcfsid")).trim() title = title + "，" + map.get("CFDD") + " 至 " + map.get("MDDD"); @@ -75,7 +75,7 @@ public class CarApplyInfoAction extends BaseBean implements Action, EsbServerles String ccry = map.get("CCRY"); // 测试环境-102，正式环境-42 String type = "42"; -// String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htportaloaUrl.pc_url")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.pc_url")).trim(); String url = configProp.getPc_url(); StringBuilder content = new StringBuilder(); content.append("行程：" + map.get("CFDD") + " 至 " + map.get("MDDD") + "；\r\n"); @@ -83,13 +83,13 @@ public class CarApplyInfoAction extends BaseBean implements Action, EsbServerles String mobile_url = "/mobile/plugin/1/view.jsp?requestid=" + requestid + "&_workflowid=" + workflowid + "&_workflowtype=&isovertime=0"; String otherids = ""; if ("0".equals(map.get("YCYQ"))) { -// otherids = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htportaloaUrl.YC_WJYQTZR")).trim(); +// otherids = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.YC_WJYQTZR")).trim(); otherids = configProp.getYC_WJYQTZR(); } else if ("1".equals(map.get("YCYQ"))) { -// otherids = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htportaloaUrl.YC_QDYQTZR")).trim(); +// otherids = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.YC_QDYQTZR")).trim(); otherids = configProp.getYC_QDYQTZR(); } else if ("2".equals(map.get("YCYQ"))) { -// otherids = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htportaloaUrl.YC_CSYQTZR")).trim(); +// otherids = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.YC_CSYQTZR")).trim(); otherids = configProp.getYC_CSYQTZR(); } String userid = ""; 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 8d03f20..b9d9f2b 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 @@ -86,22 +86,22 @@ public class CheckEmailAction extends BaseBean implements Action, EsbServerlessR if ("0".equals(value)) { yxlx = "@hengtonggroup.com.cn"; sysid = "SYS025"; -// emailIP = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htemail.htgroup")).trim(); -// port = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htemail.htgroupport")).trim(); +// emailIP = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htemail.htgroup")).trim(); +// port = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htemail.htgroupport")).trim(); emailIP = configProp.getHtgroup(); port = configProp.getHtgroupport(); } else if ("1".equals(value)) { yxlx = "@htgd.com.cn"; sysid = "SYS026"; -// emailIP = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htemail.htgd")).trim(); -// port = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htemail.htgdport")).trim(); +// emailIP = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htemail.htgd")).trim(); +// port = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htemail.htgdport")).trim(); emailIP = configProp.getHtgd(); port = configProp.getHtgdport(); } else if ("2".equals(value)) { yxlx = "@jsalpha.com"; sysid = "SYS035"; -// emailIP = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htemail.guangdao")).trim(); -// port = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htemail.guangdaoport")).trim(); +// emailIP = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htemail.guangdao")).trim(); +// port = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htemail.guangdaoport")).trim(); emailIP = configProp.getGuangdao(); port = configProp.getGuangdaoport(); } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CustomTeAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CustomTeAction.java index ca6a33e..bb33262 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CustomTeAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CustomTeAction.java @@ -80,7 +80,7 @@ public class CustomTeAction extends BaseBean implements Action, EsbServerlessRpc try { // 测试配置文件读取 -// String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("weaver-secondev-htportaloaUrl.accountUrl")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("weaver-secondev-htportaloaUrl.accountUrl")).trim(); logger.error("url = " + testProp.getAccountUrl()); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASCarRepairAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASCarRepairAction.java index c81a0ff..0e9cca0 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASCarRepairAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASCarRepairAction.java @@ -119,8 +119,10 @@ public class EASCarRepairAction extends BaseBean implements Action, EsbServerles mJson.put("by3", ""); logger_d8323d3f.info("调用EAS接口请求数据：=====" + mJson.toString()); // 调用接口 - String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("hteasoasync.syncOaApplyForm")).trim(); - String appKey = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("hteasoasync.easappkey")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("hteasoasync.syncOaApplyForm")).trim(); +// String appKey = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("hteasoasync.easappkey")).trim(); + String url = configProp.getSyncOaApplyForm(); + String appKey = configProp.getEasappkey(); SendPostRequest_API mGetResult = new SendPostRequest_API(); String result = mGetResult.getResult(mJson, url, appKey); logger_d8323d3f.info(String.valueOf("调用EAS接口请求数据：" + result)); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASJiuCanSynAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASJiuCanSynAction.java index 59d09fc..edcb6e7 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASJiuCanSynAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASJiuCanSynAction.java @@ -1,6 +1,7 @@ package com.weaver.seconddev.interfaces.workflow.action; import com.alibaba.fastjson.JSONObject; +import com.weaver.seconddev.interfaces.prop.ConfigProp; import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; import java.util.HashMap; import java.util.Map; @@ -30,7 +31,8 @@ public class EASJiuCanSynAction extends BaseBean implements Action, EsbServerles // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; - + @Autowired + private ConfigProp configProp; private static final Logger logger_6d6f68c = LoggerFactory.getLogger(EASJiuCanSynAction.class); @Override @@ -113,8 +115,10 @@ public class EASJiuCanSynAction extends BaseBean implements Action, EsbServerles mJson.put("by3", ""); logger_6d6f68c.info("调用EAS接口请求数据：=====" + mJson.toString()); // 调用接口 - String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("hteasoasync.syncOaApplyForm")).trim(); - String appKey = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("hteasoasync.easappkey")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("hteasoasync.syncOaApplyForm")).trim(); +// String appKey = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("hteasoasync.easappkey")).trim(); + String url = configProp.getSyncOaApplyForm(); + String appKey = configProp.getEasappkey(); SendPostRequest_API mGetResult = new SendPostRequest_API(); String result = mGetResult.getResult(mJson, url, appKey); logger_6d6f68c.info(String.valueOf("调用EAS接口请求数据：" + result)); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASRobotAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASRobotAction.java index 921cf4f..3592ba3 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASRobotAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASRobotAction.java @@ -2,6 +2,7 @@ package com.weaver.seconddev.interfaces.workflow.action; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.weaver.seconddev.interfaces.prop.ConfigProp; import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; import java.text.SimpleDateFormat; import java.util.Date; @@ -33,7 +34,8 @@ public class EASRobotAction extends BaseBean implements Action, EsbServerlessRpc // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; - + @Autowired + private ConfigProp configProp; private static final Logger logger_c5564c68 = LoggerFactory.getLogger(EASRobotAction.class); @Override @@ -85,7 +87,8 @@ public class EASRobotAction extends BaseBean implements Action, EsbServerlessRpc array.add(mJson); logger_c5564c68.info(requestID + "调用EAS接口请求数据：=====" + array.toString()); // 调用接口 - String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("hteasoasync.rpaLimitPay")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("hteasoasync.rpaLimitPay")).trim(); + String url = configProp.getRpaLimitPay(); // String appKey = Util.null2String(getPropValue("hteasoasync", "easappkey")).trim(); SendPostRequest_Custom mGetResult = new SendPostRequest_Custom(); String result = mGetResult.getResult(array.toString(), url); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASZhuSuSynAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASZhuSuSynAction.java index f3aad58..9819b31 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASZhuSuSynAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASZhuSuSynAction.java @@ -117,8 +117,8 @@ public class EASZhuSuSynAction extends BaseBean implements Action, EsbServerless mJson.put("by3", ""); logger_f451692d.info("调用EAS接口请求数据：=====" + mJson.toString()); // 调用接口 -// String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("hteasoasync.syncOaApplyForm")).trim(); -// String appKey = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("hteasoasync.easappkey")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("hteasoasync.syncOaApplyForm")).trim(); +// String appKey = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("hteasoasync.easappkey")).trim(); String url = configProp.getSyncOaApplyForm(); String appKey = configProp.getEasappkey(); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EAS_DZDAApproveAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EAS_DZDAApproveAction.java index 9158529..01779e9 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EAS_DZDAApproveAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EAS_DZDAApproveAction.java @@ -164,7 +164,7 @@ public class EAS_DZDAApproveAction extends BaseBean implements Action, EsbServer } logger_3f787449.info("调用借阅审批回调接口请求数据：=====" + mJson.toString()); // 调用接口 -// String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("hteasoasync.uploadDZDAApprovelUrl")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("hteasoasync.uploadDZDAApprovelUrl")).trim(); String url = configProp.getUploadZZInfoUrl(); ZZ_SendPostRequest mGetResult = new ZZ_SendPostRequest(); String result = mGetResult.getResult(mJson, url); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EAS_VoucherModifyAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EAS_VoucherModifyAction.java index b4342b4..ab22c16 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EAS_VoucherModifyAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EAS_VoucherModifyAction.java @@ -132,7 +132,7 @@ public class EAS_VoucherModifyAction extends BaseBean implements Action, EsbServ // 原凭证号 param.setVoucherNoOld(bgqpzh); // 调用接口 -// String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("hteasoasync.updatevoucherurl")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("hteasoasync.updatevoucherurl")).trim(); String url = configProp.getUpdatevoucherurl(); logger_57237c37.info("url == " + url); CallSieOAVoucherService service = new CallSieOAVoucherService(url); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasTzlbzdApproveResult.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasTzlbzdApproveResult.java index b6221f9..c9ed41c 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasTzlbzdApproveResult.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasTzlbzdApproveResult.java @@ -1,6 +1,7 @@ package com.weaver.seconddev.interfaces.workflow.action; 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,13 +24,15 @@ import com.weaver.verupgrade.general.Util; public class EasTzlbzdApproveResult extends BaseBean { private static final Logger logger_e942c7ec = LoggerFactory.getLogger(EasTzlbzdApproveResult.class); - + @Autowired + private ConfigProp configProp; public String getApproveResult(JSONObject returnJson) { HttpPost post = null; String result = "E"; try { HttpClient client = new DefaultHttpClient(); - String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("hteasoasync.getApproveResultUrl")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("hteasoasync.getApproveResultUrl")).trim(); + String url = configProp.getApprovalResult(); post = new HttpPost(url); post.setHeader(HTTP.CONTENT_TYPE, "application/json; charset=UTF-8"); post.setHeader("Accept", "application/json; charset=UTF-8"); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasTzlhtApplyResult.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasTzlhtApplyResult.java index 19d667a..5c32f01 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasTzlhtApplyResult.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasTzlhtApplyResult.java @@ -31,7 +31,7 @@ public class EasTzlhtApplyResult extends BaseBean { String result = "E"; try { HttpClient client = new DefaultHttpClient(); -// String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("hteasoasync.getTzlhtApplyResultUrl")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("hteasoasync.getTzlhtApplyResultUrl")).trim(); String url = configProp.getGetTzlhtApplyResultUrl(); logger_4b97b171.info(String.valueOf("EasTzlhtApplyResult---url=" + url)); post = new HttpPost(url); @@ -40,7 +40,7 @@ public class EasTzlhtApplyResult extends BaseBean { // post.setHeader("Authorization",Util.null2String(getPropValue("htportaloaUrl", "url_password")).trim()); // writeLog("EasTzlhtApplyResult---appkey="+Util.null2String(getPropValue("htportaloaUrl","api_appkey")).trim()); // api平台验证 -// post.setHeader("appKey", Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htportaloaUrl.api_appkey")).trim()); +// post.setHeader("appKey", Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.api_appkey")).trim()); post.setHeader("appKey", configProp.getApi_appkey()); StringEntity entity = new StringEntity(returnJson.toString(), "UTF-8"); post.setEntity(entity); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/GJB_DeliveryApproveAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/GJB_DeliveryApproveAction.java index 5229e9a..c1b8b91 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/GJB_DeliveryApproveAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/GJB_DeliveryApproveAction.java @@ -218,8 +218,8 @@ public class GJB_DeliveryApproveAction extends BaseBean implements Action, EsbSe // } logger_8ffb7f70.info("调用CMS接口请求数据：=====" + mJson.toString()); // 调用接口 -// String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htcmsoasync.oaapproveresulturl")).trim(); -// String appKey = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htcmsoasync.appKey")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htcmsoasync.oaapproveresulturl")).trim(); +// String appKey = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htcmsoasync.appKey")).trim(); String url = configProp.getHtcmsoasync_oaapproveresulturl(); String appKey = configProp.getHtcmsoasync_appKey(); // ZZ_SendPostRequest mGetResult = new ZZ_SendPostRequest(); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTGD_MES_ZG04ReturnAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTGD_MES_ZG04ReturnAction.java index af3fd10..2f59ce8 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTGD_MES_ZG04ReturnAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTGD_MES_ZG04ReturnAction.java @@ -79,7 +79,7 @@ public class HTGD_MES_ZG04ReturnAction extends BaseBean implements Action, EsbSe params.put("params", reqArr.toString()); // 调用接口 // "http://10.6.105.25:8180/mes/oa/OaAuditResult.html";// -// String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htmesoasync.GDZG04OaAuditResult")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htmesoasync.GDZG04OaAuditResult")).trim(); String url = configProp.getGetTzlhtApplyResultUrl(); SendPostRequest_param mGetResult = new SendPostRequest_param(); // reqArr.toString() diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ISO_ExternalFilesApproveAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ISO_ExternalFilesApproveAction.java index 61bbc79..41b9f67 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ISO_ExternalFilesApproveAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ISO_ExternalFilesApproveAction.java @@ -163,7 +163,7 @@ public class ISO_ExternalFilesApproveAction extends BaseBean implements Action, option.setTimeOutInMilliSeconds(30000); option.setAction("http://tempuri.org/newExternalFiles"); // https://testecmapi.hengtonggroup.com.cn:8012/workflow.asmx -// String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htecmoasync.isoresulturl")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htecmoasync.isoresulturl")).trim(); String url = configProp.getIsoresulturl(); // 值为targetNamespace+methodName EndpointReference epfs = new EndpointReference(url); @@ -230,7 +230,7 @@ public class ISO_ExternalFilesApproveAction extends BaseBean implements Action, option.setTimeOutInMilliSeconds(30000); option.setAction("http://tempuri.org/revisedExternalFiles"); // https://testecmapi.hengtonggroup.com.cn:8012/workflow.asmx -// String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htecmoasync.isoresulturl")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htecmoasync.isoresulturl")).trim(); String url =configProp.getIsoresulturl(); // 值为targetNamespace+methodName EndpointReference epfs = new EndpointReference(url); @@ -297,7 +297,7 @@ public class ISO_ExternalFilesApproveAction extends BaseBean implements Action, option.setTimeOutInMilliSeconds(30000); option.setAction("http://tempuri.org/ExternalFilesToVoid"); // https://testecmapi.hengtonggroup.com.cn:8012/workflow.asmx -// String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htecmoasync.isoresulturl")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htecmoasync.isoresulturl")).trim(); String url =configProp.getIsoresulturl(); // 值为targetNamespace+methodName EndpointReference epfs = new EndpointReference(url); @@ -364,7 +364,7 @@ public class ISO_ExternalFilesApproveAction extends BaseBean implements Action, option.setTimeOutInMilliSeconds(30000); option.setAction("http://tempuri.org/ExternalFilesReissue"); // https://testecmapi.hengtonggroup.com.cn:8012/workflow.asmx -// String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htecmoasync.isoresulturl")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htecmoasync.isoresulturl")).trim(); String url =configProp.getIsoresulturl(); // 值为targetNamespace+methodName EndpointReference epfs = new EndpointReference(url); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ISO_FileAddOrReviseAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ISO_FileAddOrReviseAction.java index 5f0aeb9..d6ca780 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ISO_FileAddOrReviseAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ISO_FileAddOrReviseAction.java @@ -158,7 +158,7 @@ public class ISO_FileAddOrReviseAction extends BaseBean implements Action, EsbSe option.setTimeOutInMilliSeconds(60000); option.setAction("http://tempuri.org/newInternalFile"); // https://testecmapi.hengtonggroup.com.cn:8012/workflow.asmx -// String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htecmoasync.isoresulturl")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htecmoasync.isoresulturl")).trim(); String url = configProp.getIsoresulturl(); // 值为targetNamespace+methodName EndpointReference epfs = new EndpointReference(url); @@ -228,7 +228,7 @@ public class ISO_FileAddOrReviseAction extends BaseBean implements Action, EsbSe option.setTimeOutInMilliSeconds(30000); option.setAction("http://tempuri.org/revisedInternalFile"); // https://testecmapi.hengtonggroup.com.cn:8012/workflow.asmx -// String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htecmoasync.isoresulturl")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htecmoasync.isoresulturl")).trim(); String url = configProp.getIsoresulturl(); // 值为targetNamespace+methodName EndpointReference epfs = new EndpointReference(url); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ISO_FilePermissionAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ISO_FilePermissionAction.java index b432f5e..c66517c 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ISO_FilePermissionAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ISO_FilePermissionAction.java @@ -139,7 +139,7 @@ public class ISO_FilePermissionAction extends BaseBean implements Action, EsbSer option.setTimeOutInMilliSeconds(30000); option.setAction("http://tempuri.org/filePermission"); // https://testecmapi.hengtonggroup.com.cn:8012/workflow.asmx -// String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htecmoasync.isoresulturl")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htecmoasync.isoresulturl")).trim(); String url = configProp.getIsoresulturl() ; // 值为targetNamespace+methodName EndpointReference epfs = new EndpointReference(url); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ISO_FileReissueAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ISO_FileReissueAction.java index dfeb3eb..5a03083 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ISO_FileReissueAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ISO_FileReissueAction.java @@ -1,5 +1,6 @@ package com.weaver.seconddev.interfaces.workflow.action; +import com.weaver.seconddev.interfaces.prop.ConfigProp; import org.apache.axiom.om.OMAbstractFactory; import org.apache.axiom.om.OMElement; import org.apache.axiom.om.OMFactory; @@ -44,7 +45,8 @@ public class ISO_FileReissueAction extends BaseBean implements Action, EsbServer // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; - + @Autowired + private ConfigProp configProp; private static final Logger logger_7836f707 = LoggerFactory.getLogger(ISO_FileReissueAction.class); @Override @@ -118,7 +120,8 @@ public class ISO_FileReissueAction extends BaseBean implements Action, EsbServer option.setTimeOutInMilliSeconds(30000); option.setAction("http://tempuri.org/fileReissue"); // https://testecmapi.hengtonggroup.com.cn:8012/workflow.asmx - String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htecmoasync.isoresulturl")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htecmoasync.isoresulturl")).trim(); + String url = configProp.getIsoresulturl(); // 值为targetNamespace+methodName EndpointReference epfs = new EndpointReference(url); option.setTo(epfs); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ISO_FileToVoidAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ISO_FileToVoidAction.java index 96f7bb3..d78759d 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ISO_FileToVoidAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ISO_FileToVoidAction.java @@ -1,5 +1,6 @@ package com.weaver.seconddev.interfaces.workflow.action; +import com.weaver.seconddev.interfaces.prop.ConfigProp; import org.apache.axiom.om.OMAbstractFactory; import org.apache.axiom.om.OMElement; import org.apache.axiom.om.OMFactory; @@ -44,7 +45,8 @@ public class ISO_FileToVoidAction extends BaseBean implements Action, EsbServerl // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; - + @Autowired + private ConfigProp configProp; private static final Logger logger_ee6301ba = LoggerFactory.getLogger(ISO_FileToVoidAction.class); @Override @@ -123,7 +125,8 @@ public class ISO_FileToVoidAction extends BaseBean implements Action, EsbServerl option.setTimeOutInMilliSeconds(30000); option.setAction("http://tempuri.org/InternalFileToVoid"); // https://testecmapi.hengtonggroup.com.cn:8012/workflow.asmx - String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htecmoasync.isoresulturl")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htecmoasync.isoresulturl")).trim(); + String url = configProp.getIsoresulturl(); // 值为targetNamespace+methodName EndpointReference epfs = new EndpointReference(url); option.setTo(epfs); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ISO_FileTransferAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ISO_FileTransferAction.java index 4f8b661..dcae504 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ISO_FileTransferAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ISO_FileTransferAction.java @@ -1,5 +1,6 @@ package com.weaver.seconddev.interfaces.workflow.action; +import com.weaver.seconddev.interfaces.prop.ConfigProp; import org.apache.axiom.om.OMAbstractFactory; import org.apache.axiom.om.OMElement; import org.apache.axiom.om.OMFactory; @@ -44,7 +45,8 @@ public class ISO_FileTransferAction extends BaseBean implements Action, EsbServe // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; - + @Autowired + private ConfigProp configProp; private static final Logger logger_7e2594b6 = LoggerFactory.getLogger(ISO_FileTransferAction.class); @Override @@ -123,7 +125,8 @@ public class ISO_FileTransferAction extends BaseBean implements Action, EsbServe option.setTimeOutInMilliSeconds(30000); option.setAction("http://tempuri.org/fileTransfer"); // https://testecmapi.hengtonggroup.com.cn:8012/workflow.asmx - String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htecmoasync.isoresulturl")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htecmoasync.isoresulturl")).trim(); + String url = configProp.getIsoresulturl(); // 值为targetNamespace+methodName EndpointReference epfs = new EndpointReference(url); option.setTo(epfs); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ISO_ProjectFileAddOrReviseAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ISO_ProjectFileAddOrReviseAction.java index d4d8f74..fc917ee 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ISO_ProjectFileAddOrReviseAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ISO_ProjectFileAddOrReviseAction.java @@ -1,5 +1,6 @@ package com.weaver.seconddev.interfaces.workflow.action; +import com.weaver.seconddev.interfaces.prop.ConfigProp; import org.apache.axiom.om.OMAbstractFactory; import org.apache.axiom.om.OMElement; import org.apache.axiom.om.OMFactory; @@ -41,7 +42,8 @@ public class ISO_ProjectFileAddOrReviseAction extends BaseBean implements Action // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; - + @Autowired + private ConfigProp configProp; private static final Logger logger_e362e0f6 = LoggerFactory.getLogger(ISO_ProjectFileAddOrReviseAction.class); @Override @@ -132,7 +134,8 @@ public class ISO_ProjectFileAddOrReviseAction extends BaseBean implements Action option.setTimeOutInMilliSeconds(60000); option.setAction("http://tempuri.org/newProjectFiles"); // https://testecmapi.hengtonggroup.com.cn:8012/workflow.asmx - String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htecmoasync.isoresulturl")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htecmoasync.isoresulturl")).trim(); + String url = configProp.getIsoresulturl(); // 值为targetNamespace+methodName EndpointReference epfs = new EndpointReference(url); option.setTo(epfs); @@ -198,7 +201,8 @@ public class ISO_ProjectFileAddOrReviseAction extends BaseBean implements Action option.setTimeOutInMilliSeconds(30000); option.setAction("http://tempuri.org/revisedProjectFiles"); // https://testecmapi.hengtonggroup.com.cn:8012/workflow.asmx - String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htecmoasync.isoresulturl")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htecmoasync.isoresulturl")).trim(); + String url = configProp.getIsoresulturl(); // 值为targetNamespace+methodName EndpointReference epfs = new EndpointReference(url); option.setTo(epfs); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ISO_ProjectFilePermissionAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ISO_ProjectFilePermissionAction.java index 0b9f5a8..b6db961 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ISO_ProjectFilePermissionAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ISO_ProjectFilePermissionAction.java @@ -117,7 +117,7 @@ public class ISO_ProjectFilePermissionAction extends BaseBean implements Action, option.setTimeOutInMilliSeconds(30000); option.setAction("http://tempuri.org/ProjectFilesPermission"); // https://testecmapi.hengtonggroup.com.cn:8012/workflow.asmx -// String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htecmoasync.isoresulturl")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htecmoasync.isoresulturl")).trim(); String url = configProp.getIsoresulturl(); // 值为targetNamespace+methodName EndpointReference epfs = new EndpointReference(url); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ISO_ProjectFileReissueAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ISO_ProjectFileReissueAction.java index 87209e1..7f35cfb 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ISO_ProjectFileReissueAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ISO_ProjectFileReissueAction.java @@ -117,7 +117,7 @@ public class ISO_ProjectFileReissueAction extends BaseBean implements Action, Es option.setTimeOutInMilliSeconds(30000); option.setAction("http://tempuri.org/ProjectFilesReissue"); // https://testecmapi.hengtonggroup.com.cn:8012/workflow.asmx -// String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htecmoasync.isoresulturl")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htecmoasync.isoresulturl")).trim(); String url = configProp.getIsoresulturl(); // 值为targetNamespace+methodName EndpointReference epfs = new EndpointReference(url); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaCrmZDYWFPAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaCrmZDYWFPAction.java index a645f7c..b716af9 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaCrmZDYWFPAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaCrmZDYWFPAction.java @@ -107,10 +107,10 @@ public class OaCrmZDYWFPAction extends BaseBean implements Action, EsbServerless // String result = mGetResult.getApproveResult(mJson,"EasYszxfpApplyResult"); logger_afe2c4b5.info(requestID + " " + mJson.toString()); // 调用接口 -// String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("hteasoasync.OA_Golden_Rewrite")).trim(); -// String appKey = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("hteasoasync.appKey")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("hteasoasync.OA_Golden_Rewrite")).trim(); +// String appKey = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("hteasoasync.appKey")).trim(); String url = configProp.getOA_Golden_Rewrite(); - String appKey = configProp.getAppKey(); + String appKey = configProp.getHteasoasync_appKey(); SendPostRequest_API mGetResult = new SendPostRequest_API(); String result = mGetResult.getResult(mJson, url, appKey); logger_afe2c4b5.info(String.valueOf(requestID + "调用CRM接口返回值：" + result)); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorPunishCommitAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorPunishCommitAction.java index 109a16e..4835e93 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorPunishCommitAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorPunishCommitAction.java @@ -112,7 +112,7 @@ public class OaSrmVendorPunishCommitAction extends BaseBean implements Action, E mJson.put("totalAmount", mMap.get("SPHJ")); mReqJson.put("DATAS", mJson); logger_c3039127.info("调用SRM供应商绩效处罚信息同步接口请求数据：=====" + mReqJson.toString()); -// String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htsrmoasync.OaSrmVendorPunish")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htsrmoasync.OaSrmVendorPunish")).trim(); String url = configProp.getOaSrmVendorPunish() ; SendPostRequest_PO mGetResult = new SendPostRequest_PO(); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorPunishConfirmAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorPunishConfirmAction.java index 246056e..4dcca5f 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorPunishConfirmAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorPunishConfirmAction.java @@ -1,6 +1,7 @@ package com.weaver.seconddev.interfaces.workflow.action; import com.alibaba.fastjson.JSONObject; +import com.weaver.seconddev.interfaces.prop.ConfigProp; import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; import java.util.HashMap; import java.util.Map; @@ -39,7 +40,8 @@ public class OaSrmVendorPunishConfirmAction extends BaseBean implements Action, private String ITFID = "HT01BDS001"; private String SYSID = "SYS004"; - + @Autowired + private ConfigProp configProp; @Override public WeaResult> execute(Map requestInfoMap) { Map weaverResultMap = new HashMap<>(); @@ -130,7 +132,8 @@ public class OaSrmVendorPunishConfirmAction extends BaseBean implements Action, mReqJson.put("DATAS", mJson); logger_9131997c.info("调用SRM供应商绩效处罚信息同步接口请求数据：=====" + mReqJson.toString()); // 调用接口 - String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htsrmoasync.OaSrmVendorPunish")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htsrmoasync.OaSrmVendorPunish")).trim(); + String url = configProp.getOaSrmVendorPunish(); SendPostRequest_PO mGetResult = new SendPostRequest_PO(); String result = mGetResult.getResult(mReqJson, url); logger_9131997c.info(String.valueOf("调用SRM供应商绩效处罚信息同步接口请求数据：" + result)); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorQualityConfirmAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorQualityConfirmAction.java index 0cb6303..07b6da9 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorQualityConfirmAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorQualityConfirmAction.java @@ -2,6 +2,7 @@ package com.weaver.seconddev.interfaces.workflow.action; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.weaver.seconddev.interfaces.prop.ConfigProp; import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; import java.util.HashMap; import java.util.Map; @@ -41,7 +42,8 @@ public class OaSrmVendorQualityConfirmAction extends BaseBean implements Action, private String ITFID = "HT01BDS001"; private String SYSID = "SYS004"; - + @Autowired + private ConfigProp configProp; @Override public WeaResult> execute(Map requestInfoMap) { Map weaverResultMap = new HashMap<>(); @@ -118,7 +120,8 @@ public class OaSrmVendorQualityConfirmAction extends BaseBean implements Action, mReqJson.put("DATAS", mJson); logger_ffadea7c.info("调用SRM供应商绩效处罚信息同步接口请求数据：=====" + mReqJson.toString()); // 调用接口 - String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htsrmoasync.OaSrmVendorPunish")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htsrmoasync.OaSrmVendorPunish")).trim(); + String url = configProp.getOaSrmVendorPunish(); SendPostRequest_PO mGetResult = new SendPostRequest_PO(); String result = mGetResult.getResult(mReqJson, url); logger_ffadea7c.info(String.valueOf("SRM系统返回数据：" + result)); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OperateEmailAccountAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OperateEmailAccountAction.java index d81335b..2e14544 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OperateEmailAccountAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OperateEmailAccountAction.java @@ -107,22 +107,22 @@ public class OperateEmailAccountAction extends BaseBean implements Action, EsbSe if ("0".equals(value)) { yxlx = "@hengtonggroup.com.cn"; sysid = "SYS025"; -// emailIP = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htemail.htgroup")).trim(); -// port = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htemail.htgroupport")).trim(); +// emailIP = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htemail.htgroup")).trim(); +// port = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htemail.htgroupport")).trim(); emailIP = configProp.getHtgroup(); port = configProp.getHtgroupport(); } else if ("1".equals(value)) { yxlx = "@htgd.com.cn"; sysid = "SYS026"; -// emailIP = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htemail.htgd")).trim(); -// port = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htemail.htgdport")).trim(); +// emailIP = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htemail.htgd")).trim(); +// port = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htemail.htgdport")).trim(); emailIP = configProp.getHtgd(); port = configProp.getHtgdport(); } else if ("2".equals(value)) { yxlx = "@jsalpha.com"; sysid = "SYS035"; -// emailIP = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htemail.guangdao")).trim(); -// port = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htemail.guangdaoport")).trim(); +// emailIP = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htemail.guangdao")).trim(); +// port = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htemail.guangdaoport")).trim(); emailIP = configProp.getGuangdao(); port = configProp.getGuangdaoport(); } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/RemindForCarAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/RemindForCarAction.java index f658a7b..bc47097 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/RemindForCarAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/RemindForCarAction.java @@ -43,7 +43,7 @@ // try { // BaseBean basebean = new BaseBean(); // logger_9618d585.info(String.valueOf("do RemindForCarAction start ")); -// String content = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("remindforweixin.carmessage")).trim(); +// String content = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("remindforweixin.carmessage")).trim(); // String requestId = request.getRequestid(); // List list = new ArrayList(); // // 获取主表数据 diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SendPostRequest_PO.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SendPostRequest_PO.java index c269df1..b976419 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SendPostRequest_PO.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SendPostRequest_PO.java @@ -33,7 +33,7 @@ public class SendPostRequest_PO extends BaseBean { post.setHeader("Accept", "application/json; charset=UTF-8"); // post.setHeader("appkey",); // po需要的验证 -// post.setHeader("Authorization", Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htportaloaUrl.url_password")).trim()); +// post.setHeader("Authorization", Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.url_password")).trim()); post.setHeader("Authorization", configProp.getUrl_password()); StringEntity entity = new StringEntity(returnJson.toString(), "UTF-8"); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/WuJangGiftStorageAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/WuJangGiftStorageAction.java index 782ff35..411b444 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/WuJangGiftStorageAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/WuJangGiftStorageAction.java @@ -63,7 +63,7 @@ public class WuJangGiftStorageAction extends BaseBean implements Action, EsbServ } } // XZ011只有配置里维护的人申请才触发接口 -// String creator = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htxzsetting.creator")); +// String creator = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htxzsetting.creator")); String creator = configProp.getCreator(); if (creator.indexOf(sqr) >= 0) { DetailTable dtq = requestinfo.getDetailTableInfo().getDetailTable(0); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_YFFY_ZjAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_YFFY_ZjAction.java index 54861d4..ec9e62a 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_YFFY_ZjAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_YFFY_ZjAction.java @@ -74,7 +74,7 @@ public class ZOA_MM_PR_CREATE_YFFY_ZjAction extends BaseBean implements Action, ResourceComInfo hr = I18nContextUtil.getBean(ResourceComInfo.class); BillFieldUtil unit = new BillFieldUtil(); // 采购申请类型 -// String prtype = I18nContextUtil.getBean(Environment.class).getProperty("htsapoasync.prtype"); +// String prtype = I18nContextUtilcus.getBean(Environment.class).getProperty("htsapoasync.prtype"); String prtype = configProp.getPrtype(); // 采购组 String cgz = "130"; diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GNCC_Action.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GNCC_Action.java index 611ea1c..1a73305 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GNCC_Action.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GNCC_Action.java @@ -562,7 +562,7 @@ public class ZOA_SL_GNCC_Action extends BaseBean implements Action, EsbServerles String returnCode = ""; String wfid = request.getWorkflowid(); tablename = unit.getTablename(wfid); -// String isneedxzsl = I18nContextUtil.getBean(Environment.class).getProperty("htctripmt.isneedxzsl"); +// String isneedxzsl = I18nContextUtilcus.getBean(Environment.class).getProperty("htctripmt.isneedxzsl"); String isneedxzsl = configProp.getIsneedxzsl(); if ("1".equals(isneedxzsl)) { // 是否需要推送中兴商旅 1是 0否 diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GN_Action.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GN_Action.java index a0619ea..a3a8ad6 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GN_Action.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GN_Action.java @@ -443,7 +443,7 @@ public class ZOA_SL_GN_Action extends BaseBean implements Action, EsbServerlessR String returnCode = ""; String wfid = request.getWorkflowid(); tablename = unit.getTablename(wfid); -// String isneedxzsl = I18nContextUtil.getBean(Environment.class).getProperty("htctripmt.isneedxzsl"); +// String isneedxzsl = I18nContextUtilcus.getBean(Environment.class).getProperty("htctripmt.isneedxzsl"); String isneedxzsl = configProp.getIsneedxzsl(); if ("1".equals(isneedxzsl)) { // 是否需要推送中兴商旅 1是 0否 diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GWCC_Action.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GWCC_Action.java index 22f3c68..001920f 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GWCC_Action.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GWCC_Action.java @@ -574,7 +574,7 @@ public class ZOA_SL_GWCC_Action extends BaseBean implements Action, EsbServerles // writeLog("传递出差单据信息完成"); String status = "E"; String message = ""; -// String isneedxzsl = I18nContextUtil.getBean(Environment.class).getProperty("htctripmt.isneedxzsl"); +// String isneedxzsl = I18nContextUtilcus.getBean(Environment.class).getProperty("htctripmt.isneedxzsl"); String isneedxzsl = configProp.getIsneedxzsl(); if ("1".equals(isneedxzsl)) { // 是否需要推送中兴商旅 1是 0否 diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GW_Action.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GW_Action.java index f0ebf8c..a8bc131 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GW_Action.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GW_Action.java @@ -1,5 +1,6 @@ package com.weaver.seconddev.interfaces.workflow.action; +import com.weaver.seconddev.interfaces.prop.ConfigProp; import corp.openapicalls.contract.setapproval.request.PassengerDetail; import com.weaver.seconddev.interfaces.oactrip.OaCtrip; import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; @@ -45,7 +46,8 @@ public class ZOA_SL_GW_Action extends BaseBean implements Action, EsbServerlessR // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; - + @Autowired + private ConfigProp configProp; private static final Logger logger_39ae6ef1 = LoggerFactory.getLogger(ZOA_SL_GW_Action.class); public WeaResult> execute(Map requestInfoMap) { @@ -461,7 +463,8 @@ public class ZOA_SL_GW_Action extends BaseBean implements Action, EsbServerlessR String message = ""; String wfid = request.getWorkflowid(); tablename = unit.getTablename(wfid); - String isneedxzsl = I18nContextUtil.getBean(Environment.class).getProperty("htctripmt.isneedxzsl"); +// String isneedxzsl = I18nContextUtilcus.getBean(Environment.class).getProperty("htctripmt.isneedxzsl"); + String isneedxzsl = configProp.getIsneedxzsl(); if ("1".equals(isneedxzsl)) { // 是否需要推送中兴商旅 1是 0否 try { diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZWZX_CG_FileUploadAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZWZX_CG_FileUploadAction.java index 1957a05..b766e19 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZWZX_CG_FileUploadAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZWZX_CG_FileUploadAction.java @@ -66,10 +66,10 @@ public class ZWZX_CG_FileUploadAction extends BaseBean implements Action, EsbSer */ String ITFID = "HTEFS001"; // 接口账号 -// String USERNAME = I18nContextUtil.getBean(Environment.class).getProperty("htsysjcmt.efsaccount"); +// String USERNAME = I18nContextUtilcus.getBean(Environment.class).getProperty("htsysjcmt.efsaccount"); String USERNAME = configProp.getEfsaccount(); // 接口密码 -// String PASSWORD = I18nContextUtil.getBean(Environment.class).getProperty("htsysjcmt.efspassword"); +// String PASSWORD = I18nContextUtilcus.getBean(Environment.class).getProperty("htsysjcmt.efspassword"); String PASSWORD = configProp.getEfspassword(); // 业务属性 0-未分类 String businessTag = "0"; @@ -201,7 +201,7 @@ public class ZWZX_CG_FileUploadAction extends BaseBean implements Action, EsbSer mJson.put("fileVOList", fileVOListArr); // writeLog(requestID+" 调用总账归档附件上传接口请求数据：=====" + mJson.toString()); // 调用接口 -// String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("hteasoasync.uploadZZInfoUrl")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("hteasoasync.uploadZZInfoUrl")).trim(); String url = configProp.getUploadZZInfoUrl(); ZZ_SendPostRequest mGetResult = new ZZ_SendPostRequest(); String result = mGetResult.getResult(mJson, url); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZZ_DZDAFDApproveAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZZ_DZDAFDApproveAction.java index 7ef4617..6fb5bc5 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZZ_DZDAFDApproveAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZZ_DZDAFDApproveAction.java @@ -2,6 +2,7 @@ package com.weaver.seconddev.interfaces.workflow.action; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.weaver.seconddev.interfaces.prop.ConfigProp; import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; import java.text.SimpleDateFormat; import java.util.Date; @@ -35,7 +36,8 @@ public class ZZ_DZDAFDApproveAction extends BaseBean implements Action, EsbServe // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; - + @Autowired + private ConfigProp configProp; private static final Logger logger_ccc3e432 = LoggerFactory.getLogger(ZZ_DZDAFDApproveAction.class); @Override @@ -85,7 +87,8 @@ public class ZZ_DZDAFDApproveAction extends BaseBean implements Action, EsbServe if (pzlx.equals("0")) { // 总账类 // 调用接口 - url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("hteasoasync.dzdafd_zz_url")).trim(); +// url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("hteasoasync.dzdafd_zz_url")).trim(); + url = configProp.getDzdafd_zz_url(); String yoaywbh = mMap.get("YOAYWBH"); mJson.put("receiptNO", yoaywbh); mJson.put("voucherSysFrom", "OA"); 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 72dbc54..2e07e21 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 @@ -2,6 +2,7 @@ package com.weaver.seconddev.interfaces.workflow.action; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.weaver.seconddev.interfaces.prop.ConfigProp; import org.apache.axis.encoding.Base64; import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; import java.io.*; @@ -48,7 +49,8 @@ public class ZZ_GDFileUploadAction extends BaseBean implements Action, EsbServer // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; - + @Autowired + private ConfigProp configProp; private static final Logger logger_b14cb5d0 = LoggerFactory.getLogger(ZZ_GDFileUploadAction.class); @Override @@ -238,7 +240,8 @@ public class ZZ_GDFileUploadAction extends BaseBean implements Action, EsbServer mJson.put("snVOList", new JSONArray()); logger_b14cb5d0.info("调用总账归档附件上传接口请求数据：=====" + mJson.toString()); // 调用接口 - String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("hteasoasync.uploadZZInfoUrl")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("hteasoasync.uploadZZInfoUrl")).trim(); + String url = configProp.getUploadZZInfoUrl(); ZZ_SendPostRequest mGetResult = new ZZ_SendPostRequest(); String result = mGetResult.getResult(mJson, url); logger_b14cb5d0.info(String.valueOf("调用总账归档附件上传接口返回值：" + result)); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZZ_Ten_GDFileUploadAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZZ_Ten_GDFileUploadAction.java index bcb7a70..78644fd 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZZ_Ten_GDFileUploadAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZZ_Ten_GDFileUploadAction.java @@ -244,7 +244,7 @@ public class ZZ_Ten_GDFileUploadAction extends BaseBean implements Action, EsbSe mJson.put("snVOList", new JSONArray()); logger_8ab26152.info("调用总账归档附件上传接口请求数据：=====" + mJson.toString()); // 调用接口 -// String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("hteasoasync.uploadZZInfoUrl")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("hteasoasync.uploadZZInfoUrl")).trim(); String url = configProp.getUploadZZInfoUrl(); ZZ_SendPostRequest mGetResult = new ZZ_SendPostRequest(); String result = mGetResult.getResult(mJson, url); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/entity/Meeting.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/entity/Meeting.java index bcf5341..28e61ff 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/entity/Meeting.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/entity/Meeting.java @@ -47,7 +47,7 @@ // logger_b81e0cc9.info(String.valueOf("requestid:" + requestid)); // RecordSet rs = I18nContextUtil.getBean(RecordSet.class); // SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); -// String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htportaloaUrl.pc_url")).trim(); +// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.pc_url")).trim(); // String address = ""; // String contacter = ""; // List sendList = new ArrayList(); @@ -93,14 +93,14 @@ // map.put("password", password); // map.put("itemId", itemId); // map.put("title", name); -// map.put("url", url + URLEncoder.encode(Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htportaloaUrl.meeting_url")).trim() + id)); +// map.put("url", url + URLEncoder.encode(Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.meeting_url")).trim() + id)); // map.put("type", type); // map.put("startDate", begindate + " " + begintime + ":00"); // map.put("endDate", enddate + " " + endtime + ":00"); // map.put("status", "0"); // map.put("priority", "0"); // map.put("formName", fromName); -// map.put("mobileUrl", url + URLEncoder.encode(Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htportaloaUrl.meeting_mobileUrl")).trim() + id)); +// map.put("mobileUrl", url + URLEncoder.encode(Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.meeting_mobileUrl")).trim() + id)); // map.put("category", meetingtype); // map.put("source", "1"); // map.put("content", "会议地点：" + location + "\r\n会议内容：" + description); @@ -111,22 +111,22 @@ // for (int a = 0; a < str.length; a++) { // int adr = Integer.parseInt(str[a]); // if (adr <= 9 || (adr >= 93 && adr <= 97) || adr == 166 || adr == 167) { -// logger_b81e0cc9.info(String.valueOf("开始微信提醒预约人：" + I18nContextUtil.getBean(Environment.class).getProperty("remindforweixin.MeetingReminderStart"))); +// logger_b81e0cc9.info(String.valueOf("开始微信提醒预约人：" + I18nContextUtilcus.getBean(Environment.class).getProperty("remindforweixin.MeetingReminderStart"))); // // InterfaceUtil.sendMsg(sendList, ",2a202436404f44368a0a7b50295d6273,", "", getPropValue("remindforweixin","MeetingReminderStart"), 3); -// MessageBean messageBean = Util_Message.createMessage(messageType, new HashSet(sendList), I18nContextUtil.getBean(Environment.class).getProperty("remindforweixin.MeetingReminderStart"), I18nContextUtil.getBean(Environment.class).getProperty("remindforweixin.MeetingReminderStart"), "", ""); +// MessageBean messageBean = Util_Message.createMessage(messageType, new HashSet(sendList), I18nContextUtilcus.getBean(Environment.class).getProperty("remindforweixin.MeetingReminderStart"), I18nContextUtilcus.getBean(Environment.class).getProperty("remindforweixin.MeetingReminderStart"), "", ""); // messageBean.setCreater(1); // Util_Message.store(messageBean); -// String senduser = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("remindforweixin.senduser")); +// String senduser = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("remindforweixin.senduser")); // if (!"".equals(senduser)) { // String[] users = senduser.split(","); // List userlist = Arrays.asList(users); // // Map sendmap = new HashMap(); -// String meetingurl = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("remindforweixin.url")) + id; +// String meetingurl = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("remindforweixin.url")) + id; // // sendmap.put("mobilemodeUrl", meetingurl); -// logger_b81e0cc9.info(String.valueOf("开始微信提醒预约人：" + I18nContextUtil.getBean(Environment.class).getProperty("remindforweixin.remind"))); +// logger_b81e0cc9.info(String.valueOf("开始微信提醒预约人：" + I18nContextUtilcus.getBean(Environment.class).getProperty("remindforweixin.remind"))); // // InterfaceUtil.sendMsg(userlist, ",15418c34550c4271956f925ba4386b10,", id, getPropValue("remindforweixin","remind"), 15,sendmap); // MessageType messageType1 = MessageType.newInstance(538); -// MessageBean messageBean1 = Util_Message.createMessage(messageType1, new HashSet(userlist), I18nContextUtil.getBean(Environment.class).getProperty("remindforweixin.remind"), I18nContextUtil.getBean(Environment.class).getProperty("remindforweixin.remind"), "", meetingurl); +// MessageBean messageBean1 = Util_Message.createMessage(messageType1, new HashSet(userlist), I18nContextUtilcus.getBean(Environment.class).getProperty("remindforweixin.remind"), I18nContextUtilcus.getBean(Environment.class).getProperty("remindforweixin.remind"), "", meetingurl); // messageBean1.setCreater(1); // Util_Message.store(messageBean1); // }