From c191650aa3cdba826723a84690b7bfa3c09ea2ef Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期五, 17 十二月 2021 15:30:22 +0800
Subject: [PATCH] [update] 調整sit與uat設定檔，並將測試接口permitAll出來
---
pamapi/src/main/java/com/pollex/pam/config/SecurityConfiguration.java | 1 +
pamapi/src/main/resources/config/application-dev.yml | 6 +++---
pamapi/src/main/resources/config/application-sit.yml | 8 ++++++++
pamapi/src/main/java/com/pollex/pam/web/rest/errors/SendSMSFailException.java | 4 ++++
pamapi/src/main/resources/config/application-uat.yml | 8 ++++++++
pamapi/src/main/java/com/pollex/pam/service/dto/SendMailResponse.java | 14 ++++++++++++++
pamapi/src/main/java/com/pollex/pam/web/rest/errors/SendEmailFailException.java | 7 +++++--
pamapi/src/main/java/com/pollex/pam/service/dto/SendSMSResponse.java | 10 ++++++++++
8 files changed, 53 insertions(+), 5 deletions(-)
diff --git a/pamapi/src/main/java/com/pollex/pam/config/SecurityConfiguration.java b/pamapi/src/main/java/com/pollex/pam/config/SecurityConfiguration.java
index 6fca6d3..45c2e6d 100644
--- a/pamapi/src/main/java/com/pollex/pam/config/SecurityConfiguration.java
+++ b/pamapi/src/main/java/com/pollex/pam/config/SecurityConfiguration.java
@@ -82,6 +82,7 @@
.antMatchers("/api/register").permitAll()
.antMatchers("/api/activate").permitAll()
.antMatchers("/api/testLogin/**").permitAll()
+ .antMatchers("/api/test/sendMsg/**").permitAll()
.antMatchers("/api/otp/**").permitAll()
.antMatchers("/api/login/validate/**").permitAll()
.antMatchers("/api/eService/authenticate").permitAll()
diff --git a/pamapi/src/main/java/com/pollex/pam/service/dto/SendMailResponse.java b/pamapi/src/main/java/com/pollex/pam/service/dto/SendMailResponse.java
index bc29f12..808dcf6 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/dto/SendMailResponse.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/dto/SendMailResponse.java
@@ -21,5 +21,19 @@
public void setMessageStatus(String messageStatus) {
this.messageStatus = messageStatus;
}
+
+ @Override
+ public String toString() {
+ return "Data{" +
+ "messageStatus='" + messageStatus + '\'' +
+ '}';
+ }
+ }
+
+ @Override
+ public String toString() {
+ return "SendMailResponse{" +
+ "data=" + data +
+ '}';
}
}
diff --git a/pamapi/src/main/java/com/pollex/pam/service/dto/SendSMSResponse.java b/pamapi/src/main/java/com/pollex/pam/service/dto/SendSMSResponse.java
index fee3219..9073766 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/dto/SendSMSResponse.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/dto/SendSMSResponse.java
@@ -47,4 +47,14 @@
public void setErrorMsg(String errorMsg) {
this.errorMsg = errorMsg;
}
+
+ @Override
+ public String toString() {
+ return "SendSMSResponse{" +
+ "pKey='" + pKey + '\'' +
+ ", returnCode='" + returnCode + '\'' +
+ ", msgBatchNo='" + msgBatchNo + '\'' +
+ ", errorMsg='" + errorMsg + '\'' +
+ '}';
+ }
}
diff --git a/pamapi/src/main/java/com/pollex/pam/web/rest/errors/SendEmailFailException.java b/pamapi/src/main/java/com/pollex/pam/web/rest/errors/SendEmailFailException.java
index 209e562..b43324b 100644
--- a/pamapi/src/main/java/com/pollex/pam/web/rest/errors/SendEmailFailException.java
+++ b/pamapi/src/main/java/com/pollex/pam/web/rest/errors/SendEmailFailException.java
@@ -1,8 +1,11 @@
package com.pollex.pam.web.rest.errors;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ResponseStatus(code = HttpStatus.INTERNAL_SERVER_ERROR, reason = "send email failed")
public class SendEmailFailException extends RuntimeException {
- public SendEmailFailException() {
- }
+ public SendEmailFailException() {}
public SendEmailFailException(String message) {
super(message);
}
diff --git a/pamapi/src/main/java/com/pollex/pam/web/rest/errors/SendSMSFailException.java b/pamapi/src/main/java/com/pollex/pam/web/rest/errors/SendSMSFailException.java
index 688751d..acfeda4 100644
--- a/pamapi/src/main/java/com/pollex/pam/web/rest/errors/SendSMSFailException.java
+++ b/pamapi/src/main/java/com/pollex/pam/web/rest/errors/SendSMSFailException.java
@@ -1,5 +1,9 @@
package com.pollex.pam.web.rest.errors;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ResponseStatus(code = HttpStatus.INTERNAL_SERVER_ERROR, reason = "send email failed")
public class SendSMSFailException extends RuntimeException{
public SendSMSFailException(){}
public SendSMSFailException(String message) {
diff --git a/pamapi/src/main/resources/config/application-dev.yml b/pamapi/src/main/resources/config/application-dev.yml
index 0239098..ddf5c77 100644
--- a/pamapi/src/main/resources/config/application-dev.yml
+++ b/pamapi/src/main/resources/config/application-dev.yml
@@ -120,10 +120,10 @@
e-service-login-func: ValidateUsrLogin
e-service-login-sys: epos
sms:
- url: https://vtwlifewinbo66.pru.intranet.asia/MesgQueueMgmnt/rest/smsSendMsgResource
+ url: https://localhost:8081/testSMS
source-code: ePos
sender: POS
- sms-type: 0017
+ sms-type: '0017'
email:
- url: https://vtwlifeopensysuat.pru.intranet.asia/tsgw/mq/mqSendMail
+ url: https://localhost:8081/testEmail
function-id: epos
diff --git a/pamapi/src/main/resources/config/application-sit.yml b/pamapi/src/main/resources/config/application-sit.yml
index f2bfc56..26a2198 100644
--- a/pamapi/src/main/resources/config/application-sit.yml
+++ b/pamapi/src/main/resources/config/application-sit.yml
@@ -117,3 +117,11 @@
e-service-login-url: https://eserviceuat.pcalife.com.tw/sso/chatbotValidate
e-service-login-func: ValidateUsrLogin
e-service-login-sys: epos
+ sms:
+ url: https://vtwlifewinbo66.pru.intranet.asia/MesgQueueMgmnt/rest/smsSendMsgResource
+ source-code: ePos
+ sender: POS
+ sms-type: '0017'
+ email:
+ url: https://vtwlifeopensysuat.pru.intranet.asia/tsgw/mq/mqSendMail
+ function-id: epos
diff --git a/pamapi/src/main/resources/config/application-uat.yml b/pamapi/src/main/resources/config/application-uat.yml
index 58ac9bb..e23f9ac 100644
--- a/pamapi/src/main/resources/config/application-uat.yml
+++ b/pamapi/src/main/resources/config/application-uat.yml
@@ -117,3 +117,11 @@
e-service-login-url: https://eserviceuat.pcalife.com.tw/sso/chatbotValidate
e-service-login-func: ValidateUsrLogin
e-service-login-sys: epos
+ sms:
+ url: https://vtwlifewinbo66.pru.intranet.asia/MesgQueueMgmnt/rest/smsSendMsgResource
+ source-code: ePos
+ sender: POS
+ sms-type: '0017'
+ email:
+ url: https://vtwlifeopensysuat.pru.intranet.asia/tsgw/mq/mqSendMail
+ function-id: epos
--
Gitblit v1.8.0