From 242fad1691917c4fd82c7f04b6190a7113628e93 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期五, 11 三月 2022 15:31:04 +0800
Subject: [PATCH] Merge branch 'pollex-dev' into sit
---
pamapi/src/main/java/com/pollex/pam/config/ApplicationProperties.java | 109 +++++++++---------------------------------------------
1 files changed, 18 insertions(+), 91 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..d692e29 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,9 @@
package com.pollex.pam.config;
+import com.pollex.pam.business.config.AppProperties;
+import com.pollex.pam.business.config.SendEmailProperties;
+import com.pollex.pam.business.config.SendSMSProperties;
+import com.pollex.pam.business.enums.SendEmailMsgMethod;
import org.springframework.boot.context.properties.ConfigurationProperties;
/**
@@ -9,7 +13,7 @@
* See {@link tech.jhipster.config.JHipsterProperties} for a good example.
*/
@ConfigurationProperties(prefix = "application", ignoreUnknownFields = false)
-public class ApplicationProperties {
+public class ApplicationProperties implements AppProperties {
private boolean mockLogin;
private String otpWebServiceUrl;
@@ -19,9 +23,9 @@
private String eServiceLoginFunc;
private String eServiceLoginSys;
private String frontEndDomain;
- private boolean sendNotifyMsg;
- private SMS sms;
- private Email email;
+ private SendSMSProperties sms;
+ private SendEmailProperties email;
+ private String fileFolderPath;
public boolean isMockLogin() {
return mockLogin;
@@ -87,105 +91,28 @@
this.frontEndDomain = frontEndDomain;
}
- public boolean isSendNotifyMsg() {
- return sendNotifyMsg;
- }
-
- public void setSendNotifyMsg(boolean sendNotifyMsg) {
- this.sendNotifyMsg = sendNotifyMsg;
- }
-
- public SMS getSms() {
+ public SendSMSProperties getSms() {
return sms;
}
- public void setSms(SMS sms) {
+ public void setSms(SendSMSProperties sms) {
this.sms = sms;
}
- public Email getEmail() {
+ public SendEmailProperties getEmail() {
return email;
}
- public void setEmail(Email email) {
+ public void setEmail(SendEmailProperties email) {
this.email = email;
}
- public static class SMS {
- private String url;
- private String sourceCode;
- private String sender;
- private String smsType;
- private String subject;
+ public String getFileFolderPath() {
+ return fileFolderPath;
+ }
- public String getUrl() {
- return url;
- }
+ public void setFileFolderPath(String fileFolderPath) {
+ this.fileFolderPath = fileFolderPath;
+ }
- public void setUrl(String url) {
- this.url = url;
- }
-
- public String getSourceCode() {
- return sourceCode;
- }
-
- public void setSourceCode(String sourceCode) {
- this.sourceCode = sourceCode;
- }
-
- public String getSender() {
- return sender;
- }
-
- public void setSender(String sender) {
- this.sender = sender;
- }
-
- public String getSmsType() {
- return smsType;
- }
-
- public void setSmsType(String smsType) {
- this.smsType = smsType;
- }
-
- public String getSubject() {
- return subject;
- }
-
- public void setSubject(String subject) {
- this.subject = subject;
- }
- }
-
- public static class Email {
- private String url;
- private String functionId;
- private String senderEmail;
-
- public String getUrl() {
- return url;
- }
-
- public void setUrl(String url) {
- this.url = url;
- }
-
- public String getFunctionId() {
- return functionId;
- }
-
- public void setFunctionId(String functionId) {
- this.functionId = functionId;
- }
-
- public String getSenderEmail() {
- return senderEmail;
- }
-
- public void setSenderEmail(String senderEmail) {
- this.senderEmail = senderEmail;
- }
- }
}
--
Gitblit v1.8.0