Merge github.com:201206030/novel-plus into develop_xxy

README.md

@@ -213,6 +213,8 @@ novel-plus -- 父工程
 
 #### 安装步骤（源码，小白请看其他安装教程）
 
+部分环境（如新版Mac OS系统）获取不到主机IP，需要手动修改host文件，增加IP-主机名（通过hostname命令查看主机名）的映射。
+
 ##### 数据库安装：
 
 1. 安装MySQL软件。

novel-admin/src/main/build/scripts/start.sh

@@ -20,7 +20,7 @@ STDOUT_FILE=$LOGS_DIR/stdout.log
 #JAVA 环境配置
 JAVA_OPTS=" -Djava.net.preferIPv4Stack=true -Dlog.home=$LOGS_DIR"
 
-JAVA_MEM_OPTS=" -server -Xms1024m -Xmx1024m -XX:MetaspaceSize=64m -XX:MaxMetaspaceSize=256m  -XX:+UseG1GC -XX:MaxGCPauseMillis=100 -XX:InitiatingHeapOccupancyPercent=50 -XX:+PrintGCApplicationStoppedTime -XX:+PrintGCApplicationConcurrentTime -XX:+PrintGCDateStamps -verbose:gc -XX:+PrintGCDetails -XX:+PrintHeapAtGC -Xloggc:$LOGS_DIR/gc.log -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=100M -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=dump.hprof "
+JAVA_MEM_OPTS=" -server -XX:+UseG1GC -XX:MaxGCPauseMillis=100 -XX:InitiatingHeapOccupancyPercent=50 -XX:+PrintGCApplicationStoppedTime -XX:+PrintGCApplicationConcurrentTime -XX:+PrintGCDateStamps -verbose:gc -XX:+PrintGCDetails -XX:+PrintHeapAtGC -Xloggc:$LOGS_DIR/gc.log -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=100M -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=dump.hprof "
 #退出标志
 RETVAL="0"
 

novel-crawl/src/main/build/scripts/start.sh

@@ -20,7 +20,7 @@ STDOUT_FILE=$LOGS_DIR/stdout.log
 #JAVA 环境配置
 JAVA_OPTS=" -Djava.net.preferIPv4Stack=true -Dlog.home=$LOGS_DIR"
 
-JAVA_MEM_OPTS=" -server -Xms1024m -Xmx1024m -XX:MetaspaceSize=64m -XX:MaxMetaspaceSize=256m  -XX:+UseG1GC -XX:MaxGCPauseMillis=100 -XX:InitiatingHeapOccupancyPercent=50 -XX:+PrintGCApplicationStoppedTime -XX:+PrintGCApplicationConcurrentTime -XX:+PrintGCDateStamps -verbose:gc -XX:+PrintGCDetails -XX:+PrintHeapAtGC -Xloggc:$LOGS_DIR/gc.log -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=100M -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=dump.hprof "
+JAVA_MEM_OPTS=" -server -XX:+UseG1GC -XX:MaxGCPauseMillis=100 -XX:InitiatingHeapOccupancyPercent=50 -XX:+PrintGCApplicationStoppedTime -XX:+PrintGCApplicationConcurrentTime -XX:+PrintGCDateStamps -verbose:gc -XX:+PrintGCDetails -XX:+PrintHeapAtGC -Xloggc:$LOGS_DIR/gc.log -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=100M -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=dump.hprof "
 #退出标志
 RETVAL="0"
 

novel-crawl/src/main/java/com/java2nb/novel/service/impl/CrawlServiceImpl.java

@@ -58,9 +58,10 @@ public class CrawlServiceImpl implements CrawlService {
 
     private final BookService bookService;
 
-
     private final CacheService cacheService;
 
+    private final IdWorker idWorker = IdWorker.INSTANCE;
+
 
     @Override
     public void addCrawlSource(CrawlSource source) {
@@ -327,7 +328,7 @@ public class CrawlServiceImpl implements CrawlService {
                 book.setCrawlBookId(bookId);
                 book.setCrawlSourceId(sourceId);
                 book.setCrawlLastTime(new Date());
-                book.setId(IdWorker.INSTANCE.nextId());
+                book.setId(idWorker.nextId());
                 //解析章节目录
                 boolean parseIndexContentResult = CrawlParser.parseBookIndexAndContent(bookId, book, ruleBean, new HashMap<>(0), chapter -> {
                     bookService.saveBookAndIndexAndContent(book, chapter.getBookIndexList(), chapter.getBookContentList());

novel-front/src/main/build/scripts/start.sh

@@ -20,7 +20,7 @@ STDOUT_FILE=$LOGS_DIR/stdout.log
 #JAVA 环境配置
 JAVA_OPTS=" -Djava.net.preferIPv4Stack=true -Dlog.home=$LOGS_DIR"
 
-JAVA_MEM_OPTS=" -server -Xms1024m -Xmx1024m -XX:MetaspaceSize=64m -XX:MaxMetaspaceSize=256m  -XX:+UseG1GC -XX:MaxGCPauseMillis=100 -XX:InitiatingHeapOccupancyPercent=50 -XX:+PrintGCApplicationStoppedTime -XX:+PrintGCApplicationConcurrentTime -XX:+PrintGCDateStamps -verbose:gc -XX:+PrintGCDetails -XX:+PrintHeapAtGC -Xloggc:$LOGS_DIR/gc.log -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=100M -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=dump.hprof "
+JAVA_MEM_OPTS=" -server -XX:+UseG1GC -XX:MaxGCPauseMillis=100 -XX:InitiatingHeapOccupancyPercent=50 -XX:+PrintGCApplicationStoppedTime -XX:+PrintGCApplicationConcurrentTime -XX:+PrintGCDateStamps -verbose:gc -XX:+PrintGCDetails -XX:+PrintHeapAtGC -Xloggc:$LOGS_DIR/gc.log -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=100M -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=dump.hprof "
 #退出标志
 RETVAL="0"
 

novel-front/src/main/java/com/java2nb/novel/service/impl/BookServiceImpl.java

@@ -95,6 +95,8 @@ public class BookServiceImpl implements BookService {
 
     private final BookPriceProperties bookPriceConfig;
 
+    private final IdWorker idWorker = IdWorker.INSTANCE;
+
 
     @SneakyThrows
     @Override
@@ -428,7 +430,7 @@ public class BookServiceImpl implements BookService {
         } else {
             //作者不存在，先创建作者
             Date currentDate = new Date();
-            authorId = IdWorker.INSTANCE.nextId();
+            authorId = idWorker.nextId();
             BookAuthor bookAuthor = new BookAuthor();
             bookAuthor.setId(authorId);
             bookAuthor.setPenName(authorName);
@@ -548,7 +550,7 @@ public class BookServiceImpl implements BookService {
             //并不是更新自己的小说
             return;
         }
-        Long lastIndexId = IdWorker.INSTANCE.nextId();
+        Long lastIndexId = idWorker.nextId();
         Date currentDate = new Date();
         int wordCount = StringUtil.getStrValidWordCount(content);
 

novel-front/src/main/java/com/java2nb/novel/service/impl/UserServiceImpl.java

@@ -56,6 +56,7 @@ public class UserServiceImpl implements UserService {
 
     private final UserBuyRecordMapper userBuyRecordMapper;
 
+    private final IdWorker idWorker = IdWorker.INSTANCE;
 
 
     @Override
@@ -74,7 +75,7 @@ public class UserServiceImpl implements UserService {
         User entity = new User();
         BeanUtils.copyProperties(user,entity);
         //数据库生成注册记录
-        Long id = IdWorker.INSTANCE.nextId();
+        Long id = idWorker.nextId();
         entity.setId(id);
         entity.setNickName(entity.getUsername());
         Date currentDate = new Date();