weiloong_zhang/zhyManagement
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复了金蝶测试环境和正式环境token主键冲突问题，优化了供应商的筛选条件

Browse Source
This commit is contained in:
itzhang 2025-06-28 08:55:13 +08:00
parent 25604adebe
commit 0724d574df
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/management/controller/KDTokenController.java
View File

@ -196,9 +196,9 @@ public class KDTokenController {
String accessToken = ""; String accessToken = "";
//判断咖啡因中是否存在accessToken //判断咖啡因中是否存在accessToken
if (CaffeineCacheUtil.get("kd_access_token") != null && !"".equals(CaffeineCacheUtil.get("kd_access_token"))) { if (CaffeineCacheUtil.get("kd_access_token_test") != null && !"".equals(CaffeineCacheUtil.get("kd_access_token_test"))) {
log.info("获取到缓存中的accessToken,{}", accessToken); log.info("获取到缓存中的accessToken,{}", accessToken);
accessToken = CaffeineCacheUtil.get("kd_access_token").toString(); accessToken = CaffeineCacheUtil.get("kd_access_token_test").toString();
return accessToken; return accessToken;
} }
@ -236,7 +236,7 @@ public class KDTokenController {
accessToken = accessTokenJSON.getJSONObject("data").getString("access_token"); accessToken = accessTokenJSON.getJSONObject("data").getString("access_token");
//存放到咖啡因之中 //存放到咖啡因之中
CaffeineCacheUtil.put("kd_access_token", accessToken); CaffeineCacheUtil.put("kd_access_token_test", accessToken);
return accessToken; return accessToken;
} }

1
src/main/java/com/management/controller/VendorController.java
View File

@ -41,6 +41,7 @@ public class VendorController {
JSONObject getVendor = crmRequestUtil.getCRMList(Arrays.asList( JSONObject getVendor = crmRequestUtil.getCRMList(Arrays.asList(
new Filter("EQ", "life_status", Arrays.asList("normal")), new Filter("EQ", "life_status", Arrays.asList("normal")),
new Filter("EQ", "record_type", Arrays.asList("record_ev1gl__c")),
//new Filter("EQ", "name", Arrays.asList("山东研了究的僧教育科技有限公司")), //new Filter("EQ", "name", Arrays.asList("山东研了究的僧教育科技有限公司")),
new Filter("EQ", "sync_status__c", Arrays.asList("option_pending_sync__c")), new Filter("EQ", "sync_status__c", Arrays.asList("option_pending_sync__c")),
new Filter("GT", "create_time", Arrays.asList("1751035349267")) new Filter("GT", "create_time", Arrays.asList("1751035349267"))