Merge remote-tracking branch 'origin/ht' into ht

secondev-history-action/src/main/java/com/weaver/custom/configcenter/htcmsoasyncConfig.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-htcmsoasync.properties",
+                group = "DEFAULT_GROUP",
+                refresh = "true")
+})
+public class htcmsoasyncConfig {
+
+
+}

secondev-history-action/src/main/java/com/weaver/custom/configcenter/htxzsettingConfig.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-htxzsetting.properties",
+                group = "DEFAULT_GROUP",
+                refresh = "true")
+})
+public class htxzsettingConfig {
+
+
+}

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/prop/ConfigProp.java

@@ -10,6 +10,12 @@ import org.springframework.context.annotation.Configuration;
 @Configuration
 @RefreshScope
 public class ConfigProp {
+    @Value("${htcmsoasync-appKey}")
+    private String htcmsoasync_appKey;
+
+    @Value("${htcmsoasync-oaapproveresulturl}")
+    private String htcmsoasync_oaapproveresulturl;
+
 
     @Value("${srmbacklisturl}")
     private String srmbacklisturl;
@@ -71,6 +77,17 @@ public class ConfigProp {
     @Value("${easappkey}")
     private String easappkey;
 
+    @Value("${uploadDZDAApprovelUrl}")
+    private String uploadDZDAApprovelUrl;
+
+    @Value("${updatevoucherurl}")
+    private String updatevoucherurl;
+
+    @Value("${OA_Golden_Rewrite}")
+    private String OA_Golden_Rewrite;
+
+    @Value("${appKey}")
+    private String appKey;
 
     @Value("${isoresulturl}")
     private String isoresulturl;
@@ -118,6 +135,9 @@ public class ConfigProp {
     @Value("${A040WLPS}")
     private String A040WLPS;
 
+    @Value("${GDZG04OaAuditResult}")
+    private String GDZG04OaAuditResult;
+
     @Value("${po_user}")
     private String po_user;
 
@@ -222,6 +242,9 @@ public class ConfigProp {
     @Value("${bjdsp}")
     private String bjdsp;
 
+    @Value("${OaSrmVendorPunish}")
+    private String OaSrmVendorPunish;
+
     @Value("${wllynmg_url}")
     private String wllynmg_url;
 
@@ -248,6 +271,10 @@ public class ConfigProp {
     @Value("${htsrm_oa_venmatsextnew}")
     private String htsrm_oa_venmatsextnew;
 
+
+    @Value("${creator}")
+    private String creator;
+
     @Value("${weaver-secondev-htctripmt-appkey}")
     private String weaver_secondev_htctripmt_appkey;
 

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EAS_DZDAApproveAction.java

@@ -2,6 +2,7 @@ package com.weaver.seconddev.interfaces.workflow.action;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.weaver.seconddev.interfaces.prop.ConfigProp;
 import  com.weaver.seconddev.interfaces.swfa.BillFieldUtil;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -42,7 +43,8 @@ public class EAS_DZDAApproveAction extends BaseBean implements Action, EsbServer
     // 对应E9的请求信息对象
     @Autowired
     private RequestInfo requestInfoTemp;
-
+    @Autowired
+    private ConfigProp configProp;
     private static final Logger logger_3f787449 = LoggerFactory.getLogger(EAS_DZDAApproveAction.class);
 
     @Override
@@ -162,7 +164,8 @@ public class EAS_DZDAApproveAction extends BaseBean implements Action, EsbServer
                 }
                 logger_3f787449.info("调用借阅审批回调接口请求数据：=====" + mJson.toString());
                 // 调用接口
-                String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("hteasoasync.uploadDZDAApprovelUrl")).trim();
+//                String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("hteasoasync.uploadDZDAApprovelUrl")).trim();
+                String url = configProp.getUploadZZInfoUrl();
                 ZZ_SendPostRequest mGetResult = new ZZ_SendPostRequest();
                 String result = mGetResult.getResult(mJson, url);
                 logger_3f787449.info(String.valueOf("调用借阅审批回调接口返回值：" + result));

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EAS_VoucherModifyAction.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import  com.weaver.seconddev.interfaces.easoa.CallSieOAVoucherService;
 import  com.weaver.seconddev.interfaces.easoa.SieOaVoucherServiceStub;
+import com.weaver.seconddev.interfaces.prop.ConfigProp;
 import  com.weaver.seconddev.interfaces.swfa.BillFieldUtil;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -37,7 +38,8 @@ public class EAS_VoucherModifyAction extends BaseBean implements Action, EsbServ
     // 对应E9的请求信息对象
     @Autowired
     private RequestInfo requestInfoTemp;
-
+    @Autowired
+    private ConfigProp configProp;
     private static final Logger logger_57237c37 = LoggerFactory.getLogger(EAS_VoucherModifyAction.class);
 
     @Override
@@ -130,7 +132,9 @@ public class EAS_VoucherModifyAction extends BaseBean implements Action, EsbServ
                 // 原凭证号
                 param.setVoucherNoOld(bgqpzh);
                 // 调用接口
-                String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("hteasoasync.updatevoucherurl")).trim();
+//                String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("hteasoasync.updatevoucherurl")).trim();
+                String url = configProp.getUpdatevoucherurl();
+                logger_57237c37.info("url == " + url);
                 CallSieOAVoucherService service = new CallSieOAVoucherService(url);
                 String[] result = service.syncVoucherInfo(param);
                 logger_57237c37.info(String.valueOf("调用借阅审批回调接口返回值：" + result));

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/GJB_DeliveryApproveAction.java

@@ -218,8 +218,10 @@ public class GJB_DeliveryApproveAction extends BaseBean implements Action, EsbSe
                 // }
                 logger_8ffb7f70.info("调用CMS接口请求数据：=====" + mJson.toString());
                 // 调用接口
-                String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htcmsoasync.oaapproveresulturl")).trim();
-                String appKey = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htcmsoasync.appKey")).trim();
+//                String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htcmsoasync.oaapproveresulturl")).trim();
+//                String appKey = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htcmsoasync.appKey")).trim();
+                String url = configProp.getHtcmsoasync_oaapproveresulturl();
+                String appKey = configProp.getHtcmsoasync_appKey();
                 // ZZ_SendPostRequest  mGetResult = new ZZ_SendPostRequest();
                 SendPostRequest_API mGetResult = new SendPostRequest_API();
                 String result = mGetResult.getResult(mJson, url, appKey);

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTGD_MES_ZG04ReturnAction.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;
@@ -38,6 +39,8 @@ public class HTGD_MES_ZG04ReturnAction extends BaseBean implements Action, EsbSe
     @Autowired
     private RequestInfo requestInfoTemp;
 
+    @Autowired
+    private ConfigProp configProp;
     private static final Logger logger_5763d172 = LoggerFactory.getLogger(HTGD_MES_ZG04ReturnAction.class);
 
     public WeaResult<Map<String, Object>> execute(Map<String, Object> requestInfoMap) {
@@ -76,7 +79,8 @@ public class HTGD_MES_ZG04ReturnAction extends BaseBean implements Action, EsbSe
                 params.put("params", reqArr.toString());
                 // 调用接口
                 // "http://10.6.105.25:8180/mes/oa/OaAuditResult.html";//
-                String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htmesoasync.GDZG04OaAuditResult")).trim();
+//                String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htmesoasync.GDZG04OaAuditResult")).trim();
+                String url = configProp.getGetTzlhtApplyResultUrl();
                 SendPostRequest_param mGetResult = new SendPostRequest_param();
                 // reqArr.toString()
                 String result = mGetResult.getResult(params, url);

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ISO_ExternalFilesApproveAction.java

@@ -1,5 +1,6 @@
 package com.weaver.seconddev.interfaces.workflow.action;
 
+import com.weaver.seconddev.interfaces.prop.ConfigProp;
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;
@@ -44,7 +45,8 @@ public class ISO_ExternalFilesApproveAction extends BaseBean implements Action,
     // 对应E9的请求信息对象
     @Autowired
     private RequestInfo requestInfoTemp;
-
+    @Autowired
+    private ConfigProp configProp;
     private static final Logger logger_1ddefef0 = LoggerFactory.getLogger(ISO_ExternalFilesApproveAction.class);
 
     @Override
@@ -161,7 +163,8 @@ public class ISO_ExternalFilesApproveAction extends BaseBean implements Action,
             option.setTimeOutInMilliSeconds(30000);
             option.setAction("http://tempuri.org/newExternalFiles");
             // https://testecmapi.hengtonggroup.com.cn:8012/workflow.asmx
-            String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htecmoasync.isoresulturl")).trim();
+//            String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htecmoasync.isoresulturl")).trim();
+            String url = configProp.getIsoresulturl();
             // 值为targetNamespace+methodName
             EndpointReference epfs = new EndpointReference(url);
             option.setTo(epfs);
@@ -227,7 +230,8 @@ public class ISO_ExternalFilesApproveAction extends BaseBean implements Action,
             option.setTimeOutInMilliSeconds(30000);
             option.setAction("http://tempuri.org/revisedExternalFiles");
             // https://testecmapi.hengtonggroup.com.cn:8012/workflow.asmx
-            String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htecmoasync.isoresulturl")).trim();
+//            String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htecmoasync.isoresulturl")).trim();
+            String url =configProp.getIsoresulturl();
             // 值为targetNamespace+methodName
             EndpointReference epfs = new EndpointReference(url);
             option.setTo(epfs);
@@ -293,7 +297,8 @@ public class ISO_ExternalFilesApproveAction extends BaseBean implements Action,
             option.setTimeOutInMilliSeconds(30000);
             option.setAction("http://tempuri.org/ExternalFilesToVoid");
             // https://testecmapi.hengtonggroup.com.cn:8012/workflow.asmx
-            String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htecmoasync.isoresulturl")).trim();
+//            String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htecmoasync.isoresulturl")).trim();
+            String url =configProp.getIsoresulturl();
             // 值为targetNamespace+methodName
             EndpointReference epfs = new EndpointReference(url);
             option.setTo(epfs);
@@ -359,7 +364,8 @@ public class ISO_ExternalFilesApproveAction extends BaseBean implements Action,
             option.setTimeOutInMilliSeconds(30000);
             option.setAction("http://tempuri.org/ExternalFilesReissue");
             // https://testecmapi.hengtonggroup.com.cn:8012/workflow.asmx
-            String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htecmoasync.isoresulturl")).trim();
+//            String url = Util.null2String(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/ISO_FileAddOrReviseAction.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.axis.client.Call;
 import org.apache.axis.client.Service;
 import  com.weaver.seconddev.interfaces.swfa.BillFieldUtil;
@@ -45,7 +46,8 @@ public class ISO_FileAddOrReviseAction extends BaseBean implements Action, EsbSe
     // 对应E9的请求信息对象
     @Autowired
     private RequestInfo requestInfoTemp;
-
+    @Autowired
+    private ConfigProp configProp;
     private static final Logger logger_cb97befd = LoggerFactory.getLogger(ISO_FileAddOrReviseAction.class);
 
     @Override
@@ -156,7 +158,8 @@ public class ISO_FileAddOrReviseAction extends BaseBean implements Action, EsbSe
             option.setTimeOutInMilliSeconds(60000);
             option.setAction("http://tempuri.org/newInternalFile");
             // https://testecmapi.hengtonggroup.com.cn:8012/workflow.asmx
-            String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htecmoasync.isoresulturl")).trim();
+//            String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htecmoasync.isoresulturl")).trim();
+            String url = configProp.getIsoresulturl();
             // 值为targetNamespace+methodName
             EndpointReference epfs = new EndpointReference(url);
             option.setTo(epfs);
@@ -225,7 +228,8 @@ public class ISO_FileAddOrReviseAction extends BaseBean implements Action, EsbSe
             option.setTimeOutInMilliSeconds(30000);
             option.setAction("http://tempuri.org/revisedInternalFile");
             // https://testecmapi.hengtonggroup.com.cn:8012/workflow.asmx
-            String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htecmoasync.isoresulturl")).trim();
+//            String url = Util.null2String(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/ISO_ProjectFilePermissionAction.java

@@ -1,5 +1,6 @@
 package com.weaver.seconddev.interfaces.workflow.action;
 
+import com.weaver.seconddev.interfaces.prop.ConfigProp;
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;
@@ -41,7 +42,8 @@ public class ISO_ProjectFilePermissionAction extends BaseBean implements Action,
     // 对应E9的请求信息对象
     @Autowired
     private RequestInfo requestInfoTemp;
-
+    @Autowired
+    private ConfigProp configProp;
     private static final Logger logger_66e50941 = LoggerFactory.getLogger(ISO_ProjectFilePermissionAction.class);
 
     @Override
@@ -115,7 +117,8 @@ public class ISO_ProjectFilePermissionAction extends BaseBean implements Action,
             option.setTimeOutInMilliSeconds(30000);
             option.setAction("http://tempuri.org/ProjectFilesPermission");
             // https://testecmapi.hengtonggroup.com.cn:8012/workflow.asmx
-            String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htecmoasync.isoresulturl")).trim();
+//            String url = Util.null2String(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/ISO_ProjectFileReissueAction.java

@@ -1,5 +1,6 @@
 package com.weaver.seconddev.interfaces.workflow.action;
 
+import com.weaver.seconddev.interfaces.prop.ConfigProp;
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;
@@ -41,7 +42,8 @@ public class ISO_ProjectFileReissueAction extends BaseBean implements Action, Es
     // 对应E9的请求信息对象
     @Autowired
     private RequestInfo requestInfoTemp;
-
+    @Autowired
+    private ConfigProp configProp;
     private static final Logger logger_c74bfd80 = LoggerFactory.getLogger(ISO_ProjectFileReissueAction.class);
 
     @Override
@@ -115,7 +117,8 @@ public class ISO_ProjectFileReissueAction extends BaseBean implements Action, Es
             option.setTimeOutInMilliSeconds(30000);
             option.setAction("http://tempuri.org/ProjectFilesReissue");
             // https://testecmapi.hengtonggroup.com.cn:8012/workflow.asmx
-            String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htecmoasync.isoresulturl")).trim();
+//            String url = Util.null2String(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/OaCrmZDYWFPAction.java

@@ -2,6 +2,7 @@ package com.weaver.seconddev.interfaces.workflow.action;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.weaver.seconddev.interfaces.prop.ConfigProp;
 import  com.weaver.seconddev.interfaces.swfa.BillFieldUtil;
 import java.util.HashMap;
 import java.util.Map;
@@ -34,7 +35,8 @@ public class OaCrmZDYWFPAction extends BaseBean implements Action, EsbServerless
     // 对应E9的请求信息对象
     @Autowired
     private RequestInfo requestInfoTemp;
-
+    @Autowired
+    private ConfigProp configProp;
     private static final Logger logger_afe2c4b5 = LoggerFactory.getLogger(OaCrmZDYWFPAction.class);
 
     @Override
@@ -105,8 +107,10 @@ public class OaCrmZDYWFPAction extends BaseBean implements Action, EsbServerless
                 // String result = mGetResult.getApproveResult(mJson,"EasYszxfpApplyResult");
                 logger_afe2c4b5.info(requestID + " " + mJson.toString());
                 // 调用接口
-                String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("hteasoasync.OA_Golden_Rewrite")).trim();
-                String appKey = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("hteasoasync.appKey")).trim();
+//                String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("hteasoasync.OA_Golden_Rewrite")).trim();
+//                String appKey = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("hteasoasync.appKey")).trim();
+                String url = configProp.getOA_Golden_Rewrite();
+                String appKey = configProp.getAppKey();
                 SendPostRequest_API mGetResult = new SendPostRequest_API();
                 String result = mGetResult.getResult(mJson, url, appKey);
                 logger_afe2c4b5.info(String.valueOf(requestID + "调用CRM接口返回值：" + result));

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorPunishCommitAction.java

@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSONObject;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
+
+import com.weaver.seconddev.interfaces.prop.ConfigProp;
 import  com.weaver.seconddev.interfaces.swfa.BillFieldUtil;
 import com.weaver.common.i18n.tool.util.I18nContextUtil;
 import org.springframework.core.env.Environment;
@@ -38,6 +40,8 @@ public class OaSrmVendorPunishCommitAction extends BaseBean implements Action, E
 
     private String SYSID;
 
+    @Autowired
+    private ConfigProp configProp;
     public OaSrmVendorPunishCommitAction() {
         this.SENDID = "";
         this.ITFID = "HT01BDS001";
@@ -108,7 +112,9 @@ public class OaSrmVendorPunishCommitAction extends BaseBean implements Action, E
                 mJson.put("totalAmount", mMap.get("SPHJ"));
                 mReqJson.put("DATAS", mJson);
                 logger_c3039127.info("调用SRM供应商绩效处罚信息同步接口请求数据：=====" + mReqJson.toString());
-                String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htsrmoasync.OaSrmVendorPunish")).trim();
+//                String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htsrmoasync.OaSrmVendorPunish")).trim();
+                String url = configProp.getOaSrmVendorPunish() ;
+
                 SendPostRequest_PO mGetResult = new SendPostRequest_PO();
                 String result = mGetResult.getResult(mReqJson, url);
                 logger_c3039127.info(String.valueOf("调用SRM供应商绩效处罚信息同步接口请求数据：" + result));

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OperateEmailAccountAction.java

@@ -6,6 +6,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import com.alibaba.fastjson.JSONArray;
 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.AccountService;
@@ -39,6 +40,8 @@ public class OperateEmailAccountAction extends BaseBean implements Action, EsbSe
     @Autowired
     private RequestInfo requestInfoTemp;
 
+    @Autowired
+    private ConfigProp configProp;
     // public static void main(String[] args) {
     // Socket socket = null;
     // try {
@@ -104,18 +107,24 @@ public class OperateEmailAccountAction extends BaseBean implements Action, EsbSe
                         if ("0".equals(value)) {
                             yxlx = "@hengtonggroup.com.cn";
                             sysid = "SYS025";
-                            emailIP = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htemail.htgroup")).trim();
-                            port = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htemail.htgroupport")).trim();
+//                            emailIP = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htemail.htgroup")).trim();
+//                            port = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htemail.htgroupport")).trim();
+                            emailIP = configProp.getHtgroup();
+                            port = configProp.getHtgroupport();
                         } else if ("1".equals(value)) {
                             yxlx = "@htgd.com.cn";
                             sysid = "SYS026";
-                            emailIP = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htemail.htgd")).trim();
-                            port = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htemail.htgdport")).trim();
+//                            emailIP = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htemail.htgd")).trim();
+//                            port = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htemail.htgdport")).trim();
+                            emailIP = configProp.getHtgd();
+                            port = configProp.getHtgdport();
                         } else if ("2".equals(value)) {
                             yxlx = "@jsalpha.com";
                             sysid = "SYS035";
-                            emailIP = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htemail.guangdao")).trim();
-                            port = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htemail.guangdaoport")).trim();
+//                            emailIP = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htemail.guangdao")).trim();
+//                            port = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htemail.guangdaoport")).trim();
+                            emailIP = configProp.getGuangdao();
+                            port = configProp.getGuangdaoport();
                         }
                     }
                     if (name.equals("YWLX")) {

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/WuJangGiftStorageAction.java

@@ -5,6 +5,7 @@ import java.util.*;
 
 import com.weaver.common.distribution.genid.IdGenerator;
 import com.weaver.common.i18n.tool.util.I18nContextUtil;
+import com.weaver.seconddev.interfaces.prop.ConfigProp;
 import com.weaver.verupgrade.conn.CONN_TYPE;
 import org.springframework.core.env.Environment;
 import java.lang.*;
@@ -34,7 +35,8 @@ public class WuJangGiftStorageAction extends BaseBean implements Action, EsbServ
     // 对应E9的请求信息对象
     @Autowired
     private RequestInfo requestInfoTemp;
-
+    @Autowired
+    private ConfigProp configProp;
     private static final Logger logger_3c4594 = LoggerFactory.getLogger(WuJangGiftStorageAction.class);
 
     @Override
@@ -61,7 +63,8 @@ public class WuJangGiftStorageAction extends BaseBean implements Action, EsbServ
                     }
                 }
                 // XZ011只有配置里维护的人申请才触发接口
-                String creator = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htxzsetting.creator"));
+//                String creator = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htxzsetting.creator"));
+                String creator = configProp.getCreator();
                 if (creator.indexOf(sqr) >= 0) {
                     DetailTable dtq = requestinfo.getDetailTableInfo().getDetailTable(0);
                     Row[] sq = dtq.getRow();

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZWZX_CG_FileUploadAction.java

@@ -201,7 +201,8 @@ public class ZWZX_CG_FileUploadAction extends BaseBean implements Action, EsbSer
                 mJson.put("fileVOList", fileVOListArr);
                 // writeLog(requestID+" 调用总账归档附件上传接口请求数据：=====" + mJson.toString());
                 // 调用接口
-                String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("hteasoasync.uploadZZInfoUrl")).trim();
+//                String url = Util.null2String(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_323752e9.info(String.valueOf(requestID + " 调用总账归档附件上传接口返回值：" + result));