From f79d681f170a016f6b89a601ed11d18a7428286e Mon Sep 17 00:00:00 2001 From: "cyril.tsui" Date: Wed, 9 Jul 2025 11:42:03 +0800 Subject: [PATCH] update m18 api --- .../com/ffii/fpsms/m18/service/M18TokenService.kt | 15 ++++++++++----- src/main/resources/application.yml | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/ffii/fpsms/m18/service/M18TokenService.kt b/src/main/java/com/ffii/fpsms/m18/service/M18TokenService.kt index 515cb7c..bbd0d22 100644 --- a/src/main/java/com/ffii/fpsms/m18/service/M18TokenService.kt +++ b/src/main/java/com/ffii/fpsms/m18/service/M18TokenService.kt @@ -26,11 +26,16 @@ open class M18TokenService( // ) // val params = M18TokenRequest( - grant_type = m18Config?.GRANT_TYPE ?: "password", - client_id = m18Config?.CLIENT_ID ?: "M2Y1OGYxMmQtZDRiOS00OTA4LTgyNTktZDRkNzEzNWVkMzRm", - client_secret = m18Config?.CLIENT_SECRET ?: "M2Y2YjQzYzQtZTc2Mi00OTFhLTkwYmItYmJhMzFjZjEyYmY5", - username = m18Config?.USERNAME ?:"testingMTMS", - password = m18Config?.PASSWORD ?: "db25f2fc14cd2d2b1e7af307241f548fb03c312a" +// grant_type = m18Config?.GRANT_TYPE ?: "password", +// client_id = m18Config?.CLIENT_ID ?: "M2Y1OGYxMmQtZDRiOS00OTA4LTgyNTktZDRkNzEzNWVkMzRm", +// client_secret = m18Config?.CLIENT_SECRET ?: "M2Y2YjQzYzQtZTc2Mi00OTFhLTkwYmItYmJhMzFjZjEyYmY5", +// username = m18Config?.USERNAME ?:"testingMTMS", +// password = m18Config?.PASSWORD ?: "db25f2fc14cd2d2b1e7af307241f548fb03c312a" + grant_type = "password", + client_id = "M2Y1OGYxMmQtZDRiOS00OTA4LTgyNTktZDRkNzEzNWVkMzRm", + client_secret = "M2Y2YjQzYzQtZTc2Mi00OTFhLTkwYmItYmJhMzFjZjEyYmY5", + username = "testingMTMS", + password = "db25f2fc14cd2d2b1e7af307241f548fb03c312a" ) apiCallerService diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index cb17e0f..d129fd4 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -34,7 +34,7 @@ m18: client-secret: M2Y2YjQzYzQtZTc2Mi00OTFhLTkwYmItYmJhMzFjZjEyYmY5 username: testingMTMS password: db25f2fc14cd2d2b1e7af307241f548fb03c312a - base-url: http://16.162.251.126/jsf/rfws + base-url: https://toa.m18saas.com/jsf/rfws base-password: qwer1234 supplier: shop-po: P06, P07