From bcc88adc97b3f112fc3d553eacd0635ff4316550 Mon Sep 17 00:00:00 2001 From: itzhang <2019326567@qq.com> Date: Wed, 4 Jun 2025 17:01:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E7=BA=B7=E4=BA=AB?= =?UTF-8?q?=E9=94=80=E5=AE=A2token=E8=8E=B7=E5=8F=96=E5=92=8C=E6=96=B0?= =?UTF-8?q?=E5=A2=9EERPURL=E5=B8=B8=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ssssssss/magicboot/constant/CertificateConstant.java | 2 +- .../org/ssssssss/magicboot/constant/ERPURLConstant.java | 5 +++++ .../ssssssss/magicboot/controller/BankInfoController.java | 5 +++-- .../ssssssss/magicboot/controller/DesignController.java | 7 +++---- .../magicboot/controller/FrameContractController.java | 3 ++- .../ssssssss/magicboot/controller/GoodsPlanController.java | 5 +++-- .../ssssssss/magicboot/controller/InvoiceController.java | 5 +++-- .../ssssssss/magicboot/controller/KDTokenController.java | 5 +++-- .../magicboot/controller/PreContractController.java | 5 +++-- .../controller/ProjectNewOpportunityController.java | 5 +++-- .../magicboot/controller/ProjectObjController.java | 5 +++-- .../magicboot/controller/QualityBackController.java | 5 +++-- .../magicboot/controller/ReimbursementController.java | 5 +++-- .../ssssssss/magicboot/controller/TenderingController.java | 3 ++- .../org/ssssssss/magicboot/controller/XSHTController.java | 7 ++++--- .../magicboot/controller/customerContactController.java | 3 ++- .../ssssssss/magicboot/controller/customerController.java | 5 +++-- .../magicboot/controller/customerFinInfoController.java | 3 ++- .../magicboot/controller/customergroupController.java | 3 ++- .../magicboot/controller/materialreqbillController.java | 3 ++- .../magicboot/controller/materialreqbillXTController.java | 5 +++-- .../magicboot/controller/priceapprovaController.java | 5 +++-- .../magicboot/controller/returnapplicationController.java | 3 ++- .../magicboot/controller/salesPredictionController.java | 5 +++-- .../java/org/ssssssss/magicboot/utils/KingDeeUtils.java | 3 ++- .../main/java/org/ssssssss/magicboot/zdyutils/FXTIC.java | 4 +++- 26 files changed, 71 insertions(+), 43 deletions(-) create mode 100644 magic-boot/src/main/java/org/ssssssss/magicboot/constant/ERPURLConstant.java diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/constant/CertificateConstant.java b/magic-boot/src/main/java/org/ssssssss/magicboot/constant/CertificateConstant.java index bf86cb0..933edbd 100644 --- a/magic-boot/src/main/java/org/ssssssss/magicboot/constant/CertificateConstant.java +++ b/magic-boot/src/main/java/org/ssssssss/magicboot/constant/CertificateConstant.java @@ -12,7 +12,7 @@ public class CertificateConstant { public static final String PERMANENT_CODE = "1A49B50861909007935CAB5E33E52BAA";//永久授权码 public static final String APP_SECRET = "5bda722932a54e80a05d2cc9b1722fed";//appSecret public static final String CORP_ID = "FSCID_11F505C980B5FE43D5D7230567802E09";//企业Id - public static final String CURRENT_OPEN_USERID = "FSUID_50D3C26809B163F663DC8557268A8D44";//当前登录用户id + public static final String CURRENT_OPEN_USERID = "FSUID_A9AD0C360309427B3F431487883B73B9";//当前登录用户id // public static final String APP_ID = "FSAID_131fa51";//appId // public static final String PERMANENT_CODE = "EF03533F6929B59934A7E1155221420B";//永久授权码 diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/constant/ERPURLConstant.java b/magic-boot/src/main/java/org/ssssssss/magicboot/constant/ERPURLConstant.java new file mode 100644 index 0000000..fd21a6a --- /dev/null +++ b/magic-boot/src/main/java/org/ssssssss/magicboot/constant/ERPURLConstant.java @@ -0,0 +1,5 @@ +package org.ssssssss.magicboot.constant; + +public class ERPURLConstant { + public static final String ERP_URL = "http://192.168.31.233:8022";//erp地址 +} diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/BankInfoController.java b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/BankInfoController.java index 1d5e7e6..f45b707 100644 --- a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/BankInfoController.java +++ b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/BankInfoController.java @@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.client.RestClientException; import org.springframework.web.client.RestTemplate; +import org.ssssssss.magicboot.constant.ERPURLConstant; import org.ssssssss.magicboot.constant.URLConstant; import org.ssssssss.magicboot.entity.Filter; import org.ssssssss.magicboot.utils.CrmRequestUtil; @@ -82,7 +83,7 @@ public class BankInfoController { HttpEntity bankReqEntity = new HttpEntity(deptReq, headers); //开始发起请求 - String bankInfoUrl = "http://192.168.31.158:8022/ierp/kapi/v2/f9w5/basedata/bd_bebank/bebankQuery"; + String bankInfoUrl = ERPURLConstant.ERP_URL +"/ierp/kapi/v2/f9w5/basedata/bd_bebank/bebankQuery"; String bankInfoResStr = ""; @@ -304,7 +305,7 @@ public class BankInfoController { HttpEntity bankReqEntity = new HttpEntity(deptReq, headers); //开始发起请求 - String bankInfoUrl = "http://192.168.31.158:8022/ierp/kapi/v2/f9w5/basedata/bd_bebank/bebankQuery"; + String bankInfoUrl = ERPURLConstant.ERP_URL+"/ierp/kapi/v2/f9w5/basedata/bd_bebank/bebankQuery"; String bankInfoResStr = ""; diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/DesignController.java b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/DesignController.java index 0badbd1..dd2b3f1 100644 --- a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/DesignController.java +++ b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/DesignController.java @@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.client.RestClientException; import org.springframework.web.client.RestTemplate; +import org.ssssssss.magicboot.constant.ERPURLConstant; import org.ssssssss.magicboot.constant.URLConstant; import org.ssssssss.magicboot.entity.Filter; import org.ssssssss.magicboot.utils.CrmRequestUtil; @@ -253,7 +254,7 @@ public class DesignController { System.out.println("请求为:" + JSON.parseObject(JSON.toJSONString(designDocReqEntity))); //开始向金蝶发起请求 - String designPlanUrl = "http://192.168.31.158:8022/ierp/kapi/v2/f9w5/pssc/requirapplybillSave"; + String designPlanUrl = ERPURLConstant.ERP_URL + "/ierp/kapi/v2/f9w5/pssc/requirapplybillSave"; JSONObject erpDesignDocRes = new JSONObject(); @@ -499,8 +500,6 @@ public class DesignController { e.printStackTrace(); } - System.out.println("测试负责人"+ownerRes); - if ("success".equals(ownerRes.getString("errorDescription")) && !ownerRes.getJSONObject("data").getJSONArray("dataList").isEmpty()) { JSONObject ownerData = ownerRes.getJSONObject("data").getJSONArray("dataList").getJSONObject(0); ownerCode = ownerData.getString("field_T1xid__c") != null ? ownerData.getString("field_T1xid__c") : ""; @@ -578,7 +577,7 @@ public class DesignController { System.out.println("请求为:" + JSON.parseObject(JSON.toJSONString(designDocReqEntity))); //开始向金蝶发起请求 - String designPlanUrl = "http://192.168.31.158:8022/ierp/kapi/v2/f9w5/pssc/pm_requirapplybill/requirapplybillSave"; + String designPlanUrl = ERPURLConstant.ERP_URL + "/ierp/kapi/v2/f9w5/pssc/pm_requirapplybill/requirapplybillSave"; JSONObject erpDesignDocRes = new JSONObject(); diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/FrameContractController.java b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/FrameContractController.java index d73ca43..13d87a0 100644 --- a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/FrameContractController.java +++ b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/FrameContractController.java @@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.client.RestClientException; import org.springframework.web.client.RestTemplate; +import org.ssssssss.magicboot.constant.ERPURLConstant; import org.ssssssss.magicboot.constant.URLConstant; import org.ssssssss.magicboot.entity.Filter; import org.ssssssss.magicboot.utils.CrmRequestUtil; @@ -258,7 +259,7 @@ public class FrameContractController { System.out.println(JSON.parseObject(JSON.toJSONString(contractReqEntity))); //开始向金蝶发起请求 - String contractUrl = "http://192.168.31.158:8022/ierp/kapi/v2/f9w5/conm/conm_salcontract/savecontract"; + String contractUrl = ERPURLConstant.ERP_URL + "/ierp/kapi/v2/f9w5/conm/conm_salcontract/savecontract"; JSONObject contractRes = new JSONObject(); diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/GoodsPlanController.java b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/GoodsPlanController.java index 8bf6f07..1eb5b25 100644 --- a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/GoodsPlanController.java +++ b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/GoodsPlanController.java @@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.client.RestClientException; import org.springframework.web.client.RestTemplate; +import org.ssssssss.magicboot.constant.ERPURLConstant; import org.ssssssss.magicboot.constant.URLConstant; import org.ssssssss.magicboot.entity.Filter; import org.ssssssss.magicboot.utils.CrmRequestUtil; @@ -268,7 +269,7 @@ public class GoodsPlanController { System.out.println(JSON.parseObject(JSON.toJSONString(goodsPlanReqEntity))); //开始向金蝶发起请求 - String goodsPlanUrl = "http://192.168.31.158:8022/ierp/kapi/v2/f9w5/sm/f9w5_sm_purchaseplan/purchaseplanSave"; + String goodsPlanUrl = ERPURLConstant.ERP_URL + "/ierp/kapi/v2/f9w5/sm/f9w5_sm_purchaseplan/purchaseplanSave"; JSONObject erpGoodsPlanRes = new JSONObject(); @@ -581,7 +582,7 @@ public class GoodsPlanController { System.out.println(JSON.parseObject(JSON.toJSONString(goodsPlanReqEntity))); //开始向金蝶发起请求 - String goodsPlanUrl = "http://192.168.31.158:8022/ierp/kapi/v2/f9w5/sm/f9w5_sm_purchaseplan/purchaseplanSave"; + String goodsPlanUrl = ERPURLConstant.ERP_URL + "/ierp/kapi/v2/f9w5/sm/f9w5_sm_purchaseplan/purchaseplanSave"; JSONObject erpGoodsPlanRes = new JSONObject(); diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/InvoiceController.java b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/InvoiceController.java index bad630d..a9caf68 100644 --- a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/InvoiceController.java +++ b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/InvoiceController.java @@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.client.RestClientException; import org.springframework.web.client.RestTemplate; +import org.ssssssss.magicboot.constant.ERPURLConstant; import org.ssssssss.magicboot.constant.URLConstant; import org.ssssssss.magicboot.entity.Filter; import org.ssssssss.magicboot.utils.CrmRequestUtil; @@ -313,7 +314,7 @@ public class InvoiceController { System.out.println(JSON.parseObject(JSON.toJSONString(invoiceReqEntity))); - String invoiceUrl = "http://192.168.31.158:8022/ierp/kapi/v2/f9w5/ar/arbusbill/createInvoice"; + String invoiceUrl = ERPURLConstant.ERP_URL + "/ierp/kapi/v2/f9w5/ar/arbusbill/createInvoice"; JSONObject erpInvoiceRes = new JSONObject(); @@ -581,7 +582,7 @@ public class InvoiceController { System.out.println(JSON.parseObject(JSON.toJSONString(invoiceReqEntity))); - String invoiceUrl = "http://192.168.31.158:8022/ierp/kapi/v2/f9w5/ar/arbusbill/createInvoice"; + String invoiceUrl = ERPURLConstant.ERP_URL + "/ierp/kapi/v2/f9w5/ar/arbusbill/createInvoice"; JSONObject erpInvoiceRes = new JSONObject(); diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/KDTokenController.java b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/KDTokenController.java index b63583d..b92b2f5 100644 --- a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/KDTokenController.java +++ b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/KDTokenController.java @@ -7,6 +7,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.client.RestClientException; import org.springframework.web.client.RestTemplate; +import org.ssssssss.magicboot.constant.ERPURLConstant; import org.ssssssss.magicboot.utils.CaffeineCacheUtil; import java.util.LinkedHashMap; @@ -150,7 +151,7 @@ public class KDTokenController { //开始封装 //接口地址 - String appTokenUrl = "http://192.168.31.158:8022/ierp/api/getAppToken.do"; + String appTokenUrl = ERPURLConstant.ERP_URL + "/ierp/api/getAppToken.do"; //请求参数 LinkedHashMap appTokenParams = new LinkedHashMap<>(); appTokenParams.put("appId", "FXXKCRM"); @@ -205,7 +206,7 @@ public class KDTokenController { //不存在,将执行获取accessToken的逻辑 //开始封装参数 //URL - String accessTokenUrl = "http://192.168.31.158:8022/ierp/api/login.do"; + String accessTokenUrl = ERPURLConstant.ERP_URL + "/ierp/api/login.do"; //请求参数 LinkedHashMap accessTokenParams = new LinkedHashMap<>(); diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/PreContractController.java b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/PreContractController.java index 73334d6..2dc8c1f 100644 --- a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/PreContractController.java +++ b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/PreContractController.java @@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.client.RestClientException; import org.springframework.web.client.RestTemplate; +import org.ssssssss.magicboot.constant.ERPURLConstant; import org.ssssssss.magicboot.constant.URLConstant; import org.ssssssss.magicboot.entity.Filter; import org.ssssssss.magicboot.utils.CrmRequestUtil; @@ -246,7 +247,7 @@ public class PreContractController { System.out.println(JSON.parseObject(JSON.toJSONString(contractReqEntity))); //开始向金蝶发起请求 - String contractUrl = "http://192.168.31.158:8022/ierp/kapi/v2/f9w5/conm/conm_salcontract/savecontract"; + String contractUrl = ERPURLConstant.ERP_URL + "/ierp/kapi/v2/f9w5/conm/conm_salcontract/savecontract"; JSONObject contractRes = new JSONObject(); @@ -542,7 +543,7 @@ public class PreContractController { System.out.println(JSON.parseObject(JSON.toJSONString(contractReqEntity))); //开始向金蝶发起请求 - String contractUrl = "http://192.168.31.158:8022/ierp/kapi/v2/f9w5/conm/salcontract/change"; + String contractUrl = ERPURLConstant.ERP_URL + "/ierp/kapi/v2/f9w5/conm/salcontract/change"; String erpPreContractBGRes = ""; diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/ProjectNewOpportunityController.java b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/ProjectNewOpportunityController.java index 62c8a6b..c14d824 100644 --- a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/ProjectNewOpportunityController.java +++ b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/ProjectNewOpportunityController.java @@ -8,6 +8,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import org.ssssssss.magicboot.constant.ERPURLConstant; import org.ssssssss.magicboot.fxapi.HttpClientResult; import org.ssssssss.magicboot.fxapi.HttpClientUtils; import org.ssssssss.magicboot.fxapi.XKTokenAccess; @@ -189,7 +190,7 @@ public class ProjectNewOpportunityController { */ public void getSynDataSave(StringBuffer stringBuffer,Boolean sendFlag,FXHTTP fxapi,String dataId,String nameData,String obj,JSONObject str) { String syn_type = "0";//同步类型 0新增 1修改 2删除 - String res_url = "http://192.168.31.158:8022/ierp/kapi/v2/f9w5/basedata/bd_project/projectSave"; + String res_url = ERPURLConstant.ERP_URL + "/ierp/kapi/v2/f9w5/basedata/bd_project/projectSave"; String res_param = obj; String res = ""; try { @@ -390,7 +391,7 @@ public class ProjectNewOpportunityController { } public void getSynDataSaveUP(StringBuffer stringBuffer,Boolean sendFlag,FXHTTP fxapi,String dataId,String nameData,String obj,JSONObject str) { String syn_type = "1";//同步类型 0新增 1修改 2删除 - String res_url = "http://192.168.31.158:8022/ierp/kapi/v2/f9w5/basedata/bd_project/projectSave"; + String res_url = ERPURLConstant.ERP_URL + "/ierp/kapi/v2/f9w5/basedata/bd_project/projectSave"; String res_param = obj; String res = ""; try { diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/ProjectObjController.java b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/ProjectObjController.java index 5b6fcf8..730c4db 100644 --- a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/ProjectObjController.java +++ b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/ProjectObjController.java @@ -8,6 +8,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import org.ssssssss.magicboot.constant.ERPURLConstant; import org.ssssssss.magicboot.fxapi.HttpClientResult; import org.ssssssss.magicboot.fxapi.HttpClientUtils; import org.ssssssss.magicboot.fxapi.XKTokenAccess; @@ -196,7 +197,7 @@ public class ProjectObjController { */ public void getSynDataSave(StringBuffer stringBuffer,Boolean sendFlag,FXHTTP fxapi,String dataId,String nameData,String obj,JSONObject str) { String syn_type = "0";//同步类型 0新增 1修改 2删除 - String res_url = "http://192.168.31.158:8022/ierp/kapi/v2/f9w5/basedata/bd_project/projectSave"; + String res_url = ERPURLConstant.ERP_URL + "/ierp/kapi/v2/f9w5/basedata/bd_project/projectSave"; String res_param = obj; String res = ""; try { @@ -397,7 +398,7 @@ public class ProjectObjController { } public void getSynDataSaveUP(StringBuffer stringBuffer,Boolean sendFlag,FXHTTP fxapi,String dataId,String nameData,String obj,JSONObject str) { String syn_type = "1";//同步类型 0新增 1修改 2删除 - String res_url = "http://192.168.31.158:8022/ierp/kapi/v2/f9w5/basedata/bd_project/projectSave"; + String res_url = ERPURLConstant.ERP_URL + "/ierp/kapi/v2/f9w5/basedata/bd_project/projectSave"; String res_param = obj; String res = ""; try { diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/QualityBackController.java b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/QualityBackController.java index b8c93ba..e4cbc4c 100644 --- a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/QualityBackController.java +++ b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/QualityBackController.java @@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.client.RestClientException; import org.springframework.web.client.RestTemplate; +import org.ssssssss.magicboot.constant.ERPURLConstant; import org.ssssssss.magicboot.constant.URLConstant; import org.ssssssss.magicboot.entity.Filter; import org.ssssssss.magicboot.utils.CrmRequestUtil; @@ -192,7 +193,7 @@ public class QualityBackController { System.out.println(JSON.parseObject(JSON.toJSONString(qualityBackReqEntity))); - String qualityBackUrl = "http://192.168.31.158:8022/ierp/kapi/v2/f9w5/qcqi/f9w5_problemfeedback/save"; + String qualityBackUrl = ERPURLConstant.ERP_URL + "/ierp/kapi/v2/f9w5/qcqi/f9w5_problemfeedback/save"; String qualityBackRes = ""; try { @@ -286,7 +287,7 @@ public class QualityBackController { JSONObject fileRes = new JSONObject(); try { - fileRes = restTemplate.postForObject("http://192.168.31.158:8022/ierp/kapi/v2/f9w5/qcqi/feedback/uploadFile", entity, JSONObject.class); + fileRes = restTemplate.postForObject(ERPURLConstant.ERP_URL + "/ierp/kapi/v2/f9w5/qcqi/feedback/uploadFile", entity, JSONObject.class); } catch (RestClientException e) { e.printStackTrace(); } diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/ReimbursementController.java b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/ReimbursementController.java index dae3d65..22f47e4 100644 --- a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/ReimbursementController.java +++ b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/ReimbursementController.java @@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.client.RestClientException; import org.springframework.web.client.RestTemplate; +import org.ssssssss.magicboot.constant.ERPURLConstant; import org.ssssssss.magicboot.constant.URLConstant; import org.ssssssss.magicboot.entity.Filter; import org.ssssssss.magicboot.utils.CrmRequestUtil; @@ -80,7 +81,7 @@ public class ReimbursementController { HttpEntity expensesEntity = new HttpEntity(expensesMap, headers); - String expensesUrl = "http://192.168.31.158:8022/ierp/kapi/v2/f9w5/em/er_dailyreimbursebill/dailyreimbursebillQuery"; + String expensesUrl = ERPURLConstant.ERP_URL + "/ierp/kapi/v2/f9w5/em/er_dailyreimbursebill/dailyreimbursebillQuery"; JSONObject expensesRes = new JSONObject(); @@ -393,7 +394,7 @@ public class ReimbursementController { HttpEntity expensesEntity = new HttpEntity(expensesMap, headers); - String expensesUrl = "http://192.168.31.158:8022/ierp/kapi/v2/f9w5/em/er_publicreimbursebill/publicreimbursebillQuery"; + String expensesUrl = ERPURLConstant.ERP_URL + "/ierp/kapi/v2/f9w5/em/er_publicreimbursebill/publicreimbursebillQuery"; JSONObject expensesRes = new JSONObject(); diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/TenderingController.java b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/TenderingController.java index 8bc37d9..5eb2171 100644 --- a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/TenderingController.java +++ b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/TenderingController.java @@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.client.RestClientException; import org.springframework.web.client.RestTemplate; +import org.ssssssss.magicboot.constant.ERPURLConstant; import org.ssssssss.magicboot.constant.URLConstant; import org.ssssssss.magicboot.entity.Filter; import org.ssssssss.magicboot.utils.CrmRequestUtil; @@ -169,7 +170,7 @@ public class TenderingController { System.out.println(JSON.parseObject(JSON.toJSONString(tenderingReqEntity))); - String tenderingUrl = "http://192.168.31.158:8022/ierp/kapi/v2/f9w5/em/f9w5_tenderbuyapply/save"; + String tenderingUrl = ERPURLConstant.ERP_URL + "/ierp/kapi/v2/f9w5/em/f9w5_tenderbuyapply/save"; JSONObject tenderingERPRes = new JSONObject(); diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/XSHTController.java b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/XSHTController.java index d7a6766..9b9d4f2 100644 --- a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/XSHTController.java +++ b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/XSHTController.java @@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.client.RestClientException; import org.springframework.web.client.RestTemplate; +import org.ssssssss.magicboot.constant.ERPURLConstant; import org.ssssssss.magicboot.constant.URLConstant; import org.ssssssss.magicboot.entity.Filter; import org.ssssssss.magicboot.utils.CrmRequestUtil; @@ -379,7 +380,7 @@ public class XSHTController { System.out.println(JSON.parseObject(JSON.toJSONString(contractReqEntity))); //开始向金蝶发起请求 - String contractUrl = "http://192.168.31.158:8022/ierp/kapi/v2/f9w5/conm/conm_salcontract/savecontract"; + String contractUrl = ERPURLConstant.ERP_URL + "/ierp/kapi/v2/f9w5/conm/conm_salcontract/savecontract"; JSONObject contractRes = new JSONObject(); @@ -488,7 +489,7 @@ public class XSHTController { JSONObject fileRes = new JSONObject(); try { - fileRes = restTemplate.postForObject("http://192.168.31.158:8022/ierp/kapi/v2/frame/attachment/uploadFile", entity, JSONObject.class); + fileRes = restTemplate.postForObject(ERPURLConstant.ERP_URL + "/ierp/kapi/v2/frame/attachment/uploadFile", entity, JSONObject.class); } catch (RestClientException e) { e.printStackTrace(); } @@ -583,7 +584,7 @@ public class XSHTController { JSONObject isCompleteRes = new JSONObject(); try { - isCompleteRes = restTemplate.postForObject("http://192.168.31.158:8022/ierp/kapi/v2/f9w5/f9w5_conm_ext/salcontract/beComplete", isCompleteEntity, JSONObject.class); + isCompleteRes = restTemplate.postForObject(ERPURLConstant.ERP_URL + "/ierp/kapi/v2/f9w5/f9w5_conm_ext/salcontract/beComplete", isCompleteEntity, JSONObject.class); } catch (RestClientException e) { e.printStackTrace(); } diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/customerContactController.java b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/customerContactController.java index f8bee3b..5efa834 100644 --- a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/customerContactController.java +++ b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/customerContactController.java @@ -8,6 +8,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import org.ssssssss.magicboot.constant.ERPURLConstant; import org.ssssssss.magicboot.fxapi.HttpClientResult; import org.ssssssss.magicboot.fxapi.HttpClientUtils; import org.ssssssss.magicboot.fxapi.XKTokenAccess; @@ -208,7 +209,7 @@ public class customerContactController { */ public void getSynDataSave(StringBuffer stringBuffer,Boolean sendFlag,FXHTTP fxapi,String dataId,String nameData,String obj,JSONObject str) { String syn_type = "0";//同步类型 0新增 1修改 2删除 - String res_url = "http://192.168.31.158:8022/ierp/kapi/v2/f9w5/basedata/bd_customer/customerSave"; + String res_url = ERPURLConstant.ERP_URL + "/ierp/kapi/v2/f9w5/basedata/bd_customer/customerSave"; String res_param = obj; String res = ""; try { diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/customerController.java b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/customerController.java index b1ae29a..1b4b937 100644 --- a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/customerController.java +++ b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/customerController.java @@ -10,6 +10,7 @@ import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import org.ssssssss.magicboot.constant.ERPURLConstant; import org.ssssssss.magicboot.fxapi.HttpClientResult; import org.ssssssss.magicboot.fxapi.HttpClientUtils; import org.ssssssss.magicboot.fxapi.XKTokenAccess; @@ -255,7 +256,7 @@ public class customerController { */ public void getSynDataSave(StringBuffer stringBuffer,Boolean sendFlag,FXHTTP fxapi,String dataId,String nameData,String obj,JSONObject str) { String syn_type = "0";//同步类型 0新增 1修改 2删除 - String res_url = "http://192.168.31.158:8022/ierp/kapi/v2/f9w5/basedata/bd_customer/customerSave"; + String res_url = ERPURLConstant.ERP_URL + "/ierp/kapi/v2/f9w5/basedata/bd_customer/customerSave"; String res_param = obj; String res = ""; try { @@ -526,7 +527,7 @@ public class customerController { public void getSynDataSaveup(StringBuffer stringBuffer,Boolean sendFlag,FXHTTP fxapi,String dataId,String nameData,String obj,JSONObject str) { String syn_type = "1";//同步类型 0新增 1修改 2删除 - String res_url = "http://192.168.31.158:8022/ierp/kapi/v2/f9w5/basedata/bd_customer/customerSave"; + String res_url = ERPURLConstant.ERP_URL + "/ierp/kapi/v2/f9w5/basedata/bd_customer/customerSave"; String res_param = obj; String res = ""; try { diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/customerFinInfoController.java b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/customerFinInfoController.java index 8d67f1c..8c3a30e 100644 --- a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/customerFinInfoController.java +++ b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/customerFinInfoController.java @@ -8,6 +8,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import org.ssssssss.magicboot.constant.ERPURLConstant; import org.ssssssss.magicboot.fxapi.HttpClientResult; import org.ssssssss.magicboot.fxapi.HttpClientUtils; import org.ssssssss.magicboot.fxapi.XKTokenAccess; @@ -203,7 +204,7 @@ public class customerFinInfoController { */ public void getSynDataSave(StringBuffer stringBuffer,Boolean sendFlag,FXHTTP fxapi,String dataId,String nameData,String obj,JSONObject str) { String syn_type = "0";//同步类型 0新增 1修改 2删除 - String res_url = "http://192.168.31.158:8022/ierp/kapi/v2/f9w5/basedata/bd_customer/customerSave"; + String res_url = ERPURLConstant.ERP_URL + "/ierp/kapi/v2/f9w5/basedata/bd_customer/customerSave"; String res_param = obj; String res = ""; try { diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/customergroupController.java b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/customergroupController.java index 53f3c63..dcc2706 100644 --- a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/customergroupController.java +++ b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/customergroupController.java @@ -8,6 +8,7 @@ import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import org.ssssssss.magicboot.constant.ERPURLConstant; import org.ssssssss.magicboot.fxapi.HttpClientResult; import org.ssssssss.magicboot.fxapi.HttpClientUtils; import org.ssssssss.magicboot.fxapi.XKTokenAccess; @@ -42,7 +43,7 @@ public class customergroupController { Boolean sendFlag = false;//是否阻断 StringBuffer stringBuffer = new StringBuffer(); - String sendUrl = "http://192.168.31.158:8022/ierp/kapi/v2/f9w5/basedata/bd_customergroup/customergroupSave"; + String sendUrl = ERPURLConstant.ERP_URL + "/ierp/kapi/v2/f9w5/basedata/bd_customergroup/customergroupSave"; String sendBody = ""; String sendRes = ""; diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/materialreqbillController.java b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/materialreqbillController.java index de20553..c7618dd 100644 --- a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/materialreqbillController.java +++ b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/materialreqbillController.java @@ -8,6 +8,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import org.ssssssss.magicboot.constant.ERPURLConstant; import org.ssssssss.magicboot.fxapi.HttpClientResult; import org.ssssssss.magicboot.fxapi.HttpClientUtils; import org.ssssssss.magicboot.fxapi.XKTokenAccess; @@ -250,7 +251,7 @@ public class materialreqbillController { */ public void getSynDataSave(StringBuffer stringBuffer,Boolean sendFlag,FXHTTP fxapi,String dataId,String nameData,String obj,JSONObject str) { String syn_type = "0";//同步类型 0新增 1修改 2删除 - String res_url = "http://192.168.31.158:8022/ierp/kapi/v2/f9w5/im/im_materialreqbill/materialreqbillSave"; + String res_url = ERPURLConstant.ERP_URL + "/ierp/kapi/v2/f9w5/im/im_materialreqbill/materialreqbillSave"; String res_param = obj; String res = ""; try { diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/materialreqbillXTController.java b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/materialreqbillXTController.java index 7ab512d..3708095 100644 --- a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/materialreqbillXTController.java +++ b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/materialreqbillXTController.java @@ -8,6 +8,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import org.ssssssss.magicboot.constant.ERPURLConstant; import org.ssssssss.magicboot.fxapi.HttpClientResult; import org.ssssssss.magicboot.fxapi.HttpClientUtils; import org.ssssssss.magicboot.fxapi.XKTokenAccess; @@ -299,7 +300,7 @@ public class materialreqbillXTController { */ public void getSynDataSave(StringBuffer stringBuffer,Boolean sendFlag,FXHTTP fxapi,String dataId,String nameData,String obj,JSONObject str) { String syn_type = "0";//同步类型 0新增 1修改 2删除 - String res_url = "http://192.168.31.158:8022/ierp/kapi/v2/f9w5/im/materialreqbill/push"; + String res_url = ERPURLConstant.ERP_URL + "/ierp/kapi/v2/f9w5/im/materialreqbill/push"; String res_param = obj; String res = ""; try { @@ -383,7 +384,7 @@ public class materialreqbillXTController { public void doOperation(String crmId,String operation) throws Exception { FXHTTP fxapi = new FXHTTP(); //操作类型:submit:提交;audit:审核;撤销:unsubmit;删除:delete;反审核:unaudit - String res_url = "http://192.168.31.158:8022/ierp/kapi/v2/f9w5/im/materialreqbill/doOperation"; + String res_url = ERPURLConstant.ERP_URL + "/ierp/kapi/v2/f9w5/im/materialreqbill/doOperation"; JSONObject datajson = new JSONObject(); datajson.put("crmId",crmId); datajson.put("operation",operation); diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/priceapprovaController.java b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/priceapprovaController.java index f44617d..d99094e 100644 --- a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/priceapprovaController.java +++ b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/priceapprovaController.java @@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.client.RestClientException; import org.springframework.web.client.RestTemplate; +import org.ssssssss.magicboot.constant.ERPURLConstant; import org.ssssssss.magicboot.fxapi.HttpClientResult; import org.ssssssss.magicboot.fxapi.HttpClientUtils; import org.ssssssss.magicboot.fxapi.XKTokenAccess; @@ -275,7 +276,7 @@ public class priceapprovaController { */ public void getSynDataSave(StringBuffer stringBuffer,Boolean sendFlag,FXHTTP fxapi,String dataId,String nameData,String obj,JSONObject str,JSONArray specificationfile) { String syn_type = "0";//同步类型 0新增 1修改 2删除 - String res_url = "http://192.168.31.158:8022/ierp/kapi/v2/f9w5/pmp/f9w5_pmp_priceapproval/priceapprovalSave"; + String res_url = ERPURLConstant.ERP_URL + "/ierp/kapi/v2/f9w5/pmp/f9w5_pmp_priceapproval/priceapprovalSave"; String res_param = obj; String res = ""; try { @@ -314,7 +315,7 @@ public class priceapprovaController { //开始发起传输 JSONObject fileRes = new JSONObject(); try { - fileRes = restTemplate.postForObject("http://192.168.31.158:8022/ierp/kapi/v2/frame/attachment/uploadFile", entity, JSONObject.class); + fileRes = restTemplate.postForObject(ERPURLConstant.ERP_URL + "/ierp/kapi/v2/frame/attachment/uploadFile", entity, JSONObject.class); Map paramMap2 = new HashMap(); String message = fileRes.getString("message"); diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/returnapplicationController.java b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/returnapplicationController.java index 0eb5629..80065c5 100644 --- a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/returnapplicationController.java +++ b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/returnapplicationController.java @@ -8,6 +8,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import org.ssssssss.magicboot.constant.ERPURLConstant; import org.ssssssss.magicboot.fxapi.HttpClientResult; import org.ssssssss.magicboot.fxapi.HttpClientUtils; import org.ssssssss.magicboot.fxapi.XKTokenAccess; @@ -267,7 +268,7 @@ public class returnapplicationController { */ public void getSynDataSave(StringBuffer stringBuffer,Boolean sendFlag,FXHTTP fxapi,String dataId,String nameData,String obj,JSONObject str) { String syn_type = "0";//同步类型 0新增 1修改 2删除 - String res_url = "http://192.168.31.158:8022/ierp/kapi/v2/f9w5/im/materialreqbill/save"; + String res_url = ERPURLConstant.ERP_URL + "/ierp/kapi/v2/f9w5/im/materialreqbill/save"; String res_param = obj; String res = ""; try { diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/salesPredictionController.java b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/salesPredictionController.java index 1da2b5f..afce89f 100644 --- a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/salesPredictionController.java +++ b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/salesPredictionController.java @@ -9,6 +9,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import org.ssssssss.magicboot.constant.ERPURLConstant; import org.ssssssss.magicboot.fxapi.HttpClientResult; import org.ssssssss.magicboot.fxapi.HttpClientUtils; import org.ssssssss.magicboot.fxapi.XKTokenAccess; @@ -223,7 +224,7 @@ public class salesPredictionController { */ public void getSynDataSave(StringBuffer stringBuffer,Boolean sendFlag,FXHTTP fxapi,String dataId,String nameData,String obj,JSONObject str) { String syn_type = "0";//同步类型 0新增 1修改 2删除 - String res_url = "http://192.168.31.158:8022/ierp/kapi/v2/f9w5/sm/f9w5_salespred/salespredSave"; + String res_url = ERPURLConstant.ERP_URL + "/ierp/kapi/v2/f9w5/sm/f9w5_salespred/salespredSave"; String res_param = obj; String res = ""; try { @@ -482,7 +483,7 @@ public class salesPredictionController { */ public void getSynDataSaveUP(StringBuffer stringBuffer,Boolean sendFlag,FXHTTP fxapi,String dataId,String nameData,String obj,JSONObject str) { String syn_type = "1";//同步类型 0新增 1修改 2删除 - String res_url = "http://192.168.31.158:8022/ierp/kapi/v2/f9w5/sm/f9w5_salespred/salespredSave"; + String res_url = ERPURLConstant.ERP_URL + "/ierp/kapi/v2/f9w5/sm/f9w5_salespred/salespredSave"; String res_param = obj; String res = ""; try { diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/utils/KingDeeUtils.java b/magic-boot/src/main/java/org/ssssssss/magicboot/utils/KingDeeUtils.java index 49c4123..eaf0194 100644 --- a/magic-boot/src/main/java/org/ssssssss/magicboot/utils/KingDeeUtils.java +++ b/magic-boot/src/main/java/org/ssssssss/magicboot/utils/KingDeeUtils.java @@ -7,6 +7,7 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.web.client.RestClientException; import org.springframework.web.client.RestTemplate; +import org.ssssssss.magicboot.constant.ERPURLConstant; import org.ssssssss.magicboot.controller.KDTokenController; import java.util.HashMap; @@ -26,7 +27,7 @@ public class KingDeeUtils { * @Author weiloong_zhang */ public void audit(String ErpId, String BillType) { - String url = "http://192.168.31.158:8022/ierp/kapi/v2/f9w5/devportal/operation/submit"; + String url = ERPURLConstant.ERP_URL + "/ierp/kapi/v2/f9w5/devportal/operation/submit"; //开始封装参数 Map auditParams = new HashMap(); diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/zdyutils/FXTIC.java b/magic-boot/src/main/java/org/ssssssss/magicboot/zdyutils/FXTIC.java index a8139e9..8e8f324 100644 --- a/magic-boot/src/main/java/org/ssssssss/magicboot/zdyutils/FXTIC.java +++ b/magic-boot/src/main/java/org/ssssssss/magicboot/zdyutils/FXTIC.java @@ -1,5 +1,7 @@ package org.ssssssss.magicboot.zdyutils; +import org.ssssssss.magicboot.constant.ERPURLConstant; + public class FXTIC { // public static String URL_FX_CREATE="https://open.fxiaoke.com/cgi/crm/v2/data/create"; @@ -19,7 +21,7 @@ public class FXTIC { public static String URL_DESCRIBE="https://open.fxiaoke.com/cgi/crm/v2/object/describe"; - public static String TESTERPURL="http://192.168.31.158:8022/ierp/kapi"; + public static String TESTERPURL= ERPURLConstant.ERP_URL + "/ierp/kapi"; public static String ERPURL="https://lxr2.zhydsp.cn:40448/ierp/kapi";