From a662f42bcfd974aa9e55c1f58b5afc2faef18f36 Mon Sep 17 00:00:00 2001
From: xxy <773861846@qq.com>
Date: Wed, 13 May 2020 22:35:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |  4 +-
 novel-admin/logs/debug.log                    |  8 ++--
 novel-admin/pom.xml                           | 39 ++++++++++---------
 novel-common/pom.xml                          |  2 +-
 novel-crawl/pom.xml                           |  2 +-
 novel-front/pom.xml                           |  2 +-
 .../novel/controller/PageController.java      |  2 +-
 .../novel/service/impl/UserServiceImpl.java   |  2 +-
 pom.xml                                       |  2 +-
 9 files changed, 34 insertions(+), 29 deletions(-)

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 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-thymeleaf</artifactId>
         </dependency>
-       <!-- NekoHTML 是一个简单地HTML扫描器和标签补偿器(tag balancer) ,使得程序能解析HTML文档并用标准的XML接口来访问其中的信息。
-        这个解析器能投扫描HTML文件并“修正”许多作者（人或机器）在编写HTML文档过程中常犯的错误。
-        NekoHTML 能增补缺失的父元素、自动用结束标签关闭相应的元素，以及不匹配的内嵌元素标签。
-        NekoHTML 的开发使用了Xerces Native Interface (XNI)，后者是Xerces2的实现基础。-->
+        <!-- NekoHTML 是一个简单地HTML扫描器和标签补偿器(tag balancer) ,使得程序能解析HTML文档并用标准的XML接口来访问其中的信息。
+         这个解析器能投扫描HTML文件并“修正”许多作者（人或机器）在编写HTML文档过程中常犯的错误。
+         NekoHTML 能增补缺失的父元素、自动用结束标签关闭相应的元素，以及不匹配的内嵌元素标签。
+         NekoHTML 的开发使用了Xerces Native Interface (XNI)，后者是Xerces2的实现基础。-->
         <dependency>
             <groupId>net.sourceforge.nekohtml</groupId>
             <artifactId>nekohtml</artifactId>
@@ -147,13 +147,13 @@
         <!--</dependency>-->
         <!-- quartz -->
         <!--<dependency>-->
-            <!--<groupId>org.springframework.boot</groupId>-->
-            <!--<artifactId>spring-boot-starter-cache</artifactId>-->
+        <!--<groupId>org.springframework.boot</groupId>-->
+        <!--<artifactId>spring-boot-starter-cache</artifactId>-->
         <!--</dependency>-->
 
         <!--<dependency>-->
-            <!--<groupId>net.sf.ehcache</groupId>-->
-            <!--<artifactId>ehcache</artifactId>-->
+        <!--<groupId>net.sf.ehcache</groupId>-->
+        <!--<artifactId>ehcache</artifactId>-->
         <!--</dependency>-->
 
 
@@ -188,7 +188,6 @@
         </dependency>
 
 
-
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -239,18 +238,22 @@
                 </configuration>
             </plugin>-->
             <!--SpringBoot项目默认使用spring-boot-maven-plugin，要打成被其他项目引用的jar包，需要更换此插件-->
+            <!-- <plugin>
+                 <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-compiler-plugin</artifactId>
+                 <configuration>
+                     <source>1.8</source>
+                     <target>1.8</target>
+                     <encoding>UTF-8</encoding>
+                 </configuration>
+             </plugin>-->
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                    <encoding>UTF-8</encoding>
-                </configuration>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
         </plugins>
     </build>
-    <distributionManagement>
+    <!--<distributionManagement>
         <repository>
             <id>nexus_release</id>
             <name>release</name>
@@ -261,5 +264,5 @@
             <name>snapshots</name>
             <url>http://47.106.243.172:8081/nexus/content/repositories/snapshots/</url>
         </snapshotRepository>
-    </distributionManagement>
+    </distributionManagement>-->
 </project>
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 @@
     <parent>
         <artifactId>novel</artifactId>
         <groupId>com.java2nb</groupId>
-        <version>1.2.0</version>
+        <version>2.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
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 @@
     <parent>
         <artifactId>novel</artifactId>
         <groupId>com.java2nb</groupId>
-        <version>1.2.0</version>
+        <version>2.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
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 @@
     <parent>
         <artifactId>novel</artifactId>
         <groupId>com.java2nb</groupId>
-        <version>1.2.0</version>
+        <version>2.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
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 @@
 
     <groupId>com.java2nb</groupId>
     <artifactId>novel</artifactId>
-    <version>1.2.0</version>
+    <version>2.0.0</version>
     <modules>
         <module>novel-common</module>
         <module>novel-front</module>