Users

From 5da131cf11d849e2de9f8dbca2e8ab66593161a7 Mon Sep 17 00:00:00 2001 From: Tanechka Date: Thu, 20 Apr 2017 23:58:12 -0700 Subject: [PATCH 1/6] change WSDL --- .../main/webapp/WEB-INF/wsdl/mailService.wsdl | 81 ++++++++++++++++--- 1 file changed, 68 insertions(+), 13 deletions(-) diff --git a/services/mail-service/src/main/webapp/WEB-INF/wsdl/mailService.wsdl b/services/mail-service/src/main/webapp/WEB-INF/wsdl/mailService.wsdl index 09511ad..464d708 100644 --- a/services/mail-service/src/main/webapp/WEB-INF/wsdl/mailService.wsdl +++ b/services/mail-service/src/main/webapp/WEB-INF/wsdl/mailService.wsdl @@ -8,10 +8,14 @@ name="MailServiceImplService"> - - - + + + + + + + @@ -20,6 +24,14 @@ + + + + + + + + @@ -28,26 +40,69 @@ - - + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + - - + + + + - - - + + + + + + + - + + + + + + + + + + From d5fc131ad5e970c675c756cc3b20b0b4ba95066f Mon Sep 17 00:00:00 2001 From: Tanechka Date: Sat, 22 Apr 2017 00:41:57 -0700 Subject: [PATCH 2/6] share WSDL, dont know why it works --- parent/pom.xml | 10 ++ persist/src/main/resources/persist.conf | 6 - .../src/test/resources/wsdl/mailService.wsdl | 65 ---------- .../main/webapp/WEB-INF/wsdl/mailService.wsdl | 120 ------------------ .../service/mail/MailServicePublisher.java | 5 +- 5 files changed, 11 insertions(+), 195 deletions(-) delete mode 100644 persist/src/main/resources/persist.conf delete mode 100644 services/mail-api/src/test/resources/wsdl/mailService.wsdl delete mode 100644 services/mail-service/src/main/webapp/WEB-INF/wsdl/mailService.wsdl diff --git a/parent/pom.xml b/parent/pom.xml index ba5e87b..695323f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -67,12 +67,22 @@ ${masterjava.config} logback-test.xml + persist.conf src/test/resources + + + ${masterjava.config}wsdl + + mailService.wsdl + + true + + diff --git a/persist/src/main/resources/persist.conf b/persist/src/main/resources/persist.conf deleted file mode 100644 index 6991cdd..0000000 --- a/persist/src/main/resources/persist.conf +++ /dev/null @@ -1,6 +0,0 @@ -db { - url = "jdbc:postgresql://localhost:5432/masterjava" - user = user - password = password -} - diff --git a/services/mail-api/src/test/resources/wsdl/mailService.wsdl b/services/mail-api/src/test/resources/wsdl/mailService.wsdl deleted file mode 100644 index 09511ad..0000000 --- a/services/mail-api/src/test/resources/wsdl/mailService.wsdl +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/services/mail-service/src/main/webapp/WEB-INF/wsdl/mailService.wsdl b/services/mail-service/src/main/webapp/WEB-INF/wsdl/mailService.wsdl deleted file mode 100644 index 464d708..0000000 --- a/services/mail-service/src/main/webapp/WEB-INF/wsdl/mailService.wsdl +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/services/mail-service/src/test/java/ru/javaops/masterjava/service/mail/MailServicePublisher.java b/services/mail-service/src/test/java/ru/javaops/masterjava/service/mail/MailServicePublisher.java index 1901d0f..451c12e 100644 --- a/services/mail-service/src/test/java/ru/javaops/masterjava/service/mail/MailServicePublisher.java +++ b/services/mail-service/src/test/java/ru/javaops/masterjava/service/mail/MailServicePublisher.java @@ -6,7 +6,6 @@ import javax.xml.transform.Source; import javax.xml.transform.stream.StreamSource; import javax.xml.ws.Endpoint; -import java.io.File; import java.util.List; public class MailServicePublisher { @@ -16,9 +15,7 @@ public static void main(String[] args) { Endpoint endpoint = Endpoint.create(new MailServiceImpl()); List metadata = ImmutableList.of( - new StreamSource( - new File("services/mail-service/src/main/webapp/WEB-INF/wsdl/mailService.wsdl"))); - + new StreamSource(String.valueOf(ClassLoader.getSystemResource("mailService.wsdl")))); endpoint.setMetadata(metadata); endpoint.publish("http://localhost:8080/mail/mailService"); } From 8b2f9a01b77abdc00bcad9252566447671f7aac7 Mon Sep 17 00:00:00 2001 From: Tanechka Date: Sat, 22 Apr 2017 17:39:12 -0700 Subject: [PATCH 3/6] NoClassDefFoundError MailConfig --- config_templates/mail.conf | 10 +++++++++ config_templates/persist.conf | 6 ++++++ parent-web/pom.xml | 1 + parent/pom.xml | 2 ++ persist/pom.xml | 5 +++++ .../masterjava/persist/dao/UserDao.java | 5 +++++ .../masterjava/persist/dao/UserDaoTest.java | 10 ++++++++- .../masterjava/service/mail/MailWSClient.java | 2 +- .../masterjava/service/mail/MailConfig.java | 2 +- .../mail-service/src/main/resources/mail.conf | 2 +- web/webapp/pom.xml | 6 ++++++ .../masterjava/webapp/UsersServlet.java | 21 +++++++++++++++++++ .../main/webapp/WEB-INF/templates/users.html | 20 +++++++++++++++++- 13 files changed, 87 insertions(+), 5 deletions(-) create mode 100644 config_templates/mail.conf create mode 100644 config_templates/persist.conf diff --git a/config_templates/mail.conf b/config_templates/mail.conf new file mode 100644 index 0000000..ad78cf6 --- /dev/null +++ b/config_templates/mail.conf @@ -0,0 +1,10 @@ +mail { + host: smtp.yandex.ru + port: 465 + username: "poliakh2017@yandex.ru" + password: poliakh2017123 + useSSL: true + useTLS: false + debug: true + fromName: MasterJava +} diff --git a/config_templates/persist.conf b/config_templates/persist.conf new file mode 100644 index 0000000..6991cdd --- /dev/null +++ b/config_templates/persist.conf @@ -0,0 +1,6 @@ +db { + url = "jdbc:postgresql://localhost:5432/masterjava" + user = user + password = password +} + diff --git a/parent-web/pom.xml b/parent-web/pom.xml index 7756bfb..4a1a267 100644 --- a/parent-web/pom.xml +++ b/parent-web/pom.xml @@ -75,6 +75,7 @@ true logback.xml + main.conf diff --git a/parent/pom.xml b/parent/pom.xml index 695323f..ceb2693 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -68,6 +68,8 @@ logback-test.xml persist.conf + hosts.conf + mail.conf diff --git a/persist/pom.xml b/persist/pom.xml index 960abcf..22d9a91 100644 --- a/persist/pom.xml +++ b/persist/pom.xml @@ -45,6 +45,11 @@ jdbi 2.78 + + org.antlr + stringtemplate + 3.2 + com.bertoncelj.jdbi.entitymapper jdbi-entity-mapper diff --git a/persist/src/main/java/ru/javaops/masterjava/persist/dao/UserDao.java b/persist/src/main/java/ru/javaops/masterjava/persist/dao/UserDao.java index 2f13898..adf34f1 100644 --- a/persist/src/main/java/ru/javaops/masterjava/persist/dao/UserDao.java +++ b/persist/src/main/java/ru/javaops/masterjava/persist/dao/UserDao.java @@ -5,6 +5,8 @@ import org.skife.jdbi.v2.sqlobject.*; import org.skife.jdbi.v2.sqlobject.customizers.BatchChunkSize; import org.skife.jdbi.v2.sqlobject.customizers.RegisterMapperFactory; +import org.skife.jdbi.v2.sqlobject.stringtemplate.UseStringTemplate3StatementLocator; +import org.skife.jdbi.v2.unstable.BindIn; import ru.javaops.masterjava.persist.DBIProvider; import ru.javaops.masterjava.persist.model.User; @@ -16,6 +18,7 @@ *

*/ +@UseStringTemplate3StatementLocator @RegisterMapperFactory(EntityMapperFactory.class) public abstract class UserDao implements AbstractDao { @@ -60,6 +63,8 @@ public int getSeqAndSkip(int step) { // "ON CONFLICT (email) DO UPDATE SET full_name=:fullName, flag=CAST(:flag AS USER_FLAG)") public abstract int[] insertBatch(@BindBean List users, @BatchChunkSize int chunkSize); + @SqlQuery("SELECT * FROM users WHERE id IN ()") + public abstract List getByIds(@BindIn("ids") List ids); public List insertAndGetConflictEmails(List users) { int[] result = insertBatch(users, users.size()); diff --git a/persist/src/test/java/ru/javaops/masterjava/persist/dao/UserDaoTest.java b/persist/src/test/java/ru/javaops/masterjava/persist/dao/UserDaoTest.java index 1dd6ed4..12c0b27 100644 --- a/persist/src/test/java/ru/javaops/masterjava/persist/dao/UserDaoTest.java +++ b/persist/src/test/java/ru/javaops/masterjava/persist/dao/UserDaoTest.java @@ -7,9 +7,10 @@ import ru.javaops.masterjava.persist.UserTestData; import ru.javaops.masterjava.persist.model.User; +import java.util.ArrayList; import java.util.List; -import static ru.javaops.masterjava.persist.UserTestData.FIST5_USERS; +import static ru.javaops.masterjava.persist.UserTestData.*; /** * gkislin @@ -50,4 +51,11 @@ public void getSeqAndSkip() throws Exception { int seq2 = dao.getSeqAndSkip(1); Assert.assertEquals(5, seq2 - seq1); } + + @Test + public void getByIds() throws Exception { + List ids = new ArrayList<>(); + FIST5_USERS.forEach(u -> ids.add(u.getId())); + Assert.assertEquals(dao.getByIds(ids),FIST5_USERS); + } } \ No newline at end of file diff --git a/services/mail-api/src/main/java/ru/javaops/masterjava/service/mail/MailWSClient.java b/services/mail-api/src/main/java/ru/javaops/masterjava/service/mail/MailWSClient.java index 473f696..7710cc1 100644 --- a/services/mail-api/src/main/java/ru/javaops/masterjava/service/mail/MailWSClient.java +++ b/services/mail-api/src/main/java/ru/javaops/masterjava/service/mail/MailWSClient.java @@ -12,7 +12,7 @@ public class MailWSClient { private static final WsClient WS_CLIENT; static { - WS_CLIENT = new WsClient(Resources.getResource("wsdl/mailService.wsdl"), + WS_CLIENT = new WsClient(Resources.getResource("mailService.wsdl"), new QName("http://mail.javaops.ru/", "MailServiceImplService"), MailService.class); diff --git a/services/mail-service/src/main/java/ru/javaops/masterjava/service/mail/MailConfig.java b/services/mail-service/src/main/java/ru/javaops/masterjava/service/mail/MailConfig.java index 4b00e02..5bfc9b4 100644 --- a/services/mail-service/src/main/java/ru/javaops/masterjava/service/mail/MailConfig.java +++ b/services/mail-service/src/main/java/ru/javaops/masterjava/service/mail/MailConfig.java @@ -12,7 +12,7 @@ public class MailConfig { private static final MailConfig INSTANCE = - new MailConfig(Configs.getConfig("mail.conf", "mail")); + new MailConfig(Configs.getConfig("C:\\apps\\masterjava\\config\\mail.conf", "mail")); final private String host; final private int port; diff --git a/services/mail-service/src/main/resources/mail.conf b/services/mail-service/src/main/resources/mail.conf index fdc6ca0..305e399 100644 --- a/services/mail-service/src/main/resources/mail.conf +++ b/services/mail-service/src/main/resources/mail.conf @@ -9,4 +9,4 @@ mail { fromName: MasterJava } -include required(file("/apps/masterjava/config/mail.conf")) +include required(file("c:/apps/masterjava/config/mail.conf")) diff --git a/web/webapp/pom.xml b/web/webapp/pom.xml index de3a56f..489df99 100644 --- a/web/webapp/pom.xml +++ b/web/webapp/pom.xml @@ -26,5 +26,11 @@ persist ${project.version} + + ${project.groupId} + mail-api + ${project.version} + + \ No newline at end of file diff --git a/web/webapp/src/main/java/ru/javaops/masterjava/webapp/UsersServlet.java b/web/webapp/src/main/java/ru/javaops/masterjava/webapp/UsersServlet.java index 5b58712..2d1a8bc 100644 --- a/web/webapp/src/main/java/ru/javaops/masterjava/webapp/UsersServlet.java +++ b/web/webapp/src/main/java/ru/javaops/masterjava/webapp/UsersServlet.java @@ -1,9 +1,13 @@ package ru.javaops.masterjava.webapp; +import com.google.common.base.Splitter; import com.google.common.collect.ImmutableMap; import org.thymeleaf.context.WebContext; import ru.javaops.masterjava.persist.DBIProvider; import ru.javaops.masterjava.persist.dao.UserDao; +import ru.javaops.masterjava.persist.model.User; +import ru.javaops.masterjava.service.mail.Addressee; +import ru.javaops.masterjava.service.mail.MailWSClient; import javax.servlet.ServletException; import javax.servlet.annotation.WebServlet; @@ -11,6 +15,10 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.util.Collections; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; import static ru.javaops.masterjava.common.web.ThymeleafListener.engine; @@ -24,4 +32,17 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se ImmutableMap.of("users", userDao.getWithLimit(20))); engine.process("users", webContext, resp.getWriter()); } + + @Override + protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + //super.doPost(req, resp); + //List ids = new ArrayList<>(); + List ids = req.getReader().lines() + .map(line -> Splitter.on(',').splitToList(line)) + .flatMap(list -> list.stream().map(Integer::valueOf)) + .collect(Collectors.toList()); + List users = userDao.getByIds(ids); + Set to = users.stream().map(u -> new Addressee(u.getEmail(), u.getFullName())).collect(Collectors.toSet()); + MailWSClient.sendMail(to, Collections.EMPTY_SET, "testSubject", "testBody"); + } } diff --git a/web/webapp/src/main/webapp/WEB-INF/templates/users.html b/web/webapp/src/main/webapp/WEB-INF/templates/users.html index 3991c8d..c816c95 100644 --- a/web/webapp/src/main/webapp/WEB-INF/templates/users.html +++ b/web/webapp/src/main/webapp/WEB-INF/templates/users.html @@ -4,7 +4,8 @@ Users - + +
@@ -20,8 +21,25 @@ +

+ + + + + \ No newline at end of file From 280044fedbda2dda98563f97d4ad817db511c644 Mon Sep 17 00:00:00 2001 From: Tanechka Date: Sun, 23 Apr 2017 11:43:50 -0700 Subject: [PATCH 4/6] optional completed --- parent/pom.xml | 5 +++-- persist/pom.xml | 5 +++++ .../masterjava/persist/dao/UserDao.java | 5 +++++ .../masterjava/service/mail/MailWSClient.java | 2 ++ .../service/mail/MailServicePublisher.java | 2 +- web/webapp/pom.xml | 5 +++++ .../masterjava/webapp/UsersServlet.java | 20 +++++++++++++++++++ .../main/webapp/WEB-INF/templates/users.html | 19 +++++++++++++++++- 8 files changed, 59 insertions(+), 4 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 695323f..3e016ed 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -76,9 +76,10 @@ - ${masterjava.config}wsdl + ${masterjava.config} - mailService.wsdl + hosts.conf + wsdl/mailService.wsdl true diff --git a/persist/pom.xml b/persist/pom.xml index 960abcf..22d9a91 100644 --- a/persist/pom.xml +++ b/persist/pom.xml @@ -45,6 +45,11 @@ jdbi 2.78 + + org.antlr + stringtemplate + 3.2 + com.bertoncelj.jdbi.entitymapper jdbi-entity-mapper diff --git a/persist/src/main/java/ru/javaops/masterjava/persist/dao/UserDao.java b/persist/src/main/java/ru/javaops/masterjava/persist/dao/UserDao.java index 2f13898..adf34f1 100644 --- a/persist/src/main/java/ru/javaops/masterjava/persist/dao/UserDao.java +++ b/persist/src/main/java/ru/javaops/masterjava/persist/dao/UserDao.java @@ -5,6 +5,8 @@ import org.skife.jdbi.v2.sqlobject.*; import org.skife.jdbi.v2.sqlobject.customizers.BatchChunkSize; import org.skife.jdbi.v2.sqlobject.customizers.RegisterMapperFactory; +import org.skife.jdbi.v2.sqlobject.stringtemplate.UseStringTemplate3StatementLocator; +import org.skife.jdbi.v2.unstable.BindIn; import ru.javaops.masterjava.persist.DBIProvider; import ru.javaops.masterjava.persist.model.User; @@ -16,6 +18,7 @@ *

*/ +@UseStringTemplate3StatementLocator @RegisterMapperFactory(EntityMapperFactory.class) public abstract class UserDao implements AbstractDao { @@ -60,6 +63,8 @@ public int getSeqAndSkip(int step) { // "ON CONFLICT (email) DO UPDATE SET full_name=:fullName, flag=CAST(:flag AS USER_FLAG)") public abstract int[] insertBatch(@BindBean List users, @BatchChunkSize int chunkSize); + @SqlQuery("SELECT * FROM users WHERE id IN ()") + public abstract List getByIds(@BindIn("ids") List ids); public List insertAndGetConflictEmails(List users) { int[] result = insertBatch(users, users.size()); diff --git a/services/mail-api/src/main/java/ru/javaops/masterjava/service/mail/MailWSClient.java b/services/mail-api/src/main/java/ru/javaops/masterjava/service/mail/MailWSClient.java index 473f696..f2c46f8 100644 --- a/services/mail-api/src/main/java/ru/javaops/masterjava/service/mail/MailWSClient.java +++ b/services/mail-api/src/main/java/ru/javaops/masterjava/service/mail/MailWSClient.java @@ -5,6 +5,7 @@ import ru.javaops.masterjava.web.WsClient; import javax.xml.namespace.QName; +import java.net.URL; import java.util.Set; @Slf4j @@ -22,6 +23,7 @@ public class MailWSClient { public static void sendMail(final Set to, final Set cc, final String subject, final String body) { log.info("Send mail to '" + to + "' cc '" + cc + "' subject '" + subject + (log.isDebugEnabled() ? "\nbody=" + body : "")); + URL systemResource = Resources.getResource("wsdl/mailService.wsdl"); WS_CLIENT.getPort().sendToGroup(to, cc, subject, body); } } diff --git a/services/mail-service/src/test/java/ru/javaops/masterjava/service/mail/MailServicePublisher.java b/services/mail-service/src/test/java/ru/javaops/masterjava/service/mail/MailServicePublisher.java index 451c12e..1d053f4 100644 --- a/services/mail-service/src/test/java/ru/javaops/masterjava/service/mail/MailServicePublisher.java +++ b/services/mail-service/src/test/java/ru/javaops/masterjava/service/mail/MailServicePublisher.java @@ -15,7 +15,7 @@ public static void main(String[] args) { Endpoint endpoint = Endpoint.create(new MailServiceImpl()); List metadata = ImmutableList.of( - new StreamSource(String.valueOf(ClassLoader.getSystemResource("mailService.wsdl")))); + new StreamSource(String.valueOf(ClassLoader.getSystemResource("wsdl/mailService.wsdl")))); endpoint.setMetadata(metadata); endpoint.publish("http://localhost:8080/mail/mailService"); } diff --git a/web/webapp/pom.xml b/web/webapp/pom.xml index de3a56f..e892e75 100644 --- a/web/webapp/pom.xml +++ b/web/webapp/pom.xml @@ -26,5 +26,10 @@ persist ${project.version} + + ${project.groupId} + mail-api + ${project.version} + \ No newline at end of file diff --git a/web/webapp/src/main/java/ru/javaops/masterjava/webapp/UsersServlet.java b/web/webapp/src/main/java/ru/javaops/masterjava/webapp/UsersServlet.java index 5b58712..0d14b66 100644 --- a/web/webapp/src/main/java/ru/javaops/masterjava/webapp/UsersServlet.java +++ b/web/webapp/src/main/java/ru/javaops/masterjava/webapp/UsersServlet.java @@ -1,9 +1,13 @@ package ru.javaops.masterjava.webapp; +import com.google.common.base.Splitter; import com.google.common.collect.ImmutableMap; import org.thymeleaf.context.WebContext; import ru.javaops.masterjava.persist.DBIProvider; import ru.javaops.masterjava.persist.dao.UserDao; +import ru.javaops.masterjava.persist.model.User; +import ru.javaops.masterjava.service.mail.Addressee; +import ru.javaops.masterjava.service.mail.MailWSClient; import javax.servlet.ServletException; import javax.servlet.annotation.WebServlet; @@ -11,6 +15,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; import static ru.javaops.masterjava.common.web.ThymeleafListener.engine; @@ -24,4 +31,17 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se ImmutableMap.of("users", userDao.getWithLimit(20))); engine.process("users", webContext, resp.getWriter()); } + + @Override + protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + //super.doPost(req, resp); + //List ids = new ArrayList<>(); + List ids = req.getReader().lines() + .map(line -> Splitter.on(',').splitToList(line)) + .flatMap(list -> list.stream().map(Integer::valueOf)) + .collect(Collectors.toList()); + List users = userDao.getByIds(ids); + Set to = users.stream().map(u -> new Addressee(u.getEmail(), u.getFullName())).collect(Collectors.toSet()); + MailWSClient.sendMail(to, to, "testSubject", "testBody"); + } } diff --git a/web/webapp/src/main/webapp/WEB-INF/templates/users.html b/web/webapp/src/main/webapp/WEB-INF/templates/users.html index 3991c8d..57702eb 100644 --- a/web/webapp/src/main/webapp/WEB-INF/templates/users.html +++ b/web/webapp/src/main/webapp/WEB-INF/templates/users.html @@ -4,7 +4,8 @@ Users - + +
@@ -20,8 +21,24 @@ +

+ + + + + \ No newline at end of file From 7803229ca080ab05666062c8723fe13c9214c1c4 Mon Sep 17 00:00:00 2001 From: Tanechka Date: Sun, 23 Apr 2017 11:56:18 -0700 Subject: [PATCH 5/6] optional completed --- .../java/ru/javaops/masterjava/service/mail/MailWSClient.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/services/mail-api/src/main/java/ru/javaops/masterjava/service/mail/MailWSClient.java b/services/mail-api/src/main/java/ru/javaops/masterjava/service/mail/MailWSClient.java index f2c46f8..473f696 100644 --- a/services/mail-api/src/main/java/ru/javaops/masterjava/service/mail/MailWSClient.java +++ b/services/mail-api/src/main/java/ru/javaops/masterjava/service/mail/MailWSClient.java @@ -5,7 +5,6 @@ import ru.javaops.masterjava.web.WsClient; import javax.xml.namespace.QName; -import java.net.URL; import java.util.Set; @Slf4j @@ -23,7 +22,6 @@ public class MailWSClient { public static void sendMail(final Set to, final Set cc, final String subject, final String body) { log.info("Send mail to '" + to + "' cc '" + cc + "' subject '" + subject + (log.isDebugEnabled() ? "\nbody=" + body : "")); - URL systemResource = Resources.getResource("wsdl/mailService.wsdl"); WS_CLIENT.getPort().sendToGroup(to, cc, subject, body); } } From d9901a16ecf4ec8c2dd437c8a84c434d77d2008e Mon Sep 17 00:00:00 2001 From: Tanechka Date: Sun, 23 Apr 2017 12:17:24 -0700 Subject: [PATCH 6/6] fix problems after merge --- config_templates/mail.conf | 10 ---------- parent-web/pom.xml | 2 +- parent/pom.xml | 2 -- .../javaops/masterjava/service/mail/MailWSClient.java | 2 +- .../ru/javaops/masterjava/service/mail/MailConfig.java | 2 +- services/mail-service/src/main/resources/mail.conf | 2 +- 6 files changed, 4 insertions(+), 16 deletions(-) delete mode 100644 config_templates/mail.conf diff --git a/config_templates/mail.conf b/config_templates/mail.conf deleted file mode 100644 index ad78cf6..0000000 --- a/config_templates/mail.conf +++ /dev/null @@ -1,10 +0,0 @@ -mail { - host: smtp.yandex.ru - port: 465 - username: "poliakh2017@yandex.ru" - password: poliakh2017123 - useSSL: true - useTLS: false - debug: true - fromName: MasterJava -} diff --git a/parent-web/pom.xml b/parent-web/pom.xml index 4a1a267..a21d77c 100644 --- a/parent-web/pom.xml +++ b/parent-web/pom.xml @@ -75,7 +75,7 @@ true logback.xml - main.conf + diff --git a/parent/pom.xml b/parent/pom.xml index 31d072f..3e016ed 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -68,8 +68,6 @@ logback-test.xml persist.conf - hosts.conf - mail.conf diff --git a/services/mail-api/src/main/java/ru/javaops/masterjava/service/mail/MailWSClient.java b/services/mail-api/src/main/java/ru/javaops/masterjava/service/mail/MailWSClient.java index 7710cc1..473f696 100644 --- a/services/mail-api/src/main/java/ru/javaops/masterjava/service/mail/MailWSClient.java +++ b/services/mail-api/src/main/java/ru/javaops/masterjava/service/mail/MailWSClient.java @@ -12,7 +12,7 @@ public class MailWSClient { private static final WsClient WS_CLIENT; static { - WS_CLIENT = new WsClient(Resources.getResource("mailService.wsdl"), + WS_CLIENT = new WsClient(Resources.getResource("wsdl/mailService.wsdl"), new QName("http://mail.javaops.ru/", "MailServiceImplService"), MailService.class); diff --git a/services/mail-service/src/main/java/ru/javaops/masterjava/service/mail/MailConfig.java b/services/mail-service/src/main/java/ru/javaops/masterjava/service/mail/MailConfig.java index 5bfc9b4..4b00e02 100644 --- a/services/mail-service/src/main/java/ru/javaops/masterjava/service/mail/MailConfig.java +++ b/services/mail-service/src/main/java/ru/javaops/masterjava/service/mail/MailConfig.java @@ -12,7 +12,7 @@ public class MailConfig { private static final MailConfig INSTANCE = - new MailConfig(Configs.getConfig("C:\\apps\\masterjava\\config\\mail.conf", "mail")); + new MailConfig(Configs.getConfig("mail.conf", "mail")); final private String host; final private int port; diff --git a/services/mail-service/src/main/resources/mail.conf b/services/mail-service/src/main/resources/mail.conf index 305e399..fdc6ca0 100644 --- a/services/mail-service/src/main/resources/mail.conf +++ b/services/mail-service/src/main/resources/mail.conf @@ -9,4 +9,4 @@ mail { fromName: MasterJava } -include required(file("c:/apps/masterjava/config/mail.conf")) +include required(file("/apps/masterjava/config/mail.conf"))