diff --git a/pom.xml b/pom.xml
index e0a761b..93d7037 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,11 +20,20 @@
+
+
+ uPagge
+ Struchkov Mark
+ upagge@mail.ru
+
+
+
2.8.5
0.5.13-SNAPSHOT
1.2.17
20180813
+ 1.1.2-SNAPHOT
@@ -51,8 +60,7 @@
org.sadtech.autoresponder
autoresponder
- 1.1.2-SNAPHOT
- compile
+ ${autoresponder.ver}
diff --git a/src/main/java/org/sadtech/vkbot/core/entity/unit/SaveAnswer.java b/src/main/java/org/sadtech/vkbot/core/entity/unit/SaveAnswer.java
deleted file mode 100644
index 19f9f36..0000000
--- a/src/main/java/org/sadtech/vkbot/core/entity/unit/SaveAnswer.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.sadtech.vkbot.core.entity.unit;
-
-import org.sadtech.vkbot.autoresponder.DataService;
-
-public class SaveAnswer extends TextAnswer {
-
- private SaveAnswer prevSaveAnswer;
- private DataService dataService;
-
-}
diff --git a/src/main/java/org/sadtech/vkbot/core/entity/unit/TextAndKeyBoardAnswer.java b/src/main/java/org/sadtech/vkbot/core/entity/unit/TextAndKeyBoardAnswer.java
deleted file mode 100644
index 708ca80..0000000
--- a/src/main/java/org/sadtech/vkbot/core/entity/unit/TextAndKeyBoardAnswer.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.sadtech.vkbot.core.entity.unit;
-
-import org.sadtech.vkbot.core.keyboard.KeyBoard;
-
-public class TextAndKeyBoardAnswer extends TextAnswer {
-
- KeyBoard keyBoard;
-
- public KeyBoard getKeyBoard() {
- return keyBoard;
- }
-
- public void setKeyBoard(KeyBoard keyBoard) {
- this.keyBoard = keyBoard;
- }
-}
diff --git a/src/main/java/org/sadtech/vkbot/core/entity/unit/TextAnswer.java b/src/main/java/org/sadtech/vkbot/core/entity/unit/TextAnswer.java
deleted file mode 100644
index ccd6800..0000000
--- a/src/main/java/org/sadtech/vkbot/core/entity/unit/TextAnswer.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.sadtech.vkbot.core.entity.unit;
-
-import org.sadtech.autoresponder.entity.Unit;
-
-public class TextAnswer extends Unit {
-
- private String answer;
-
- public String getAnswer() {
- return answer;
- }
-
- public void setAnswer(String answer) {
- this.answer = answer;
- }
-}
diff --git a/src/main/java/org/sadtech/vkbot/core/keyboard/ButtonKeyBoardService.java b/src/main/java/org/sadtech/vkbot/core/keyboard/ButtonKeyBoardService.java
new file mode 100644
index 0000000..c021d5e
--- /dev/null
+++ b/src/main/java/org/sadtech/vkbot/core/keyboard/ButtonKeyBoardService.java
@@ -0,0 +1,7 @@
+package org.sadtech.vkbot.core.keyboard;
+
+public interface ButtonKeyBoardService {
+
+
+
+}
diff --git a/src/main/java/org/sadtech/vkbot/core/keyboard/LineKeyBoardService.java b/src/main/java/org/sadtech/vkbot/core/keyboard/LineKeyBoardService.java
new file mode 100644
index 0000000..d36ed38
--- /dev/null
+++ b/src/main/java/org/sadtech/vkbot/core/keyboard/LineKeyBoardService.java
@@ -0,0 +1,4 @@
+package org.sadtech.vkbot.core.keyboard;
+
+public interface LineKeyBoardService {
+}
diff --git a/src/main/java/org/sadtech/vkbot/core/listener/EventListenable.java b/src/main/java/org/sadtech/vkbot/core/listener/EventListener.java
similarity index 61%
rename from src/main/java/org/sadtech/vkbot/core/listener/EventListenable.java
rename to src/main/java/org/sadtech/vkbot/core/listener/EventListener.java
index ff854f0..3109603 100644
--- a/src/main/java/org/sadtech/vkbot/core/listener/EventListenable.java
+++ b/src/main/java/org/sadtech/vkbot/core/listener/EventListener.java
@@ -1,6 +1,6 @@
package org.sadtech.vkbot.core.listener;
-public interface EventListenable extends Runnable {
+public interface EventListener extends Runnable {
void listen() throws Exception;
diff --git a/src/main/java/org/sadtech/vkbot/core/listener/impl/EventListenerVk.java b/src/main/java/org/sadtech/vkbot/core/listener/EventListenerVk.java
similarity index 94%
rename from src/main/java/org/sadtech/vkbot/core/listener/impl/EventListenerVk.java
rename to src/main/java/org/sadtech/vkbot/core/listener/EventListenerVk.java
index 5fc99c1..3a3f988 100644
--- a/src/main/java/org/sadtech/vkbot/core/listener/impl/EventListenerVk.java
+++ b/src/main/java/org/sadtech/vkbot/core/listener/EventListenerVk.java
@@ -1,4 +1,4 @@
-package org.sadtech.vkbot.core.listener.impl;
+package org.sadtech.vkbot.core.listener;
import com.google.gson.JsonObject;
import com.vk.api.sdk.actions.LongPoll;
@@ -15,9 +15,8 @@ import org.sadtech.vkbot.core.repository.EventRepository;
import org.sadtech.vkbot.core.repository.impl.EventRepositoryQueue;
import org.sadtech.vkbot.core.service.EventService;
import org.sadtech.vkbot.core.service.impl.EventServiceImpl;
-import org.sadtech.vkbot.core.listener.EventListenable;
-public class EventListenerVk implements EventListenable, Runnable {
+public class EventListenerVk implements EventListener, Runnable {
public static final Logger log = Logger.getLogger(EventListenerVk.class);
diff --git a/src/main/java/org/sadtech/vkbot/core/repository/unit/TextAndKeyBoardAnswerRepository.java b/src/main/java/org/sadtech/vkbot/core/repository/unit/TextAndKeyBoardAnswerRepository.java
deleted file mode 100644
index cd17c90..0000000
--- a/src/main/java/org/sadtech/vkbot/core/repository/unit/TextAndKeyBoardAnswerRepository.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.sadtech.vkbot.core.repository.unit;
-
-import org.sadtech.vkbot.core.entity.unit.TextAndKeyBoardAnswer;
-import org.sadtech.autoresponder.repository.UnitRepository;
-
-import java.util.List;
-
-public class TextAndKeyBoardAnswerRepository implements UnitRepository {
-
- @Override
- public void addUnit(TextAndKeyBoardAnswer unit) {
-
- }
-
- @Override
- public void addUnits(List units) {
-
- }
-
- @Override
- public List menuUnits() {
- return null;
- }
-}
diff --git a/src/main/java/org/sadtech/vkbot/core/repository/unit/TextAnswerRepository.java b/src/main/java/org/sadtech/vkbot/core/repository/unit/TextAnswerRepository.java
deleted file mode 100644
index acaf94c..0000000
--- a/src/main/java/org/sadtech/vkbot/core/repository/unit/TextAnswerRepository.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.sadtech.vkbot.core.repository.unit;
-
-import org.sadtech.vkbot.core.entity.unit.TextAnswer;
-import org.sadtech.autoresponder.repository.UnitRepository;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class TextAnswerRepository implements UnitRepository {
-
- private List textAnswers;
-
- public TextAnswerRepository() {
- textAnswers = new ArrayList<>();
- }
-
- public TextAnswerRepository(List textAnswers) {
- this.textAnswers = textAnswers;
- }
-
- @Override
- public void addUnit(TextAnswer unit) {
- textAnswers.add(unit);
- }
-
- @Override
- public void addUnits(List units) {
- textAnswers.addAll(units);
- }
-
- @Override
- public List menuUnits() {
- return textAnswers;
- }
-}
diff --git a/src/main/java/org/sadtech/vkbot/core/sender/MailSanderVk.java b/src/main/java/org/sadtech/vkbot/core/sender/MailSanderVk.java
index bc8bf4a..a195800 100644
--- a/src/main/java/org/sadtech/vkbot/core/sender/MailSanderVk.java
+++ b/src/main/java/org/sadtech/vkbot/core/sender/MailSanderVk.java
@@ -6,9 +6,8 @@ import com.vk.api.sdk.exceptions.ApiException;
import com.vk.api.sdk.exceptions.ClientException;
import org.sadtech.vkbot.core.VkConnect;
import org.sadtech.vkbot.core.entity.Person;
-import org.sadtech.vkbot.core.keyboard.KeyBoard;
-public class MailSanderVk {
+public class MailSanderVk implements MailSandler {
private Person person;
private VkApiClient vkApiClient;
@@ -29,20 +28,12 @@ public class MailSanderVk {
this.person = person;
}
- public void sendText(String messageText) {
+ @Override
+ public void send(String text) {
try {
- vkApiClient.messages().send(groupActor).userId(person.getId()).message(messageText).execute();
+ vkApiClient.messages().send(groupActor).userId(person.getId()).message(text).execute();
} catch (ApiException | ClientException e) {
e.printStackTrace();
}
}
-
- public void sendTextandKeyBoard(String message, KeyBoard keyBoard) {
- try {
- vkApiClient.messages().send(groupActor).userId(person.getId()).message(message).keyboard(keyBoard.getKeyboard(true).toString()).execute();
- } catch (ApiException | ClientException e) {
- e.printStackTrace();
- }
- }
-
}
diff --git a/src/main/java/org/sadtech/vkbot/core/sender/MailSandler.java b/src/main/java/org/sadtech/vkbot/core/sender/MailSandler.java
new file mode 100644
index 0000000..8d743b6
--- /dev/null
+++ b/src/main/java/org/sadtech/vkbot/core/sender/MailSandler.java
@@ -0,0 +1,11 @@
+package org.sadtech.vkbot.core.sender;
+
+import org.sadtech.vkbot.core.entity.Person;
+
+public interface MailSandler {
+
+ void send(String text);
+
+ void setPerson(Person person);
+
+}
diff --git a/src/main/java/org/sadtech/vkbot/core/service/handlers/impl/MailServiceImpl.java b/src/main/java/org/sadtech/vkbot/core/service/handlers/impl/MailServiceImpl.java
index cd3ccea..0d9e8c6 100644
--- a/src/main/java/org/sadtech/vkbot/core/service/handlers/impl/MailServiceImpl.java
+++ b/src/main/java/org/sadtech/vkbot/core/service/handlers/impl/MailServiceImpl.java
@@ -33,6 +33,7 @@ public class MailServiceImpl implements MailService {
@Override
public List getFirstMailByTime(Integer timeFrom, Integer timeTo) {
+ log.info("Запрошены сообщения от " + timeFrom + " до " + timeTo);
List mails = messageRepository.getMailByTime(timeFrom, timeTo);
Set people = new HashSet<>();
List returnMails = new ArrayList<>();