提交 bc3e3d6f 编写于 作者: W wenyann

测试

上级 21d7beb8
...@@ -28,7 +28,7 @@ public interface ParamConstants { ...@@ -28,7 +28,7 @@ public interface ParamConstants {
} }
enum Classify implements ParamConstants { enum Classify implements ParamConstants {
MAIL("meter"), MAIL("smtp"),
REGISTRY("registry"); REGISTRY("registry");
private String value; private String value;
...@@ -86,14 +86,15 @@ public interface ParamConstants { ...@@ -86,14 +86,15 @@ public interface ParamConstants {
} }
} }
public static enum MAIL { enum MAIL {
HOST("meter.host", 1), SERVER("smtp.server", 1),
PORT("meter.port", 2), PORT("smtp.port", 2),
ACCOUNT("meter.account", 3), ACCOUNT("smtp.account", 3),
PASSWORD("meter.password", 4), PASSWORD("smtp.password", 4),
SSL("meter.ssl", 5), SSL("smtp.ssl", 5),
TLS("meter.tls", 6), TLS("smtp.tls", 6),
ANON("meter.anon", 7); SMTP("smtp.smtp", 7);
/* ANON("smtp.anon", 7);*/
private String key; private String key;
private Integer value; private Integer value;
......
...@@ -4,21 +4,21 @@ import io.metersphere.base.domain.SystemParameter; ...@@ -4,21 +4,21 @@ import io.metersphere.base.domain.SystemParameter;
import io.metersphere.base.domain.SystemParameterExample; import io.metersphere.base.domain.SystemParameterExample;
import io.metersphere.base.mapper.SystemParameterMapper; import io.metersphere.base.mapper.SystemParameterMapper;
import io.metersphere.commons.constants.ParamConstants; import io.metersphere.commons.constants.ParamConstants;
import io.metersphere.commons.exception.MSException;
import io.metersphere.commons.utils.EncryptUtils; import io.metersphere.commons.utils.EncryptUtils;
import io.metersphere.i18n.Translator;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.mail.javamail.JavaMailSenderImpl;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import javax.mail.MessagingException;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Properties; import java.util.Properties;
import org.springframework.mail.javamail.JavaMailSenderImpl;
import javax.annotation.Resource;
@Service @Service
public class SystemParameterService { public class SystemParameterService {
...@@ -65,7 +65,7 @@ public class SystemParameterService { ...@@ -65,7 +65,7 @@ public class SystemParameterService {
public void testConnection(HashMap<String, String> hashMap) { public void testConnection(HashMap<String, String> hashMap) {
JavaMailSenderImpl javaMailSender = new JavaMailSenderImpl(); JavaMailSenderImpl javaMailSender = new JavaMailSenderImpl();
javaMailSender.setDefaultEncoding("UTF-8"); javaMailSender.setDefaultEncoding("UTF-8");
javaMailSender.setHost(hashMap.get(ParamConstants.MAIL.PORT.getKey())); javaMailSender.setHost(hashMap.get(ParamConstants.MAIL.SERVER.getKey()));
javaMailSender.setPort(Integer.valueOf(hashMap.get(ParamConstants.MAIL.PORT.getKey()))); javaMailSender.setPort(Integer.valueOf(hashMap.get(ParamConstants.MAIL.PORT.getKey())));
javaMailSender.setUsername(hashMap.get(ParamConstants.MAIL.ACCOUNT.getKey())); javaMailSender.setUsername(hashMap.get(ParamConstants.MAIL.ACCOUNT.getKey()));
javaMailSender.setPassword(hashMap.get(ParamConstants.MAIL.PASSWORD.getKey())); javaMailSender.setPassword(hashMap.get(ParamConstants.MAIL.PASSWORD.getKey()));
...@@ -78,6 +78,12 @@ public class SystemParameterService { ...@@ -78,6 +78,12 @@ public class SystemParameterService {
props.put("mail.smtp.starttls.enable", "true"); props.put("mail.smtp.starttls.enable", "true");
} }
javaMailSender.setJavaMailProperties(props); javaMailSender.setJavaMailProperties(props);
try {
javaMailSender.testConnection();
} catch (MessagingException e) {
MSException.throwException(Translator.get("connection_failed"));
}
} }
} }
...@@ -88,3 +88,4 @@ module_created_automatically=If there is no such module, will be created automat ...@@ -88,3 +88,4 @@ module_created_automatically=If there is no such module, will be created automat
options=options options=options
please_input_workspace_member=Please input workspace merber please_input_workspace_member=Please input workspace merber
test_case_report_template_repeat=The workspace has the same name template test_case_report_template_repeat=The workspace has the same name template
connection_failed=Connection failed
\ No newline at end of file
...@@ -88,3 +88,4 @@ module_created_automatically=若无该模块将自动创建 ...@@ -88,3 +88,4 @@ module_created_automatically=若无该模块将自动创建
options=选项 options=选项
please_input_workspace_member=请填写该工作空间相关人员 please_input_workspace_member=请填写该工作空间相关人员
test_case_report_template_repeat=同一工作空间下不能存在同名模版 test_case_report_template_repeat=同一工作空间下不能存在同名模版
connection_failed=连接失败
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册