Merge remote-tracking branch 'origin/jenkins_with_weblogic' of C:/KJB_DEV/git-bundles/bundles/251222/elink-online-common_incremental_2025-12-01.bundle into jenkins_with_weblogic
This commit is contained in:
+6
-3
@@ -327,6 +327,7 @@ public class HttpClient5AdapterServiceRest extends HttpClient5AdapterServiceSupp
|
|||||||
auth = niceToken + ":" + currentTime + ":" + clientId ;
|
auth = niceToken + ":" + currentTime + ":" + clientId ;
|
||||||
logger.debug("HttpClientAdapterServiceRest] NiceOn auth = [" + auth + "]");
|
logger.debug("HttpClientAdapterServiceRest] NiceOn auth = [" + auth + "]");
|
||||||
auth = Base64.getEncoder().encodeToString(auth.getBytes("UTF-8"));
|
auth = Base64.getEncoder().encodeToString(auth.getBytes("UTF-8"));
|
||||||
|
logger.debug("HttpClientAdapterServiceRest] NiceOn Base64 encoded auth = [" + auth + "]");
|
||||||
|
|
||||||
setNiceOnAuthHeaders(method, auth);
|
setNiceOnAuthHeaders(method, auth);
|
||||||
} else {
|
} else {
|
||||||
@@ -1071,8 +1072,10 @@ public class HttpClient5AdapterServiceRest extends HttpClient5AdapterServiceSupp
|
|||||||
break;
|
break;
|
||||||
case "AES256-NICEON":
|
case "AES256-NICEON":
|
||||||
try {
|
try {
|
||||||
String key = clientSecretKey.substring(10,42);
|
String key = clientSecretKey.substring(10,42);
|
||||||
|
logger.debug("HttpClientAdapterServiceRest] NICE ON AES256 Encryption key is :+="+key);
|
||||||
encryptedMessage = AES256Cipher.encrypt(eaiBody.toString(), key);
|
encryptedMessage = AES256Cipher.encrypt(eaiBody.toString(), key);
|
||||||
|
//encryptedMessage = ExchangeCrypto.encodedData(eaiStringBody, clientSecretKey);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
logger.error("HttpClientAdapterServiceRest] AES256 Encryption error=" + e.getMessage());
|
logger.error("HttpClientAdapterServiceRest] AES256 Encryption error=" + e.getMessage());
|
||||||
@@ -1257,8 +1260,8 @@ public class HttpClient5AdapterServiceRest extends HttpClient5AdapterServiceSupp
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case "AES256-NICEON":
|
case "AES256-NICEON":
|
||||||
try {
|
try {
|
||||||
String key = clientSecretKey.substring(10,42);
|
String key = clientSecretKey.substring(10,42);
|
||||||
String decryptedStrMessage = AES256Cipher.decrypt(eaiStringBody, key);
|
String decryptedStrMessage = AES256Cipher.decrypt(eaiStringBody, key);
|
||||||
decryptedMessage = decryptedStrMessage.getBytes(StandardCharsets.UTF_8);
|
decryptedMessage = decryptedStrMessage.getBytes(StandardCharsets.UTF_8);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
|||||||
+1
-1
@@ -283,7 +283,7 @@ public class HttpClientAccessTokenServiceWithBase64NiceOn implements HttpClientA
|
|||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
logger.error("[HttpClientAccessTokenServiceWithBase64NiceOn] retrieve accessToken exception :" + e.getMessage());
|
logger.error("[HttpClientAccessTokenServiceWithBase64NiceOn] retrieve accessToken exception :" + e.getMessage());
|
||||||
return accessToken;
|
return accessToken;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user