From a3716f72066d25d745f4d5103ff23a553c3e102b Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期四, 17 二月 2022 11:41:19 +0800
Subject: [PATCH] Merge branch 'sit' into uat
---
pamapi/src/main/java/com/pollex/pam/config/ApplicationProperties.java | 46 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 37 insertions(+), 9 deletions(-)
diff --git a/pamapi/src/main/java/com/pollex/pam/config/ApplicationProperties.java b/pamapi/src/main/java/com/pollex/pam/config/ApplicationProperties.java
index 332ead8..60b33ca 100644
--- a/pamapi/src/main/java/com/pollex/pam/config/ApplicationProperties.java
+++ b/pamapi/src/main/java/com/pollex/pam/config/ApplicationProperties.java
@@ -1,5 +1,6 @@
package com.pollex.pam.config;
+import com.pollex.pam.enums.SendEmailMsgMethod;
import org.springframework.boot.context.properties.ConfigurationProperties;
/**
@@ -19,9 +20,9 @@
private String eServiceLoginFunc;
private String eServiceLoginSys;
private String frontEndDomain;
- private boolean sendNotifyMsg;
private SMS sms;
private Email email;
+ private String fileFolderPath;
public boolean isMockLogin() {
return mockLogin;
@@ -87,14 +88,6 @@
this.frontEndDomain = frontEndDomain;
}
- public boolean isSendNotifyMsg() {
- return sendNotifyMsg;
- }
-
- public void setSendNotifyMsg(boolean sendNotifyMsg) {
- this.sendNotifyMsg = sendNotifyMsg;
- }
-
public SMS getSms() {
return sms;
}
@@ -117,6 +110,7 @@
private String sender;
private String smsType;
private String subject;
+ private boolean sendNotifyMsg;
public String getUrl() {
return url;
@@ -157,12 +151,22 @@
public void setSubject(String subject) {
this.subject = subject;
}
+
+ public boolean isSendNotifyMsg() {
+ return sendNotifyMsg;
+ }
+
+ public void setSendNotifyMsg(boolean sendNotifyMsg) {
+ this.sendNotifyMsg = sendNotifyMsg;
+ }
}
public static class Email {
private String url;
private String functionId;
private String senderEmail;
+ private boolean sendNotifyMsg;
+ private SendEmailMsgMethod method;
public String getUrl() {
return url;
@@ -187,5 +191,29 @@
public void setSenderEmail(String senderEmail) {
this.senderEmail = senderEmail;
}
+
+ public boolean isSendNotifyMsg() {
+ return sendNotifyMsg;
+ }
+
+ public void setSendNotifyMsg(boolean sendNotifyMsg) {
+ this.sendNotifyMsg = sendNotifyMsg;
+ }
+
+ public SendEmailMsgMethod getMethod() {
+ return method;
+ }
+
+ public void setMethod(SendEmailMsgMethod method) {
+ this.method = method;
+ }
}
+ public String getFileFolderPath() {
+ return fileFolderPath;
+ }
+
+ public void setFileFolderPath(String fileFolderPath) {
+ this.fileFolderPath = fileFolderPath;
+ }
+
}
--
Gitblit v1.8.0