Merge branch 'master' of https://git.loafle.net/overflow/overflow_server

src/main/java/com/loafle/overflow/module/email/service/EmailAuthService.java

@@ -28,7 +28,7 @@ public class EmailAuthService {
     @Autowired
     private EmailAuthDAO emailAuthDAO;
 
-    public EmailAuth sendEmailByMemberId(long memberId, String memberEmail) {
+    public EmailAuth sendEmailByMember(long memberId, String memberEmail) {
         try {
             this.sendSimpleEmail(memberEmail, "Test Spring Mail", "Confirm Email");
         }catch (MailException e) {

src/main/java/com/loafle/overflow/module/probe/service/ProbeService.java

@@ -17,8 +17,8 @@ public class ProbeService {
     @Autowired
     private ProbeDAO probeDAO;
 
-    public void regist(Probe probe) {
+    public Probe regist(Probe probe) {
-        this.probeDAO.save(probe);
+        return this.probeDAO.save(probe);
     }
 
     public List<Probe> readAllByDomain(Domain domain) {

src/main/java/com/loafle/overflow/module/probe/service/ProbeTaskService.java

@@ -17,8 +17,8 @@ public class ProbeTaskService {
     @Autowired
     private ProbeTaskDAO probeTaskDAO;
 
-    public void regist(ProbeTask probeTask) {
+    public ProbeTask regist(ProbeTask probeTask) {
-        this.probeTaskDAO.save(probeTask);
+        return this.probeTaskDAO.save(probeTask);
     }
 
     public List<ProbeTask> readAllByProbe(Probe probe) {

src/main/java/com/loafle/overflow/module/probe/type/ProbeStatusType.java

@@ -1,18 +0,0 @@
-package com.loafle.overflow.module.probe.type;
-
-/**
- * Created by root on 17. 6. 23.
- */
-public enum ProbeStatusType {
-    I("INITIAL"),
-    N("NORMAL");
-
-
-    private String stringValue;
-    ProbeStatusType(String string) {stringValue = string;}
-
-    @Override
-    public String toString() {
-        return stringValue;
-    }
-}