From 7f4728191ab231d623d4f054e6be7de2124f672d Mon Sep 17 00:00:00 2001 From: xiaoyang Date: Sat, 4 Sep 2021 16:27:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE=E9=A1=B9?= =?UTF-8?q?=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- novel-common/src/main/resources/application-common-dev.yml | 2 +- novel-common/src/main/resources/application-common-prod.yml | 2 +- .../java2nb/novel/service/impl/DbBookContentServiceImpl.java | 2 +- .../novel/service/impl/FileBookContentServiceImpl.java | 4 ++-- .../src/main/java/com/java2nb/novel/page/PageController.java | 2 +- .../java2nb/novel/service/impl/DbBookContentServiceImpl.java | 2 +- .../novel/service/impl/FileBookContentServiceImpl.java | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/novel-common/src/main/resources/application-common-dev.yml b/novel-common/src/main/resources/application-common-dev.yml index 9018872..92d740d 100644 --- a/novel-common/src/main/resources/application-common-dev.yml +++ b/novel-common/src/main/resources/application-common-dev.yml @@ -71,7 +71,7 @@ sharding: -txt: +content: save: storage: db #存储介质，db：数据库，file：txt文本 path: /Users/xiongxiaoyang/books #txt小说文本保存路径 \ No newline at end of file diff --git a/novel-common/src/main/resources/application-common-prod.yml b/novel-common/src/main/resources/application-common-prod.yml index 8853b0b..9f02a0a 100644 --- a/novel-common/src/main/resources/application-common-prod.yml +++ b/novel-common/src/main/resources/application-common-prod.yml @@ -74,7 +74,7 @@ logging: -txt: +content: save: storage: db #存储介质，db：数据库，file：txt文本 path: /Users/xiongxiaoyang/books #txt小说文本保存路径 diff --git a/novel-crawl/src/main/java/com/java2nb/novel/service/impl/DbBookContentServiceImpl.java b/novel-crawl/src/main/java/com/java2nb/novel/service/impl/DbBookContentServiceImpl.java index 9cb75bc..4aa7849 100644 --- a/novel-crawl/src/main/java/com/java2nb/novel/service/impl/DbBookContentServiceImpl.java +++ b/novel-crawl/src/main/java/com/java2nb/novel/service/impl/DbBookContentServiceImpl.java @@ -17,7 +17,7 @@ import static org.mybatis.dynamic.sql.SqlBuilder.update; @Service @RequiredArgsConstructor -@ConditionalOnProperty(prefix = "txt.save", name = "storage", havingValue = "db") +@ConditionalOnProperty(prefix = "content.save", name = "storage", havingValue = "db") public class DbBookContentServiceImpl implements BookContentService { private final BookContentMapper bookContentMapper; diff --git a/novel-crawl/src/main/java/com/java2nb/novel/service/impl/FileBookContentServiceImpl.java b/novel-crawl/src/main/java/com/java2nb/novel/service/impl/FileBookContentServiceImpl.java index 28afc57..5d6f256 100644 --- a/novel-crawl/src/main/java/com/java2nb/novel/service/impl/FileBookContentServiceImpl.java +++ b/novel-crawl/src/main/java/com/java2nb/novel/service/impl/FileBookContentServiceImpl.java @@ -12,10 +12,10 @@ import java.util.List; @Service @RequiredArgsConstructor -@ConditionalOnProperty(prefix = "txt.save", name = "storage", havingValue = "file") +@ConditionalOnProperty(prefix = "content.save", name = "storage", havingValue = "file") public class FileBookContentServiceImpl implements BookContentService { - @Value("${txt.save.path}") + @Value("${content.save.path}") private String fileSavePath; @Override diff --git a/novel-front/src/main/java/com/java2nb/novel/page/PageController.java b/novel-front/src/main/java/com/java2nb/novel/page/PageController.java index 44b211f..1859418 100644 --- a/novel-front/src/main/java/com/java2nb/novel/page/PageController.java +++ b/novel-front/src/main/java/com/java2nb/novel/page/PageController.java @@ -34,7 +34,7 @@ import java.util.concurrent.ThreadPoolExecutor; @Controller public class PageController extends BaseController { - @Value("${txt.save.path}") + @Value("${content.save.path}") private String fileSavePath; private final BookService bookService; diff --git a/novel-front/src/main/java/com/java2nb/novel/service/impl/DbBookContentServiceImpl.java b/novel-front/src/main/java/com/java2nb/novel/service/impl/DbBookContentServiceImpl.java index bf5e008..3e4344f 100644 --- a/novel-front/src/main/java/com/java2nb/novel/service/impl/DbBookContentServiceImpl.java +++ b/novel-front/src/main/java/com/java2nb/novel/service/impl/DbBookContentServiceImpl.java @@ -20,7 +20,7 @@ import static org.mybatis.dynamic.sql.select.SelectDSL.select; @Service @RequiredArgsConstructor -@ConditionalOnProperty(prefix = "txt.save", name = "storage", havingValue = "db") +@ConditionalOnProperty(prefix = "content.save", name = "storage", havingValue = "db") public class DbBookContentServiceImpl implements BookContentService { private final BookContentMapper bookContentMapper; diff --git a/novel-front/src/main/java/com/java2nb/novel/service/impl/FileBookContentServiceImpl.java b/novel-front/src/main/java/com/java2nb/novel/service/impl/FileBookContentServiceImpl.java index aa59320..bcb0425 100644 --- a/novel-front/src/main/java/com/java2nb/novel/service/impl/FileBookContentServiceImpl.java +++ b/novel-front/src/main/java/com/java2nb/novel/service/impl/FileBookContentServiceImpl.java @@ -15,10 +15,10 @@ import java.util.List; @Service @RequiredArgsConstructor -@ConditionalOnProperty(prefix = "txt.save", name = "storage", havingValue = "file") +@ConditionalOnProperty(prefix = "content.save", name = "storage", havingValue = "file") public class FileBookContentServiceImpl implements BookContentService { - @Value("${txt.save.path}") + @Value("${content.save.path}") private String fileSavePath; @SneakyThrows