diff --git a/account-service/src/main/java/com/drinkool/services/OtpService.java b/account-service/src/main/java/com/drinkool/services/OtpService.java index 5140f7b..fa45657 100644 --- a/account-service/src/main/java/com/drinkool/services/OtpService.java +++ b/account-service/src/main/java/com/drinkool/services/OtpService.java @@ -27,10 +27,14 @@ public class OtpService { countCommands.setex(key, 300, otp); + String smsStatus = null; + try { - smsApi.sendSMS(phone, "Mã OTP drinkool của bạn là " + otp, 2, ""); + smsStatus = smsApi.sendSMS(phone, "Mã OTP drinkool của bạn là " + otp); } catch (IOException e) { e.printStackTrace(); + } finally { + System.out.println("SMS API response: " + smsStatus); } } diff --git a/account-service/src/main/java/com/drinkool/utils/SmsApi.java b/account-service/src/main/java/com/drinkool/utils/SmsApi.java index a1115d4..0fc8fff 100644 --- a/account-service/src/main/java/com/drinkool/utils/SmsApi.java +++ b/account-service/src/main/java/com/drinkool/utils/SmsApi.java @@ -11,11 +11,14 @@ public class SmsApi { public static final String API_URL = "https://api.speedsms.vn/index.php"; protected String mAccessToken; + protected String mBrandName; public SmsApi( @ConfigProperty(name = "sms.api.token") String accessToken + // @ConfigProperty(name = "sms.api.brand") String brandName ) { this.mAccessToken = accessToken; + this.mBrandName = ""; } /** @@ -51,7 +54,7 @@ public class SmsApi { * @param * @return: json string * */ - public String sendSMS(String to, String content, int type, String sender) + public String sendSMS(String to, String content) throws IOException { String json = "{\"to\": [\"" + @@ -59,9 +62,9 @@ public class SmsApi { "\"], \"content\": \"" + EncodeNonAsciiCharacters(content) + "\", \"type\":" + - type + + 4 + ", \"brandname\":\"" + - sender + + this.mBrandName + "\"}"; URI uri = URI.create(API_URL + "/sms/send"); HttpURLConnection conn = (HttpURLConnection) uri.toURL().openConnection(); diff --git a/account-service/src/main/resources/application.properties b/account-service/src/main/resources/application.properties index 3349bd8..d86521c 100644 --- a/account-service/src/main/resources/application.properties +++ b/account-service/src/main/resources/application.properties @@ -2,7 +2,7 @@ quarkus.datasource.db-kind=postgresql quarkus.datasource.username=postgres quarkus.datasource.password=password -quarkus.datasource.jdbc.url=jdbc:postgresql://localhost:5432/postgres +quarkus.datasource.jdbc.url=jdbc:postgresql://host.docker.internal:5432/postgres quarkus.hibernate-orm.database.generation=update @@ -27,4 +27,7 @@ quarkus.index-dependency.lib.artifact-id=lib quarkus.native.container-build=true quarkus.native.remote-container-build=true quarkus.native.additional-build-args=--initialize-at-run-time=com.password4j.AlgorithmFinder,--future-defaults=all -quarkus.native.resources.includes=com/google/i18n/phonenumbers/data/**/* \ No newline at end of file +quarkus.native.resources.includes=com/google/i18n/phonenumbers/data/**/* + +# Sms API +sms.api.token=vc6kYQey8nFG7uRe7U4eYB3Iwq2JAiQa \ No newline at end of file diff --git a/account-service/src/test/java/com/drinkool/services/CustomerServiceTest.java b/account-service/src/test/java/com/drinkool/services/CustomerServiceTest.java index 2732b39..61e9be1 100644 --- a/account-service/src/test/java/com/drinkool/services/CustomerServiceTest.java +++ b/account-service/src/test/java/com/drinkool/services/CustomerServiceTest.java @@ -147,12 +147,7 @@ public class CustomerServiceTest { String.class ); - verify(smsApiMock).sendSMS( - eq(phone), - contentCaptor.capture(), - anyInt(), - anyString() - ); + verify(smsApiMock).sendSMS(eq(phone), contentCaptor.capture()); // 4. Trích xuất mã OTP từ nội dung tin nhắn đã bắt được // Giả sử tin nhắn có định dạng: "... là 123456" diff --git a/account-service/src/test/java/com/drinkool/services/OtpServiceTest.java b/account-service/src/test/java/com/drinkool/services/OtpServiceTest.java index 41fe505..5f4d567 100644 --- a/account-service/src/test/java/com/drinkool/services/OtpServiceTest.java +++ b/account-service/src/test/java/com/drinkool/services/OtpServiceTest.java @@ -60,12 +60,7 @@ public class OtpServiceTest { String.class ); - verify(smsApiMock).sendSMS( - eq(phone), - contentCaptor.capture(), - anyInt(), - anyString() - ); + verify(smsApiMock).sendSMS(eq(phone), contentCaptor.capture()); // 4. Trích xuất mã OTP từ nội dung tin nhắn đã bắt được // Giả sử tin nhắn có định dạng: "... là 123456" @@ -117,12 +112,7 @@ public class OtpServiceTest { String.class ); - verify(smsApiMock).sendSMS( - eq(phone), - contentCaptor.capture(), - anyInt(), - anyString() - ); + verify(smsApiMock).sendSMS(eq(phone), contentCaptor.capture()); // 4. Trích xuất mã OTP từ nội dung tin nhắn đã bắt được // Giả sử tin nhắn có định dạng: "... là 123456"