From 192818aad30148c7f1226e30177f33b0bab43ad2 Mon Sep 17 00:00:00 2001 From: qijirenjian Date: Tue, 17 Dec 2024 17:30:03 +0800 Subject: [PATCH] configpro --- .../crmoa/CRM_syncUnFreezeTimes.java | 2 +- .../interfaces/easoa/CallEasServices.java | 2 +- .../seconddev/interfaces/prop/ConfigProp.java | 146 ++++++++---------- .../action/ARSPaymentRecepitAction.java | 2 +- .../workflow/action/OaCrmZDYWFPAction.java | 2 +- 5 files changed, 66 insertions(+), 88 deletions(-) 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 dea7da1..b628e86 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 @@ -41,7 +41,7 @@ public class CRM_syncUnFreezeTimes extends BaseBean { CRM_SyncUnFreezeTimesStub stub = null; // String s2= "http://10.6.6.77:8070/CRM_SyncUnFreezeTimes.asmx"; // String s2 = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htcrmoasync.times")).trim(); - String s2 = configProp.getTimes(); + String s2 = configProp.getHtcrmoasync_times(); stub = new CRM_SyncUnFreezeTimesStub(s2); stub._getServiceClient().getOptions().setProperty("__CHUNKED__", Boolean.FALSE); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/CallEasServices.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/CallEasServices.java index 97cd7a4..6bbf0a2 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 @@ -27,7 +27,7 @@ public class CallEasServices extends BaseBean { // private static String url = "http://10.6.34.83:8080/easws/services/PayControlService?wsdl"; // private String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("hteasoasync.url")).trim(); - private String url =configProp.getUrl(); + private String url =configProp.getWeaver_secondev_hteasoasync_url(); // private String url = "http://sappod.hengtong.com:50000/XISOAPAdapter/MessageServlet?senderParty=&senderService=BS_OA&receiverParty=&receiverService=&interface=SI_HTOAPayControl_OUT&interfaceNamespace=http://hengtong.com/OA/HTOAPayControl"; public CallEasServices() { } 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 bebb85c..b5fc85b 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 @@ -10,258 +10,241 @@ import org.springframework.context.annotation.Configuration; @Configuration @RefreshScope public class ConfigProp { + //htcmsoasync @Value("${htcmsoasync-appKey}") private String htcmsoasync_appKey; - @Value("${htcmsoasync-oaapproveresulturl}") private String htcmsoasync_oaapproveresulturl; - - @Value("${srmbacklisturl}") private String srmbacklisturl; + //htcrmoasync @Value("${TempUnfreeze}") private String TempUnfreeze; - - @Value("${times}") - private String times; - + //htcrmoasync.times + @Value("${htcrmoasync-times}") + private String htcrmoasync_times; @Value("${CreateBilling}") private String CreateBilling; - + //htcrmoasync.appkey @Value("${htcrmoasync-appkey}") - private String appkey; + private String htcrmoasync_appkey; + -// @Value("${appkey}") -// private String appkey; + //htctripmt + //htctripmt.appkey + @Value("${weaver-secondev-htctripmt-appkey}") + private String weaver_secondev_htctripmt_appkey; + //htctripmt.appkey @Value("${weaver-secondev-htctripmt-appsecurity}") private String weaver_secondev_htctripmt_appsecurity; - - @Value("${isneedxzsl}") private String isneedxzsl; - @Value("${url}") - private String url; + //hteasoasync + //hteasoasync.url + @Value("${weaver-secondev-hteasoasync-url}") + private String weaver_secondev_hteasoasync_url; @Value("${TravelApply}") private String TravelApply; - - @Value("${DelayDateSync}") private String DelayDateSync; - - @Value("${intermediarysync}") private String intermediarysync; - - @Value("${FeeApplication}") private String FeeApplication; - @Value("${InterLoan}") private String InterLoan; - @Value("${getTzlhtApplyResultUrl}") private String getTzlhtApplyResultUrl; - @Value("${uploadZZInfoUrl}") private String uploadZZInfoUrl; - @Value("${syncOaApplyForm}") private String syncOaApplyForm; - @Value("${easappkey}") private String easappkey; - @Value("${uploadDZDAApprovelUrl}") private String uploadDZDAApprovelUrl; - @Value("${updatevoucherurl}") private String updatevoucherurl; - @Value("${OA_Golden_Rewrite}") private String OA_Golden_Rewrite; - - @Value("${hteasoasync_appKey}") - private String hteasoasync_appKey; - + //hteasoasync.appKey + @Value("${weaver-secondev-hteasoasync-appKey}") + private String weaver_secondev_hteasoasync_appKey; @Value("${rpaLimitPay}") private String rpaLimitPay; - @Value("${getApproveResultUrl}") private String getApproveResultUrl; - @Value("${dzdafd_zz_url}") private String dzdafd_zz_url; + + //htecmoasync @Value("${isoresulturl}") private String isoresulturl; + + //htemail @Value("${htgroup}") private String htgroup; - @Value("${htgroupport}") private String htgroupport; - @Value("${htgd}") private String htgd; - @Value("${htgdport}") private String htgdport; - - @Value("${guangdao}") private String guangdao; - @Value("${guangdaoport}") private String guangdaoport; - @Value("${creathtvisitorapply}") - private String creathtvisitorapply; + + + //htk3oasync @Value("${approval_url}") private String approval_url; - @Value("${customer_url}") private String customer_url; - @Value("${supplier_url}") private String supplier_url; - @Value("${porequest_url}") private String porequest_url; - @Value("${lplysl_url}") private String lplysl_url; - @Value("${lplyhtk_url}") private String lplyhtk_url; + + + + //htmesoasync @Value("${A040WLPS}") private String A040WLPS; - @Value("${GDZG04OaAuditResult}") private String GDZG04OaAuditResult; + + + //htportaloaUrl @Value("${po_user}") private String po_user; - @Value("${po_password}") private String po_password; - @Value("${accountUrl}") private String accountUrl; - @Value("${getSystemListUrl}") private String getSystemListUrl; - @Value("${url_password}") private String url_password; - @Value("${mesaccountUrl}") private String mesaccountUrl; - @Value("${plan_url}") private String plan_url; - @Value("${pc_url}") private String pc_url; - @Value("${JCZS_ycsdid}") private String JCZS_ycsdid; - @Value("${JCZS_jdbzid}") private String JCZS_jdbzid; - @Value("${JCZS_WJYQTZR}") private String JCZS_WJYQTZR; - @Value("${JCZS_QDYQTZR}") private String JCZS_QDYQTZR; - @Value("${JCZS_CSYQTZR}") private String JCZS_CSYQTZR; - @Value("${YC_pcfsid}") private String YC_pcfsid; - @Value("${YC_WJYQTZR}") private String YC_WJYQTZR; - @Value("${YC_QDYQTZR}") private String YC_QDYQTZR; - @Value("${YC_CSYQTZR}") private String YC_CSYQTZR; - @Value("${api_appkey}") private String api_appkey; + + + //htpmoasync @Value("${projectConclusion}") private String projectConclusion; - @Value("${account}") private String account; - @Value("${password}") private String password; + + + //htscfoasync. @Value("${approvalResult}") private String approvalResult; + + + //htsloasync @Value("${dttrip_orderUrl}") private String dttrip_orderUrl; - @Value("${dttrip_tokenUrl}") private String dttrip_tokenUrl; - @Value("${dttrip_account}") private String dttrip_account; - @Value("${dttrip_password}") private String dttrip_password; - @Value("${dttrip_secret}") private String dttrip_secret; - @Value("${ServicesURL}") private String ServicesURL; - @Value("${UserName}") private String UserName; - @Value("${Key}") private String Key; + + + + @Value("${efsaccount}") private String efsaccount; - @Value("${efspassword}") private String efspassword; + + //htsrmoasync @Value("${htshop}") private String htshop; - @Value("${bjdsp}") private String bjdsp; - @Value("${OaSrmVendorPunish}") private String OaSrmVendorPunish; + + + + //htwmsoasync @Value("${wllynmg_url}") private String wllynmg_url; - @Value("${wlly_url}") private String wlly_url; + + + //htxzsetting + @Value("${creator}") + private String creator; + + + + //MesInterfaceAddr @Value("${WsdlLocation}") private String WsdlLocation; @@ -283,11 +266,6 @@ public class ConfigProp { private String htsrm_oa_venmatsextnew; - @Value("${creator}") - private String creator; - - @Value("${weaver-secondev-htctripmt-appkey}") - private String weaver_secondev_htctripmt_appkey; } 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 ba9e80b..58fb64a 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 @@ -131,7 +131,7 @@ public class ARSPaymentRecepitAction extends BaseBean implements Action, EsbServ // String appkey = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htcrmoasync.appkey")).trim(); String url = configProp.getCreateBilling(); - String appkey = configProp.getAppkey(); + String appkey = configProp.getHtcrmoasync_appkey(); logger_c29b3679.info(" url " + url); logger_c29b3679.info(" appkey " + appkey ); 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 b716af9..155a6b3 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 @@ -110,7 +110,7 @@ public class OaCrmZDYWFPAction extends BaseBean implements Action, EsbServerless // 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.getHteasoasync_appKey(); + String appKey = configProp.getWeaver_secondev_hteasoasync_appKey(); SendPostRequest_API mGetResult = new SendPostRequest_API(); String result = mGetResult.getResult(mJson, url, appKey); logger_afe2c4b5.info(String.valueOf(requestID + "调用CRM接口返回值：" + result));