diff --git a/src/main/java/com/dd/admin/business/note/mapper/xml/NoteMapper.xml b/src/main/java/com/dd/admin/business/note/mapper/xml/NoteMapper.xml index 76264c2..d9fe09b 100644 --- a/src/main/java/com/dd/admin/business/note/mapper/xml/NoteMapper.xml +++ b/src/main/java/com/dd/admin/business/note/mapper/xml/NoteMapper.xml @@ -235,7 +235,6 @@ ) AS n LEFT JOIN business_author a ON n.follow_id = a.AUTHOR_ID LEFT JOIN business_note b ON n.note_id = b.note_id - where n.follow_id != #{authorId} ORDER BY n.create_time DESC @@ -268,7 +267,7 @@ business_reply r LEFT JOIN business_author a ON r.author_id = a.AUTHOR_ID LEFT JOIN business_note b ON r.note_id = b.note_id - where PARENT_AUTHOR_ID = #{authorId} and r.author_id != #{authorId} + where PARENT_AUTHOR_ID = #{authorId} ORDER BY r.create_time DESC diff --git a/src/test/java/com/dd/admin/BusinessGenerator.java b/src/test/java/com/dd/admin/BusinessGenerator.java index dfec192..185c8fb 100644 --- a/src/test/java/com/dd/admin/BusinessGenerator.java +++ b/src/test/java/com/dd/admin/BusinessGenerator.java @@ -77,7 +77,7 @@ public class BusinessGenerator { DataSourceConfig dsc = new DataSourceConfig(); dsc.setUrl("jdbc:mysql://8.146.211.120:3306/ddxhs?useSSL=false&autoReconnect=true&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8"); dsc.setUsername("root"); - dsc.setPassword("wxlwxl12"); + dsc.setPassword("admin"); // dsc.setSchemaName("public"); dsc.setDriverName("com.mysql.cj.jdbc.Driver"); diff --git a/web/src/utils/auth.js b/web/src/utils/auth.js index 059af18..4e69ba4 100644 --- a/web/src/utils/auth.js +++ b/web/src/utils/auth.js @@ -7,7 +7,7 @@ export function getToken() { } export function setToken(token) { - return Cookies.set(TokenKey, token) + return Cookies.set(TokenKey, token,{ expires: 29 }) } export function removeToken() {