From eeb7c0a2d6f037d515bb822d739036b69c4dc73a Mon Sep 17 00:00:00 2001
From: 沙世明 <shashiming@prec-tech.com>
Date: 星期五, 08 四月 2022 17:14:12 +0800
Subject: [PATCH] Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBG
---
force-app/main/default/classes/NFM503InfoFileBatch.cls | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/force-app/main/default/classes/NFM503InfoFileBatch.cls b/force-app/main/default/classes/NFM503InfoFileBatch.cls
index 5149138..25c2b6b 100644
--- a/force-app/main/default/classes/NFM503InfoFileBatch.cls
+++ b/force-app/main/default/classes/NFM503InfoFileBatch.cls
@@ -70,14 +70,15 @@
timeslot = newTime.getTime() - oldTime.getTime();
}
// System.debug('++++1++++' + token + ' : ' + timeslot);
+ PIHelper.piIntegration pi =PIHelper.getPIIntegrationInfo('NFM503');
if (string.isblank(token) || timeslot > 1800000) {
//UP TO AWAS TOKEN 20220225 SUSHANHU START
- NFMUtil.response response = NFMUtil.getAWSToken();
- //UP TO AWAS TOKEN 20220225 SUSHANHU END
- if (String.isBlank(response.responseBody)) {
- bidInfoFile.ErrorMessage__c = '503token:' + response.status;
- }
- token = response.responseBody;
+ // NFMUtil.response response = NFMUtil.getAWSToken();
+ // //UP TO AWAS TOKEN 20220225 SUSHANHU END
+ // if (String.isBlank(response.responseBody)) {
+ // bidInfoFile.ErrorMessage__c = '503token:' + response.status;
+ // }
+ token = pi.token;
oldTime = Datetime.now();
token503.NFM501_Token__c = token;
oldTime503.NFM501_Gain_End_Time__c = oldTime;
@@ -93,7 +94,6 @@
//UP TO NEW AWS method sushanhu start 20220301
// List< Tender_information__c> updateTenderList = new List< Tender_information__c>();
List<FileAddress__c> fileList = new List<FileAddress__c>();
- PIHelper.piIntegration pi =PIHelper.getPIIntegrationInfo('NFM503');
transUrl =pi.searchUrl;
NFMUtil.response response = NFMUtil.getAWSQLMData(pi.newUrl ,JSON.serialize(queryfileList), token);
system.debug('aws result'+response.responseBody);
@@ -213,7 +213,7 @@
if (System.Test.isRunningTest()) {
throw new ControllerUtil.myException('aaa');
}
- return;
+ // return;
} catch (Exception ex) {
if (sp != null) {
Database.rollback(sp);
--
Gitblit v1.9.1