diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/mservice/ApiService.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/mservice/ApiService.java index 52702c5..ddde14c 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/mservice/ApiService.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/mservice/ApiService.java @@ -31,7 +31,7 @@ import java.util.*; public class ApiService { private static final Log logger = LogFactory.getLog(ApiService.class); - public static String getBIPToken() { + public static String getBIPToken(String domainName) { String access_token = null; long currentTimeMillis = System.currentTimeMillis(); try { @@ -43,7 +43,7 @@ public class ApiService { String signature = generateSignature("appKey" + appKey + "timestamp" + timestamp); // 构建URL - String urlString = "https://biptest.ctny.com.cn/iuap-api-auth/open-auth/selfAppAuth/getAccessToken" + + String urlString = domainName + "/iuap-api-auth/open-auth/selfAppAuth/getAccessToken" + "?appKey=22564a240d3140d0b15582aca71a748c" + "×tamp=" + currentTimeMillis + "&signature=" + signature; diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/ApiMappingBillPlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/ApiMappingBillPlugin.java index 1258939..fa04893 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/ApiMappingBillPlugin.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/ApiMappingBillPlugin.java @@ -50,8 +50,10 @@ public class ApiMappingBillPlugin extends AbstractFormPlugin implements Plugin { if ("shkd_generatejson".equals(itemKey)) { // 获取想要推送单据编码 String billNumber = dataEntity.getString("shkd_sourcenumber"); + logger.info("获取推送单据编码 → billNumber:{}", billNumber); // 获取想要推送单据类型 - String billMark = dataEntity.getDynamicObject("shkd_sourcebill").getDataEntityType().getName(); + String billMark = dataEntity.getDynamicObject("shkd_sourcebill").getString("number"); + logger.info("获取推送单据类型 → billMark:{}", billMark); // 获取推送单据对象 DynamicObject billObject = BusinessDataServiceHelper.loadSingle(billMark, new QFilter("billno", QCP.equals, billNumber).toArray()); logger.info("获取推送对象 → billObject:{}", billObject); @@ -138,10 +140,12 @@ public class ApiMappingBillPlugin extends AbstractFormPlugin implements Plugin { } jsonArray.add(json); codeEdit.setText(jsonArray.toJSONString()); + logger.info("JSON:{}", jsonArray.toJSONString()); } else { JSONObject resultJson = new JSONObject(); processFloor(resultJson, "data", floors.get(0), floors, billObject); codeEdit.setText(resultJson.toJSONString()); + logger.info("JSON:{}", resultJson.toJSONString()); } } @@ -158,15 +162,19 @@ public class ApiMappingBillPlugin extends AbstractFormPlugin implements Plugin { } if ("shkd_testapi".equals(itemKey)) { + String domainName = dataEntity.getString("shkd_domainname"); String url = dataEntity.getString("shkd_url"); ApiEntity apiEntity = new ApiEntity(); - apiEntity.setURL(url); + apiEntity.setURL(domainName + url); apiEntity.setMethod("POST"); Map headMap = new HashMap<>(); headMap.put("Content-Type", "application/json"); apiEntity.setHeaders(headMap); Map paramsMap = new HashMap<>(); - paramsMap.put("access_token", ApiService.getBIPToken()); + + String old_url = "https://biptest.ctny.com.cn"; + + paramsMap.put("access_token", ApiService.getBIPToken(domainName)); apiEntity.setQueryParams(paramsMap); apiEntity.setRequestBody(codeEdit.getText()); JSONObject responseBody = ApiEntity.getResponseBody(apiEntity); diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/ApiTestBillPlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/ApiTestBillPlugin.java index a397524..73d5f47 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/ApiTestBillPlugin.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/ApiTestBillPlugin.java @@ -32,7 +32,8 @@ public class ApiTestBillPlugin extends AbstractBillPlugIn implements Plugin { String key = evt.getItemKey(); if ("shkd_token".equals(key)) { - String bipToken = ApiService.getBIPToken(); + String url = this.getModel().getValue("shkd_url").toString(); + String bipToken = ApiService.getBIPToken(url); this.getView().showTipNotification(bipToken); }