diff --git a/README.md b/README.md
index 64495f3..2eca4a1 100644
--- a/README.md
+++ b/README.md
@@ -24,9 +24,9 @@
- [x] 排行榜。
- [x] 小说评论模块。
- [x] 阅读主题模块。
-- [ ] 作家专区。
+- [x] 作家专区。
- [x] 充值。
-- [ ] 后台管理系统。
+- [x] 后台管理系统。
- [x] 爬虫管理系统。
#### 项目结构
diff --git a/novel-admin/logs/debug.log b/novel-admin/logs/debug.log
index f79869e..a4414cb 100644
--- a/novel-admin/logs/debug.log
+++ b/novel-admin/logs/debug.log
@@ -1,3 +1,5 @@
-2020-05-07 04:15:36,250 INFO (StartupInfoLogger.java:50)- Starting TestDemo on USER-20180729KA with PID 9748 (started by Administrator in E:\baseprojectparent\novel-plus\novel-admin)
-2020-05-07 04:15:36,253 DEBUG (StartupInfoLogger.java:53)- Running with Spring Boot v2.0.1.RELEASE, Spring v5.0.5.RELEASE
-2020-05-07 04:15:36,260 INFO (SpringApplication.java:663)- The following profiles are active: dev
+2020-05-13 21:52:00,972 INFO (StartupInfoLogger.java:50)- Starting TestDemo on USER-20180729KA with PID 3532 (started by Administrator in E:\baseprojectparent\novel-plus\novel-admin)
+2020-05-13 21:52:01,113 DEBUG (StartupInfoLogger.java:53)- Running with Spring Boot v2.0.1.RELEASE, Spring v5.0.5.RELEASE
+2020-05-13 21:52:01,131 INFO (SpringApplication.java:663)- The following profiles are active: dev
+2020-05-13 21:52:54,469 DEBUG (ApplicationContextRegister.java:29)- ApplicationContext registed-->org.springframework.web.context.support.GenericWebApplicationContext@5b529706: startup date [Wed May 13 21:52:01 CST 2020]; root of context hierarchy
+2020-05-13 21:53:49,622 INFO (StartupInfoLogger.java:59)- Started TestDemo in 114.268 seconds (JVM running for 124.957)
diff --git a/novel-admin/pom.xml b/novel-admin/pom.xml
index 6587b21..43520ef 100644
--- a/novel-admin/pom.xml
+++ b/novel-admin/pom.xml
@@ -50,10 +50,10 @@
org.springframework.boot
spring-boot-starter-thymeleaf
-
+
net.sourceforge.nekohtml
nekohtml
@@ -147,13 +147,13 @@
-
-
+
+
-
-
+
+
@@ -188,7 +188,6 @@
-
org.projectlombok
lombok
@@ -239,18 +238,22 @@
-->
+
- org.apache.maven.plugins
- maven-compiler-plugin
-
- 1.8
- 1.8
- UTF-8
-
+ org.springframework.boot
+ spring-boot-maven-plugin
-
+
diff --git a/novel-common/pom.xml b/novel-common/pom.xml
index fb7c41b..3d2e021 100644
--- a/novel-common/pom.xml
+++ b/novel-common/pom.xml
@@ -5,7 +5,7 @@
novel
com.java2nb
- 1.2.0
+ 2.0.0
4.0.0
diff --git a/novel-crawl/pom.xml b/novel-crawl/pom.xml
index 9e84ff3..c7ef362 100644
--- a/novel-crawl/pom.xml
+++ b/novel-crawl/pom.xml
@@ -5,7 +5,7 @@
novel
com.java2nb
- 1.2.0
+ 2.0.0
4.0.0
diff --git a/novel-front/pom.xml b/novel-front/pom.xml
index ce12dab..66b7612 100644
--- a/novel-front/pom.xml
+++ b/novel-front/pom.xml
@@ -5,7 +5,7 @@
novel
com.java2nb
- 1.2.0
+ 2.0.0
4.0.0
diff --git a/novel-front/src/main/java/com/java2nb/novel/controller/PageController.java b/novel-front/src/main/java/com/java2nb/novel/controller/PageController.java
index f9dd17d..bcba1c4 100644
--- a/novel-front/src/main/java/com/java2nb/novel/controller/PageController.java
+++ b/novel-front/src/main/java/com/java2nb/novel/controller/PageController.java
@@ -51,7 +51,7 @@ public class PageController extends BaseController{
UserDetails user = getUserDetails(request);
if (user == null) {
//未登录
- return "redirect:/user/login.html?originUrl=" + URLEncoder.encode(request.getRequestURL().toString());
+ return "redirect:/user/login.html?originUrl=" + request.getRequestURI();
}
boolean isAuthor = authorService.isAuthor(user.getId());
diff --git a/novel-front/src/main/java/com/java2nb/novel/service/impl/UserServiceImpl.java b/novel-front/src/main/java/com/java2nb/novel/service/impl/UserServiceImpl.java
index 25ec2f3..2914cd8 100644
--- a/novel-front/src/main/java/com/java2nb/novel/service/impl/UserServiceImpl.java
+++ b/novel-front/src/main/java/com/java2nb/novel/service/impl/UserServiceImpl.java
@@ -276,7 +276,7 @@ public class UserServiceImpl implements UserService {
.and(UserBuyRecordDynamicSqlSupport.bookIndexId,isEqualTo(bookIndexId))) > 0;
}
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
@Override
public void buyBookIndex(Long userId, UserBuyRecord buyRecord) {
//查询用户余额
diff --git a/pom.xml b/pom.xml
index 3ec8697..75be04e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
com.java2nb
novel
- 1.2.0
+ 2.0.0
novel-common
novel-front