- 优化集成url 配置系统参数(sap,fk,oa)

--s

main/java/shjh/jhzj7/fi/fi/utils/OAUtils.java

@@ -17,8 +17,8 @@ import java.util.Objects;
  */
 public class OAUtils {
 
-    public static final String oaUrl = "https://hipint-stg.jahwa.com.cn:6443/gateway/HIP_ReceiveToOA/1.0/receiveToOA";//测试环境
+    public static final String oaUrl = System.getProperty("oaUrl");//测试环境
-    public static final String oaAPIKey = "207b5296-9866-4b4b-8146-1fea58b3c8c9";//测试环境APIKey
+    public static final String oaAPIKey = System.getProperty("oaAPIKey");//测试环境APIKey
     private static final Log logger = LogFactory.getLog(OAUtils.class);
     private static final String Apimenthod = "OA待办接口";
 
@@ -63,7 +63,7 @@ public class OAUtils {
     private static JSONObject buildPendingsBody(Map<String, Object> thirdPartyMap) {
         //组装请求体
         JSONObject pendingsBody = new JSONObject();
-        pendingsBody.put("rootContextID", ""+System.currentTimeMillis());//todo:唯一事务ID，采用UUID或其他强唯一性ID
+        pendingsBody.put("rootContextID", ""+System.currentTimeMillis());//唯一事务ID，采用UUID或其他强唯一性ID
         pendingsBody.put("requestTime", ""+(thirdPartyMap.get("createDateStr1")));//请求时间,格式为yyyy-MM-dd HH:mm:ss.SSS
 
         JSONObject jsonObject = new JSONObject();

main/java/shjh/jhzj7/fi/fi/utils/SapUtils.java

@@ -27,22 +27,20 @@ import java.util.Objects;
 public class SapUtils {
 
     private static final Log logger = LogFactory.getLog(SapUtils.class);
-    public static final String APIKey = "207b5296-9866-4b4b-8146-1fea58b3c8c9";//测试环境APIKey
+    public static final String APIKey = System.getProperty("APIKey");//测试环境APIKey
-    //    public static final String APIKey = "8281da80-b39b-48c4-83bd-f8e480740c6a";//测试环境APIKey
+    public static final String url_a = System.getProperty("url_a");//url_a (SAP应付凭证锁定解锁状态回写) && (SAP应付凭证清单) && (SAP应收凭证清单) && (先付后记（其他付款、劳务报销单、SAP会员退卡单）回写付款状态)
+    public static final String url_b = System.getProperty("url_b");//url_b (生成代扣款记账单)
     private static final String Apimenthod1 = "SAP应付凭证锁定解锁状态回写接口";
     private static final String interfaceID1 = "PayableVoucherStatus";//识别被调接口并进行路由
-    public static final String unlockedUrl = "https://hipint-stg.jahwa.com.cn:6443/gateway/HIP_ReceiveFromFM/1.0/fm/send";//测试环境(SAP应付凭证锁定解锁状态回写)
+    public static final String unlockedUrl = url_a;//测试环境(SAP应付凭证锁定解锁状态回写)
-    //    public static final String unlockedUrl = "https://hipint.jahwa.com.cn:6443/gateway/HIP_ReceiveFromFM/1.0/fm/send";//正式环境
     private static final String Apimenthod2 = "SAP应付凭证清单接口";
     private static final String interfaceID2 = "PayableVoucherList";//识别被调接口并进行路由
 
-    public static final String vouchersUrl = "https://hipint-stg.jahwa.com.cn:6443/gateway/HIP_ReceiveFromFM/1.0/fm/send";//测试环境(SAP应付凭证清单)
+    public static final String vouchersUrl = url_a;//测试环境(SAP应付凭证清单)
-    //    public static final String vouchersUrl = "https://hipint.jahwa.com.cn:6443/gateway/HIP_ReceiveFromFM/1.0/fm/send";//正式环境
     public static final String receiverID1 = "SAP";//定义的发送者
     private static final String Apimenthod3 = "生成代扣款记账单接口";
     private static final String interfaceID3 = "FMCreateDKKRecord";//识别被调接口并进行路由
-    public static final String withholdingUrl = "https://hipint-stg.jahwa.com.cn:6443/gateway//HIP_ReceiveFromFM/1.0/fm/send";//测试环境(生成代扣款记账单)
+    public static final String withholdingUrl = url_b;//测试环境(生成代扣款记账单)
-    //    public static final String withholdingUrl = "https://hipint.jahwa.com.cn:6443/gateway//HIP_ReceiveFromFM/1.0/fm/send";//正式环境
     public static final String receiverID2 = "FeiKong";//定义的发送者
 
     private static final String interfaceID5 = "AccountsReceivableVoucherList";//SAP应收凭证清单 识别被调接口并进行路由
@@ -55,21 +53,18 @@ public class SapUtils {
     private static final String Apimenthod6 = "SAP反清账";
     private static final String interfaceID7 = "FinancialTransactionVoucher";//SAP清账 识别被调接口并进行路由
     private static final String Apimenthod7 = "SAP清账";
-    public static final String sapArUrl = "https://hipint-stg.jahwa.com.cn:6443/gateway/HIP_ReceiveFromFM/1.0/fm/send";//测试环境(SAP应收凭证清单)
+    public static final String sapArUrl = url_a;//测试环境(SAP应收凭证清单)
-    //    public static final String sapArUrl = "https://hipint.jahwa.com.cn:6443/gateway/HIP_ReceiveFromFM/1.0/fm/send";//正式环境
 
     private static final String API_METHOD4 = "SAP收款凭证清账状态查询接口";
     private static final String INTERFACE_ID4 = "ReceiptVoucherClearingStatusCheck";
 
     private static final String Apimenthod4 = "先付后记（其他付款、劳务报销单、SAP会员退卡单）回写付款状态";
     private static final String interfaceID4 = "WritePaymentDetailStatus";//识别被调接口并进行路由
-    public static final String backpaymentUrl = "https://hipint-stg.jahwa.com.cn:6443/gateway/HIP_ReceiveFromFM/1.0/fm/send";//测试环境(先付后记（其他付款、劳务报销单、SAP会员退卡单）回写付款状态)
+    public static final String backpaymentUrl = url_a;//测试环境(先付后记（其他付款、劳务报销单、SAP会员退卡单）回写付款状态)
-    //    public static final String backpaymentUrl = "https://hipint.jahwa.com.cn:6443/gateway/HIP_ReceiveFromFM/1.0/fm/send";//正式环境
     /**
      * 测试地址
      */
-    public static final String QUERY_STATE_URL = "https://hipint-stg.jahwa.com.cn:6443/gateway/HIP_ReceiveFromFM/1.0/fm/send";
+    public static final String QUERY_STATE_URL = url_a;
-    //    public static final String withholdingUrl = "https://hipint.jahwa.com.cn:6443/gateway//HIP_ReceiveFromFM/1.0/fm/send";
     public static final String RECEIVER_ID4 = "SAP";
     private static final String Apimenthod10 = "SAP应付凭证数据校验";
     private static final String interfaceID10 = "ValidatePayableVoucher";//识别被调接口并进行路由
@@ -316,7 +311,7 @@ public class SapUtils {
         String dates = date.format(formatter);
         //组装请求体
         JSONObject pendingsBody = new JSONObject();
-        pendingsBody.put("rootContextID", "" + System.currentTimeMillis());//todo:唯一事务ID，采用UUID或其他强唯一性ID
+        pendingsBody.put("rootContextID", "" + System.currentTimeMillis());//唯一事务ID，采用UUID或其他强唯一性ID
         pendingsBody.put("requestTime", dates);//请求时间,格式为yyyy-MM-dd HH:mm:ss.SSS
         pendingsBody.put("data", data);
         return pendingsBody;