Merge branch 'master' of https://git.loafle.net/overflow/overflow_server
This commit is contained in:
commit
1e840ef024
|
@ -13,7 +13,6 @@ import java.util.Properties;
|
|||
*/
|
||||
@Configuration
|
||||
@ComponentScan(basePackages = "com.loafle.overflow")
|
||||
//@ComponentScan(basePackages = "com.loafle.overflow", includeFilters = @ComponentScan.Filter(EmailAuth.class))
|
||||
public class MailConfiguration {
|
||||
|
||||
|
||||
|
@ -29,17 +28,6 @@ public class MailConfiguration {
|
|||
@Value("${mail.protocol}")
|
||||
private String protocol;
|
||||
|
||||
@Value("${mail.properties.mail.smtp.auth}")
|
||||
private boolean smtpAuth;
|
||||
@Value("${mail.properties.mail.smtp.starttls.enable}")
|
||||
private boolean ttlEnable;
|
||||
@Value("${mail.transport.protocol}")
|
||||
private String transProtocol;
|
||||
@Value("${mail.smtps.ssl.checkserveridentity}")
|
||||
private boolean checkserver;
|
||||
@Value("${mail.smtps.ssl.trust}")
|
||||
private String sslTrust;
|
||||
|
||||
@Bean
|
||||
public JavaMailSenderImpl mailSender() {
|
||||
JavaMailSenderImpl mailSender = new JavaMailSenderImpl();
|
||||
|
@ -58,15 +46,26 @@ public class MailConfiguration {
|
|||
@Bean
|
||||
public Properties getJavaMailProperties() {
|
||||
Properties javaMailProperties = new Properties();
|
||||
javaMailProperties.put("mail.smtp.starttls.enable", this.ttlEnable);
|
||||
javaMailProperties.put("mail.smtp.auth", this.smtpAuth);
|
||||
javaMailProperties.put("mail.transport.protocol", this.transProtocol);
|
||||
javaMailProperties.put("mail.smtp.starttls.enable", true);
|
||||
javaMailProperties.put("mail.smtp.auth", true);
|
||||
javaMailProperties.put("mail.transport.protocol", "smtp");
|
||||
javaMailProperties.put("mail.debug", "true");
|
||||
javaMailProperties.put("mail.smtps.ssl.checkserveridentity", this.checkserver);
|
||||
javaMailProperties.put("mail.smtps.ssl.trust", this.sslTrust);
|
||||
javaMailProperties.put("mail.smtps.ssl.checkserveridentity", true);
|
||||
javaMailProperties.put("mail.smtps.ssl.trust", "*");
|
||||
|
||||
return javaMailProperties;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
//
|
||||
// @Value("${mail.properties.mail.smtp.auth}")
|
||||
// private boolean smtpAuth;
|
||||
// @Value("${mail.properties.mail.smtp.starttls.enable}")
|
||||
// private boolean ttlEnable;
|
||||
// @Value("${mail.transport.protocol}")
|
||||
// private String transProtocol;
|
||||
// @Value("${mail.smtps.ssl.checkserveridentity}")
|
||||
// private boolean checkserver;
|
||||
// @Value("${mail.smtps.ssl.trust}")
|
||||
// private String sslTrust;
|
||||
|
|
|
@ -22,102 +22,145 @@ INSERT INTO public.meta_infra_type (id,create_date,"name") VALUES (
|
|||
INSERT INTO public.meta_infra_type (id,create_date,"name") VALUES (
|
||||
7,'2017-06-25 17:31:42.906','OS_SERVICE');
|
||||
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
|
||||
1,'2017-06-30 13:05:40.847','APPLE',1);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
|
||||
2,'2017-06-30 13:05:40.847','MICROSOFT',1);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
|
||||
3,'2017-06-30 13:05:40.847','ASUS',1);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
|
||||
4,'2017-06-30 13:05:40.847','HP',1);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
|
||||
5,'2017-06-30 13:05:40.847','DELL',1);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
|
||||
6,'2017-06-30 13:05:40.847','LENOVO',1);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
|
||||
7,'2017-06-30 13:05:40.847','ACER',1);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
|
||||
8,'2017-06-30 13:05:40.847','SAMSUNG',1);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
|
||||
9,'2017-06-30 13:05:40.847','LG',1);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
|
||||
10,'2017-06-30 13:05:40.847','CISCO',1);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
|
||||
11,'2017-06-30 13:05:40.847','Windows',2);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
|
||||
12,'2017-06-30 13:05:40.847','Linux',2);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
|
||||
13,'2017-06-30 13:05:40.847','Mac OS',2);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
|
||||
14,'2017-06-30 13:05:40.847','Ubuntu',2);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
|
||||
15,'2017-06-30 13:05:40.847','Cent OS',2);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
|
||||
16,'2017-06-30 13:05:40.847','Fedora',2);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
|
||||
17,'2017-06-30 13:05:40.847','Red Hat',2);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
|
||||
18,'2017-06-30 13:05:40.847','Debian',2);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
|
||||
19,'2017-06-30 13:05:40.847','SUSE',2);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
|
||||
20,'2017-06-30 13:05:40.847','Core OS',2);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
|
||||
21,'2017-06-30 13:05:40.847','Amazon Linux',2);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
|
||||
22,'2017-06-30 13:05:40.847','Kubernetes',2);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
|
||||
23,'2017-06-30 13:05:40.847','Docker',2);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
|
||||
24,'2017-06-30 13:05:40.847','iOS',2);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
|
||||
25,'2017-06-30 13:05:40.847','Android',2);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
|
||||
26,'2017-06-30 13:05:40.847','Windows',3);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
|
||||
27,'2017-06-30 13:05:40.847','Mac OS',3);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
|
||||
28,'2017-06-30 13:05:40.847','Ubuntu',3);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
|
||||
29,'2017-06-30 13:05:40.847','Cent OS',3);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
|
||||
30,'2017-06-30 13:05:40.847','Fedora',3);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
|
||||
31,'2017-06-30 13:05:40.847','Red Hat',3);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
|
||||
32,'2017-06-30 13:05:40.847','Debian',3);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
|
||||
33,'2017-06-30 13:05:40.847','SUSE',3);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
|
||||
34,'2017-06-30 13:05:40.847','Core OS',3);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
|
||||
35,'2017-06-30 13:05:40.847','Amazon Linux',3);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
|
||||
36,'2017-06-30 13:05:40.847','Kubernetes',3);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
|
||||
37,'2017-06-30 13:05:40.847','Docker',3);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
|
||||
38,'2017-06-30 13:05:40.847','iOS',3);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
|
||||
39,'2017-06-30 13:05:40.847','Android',3);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
|
||||
40,'2017-06-30 13:05:40.847','MySql',7);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
|
||||
41,'2017-06-30 13:05:40.847','PostgreSQL',7);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
|
||||
42,'2017-06-30 13:05:40.847','WMI',7);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
|
||||
43,'2017-06-30 13:05:40.847','SNMP_V2',7);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
|
||||
44,'2017-06-30 13:05:40.847','UNKNOWN',7);
|
||||
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,"name",type_id) VALUES (
|
||||
1,'2017-06-25 17:31:42.916','APPLE',1);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,"name",type_id) VALUES (
|
||||
2,'2017-06-25 17:31:42.937','MICROSOFT',1);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,"name",type_id) VALUES (
|
||||
3,'2017-06-25 17:31:42.949','ASUS',1);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,"name",type_id) VALUES (
|
||||
4,'2017-06-25 17:31:42.960','HP',1);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,"name",type_id) VALUES (
|
||||
5,'2017-06-25 17:31:42.972','DELL',1);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,"name",type_id) VALUES (
|
||||
6,'2017-06-25 17:31:42.982','LENOVO',1);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,"name",type_id) VALUES (
|
||||
7,'2017-06-25 17:31:42.993','ACER',1);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,"name",type_id) VALUES (
|
||||
8,'2017-06-25 17:31:43.004','SAMSUNG',1);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,"name",type_id) VALUES (
|
||||
9,'2017-06-25 17:31:43.023','LG',1);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,"name",type_id) VALUES (
|
||||
10,'2017-06-25 17:31:43.036','CISCO',1);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,"name",type_id) VALUES (
|
||||
11,'2017-06-25 17:31:43.052','Windows',2);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,"name",type_id) VALUES (
|
||||
12,'2017-06-25 17:31:43.070','Mac OS',2);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,"name",type_id) VALUES (
|
||||
13,'2017-06-25 17:31:43.084','Ubuntu',2);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,"name",type_id) VALUES (
|
||||
14,'2017-06-25 17:31:43.102','Cent OS',2);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,"name",type_id) VALUES (
|
||||
15,'2017-06-25 17:31:43.116','Fedora',2);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,"name",type_id) VALUES (
|
||||
16,'2017-06-25 17:31:43.130','Red Hat',2);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,"name",type_id) VALUES (
|
||||
17,'2017-06-25 17:31:43.144','Debian',2);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,"name",type_id) VALUES (
|
||||
18,'2017-06-25 17:31:43.156','SUSE',2);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,"name",type_id) VALUES (
|
||||
19,'2017-06-25 17:31:43.169','Core OS',2);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,"name",type_id) VALUES (
|
||||
20,'2017-06-25 17:31:43.181','Amazon Linux',2);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,"name",type_id) VALUES (
|
||||
21,'2017-06-25 17:31:43.192','Kubernetes',2);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,"name",type_id) VALUES (
|
||||
22,'2017-06-25 17:31:43.202','Docker',2);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,"name",type_id) VALUES (
|
||||
23,'2017-06-25 17:31:43.214','iOS',2);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,"name",type_id) VALUES (
|
||||
24,'2017-06-25 17:31:43.229','Android',2);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,"name",type_id) VALUES (
|
||||
25,'2017-06-25 17:31:43.242','Windows',3);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,"name",type_id) VALUES (
|
||||
26,'2017-06-25 17:31:43.255','Mac OS',3);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,"name",type_id) VALUES (
|
||||
27,'2017-06-25 17:31:43.271','Ubuntu',3);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,"name",type_id) VALUES (
|
||||
28,'2017-06-25 17:31:43.285','Cent OS',3);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,"name",type_id) VALUES (
|
||||
29,'2017-06-25 17:31:43.298','Fedora',3);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,"name",type_id) VALUES (
|
||||
30,'2017-06-25 17:31:43.312','Red Hat',3);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,"name",type_id) VALUES (
|
||||
31,'2017-06-25 17:31:43.324','Debian',3);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,"name",type_id) VALUES (
|
||||
32,'2017-06-25 17:31:43.336','SUSE',3);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,"name",type_id) VALUES (
|
||||
33,'2017-06-25 17:31:43.347','Core OS',3);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,"name",type_id) VALUES (
|
||||
34,'2017-06-25 17:31:43.361','Amazon Linux',3);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,"name",type_id) VALUES (
|
||||
35,'2017-06-25 17:31:43.375','Kubernetes',3);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,"name",type_id) VALUES (
|
||||
36,'2017-06-25 17:31:43.387','Docker',3);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,"name",type_id) VALUES (
|
||||
37,'2017-06-25 17:31:43.399','iOS',3);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,"name",type_id) VALUES (
|
||||
38,'2017-06-25 17:31:43.410','Android',3);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,"name",type_id) VALUES (
|
||||
39,'2017-06-26 20:59:36.255','MySql',7);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,"name",type_id) VALUES (
|
||||
40,'2017-06-26 20:59:36.364','PostgreSQL',7);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,"name",type_id) VALUES (
|
||||
41,'2017-06-26 20:59:36.385','WMI',7);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,"name",type_id) VALUES (
|
||||
42,'2017-06-26 20:59:36.414','SNMP_V2',7);
|
||||
INSERT INTO public.meta_infra_vendor (id,create_date,"name",type_id) VALUES (
|
||||
43,'2017-06-27 14:32:12.506','UNKNOWN',7);
|
||||
|
||||
INSERT INTO public.meta_crawler (id,create_date,description,"name") VALUES (
|
||||
1,'2017-06-25 17:00:43.869','WMI','WMI_CRAWLER');
|
||||
INSERT INTO public.meta_crawler (id,create_date,description,"name") VALUES (
|
||||
2,'2017-06-25 17:00:43.919','SNMPV2','SNMP_V2_CRAWLER');
|
||||
INSERT INTO public.meta_crawler (id,create_date,description,"name") VALUES (
|
||||
3,'2017-06-25 17:00:43.941','SNMPV3','SNMP_V3_CRAWLER');
|
||||
INSERT INTO public.meta_crawler (id,create_date,description,"name") VALUES (
|
||||
4,'2017-06-25 17:00:43.969','MYSQL','MYSQL_CRAWLER');
|
||||
INSERT INTO public.meta_crawler (id,create_date,description,name) VALUES (
|
||||
1,'2017-06-30 12:56:08.791','ACTIVEDIRECTORY','ACTIVEDIRECTORY_CRAWLER');
|
||||
INSERT INTO public.meta_crawler (id,create_date,description,name) VALUES (
|
||||
2,'2017-06-30 12:56:08.791','CASSANDRA','CASSANDRA_CRAWLER');
|
||||
INSERT INTO public.meta_crawler (id,create_date,description,name) VALUES (
|
||||
3,'2017-06-30 12:56:08.791','DHCP','DHCP_CRAWLER');
|
||||
INSERT INTO public.meta_crawler (id,create_date,description,name) VALUES (
|
||||
4,'2017-06-30 12:56:08.791','DNS','DNS_CRAWLER');
|
||||
INSERT INTO public.meta_crawler (id,create_date,description,name) VALUES (
|
||||
5,'2017-06-30 12:56:08.791','FTP','FTP_CRAWLER');
|
||||
INSERT INTO public.meta_crawler (id,create_date,description,name) VALUES (
|
||||
6,'2017-06-30 12:56:08.791','HTTP','HTTP_CRAWLER');
|
||||
INSERT INTO public.meta_crawler (id,create_date,description,name) VALUES (
|
||||
7,'2017-06-30 12:56:08.791','IMAP','IMAP_CRAWLER');
|
||||
INSERT INTO public.meta_crawler (id,create_date,description,name) VALUES (
|
||||
8,'2017-06-30 12:56:08.791','LDAP','LDAP_CRAWLER');
|
||||
INSERT INTO public.meta_crawler (id,create_date,description,name) VALUES (
|
||||
9,'2017-06-30 12:56:08.791','MONGODB','MONGODB_CRAWLER');
|
||||
INSERT INTO public.meta_crawler (id,create_date,description,name) VALUES (
|
||||
10,'2017-06-30 12:56:08.791','MSSQL','MSSQL_CRAWLER');
|
||||
INSERT INTO public.meta_crawler (id,create_date,description,name) VALUES (
|
||||
11,'2017-06-30 12:56:08.791','MYSQL','MYSQL_CRAWLER');
|
||||
INSERT INTO public.meta_crawler (id,create_date,description,name) VALUES (
|
||||
12,'2017-06-30 12:56:08.791','NETBIOS','NETBIOS_CRAWLER');
|
||||
INSERT INTO public.meta_crawler (id,create_date,description,name) VALUES (
|
||||
13,'2017-06-30 12:56:08.791','ORACLE','ORACLE_CRAWLER');
|
||||
INSERT INTO public.meta_crawler (id,create_date,description,name) VALUES (
|
||||
14,'2017-06-30 12:56:08.791','POP','POP_CRAWLER');
|
||||
INSERT INTO public.meta_crawler (id,create_date,description,name) VALUES (
|
||||
15,'2017-06-30 12:56:08.791','POSTGRESQL','POSTGRESQL_CRAWLER');
|
||||
INSERT INTO public.meta_crawler (id,create_date,description,name) VALUES (
|
||||
16,'2017-06-30 12:56:08.791','REDIS','REDIS_CRAWLER');
|
||||
INSERT INTO public.meta_crawler (id,create_date,description,name) VALUES (
|
||||
17,'2017-06-30 12:56:08.791','RMI','RMI_CRAWLER');
|
||||
INSERT INTO public.meta_crawler (id,create_date,description,name) VALUES (
|
||||
18,'2017-06-30 12:56:08.791','SMB','SMB_CRAWLER');
|
||||
INSERT INTO public.meta_crawler (id,create_date,description,name) VALUES (
|
||||
19,'2017-06-30 12:56:08.791','SMTP','SMTP_CRAWLER');
|
||||
INSERT INTO public.meta_crawler (id,create_date,description,name) VALUES (
|
||||
20,'2017-06-30 12:56:08.791','SNMP','SNMP_CRAWLER');
|
||||
INSERT INTO public.meta_crawler (id,create_date,description,name) VALUES (
|
||||
21,'2017-06-30 12:56:08.791','SSH','SSH_CRAWLER');
|
||||
INSERT INTO public.meta_crawler (id,create_date,description,name) VALUES (
|
||||
22,'2017-06-30 12:56:08.791','TELNET','TELNET_CRAWLER');
|
||||
INSERT INTO public.meta_crawler (id,create_date,description,name) VALUES (
|
||||
23,'2017-06-30 12:56:08.791','WMI','WMI_CRAWLER');
|
||||
INSERT INTO public.meta_crawler (id,create_date,description,name) VALUES (
|
||||
24,'2017-06-30 12:56:08.791','UNKNOWN','UNKNOWN_CRAWLER');
|
||||
|
||||
|
||||
INSERT INTO public.meta_input_type (id,create_date,description,"name") VALUES (
|
||||
1,'2017-06-25 17:00:53.861','TEXT','TEXT_TYPE');
|
||||
|
|
Loading…
Reference in New Issue
Block a user