diff --git a/.gitignore b/.gitignore index 4709401..271ba77 100644 --- a/.gitignore +++ b/.gitignore @@ -21,5 +21,7 @@ # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* -.settings/org.eclipse.m2e.core.prefs +.settings/ .project +/target/ +.classpath diff --git a/src/main/java/com/flagnote/note/controller/NoteController.java b/src/main/java/com/flagnote/note/controller/NoteController.java index 1364114..f40689f 100644 --- a/src/main/java/com/flagnote/note/controller/NoteController.java +++ b/src/main/java/com/flagnote/note/controller/NoteController.java @@ -49,15 +49,17 @@ public class NoteController { public NoteMeta getNoteMeta(@PathVariable("key") String key) { NoteMeta meta = new NoteMeta(); Note note = noteService.getNote(key); + meta.setKey(key); + if (null == note) { return meta; } + meta.setServerTime(new Date().getTime()); - meta.setKey(key); meta.setLock(note.getLock()); meta.setMd5(note.getMd5()); - + meta.setState(note.getState()); meta.setTtl(note.getTtl()); return meta; diff --git a/src/main/java/com/flagnote/note/entity/Note.java b/src/main/java/com/flagnote/note/entity/Note.java index 6e15de9..e3c9004 100644 --- a/src/main/java/com/flagnote/note/entity/Note.java +++ b/src/main/java/com/flagnote/note/entity/Note.java @@ -17,8 +17,6 @@ public class Note implements Serializable { private String key; - private String text; - private String md5; private Integer lock; diff --git a/src/main/java/com/flagnote/note/entity/NoteMeta.java b/src/main/java/com/flagnote/note/entity/NoteMeta.java index de3d62b..ca5d0aa 100644 --- a/src/main/java/com/flagnote/note/entity/NoteMeta.java +++ b/src/main/java/com/flagnote/note/entity/NoteMeta.java @@ -16,6 +16,8 @@ public class NoteMeta implements Serializable {/** private String key; + private Integer state; + private String cipher; private Integer lock; diff --git a/src/main/java/com/flagnote/note/service/NoteServiceImpl.java b/src/main/java/com/flagnote/note/service/NoteServiceImpl.java index 4370c6e..624e280 100644 --- a/src/main/java/com/flagnote/note/service/NoteServiceImpl.java +++ b/src/main/java/com/flagnote/note/service/NoteServiceImpl.java @@ -3,10 +3,6 @@ package com.flagnote.note.service; import java.util.Date; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Example; -import org.springframework.data.domain.ExampleMatcher; -import org.springframework.data.mongodb.core.query.Criteria; -import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Service; import com.flagnote.note.entity.Note; @@ -14,6 +10,7 @@ import com.flagnote.note.repository.NoteMongoRepository; import com.flagnote.note.utils.BizKeyUtils; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ArrayUtil; @Service public class NoteServiceImpl implements NoteService { @@ -33,11 +30,14 @@ public class NoteServiceImpl implements NoteService { } if (note.getState() != 1) { - return null; + note.setTextBytes(null); + return note; } if (note.getExpireTime().getTime() <= new Date().getTime()) { - return null; + note.setState(0); + note.setTextBytes(null); + return note; } return note; @@ -63,8 +63,13 @@ public class NoteServiceImpl implements NoteService { @Override public void deleteNote(String key) { String mixKey = BizKeyUtils.mixKey(key); + Note note = noteMongoRepository.findById(mixKey).orElse(null); - noteMongoRepository.deleteById(mixKey); + if(null!=note && ArrayUtil.isNotEmpty(note.getTextBytes())) { + note.setState(0); + note.setTextBytes(null); + noteMongoRepository.save(note); + } } }