Merge remote-tracking branch 'origin/dev' into dev

.gitignore

@@ -63,5 +63,4 @@ nbdist/
 *.rar
 
 ### VSCode
-.vscode
-
+.vscode

.travis.yml

@@ -16,21 +16,33 @@ jobs:
       script: ./gradlew check
     - stage: build
       script: ./gradlew build -x test
-    - stage: build-docker-image-for-release
+    - stage: Build Docker Image for Release
       script: ./scripts/docker-build-release.sh
-    - stage: build-docker-image-for-dev
+    - stage: Build Docker Image for Dev
       script: ./scripts/docker-build-dev.sh
+    - stage: GitHub Release
+      script: echo "Deploying to GitHub releases ..." && pwd
+      deploy:
+        provider: releases
+        api_key: $GITHUB_OAUTH_TOKEN
+        file_glob: true
+        file: $TRAVIS_BUILD_DIR/build/libs/*
+        skip_cleanup: true
+        on:
+          tags: true
 stages:
   - test
   - build
-  - name: build-docker-image-for-release
-    if: tag IS present
-  - name: build-docker-image-for-dev
-    if: branch = dev
+  - GitHub Release
+  - name: Build Docker Image for Release
+    if: tag =~ /^v\d+\.\d+(\.\d+)?(-release)?$/
+  - name: Build Docker Image for Dev
+    if: tag =~ /^v\d+\.\d+(\.\d+)?-(beta|alpha)+(\.\d+)?$/
 branches:
   only:
     - master
     - dev
+    - /^v\d+\.\d+(\.\d+)?(-\S*)?$/
 notifications:
   webhooks:
     - https://fathomless-fjord-24024.herokuapp.com/notify

Dockerfile

@@ -2,7 +2,7 @@ FROM openjdk:8-jdk-alpine
 
 VOLUME /tmp
 
-ARG JAR_FILE=build/libs/halo-1.0.0.beta.jar
+ARG JAR_FILE=build/libs/halo.jar
 ARG PORT=8090
 ARG TIME_ZONE=Asia/Shanghai
 

README.md

@@ -5,9 +5,9 @@
 <p align="center">
 <a href="https://ryanc.cc"><img alt="Author" src="https://img.shields.io/badge/author-ruibaby-red.svg?style=flat-square"/></a>
 <a href="#"><img alt="JDK" src="https://img.shields.io/badge/JDK-1.8-yellow.svg?style=flat-square"/></a>
-<a href="https://github.com/ruibaby/halo/releases"><img alt="GitHub release" src="https://img.shields.io/github/release/ruibaby/halo.svg?style=flat-square"/></a>
-<a href="https://travis-ci.org/ruibaby/halo"><img alt="Travis CI" src="https://img.shields.io/travis/ruibaby/halo.svg?style=flat-square"/></a>
-<a href="https://hub.docker.com/r/ruibaby/halo/"><img alt="Docker Build Status" src="https://img.shields.io/docker/build/ruibaby/halo.svg?style=flat-square"/></a>
+<a href="https://github.com/halo-dev/halo/releases"><img alt="GitHub release" src="https://img.shields.io/github/release/halo-dev/halo.svg?style=flat-square"/></a>
+<a href="https://travis-ci.org/halo-dev/halo"><img alt="Travis CI" src="https://img.shields.io/travis/halo-dev/halo.svg?style=flat-square"/></a>
+<a href="https://hub.docker.com/r/halo-dev/halo/"><img alt="Docker Build Status" src="https://img.shields.io/docker/build/halo-dev/halo.svg?style=flat-square"/></a>
 </p>
 
 ------------------------------

build.gradle

@@ -8,7 +8,7 @@ apply plugin: 'io.spring.dependency-management'
 
 group = 'run.halo.app'
 archivesBaseName = 'halo'
-version = '1.0.0.beta'
+version = '1.0.0-beta.3'
 sourceCompatibility = '1.8'
 description = 'Halo, personal blog system developed in Java.'
 

scripts/docker-build-dev.sh

@@ -5,6 +5,6 @@ VERSION=$(ls build/libs | sed 's/.*halo-//' | sed 's/.jar$//')
 echo "Halo version: $VERSION"
 
 echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-docker build -t $DOCKER_USERNAME/halo:latest-dev -t $DOCKER_USERNAME/halo:$VERSION.dev .
+docker build --build-arg JAR_FILE="build/libs/halo-$VERSION.jar" -t $DOCKER_USERNAME/halo:latest-dev -t $DOCKER_USERNAME/halo:$VERSION.dev .
 docker images
 docker push $DOCKER_USERNAME/halo

scripts/docker-build-release.sh

@@ -5,6 +5,6 @@ VERSION=$(ls build/libs | sed 's/.*halo-//' | sed 's/.jar$//')
 echo "Halo version: $VERSION"
 
 echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-docker build -t $DOCKER_USERNAME/halo -t $DOCKER_USERNAME/$VERSION .
+docker build --build-arg JAR_FILE=build/libs/halo-$VERSION.jar -t $DOCKER_USERNAME/halo -t $DOCKER_USERNAME/$VERSION .
 docker images
 docker push $DOCKER_USERNAME/halo

src/main/java/run/halo/app/event/comment/CommentEventListener.java

@@ -74,6 +74,8 @@ public void handleCommentNewEvent(CommentNewEvent newEvent) {
             // Get postComment id
             PostComment postComment = postCommentService.getById(newEvent.getCommentId());
 
+            log.debug("Got post comment: [{}]", postComment);
+
             Post post = postService.getById(postComment.getPostId());
 
             StrBuilder url = new StrBuilder(optionService.getBlogBaseUrl())
@@ -86,6 +88,8 @@ public void handleCommentNewEvent(CommentNewEvent newEvent) {
         } else if (newEvent.getSource() instanceof SheetService) {
             SheetComment sheetComment = sheetCommentService.getById(newEvent.getCommentId());
 
+            log.debug("Got sheet comment: [{}]", sheetComment);
+
             Sheet sheet = sheetService.getById(sheetComment.getPostId());
 
             StrBuilder url = new StrBuilder(optionService.getBlogBaseUrl())
@@ -98,6 +102,8 @@ public void handleCommentNewEvent(CommentNewEvent newEvent) {
         } else if (newEvent.getSource() instanceof JournalService) {
             JournalComment journalComment = journalCommentService.getById(newEvent.getCommentId());
 
+            log.debug("Got journal comment: [{}]", journalComment);
+
             Journal journal = journalService.getById(journalComment.getPostId());
 
             StrBuilder url = new StrBuilder(optionService.getBlogBaseUrl())
@@ -133,7 +139,7 @@ public void handleCommentReplyEvent(CommentReplyEvent replyEvent) {
 
         Map<String, Object> data = new HashMap<>();
 
-        log.debug("replyEvent.getSource():"+replyEvent.getSource().toString());
+        log.debug("replyEvent.getSource():" + replyEvent.getSource().toString());
 
         if (replyEvent.getSource() instanceof PostCommentService) {
 

src/main/java/run/halo/app/event/freemarker/FreemarkerConfigAwareListener.java

@@ -49,7 +49,6 @@ public FreemarkerConfigAwareListener(OptionService optionService,
         this.userService = userService;
     }
 
-    @Async
     @EventListener
     @Order(Ordered.HIGHEST_PRECEDENCE + 1)
     public void onApplicationStartedEvent(ApplicationStartedEvent applicationStartedEvent) throws TemplateModelException {
@@ -60,23 +59,20 @@ public void onApplicationStartedEvent(ApplicationStartedEvent applicationStarted
         loadUserConfig();
     }
 
-    @Async
     @EventListener
     public void onThemeActivatedEvent(ThemeActivatedEvent themeActivatedEvent) throws TemplateModelException {
         log.debug("Received theme activated event");
 
         loadThemeConfig();
     }
 
-    @Async
     @EventListener
     public void onUserUpdate(UserUpdatedEvent event) throws TemplateModelException {
         log.debug("Received user updated event, user id: [{}]", event.getUserId());
 
         loadUserConfig();
     }
 
-    @Async
     @EventListener
     public void onOptionUpdate(OptionUpdatedEvent event) throws TemplateModelException {
         log.debug("Received option updated event");

src/main/java/run/halo/app/event/theme/ThemeUpdatedListener.java

@@ -22,13 +22,11 @@ public ThemeUpdatedListener(StringCacheStore cacheStore) {
         this.cacheStore = cacheStore;
     }
 
-    @Async
     @EventListener
     public void onApplicationEvent(ThemeUpdatedEvent event) {
         cacheStore.delete(ThemeService.THEMES_CACHE_KEY);
     }
 
-    @Async
     @EventListener
     public void onOptionUpdatedEvent(OptionUpdatedEvent optionUpdatedEvent) {
         cacheStore.delete(ThemeService.THEMES_CACHE_KEY);