From 16e381f384947ed7dfb74b73a37ce5cc2ab2351a Mon Sep 17 00:00:00 2001 From: xiaoyang Date: Fri, 7 Jan 2022 17:24:20 +0800 Subject: [PATCH 1/3] =?UTF-8?q?chore(sh):=20=E4=BF=AE=E6=94=B9JVM=E5=90=AF?= =?UTF-8?q?=E5=8A=A8=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 兼容低配置机器 --- novel-admin/src/main/build/scripts/start.sh | 2 +- novel-crawl/src/main/build/scripts/start.sh | 2 +- novel-front/src/main/build/scripts/start.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/novel-admin/src/main/build/scripts/start.sh b/novel-admin/src/main/build/scripts/start.sh index d58dc95..0819461 100644 --- a/novel-admin/src/main/build/scripts/start.sh +++ b/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" diff --git a/novel-crawl/src/main/build/scripts/start.sh b/novel-crawl/src/main/build/scripts/start.sh index 17f0acd..1e587e0 100644 --- a/novel-crawl/src/main/build/scripts/start.sh +++ b/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" diff --git a/novel-front/src/main/build/scripts/start.sh b/novel-front/src/main/build/scripts/start.sh index 58519df..a09f4d0 100644 --- a/novel-front/src/main/build/scripts/start.sh +++ b/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" From c1eb7b8954fd3e19af7c04c3874b49fd186c3eae Mon Sep 17 00:00:00 2001 From: xiaoyang Date: Fri, 7 Jan 2022 18:02:46 +0800 Subject: [PATCH 2/3] =?UTF-8?q?docs:=20=E5=A2=9E=E5=8A=A0=E8=AF=B4?= =?UTF-8?q?=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 3dff6b8..08915cb 100644 --- a/README.md +++ b/README.md @@ -213,6 +213,8 @@ novel-plus -- 父工程 #### 安装步骤（源码，小白请看其他安装教程） +部分环境（如新版Mac OS系统）获取不到主机IP，需要手动修改host文件，增加IP-主机名（通过hostname命令查看主机名）的映射。 + ##### 数据库安装： 1. 安装MySQL软件。 From 2a69a28a0cca0566805566d1da891f9f3dd79231 Mon Sep 17 00:00:00 2001 From: xiaoyang Date: Sat, 8 Jan 2022 11:59:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?perf:=20=E9=A2=84=E5=8A=A0=E8=BD=BDIdWorker?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/java2nb/novel/service/impl/CrawlServiceImpl.java | 5 +++-- .../com/java2nb/novel/service/impl/BookServiceImpl.java | 6 ++++-- .../com/java2nb/novel/service/impl/UserServiceImpl.java | 3 ++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/novel-crawl/src/main/java/com/java2nb/novel/service/impl/CrawlServiceImpl.java b/novel-crawl/src/main/java/com/java2nb/novel/service/impl/CrawlServiceImpl.java index 9b7b00c..d8b02b8 100644 --- a/novel-crawl/src/main/java/com/java2nb/novel/service/impl/CrawlServiceImpl.java +++ b/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()); diff --git a/novel-front/src/main/java/com/java2nb/novel/service/impl/BookServiceImpl.java b/novel-front/src/main/java/com/java2nb/novel/service/impl/BookServiceImpl.java index 056bda6..cf8a750 100644 --- a/novel-front/src/main/java/com/java2nb/novel/service/impl/BookServiceImpl.java +++ b/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); 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 b4970b6..bd85505 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 @@ -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();