From 6fa4bba623713c396432ba8b863846883d6a1906 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期三, 26 一月 2022 10:52:23 +0800
Subject: [PATCH] Merge branch 'pollex-dev' into sit
---
pamapi/src/main/java/com/pollex/pam/config/ApplicationProperties.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 55 insertions(+), 1 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 1fb6031..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;
/**
@@ -18,6 +19,7 @@
private String eServiceLoginUrl;
private String eServiceLoginFunc;
private String eServiceLoginSys;
+ private String frontEndDomain;
private SMS sms;
private Email email;
private String fileFolderPath;
@@ -78,6 +80,14 @@
this.eServiceLoginSys = eServiceLoginSys;
}
+ public String getFrontEndDomain() {
+ return frontEndDomain;
+ }
+
+ public void setFrontEndDomain(String frontEndDomain) {
+ this.frontEndDomain = frontEndDomain;
+ }
+
public SMS getSms() {
return sms;
}
@@ -99,6 +109,8 @@
private String sourceCode;
private String sender;
private String smsType;
+ private String subject;
+ private boolean sendNotifyMsg;
public String getUrl() {
return url;
@@ -131,11 +143,30 @@
public void setSmsType(String smsType) {
this.smsType = smsType;
}
+
+ public String getSubject() {
+ return subject;
+ }
+
+ 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;
@@ -152,6 +183,30 @@
public void setFunctionId(String functionId) {
this.functionId = functionId;
}
+
+ public String getSenderEmail() {
+ return senderEmail;
+ }
+
+ 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;
@@ -160,6 +215,5 @@
public void setFileFolderPath(String fileFolderPath) {
this.fileFolderPath = fileFolderPath;
}
-
}
--
Gitblit v1.8.0