From 48922e41e0313c82b85e11a5845eb601d2afa940 Mon Sep 17 00:00:00 2001 From: zzs Date: Fri, 17 Jan 2025 14:50:06 +0800 Subject: [PATCH] ci:change api endpoint --- .../crm/module/crm/service/ProxyService.java | 41 ++++++++++++++----- .../src/main/resources/application.yaml | 9 ++++ 2 files changed, 40 insertions(+), 10 deletions(-) diff --git a/ensign-module-crm/ensign-module-crm-biz/src/main/java/com/ensign/crm/module/crm/service/ProxyService.java b/ensign-module-crm/ensign-module-crm-biz/src/main/java/com/ensign/crm/module/crm/service/ProxyService.java index 0abfc0d..38f3c3d 100644 --- a/ensign-module-crm/ensign-module-crm-biz/src/main/java/com/ensign/crm/module/crm/service/ProxyService.java +++ b/ensign-module-crm/ensign-module-crm-biz/src/main/java/com/ensign/crm/module/crm/service/ProxyService.java @@ -80,6 +80,27 @@ public class ProxyService { @Value("${ensign.kingdee.env}") private String env; + @Value("${ensign.kingdee.appToken.appId}") + private String appId; + + @Value("${ensign.kingdee.appToken.appSecuret}") + private String appSecuret; + + @Value("${ensign.kingdee.appToken.tenantid}") + private String tenantid; + + @Value("${ensign.kingdee.appToken.accountId}") + private String accountId; + + @Value("${ensign.kingdee.appToken.language}") + private String language; + + @Value("${ensign.kingdee.accessToken.user}") + private String user; + + @Value("${ensign.kingdee.accessToken.usertype}") + private String usertype; + private final String redisKingdeeKey = "kingdee:accessToken"; @Resource @@ -383,11 +404,11 @@ public class ProxyService { Map body = new HashMap<>(); - body.put("appId", "CRM"); - body.put("appSecuret", "yx.CRM.tksecurit@240924"); - body.put("tenantid", "yxzg-topview-dev"); - body.put("accountId", "1878420900609526784"); - body.put("language", "zh_CN"); + body.put("appId", appId); + body.put("appSecuret", appSecuret); + body.put("tenantid", tenantid); + body.put("accountId", accountId); + body.put("language", language); HttpEntity reqEntity = new StringEntity(JSONUtil.toJsonStr(body), "utf-8"); @@ -420,12 +441,12 @@ public class ProxyService { Map body = new HashMap<>(); - body.put("user", "COSMIC"); + body.put("user", user); body.put("apptoken", appToken); - body.put("tenantid", "yxgz-prod"); - body.put("accountId", "1878420900609526784"); - body.put("language", "zh_CN"); - body.put("usertype", "UserName"); + body.put("tenantid", tenantid); + body.put("accountId", accountId); + body.put("language", language); + body.put("usertype", usertype); HttpEntity reqEntity = new StringEntity(JSONUtil.toJsonStr(body), "utf-8"); diff --git a/ensign-server/src/main/resources/application.yaml b/ensign-server/src/main/resources/application.yaml index 1185acd..b6ccab6 100644 --- a/ensign-server/src/main/resources/application.yaml +++ b/ensign-server/src/main/resources/application.yaml @@ -272,4 +272,13 @@ ensign: test-inner-end-point: 'http://10.64.112.152:8022' prod-public-end-point: 'http://122.4.221.130:8022' prod-inner-end-point: 'http://10.64.111.134:8022' + appToken: + appId: 'CRM' + appSecuret: 'yx.CRM.tksecurit@240924' + tenantid: 'yxzg-topview-dev' + accountId: '1878420900609526784' + language: 'zh_CN' + accessToken: + user: 'COSMIC' + usertype: 'UserName' debug: false \ No newline at end of file