config 配置文件修改all

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 {
+
+
+}

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 {
+
+
+}

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 {
+
+
+}

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 {
+
+
+}

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 {
+
+
+}

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 {
+
+
+}

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 {
+
+
+}

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 {
+
+
+}

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 {
+
+
+}

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 {
+
+
+}

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 {
+
+
+}

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 {
+
+
+}

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 {
+
+
+}

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 {
+
+
+}

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 {
+
+
+}

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.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.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();

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.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.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();

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.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.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();

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.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.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);

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);

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.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.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);

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.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.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;
 	}

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);

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.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.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();

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);

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);

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);

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<String, String> 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<String, String> map = new HashMap<String, String>();
 		try {
 			logger_a44d19bf.info(String.valueOf("GiftQtyService--start"));

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);

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");
+		//TODO config
-		String appsecurity = I18nContextUtil.getBean(Environment.class).getProperty("htctripmt.appsecurity");
+//		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() + "";

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"));

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.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.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);

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 url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htpmoasync.projectConclusion")).trim();
-            String account = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htpmoasync.account")).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 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");

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;
 
-    /**
+    @Value("${CreateBilling}")
-     * easoa
+    private String CreateBilling;
-     */
+
-    //CallEasServices
+    @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;
 

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);

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);
 		// 设置传入参数

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);
 		// 设置传入参数

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.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.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);

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<String, Object> 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 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 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 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;

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 username = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htsloasync.UserName")).trim();
-		String key = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htsloasync.Key")).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();

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 url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htcrmoasync.CreateBilling")).trim();
-                String appkey = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htcrmoasync.appkey")).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");

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)) {

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)) {

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<Map<String, Object>> execute(Map<String, Object> 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();
+//                            emailIP = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htemail.htgroup")).trim();
-                            port = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htemail.htgroupport")).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();
+//                            emailIP = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htemail.htgd")).trim();
-                            port = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htemail.htgdport")).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();
+//                            emailIP = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htemail.guangdao")).trim();
-                            port = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htemail.guangdaoport")).trim();
+//                            port = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htemail.guangdaoport")).trim();
+                            emailIP = configProp.getGuangdao();
+                            port = configProp.getGuangdaoport();
                         }
                     }
                     if (name.equals("YWLX")) {

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);

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

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);

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);

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;
+//package com.weaver.seconddev.interfaces.workflow.action;
-import com.alibaba.fastjson.JSONObject;
+//
-import  com.weaver.seconddev.interfaces.swfa.BillFieldUtil;
+//import com.alibaba.fastjson.JSONArray;
-import java.util.HashMap;
+//import com.alibaba.fastjson.JSONObject;
-import java.util.Map;
+//import  com.weaver.seconddev.interfaces.swfa.BillFieldUtil;
-import com.weaver.common.i18n.tool.util.I18nContextUtil;
+//import java.util.HashMap;
-import org.springframework.core.env.Environment;
+//import java.util.Map;
-import java.lang.*;
+//import com.weaver.common.i18n.tool.util.I18nContextUtil;
-import java.util.*;
+//import org.springframework.core.env.Environment;
-import com.weaver.verupgrade.workflow.request.RequestManager;
+//import java.lang.*;
-import com.weaver.esb.api.rpc.EsbServerlessRpcRemoteInterface;
+//import java.util.*;
-import com.weaver.common.base.entity.result.WeaResult;
+//import com.weaver.verupgrade.workflow.request.RequestManager;
-import org.slf4j.Logger;
+//import com.weaver.esb.api.rpc.EsbServerlessRpcRemoteInterface;
-import org.slf4j.LoggerFactory;
+//import com.weaver.common.base.entity.result.WeaResult;
-import org.springframework.beans.factory.annotation.Autowired;
+//import org.slf4j.Logger;
-import com.weaver.verupgrade.soa.workflow.request.RequestInfo;
+//import org.slf4j.LoggerFactory;
-import com.weaver.verupgrade.general.BaseBean;
+//import org.springframework.beans.factory.annotation.Autowired;
-import com.weaver.verupgrade.general.Util;
+//import com.weaver.verupgrade.soa.workflow.request.RequestInfo;
-import com.weaver.verupgrade.hrm.resource.ResourceComInfo;
+//import com.weaver.verupgrade.general.BaseBean;
-import com.weaver.verupgrade.soa.workflow.request.*;
+//import com.weaver.verupgrade.general.Util;
-import com.weaver.verupgrade.soa.workflow.request.Property;
+//import com.weaver.verupgrade.hrm.resource.ResourceComInfo;
-import com.weaver.verupgrade.soa.workflow.request.DetailTable;
+//import com.weaver.verupgrade.soa.workflow.request.*;
-import com.weaver.verupgrade.soa.workflow.request.Row;
+//import com.weaver.verupgrade.soa.workflow.request.Property;
-import com.weaver.verupgrade.soa.workflow.request.Cell;
+//import com.weaver.verupgrade.soa.workflow.request.DetailTable;
-import com.weaver.verupgrade.interfaces.workflow.action.Action;
+//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 {
+// */
-
+//@org.springframework.stereotype.Service("workflow_action_XZ_FKYYApproveAction")
-    // 对应E9的请求信息对象
+//public class XZ_FKYYApproveAction extends BaseBean implements Action, EsbServerlessRpcRemoteInterface {
-    @Autowired
+//
-    private RequestInfo requestInfoTemp;
+//    // 对应E9的请求信息对象
-
+//    @Autowired
-    private static final Logger logger_a4ff2ce0 = LoggerFactory.getLogger(XZ_FKYYApproveAction.class);
+//    private RequestInfo requestInfoTemp;
-
+//
-    @Override
+//    private static final Logger logger_a4ff2ce0 = LoggerFactory.getLogger(XZ_FKYYApproveAction.class);
-    public WeaResult<Map<String, Object>> execute(Map<String, Object> requestInfoMap) {
+//
-        Map<String, Object> weaverResultMap = new HashMap<>();
+//    @Override
-        Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1)));
+//    public WeaResult<Map<String, Object>> execute(Map<String, Object> requestInfoMap) {
-        Long userIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("userid", -1)));
+//        Map<String, Object> weaverResultMap = new HashMap<>();
-        RequestInfo requestInfo = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp);
+//        Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1)));
-        try {
+//        Long userIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("userid", -1)));
-            /**
+//        RequestInfo requestInfo = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp);
-             * 请求ID*
+//        try {
-             */
+//            /**
-            String requestID = "";
+//             * 请求ID*
-            try {
+//             */
-                ResourceComInfo hr = I18nContextUtil.getBean(ResourceComInfo.class);
+//            String requestID = "";
-                BillFieldUtil unit = new BillFieldUtil();
+//            try {
-                // 工作流ID
+//                ResourceComInfo hr = I18nContextUtil.getBean(ResourceComInfo.class);
-                String workFlowId = requestInfo.getWorkflowid();
+//                BillFieldUtil unit = new BillFieldUtil();
-                Property[] properties = requestInfo.getMainTableInfo().getProperty();
+//                // 工作流ID
-                requestID = requestInfo.getRequestid();
+//                String workFlowId = requestInfo.getWorkflowid();
-                logger_a4ff2ce0.info(String.valueOf("XZ_FKYYApproveAction--start--" + requestID));
+//                Property[] properties = requestInfo.getMainTableInfo().getProperty();
-                Map<String, String> mMap = new HashMap<String, String>();
+//                requestID = requestInfo.getRequestid();
-                for (int i = 0; i < properties.length; i++) {
+//                logger_a4ff2ce0.info(String.valueOf("XZ_FKYYApproveAction--start--" + requestID));
-                    String name = properties[i].getName().toUpperCase();
+//                Map<String, String> mMap = new HashMap<String, String>();
-                    String value = Util.null2String(properties[i].getValue());
+//                for (int i = 0; i < properties.length; i++) {
-                    mMap.put(name, value);
+//                    String name = properties[i].getName().toUpperCase();
-                }
+//                    String value = Util.null2String(properties[i].getValue());
-                JSONObject mJson = new JSONObject();
+//                    mMap.put(name, value);
-                // 申请人
+//                }
-                String sqr = mMap.get("SQR");
+//                JSONObject mJson = new JSONObject();
-                String sqrcode = "";
+//                // 申请人
-                String sqrname = "";
+//                String sqr = mMap.get("SQR");
-                if (!sqr.equals("")) {
+//                String sqrcode = "";
-                    // 申请人工号
+//                String sqrname = "";
-                    sqrcode = unit.getWorkcode(sqr);
+//                if (!sqr.equals("")) {
-                    // 申请人姓名
+//                    // 申请人工号
-                    sqrname = hr.getResourcename(sqr);
+//                    sqrcode = unit.getWorkcode(sqr);
-                }
+//                    // 申请人姓名
-                // 申请人
+//                    sqrname = hr.getResourcename(sqr);
-                mJson.put("applyName", sqrname);
+//                }
-                String sqdw = mMap.get("SQDW");
+//                // 申请人
-                String sqdwname = unit.getSubcompanyname(sqdw);
+//                mJson.put("applyName", sqrname);
-                // 申请单位
+//                String sqdw = mMap.get("SQDW");
-                mJson.put("applyCompany", sqdwname);
+//                String sqdwname = unit.getSubcompanyname(sqdw);
-                String sqbm = mMap.get("SQBM");
+//                // 申请单位
-                String sqbmname = unit.getDepartmentname(sqbm);
+//                mJson.put("applyCompany", sqdwname);
-                // 申请部门
+//                String sqbm = mMap.get("SQBM");
-                mJson.put("applyDepartment", sqbmname);
+//                String sqbmname = unit.getDepartmentname(sqbm);
-                // 申请日期
+//                // 申请部门
-                mJson.put("applyDate", mMap.get("SQRQ"));
+//                mJson.put("applyDepartment", sqbmname);
-                String qwyq = mMap.get("QWYQ");
+//                // 申请日期
-                String qwyqName = unit.getselectNameByCol("qwyq", workFlowId, qwyq);
+//                mJson.put("applyDate", mMap.get("SQRQ"));
-                // 前往园区
+//                String qwyq = mMap.get("QWYQ");
-                mJson.put("purpose", qwyqName);
+//                String qwyqName = unit.getselectNameByCol("qwyq", workFlowId, qwyq);
-                // 对接人
+//                // 前往园区
-                String djr = mMap.get("DJRXM");
+//                mJson.put("purpose", qwyqName);
-                String djrcode = "";
+//                // 对接人
-                String djrname = "";
+//                String djr = mMap.get("DJRXM");
-                if (!djr.equals("")) {
+//                String djrcode = "";
-                    // 对接人工号
+//                String djrname = "";
-                    djrcode = unit.getWorkcode(djr);
+//                if (!djr.equals("")) {
-                    // 对接人姓名
+//                    // 对接人工号
-                    djrname = hr.getResourcename(djr);
+//                    djrcode = unit.getWorkcode(djr);
-                }
+//                    // 对接人姓名
-                // 对接人姓名
+//                    djrname = hr.getResourcename(djr);
-                mJson.put("receptionName", djrname);
+//                }
-                String djrdw = mMap.get("DJRDW");
+//                // 对接人姓名
-                String djrdwname = unit.getSubcompanyname(djrdw);
+//                mJson.put("receptionName", djrname);
-                // 对接单位
+//                String djrdw = mMap.get("DJRDW");
-                mJson.put("receptionCompany", djrdwname);
+//                String djrdwname = unit.getSubcompanyname(djrdw);
-                // 对接人联系电话
+//                // 对接单位
-                mJson.put("receptionContact", mMap.get("DJRLXDH"));
+//                mJson.put("receptionCompany", djrdwname);
-                String djrbm = mMap.get("DJRBM");
+//                // 对接人联系电话
-                String djrbmname = unit.getDepartmentname(djrbm);
+//                mJson.put("receptionContact", mMap.get("DJRLXDH"));
-                // 对接人部门
+//                String djrbm = mMap.get("DJRBM");
-                mJson.put("receptionDepartment", djrbmname);
+//                String djrbmname = unit.getDepartmentname(djrbm);
-                String djk = mMap.get("DJK");
+//                // 对接人部门
-                String djkname = unit.getselectNameByCol("djk", workFlowId, djk);
+//                mJson.put("receptionDepartment", djrbmname);
-                String name = "";
+//                String djk = mMap.get("DJK");
-                String address = "";
+//                String djkname = unit.getselectNameByCol("djk", workFlowId, djk);
-                // if(djkname.contains("(")&&djkname.contains(")")){
+//                String name = "";
-                // name = djkname.substring(0,djkname.indexOf("("));
+//                String address = "";
-                // address = djkname.substring(djkname.indexOf("("),djkname.indexOf(")"));
+//                // if(djkname.contains("(")&&djkname.contains(")")){
-                // }else{
+//                // name = djkname.substring(0,djkname.indexOf("("));
-                // name = djkname;
+//                // address = djkname.substring(djkname.indexOf("("),djkname.indexOf(")"));
-                // }
+//                // }else{
-                if (djkname.contains("/")) {
+//                // name = djkname;
-                    name = djkname.substring(0, djkname.lastIndexOf("/"));
+//                // }
-                    address = djkname.substring(djkname.lastIndexOf("/") + 1);
+//                if (djkname.contains("/")) {
-                } else {
+//                    name = djkname.substring(0, djkname.lastIndexOf("/"));
-                    name = djkname;
+//                    address = djkname.substring(djkname.lastIndexOf("/") + 1);
-                }
+//                } else {
-                // 登记口
+//                    name = djkname;
-                mJson.put("registration", name);
+//                }
-                // 登记口具体地址
+//                // 登记口
-                mJson.put("registrationAddress", address);
+//                mJson.put("registration", name);
-                // 备注
+//                // 登记口具体地址
-                mJson.put("remark", mMap.get("BZ"));
+//                mJson.put("registrationAddress", address);
-                // 标题
+//                // 备注
-                mJson.put("title", "");
+//                mJson.put("remark", mMap.get("BZ"));
-                // 流程编号
+//                // 标题
-                mJson.put("visitorCode", mMap.get("LCBH"));
+//                mJson.put("title", "");
-                // 访客单位全称
+//                // 流程编号
-                mJson.put("visitorCompany", mMap.get("FKDWQC"));
+//                mJson.put("visitorCode", mMap.get("LCBH"));
-                // 访客人数
+//                // 访客单位全称
-                mJson.put("visitorNumber", mMap.get("FKRS"));
+//                mJson.put("visitorCompany", mMap.get("FKDWQC"));
-                // 来访事由
+//                // 访客人数
-                mJson.put("visitorReason", mMap.get("LFSY"));
+//                mJson.put("visitorNumber", mMap.get("FKRS"));
-                mJson.put("requestId", requestID);
+//                // 来访事由
-                logger_a4ff2ce0.info(String.valueOf("明细表开始取值"));
+//                mJson.put("visitorReason", mMap.get("LFSY"));
-                DetailTable[] detailtable = requestInfo.getDetailTableInfo().getDetailTable();
+//                mJson.put("requestId", requestID);
-                // ===========凭证明细==============//
+//                logger_a4ff2ce0.info(String.valueOf("明细表开始取值"));
-                DetailTable dtq = detailtable[0];
+//                DetailTable[] detailtable = requestInfo.getDetailTableInfo().getDetailTable();
-                Row[] sq = dtq.getRow();
+//                // ===========凭证明细==============//
-                JSONArray visitorsPeopleArr = new JSONArray();
+//                DetailTable dtq = detailtable[0];
-                for (int j = 0; j < sq.length; j++) {
+//                Row[] sq = dtq.getRow();
-                    // 指定行
+//                JSONArray visitorsPeopleArr = new JSONArray();
-                    Row rq = sq[j];
+//                for (int j = 0; j < sq.length; j++) {
-                    // 每行数据再按列存储
+//                    // 指定行
-                    Cell[] cq = rq.getCell();
+//                    Row rq = sq[j];
-                    JSONObject item = new JSONObject();
+//                    // 每行数据再按列存储
-                    Map<String, String> mDetailMap = new HashMap<String, String>();
+//                    Cell[] cq = rq.getCell();
-                    for (int k = 0; k < cq.length; k++) {
+//                    JSONObject item = new JSONObject();
-                        // 指定列
+//                    Map<String, String> mDetailMap = new HashMap<String, String>();
-                        Cell cq1 = cq[k];
+//                    for (int k = 0; k < cq.length; k++) {
-                        // 明细字段名称
+//                        // 指定列
-                        String nameq = cq1.getName().toUpperCase();
+//                        Cell cq1 = cq[k];
-                        String valueq = Util.null2String(cq1.getValue());
+//                        // 明细字段名称
-                        mDetailMap.put(nameq, valueq);
+//                        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("visitorName", mDetailMap.get("XM"));
-                    // 预计入园时间
+//                    // 联系电话
-                    item.put("estimatedInTime", mDetailMap.get("YJRYRQ") + " " + mDetailMap.get("YJRYSJ") + ":00");
+//                    item.put("visitorContant", mDetailMap.get("LXDH"));
-                    // 预计离开时间
+//                    // 预计入园时间
-                    item.put("estimatedOutTime", mDetailMap.get("YJLKRQ") + " " + mDetailMap.get("YJLKSJ") + ":00");
+//                    item.put("estimatedInTime", mDetailMap.get("YJRYRQ") + " " + mDetailMap.get("YJRYSJ") + ":00");
-                    // 车辆
+//                    // 预计离开时间
-                    item.put("licensePlateNumber", mDetailMap.get("CPH"));
+//                    item.put("estimatedOutTime", mDetailMap.get("YJLKRQ") + " " + mDetailMap.get("YJLKSJ") + ":00");
-                    visitorsPeopleArr.add(item);
+//                    // 车辆
-                }
+//                    item.put("licensePlateNumber", mDetailMap.get("CPH"));
-                mJson.put("visitorsPeopleList", visitorsPeopleArr);
+//                    visitorsPeopleArr.add(item);
-                logger_a4ff2ce0.info(String.valueOf("获取明细表数据结束"));
+//                }
-                writeLog("调用访客系统接口请求数据：=====" + mJson.toString());
+//                mJson.put("visitorsPeopleList", visitorsPeopleArr);
-                // 调用接口
+//                logger_a4ff2ce0.info(String.valueOf("获取明细表数据结束"));
-                String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htfkxtoasync.creathtvisitorapply")).trim();
+//                writeLog("调用访客系统接口请求数据：=====" + mJson.toString());
-                ZZ_SendPostRequest mGetResult = new ZZ_SendPostRequest();
+//                // 调用接口
-                String result = mGetResult.getResult(mJson, url);
+//                String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htfkxtoasync.creathtvisitorapply")).trim();
-                logger_a4ff2ce0.info(String.valueOf("调用访客系统接口请求数据：" + result));
+//                ZZ_SendPostRequest mGetResult = new ZZ_SendPostRequest();
-                if (!"E".equals(result)) {
+//                String result = mGetResult.getResult(mJson, url);
-                    JSONObject jsonObject = JSONObject.parseObject(result);
+//                logger_a4ff2ce0.info(String.valueOf("调用访客系统接口请求数据：" + result));
-                    // 接口处理状态 1-成功，0-失败
+//                if (!"E".equals(result)) {
-                    String isTat = jsonObject.getString("code");
+//                    JSONObject jsonObject = JSONObject.parseObject(result);
-                    // 处理消息
+//                    // 接口处理状态 1-成功，0-失败
-                    String srMessage = jsonObject.getString("message");
+//                    String isTat = jsonObject.getString("code");
-                    writeLog("访客系统返回数据：" + jsonObject.toString());
+//                    // 处理消息
-                    if (!"1".equals(isTat)) {
+//                    String srMessage = jsonObject.getString("message");
-                        // 失败
+//                    writeLog("访客系统返回数据：" + jsonObject.toString());
-                        logger_a4ff2ce0.info(String.valueOf("访客系统返回错误信息：" + srMessage));
+//                    if (!"1".equals(isTat)) {
-                        // requestInfo.getRequestManager().setMessageid("ERROR");
+//                        // 失败
-                        requestInfo.getRequestManager().setMessagecontent("访客系统返回错误信息：" + srMessage);
+//                        logger_a4ff2ce0.info(String.valueOf("访客系统返回错误信息：" + srMessage));
-                        return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, requestInfo.getRequestManager()));
+//                        // requestInfo.getRequestManager().setMessageid("ERROR");
-                    }
+//                        requestInfo.getRequestManager().setMessagecontent("访客系统返回错误信息：" + srMessage);
-                } else {
+//                        return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, requestInfo.getRequestManager()));
-                    logger_a4ff2ce0.info(String.valueOf("调用访客系统接口返回失败，请联系访客系统管理员！"));
+//                    }
-                    // requestInfo.getRequestManager().setMessageid("ERROR");
+//                } else {
-                    requestInfo.getRequestManager().setMessagecontent("调用访客系统接口返回失败，请联系访客系统管理员！");
+//                    logger_a4ff2ce0.info(String.valueOf("调用访客系统接口返回失败，请联系访客系统管理员！"));
-                    return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, requestInfo.getRequestManager()));
+//                    // requestInfo.getRequestManager().setMessageid("ERROR");
-                }
+//                    requestInfo.getRequestManager().setMessagecontent("调用访客系统接口返回失败，请联系访客系统管理员！");
-            } catch (Exception e) {
+//                    return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, requestInfo.getRequestManager()));
-                logger_a4ff2ce0.info(String.valueOf("提交失败！"));
+//                }
-                logger_a4ff2ce0.info(String.valueOf("Error======" + e.getMessage()));
+//            } catch (Exception e) {
-                // requestInfo.getRequestManager().setMessageid("ERROR");
+//                logger_a4ff2ce0.info(String.valueOf("提交失败！"));
-                requestInfo.getRequestManager().setMessagecontent("提交失败！");
+//                logger_a4ff2ce0.info(String.valueOf("Error======" + e.getMessage()));
-                return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, requestInfo.getRequestManager()));
+//                // requestInfo.getRequestManager().setMessageid("ERROR");
-            }
+//                requestInfo.getRequestManager().setMessagecontent("提交失败！");
-            return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, requestInfo.getRequestManager()));
+//                return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, requestInfo.getRequestManager()));
-        } catch (Exception e) {
+//            }
-            e.printStackTrace();
+//            return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, requestInfo.getRequestManager()));
-            logger_a4ff2ce0.error("XZ_FKYYApproveAction e: {}", e.getMessage());
+//        } catch (Exception e) {
-            return WeaResult.success(getResultMapForAction(weaverResultMap, "result", WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), requestInfo.getRequestManager())), requestInfo.getRequestManager()));
+//            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<String, Object> getResultMapForAction(Map<String, Object> map, String key, Object value, RequestManager requestManager) {
+//    }
-        if (key != null && !key.isEmpty()) {
+//
-            map.put(key, value);
+//    Map<String, Object> getResultMapForAction(Map<String, Object> map, String key, Object value, RequestManager requestManager) {
-        }
+//        if (key != null && !key.isEmpty()) {
-        String msgContent = requestManager.getMessagecontent();
+//            map.put(key, value);
-        if (msgContent != null && !msgContent.isEmpty()) {
+//        }
-            map.put("msgContent", msgContent);
+//        String msgContent = requestManager.getMessagecontent();
-        }
+//        if (msgContent != null && !msgContent.isEmpty()) {
-        String msgId = requestManager.getMessageid();
+//            map.put("msgContent", msgContent);
-        if (msgId != null && !msgId.isEmpty()) {
+//        }
-            map.put("msgId", msgId);
+//        String msgId = requestManager.getMessageid();
-        }
+//        if (msgId != null && !msgId.isEmpty()) {
-        return map;
+//            map.put("msgId", msgId);
-    }
+//        }
-}
+//        return map;
+//    }
+//}

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";
                 // 申请人

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 {

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<Map<String, Object>> execute(Map<String, Object> 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 {

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<Map<String, Object>> execute(Map<String, Object> 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 {

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是针对报账系统的

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));