diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 0000000..bf3b88e --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,29 @@ +# This workflow will build a package using Maven and then publish it to GitHub packages when a release is created +# For more information see: https://github.com/actions/setup-java#apache-maven-with-a-settings-path + +name: Blog backEnd CI + +on: + push: + pull_request: + branches: [ master ] + +jobs: + build: + + runs-on: ubuntu-latest + env: + APPLICATION_PROPERTIES_TEST: ${{ secrets.APPLICATION_PROPERTIES_TEST }} + APPLICATION_PROPERTIES_PROD: ${{ secrets.APPLICATION_PROPERTIES_PROD }} + + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + + - name: Build jar file + run: echo $APPLICATION_PROPERTIES_TEST|base64 -d > src/main/resources/application-test.properties && mvn -B test --file pom.xml + + diff --git a/blog.sql b/blog.sql index 5e15303..325eb68 100644 --- a/blog.sql +++ b/blog.sql @@ -139,7 +139,7 @@ where article.a_id = article_tag.a_id CREATE VIEW commentView (commentId, pagePath, content, date, status, pid, toAuthorId, toAuthorEmail, toAuthorDisplayName, toAuthorAvatar, fromAuthorId, fromAuthorEmail, fromAuthorDisplayName, - fromAuthorAvatar, isDelete) + fromAuthorAvatar) as select cuT.co_id as commentId, cuT.co_page_path as pagePath, @@ -154,8 +154,7 @@ select cuT.co_id as commentId, userFrom.u_id as fromAuthorId, userFrom.u_email as fromAuthorEmail, userFrom.u_display_name as fromAuthorDisplayName, - userFrom.u_avatar as fromAuthorAvatar, - cuT.is_delete as isDelete + userFrom.u_avatar as fromAuthorAvatar from (select comment.co_id, comment.co_page_path, comment.co_content, @@ -166,8 +165,7 @@ from (select comment.co_id, comment.co_to_author_id, userTo.u_email as toEmail, userTo.u_display_name as toDisplayName, - userTo.u_avatar as toAvatar, - comment.is_delete + userTo.u_avatar as toAvatar from comment left join user userTo on (comment.co_to_author_id = userTo.u_id) ) as cuT, diff --git a/src/main/resources/mapper/CommentMapper.xml b/src/main/resources/mapper/CommentMapper.xml index 73ae58e..2405cd1 100644 --- a/src/main/resources/mapper/CommentMapper.xml +++ b/src/main/resources/mapper/CommentMapper.xml @@ -37,8 +37,8 @@ - insert into comment (co_page_path, co_content, co_date, co_pid, co_from_author_id, co_to_author_id, is_delete) - VALUES (#{pagePath}, #{content}, now(), #{pid}, #{fromUser.id}, #{toUser.id}, false) + insert into comment (co_page_path, co_content, co_date, co_pid, co_from_author_id, co_to_author_id, co_status) + VALUES (#{pagePath}, #{content}, now(), #{pid}, #{fromUser.id}, #{toUser.id}, 0)