From 3d280de545ceff5faf8da9a82b959b1726cba825 Mon Sep 17 00:00:00 2001 From: ruibaby Date: Tue, 3 Sep 2019 10:11:25 +0800 Subject: [PATCH] Fixed #280 --- .../java/run/halo/app/model/params/PostParam.java | 4 ++-- .../java/run/halo/app/model/params/SheetParam.java | 12 ++---------- .../halo/app/service/impl/AdminServiceImpl.java | 2 +- src/main/resources/application-dev.yaml | 14 ++++---------- src/main/resources/application-test.yaml | 14 ++++---------- src/main/resources/application.yaml | 10 +--------- 6 files changed, 14 insertions(+), 42 deletions(-) diff --git a/src/main/java/run/halo/app/model/params/PostParam.java b/src/main/java/run/halo/app/model/params/PostParam.java index 24d16a66d..abf14a7c6 100644 --- a/src/main/java/run/halo/app/model/params/PostParam.java +++ b/src/main/java/run/halo/app/model/params/PostParam.java @@ -62,7 +62,7 @@ public class PostParam implements InputConverter { @Override public Post convertTo() { if (StringUtils.isBlank(url)) { - url = title; + url = title.replace(".",""); } if (null == thumbnail) { thumbnail = ""; @@ -80,7 +80,7 @@ public class PostParam implements InputConverter { @Override public void update(Post post) { if (StringUtils.isBlank(url)) { - url = title; + url = title.replace(".",""); } if (null == thumbnail) { thumbnail = ""; diff --git a/src/main/java/run/halo/app/model/params/SheetParam.java b/src/main/java/run/halo/app/model/params/SheetParam.java index cd01a4430..e657ddbbc 100644 --- a/src/main/java/run/halo/app/model/params/SheetParam.java +++ b/src/main/java/run/halo/app/model/params/SheetParam.java @@ -53,13 +53,9 @@ public class SheetParam implements InputConverter { @Override public Sheet convertTo() { if (StringUtils.isBlank(url)) { - url = HaloUtils.normalizeUrl(title); - } else { - url = HaloUtils.normalizeUrl(url); + url = title.replace(".",""); } - url = HaloUtils.initializeUrlIfBlank(url); - if (null == thumbnail) { thumbnail = ""; } @@ -76,13 +72,9 @@ public class SheetParam implements InputConverter { @Override public void update(Sheet sheet) { if (StringUtils.isBlank(url)) { - url = HaloUtils.normalizeUrl(title); - } else { - url = HaloUtils.normalizeUrl(url); + url = title.replace(".",""); } - url = HaloUtils.initializeUrlIfBlank(url); - if (null == thumbnail) { thumbnail = ""; } diff --git a/src/main/java/run/halo/app/service/impl/AdminServiceImpl.java b/src/main/java/run/halo/app/service/impl/AdminServiceImpl.java index 4c08c7f7a..4744b9c0f 100644 --- a/src/main/java/run/halo/app/service/impl/AdminServiceImpl.java +++ b/src/main/java/run/halo/app/service/impl/AdminServiceImpl.java @@ -194,7 +194,7 @@ public class AdminServiceImpl implements AdminService { @Override public StatisticDTO getCount() { StatisticDTO statisticDTO = new StatisticDTO(); - statisticDTO.setPostCount(postService.countByStatus(PostStatus.PUBLISHED)); + statisticDTO.setPostCount(postService.countByStatus(PostStatus.PUBLISHED) + sheetService.countByStatus(PostStatus.PUBLISHED)); statisticDTO.setAttachmentCount(attachmentService.count()); // Handle comment count diff --git a/src/main/resources/application-dev.yaml b/src/main/resources/application-dev.yaml index 081a65144..28b573305 100755 --- a/src/main/resources/application-dev.yaml +++ b/src/main/resources/application-dev.yaml @@ -1,16 +1,8 @@ server: port: 8090 use-forward-headers: true - undertow: - io-threads: 2 - worker-threads: 36 - buffer-size: 1024 - directBuffers: true - servlet: - session: - timeout: 86400s compression: - enabled: true + enabled: false mime-types: application/javascript,text/css,application/json,application/xml,text/html,text/xml,text/plain spring: jackson: @@ -48,7 +40,9 @@ spring: multipart: max-file-size: 10240MB max-request-size: 10240MB - + mvc: + favicon: + enabled: false cache: type: none logging: diff --git a/src/main/resources/application-test.yaml b/src/main/resources/application-test.yaml index 04d845f46..25250f245 100755 --- a/src/main/resources/application-test.yaml +++ b/src/main/resources/application-test.yaml @@ -1,16 +1,8 @@ server: port: 8090 use-forward-headers: true - undertow: - io-threads: 2 - worker-threads: 36 - buffer-size: 1024 - directBuffers: true - servlet: - session: - timeout: 86400s compression: - enabled: true + enabled: false mime-types: application/javascript,text/css,application/json,application/xml,text/html,text/xml,text/plain spring: jackson: @@ -47,7 +39,9 @@ spring: multipart: max-file-size: 10MB max-request-size: 10MB - + mvc: + favicon: + enabled: false cache: type: none logging: diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 85616f951..0312d2e77 100755 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -1,16 +1,8 @@ server: port: 8090 use-forward-headers: true - undertow: - io-threads: 2 - worker-threads: 36 - buffer-size: 1024 - directBuffers: true - servlet: - session: - timeout: 86400s compression: - enabled: true + enabled: false mime-types: application/javascript,text/css,application/json,application/xml,text/html,text/xml,text/plain spring: jackson: