diff --git a/secondev-history-action/src/main/java/com/weaver/custom/configcenter/MesInterfaceAddrConfig.java b/secondev-history-action/src/main/java/com/weaver/custom/configcenter/MesInterfaceAddrConfig.java new file mode 100644 index 0000000..9110320 --- /dev/null +++ b/secondev-history-action/src/main/java/com/weaver/custom/configcenter/MesInterfaceAddrConfig.java @@ -0,0 +1,18 @@ +package com.weaver.custom.configcenter; + +import com.weaver.framework.client.annotation.WeaverConfigCenter; +import lombok.Data; +import org.springframework.stereotype.Component; + +@Data +@Component +@WeaverConfigCenter(sources = { + @WeaverConfigCenter.ConfigProperty( + dataId = "weaver-secondev-MesInterfaceAddr.properties", + group = "DEFAULT_GROUP", + refresh = "true") +}) +public class MesInterfaceAddrConfig { + + +} diff --git a/secondev-history-action/src/main/java/com/weaver/custom/configcenter/htcrmoasyncConfig.java b/secondev-history-action/src/main/java/com/weaver/custom/configcenter/htcrmoasyncConfig.java new file mode 100644 index 0000000..f965b99 --- /dev/null +++ b/secondev-history-action/src/main/java/com/weaver/custom/configcenter/htcrmoasyncConfig.java @@ -0,0 +1,18 @@ +package com.weaver.custom.configcenter; + +import com.weaver.framework.client.annotation.WeaverConfigCenter; +import lombok.Data; +import org.springframework.stereotype.Component; + +@Data +@Component +@WeaverConfigCenter(sources = { + @WeaverConfigCenter.ConfigProperty( + dataId = "weaver-secondev-htcrmoasync.properties", + group = "DEFAULT_GROUP", + refresh = "true") +}) +public class htcrmoasyncConfig { + + +} diff --git a/secondev-history-action/src/main/java/com/weaver/custom/configcenter/htctripmtConfig.java b/secondev-history-action/src/main/java/com/weaver/custom/configcenter/htctripmtConfig.java new file mode 100644 index 0000000..6402e51 --- /dev/null +++ b/secondev-history-action/src/main/java/com/weaver/custom/configcenter/htctripmtConfig.java @@ -0,0 +1,18 @@ +package com.weaver.custom.configcenter; + +import com.weaver.framework.client.annotation.WeaverConfigCenter; +import lombok.Data; +import org.springframework.stereotype.Component; + +@Data +@Component +@WeaverConfigCenter(sources = { + @WeaverConfigCenter.ConfigProperty( + dataId = "weaver-secondev-htctripmt.properties", + group = "DEFAULT_GROUP", + refresh = "true") +}) +public class htctripmtConfig { + + +} diff --git a/secondev-history-action/src/main/java/com/weaver/custom/configcenter/hteasoasyncConfig.java b/secondev-history-action/src/main/java/com/weaver/custom/configcenter/hteasoasyncConfig.java new file mode 100644 index 0000000..6a42095 --- /dev/null +++ b/secondev-history-action/src/main/java/com/weaver/custom/configcenter/hteasoasyncConfig.java @@ -0,0 +1,18 @@ +package com.weaver.custom.configcenter; + +import com.weaver.framework.client.annotation.WeaverConfigCenter; +import lombok.Data; +import org.springframework.stereotype.Component; + +@Data +@Component +@WeaverConfigCenter(sources = { + @WeaverConfigCenter.ConfigProperty( + dataId = "weaver-secondev-hteasoasync.properties", + group = "DEFAULT_GROUP", + refresh = "true") +}) +public class hteasoasyncConfig { + + +} diff --git a/secondev-history-action/src/main/java/com/weaver/custom/configcenter/htecmoasyncConfig.java b/secondev-history-action/src/main/java/com/weaver/custom/configcenter/htecmoasyncConfig.java new file mode 100644 index 0000000..1ad7baf --- /dev/null +++ b/secondev-history-action/src/main/java/com/weaver/custom/configcenter/htecmoasyncConfig.java @@ -0,0 +1,18 @@ +package com.weaver.custom.configcenter; + +import com.weaver.framework.client.annotation.WeaverConfigCenter; +import lombok.Data; +import org.springframework.stereotype.Component; + +@Data +@Component +@WeaverConfigCenter(sources = { + @WeaverConfigCenter.ConfigProperty( + dataId = "weaver-secondev-htecmoasync.properties", + group = "DEFAULT_GROUP", + refresh = "true") +}) +public class htecmoasyncConfig { + + +} diff --git a/secondev-history-action/src/main/java/com/weaver/custom/configcenter/htemailConfig.java b/secondev-history-action/src/main/java/com/weaver/custom/configcenter/htemailConfig.java new file mode 100644 index 0000000..20050ba --- /dev/null +++ b/secondev-history-action/src/main/java/com/weaver/custom/configcenter/htemailConfig.java @@ -0,0 +1,18 @@ +package com.weaver.custom.configcenter; + +import com.weaver.framework.client.annotation.WeaverConfigCenter; +import lombok.Data; +import org.springframework.stereotype.Component; + +@Data +@Component +@WeaverConfigCenter(sources = { + @WeaverConfigCenter.ConfigProperty( + dataId = "weaver-secondev-htemail.properties", + group = "DEFAULT_GROUP", + refresh = "true") +}) +public class htemailConfig { + + +} diff --git a/secondev-history-action/src/main/java/com/weaver/custom/configcenter/htfkxtoasyncConfig.java b/secondev-history-action/src/main/java/com/weaver/custom/configcenter/htfkxtoasyncConfig.java new file mode 100644 index 0000000..130d0d7 --- /dev/null +++ b/secondev-history-action/src/main/java/com/weaver/custom/configcenter/htfkxtoasyncConfig.java @@ -0,0 +1,18 @@ +package com.weaver.custom.configcenter; + +import com.weaver.framework.client.annotation.WeaverConfigCenter; +import lombok.Data; +import org.springframework.stereotype.Component; + +@Data +@Component +@WeaverConfigCenter(sources = { + @WeaverConfigCenter.ConfigProperty( + dataId = "weaver-secondev-htfkxtoasync.properties", + group = "DEFAULT_GROUP", + refresh = "true") +}) +public class htfkxtoasyncConfig { + + +} diff --git a/secondev-history-action/src/main/java/com/weaver/custom/configcenter/htk3oasyncConfig.java b/secondev-history-action/src/main/java/com/weaver/custom/configcenter/htk3oasyncConfig.java new file mode 100644 index 0000000..0727df5 --- /dev/null +++ b/secondev-history-action/src/main/java/com/weaver/custom/configcenter/htk3oasyncConfig.java @@ -0,0 +1,18 @@ +package com.weaver.custom.configcenter; + +import com.weaver.framework.client.annotation.WeaverConfigCenter; +import lombok.Data; +import org.springframework.stereotype.Component; + +@Data +@Component +@WeaverConfigCenter(sources = { + @WeaverConfigCenter.ConfigProperty( + dataId = "weaver-secondev-htk3oasync.properties", + group = "DEFAULT_GROUP", + refresh = "true") +}) +public class htk3oasyncConfig { + + +} diff --git a/secondev-history-action/src/main/java/com/weaver/custom/configcenter/htmesoasyncConfig.java b/secondev-history-action/src/main/java/com/weaver/custom/configcenter/htmesoasyncConfig.java new file mode 100644 index 0000000..59079b1 --- /dev/null +++ b/secondev-history-action/src/main/java/com/weaver/custom/configcenter/htmesoasyncConfig.java @@ -0,0 +1,18 @@ +package com.weaver.custom.configcenter; + +import com.weaver.framework.client.annotation.WeaverConfigCenter; +import lombok.Data; +import org.springframework.stereotype.Component; + +@Data +@Component +@WeaverConfigCenter(sources = { + @WeaverConfigCenter.ConfigProperty( + dataId = "weaver-secondev-htmesoasync.properties", + group = "DEFAULT_GROUP", + refresh = "true") +}) +public class htmesoasyncConfig { + + +} diff --git a/secondev-history-action/src/main/java/com/weaver/custom/configcenter/htpmoasyncConfig.java b/secondev-history-action/src/main/java/com/weaver/custom/configcenter/htpmoasyncConfig.java new file mode 100644 index 0000000..155a050 --- /dev/null +++ b/secondev-history-action/src/main/java/com/weaver/custom/configcenter/htpmoasyncConfig.java @@ -0,0 +1,18 @@ +package com.weaver.custom.configcenter; + +import com.weaver.framework.client.annotation.WeaverConfigCenter; +import lombok.Data; +import org.springframework.stereotype.Component; + +@Data +@Component +@WeaverConfigCenter(sources = { + @WeaverConfigCenter.ConfigProperty( + dataId = "weaver-secondev-htpmoasync.properties", + group = "DEFAULT_GROUP", + refresh = "true") +}) +public class htpmoasyncConfig { + + +} diff --git a/secondev-history-action/src/main/java/com/weaver/custom/configcenter/htportaloaUrlConfig.java b/secondev-history-action/src/main/java/com/weaver/custom/configcenter/htportaloaUrlConfig.java new file mode 100644 index 0000000..4a331de --- /dev/null +++ b/secondev-history-action/src/main/java/com/weaver/custom/configcenter/htportaloaUrlConfig.java @@ -0,0 +1,18 @@ +package com.weaver.custom.configcenter; + +import com.weaver.framework.client.annotation.WeaverConfigCenter; +import lombok.Data; +import org.springframework.stereotype.Component; + +@Data +@Component +@WeaverConfigCenter(sources = { + @WeaverConfigCenter.ConfigProperty( + dataId = "weaver-secondev-htportaloaUrl.properties", + group = "DEFAULT_GROUP", + refresh = "true") +}) +public class htportaloaUrlConfig { + + +} diff --git a/secondev-history-action/src/main/java/com/weaver/custom/configcenter/htscfoasyncConfig.java b/secondev-history-action/src/main/java/com/weaver/custom/configcenter/htscfoasyncConfig.java new file mode 100644 index 0000000..4540557 --- /dev/null +++ b/secondev-history-action/src/main/java/com/weaver/custom/configcenter/htscfoasyncConfig.java @@ -0,0 +1,18 @@ +package com.weaver.custom.configcenter; + +import com.weaver.framework.client.annotation.WeaverConfigCenter; +import lombok.Data; +import org.springframework.stereotype.Component; + +@Data +@Component +@WeaverConfigCenter(sources = { + @WeaverConfigCenter.ConfigProperty( + dataId = "weaver-secondev-htscfoasync.properties", + group = "DEFAULT_GROUP", + refresh = "true") +}) +public class htscfoasyncConfig { + + +} diff --git a/secondev-history-action/src/main/java/com/weaver/custom/configcenter/htsloasyncConfig.java b/secondev-history-action/src/main/java/com/weaver/custom/configcenter/htsloasyncConfig.java new file mode 100644 index 0000000..310ab72 --- /dev/null +++ b/secondev-history-action/src/main/java/com/weaver/custom/configcenter/htsloasyncConfig.java @@ -0,0 +1,18 @@ +package com.weaver.custom.configcenter; + +import com.weaver.framework.client.annotation.WeaverConfigCenter; +import lombok.Data; +import org.springframework.stereotype.Component; + +@Data +@Component +@WeaverConfigCenter(sources = { + @WeaverConfigCenter.ConfigProperty( + dataId = "weaver-secondev-htsloasync.properties", + group = "DEFAULT_GROUP", + refresh = "true") +}) +public class htsloasyncConfig { + + +} diff --git a/secondev-history-action/src/main/java/com/weaver/custom/configcenter/htsrmoasyncConfig.java b/secondev-history-action/src/main/java/com/weaver/custom/configcenter/htsrmoasyncConfig.java new file mode 100644 index 0000000..639d541 --- /dev/null +++ b/secondev-history-action/src/main/java/com/weaver/custom/configcenter/htsrmoasyncConfig.java @@ -0,0 +1,18 @@ +package com.weaver.custom.configcenter; + +import com.weaver.framework.client.annotation.WeaverConfigCenter; +import lombok.Data; +import org.springframework.stereotype.Component; + +@Data +@Component +@WeaverConfigCenter(sources = { + @WeaverConfigCenter.ConfigProperty( + dataId = "weaver-secondev-htsrmoasync.properties", + group = "DEFAULT_GROUP", + refresh = "true") +}) +public class htsrmoasyncConfig { + + +} diff --git a/secondev-history-action/src/main/java/com/weaver/custom/configcenter/htwmsoasyncConfig.java b/secondev-history-action/src/main/java/com/weaver/custom/configcenter/htwmsoasyncConfig.java new file mode 100644 index 0000000..32c8030 --- /dev/null +++ b/secondev-history-action/src/main/java/com/weaver/custom/configcenter/htwmsoasyncConfig.java @@ -0,0 +1,18 @@ +package com.weaver.custom.configcenter; + +import com.weaver.framework.client.annotation.WeaverConfigCenter; +import lombok.Data; +import org.springframework.stereotype.Component; + +@Data +@Component +@WeaverConfigCenter(sources = { + @WeaverConfigCenter.ConfigProperty( + dataId = "weaver-secondev-htwmsoasync.properties", + group = "DEFAULT_GROUP", + refresh = "true") +}) +public class htwmsoasyncConfig { + + +} 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 33ac2c4..e9f5c21 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 @@ -28,8 +28,11 @@ 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(I18nContextUtil.getBean(Environment.class).getProperty("htportaloaUrl.po_user")).trim()); +// auth.setPassword(Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htportaloaUrl.po_password")).trim()); + auth.setUsername(configProp.getPo_user()); + auth.setPassword(configProp.getPo_password()); + stub._getServiceClient().getOptions().setProperty(org.apache.axis2.transport.http.HTTPConstants.AUTHENTICATE, auth); IntermediaryService req = new IntermediaryService(); IntermediaryApplicationSynchronization param = new IntermediaryApplicationSynchronization(); 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 9b01138..48f556d 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 @@ -21,14 +21,18 @@ 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(I18nContextUtil.getBean(Environment.class).getProperty("hteasoasync.FeeApplication")).trim(); + String url = configProp.getFeeApplication(); logger_2817d3b0.info(String.valueOf("调用报账系统话费交通费接口开始")); 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(I18nContextUtil.getBean(Environment.class).getProperty("htportaloaUrl.po_user")).trim()); +// auth.setPassword(Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htportaloaUrl.po_password")).trim()); + auth.setUsername(configProp.getPo_user()); + auth.setPassword(configProp.getPo_password()); + stub._getServiceClient().getOptions().setProperty(org.apache.axis2.transport.http.HTTPConstants.AUTHENTICATE, auth); CostStandardSynchronizationService req = new CostStandardSynchronizationService(); CostStandardSynchronization info = new CostStandardSynchronization(); 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 3bcbd32..0cedb16 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,15 +23,19 @@ 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(I18nContextUtil.getBean(Environment.class).getProperty("hteasoasync.InterLoan")).trim(); + String url = configProp.getInterLoan(); try { logger_9c1a93c4.info(String.valueOf("调用报账系统内部借款接口开始")); SI_InterLoanApplicationSync_OUTServiceStub stub = new SI_InterLoanApplicationSync_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(I18nContextUtil.getBean(Environment.class).getProperty("htportaloaUrl.po_user")).trim()); +// auth.setPassword(Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htportaloaUrl.po_password")).trim()); + + auth.setUsername(configProp.getPo_user()); + auth.setPassword(configProp.getPo_password()); stub._getServiceClient().getOptions().setProperty(org.apache.axis2.transport.http.HTTPConstants.AUTHENTICATE, auth); InternalBorrowingService res = new InternalBorrowingService(); InternalBorrowingSynchronization param = new InternalBorrowingSynchronization(); 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 885c50a..e4035f2 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 @@ -18,15 +18,19 @@ 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(I18nContextUtil.getBean(Environment.class).getProperty("htportaloaUrl.accountUrl")).trim(); + String url = configProp.getAccountUrl(); try { logger_18cc50ce.info(String.valueOf("开始调用批量开户销户接口")); SI_HTPortalUAMGMT2_OUTServiceStub stub = new SI_HTPortalUAMGMT2_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(I18nContextUtil.getBean(Environment.class).getProperty("htportaloaUrl.po_user")).trim()); +// auth.setPassword(Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htportaloaUrl.po_password")).trim()); + + auth.setUsername(configProp.getPo_user()); + auth.setPassword(configProp.getPo_password()); stub._getServiceClient().getOptions().setProperty(org.apache.axis2.transport.http.HTTPConstants.AUTHENTICATE, auth); SI_HTPortalUAMGMT2_OUTServiceStub.UserAccount request = new SI_HTPortalUAMGMT2_OUTServiceStub.UserAccount(); request.setSendid(sendid); 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 310ebb2..b2b8d42 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 @@ -27,11 +27,13 @@ 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(I18nContextUtil.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(I18nContextUtil.getBean(Environment.class).getProperty("htportaloaUrl.url_password")).trim()); + post.setHeader("Authorization", configProp.getUrl_password()); JSONObject returnJson = new JSONObject(); returnJson.put("doAction", "listSystem"); returnJson.put("uid", uid); 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 89927f4..ba8f6de 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,15 +20,18 @@ 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(I18nContextUtil.getBean(Environment.class).getProperty("htportaloaUrl.mesaccountUrl")).trim(); + String url = configProp.getMesaccountUrl(); try { logger_8f904fbd.info(String.valueOf("开始调用门户金思维MES批量开户销户接口")); SI_HTPortalFuncSync_OUTServiceStub stub = new SI_HTPortalFuncSync_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(I18nContextUtil.getBean(Environment.class).getProperty("htportaloaUrl.po_user")).trim()); +// auth.setPassword(Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htportaloaUrl.po_password")).trim()); + auth.setUsername(configProp.getPo_user()); + auth.setPassword(configProp.getPo_password()); stub._getServiceClient().getOptions().setProperty(org.apache.axis2.transport.http.HTTPConstants.AUTHENTICATE, auth); UserOaAccount request = new UserOaAccount(); request.setUser(param); 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 d3ef5f3..4bd0cab 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,13 +59,17 @@ 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(I18nContextUtil.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(I18nContextUtil.getBean(Environment.class).getProperty("htportaloaUrl.po_user")).trim()); +// auth.setPassword(Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htportaloaUrl.po_password")).trim()); + auth.setUsername(configProp.getPo_user()); + + auth.setPassword(configProp.getPo_password()); stub._getServiceClient().getOptions().setProperty(org.apache.axis2.transport.http.HTTPConstants.AUTHENTICATE, auth); return stub; } 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 9dab2ba..6cadbec 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,9 +20,11 @@ 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(I18nContextUtil.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(I18nContextUtil.getBean(Environment.class).getProperty("htwmsoasync.wlly_url")).trim(); + url = configProp.getWlly_url(); } logger_b6665baf.info(String.valueOf(requestid + " url:" + url)); ZMES_OA_SUBMIT_SERVICEStub stub = new ZMES_OA_SUBMIT_SERVICEStub(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 f23543d..a8c72c8 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,13 +20,17 @@ 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(I18nContextUtil.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(I18nContextUtil.getBean(Environment.class).getProperty("htportaloaUrl.po_user")).trim()); +// auth.setPassword(Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htportaloaUrl.po_password")).trim()); + + auth.setUsername(configProp.getPo_user()); + auth.setPassword(configProp.getPo_password()); stub._getServiceClient().getOptions().setProperty(org.apache.axis2.transport.http.HTTPConstants.AUTHENTICATE, auth); SI_HTOAPurreqAPPROSync_OUTServiceStub.Oa2K3PurchaseRequestResult request = new SI_HTOAPurreqAPPROSync_OUTServiceStub.Oa2K3PurchaseRequestResult(); SI_HTOAPurreqAPPROSync_OUTServiceStub.OAPRResultIn resultIn = new SI_HTOAPurreqAPPROSync_OUTServiceStub.OAPRResultIn(); 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 c2620af..4adc8b8 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,8 @@ 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(I18nContextUtil.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); stub._getServiceClient().getOptions().setTimeOutInMilliSeconds(300000); @@ -53,7 +54,8 @@ 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(I18nContextUtil.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); stub._getServiceClient().getOptions().setTimeOutInMilliSeconds(300000); @@ -81,7 +83,8 @@ 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(I18nContextUtil.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); stub._getServiceClient().getOptions().setTimeOutInMilliSeconds(300000); 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 21937c2..d52687e 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,8 @@ 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(I18nContextUtil.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); stub._getServiceClient().getOptions().setTimeOutInMilliSeconds(300000); @@ -54,7 +55,8 @@ 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(I18nContextUtil.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); stub._getServiceClient().getOptions().setTimeOutInMilliSeconds(300000); @@ -77,7 +79,8 @@ 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(I18nContextUtil.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); stub._getServiceClient().getOptions().setTimeOutInMilliSeconds(300000); 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 e462ede..af1dcf9 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,8 @@ 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(I18nContextUtil.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); stub._getServiceClient().getOptions().setTimeOutInMilliSeconds(300000); 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 b16c46e..fb2a4ec 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 @@ -20,7 +20,8 @@ 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(I18nContextUtil.getBean(Environment.class).getProperty("htk3oasync.lplysl_url")).trim(); + String url = configProp.getLplysl_url(); Map map = new HashMap(); try { logger_a44d19bf.info(String.valueOf("GiftQtyService--start")); 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 41b025a..cd8896a 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,8 @@ 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(I18nContextUtil.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); stub._getServiceClient().getOptions().setTimeOutInMilliSeconds(300000); 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 027922c..fe3ba3c 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 @@ -66,8 +66,13 @@ 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"); + //TODO config +// String appKey = I18nContextUtil.getBean(Environment.class).getProperty("htctripmt.appkey"); +// String appsecurity = I18nContextUtil.getBean(Environment.class).getProperty("htctripmt.appsecurity"); + + String appKey = ""; + String appsecurity = configProp.getAppsecurity(); + TicketResponse ticketResponse = CorpTicketService.getOrderAuditTicket(appKey, appsecurity, "1.0"); rtInfo[1] = ticketResponse.getStatus().getMessage(); rtInfo[2] = ticketResponse.getStatus().getErrorCode() + ""; 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 fbbc491..678ef97 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 @@ -2,6 +2,8 @@ package com.weaver.seconddev.interfaces.oames; import java.rmi.RemoteException; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.seconddev.interfaces.prop.ConfigProp; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import java.lang.*; import org.slf4j.Logger; @@ -14,7 +16,8 @@ public class CallMesChuMenZhengService extends BaseBean { private static final org.slf4j.Logger logger_742486d = LoggerFactory.getLogger(CallMesChuMenZhengService.class); private OA_CMZ_SERVICEStub.OA_CMZ_MSG resultIn = null; - + @Autowired + private ConfigProp configProp; public void setOainput(OA_CMZ_SERVICEStub.OA_CMZ_MSG oames) { this.resultIn = oames; } @@ -22,7 +25,8 @@ 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(I18nContextUtil.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); logger_742486d.info(String.valueOf("已获取wsdl")); 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 6fbc2e2..3553178 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/oames/ReturnMesWLPS_SYService.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/oames/ReturnMesWLPS_SYService.java @@ -1,9 +1,11 @@ package com.weaver.seconddev.interfaces.oames; +import com.weaver.seconddev.interfaces.prop.ConfigProp; import org.apache.axis2.transport.http.HttpTransportProperties; import com.weaver.seconddev.interfaces.oames.SI_OA_HTOAApproFlowSync_OUTServiceStub.SendReq; import com.weaver.seconddev.interfaces.oames.SI_OA_HTOAApproFlowSync_OUTServiceStub.WLPS_SY_Request; 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; @@ -12,20 +14,24 @@ import com.weaver.verupgrade.general.BaseBean; import com.weaver.verupgrade.general.Util; public class ReturnMesWLPS_SYService extends BaseBean { - + @Autowired + private ConfigProp configProp; private static final org.slf4j.Logger logger_d5127138 = LoggerFactory.getLogger(ReturnMesWLPS_SYService.class); public String[] returnRes(WLPS_SY_Request param) { String[] message = new String[2]; - String url = (I18nContextUtil.getBean(Environment.class).getProperty("htmesoasync.A040WLPS")).trim(); +// String url = (I18nContextUtil.getBean(Environment.class).getProperty("htmesoasync.A040WLPS")).trim(); + String url = configProp.getA040WLPS(); try { logger_d5127138.info(String.valueOf("开始调用ReturnMesWLPS_SYService接口")); SI_OA_HTOAApproFlowSync_OUTServiceStub stub = new SI_OA_HTOAApproFlowSync_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(I18nContextUtil.getBean(Environment.class).getProperty("htportaloaUrl.po_user")).trim()); +// auth.setPassword(Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htportaloaUrl.po_password")).trim()); + auth.setUsername(configProp.getPo_user()); + auth.setPassword(configProp.getPo_password()); stub._getServiceClient().getOptions().setProperty(org.apache.axis2.transport.http.HTTPConstants.AUTHENTICATE, auth); SendReq sendReq = new SendReq(); sendReq.setWLPS_SY_Req(param); 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 a7175b6..0dfa967 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 @@ -1,5 +1,6 @@ package com.weaver.seconddev.interfaces.pmoa; +import com.weaver.seconddev.interfaces.prop.ConfigProp; import org.apache.http.HttpResponse; import org.apache.http.client.methods.HttpPost; import org.apache.http.entity.StringEntity; @@ -9,6 +10,7 @@ import org.apache.http.protocol.HTTP; import org.apache.http.util.EntityUtils; import java.util.Base64; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import java.lang.*; import org.slf4j.Logger; @@ -17,7 +19,8 @@ import com.weaver.verupgrade.general.BaseBean; import com.weaver.verupgrade.general.Util; public class PMService extends BaseBean { - + @Autowired + private ConfigProp configProp; private static final org.slf4j.Logger logger_8a709bef = LoggerFactory.getLogger(PMService.class); public String call(String json) { @@ -25,9 +28,12 @@ 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(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 = configProp.getProjectConclusion(); + String account = configProp.getAccount(); + String password = configProp.getPassword(); 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/prop/ConfigProp.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/prop/ConfigProp.java index 0393870..aa0dcbd 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 @@ -14,59 +14,231 @@ public class ConfigProp { @Value("${srmbacklisturl}") private String srmbacklisturl; - @Value("${accountUrl}") - private String accountUrl; - /** - * crmoa - */ - //CRM_SyncTempUnfreeze @Value("${TempUnfreeze}") private String TempUnfreeze; - @Value("${po_user}") - private String po_user; - @Value("${po_password}") - private String po_password; - //CRM_syncUnFreezeTimes @Value("${times}") private String times; - /** - * easoa - */ - //CallEasServices + @Value("${CreateBilling}") + private String CreateBilling; + + @Value("${appkey}") + private String appkey; + +// @Value("${appkey}") +// private String appkey; + + + @Value("${appsecurity}") + private String appsecurity; + + @Value("${isneedxzsl}") + private String isneedxzsl; + @Value("${url}") private String url; - //CallTravelApplyService + + @Value("${TravelApply}") private String TravelApply; - //DelayDateService + + @Value("${DelayDateSync}") private String DelayDateSync; - //EASIntermediarySyncService + + @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("${isoresulturl}") + private String isoresulturl; + + @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; + + @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; + + @Value("${A040WLPS}") + private String A040WLPS; + + @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; + + @Value("${projectConclusion}") + private String projectConclusion; + + @Value("${account}") + private String account; + + @Value("${password}") + private String password; + + @Value("${approvalResult}") + private String approvalResult; + + + @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; + + + @Value("${htshop}") + private String htshop; + + @Value("${bjdsp}") + private String bjdsp; + + @Value("${wllynmg_url}") + private String wllynmg_url; + + @Value("${wlly_url}") + private String wlly_url; + + @Value("${WsdlLocation}") + private String WsdlLocation; + @Value("${prtype}") + private String prtype; - //OaSrmVendorPropmtionServiceServiceStub @Value("${gyszznew}") private String gyszznew; - //VdDlvApplyHandlerServiceServiceStub @Value("${gysxznew}") private String gysxznew; - //VenMatExtHandlerServiceServiceStub @Value("${SrmVenMatExtnew}") private String SrmVenMatExtnew; - //VenMatExtsHandlerServiceServiceStub @Value("${htsrm_oa_venmatsextnew}") private String htsrm_oa_venmatsextnew; 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 3c19e7e..1b9d5b3 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,11 +31,13 @@ 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(I18nContextUtil.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(I18nContextUtil.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); HttpResponse response = client.execute(post); 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 914d2d3..b4c49fd 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,8 @@ 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(I18nContextUtil.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 7377947..7ef64d9 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,9 @@ 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(I18nContextUtil.getBean(Environment.class).getProperty("htsrmoasync.bjdsp")).trim(); + wsdlLocation = configProp.getBjdsp(); + stub = new RfqCheckPriceHandlerServiceServiceStub(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/OaSrmVenMatExtService.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/OaSrmVenMatExtService.java index 4e732cf..d78003f 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,15 +19,18 @@ 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(I18nContextUtil.getBean(Environment.class).getProperty("htsrmoasync.SrmVenMatExt")).trim(); + String url = configProp.getSrmVenMatExtnew(); try { logger_333d882d.info(String.valueOf("调用SRM供应商货源关系接口开始")); SI_GoodsSupplyExpanding_OUTServiceStub stub = new SI_GoodsSupplyExpanding_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(I18nContextUtil.getBean(Environment.class).getProperty("htportaloaUrl.po_user")).trim()); +// auth.setPassword(Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htportaloaUrl.po_password")).trim()); + auth.setUsername(configProp.getPo_user()); + auth.setPassword(configProp.getPo_password()); stub._getServiceClient().getOptions().setProperty(org.apache.axis2.transport.http.HTTPConstants.AUTHENTICATE, auth); SRM_OA_VENMATEXT_RESULTE req = new SRM_OA_VENMATEXT_RESULTE(); req.setSRM_OA_VENMATEXT_RESULT(param); 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 ed24a0b..be09ac9 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,8 @@ 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(I18nContextUtil.getBean(Environment.class).getProperty("htsloasync.dttrip_orderUrl")).trim(); + String url = configProp.getDttrip_orderUrl(); JSONObject jsonObject = new JSONObject(); jsonObject.put("isEncrypt", false); jsonObject.put("random", UUID.randomUUID().toString()); @@ -93,9 +94,12 @@ 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(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 = configProp.getDttrip_tokenUrl(); + String account = configProp.getDttrip_account(); + String password = configProp.getDttrip_password(); httpPost = new HttpPost(url); httpPost.setHeader(HTTP.CONTENT_TYPE, "application/json; charset=UTF-8"); httpPost.setHeader("Accept", "application/json; charset=UTF-8"); @@ -136,7 +140,8 @@ 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(I18nContextUtil.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(); return finallySign; 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 4f95cbe..69ef470 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,8 @@ 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(I18nContextUtil.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); CreateBillSrvStub.CreateBillRequest createBillRequest = new CreateBillSrvStub.CreateBillRequest(); @@ -244,8 +245,10 @@ 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(I18nContextUtil.getBean(Environment.class).getProperty("htsloasync.UserName")).trim(); +// String key = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htsloasync.Key")).trim(); + String username = configProp.getUserName(); + String key = configProp.getKey(); createBillRequest.setCurrentTime(df.format(da)); // createBillRequest.setUserName(GetUserName()); // String password = GetUserName()+bill.getSourceType()+bill.getSourceKey()+df.format(new Date())+GetKey(); 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 9f89fdf..0a7b883 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 @@ -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; @@ -35,7 +36,8 @@ public class ARSPaymentRecepitAction extends BaseBean implements Action, EsbServ // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; - + @Autowired + private ConfigProp configProp; private static final Logger logger_c29b3679 = LoggerFactory.getLogger(ARSPaymentRecepitAction.class); String operate; @@ -106,8 +108,10 @@ public class ARSPaymentRecepitAction extends BaseBean implements Action, EsbServ obj.put("OPERATETYPE", operate); writeLog(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(I18nContextUtil.getBean(Environment.class).getProperty("htcrmoasync.CreateBilling")).trim(); +// String appkey = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htcrmoasync.appkey")).trim(); + String url = configProp.getCreateBilling(); + String appkey = configProp.getAppkey(); HttpPost 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/AccommodationAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/AccommodationAction.java index af4dcc7..a3cad75 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 @@ -2,6 +2,7 @@ package com.weaver.seconddev.interfaces.workflow.action; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.weaver.seconddev.interfaces.prop.ConfigProp; import org.apache.commons.lang.StringUtils; import com.weaver.seconddev.interfaces.eipoa.PortalPlanService ; import com.weaver.seconddev.interfaces.eipoa.SI_HTPortalPlan_OUTServiceStub.InsertPlan; @@ -34,6 +35,8 @@ import com.weaver.verupgrade.interfaces.workflow.action.Action; @org.springframework.stereotype.Service("workflow_action_AccommodationAction") public class AccommodationAction extends BaseBean implements Action, EsbServerlessRpcRemoteInterface { + @Autowired + private ConfigProp configProp; // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; @@ -67,7 +70,8 @@ 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(I18nContextUtil.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"; String fromName = util.getName(sqr); @@ -79,7 +83,8 @@ 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(I18nContextUtil.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("就餐地点："); if ("0".equals(map.get("DYJCCS"))) { @@ -114,7 +119,8 @@ 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"), I18nContextUtil.getBean(Environment.class).getProperty("htportaloaUrl.JCZS_jdbzid")).substring(0, 1); + title = title + "，" + util.getselectName(map.get("JDBZ"),configProp.getJCZS_jdbzid() ).substring(0, 1); } // 包厢号 String jcbx = map.get("JCBX"); @@ -125,11 +131,14 @@ 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(I18nContextUtil.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(I18nContextUtil.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(I18nContextUtil.getBean(Environment.class).getProperty("htportaloaUrl.JCZS_CSYQTZR")).trim(); + otherids =configProp.getJCZS_CSYQTZR(); } String userid = ""; if (!"".equals(otherids)) { 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 96befb7..3e48486 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 @@ -5,6 +5,8 @@ import java.text.SimpleDateFormat; import java.util.HashMap; import java.util.HashSet; import java.util.Map; + +import com.weaver.seconddev.interfaces.prop.ConfigProp; import org.apache.commons.lang.StringUtils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; @@ -35,7 +37,8 @@ public class CarApplyInfoAction extends BaseBean implements Action, EsbServerles // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; - + @Autowired + private ConfigProp configProp; private static final Logger logger_4411f79d = LoggerFactory.getLogger(CarApplyInfoAction.class); @Override @@ -62,7 +65,8 @@ 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(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"), configProp.getYC_pcfsid()); // 测试环境-"61279"，正式环境-Util.null2String(this.getPropValue("htportaloaUrl", "YC_pcfsid")).trim() title = title + "，" + map.get("CFDD") + " 至 " + map.get("MDDD"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -71,18 +75,22 @@ 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(I18nContextUtil.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"); String pc_url = "/workflow/request/ViewRequest.jsp?requestid=" + requestid + "&_workflowid=" + workflowid + "&_workflowtype=&isovertime=0"; 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(I18nContextUtil.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(I18nContextUtil.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(I18nContextUtil.getBean(Environment.class).getProperty("htportaloaUrl.YC_CSYQTZR")).trim(); + otherids = configProp.getYC_CSYQTZR(); } String userid = ""; if (!"".equals(otherids)) { 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 add99f8..ef25074 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 @@ -2,6 +2,7 @@ package com.weaver.seconddev.interfaces.workflow.action; import java.net.Socket; import com.alibaba.fastjson.JSONObject; +import com.weaver.seconddev.interfaces.prop.ConfigProp; import tebie.applib.api.APIContext; import tebie.applib.api.IClient; import com.weaver.seconddev.interfaces.eipoa.GetSystemList; @@ -37,7 +38,8 @@ public class CheckEmailAction extends BaseBean implements Action, EsbServerlessR public CheckEmailAction() { } - + @Autowired + private ConfigProp configProp; public WeaResult> execute(Map requestInfoMap) { @@ -80,18 +82,24 @@ 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(I18nContextUtil.getBean(Environment.class).getProperty("htemail.htgroup")).trim(); +// port = Util.null2String(I18nContextUtil.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(I18nContextUtil.getBean(Environment.class).getProperty("htemail.htgd")).trim(); +// port = Util.null2String(I18nContextUtil.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(I18nContextUtil.getBean(Environment.class).getProperty("htemail.guangdao")).trim(); +// port = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htemail.guangdaoport")).trim(); + emailIP = configProp.getGuangdao(); + port = configProp.getGuangdaoport(); } } if (name.equals("YWLX")) { 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 30dc7f6..19d667a 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 @@ -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 EasTzlhtApplyResult extends BaseBean { private static final Logger logger_4b97b171 = LoggerFactory.getLogger(EasTzlhtApplyResult.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.getTzlhtApplyResultUrl")).trim(); +// String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("hteasoasync.getTzlhtApplyResultUrl")).trim(); + String url = configProp.getGetTzlhtApplyResultUrl(); logger_4b97b171.info(String.valueOf("EasTzlhtApplyResult---url=" + url)); post = new HttpPost(url); post.setHeader(HTTP.CONTENT_TYPE, "application/json; charset=UTF-8"); @@ -36,7 +40,8 @@ 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(I18nContextUtil.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); HttpResponse response = client.execute(post); 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 91f398b..ffed5ce 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 @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.weaver.seconddev.interfaces.oames.ReturnMesWLPS_SYService; import com.weaver.seconddev.interfaces.oames.SI_OA_HTOAApproFlowSync_OUTServiceStub; +import com.weaver.seconddev.interfaces.prop.ConfigProp; import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; import java.util.HashMap; import java.util.Map; @@ -36,7 +37,8 @@ public class GJB_DeliveryApproveAction extends BaseBean implements Action, EsbSe // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; - + @Autowired + private ConfigProp configProp; private static final Logger logger_8ffb7f70 = LoggerFactory.getLogger(GJB_DeliveryApproveAction.class); @Override 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 bb67616..c74e731 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 @@ -1,6 +1,7 @@ package com.weaver.seconddev.interfaces.workflow.action; import com.weaver.seconddev.interfaces.htjt.util.LogUtil; +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; @@ -45,7 +46,8 @@ public class ISO_FilePermissionAction extends BaseBean implements Action, EsbSer // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; - + @Autowired + private ConfigProp configProp; private static final Logger logger_8728ce5a = LoggerFactory.getLogger(ISO_FilePermissionAction.class); @Override @@ -137,7 +139,8 @@ 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(I18nContextUtil.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/SendPostRequest_PO.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SendPostRequest_PO.java index 3f991f6..c269df1 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 @@ -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; @@ -19,7 +21,8 @@ import com.weaver.verupgrade.general.Util; public class SendPostRequest_PO extends BaseBean { private static final Logger logger_8469796 = LoggerFactory.getLogger(SendPostRequest_PO.class); - + @Autowired + private ConfigProp configProp; public String getResult(JSONObject returnJson, String url) { HttpPost post = null; String result = "E"; @@ -30,7 +33,9 @@ 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(I18nContextUtil.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); HttpResponse response = client.execute(post); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/XZ_FKYYApproveAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/XZ_FKYYApproveAction.java index f8c77ce..daf8ac5 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/XZ_FKYYApproveAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/XZ_FKYYApproveAction.java @@ -1,238 +1,240 @@ -package com.weaver.seconddev.interfaces.workflow.action; +// 废弃不需要改造 -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; -import java.util.HashMap; -import java.util.Map; -import com.weaver.common.i18n.tool.util.I18nContextUtil; -import org.springframework.core.env.Environment; -import java.lang.*; -import java.util.*; -import com.weaver.verupgrade.workflow.request.RequestManager; -import com.weaver.esb.api.rpc.EsbServerlessRpcRemoteInterface; -import com.weaver.common.base.entity.result.WeaResult; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import com.weaver.verupgrade.soa.workflow.request.RequestInfo; -import com.weaver.verupgrade.general.BaseBean; -import com.weaver.verupgrade.general.Util; -import com.weaver.verupgrade.hrm.resource.ResourceComInfo; -import com.weaver.verupgrade.soa.workflow.request.*; -import com.weaver.verupgrade.soa.workflow.request.Property; -import com.weaver.verupgrade.soa.workflow.request.DetailTable; -import com.weaver.verupgrade.soa.workflow.request.Row; -import com.weaver.verupgrade.soa.workflow.request.Cell; -import com.weaver.verupgrade.interfaces.workflow.action.Action; - -/** - * 访客邀约系统审批返回 - */ -@org.springframework.stereotype.Service("workflow_action_XZ_FKYYApproveAction") -public class XZ_FKYYApproveAction extends BaseBean implements Action, EsbServerlessRpcRemoteInterface { - - // 对应E9的请求信息对象 - @Autowired - private RequestInfo requestInfoTemp; - - private static final Logger logger_a4ff2ce0 = LoggerFactory.getLogger(XZ_FKYYApproveAction.class); - - @Override - public WeaResult> execute(Map requestInfoMap) { - Map weaverResultMap = new HashMap<>(); - Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1))); - Long userIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("userid", -1))); - RequestInfo requestInfo = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp); - try { - /** - * 请求ID* - */ - String requestID = ""; - try { - ResourceComInfo hr = I18nContextUtil.getBean(ResourceComInfo.class); - BillFieldUtil unit = new BillFieldUtil(); - // 工作流ID - String workFlowId = requestInfo.getWorkflowid(); - Property[] properties = requestInfo.getMainTableInfo().getProperty(); - requestID = requestInfo.getRequestid(); - logger_a4ff2ce0.info(String.valueOf("XZ_FKYYApproveAction--start--" + requestID)); - Map mMap = new HashMap(); - for (int i = 0; i < properties.length; i++) { - String name = properties[i].getName().toUpperCase(); - String value = Util.null2String(properties[i].getValue()); - mMap.put(name, value); - } - JSONObject mJson = new JSONObject(); - // 申请人 - String sqr = mMap.get("SQR"); - String sqrcode = ""; - String sqrname = ""; - if (!sqr.equals("")) { - // 申请人工号 - sqrcode = unit.getWorkcode(sqr); - // 申请人姓名 - sqrname = hr.getResourcename(sqr); - } - // 申请人 - mJson.put("applyName", sqrname); - String sqdw = mMap.get("SQDW"); - String sqdwname = unit.getSubcompanyname(sqdw); - // 申请单位 - mJson.put("applyCompany", sqdwname); - String sqbm = mMap.get("SQBM"); - String sqbmname = unit.getDepartmentname(sqbm); - // 申请部门 - mJson.put("applyDepartment", sqbmname); - // 申请日期 - mJson.put("applyDate", mMap.get("SQRQ")); - String qwyq = mMap.get("QWYQ"); - String qwyqName = unit.getselectNameByCol("qwyq", workFlowId, qwyq); - // 前往园区 - mJson.put("purpose", qwyqName); - // 对接人 - String djr = mMap.get("DJRXM"); - String djrcode = ""; - String djrname = ""; - if (!djr.equals("")) { - // 对接人工号 - djrcode = unit.getWorkcode(djr); - // 对接人姓名 - djrname = hr.getResourcename(djr); - } - // 对接人姓名 - mJson.put("receptionName", djrname); - String djrdw = mMap.get("DJRDW"); - String djrdwname = unit.getSubcompanyname(djrdw); - // 对接单位 - mJson.put("receptionCompany", djrdwname); - // 对接人联系电话 - mJson.put("receptionContact", mMap.get("DJRLXDH")); - String djrbm = mMap.get("DJRBM"); - String djrbmname = unit.getDepartmentname(djrbm); - // 对接人部门 - mJson.put("receptionDepartment", djrbmname); - String djk = mMap.get("DJK"); - String djkname = unit.getselectNameByCol("djk", workFlowId, djk); - String name = ""; - String address = ""; - // if(djkname.contains("(")&&djkname.contains(")")){ - // name = djkname.substring(0,djkname.indexOf("(")); - // address = djkname.substring(djkname.indexOf("("),djkname.indexOf(")")); - // }else{ - // name = djkname; - // } - if (djkname.contains("/")) { - name = djkname.substring(0, djkname.lastIndexOf("/")); - address = djkname.substring(djkname.lastIndexOf("/") + 1); - } else { - name = djkname; - } - // 登记口 - mJson.put("registration", name); - // 登记口具体地址 - mJson.put("registrationAddress", address); - // 备注 - mJson.put("remark", mMap.get("BZ")); - // 标题 - mJson.put("title", ""); - // 流程编号 - mJson.put("visitorCode", mMap.get("LCBH")); - // 访客单位全称 - mJson.put("visitorCompany", mMap.get("FKDWQC")); - // 访客人数 - mJson.put("visitorNumber", mMap.get("FKRS")); - // 来访事由 - mJson.put("visitorReason", mMap.get("LFSY")); - mJson.put("requestId", requestID); - logger_a4ff2ce0.info(String.valueOf("明细表开始取值")); - DetailTable[] detailtable = requestInfo.getDetailTableInfo().getDetailTable(); - // ===========凭证明细==============// - DetailTable dtq = detailtable[0]; - Row[] sq = dtq.getRow(); - JSONArray visitorsPeopleArr = new JSONArray(); - for (int j = 0; j < sq.length; j++) { - // 指定行 - Row rq = sq[j]; - // 每行数据再按列存储 - Cell[] cq = rq.getCell(); - JSONObject item = new JSONObject(); - Map mDetailMap = new HashMap(); - for (int k = 0; k < cq.length; k++) { - // 指定列 - Cell cq1 = cq[k]; - // 明细字段名称 - String nameq = cq1.getName().toUpperCase(); - String valueq = Util.null2String(cq1.getValue()); - mDetailMap.put(nameq, valueq); - } - // 姓名 - item.put("visitorName", mDetailMap.get("XM")); - // 联系电话 - item.put("visitorContant", mDetailMap.get("LXDH")); - // 预计入园时间 - item.put("estimatedInTime", mDetailMap.get("YJRYRQ") + " " + mDetailMap.get("YJRYSJ") + ":00"); - // 预计离开时间 - item.put("estimatedOutTime", mDetailMap.get("YJLKRQ") + " " + mDetailMap.get("YJLKSJ") + ":00"); - // 车辆 - item.put("licensePlateNumber", mDetailMap.get("CPH")); - visitorsPeopleArr.add(item); - } - mJson.put("visitorsPeopleList", visitorsPeopleArr); - logger_a4ff2ce0.info(String.valueOf("获取明细表数据结束")); - writeLog("调用访客系统接口请求数据：=====" + mJson.toString()); - // 调用接口 - String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htfkxtoasync.creathtvisitorapply")).trim(); - ZZ_SendPostRequest mGetResult = new ZZ_SendPostRequest(); - String result = mGetResult.getResult(mJson, url); - logger_a4ff2ce0.info(String.valueOf("调用访客系统接口请求数据：" + result)); - if (!"E".equals(result)) { - JSONObject jsonObject = JSONObject.parseObject(result); - // 接口处理状态 1-成功，0-失败 - String isTat = jsonObject.getString("code"); - // 处理消息 - String srMessage = jsonObject.getString("message"); - writeLog("访客系统返回数据：" + jsonObject.toString()); - if (!"1".equals(isTat)) { - // 失败 - logger_a4ff2ce0.info(String.valueOf("访客系统返回错误信息：" + srMessage)); - // requestInfo.getRequestManager().setMessageid("ERROR"); - requestInfo.getRequestManager().setMessagecontent("访客系统返回错误信息：" + srMessage); - return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, requestInfo.getRequestManager())); - } - } else { - logger_a4ff2ce0.info(String.valueOf("调用访客系统接口返回失败，请联系访客系统管理员！")); - // requestInfo.getRequestManager().setMessageid("ERROR"); - requestInfo.getRequestManager().setMessagecontent("调用访客系统接口返回失败，请联系访客系统管理员！"); - return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, requestInfo.getRequestManager())); - } - } catch (Exception e) { - logger_a4ff2ce0.info(String.valueOf("提交失败！")); - logger_a4ff2ce0.info(String.valueOf("Error======" + e.getMessage())); - // requestInfo.getRequestManager().setMessageid("ERROR"); - requestInfo.getRequestManager().setMessagecontent("提交失败！"); - return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, requestInfo.getRequestManager())); - } - return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, requestInfo.getRequestManager())); - } catch (Exception e) { - e.printStackTrace(); - logger_a4ff2ce0.error("XZ_FKYYApproveAction e: {}", e.getMessage()); - return WeaResult.success(getResultMapForAction(weaverResultMap, "result", WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), requestInfo.getRequestManager())), requestInfo.getRequestManager())); - } - } - - Map getResultMapForAction(Map map, String key, Object value, RequestManager requestManager) { - if (key != null && !key.isEmpty()) { - map.put(key, value); - } - String msgContent = requestManager.getMessagecontent(); - if (msgContent != null && !msgContent.isEmpty()) { - map.put("msgContent", msgContent); - } - String msgId = requestManager.getMessageid(); - if (msgId != null && !msgId.isEmpty()) { - map.put("msgId", msgId); - } - return map; - } -} +//package com.weaver.seconddev.interfaces.workflow.action; +// +//import com.alibaba.fastjson.JSONArray; +//import com.alibaba.fastjson.JSONObject; +//import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; +//import java.util.HashMap; +//import java.util.Map; +//import com.weaver.common.i18n.tool.util.I18nContextUtil; +//import org.springframework.core.env.Environment; +//import java.lang.*; +//import java.util.*; +//import com.weaver.verupgrade.workflow.request.RequestManager; +//import com.weaver.esb.api.rpc.EsbServerlessRpcRemoteInterface; +//import com.weaver.common.base.entity.result.WeaResult; +//import org.slf4j.Logger; +//import org.slf4j.LoggerFactory; +//import org.springframework.beans.factory.annotation.Autowired; +//import com.weaver.verupgrade.soa.workflow.request.RequestInfo; +//import com.weaver.verupgrade.general.BaseBean; +//import com.weaver.verupgrade.general.Util; +//import com.weaver.verupgrade.hrm.resource.ResourceComInfo; +//import com.weaver.verupgrade.soa.workflow.request.*; +//import com.weaver.verupgrade.soa.workflow.request.Property; +//import com.weaver.verupgrade.soa.workflow.request.DetailTable; +//import com.weaver.verupgrade.soa.workflow.request.Row; +//import com.weaver.verupgrade.soa.workflow.request.Cell; +//import com.weaver.verupgrade.interfaces.workflow.action.Action; +// +///** +// * 访客邀约系统审批返回 +// */ +//@org.springframework.stereotype.Service("workflow_action_XZ_FKYYApproveAction") +//public class XZ_FKYYApproveAction extends BaseBean implements Action, EsbServerlessRpcRemoteInterface { +// +// // 对应E9的请求信息对象 +// @Autowired +// private RequestInfo requestInfoTemp; +// +// private static final Logger logger_a4ff2ce0 = LoggerFactory.getLogger(XZ_FKYYApproveAction.class); +// +// @Override +// public WeaResult> execute(Map requestInfoMap) { +// Map weaverResultMap = new HashMap<>(); +// Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1))); +// Long userIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("userid", -1))); +// RequestInfo requestInfo = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp); +// try { +// /** +// * 请求ID* +// */ +// String requestID = ""; +// try { +// ResourceComInfo hr = I18nContextUtil.getBean(ResourceComInfo.class); +// BillFieldUtil unit = new BillFieldUtil(); +// // 工作流ID +// String workFlowId = requestInfo.getWorkflowid(); +// Property[] properties = requestInfo.getMainTableInfo().getProperty(); +// requestID = requestInfo.getRequestid(); +// logger_a4ff2ce0.info(String.valueOf("XZ_FKYYApproveAction--start--" + requestID)); +// Map mMap = new HashMap(); +// for (int i = 0; i < properties.length; i++) { +// String name = properties[i].getName().toUpperCase(); +// String value = Util.null2String(properties[i].getValue()); +// mMap.put(name, value); +// } +// JSONObject mJson = new JSONObject(); +// // 申请人 +// String sqr = mMap.get("SQR"); +// String sqrcode = ""; +// String sqrname = ""; +// if (!sqr.equals("")) { +// // 申请人工号 +// sqrcode = unit.getWorkcode(sqr); +// // 申请人姓名 +// sqrname = hr.getResourcename(sqr); +// } +// // 申请人 +// mJson.put("applyName", sqrname); +// String sqdw = mMap.get("SQDW"); +// String sqdwname = unit.getSubcompanyname(sqdw); +// // 申请单位 +// mJson.put("applyCompany", sqdwname); +// String sqbm = mMap.get("SQBM"); +// String sqbmname = unit.getDepartmentname(sqbm); +// // 申请部门 +// mJson.put("applyDepartment", sqbmname); +// // 申请日期 +// mJson.put("applyDate", mMap.get("SQRQ")); +// String qwyq = mMap.get("QWYQ"); +// String qwyqName = unit.getselectNameByCol("qwyq", workFlowId, qwyq); +// // 前往园区 +// mJson.put("purpose", qwyqName); +// // 对接人 +// String djr = mMap.get("DJRXM"); +// String djrcode = ""; +// String djrname = ""; +// if (!djr.equals("")) { +// // 对接人工号 +// djrcode = unit.getWorkcode(djr); +// // 对接人姓名 +// djrname = hr.getResourcename(djr); +// } +// // 对接人姓名 +// mJson.put("receptionName", djrname); +// String djrdw = mMap.get("DJRDW"); +// String djrdwname = unit.getSubcompanyname(djrdw); +// // 对接单位 +// mJson.put("receptionCompany", djrdwname); +// // 对接人联系电话 +// mJson.put("receptionContact", mMap.get("DJRLXDH")); +// String djrbm = mMap.get("DJRBM"); +// String djrbmname = unit.getDepartmentname(djrbm); +// // 对接人部门 +// mJson.put("receptionDepartment", djrbmname); +// String djk = mMap.get("DJK"); +// String djkname = unit.getselectNameByCol("djk", workFlowId, djk); +// String name = ""; +// String address = ""; +// // if(djkname.contains("(")&&djkname.contains(")")){ +// // name = djkname.substring(0,djkname.indexOf("(")); +// // address = djkname.substring(djkname.indexOf("("),djkname.indexOf(")")); +// // }else{ +// // name = djkname; +// // } +// if (djkname.contains("/")) { +// name = djkname.substring(0, djkname.lastIndexOf("/")); +// address = djkname.substring(djkname.lastIndexOf("/") + 1); +// } else { +// name = djkname; +// } +// // 登记口 +// mJson.put("registration", name); +// // 登记口具体地址 +// mJson.put("registrationAddress", address); +// // 备注 +// mJson.put("remark", mMap.get("BZ")); +// // 标题 +// mJson.put("title", ""); +// // 流程编号 +// mJson.put("visitorCode", mMap.get("LCBH")); +// // 访客单位全称 +// mJson.put("visitorCompany", mMap.get("FKDWQC")); +// // 访客人数 +// mJson.put("visitorNumber", mMap.get("FKRS")); +// // 来访事由 +// mJson.put("visitorReason", mMap.get("LFSY")); +// mJson.put("requestId", requestID); +// logger_a4ff2ce0.info(String.valueOf("明细表开始取值")); +// DetailTable[] detailtable = requestInfo.getDetailTableInfo().getDetailTable(); +// // ===========凭证明细==============// +// DetailTable dtq = detailtable[0]; +// Row[] sq = dtq.getRow(); +// JSONArray visitorsPeopleArr = new JSONArray(); +// for (int j = 0; j < sq.length; j++) { +// // 指定行 +// Row rq = sq[j]; +// // 每行数据再按列存储 +// Cell[] cq = rq.getCell(); +// JSONObject item = new JSONObject(); +// Map mDetailMap = new HashMap(); +// for (int k = 0; k < cq.length; k++) { +// // 指定列 +// Cell cq1 = cq[k]; +// // 明细字段名称 +// String nameq = cq1.getName().toUpperCase(); +// String valueq = Util.null2String(cq1.getValue()); +// mDetailMap.put(nameq, valueq); +// } +// // 姓名 +// item.put("visitorName", mDetailMap.get("XM")); +// // 联系电话 +// item.put("visitorContant", mDetailMap.get("LXDH")); +// // 预计入园时间 +// item.put("estimatedInTime", mDetailMap.get("YJRYRQ") + " " + mDetailMap.get("YJRYSJ") + ":00"); +// // 预计离开时间 +// item.put("estimatedOutTime", mDetailMap.get("YJLKRQ") + " " + mDetailMap.get("YJLKSJ") + ":00"); +// // 车辆 +// item.put("licensePlateNumber", mDetailMap.get("CPH")); +// visitorsPeopleArr.add(item); +// } +// mJson.put("visitorsPeopleList", visitorsPeopleArr); +// logger_a4ff2ce0.info(String.valueOf("获取明细表数据结束")); +// writeLog("调用访客系统接口请求数据：=====" + mJson.toString()); +// // 调用接口 +// String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htfkxtoasync.creathtvisitorapply")).trim(); +// ZZ_SendPostRequest mGetResult = new ZZ_SendPostRequest(); +// String result = mGetResult.getResult(mJson, url); +// logger_a4ff2ce0.info(String.valueOf("调用访客系统接口请求数据：" + result)); +// if (!"E".equals(result)) { +// JSONObject jsonObject = JSONObject.parseObject(result); +// // 接口处理状态 1-成功，0-失败 +// String isTat = jsonObject.getString("code"); +// // 处理消息 +// String srMessage = jsonObject.getString("message"); +// writeLog("访客系统返回数据：" + jsonObject.toString()); +// if (!"1".equals(isTat)) { +// // 失败 +// logger_a4ff2ce0.info(String.valueOf("访客系统返回错误信息：" + srMessage)); +// // requestInfo.getRequestManager().setMessageid("ERROR"); +// requestInfo.getRequestManager().setMessagecontent("访客系统返回错误信息：" + srMessage); +// return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, requestInfo.getRequestManager())); +// } +// } else { +// logger_a4ff2ce0.info(String.valueOf("调用访客系统接口返回失败，请联系访客系统管理员！")); +// // requestInfo.getRequestManager().setMessageid("ERROR"); +// requestInfo.getRequestManager().setMessagecontent("调用访客系统接口返回失败，请联系访客系统管理员！"); +// return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, requestInfo.getRequestManager())); +// } +// } catch (Exception e) { +// logger_a4ff2ce0.info(String.valueOf("提交失败！")); +// logger_a4ff2ce0.info(String.valueOf("Error======" + e.getMessage())); +// // requestInfo.getRequestManager().setMessageid("ERROR"); +// requestInfo.getRequestManager().setMessagecontent("提交失败！"); +// return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, requestInfo.getRequestManager())); +// } +// return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, requestInfo.getRequestManager())); +// } catch (Exception e) { +// e.printStackTrace(); +// logger_a4ff2ce0.error("XZ_FKYYApproveAction e: {}", e.getMessage()); +// return WeaResult.success(getResultMapForAction(weaverResultMap, "result", WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), requestInfo.getRequestManager())), requestInfo.getRequestManager())); +// } +// } +// +// Map getResultMapForAction(Map map, String key, Object value, RequestManager requestManager) { +// if (key != null && !key.isEmpty()) { +// map.put(key, value); +// } +// String msgContent = requestManager.getMessagecontent(); +// if (msgContent != null && !msgContent.isEmpty()) { +// map.put("msgContent", msgContent); +// } +// String msgId = requestManager.getMessageid(); +// if (msgId != null && !msgId.isEmpty()) { +// map.put("msgId", msgId); +// } +// return map; +// } +//} 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 15056a7..cde9f19 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 @@ -10,6 +10,7 @@ import java.math.*; import com.alibaba.fastjson.JSON; import com.weaver.seconddev.interfaces.htjt.util.LogUtil; import com.weaver.seconddev.interfaces.htjt.util.TransUtil; +import com.weaver.seconddev.interfaces.prop.ConfigProp; import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; import com.weaver.common.i18n.tool.util.I18nContextUtil; import com.weaver.verupgrade.conn.CONN_TYPE; @@ -44,6 +45,8 @@ import com.weaver.verupgrade.conn.RecordSet; @org.springframework.stereotype.Service("workflow_action_ZOA_MM_PR_CREATE_YFFY_ZjAction") public class ZOA_MM_PR_CREATE_YFFY_ZjAction extends BaseBean implements Action, EsbServerlessRpcRemoteInterface { + @Autowired + private ConfigProp configProp; // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; @@ -71,7 +74,8 @@ 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 = I18nContextUtil.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 7c3d95f..eaf09d0 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 @@ -3,6 +3,7 @@ package com.weaver.seconddev.interfaces.workflow.action; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.weaver.seconddev.interfaces.prop.ConfigProp; import corp.openapicalls.contract.setapproval.request.PassengerDetail; import com.weaver.seconddev.interfaces.htjt.util.LogUtil; import com.weaver.seconddev.interfaces.htjt.util.WebApi; @@ -53,7 +54,8 @@ public class ZOA_SL_GNCC_Action extends BaseBean implements Action, EsbServerles // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; - + @Autowired + private ConfigProp configProp; private static final Logger logger_5e8d517a = LoggerFactory.getLogger(ZOA_SL_GNCC_Action.class); // E就是否 是否传商旅 @@ -558,7 +560,8 @@ 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 = I18nContextUtil.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/ZOA_SL_GN_Action.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GN_Action.java index 1cafcc2..a0619ea 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 @@ -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; @@ -41,7 +42,8 @@ public class ZOA_SL_GN_Action extends BaseBean implements Action, EsbServerlessR // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; - + @Autowired + private ConfigProp configProp; private static final Logger logger_92c3db1a = LoggerFactory.getLogger(ZOA_SL_GN_Action.class); public WeaResult> execute(Map requestInfoMap) { @@ -441,7 +443,8 @@ 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 = I18nContextUtil.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/ZOA_SL_GWCC_Action.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GWCC_Action.java index b3a7d24..2dc1caf 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 @@ -3,6 +3,7 @@ package com.weaver.seconddev.interfaces.workflow.action; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.weaver.seconddev.interfaces.prop.ConfigProp; import corp.openapicalls.contract.setapproval.request.PassengerDetail; import com.weaver.seconddev.interfaces.htjt.util.LogUtil ; import com.weaver.seconddev.interfaces.htjt.util.WebApi; @@ -55,7 +56,8 @@ public class ZOA_SL_GWCC_Action extends BaseBean implements Action, EsbServerles // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; - + @Autowired + private ConfigProp configProp; private static final Logger logger_f5224b91 = LoggerFactory.getLogger(ZOA_SL_GWCC_Action.class); public WeaResult> execute(Map requestInfoMap) { @@ -570,7 +572,8 @@ 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 = I18nContextUtil.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 51258b9..21074c5 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 @@ -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.*; @@ -41,7 +42,8 @@ public class ZWZX_CG_FileUploadAction extends BaseBean implements Action, EsbSer // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; - + @Autowired + private ConfigProp configProp; private static final Logger logger_323752e9 = LoggerFactory.getLogger(ZWZX_CG_FileUploadAction.class); @Override @@ -64,9 +66,11 @@ public class ZWZX_CG_FileUploadAction extends BaseBean implements Action, EsbSer */ String ITFID = "HTEFS001"; // 接口账号 - String USERNAME = I18nContextUtil.getBean(Environment.class).getProperty("htsysjcmt.efsaccount"); +// String USERNAME = I18nContextUtil.getBean(Environment.class).getProperty("htsysjcmt.efsaccount"); + String USERNAME = configProp.getEfsaccount(); // 接口密码 - String PASSWORD = I18nContextUtil.getBean(Environment.class).getProperty("htsysjcmt.efspassword"); +// String PASSWORD = I18nContextUtil.getBean(Environment.class).getProperty("htsysjcmt.efspassword"); + String PASSWORD = configProp.getEfspassword(); // 业务属性 0-未分类 String businessTag = "0"; // //业务类型 1: 费用类 2; 采购类---1,2是针对报账系统的 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 3d4f397..a3bdcc2 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 @@ -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.*; @@ -44,7 +45,8 @@ public class ZZ_Ten_GDFileUploadAction extends BaseBean implements Action, EsbSe // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; - + @Autowired + private ConfigProp configProp; private static final Logger logger_8ab26152 = LoggerFactory.getLogger(ZZ_Ten_GDFileUploadAction.class); @Override @@ -242,7 +244,8 @@ public class ZZ_Ten_GDFileUploadAction extends BaseBean implements Action, EsbSe mJson.put("snVOList", new JSONArray()); writeLog("调用总账归档附件上传接口请求数据：=====" + mJson.toString()); // 调用接口 - String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("hteasoasync.uploadZZInfoUrl")).trim(); +// String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("hteasoasync.uploadZZInfoUrl")).trim(); + String url = configProp.getUploadZZInfoUrl(); ZZ_SendPostRequest mGetResult = new ZZ_SendPostRequest(); String result = mGetResult.getResult(mJson, url); logger_8ab26152.info(String.valueOf("调用总账归档附件上传接口返回值：" + result));