diff --git a/novel-front/src/main/java/xyz/zinglizingli/BookApplication.java b/novel-front/src/main/java/xyz/zinglizingli/BookApplication.java index 5db3b5f..e1cfe44 100644 --- a/novel-front/src/main/java/xyz/zinglizingli/BookApplication.java +++ b/novel-front/src/main/java/xyz/zinglizingli/BookApplication.java @@ -3,6 +3,7 @@ package xyz.zinglizingli; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.web.servlet.ServletComponentScan; import org.springframework.cache.annotation.EnableCaching; import org.springframework.context.annotation.Bean; import org.springframework.scheduling.TaskScheduler; @@ -13,6 +14,7 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; @EnableCaching @EnableScheduling @MapperScan({"xyz.zinglizingli.*.mapper"}) +@ServletComponentScan public class BookApplication { public static void main(String[] args) { diff --git a/novel-front/src/main/java/xyz/zinglizingli/books/core/listener/StartListener.java b/novel-front/src/main/java/xyz/zinglizingli/books/core/listener/StartListener.java index 480d6a2..cc94b6b 100644 --- a/novel-front/src/main/java/xyz/zinglizingli/books/core/listener/StartListener.java +++ b/novel-front/src/main/java/xyz/zinglizingli/books/core/listener/StartListener.java @@ -7,25 +7,35 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.context.ApplicationListener; import org.springframework.context.event.ContextRefreshedEvent; import org.springframework.stereotype.Component; +import org.springframework.web.context.ContextLoader; +import org.springframework.web.context.support.WebApplicationContextUtils; import xyz.zinglizingli.books.core.crawl.BaseCrawlSource; import xyz.zinglizingli.books.core.utils.Constants; +import javax.servlet.ServletContextEvent; +import javax.servlet.ServletContextListener; +import javax.servlet.annotation.WebListener; + /** * @author 11797 */ -@Component +@WebListener @Slf4j @RequiredArgsConstructor -public class StartListener implements ApplicationListener { +public class StartListener implements ServletContextListener { private final BaseCrawlSource crawlSource; @Value("${crawl.book.new.enabled}") private String crawlEnable; - @SneakyThrows + @Value("${website.name}") + private String webSiteName; + + @Override - public void onApplicationEvent(ContextRefreshedEvent event) { + public void contextInitialized(ServletContextEvent servletContextEvent) { + servletContextEvent.getServletContext().setAttribute("websiteName",webSiteName); if (!Constants.ENABLE_NEW_BOOK.equals(crawlEnable.trim())) { log.info("程序启动"); new Thread(() -> { @@ -45,4 +55,8 @@ public class StartListener implements ApplicationListener } } + @Override + public void contextDestroyed(ServletContextEvent servletContextEvent) { + + } } diff --git a/novel-front/src/main/java/xyz/zinglizingli/books/web/IndexController.java b/novel-front/src/main/java/xyz/zinglizingli/books/web/IndexController.java index 4bc4e4b..bade547 100644 --- a/novel-front/src/main/java/xyz/zinglizingli/books/web/IndexController.java +++ b/novel-front/src/main/java/xyz/zinglizingli/books/web/IndexController.java @@ -2,6 +2,7 @@ package xyz.zinglizingli.books.web; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.RequestMapping; @@ -11,6 +12,8 @@ import xyz.zinglizingli.books.service.BookService; import xyz.zinglizingli.common.cache.CommonCacheUtil; import xyz.zinglizingli.books.core.config.IndexRecBooksConfig; +import javax.servlet.ServletContext; +import javax.servlet.http.HttpServletRequest; import java.util.List; import java.util.Map; @@ -21,6 +24,7 @@ import java.util.Map; @Controller @RequestMapping @RequiredArgsConstructor +@Slf4j public class IndexController { diff --git a/novel-front/src/main/resources/application.yml b/novel-front/src/main/resources/application.yml index 71c8a2d..eef66ae 100644 --- a/novel-front/src/main/resources/application.yml +++ b/novel-front/src/main/resources/application.yml @@ -1,3 +1,6 @@ +website: + name: 笔趣阁新书门 + server: port: 8080 diff --git a/novel-front/src/main/resources/messages.properties b/novel-front/src/main/resources/messages.properties deleted file mode 100644 index aa81015..0000000 --- a/novel-front/src/main/resources/messages.properties +++ /dev/null @@ -1 +0,0 @@ -website.name=小说精品屋 \ No newline at end of file diff --git a/novel-front/src/main/resources/templates/books/book_search.html b/novel-front/src/main/resources/templates/books/book_search.html index 1bc618b..35a6be6 100644 --- a/novel-front/src/main/resources/templates/books/book_search.html +++ b/novel-front/src/main/resources/templates/books/book_search.html @@ -5,12 +5,12 @@ - + - + + th:content="${application.websiteName}+'是国内优秀的小说弹幕网站,'+${application.websiteName}+'提供海量热门网络小说,日本轻小说,国产轻小说,动漫小说,轻小说在线阅读和TXT小说下载,致力于网络精品小说的收集,智能计算小说评分,打造小说精品排行榜,致力于无广告无弹窗的小说阅读环境。'">
diff --git a/novel-front/src/main/resources/templates/books/index.html b/novel-front/src/main/resources/templates/books/index.html index b471fca..77f9c58 100644 --- a/novel-front/src/main/resources/templates/books/index.html +++ b/novel-front/src/main/resources/templates/books/index.html @@ -5,17 +5,17 @@ - + - + + th:content="${application.websiteName}+'是国内优秀的小说弹幕网站,'+${application.websiteName}+'提供海量热门网络小说,日本轻小说,国产轻小说,动漫小说,轻小说在线阅读和TXT小说下载,致力于网络精品小说的收集,智能计算小说评分,打造小说精品排行榜,致力于无广告无弹窗的小说阅读环境。'"> - + + th:content="${application.websiteName}+'是国内优秀的小说弹幕网站,'+${application.websiteName}+'提供海量热门网络小说,日本轻小说,国产轻小说,动漫小说,轻小说在线阅读和TXT小说下载,致力于网络精品小说的收集,智能计算小说评分,打造小说精品排行榜,致力于无广告无弹窗的小说阅读环境。'"/>
diff --git a/novel-front/src/main/resources/templates/books/mh_book_search.html b/novel-front/src/main/resources/templates/books/mh_book_search.html index a64b186..2075f20 100644 --- a/novel-front/src/main/resources/templates/books/mh_book_search.html +++ b/novel-front/src/main/resources/templates/books/mh_book_search.html @@ -5,17 +5,17 @@ - + - + + th:content="${application.websiteName}+'是国内优秀的小说弹幕网站,'+${application.websiteName}+'提供海量热门网络小说,日本轻小说,国产轻小说,动漫小说,轻小说在线阅读和TXT小说下载,致力于网络精品小说的收集,智能计算小说评分,打造小说精品排行榜,致力于无广告无弹窗的小说阅读环境。'"> - + + th:content="${application.websiteName}+'是国内优秀的小说弹幕网站,'+${application.websiteName}+'提供海量热门网络小说,日本轻小说,国产轻小说,动漫小说,轻小说在线阅读和TXT小说下载,致力于网络精品小说的收集,智能计算小说评分,打造小说精品排行榜,致力于无广告无弹窗的小说阅读环境。'"/>
diff --git a/novel-front/src/main/resources/templates/books/soft_book_search.html b/novel-front/src/main/resources/templates/books/soft_book_search.html index 9170bbe..038893d 100644 --- a/novel-front/src/main/resources/templates/books/soft_book_search.html +++ b/novel-front/src/main/resources/templates/books/soft_book_search.html @@ -5,17 +5,17 @@ - + - + + th:content="${application.websiteName}+'是国内优秀的小说弹幕网站,'+${application.websiteName}+'提供海量热门网络小说,日本轻小说,国产轻小说,动漫小说,轻小说在线阅读和TXT小说下载,致力于网络精品小说的收集,智能计算小说评分,打造小说精品排行榜,致力于无广告无弹窗的小说阅读环境。'"> - + + th:content="${application.websiteName}+'是国内优秀的小说弹幕网站,'+${application.websiteName}+'提供海量热门网络小说,日本轻小说,国产轻小说,动漫小说,轻小说在线阅读和TXT小说下载,致力于网络精品小说的收集,智能计算小说评分,打造小说精品排行榜,致力于无广告无弹窗的小说阅读环境。'"/>
diff --git a/novel-front/src/main/resources/templates/user/login.html b/novel-front/src/main/resources/templates/user/login.html index 0c2a60c..13ee0a9 100644 --- a/novel-front/src/main/resources/templates/user/login.html +++ b/novel-front/src/main/resources/templates/user/login.html @@ -7,7 +7,7 @@ 登录|注册 + th:content="${application.websiteName}+'是国内优秀的小说弹幕网站,'+${application.websiteName}+'提供海量热门网络小说,日本轻小说,国产轻小说,动漫小说,轻小说在线阅读和TXT小说下载,致力于网络精品小说的收集,智能计算小说评分,打造小说精品排行榜,致力于无广告无弹窗的小说阅读环境。'">