Merge remote-tracking branch 'origin/master'

src/main/java/com/loafle/overflow/module/infra/service/InfraService.java

@@ -0,0 +1,67 @@
+package com.loafle.overflow.module.infra.service;
+
+import com.loafle.overflow.module.infra.dao.*;
+import com.loafle.overflow.module.infra.model.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * Created by insanity on 17. 6. 28.
+ */
+
+@Service
+public class InfraService {
+
+    @Autowired
+    InfraDAO infraDAO;
+    @Autowired
+    InfraMachineDAO infraMachineDAO;
+    @Autowired
+    InfraHostDAO infraHostDAO;
+    @Autowired
+    InfraOSDAO infraOSDAO;
+    @Autowired
+    InfraOSApplicationDAO infraOSApplicationDAO;
+    @Autowired
+    InfraOSDaemonDAO infraOSDaemonDAO;
+    @Autowired
+    InfraOSPortDAO infraOSPortDAO;
+    @Autowired
+    InfraServiceDAO infraServiceDAO;
+
+
+    public Infra regist(Infra infra) {
+        return this.infraDAO.save(infra);
+    }
+
+    public InfraMachine registMachine(InfraMachine infraMachine) {
+        return this.infraMachineDAO.save(infraMachine);
+    }
+
+    public InfraHost registHost(InfraHost infraHost) {
+        return this.infraHostDAO.save(infraHost);
+    }
+
+    public InfraOS registOS(InfraOS infraOS) {
+        return this.infraOSDAO.save(infraOS);
+    }
+    public InfraOSApplication registOSApplication(InfraOSApplication infraOSApplication) {
+        return this.infraOSApplicationDAO.save(infraOSApplication);
+    }
+    public InfraOSDaemon registOSDaemon(InfraOSDaemon infraOSDaemon) {
+        return this.infraOSDaemonDAO.save(infraOSDaemon);
+    }
+
+    public InfraOSPort registOSPort(InfraOSPort infraOSPort) {
+        return this.infraOSPortDAO.save(infraOSPort);
+    }
+
+    public com.loafle.overflow.module.infra.model.InfraService registService(com.loafle.overflow.module.infra.model.InfraService infraService) {
+        return this.infraServiceDAO.save(infraService);
+    }
+
+    public Infra read(String id) {
+        return this.infraDAO.findOne(Long.valueOf(id));
+    }
+
+}

src/main/java/com/loafle/overflow/module/member/model/Member.java

@@ -15,7 +15,6 @@ public class Member {
     private long id;
     private String email;
     private String pw;
-    private String pwSalt;
     private String name;
     private String phone;
     private String companyName;
@@ -59,16 +58,6 @@ public class Member {
         this.pw = pw;
     }
 
-    @Basic
-    @Column(name = "PW_SALT", nullable = true, length = 32)
-    public String getPwSalt() {
-        return pwSalt;
-    }
-
-    public void setPwSalt(String pwSalt) {
-        this.pwSalt = pwSalt;
-    }
-
     @Basic
     @Column(name = "NAME", nullable = true, length = 50)
     public String getName() {

src/main/java/com/loafle/overflow/module/member/service/MemberService.java

@@ -0,0 +1,63 @@
+package com.loafle.overflow.module.member.service;
+
+import com.loafle.overflow.module.member.dao.MemberDAO;
+import com.loafle.overflow.module.member.model.Member;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.stereotype.Service;
+
+/**
+ * Created by geek on 17. 6. 28.
+ */
+@Service
+public class MemberService {
+
+    @Autowired
+    private MemberDAO memberDAO;
+    @Autowired
+    private BCryptPasswordEncoder passwordEncoder;
+
+    public Member signin(Member member) throws Exception {
+        Member m = this.memberDAO.findByEmail(member);
+
+        if ( null == m ) {
+            return m;
+        }
+
+        if ( m.getStatus().getId() == 1 ) {
+            throw new Exception("Email Auth Confirm Check");
+        }
+
+        Boolean match = this.passwordEncoder.matches(member.getPw(), m.getPw());
+        if(!match) return null;
+
+        return m;
+    }
+
+    public Member signup(Member member) {
+
+        member.setPw(this.passwordEncoder.encode(member.getPw()));
+        return this.memberDAO.save(member);
+    }
+
+    public void signout(Member member) {
+        // Todo websocket session remove
+    }
+
+    public Member modify(Member member) {
+
+        return this.memberDAO.save(member);
+    }
+
+    public Member read(long memberId) {
+        return this.memberDAO.findOne(memberId);
+    }
+
+    public void withdrawal(Member member) {
+        // Todo DB delete?
+    }
+
+    public void emailConfirm(Member member) {
+
+    }
+}

src/main/java/com/loafle/overflow/module/sensor/service/SensorService.java

@@ -1,15 +1,18 @@
 package com.loafle.overflow.module.sensor.service;
 
+import com.loafle.overflow.module.meta.model.MetaSensorStatus;
 import com.loafle.overflow.module.sensor.dao.SensorDAO;
 import com.loafle.overflow.module.sensor.model.Sensor;
 import com.loafle.overflow.module.target.model.Target;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import java.util.List;
 
 /**
  * Created by insanity on 17. 6. 28.
  */
+@Service
 public class SensorService  {
 
     @Autowired
@@ -30,4 +33,16 @@ public class SensorService  {
     public void remove(Sensor sensor) {
         this.sensorDAO.delete(sensor);
     }
+
+    public Sensor start(Sensor sensor) {
+        MetaSensorStatus status = new MetaSensorStatus((short)1);
+        sensor.setStatus(status);
+        return this.sensorDAO.save(sensor);
+    }
+
+    public Sensor stop(Sensor sensor) {
+        MetaSensorStatus status = new MetaSensorStatus((short)2);
+        sensor.setStatus(status);
+        return this.sensorDAO.save(sensor);
+    }
 }

src/main/java/com/loafle/overflow/module/target/service/TargetDiscoveryService.java

@@ -0,0 +1,8 @@
+package com.loafle.overflow.module.target.service;
+
+/**
+ * Created by insanity on 17. 6. 28.
+ */
+public class TargetDiscoveryService {
+
+}

src/main/java/com/loafle/overflow/module/target/service/TargetService.java

@@ -4,12 +4,14 @@ import com.loafle.overflow.module.probe.model.Probe;
 import com.loafle.overflow.module.target.dao.TargetDAO;
 import com.loafle.overflow.module.target.model.Target;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import java.util.List;
 
 /**
  * Created by insanity on 17. 6. 28.
  */
+@Service
 public class TargetService {
 
     @Autowired