Merge remote-tracking branch 'origin/master'

This commit is contained in:
snoop 2017-08-22 19:24:44 +09:00
commit 2e09733eb5
3 changed files with 6 additions and 2 deletions

View File

@ -55,6 +55,7 @@ public class NoAuthProbeService {
probe.setTargetCount(0);
probe.setSensorCount(0);
probe.setEncryptionKey("111");
probe.setDisplayName(noAuth.getHostName()+"'s probe");
// resprobe.add(probe);
this.probeService.regist(probe);

View File

@ -17,5 +17,5 @@ public interface ProbeDAO extends JpaRepository<Probe, Long> {
Probe findByProbeKey(String probeKey);
List<Probe> findAllByDomain(Domain domain);
List<Probe> findAllByDomainOrderByIdDesc(Domain domain);
}

View File

@ -23,7 +23,7 @@ public class ProbeService {
public List<Probe> readAllByDomain(Domain domain) {
return this.probeDAO.findAllByDomain(domain);
return this.probeDAO.findAllByDomainOrderByIdDesc(domain);
}
public Probe read(long id) {
@ -35,4 +35,7 @@ public class ProbeService {
return this.probeDAO.findByProbeKey(probeKey);
}
public Probe modify(Probe probe) {
return this.probeDAO.save(probe);
}
}