feat: 默认返回位置信息

refactor: 简化代码
2020-09-05 16:35:45 +08:00 · 2020-09-05 15:43:43 +08:00 · 2020-09-05 15:42:03 +08:00 · 2020-09-04 13:02:36 +08:00 · 2020-09-04 12:29:18 +08:00 · 2020-09-04 12:23:15 +08:00
144 changed files with 10074 additions and 4000 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -0,0 +1,26 @@
+# 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: Build
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    env:
+      KEY: ${{ secrets.WEB_HOOK_ACCESS_KEY }}
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+
+      - name: Deploy
+        run: mvn -B test --file pom.xml && curl http://bt.celess.cn:2271/hook?access_key=$KEY
--- a/.github/workflows/mavenpublish.yml
+++ b/.github/workflows/mavenpublish.yml
@@ -1,47 +0,0 @@
-# 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:
-    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 && echo $APPLICATION_PROPERTIES_PROD|base64 -d> src/main/resources/application-prod.properties && mvn -B package --file pom.xml
-        
-    - name: SCP
-      uses: appleboy/scp-action@master
-      with:
-        host: ${{ secrets.SSH_HOST }}
-        username: ${{ secrets.SSH_USERNAME }}
-        password: ${{ secrets.SSH_PASSWORD }}
-        port: ${{ secrets.SSH_PORT }}
-        source: "target/blog-0.0.1-SNAPSHOT.jar"
-        target: "/www/wwwroot/api.celess.cn"
-
-    - name: Run SSH command
-      uses: garygrossgarten/github-action-ssh@v0.5.0
-      with:
-        command: cd /www/wwwroot/api.celess.cn && bash build.sh
-        host: ${{ secrets.SSH_HOST }}
-        username: ${{ secrets.SSH_USERNAME }}
-        password: ${{ secrets.SSH_PASSWORD }}
-        port: ${{ secrets.SSH_PORT }}
-    
--- a/.github/workflows/test.yml
+++ 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: Test
+
+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: Test
+        run: mvn -B test --file pom.xml
+
+    
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,8 @@
 .idea/
 *.imi
+*.iml
 target/

 # 本地项目的私有文件
-back-end/blog-dev.sql
 src/main/resources/application-dev.properties
 src/main/resources/application-prod.properties
-src/main/resources/application-test.properties
--- a/.mvn/wrapper/MavenWrapperDownloader.java
+++ b/.mvn/wrapper/MavenWrapperDownloader.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2007-present the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,7 +13,6 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-
 import java.net.*;
 import java.io.*;
 import java.nio.channels.*;
@@ -21,7 +20,7 @@ import java.util.Properties;

 public class MavenWrapperDownloader {

-    private static final String WRAPPER_VERSION = "0.5.5";
+    private static final String WRAPPER_VERSION = "0.5.6";
    /**
     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
     */
@@ -55,7 +54,7 @@ public class MavenWrapperDownloader {
        // wrapperUrl parameter.
        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
        String url = DEFAULT_DOWNLOAD_URL;
-        if (mavenWrapperPropertyFile.exists()) {
+        if(mavenWrapperPropertyFile.exists()) {
            FileInputStream mavenWrapperPropertyFileInputStream = null;
            try {
                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
@@ -66,7 +65,7 @@ public class MavenWrapperDownloader {
                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
            } finally {
                try {
-                    if (mavenWrapperPropertyFileInputStream != null) {
+                    if(mavenWrapperPropertyFileInputStream != null) {
                        mavenWrapperPropertyFileInputStream.close();
                    }
                } catch (IOException e) {
@@ -77,8 +76,8 @@ public class MavenWrapperDownloader {
        System.out.println("- Downloading from: " + url);

        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
-        if (!outputFile.getParentFile().exists()) {
-            if (!outputFile.getParentFile().mkdirs()) {
+        if(!outputFile.getParentFile().exists()) {
+            if(!outputFile.getParentFile().mkdirs()) {
                System.out.println(
                        "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
            }
--- a/.mvn/wrapper/maven-wrapper.jar
+++ b/.mvn/wrapper/maven-wrapper.jar
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -1,2 +1,2 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.2/apache-maven-3.6.2-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 MIT License

-Copyright (c) 2019 小海
+Copyright (c) 2020 禾几海

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/README.md
+++ b/README.md
@@ -1,11 +1,23 @@
- # 小海博客后端管理系统
-![Build Staus](https://github.com/xiaohai2271/blog-backEnd/workflows/Blog%20backEnd%20CI/badge.svg?branch=master&event=push) ![coverage report](https://gitlab.com/xiaohai2271/blog-backEnd/badges/master/coverage.svg) ![GitHub](https://img.shields.io/github/license/xiaohai2271/blog-backEnd) [![Website](https://img.shields.io/website?up_message=%E5%B0%8F%E6%B5%B7%E5%8D%9A%E5%AE%A2&url=https%3A%2F%2Fwww.celess.cn)](https://www.celess.cn)
-  ## 基于Springboot的后端博客管理系统
+<h1 align="center">
+小海博客后端管理系统
+</h1>

+<div align="center">

+基于Springboot的后端博客管理系统

+[![Build](https://github.com/xiaohai2271/blog-backEnd/workflows/Build/badge.svg)](https://github.com/xiaohai2271/blog-backEnd)
+[![Test](https://github.com/xiaohai2271/blog-backEnd/workflows/Test/badge.svg)](https://github.com/xiaohai2271/blog-backEnd)
+[![GitHub tag (latest SemVer)](https://img.shields.io/github/v/tag/xiaohai2271/blog-backEnd)](https://github.com/xiaohai2271/blog-backEnd)
+[![GitHub](https://img.shields.io/github/license/xiaohai2271/blog-backEnd)](https://github.com/xiaohai2271/blog-backEnd)
+[![GitHub top language](https://img.shields.io/github/languages/top/xiaohai2271/blog-backEnd)](https://github.com/xiaohai2271/blog-backEnd)
+[![GitHub commit activity](https://img.shields.io/github/commit-activity/m/xiaohai2271/blog-backEnd)](https://github.com/xiaohai2271/blog-backEnd)
+[![GitHub last commit](https://img.shields.io/github/last-commit/xiaohai2271/blog-backEnd)](https://github.com/xiaohai2271/blog-backEnd)
+[![Website](https://img.shields.io/website?up_message=%E5%B0%8F%E6%B5%B7%E5%8D%9A%E5%AE%A2&url=https%3A%2F%2Fwww.celess.cn)](https://www.celess.cn)
+</div>

-  ### 主要使用的技术
+> 请配合前端项目一起食用 [https://github.com/xiaohai2271/blog-frontEnd](https://github.com/xiaohai2271/blog-frontEnd)
+## 🎈主要使用的技术

 |    使用的技术    |    名称    |     版本      |
 | :--------------: | :--------: | :-----------: |
@@ -18,18 +30,16 @@
 |     接口文档     |  Swagger   |     2.6.1     |
 |   数据库连接池   |   druid    |    1.1.14     |
 | 缓存（线上环境） |   redis    |     3.0.6     |
-|数据库|mysql|5.7|
+|    数据库     |mysql          |5.7            |

-  ### 接口文档
+## 🔨如何构建
+详情参照[Build](./doc/Build.md)文档

-   项目采用swagger2，接口文档自动生成，具体为 http://ip:端口/swagger-ui.html

-  ###  📝TODO
+## 📒接口文档
+项目采用swagger2，接口文档自动生成，具体为 http://ip:port/doc.html

-  - [x] 密码重置
-  - [x] 信息修改
-  - [ ] 接入qq登录
+或者参照[离线API文档](./doc/API.md)

-  ### 📌FIXME
-
-  - [ ] `/write` 图片上传的跨域问题
+## ☀授权协议
+[MIT](./LICENSE)
--- a/blog.iml
+++ b/blog.iml
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-    <facet type="web" name="Web">
-      <configuration>
-        <webroots />
-        <sourceRoots>
-          <root url="file://$MODULE_DIR$/src/main/java" />
-          <root url="file://$MODULE_DIR$/src/main/resources" />
-        </sourceRoots>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.11.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.11.2" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.25" level="project" />
-    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.1.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.8" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.8" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.8" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.1.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.16" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.16" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.16" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.14.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.1.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.1.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.5.RELEASE" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:8.0.15" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.1.3.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.1.3.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.1.3.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.11.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:2.23.4" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.9.10" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.10" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
-    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.5.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.1.5.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.6.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.14" level="project" />
-    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.6" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.6.1" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.10" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.10" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.6.1" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.6.1" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.6.1" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.6.1" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.6.1" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.0.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.6.1" level="project" />
-    <orderEntry type="library" name="Maven: com.youbenzi:MDTool:1.2.3" level="project" />
-    <orderEntry type="library" name="Maven: net.minidev:json-smart:2.3" level="project" />
-    <orderEntry type="library" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" level="project" />
-    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
-    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.5" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.ezmorph:ezmorph:1.0.6" level="project" />
-    <orderEntry type="library" name="Maven: com.qiniu:qiniu-java-sdk:7.2.27" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.squareup.okhttp3:okhttp:3.14.4" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.squareup.okio:okio:1.17.2" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.google.code.gson:gson:2.8.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-mail:2.1.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.1.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.mail:javax.mail:1.6.2" level="project" />
-    <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.1.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.1.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.1.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.1.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.1.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.1.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.33.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.33.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.33.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.33.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.33.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.33.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.2.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.2" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.1.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.1" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.1" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.12" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.2.12" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.10" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:2.0" level="project" />
-    <orderEntry type="library" name="Maven: com.dyuproject.protostuff:protostuff-core:1.0.8" level="project" />
-    <orderEntry type="library" name="Maven: com.dyuproject.protostuff:protostuff-api:1.0.8" level="project" />
-    <orderEntry type="library" name="Maven: com.dyuproject.protostuff:protostuff-runtime:1.0.8" level="project" />
-    <orderEntry type="library" name="Maven: com.dyuproject.protostuff:protostuff-collectionschema:1.0.8" level="project" />
-    <orderEntry type="library" name="Maven: eu.bitwalker:UserAgentUtils:1.20" level="project" />
-    <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
-    <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.1" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.8" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.8" level="project" />
-  </component>
-</module>
--- a/blog.sql
+++ b/blog.sql
@@ -1,92 +0,0 @@
-CREATE DATABASE `blog`;
-
-USE blog;
-
-CREATE TABLE `article`
-(
-    `a_id`             bigint(20) primary key auto_increment,
-    `a_title`          varchar(255) not null unique comment '文章标题',
-    `a_summary`        varchar(255) not null comment '文章摘要',
-    `a_md_content`     longtext     not null comment '文章Markdown内容',
-    `a_tags_id`        varchar(255) not null comment '标签id \',\'处于最尾端',
-    `a_category_id`    bigint(20)   not null comment '分类的id',
-    `a_url`            tinytext   default null comment '转载文章的原文链接',
-    `a_author_id`      bigint(20)   not null comment '作者id',
-    `a_is_open`        boolean    default true comment '文章是否可见',
-    `a_is_original`    boolean    default true comment '文章是否原创',
-    `next_a_id`        bigint(20) default -1 comment '下篇文章id',
-    `pre_a_id`         bigint(20) default -1 comment '前一篇文章的id',
-    `a_reading_number` int        default 0 comment '文章阅读数',
-    `a_publish_date`   datetime     not null comment '文章发布时间',
-    `a_update_date`    datetime   default null comment '文章的更新时间'
-) DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci,comment '文章表';
-
-CREATE TABLE `tag`
-(
-    `tag_id`   bigint(20) primary key auto_increment,
-    `tag_name` varchar(255) unique not null,
-    `articles` tinytext default null comment 'tag对应的文章id'
-) comment '标签表';
-
-CREATE table `category`
-(
-    `c_id`     bigint(20) primary key auto_increment,
-    `c_name`   varchar(255) unique not null,
-    `articles` varchar(255) comment '分类下的文章'
-)comment '分类表';
-
-CREATE TABLE `comment`
-(
-    `co_id`          bigint(20) primary key auto_increment,
-    `co_article_id`  bigint(20)          default -1 comment '文章id',
-    `is_comment`     boolean             default true comment '是否是评论',
-    `author_id`      bigint(20) not null comment '留言者id',
-    `co_content`     text       not null comment '评论/留言内容',
-    `co_date`        datetime   not null comment '评论/留言的日期',
-    `co_pid`         bigint     not null default -1 comment '评论/留言的父id',
-    `co_response_id` tinytext
-) DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci,comment '评论/留言表';
-
-CREATE TABLE `links`
-(
-    `site_id`   bigint(20) primary key auto_increment,
-    `site_name` varchar(255) not null comment '友站名称',
-    `is_open`   boolean default true comment '是否公开',
-    `site_url`  varchar(255) not null comment '首页地址'
-) comment '友站表';
-
-CREATE TABLE `visitor`
-(
-    `v_id`         bigint(20) primary key auto_increment,
-    `v_date`       datetime     not null comment '访问时间',
-    `v_ip`         varchar(255) not null comment '访客ip',
-    `v_user_agent` text comment '访客ua'
-) comment '访客表';
-
-
-
-CREATE TABLE IF NOT EXISTS `web_update`
-(
-    `update_id`   bigint(20) primary key auto_increment,
-    `update_info` varchar(255) not null comment '更新内容',
-    `update_time` datetime     not null comment '更新时间'
-) comment '更新内容表';
-
-create table `user`
-(
-    `u_id`                 int         not null primary key auto_increment,
-    `u_email`              varchar(50) not null,
-    `u_uid`                varchar(40)          default null comment '用户唯一标识码',
-    `u_pwd`                varchar(40) not null comment '密码',
-    `email_status`         boolean              default false comment '邮箱验证状态',
-    `u_avatar`             varchar(255) comment '用户头像',
-    `u_desc`               tinytext comment '用户的描述',
-    `recently_landed_time` datetime comment '最近的登录时间',
-    `email_verify_id`      varchar(40) comment '用于找回密码或验证邮箱的id',
-    `display_name`         varchar(30) comment '展示的昵称',
-    `role`                 varchar(40) not null default 'user' comment '权限组',
-    unique key `uni_user_id` (`u_id`),
-    unique key `uni_user_uid` (`u_uid`),
-    unique key `uni_user_email` (`u_email`)
-) comment '用户表';
-
--- a/build.sh
+++ b/build.sh
@@ -1,8 +0,0 @@
-#!/bin/sh
-echo "查询已存在进程"
-pgrep -af blog-0.0.1-SNAPSHOT.jar
-echo "结束已存在进程"
-pkill -f blog-0.0.1-SNAPSHOT.jar
-echo "开始运行小海博客"
-nohup java -jar -Dfile.encoding=UTF-8 blog-0.0.1-SNAPSHOT.jar >blog.log &
-echo "更新结束"
--- a/doc/API.md
+++ b/doc/API.md
--- a/doc/Build.md
+++ b/doc/Build.md
@@ -0,0 +1,32 @@
+# 如何构建
+### 1. 构建前准备
+- 安装jdk
+- 安装maven(也可使使用项目中的maven wrapper)
+- 安装mysql
+- 安装redis
+- 获取七牛云的AccessKey/SecretKey (个人中心-密钥管理) [七牛云官网](https://www.qiniu.com/)
+
+### 2. 拉取项目到本地
+``` shell script
+git clone https://github.com/xiaohai2271/blog-backEnd.git
+或 git clone git@github.com:xiaohai2271/blog-backEnd.git
+```
+ 
+### 3. maven构建
+```shell script
+mvn package
+```
+
+### 4. 运行
+```shell script
+java -jar target/blog-0.0.1-SNAPSHOT.jar
+```
+
+### 5. 其他命令
+```shell script
+mvn clean # 清理项目资源
+mvn clean package # 清理项目资源并重新打包
+mvn clean package -DskipTest # 清理项目资源,重新打包并跳过测试
+mvn test # 运行测试 
+..... #待添加
+```
--- a/146
+++ b/146
@@ -8,7 +8,7 @@
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
 #
-#    https://www.apache.org/licenses/LICENSE-2.0
+#    http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
@@ -19,7 +19,7 @@
 # ----------------------------------------------------------------------------

 # ----------------------------------------------------------------------------
-# Maven2 Start Up Batch script
+# Maven Start Up Batch script
 #
 # Required ENV vars:
 # ------------------
@@ -34,32 +34,31 @@
 #   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
 # ----------------------------------------------------------------------------

-if [ -z "$MAVEN_SKIP_RC" ]; then
+if [ -z "$MAVEN_SKIP_RC" ] ; then

-  if [ -f /etc/mavenrc ]; then
+  if [ -f /etc/mavenrc ] ; then
    . /etc/mavenrc
  fi

-  if [ -f "$HOME/.mavenrc" ]; then
+  if [ -f "$HOME/.mavenrc" ] ; then
    . "$HOME/.mavenrc"
  fi

 fi

 # OS specific support.  $var _must_ be set to either true or false.
-cygwin=false
-darwin=false
+cygwin=false;
+darwin=false;
 mingw=false
-case "$(uname)" in
-CYGWIN*) cygwin=true ;;
-MINGW*) mingw=true ;;
-Darwin*)
-  darwin=true
+case "`uname`" in
+  CYGWIN*) cygwin=true ;;
+  MINGW*) mingw=true;;
+  Darwin*) darwin=true
    # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
    if [ -z "$JAVA_HOME" ]; then
      if [ -x "/usr/libexec/java_home" ]; then
-      export JAVA_HOME="$(/usr/libexec/java_home)"
+        export JAVA_HOME="`/usr/libexec/java_home`"
      else
        export JAVA_HOME="/Library/Java/Home"
      fi
@@ -67,102 +66,96 @@ Darwin*)
    ;;
 esac

-if [ -z "$JAVA_HOME" ]; then
-  if [ -r /etc/gentoo-release ]; then
-    JAVA_HOME=$(java-config --jre-home)
+if [ -z "$JAVA_HOME" ] ; then
+  if [ -r /etc/gentoo-release ] ; then
+    JAVA_HOME=`java-config --jre-home`
  fi
 fi

-if [ -z "$M2_HOME" ]; then
+if [ -z "$M2_HOME" ] ; then
  ## resolve links - $0 may be a link to maven's home
  PRG="$0"

  # need this for relative symlinks
-  while [ -h "$PRG" ]; do
-    ls=$(ls -ld "$PRG")
-    link=$(expr "$ls" : '.*-> \(.*\)$')
-    if expr "$link" : '/.*' >/dev/null; then
+  while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
      PRG="$link"
    else
-      PRG="$(dirname "$PRG")/$link"
+      PRG="`dirname "$PRG"`/$link"
    fi
  done

-  saveddir=$(pwd)
+  saveddir=`pwd`

-  M2_HOME=$(dirname "$PRG")/..
+  M2_HOME=`dirname "$PRG"`/..

  # make it fully qualified
-  M2_HOME=$(cd "$M2_HOME" && pwd)
+  M2_HOME=`cd "$M2_HOME" && pwd`

  cd "$saveddir"
  # echo Using m2 at $M2_HOME
 fi

 # For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin; then
+if $cygwin ; then
  [ -n "$M2_HOME" ] &&
-    M2_HOME=$(cygpath --unix "$M2_HOME")
+    M2_HOME=`cygpath --unix "$M2_HOME"`
  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME=$(cygpath --unix "$JAVA_HOME")
+    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
  [ -n "$CLASSPATH" ] &&
-    CLASSPATH=$(cygpath --path --unix "$CLASSPATH")
+    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
 fi

 # For Mingw, ensure paths are in UNIX format before anything is touched
-if $mingw; then
+if $mingw ; then
  [ -n "$M2_HOME" ] &&
-    M2_HOME="$( (
-      cd "$M2_HOME"
-      pwd
-    ))"
+    M2_HOME="`(cd "$M2_HOME"; pwd)`"
  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME="$( (
-      cd "$JAVA_HOME"
-      pwd
-    ))"
+    JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
 fi

 if [ -z "$JAVA_HOME" ]; then
-  javaExecutable="$(which javac)"
-  if [ -n "$javaExecutable" ] && ! [ "$(expr \"$javaExecutable\" : '\([^ ]*\)')" = "no" ]; then
+  javaExecutable="`which javac`"
+  if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
    # readlink(1) is not available as standard on Solaris 10.
-    readLink=$(which readlink)
-    if [ ! $(expr "$readLink" : '\([^ ]*\)') = "no" ]; then
-      if $darwin; then
-        javaHome="$(dirname \"$javaExecutable\")"
-        javaExecutable="$(cd \"$javaHome\" && pwd -P)/javac"
+    readLink=`which readlink`
+    if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+      if $darwin ; then
+        javaHome="`dirname \"$javaExecutable\"`"
+        javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
      else
-        javaExecutable="$(readlink -f \"$javaExecutable\")"
+        javaExecutable="`readlink -f \"$javaExecutable\"`"
      fi
-      javaHome="$(dirname \"$javaExecutable\")"
-      javaHome=$(expr "$javaHome" : '\(.*\)/bin')
+      javaHome="`dirname \"$javaExecutable\"`"
+      javaHome=`expr "$javaHome" : '\(.*\)/bin'`
      JAVA_HOME="$javaHome"
      export JAVA_HOME
    fi
  fi
 fi

-if [ -z "$JAVACMD" ]; then
-  if [ -n "$JAVA_HOME" ]; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ]; then
+if [ -z "$JAVACMD" ] ; then
+  if [ -n "$JAVA_HOME"  ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
      # IBM's JDK on AIX uses strange locations for the executables
      JAVACMD="$JAVA_HOME/jre/sh/java"
    else
      JAVACMD="$JAVA_HOME/bin/java"
    fi
  else
-    JAVACMD="$(which java)"
+    JAVACMD="`which java`"
  fi
 fi

-if [ ! -x "$JAVACMD" ]; then
+if [ ! -x "$JAVACMD" ] ; then
  echo "Error: JAVA_HOME is not defined correctly." >&2
  echo "  We cannot execute $JAVACMD" >&2
  exit 1
 fi

-if [ -z "$JAVA_HOME" ]; then
+if [ -z "$JAVA_HOME" ] ; then
  echo "Warning: JAVA_HOME environment variable is not set."
 fi

@@ -172,24 +165,22 @@ CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
 # first directory with .mvn subdirectory is considered project base directory
 find_maven_basedir() {

-  if [ -z "$1" ]; then
+  if [ -z "$1" ]
+  then
    echo "Path not specified to find_maven_basedir"
    return 1
  fi

  basedir="$1"
  wdir="$1"
-  while [ "$wdir" != '/' ]; do
-    if [ -d "$wdir"/.mvn ]; then
+  while [ "$wdir" != '/' ] ; do
+    if [ -d "$wdir"/.mvn ] ; then
      basedir=$wdir
      break
    fi
    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
    if [ -d "${wdir}" ]; then
-      wdir=$(
-        cd "$wdir/.."
-        pwd
-      )
+      wdir=`cd "$wdir/.."; pwd`
    fi
    # end of workaround
  done
@@ -199,13 +190,13 @@ find_maven_basedir() {
 # concatenates all lines of a file
 concat_lines() {
  if [ -f "$1" ]; then
-    echo "$(tr -s '\n' ' ' <"$1")"
+    echo "$(tr -s '\n' ' ' < "$1")"
  fi
 }

-BASE_DIR=$(find_maven_basedir "$(pwd)")
+BASE_DIR=`find_maven_basedir "$(pwd)"`
 if [ -z "$BASE_DIR" ]; then
-  exit 1
+  exit 1;
 fi

 ##########################################################################################
@@ -221,26 +212,23 @@ else
      echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
    fi
    if [ -n "$MVNW_REPOURL" ]; then
-    jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
+      jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
    else
-    jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
+      jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
    fi
    while IFS="=" read key value; do
-    case "$key" in wrapperUrl)
-      jarUrl="$value"
-      break
-      ;;
+      case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
      esac
-  done <"$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+    done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
    if [ "$MVNW_VERBOSE" = true ]; then
      echo "Downloading from: $jarUrl"
    fi
    wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
    if $cygwin; then
-    wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath")
+      wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
    fi

-  if command -v wget >/dev/null; then
+    if command -v wget > /dev/null; then
        if [ "$MVNW_VERBOSE" = true ]; then
          echo "Found wget ... using wget"
        fi
@@ -249,7 +237,7 @@ else
        else
            wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
        fi
-  elif command -v curl >/dev/null; then
+    elif command -v curl > /dev/null; then
        if [ "$MVNW_VERBOSE" = true ]; then
          echo "Found curl ... using curl"
        fi
@@ -266,7 +254,7 @@ else
        javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
        # For Cygwin, switch paths to Windows format before running javac
        if $cygwin; then
-      javaClass=$(cygpath --path --windows "$javaClass")
+          javaClass=`cygpath --path --windows "$javaClass"`
        fi
        if [ -e "$javaClass" ]; then
            if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
@@ -299,13 +287,13 @@ MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
 # For Cygwin, switch paths to Windows format before running java
 if $cygwin; then
  [ -n "$M2_HOME" ] &&
-    M2_HOME=$(cygpath --path --windows "$M2_HOME")
+    M2_HOME=`cygpath --path --windows "$M2_HOME"`
  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME")
+    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
  [ -n "$CLASSPATH" ] &&
-    CLASSPATH=$(cygpath --path --windows "$CLASSPATH")
+    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
-    MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR")
+    MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
 fi

 # Provide a "standardized" way to retrieve the CLI args that will
--- a/mvnw.cmd
+++ b/mvnw.cmd
@@ -7,7 +7,7 @@
@REM "License"); you may not use this file except in compliance
@REM with the License.  You may obtain a copy of the License at
@REM
-@REM    https://www.apache.org/licenses/LICENSE-2.0
+@REM    http://www.apache.org/licenses/LICENSE-2.0
@REM
@REM Unless required by applicable law or agreed to in writing,
@REM software distributed under the License is distributed on an
@@ -18,7 +18,7 @@
@REM ----------------------------------------------------------------------------

@REM ----------------------------------------------------------------------------
-@REM Maven2 Start Up Batch script
+@REM Maven Start Up Batch script
@REM
@REM Required ENV vars:
@REM JAVA_HOME - location of a JDK home dir
@@ -26,7 +26,7 @@
@REM Optional ENV vars
@REM M2_HOME - location of maven2's installed home dir
@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
-@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
@REM     e.g. to debug Maven itself, use
@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
@@ -120,7 +120,7 @@ SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
 set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
 set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain

-set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"

 FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
    IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
@@ -134,7 +134,7 @@ if exist %WRAPPER_JAR% (
    )
 ) else (
    if not "%MVNW_REPOURL%" == "" (
-        SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
+        SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
    )
    if "%MVNW_VERBOSE%" == "true" (
        echo Couldn't find %WRAPPER_JAR%, downloading it ...
--- a/pom.xml
+++ b/pom.xml
@@ -55,12 +55,12 @@
        <dependency>
            <groupId>io.springfox</groupId>
            <artifactId>springfox-swagger2</artifactId>
-            <version>2.6.1</version>
+            <version>2.9.2</version>
        </dependency>
        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>2.6.1</version>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>swagger-bootstrap-ui</artifactId>
+            <version>1.9.6</version>
        </dependency>

        <!--MarkDown 2 html -->
@@ -76,14 +76,6 @@
            <scope>compile</scope>
        </dependency>

-        <!--Json-->
-        <dependency>
-            <groupId>net.sf.json-lib</groupId>
-            <artifactId>json-lib</artifactId>
-            <version>2.4</version>
-            <classifier>jdk15</classifier>
-        </dependency>
-
        <!--    七牛云SDK    -->
        <dependency>
            <groupId>com.qiniu</groupId>
@@ -148,6 +140,69 @@
            <artifactId>jjwt</artifactId>
            <version>0.9.1</version>
        </dependency>
+
+        <!--    OkHttp  -->
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>4.8.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib</artifactId>
+            <version>1.3.72</version>
+            <scope>compile</scope>
+        </dependency>
+
+
+        <dependency>
+            <groupId>net.sourceforge.htmlunit</groupId>
+            <artifactId>htmlunit</artifactId>
+            <version>2.42.0</version>
+        </dependency>
+
+
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>1.4.200</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.kstyrc</groupId>
+            <artifactId>embedded-redis</artifactId>
+            <version>0.6</version>
+            <scope>test</scope>
+        </dependency>
+
+
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-core</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.activation</groupId>
+            <artifactId>activation</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+
+
+        <dependency>
+            <groupId>org.lionsoul</groupId>
+            <artifactId>ip2region</artifactId>
+            <version>1.7.2</version>
+        </dependency>
+
    </dependencies>

    <build>
@@ -157,21 +212,15 @@
                <artifactId>spring-boot-maven-plugin</artifactId>
            </plugin>
            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.7.9</version>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-maven-plugin</artifactId>
+                <version>1.3.72</version>
                <executions>
                    <execution>
-                        <id>pre-unit-test</id>
+                        <id>compile</id>
+                        <phase>process-sources</phase>
                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>post-unit-test</id>
-                        <phase>test</phase>
-                        <goals>
-                            <goal>report</goal>
+                            <goal>compile</goal>
                        </goals>
                    </execution>
                </executions>
--- a/src/main/java/cn/celess/blog/configuration/CorsConfig.java
+++ b/src/main/java/cn/celess/blog/configuration/CorsConfig.java
@@ -26,7 +26,7 @@ public class CorsConfig {
        config.addAllowedOrigin("https://celess.cn");
        config.addAllowedOrigin("https://www.celess.cn");
        // 本地调试时的跨域
-        if ("dev".equals(activeModel)) {
+        if (!"prod".equals(activeModel)) {
            config.addAllowedOrigin("http://localhost:4200");
            config.addAllowedOrigin("http://127.0.0.1:4200");
        }
--- a/src/main/java/cn/celess/blog/configuration/DruidConfig.java
+++ b/src/main/java/cn/celess/blog/configuration/DruidConfig.java
@@ -26,7 +26,7 @@ public class DruidConfig {
    @Bean
    public DruidDataSource druidDataSource() {
        DruidDataSource dataSource = new DruidDataSource();
-        dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
+        dataSource.setDriverClassName(driverClassName);
        // 数据库基本信息
        dataSource.setUrl(dbUrl);
        dataSource.setUsername(username);
--- a/src/main/java/cn/celess/blog/configuration/RedisConfig.java
+++ b/src/main/java/cn/celess/blog/configuration/RedisConfig.java
@@ -31,9 +31,7 @@ public class RedisConfig extends CachingConfigurerSupport {
    @Override
    @Bean
    public KeyGenerator keyGenerator() {
-        return new KeyGenerator() {
-            @Override
-            public Object generate(Object target, Method method, Object... params) {
+        return (target, method, params) -> {
            StringBuilder sb = new StringBuilder();
            String name = target.getClass().getName();
            sb.append(name.substring(name.lastIndexOf(".") + 1));
@@ -43,7 +41,6 @@ public class RedisConfig extends CachingConfigurerSupport {
                sb.append("-").append(obj.toString());
            }
            return sb.toString();
-            }
        };
    }

--- a/src/main/java/cn/celess/blog/configuration/SwaggerConfig.java
+++ b/src/main/java/cn/celess/blog/configuration/SwaggerConfig.java
@@ -7,6 +7,7 @@ import springfox.documentation.builders.ApiInfoBuilder;
 import springfox.documentation.builders.PathSelectors;
 import springfox.documentation.builders.RequestHandlerSelectors;
 import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.Contact;
 import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spring.web.plugins.Docket;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
@@ -25,7 +26,7 @@ public class SwaggerConfig {
    @Bean
    public Docket createRestApi() {
        return new Docket(DocumentationType.SWAGGER_2)
-                .enable("dev".equals(environment))
+                .enable(!"prod".equals(environment))
                .apiInfo(apiInfo())
                .select()
                .apis(RequestHandlerSelectors.basePackage("cn.celess.blog"))
@@ -37,7 +38,7 @@ public class SwaggerConfig {
        return new ApiInfoBuilder()
                .title("小海博客的APi")
                .description("小海博客的APi")
-                .contact("小海")
+                .contact(new Contact("小海", "https://www.celess.cn", "a@celess.cn"))
                .version("1.0")
                .build();
    }
--- a/src/main/java/cn/celess/blog/configuration/filter/AuthenticationFilter.java
+++ b/src/main/java/cn/celess/blog/configuration/filter/AuthenticationFilter.java
@@ -1,16 +1,15 @@
 package cn.celess.blog.configuration.filter;

 import cn.celess.blog.enmu.ResponseEnum;
+import cn.celess.blog.entity.Response;
 import cn.celess.blog.service.UserService;
 import cn.celess.blog.util.JwtUtil;
 import cn.celess.blog.util.RedisUtil;
-import cn.celess.blog.util.ResponseUtil;
-import net.sf.json.JSONObject;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.servlet.HandlerInterceptor;
-import org.springframework.web.servlet.ModelAndView;

 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -22,6 +21,11 @@ import java.io.IOException;
 * @Description: 鉴权拦截器
 */
 public class AuthenticationFilter implements HandlerInterceptor {
+    private static final Logger logger = LoggerFactory.getLogger(AuthenticationFilter.class);
+    private static final String USER_PREFIX = "/user";
+    private static final String ADMIN_PREFIX = "/admin";
+    private static final String ROLE_ADMIN = "admin";
+    private static final String ROLE_USER = "user";
    @Autowired
    JwtUtil jwtUtil;
    @Autowired
@@ -29,13 +33,6 @@ public class AuthenticationFilter implements HandlerInterceptor {
    @Autowired
    UserService userService;

-    private static final Logger logger = LoggerFactory.getLogger(AuthenticationFilter.class);
-
-    private static final String USER_PREFIX = "/user";
-    private static final String ADMIN_PREFIX = "/admin";
-    private static final String ROLE_ADMIN = "admin";
-    private static final String ROLE_USER = "user";
-
    @Override
    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
        String path = request.getRequestURI();
@@ -59,15 +56,18 @@ public class AuthenticationFilter implements HandlerInterceptor {
            return writeResponse(ResponseEnum.LOGIN_EXPIRED, response, request);
        }
        String email = jwtUtil.getUsernameFromToken(jwtStr);
-        if (!redisUtil.hasKey(email + "-login") || jwtUtil.isTokenExpired(jwtStr)) {
+        if (jwtUtil.isTokenExpired(jwtStr)) {
            // 登陆过期
            return writeResponse(ResponseEnum.LOGIN_EXPIRED, response, request);
        }
+        if (!redisUtil.hasKey(email + "-login")) {
+            return writeResponse(ResponseEnum.LOGOUT, response, request);
+        }
        String role = userService.getUserRoleByEmail(email);
        if (role.equals(ROLE_USER) || role.equals(ROLE_ADMIN)) {
            // 更新token
            String token = jwtUtil.updateTokenDate(jwtStr);
-            response.setHeader("Authorization",token);
+            response.setHeader("Authorization", token);
        }
        if (role.equals(ROLE_ADMIN)) {
            // admin
@@ -84,7 +84,7 @@ public class AuthenticationFilter implements HandlerInterceptor {
        response.setHeader("Content-Type", "application/json;charset=UTF-8");
        try {
            logger.info("鉴权失败，[code:{},msg:{},path:{}]", e.getCode(), e.getMsg(), request.getRequestURI() + "?" + request.getQueryString());
-            response.getWriter().println(JSONObject.fromObject(ResponseUtil.response(e, null)));
+            response.getWriter().println(new ObjectMapper().writeValueAsString(Response.response(e, null)));
        } catch (IOException ex) {
            ex.printStackTrace();
        }
--- a/src/main/java/cn/celess/blog/configuration/filter/MultipleSubmitFilter.java
+++ b/src/main/java/cn/celess/blog/configuration/filter/MultipleSubmitFilter.java
@@ -28,7 +28,7 @@ public class MultipleSubmitFilter implements HandlerInterceptor {
            // 请求参数和路径均相同 且请求时间间隔小于 WAIT_TIME
            response.setContentType("application/json");
            response.setCharacterEncoding("UTF-8");
-            Response result = new Response(ResponseEnum.FAILURE.getCode(), "重复请求", null, System.currentTimeMillis());
+            Response result = new Response(ResponseEnum.FAILURE.getCode(), "重复请求", null);
            response.getWriter().println(result.toString());
            return false;
        }
--- a/src/main/java/cn/celess/blog/configuration/listener/SessionListener.java
+++ b/src/main/java/cn/celess/blog/configuration/listener/SessionListener.java
@@ -25,7 +25,6 @@ public class SessionListener implements HttpSessionListener {

    @Override
    public void sessionCreated(HttpSessionEvent se) {
-        // TODO : can move 'visit' api  to here
        se.getSession().setAttribute("visitDetail", new HashMap<String, Integer>());
        // 10s for debug
        // se.getSession().setMaxInactiveInterval(10);
@@ -44,9 +43,7 @@ public class SessionListener implements HttpSessionListener {
        sb.append("\t登录情况 => ");
        String email = (String) se.getSession().getAttribute("email");
        sb.append(email == null ? "游客访问" : email);
-        visitDetail.forEach((s, integer) -> {
-            sb.append("\n").append("Method:[").append(s.split(":")[1]).append("]\tTimes:[").append(integer).append("]\tPath:[").append(s.split(":")[0]).append("]");
-        });
+        visitDetail.forEach((s, integer) -> sb.append("\n").append("Method:[").append(s.split(":")[1]).append("]\tTimes:[").append(integer).append("]\tPath:[").append(s.split(":")[0]).append("]"));
        log.info(sb.toString());
    }
 }
--- a/src/main/java/cn/celess/blog/controller/ArticleController.java
+++ b/src/main/java/cn/celess/blog/controller/ArticleController.java
@@ -6,9 +6,9 @@ import cn.celess.blog.entity.model.ArticleModel;
 import cn.celess.blog.entity.request.ArticleReq;
 import cn.celess.blog.service.ArticleService;
 import cn.celess.blog.util.RedisUserUtil;
-import cn.celess.blog.util.ResponseUtil;
 import cn.celess.blog.util.SitemapGenerateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;

 import javax.servlet.http.HttpServletRequest;
@@ -25,6 +25,8 @@ public class ArticleController {
    SitemapGenerateUtil sitemapGenerateUtil;
    @Autowired
    RedisUserUtil redisUserUtil;
+    @Value("${spring.profiles.active}")
+    private String activeModel;

    /**
     * 新建一篇文章
@@ -35,8 +37,10 @@ public class ArticleController {
    @PostMapping("/admin/article/create")
    public Response create(@RequestBody ArticleReq body) {
        ArticleModel articleModel = articleService.create(body);
+        if ("prod".equals(activeModel)) {
            sitemapGenerateUtil.createSitemap();
-        return ResponseUtil.success(articleModel);
+        }
+        return Response.success(articleModel);
    }

    /**
@@ -48,8 +52,10 @@ public class ArticleController {
    @DeleteMapping("/admin/article/del")
    public Response delete(@RequestParam("articleID") long articleId) {
        boolean delete = articleService.delete(articleId);
+        if ("prod".equals(activeModel)) {
            sitemapGenerateUtil.createSitemap();
-        return ResponseUtil.success(delete);
+        }
+        return Response.success(delete);
    }

    /**
@@ -61,8 +67,10 @@ public class ArticleController {
    @PutMapping("/admin/article/update")
    public Response update(@RequestBody ArticleReq body) {
        ArticleModel update = articleService.update(body);
+        if ("prod".equals(activeModel)) {
            sitemapGenerateUtil.createSitemap();
-        return ResponseUtil.success(update);
+        }
+        return Response.success(update);
    }

    /**
@@ -80,13 +88,13 @@ public class ArticleController {
    public Response retrieveOneById(@PathVariable("articleID") long articleId,
                                    @RequestParam(value = "update", defaultValue = "false") boolean is4update,
                                    HttpServletRequest request) {
-        ArticleModel article = articleService.retrieveOneByID(articleId, is4update);
+        ArticleModel article = articleService.retrieveOneById(articleId, is4update);
        if (article.getOpen()) {
-            return ResponseUtil.success(article);
-        } else if (article.getAuthorId().equals(redisUserUtil.get().getId())) {
-            return ResponseUtil.success(article);
+            return Response.success(article);
+        } else if (article.getAuthor().getId().equals(redisUserUtil.get().getId())) {
+            return Response.success(article);
        }
-        return ResponseUtil.response(ResponseEnum.PERMISSION_ERROR, null);
+        return Response.response(ResponseEnum.PERMISSION_ERROR, null);
    }

    /**
@@ -99,7 +107,7 @@ public class ArticleController {
    @GetMapping("/articles")
    public Response articles(@RequestParam(name = "page", defaultValue = "1") int page,
                             @RequestParam(name = "count", defaultValue = "5") int count) {
-        return ResponseUtil.success(articleService.retrievePageForOpen(count, page));
+        return Response.success(articleService.retrievePageForOpen(count, page));
    }

    /**
@@ -111,8 +119,9 @@ public class ArticleController {
     */
    @GetMapping("/admin/articles")
    public Response adminArticles(@RequestParam(name = "page", defaultValue = "1") int page,
-                                  @RequestParam(name = "count", defaultValue = "10") int count) {
-        return ResponseUtil.success(articleService.adminArticles(count, page));
+                                  @RequestParam(name = "count", defaultValue = "10") int count,
+                                  @RequestParam(name = "deleted", required = false) Boolean deleted) {
+        return Response.success(articleService.adminArticles(count, page, deleted));
    }

    /**
@@ -127,7 +136,7 @@ public class ArticleController {
    public Response findByCategory(@PathVariable("name") String name,
                                   @RequestParam(name = "page", defaultValue = "1") int page,
                                   @RequestParam(name = "count", defaultValue = "10") int count) {
-        return ResponseUtil.success(articleService.findByCategory(name, page, count));
+        return Response.success(articleService.findByCategory(name, page, count));
    }

    /**
@@ -142,13 +151,13 @@ public class ArticleController {
    public Response findByTag(@PathVariable("name") String name,
                              @RequestParam(name = "page", defaultValue = "1") int page,
                              @RequestParam(name = "count", defaultValue = "10") int count) {
-        return ResponseUtil.success(articleService.findByTag(name, page, count));
+        return Response.success(articleService.findByTag(name, page, count));
    }


    @GetMapping("/createSitemap")
    public Response createSitemap() {
        sitemapGenerateUtil.createSitemap();
-        return ResponseUtil.success(null);
+        return Response.success(null);
    }
 }
--- a/src/main/java/cn/celess/blog/controller/CategoryController.java
+++ b/src/main/java/cn/celess/blog/controller/CategoryController.java
@@ -2,7 +2,6 @@ package cn.celess.blog.controller;

 import cn.celess.blog.entity.Response;
 import cn.celess.blog.service.CategoryService;
-import cn.celess.blog.util.ResponseUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

@@ -24,7 +23,7 @@ public class CategoryController {
     */
    @PostMapping("/admin/category/create")
    public Response addOne(@RequestParam("name") String name) {
-        return ResponseUtil.success(categoryService.create(name));
+        return Response.success(categoryService.create(name));
    }

    /**
@@ -35,7 +34,7 @@ public class CategoryController {
     */
    @DeleteMapping("/admin/category/del")
    public Response deleteOne(@RequestParam("id") long id) {
-        return ResponseUtil.success(categoryService.delete(id));
+        return Response.success(categoryService.delete(id));
    }

    /**
@@ -48,7 +47,7 @@ public class CategoryController {
    @PutMapping("/admin/category/update")
    public Response updateOne(@RequestParam("id") Long id,
                              @RequestParam("name") String name) {
-        return ResponseUtil.success(categoryService.update(id, name));
+        return Response.success(categoryService.update(id, name));
    }

    /**
@@ -57,7 +56,8 @@ public class CategoryController {
     * @return Response
     */
    @GetMapping("/categories")
-    public Response getPage() {
-        return ResponseUtil.success(categoryService.retrievePage());
+    public Response getPage(@RequestParam(name = "page", defaultValue = "1") int page,
+                            @RequestParam(name = "count", defaultValue = "1000") int count) {
+        return Response.success(categoryService.retrievePage(page, count));
    }
 }
--- a/src/main/java/cn/celess/blog/controller/CommentController.java
+++ b/src/main/java/cn/celess/blog/controller/CommentController.java
@@ -1,10 +1,8 @@
 package cn.celess.blog.controller;

-import cn.celess.blog.entity.Comment;
 import cn.celess.blog.entity.Response;
 import cn.celess.blog.entity.request.CommentReq;
 import cn.celess.blog.service.CommentService;
-import cn.celess.blog.util.ResponseUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

@@ -26,72 +24,96 @@ public class CommentController {
     */
    @PostMapping("/user/comment/create")
    public Response addOne(@RequestBody CommentReq reqBody) {
-        return ResponseUtil.success(commentService.create(reqBody));
+        return Response.success(commentService.create(reqBody));
    }

    @DeleteMapping("/user/comment/del")
    public Response delete(@RequestParam("id") long id) {
-        return ResponseUtil.success(commentService.delete(id));
+        return Response.success(commentService.delete(id));
    }

    @PutMapping("/user/comment/update")
    public Response update(@RequestBody CommentReq reqBody) {
-        return ResponseUtil.success(commentService.update(reqBody));
+        return Response.success(commentService.update(reqBody));
    }

    /**
-     * 获取所有的一级评论
+     * 获取所有的评论
     *
-     * @param articleId 文章id
+     * @param pagePath pagePath
     * @param count    单页数据量
     * @param page     页码
     * @return Response
     */
-    @GetMapping("/comments")
-    public Response commentsOfArticle(@RequestParam("articleId") long articleId,
+    @GetMapping("/comments/{pagePath}/{pid}")
+    public Response commentsOfArticle(@PathVariable("pagePath") String pagePath, @PathVariable(value = "pid") long pid,
                                      @RequestParam(value = "count", required = false, defaultValue = "10") int count,
                                      @RequestParam(value = "page", required = false, defaultValue = "1") int page) {
-        return ResponseUtil.success(commentService.retrievePageByArticle(articleId, -1, page, count));
+        String path = "";
+        if (pagePath.contains("article+")) {
+            path = "article/" + pagePath.split("\\+", 2)[1];
+        } else {
+            path = pagePath;
+        }
+        if ("*".equals(pagePath)) {
+            path = null;
+        }
+        return Response.success(commentService.retrievePageByPageAndPid(path, pid, page, count));
    }

    /**
     * 通过pid获取数据
     *
-     * @param pid
-     * @return
+     * @param pagePath pagePath
+     * @param count    count
+     * @param page     page
+     * @return Response
     */
-    @GetMapping("/comment/pid/{pid}")
-    public Response retrievePage(@PathVariable("pid") long pid) {
-        return ResponseUtil.success(commentService.retrievePageByPid(pid));
-    }
-
-    /**
-     * 获取所以的一级留言
-     *
-     * @param count
-     * @param page
-     * @return
-     */
-    @GetMapping("/leaveMsg")
-    public Response retrievePageOfLeaveMsg(@RequestParam(value = "count", required = false, defaultValue = "10") int count,
-                                           @RequestParam(value = "page", required = false, defaultValue = "1") int page) {
-        return ResponseUtil.success(commentService.retrievePageByTypeAndPid(false, -1, page, count));
-    }
-
-    @GetMapping("/admin/comment/type/{type}")
-    public Response retrievePageAdmin(
-            @PathVariable("type") int isComment,
+    @GetMapping("/comment/pagePath/{pagePath}")
+    public Response retrievePage(@PathVariable("pagePath") String pagePath,
                                 @RequestParam(value = "count", required = false, defaultValue = "10") int count,
                                 @RequestParam(value = "page", required = false, defaultValue = "1") int page) {
-        return ResponseUtil.success(commentService.retrievePageByType(1 == isComment, page, count));
+        String path = "";
+        if (pagePath.contains("article+")) {
+            path = "article/" + pagePath.split("\\+", 2)[1];
+        } else {
+            path = pagePath;
+        }
+        if ("*".equals(pagePath)) {
+            path = null;
+        }
+        return Response.success(commentService.retrievePage(path, page, count));
    }

-    @GetMapping("/user/comment/type/{type}")
-    public Response retrievePageByAuthor(
-            @PathVariable(value = "type") int isComment,
+    @GetMapping("/user/comment/pagePath/{pagePath}")
+    public Response userComment(@PathVariable("pagePath") String pagePath,
                                @RequestParam(value = "count", required = false, defaultValue = "10") int count,
                                @RequestParam(value = "page", required = false, defaultValue = "1") int page) {
-        return ResponseUtil.success(commentService.retrievePageByAuthor(1 == isComment, page, count));
+        String path = "";
+        if (pagePath.contains("article+")) {
+            path = "article/" + pagePath.split("\\+", 2)[1];
+        } else {
+            path = pagePath;
+        }
+        if ("*".equals(pagePath)) {
+            path = null;
+        }
+        return Response.success(commentService.retrievePageByAuthor(path, page, count));
    }

+    @GetMapping("/admin/comment/pagePath/{pagePath}")
+    public Response adminComment(@PathVariable("pagePath") String pagePath,
+                                 @RequestParam(value = "count", required = false, defaultValue = "10") int count,
+                                 @RequestParam(value = "page", required = false, defaultValue = "1") int page) {
+        String path = "";
+        if (pagePath.contains("article+")) {
+            path = "article/" + pagePath.split("\\+", 2)[1];
+        } else {
+            path = pagePath;
+        }
+        if ("*".equals(pagePath)) {
+            path = null;
+        }
+        return Response.success(commentService.retrievePageByPage(path, page, count));
+    }
 }
--- a/src/main/java/cn/celess/blog/controller/CommonController.java
+++ b/src/main/java/cn/celess/blog/controller/CommonController.java
@@ -8,25 +8,25 @@ import cn.celess.blog.service.CountService;
 import cn.celess.blog.service.QiniuService;
 import cn.celess.blog.util.HttpUtil;
 import cn.celess.blog.util.RedisUtil;
-import cn.celess.blog.util.ResponseUtil;
 import cn.celess.blog.util.VeriCodeUtil;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;

 import javax.imageio.ImageIO;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.awt.image.BufferedImage;
-import java.io.*;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
+import java.io.IOException;
+import java.io.OutputStream;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
@@ -37,7 +37,7 @@ import java.util.concurrent.TimeUnit;
 * @date : 2019/04/02 22:03
 */
@RestController
-public class Other {
+public class CommonController {
    public static final Logger logger = LoggerFactory.getLogger(Object.class);

    @Autowired
@@ -55,11 +55,10 @@ public class Other {
        Map<String, Long> countMap = new HashMap<>();
        countMap.put("articleCount", countService.getArticleCount());
        countMap.put("commentCount", countService.getCommentCount());
-        countMap.put("leaveMsgCount", countService.getLeaveMessageCount());
        countMap.put("categoryCount", countService.getCategoriesCount());
        countMap.put("tagCount", countService.getTagsCount());
        countMap.put("visitorCount", countService.getVisitorCount());
-        return ResponseUtil.success(countMap);
+        return Response.success(countMap);
    }


@@ -80,7 +79,7 @@ public class Other {
        }
        map.put("sessionID", request.getSession().getId());
        map.put("request.getRemoteAddr()", request.getRemoteAddr());
-        return ResponseUtil.success(map);
+        return Response.success(map);
    }

    /**
@@ -123,10 +122,10 @@ public class Other {
        if (code.equals(codeStr)) {
            request.getSession().removeAttribute("code");
            request.getSession().setAttribute("verImgCodeStatus", true);
-            return ResponseUtil.success("验证成功");
+            return Response.success("验证成功");
        } else {
            request.getSession().removeAttribute("code");
-            return ResponseUtil.failure("验证失败，请重新获取验证码");
+            return Response.failure("验证失败，请重新获取验证码");
        }
    }

@@ -136,12 +135,11 @@ public class Other {
     * FUCK !!!
     *
     * @param file 文件
-     * @return
-     * @throws IOException
     */
    @PostMapping("/imgUpload")
    public void upload(HttpServletRequest request, HttpServletResponse response, @RequestParam("editormd-image-file") MultipartFile file) throws IOException {
-        JSONObject jsonObject = new JSONObject();
+        Map<String, Object> map = new HashMap<>();
+        ObjectMapper mapper = new ObjectMapper();
        String uploadTimesStr = redisUtil.get(request.getRemoteAddr() + "-ImgUploadTimes");
        int uploadTimes = 0;
        if (uploadTimesStr != null) {
@@ -151,41 +149,41 @@ public class Other {
            throw new MyException(ResponseEnum.FAILURE.getCode(), "上传次数已达10次，请2小时后在上传");
        }
        request.setCharacterEncoding("utf-8");
-        response.setContentType("text/html");
+        response.setContentType(MediaType.APPLICATION_JSON_UTF8_VALUE);
        if (file.isEmpty()) {
-            jsonObject.put("success", 0);
-            jsonObject.put("message", "上传失败，请选择文件");
-            response.getWriter().println(jsonObject.toString());
+            map.put("success", 0);
+            map.put("message", "上传失败，请选择文件");
+            response.getWriter().println(mapper.writeValueAsString(map));
            return;
        }
        String fileName = file.getOriginalFilename();
+        assert fileName != null;
        String mime = fileName.substring(fileName.lastIndexOf("."));
        if (".png".equals(mime.toLowerCase()) || ".jpg".equals(mime.toLowerCase()) ||
                ".jpeg".equals(mime.toLowerCase()) || ".bmp".equals(mime.toLowerCase())) {
            QiniuResponse qiniuResponse = qiniuService.uploadFile(file.getInputStream(), "img_" + System.currentTimeMillis() + mime);
-            jsonObject.put("success", 1);
-            jsonObject.put("message", "上传成功");
-            jsonObject.put("url", "http://cdn.celess.cn/" + qiniuResponse.key);
-            response.getWriter().println(jsonObject.toString());
+            map.put("success", 1);
+            map.put("message", "上传成功");
+            map.put("url", "http://cdn.celess.cn/" + qiniuResponse.key);
+            response.getWriter().println(mapper.writeValueAsString(map));
            redisUtil.setEx(request.getRemoteAddr() + "-ImgUploadTimes", uploadTimes + 1 + "", 2, TimeUnit.HOURS);
            return;
        }
-        jsonObject.put("success", 0);
-        jsonObject.put("message", "上传失败，请上传图片文件");
-        response.getWriter().println(jsonObject.toString());
+        map.put("success", 0);
+        map.put("message", "上传失败，请上传图片文件");
+        response.getWriter().println(mapper.writeValueAsString(map));
    }

    @GetMapping("/bingPic")
    public Response bingPic() {
-
-        JSONObject imageObj;
+        ObjectMapper mapper = new ObjectMapper();
+        JsonNode root;
        try {
-            imageObj = JSONObject.fromObject(HttpUtil.get("https://cn.bing.com/HPImageArchive.aspx?format=js&idx=0&n=1&mkt=zh-CN"));
+            root = mapper.readTree(HttpUtil.get("https://cn.bing.com/HPImageArchive.aspx?format=js&idx=0&n=1&mkt=zh-CN"));
        } catch (IOException e) {
-            return ResponseUtil.failure(null);
+            return Response.failure(null);
        }
-        JSONArray jsonArray = imageObj.getJSONArray("images");
-        String imageName = jsonArray.getJSONObject(0).getString("url");
-        return ResponseUtil.success("https://cn.bing.com" + imageName);
+        JsonNode images = root.get("images").elements().next();
+        return Response.success("https://cn.bing.com" + images.get("url").asText());
    }
 }
--- a/src/main/java/cn/celess/blog/controller/LinksController.java
+++ b/src/main/java/cn/celess/blog/controller/LinksController.java
@@ -1,24 +1,18 @@
 package cn.celess.blog.controller;

-import cn.celess.blog.enmu.ResponseEnum;
 import cn.celess.blog.entity.PartnerSite;
 import cn.celess.blog.entity.Response;
+import cn.celess.blog.entity.request.LinkApplyReq;
 import cn.celess.blog.entity.request.LinkReq;
-import cn.celess.blog.exception.MyException;
 import cn.celess.blog.service.MailService;
 import cn.celess.blog.service.PartnerSiteService;
 import cn.celess.blog.util.RedisUtil;
-import cn.celess.blog.util.RegexUtil;
-import cn.celess.blog.util.ResponseUtil;
-import cn.celess.blog.util.DateFormatUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.mail.SimpleMailMessage;
 import org.springframework.web.bind.annotation.*;

 import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;

 /**
 * @author : xiaohai
@@ -37,63 +31,39 @@ public class LinksController {

    @PostMapping("/admin/links/create")
    public Response create(@RequestBody LinkReq reqBody) {
-        return ResponseUtil.success(partnerSiteService.create(reqBody));
+        return Response.success(partnerSiteService.create(reqBody));
    }

    @DeleteMapping("/admin/links/del/{id}")
    public Response del(@PathVariable("id") long id) {
-        return ResponseUtil.success(partnerSiteService.del(id));
+        return Response.success(partnerSiteService.del(id));
    }

    @PutMapping("/admin/links/update")
    public Response update(@RequestBody LinkReq reqBody) {
-        return ResponseUtil.success(partnerSiteService.update(reqBody));
+        return Response.success(partnerSiteService.update(reqBody));
    }

    @GetMapping("/links")
    public Response allForOpen() {
-        List<PartnerSite> sites = new ArrayList<>();
-        for (PartnerSite p : partnerSiteService.findAll()) {
-            if (p.getOpen()) {
-                //隐藏open字段
-                p.setOpen(null);
-                sites.add(p);
-            }
-        }
-        return ResponseUtil.success(sites);
+        List<PartnerSite> sites = partnerSiteService.findAll().stream().peek(partnerSite -> partnerSite.setOpen(null)).collect(Collectors.toList());
+        return Response.success(sites);
    }

    @GetMapping("/admin/links")
    public Response all(@RequestParam("page") int page,
-                        @RequestParam("count") int count) {
-        return ResponseUtil.success(partnerSiteService.PartnerSitePages(page, count));
+                        @RequestParam("count") int count,
+                        @RequestParam(value = "deleted", required = false) Boolean deleted) {
+        return Response.success(partnerSiteService.partnerSitePages(page, count, deleted));
    }

    @PostMapping("/apply")
-    public Response apply(@RequestParam("name") String name,
-                          @RequestParam("url") String url) {
-        // TODO :: 弃用发送邮件的方式。
-        if (name == null || name.replaceAll(" ", "").isEmpty()) {
-            return ResponseUtil.response(ResponseEnum.PARAMETERS_ERROR, null);
+    public Response apply(@RequestBody() LinkApplyReq linkApplyReq) {
+        return Response.success(partnerSiteService.apply(linkApplyReq));
    }
-        if (!RegexUtil.urlMatch(url)) {
-            return ResponseUtil.response(ResponseEnum.PARAMETERS_URL_ERROR, null);
-        }
-        String applyTimeStr = redisUtil.get(request.getRemoteAddr() + "-Apply");
-        int applyTime = 0;
-        if (applyTimeStr != null) {
-            applyTime = Integer.parseInt(applyTimeStr);
-        }
-        if (applyTime == 10) {
-            throw new MyException(ResponseEnum.FAILURE.getCode(), "申请次数已达10次，请2小时后重试");
-        }
-        SimpleMailMessage message = new SimpleMailMessage();
-        message.setSubject("友链申请：" + name);
-        message.setTo("a@celess.cn");
-        message.setText("name:" + name + "\nurl:" + url + "\n" + DateFormatUtil.getNow());
-        Boolean send = mailService.send(message);
-        redisUtil.setEx(request.getRemoteAddr() + "-Apply", applyTime + 1 + "", 2, TimeUnit.HOURS);
-        return send ? ResponseUtil.success("") : ResponseUtil.failure("");

+    @PostMapping("/reapply")
+    public Response reapply(@RequestParam("key") String key) {
+        return Response.success(partnerSiteService.reapply(key));
    }
 }
--- a/src/main/java/cn/celess/blog/controller/TagController.java
+++ b/src/main/java/cn/celess/blog/controller/TagController.java
@@ -1,16 +1,15 @@
 package cn.celess.blog.controller;

 import cn.celess.blog.entity.Response;
-import cn.celess.blog.entity.Tag;
 import cn.celess.blog.entity.model.TagModel;
 import cn.celess.blog.service.TagService;
-import cn.celess.blog.util.ResponseUtil;
-import net.sf.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;

 /**
 * @author : xiaohai
@@ -24,47 +23,37 @@ public class TagController {

    @PostMapping("/admin/tag/create")
    public Response addOne(@RequestParam("name") String name) {
-        return ResponseUtil.success(tagService.create(name));
+        return Response.success(tagService.create(name));
    }

    @DeleteMapping("/admin/tag/del")
    public Response delOne(@RequestParam("id") long id) {
-        return ResponseUtil.success(tagService.delete(id));
+        return Response.success(tagService.delete(id));
    }


    @PutMapping("/admin/tag/update")
    public Response updateOne(@RequestParam("id") Long id, @RequestParam("name") String name) {
-        return ResponseUtil.success(tagService.update(id, name));
-    }
-
-    @GetMapping("/tag/id/{id}")
-    public Response retrieveOneById(@PathVariable("id") long id) {
-        return ResponseUtil.success(tagService.retrieveOneById(id));
-    }
-
-    @GetMapping("/tag/name/{name}")
-    public Response retrieveOneByName(@PathVariable("name") String name) {
-        return ResponseUtil.success(tagService.retrieveOneByName(name));
+        return Response.success(tagService.update(id, name));
    }

    @GetMapping("/tags")
    public Response getPage(@RequestParam(required = false, defaultValue = "10", value = "count") int count,
                            @RequestParam(required = false, defaultValue = "1", value = "page") int page) {
-        return ResponseUtil.success(tagService.retrievePage(page, count));
+        return Response.success(tagService.retrievePage(page, count));
    }

    @GetMapping("/tags/nac")
    public Response getTagNameAndCount() {
-        List<JSONObject> nameAndCount = new ArrayList<>();
+        List<Map<String, Object>> nameAndCount = new ArrayList<>();
        List<TagModel> all = tagService.findAll();
        for (TagModel t : all) {
-            JSONObject jsonObject = new JSONObject();
-            jsonObject.put("name", t.getName());
-            jsonObject.put("size", t.getArticles() == null ? 0 : t.getArticles().size());
-            nameAndCount.add(jsonObject);
+            Map<String, Object> map = new HashMap<>(2);
+            map.put("name", t.getName());
+            map.put("size", t.getArticles().size());
+            nameAndCount.add(map);
        }
-        return ResponseUtil.success(nameAndCount);
+        return Response.success(nameAndCount);
    }

 }
--- a/src/main/java/cn/celess/blog/controller/UserController.java
+++ b/src/main/java/cn/celess/blog/controller/UserController.java
@@ -4,7 +4,6 @@ import cn.celess.blog.entity.Response;
 import cn.celess.blog.entity.request.LoginReq;
 import cn.celess.blog.entity.request.UserReq;
 import cn.celess.blog.service.UserService;
-import cn.celess.blog.util.ResponseUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -23,28 +22,28 @@ public class UserController {

    @PostMapping("/login")
    public Response login(@RequestBody LoginReq loginReq) {
-        return ResponseUtil.success(userService.login(loginReq));
+        return Response.success(userService.login(loginReq));
    }

    @PostMapping("/registration")
    public Response registration(@RequestParam("email") String email,
                                 @RequestParam("password") String password) {
-        return ResponseUtil.success(userService.registration(email, password));
+        return Response.success(userService.registration(email, password));
    }

    @GetMapping("/logout")
    public Response logout() {
-        return ResponseUtil.success(userService.logout());
+        return Response.success(userService.logout());
    }

    @PutMapping("/user/userInfo/update")
    public Response updateInfo(String desc, String displayName) {
-        return ResponseUtil.success(userService.update(desc, displayName));
+        return Response.success(userService.update(desc, displayName));
    }

    @GetMapping("/user/userInfo")
    public Response getUserInfo() {
-        return ResponseUtil.success(userService.getUserInfoBySession());
+        return Response.success(userService.getUserInfoBySession());
    }

    /**
@@ -58,7 +57,7 @@ public class UserController {
    @ResponseBody
    public Response upload(@RequestParam("file") MultipartFile file) throws IOException {
        if (file.isEmpty()) {
-            return ResponseUtil.failure("上传失败，请选择文件");
+            return Response.failure("上传失败，请选择文件");
        }
        String fileName = file.getOriginalFilename();
        String mime = fileName.substring(fileName.lastIndexOf("."));
@@ -66,64 +65,64 @@ public class UserController {
                ".jpeg".equals(mime.toLowerCase()) || ".bmp".equals(mime.toLowerCase())) {
            return (Response) userService.updateUserAavatarImg(file.getInputStream(), mime);
        }
-        return ResponseUtil.failure("请上传图片文件");
+        return Response.failure("请上传图片文件");
    }

    @PostMapping("/sendResetPwdEmail")
    public Response sendResetPwdEmail(@RequestParam("email") String email) {
-        return ResponseUtil.success(userService.sendResetPwdEmail(email));
+        return Response.success(userService.sendResetPwdEmail(email));
    }

    @PostMapping("/sendVerifyEmail")
    public Response sendVerifyEmail(@RequestParam("email") String email) {
-        return ResponseUtil.success(userService.sendVerifyEmail(email));
+        return Response.success(userService.sendVerifyEmail(email));
    }


    @PostMapping("/emailVerify")
    public Response emailVerify(@RequestParam("verifyId") String verifyId,
                                @RequestParam("email") String mail) {
-        return ResponseUtil.success(userService.verifyEmail(verifyId, mail));
+        return Response.success(userService.verifyEmail(verifyId, mail));
    }

    @PostMapping("/resetPwd")
    public Response resetPwd(@RequestParam("verifyId") String verifyId,
                             @RequestParam("email") String email,
                             @RequestParam("pwd") String pwd) {
-        return ResponseUtil.success(userService.reSetPwd(verifyId, email, pwd));
+        return Response.success(userService.reSetPwd(verifyId, email, pwd));
    }

    @PostMapping("/user/setPwd")
    public Response setPwd(@RequestParam("pwd") String pwd,
                           @RequestParam("newPwd") String newPwd,
                           @RequestParam("confirmPwd") String confirmPwd) {
-        return ResponseUtil.success(userService.setPwd(pwd,newPwd,confirmPwd));
+        return Response.success(userService.setPwd(pwd, newPwd, confirmPwd));
    }


    @DeleteMapping("/admin/user/delete")
    public Response multipleDelete(@RequestBody Integer[] ids) {
-        return ResponseUtil.success(userService.deleteUser(ids));
+        return Response.success(userService.deleteUser(ids));
    }

    @DeleteMapping("/admin/user/delete/{id}")
    public Response delete(@PathVariable("id") Integer id) {
-        return ResponseUtil.success(userService.deleteUser(new Integer[]{id}));
+        return Response.success(userService.deleteUser(new Integer[]{id}));
    }

    @PutMapping("/admin/user")
    public Response updateInfoByAdmin(@RequestBody UserReq user) {
-        return ResponseUtil.success(userService.adminUpdate(user));
+        return Response.success(userService.adminUpdate(user));
    }

    @GetMapping("/admin/users")
-    public Response getAllUser(@RequestParam("page") int pageNum, @RequestParam("count") int count) {
-        return ResponseUtil.success(userService.getUserList(pageNum, count));
+    public Response getAllUser(@RequestParam("page") int pageNum, @RequestParam("count") int count, @RequestParam(name = "status", required = false) Integer status) {
+        return Response.success(userService.getUserList(pageNum, count, status));
    }

    @GetMapping("/emailStatus/{email}")
    public Response getEmailStatus(@PathVariable("email") String email) {
-        return ResponseUtil.success(userService.getStatusOfEmail(email));
+        return Response.success(userService.getStatusOfEmail(email));
    }


--- a/src/main/java/cn/celess/blog/controller/VisitorController.java
+++ b/src/main/java/cn/celess/blog/controller/VisitorController.java
@@ -3,7 +3,6 @@ package cn.celess.blog.controller;
 import cn.celess.blog.entity.Response;
 import cn.celess.blog.service.CountService;
 import cn.celess.blog.service.VisitorService;
-import cn.celess.blog.util.ResponseUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

@@ -22,29 +21,29 @@ public class VisitorController {

    @GetMapping("/visitor/count")
    public Response getVisitorCount() {
-        return ResponseUtil.success(countService.getVisitorCount());
+        return Response.success(countService.getVisitorCount());
    }

    @GetMapping("/admin/visitor/page")
    public Response page(@RequestParam(value = "count", required = false, defaultValue = "10") int count,
                         @RequestParam(value = "page", required = false, defaultValue = "1") int page,
-                         @RequestParam(value = "showLocation", required = false, defaultValue = "false") boolean showLocation) {
-        return ResponseUtil.success(visitorService.visitorPage(page, count, showLocation));
+                         @RequestParam(value = "showLocation", required = false, defaultValue = "true") boolean showLocation) {
+        return Response.success(visitorService.visitorPage(page, count, showLocation));
    }

    @PostMapping("/visit")
    public Response add(HttpServletRequest request) {
-        return ResponseUtil.success(visitorService.addVisitor(request));
+        return Response.success(visitorService.addVisitor(request));
    }

    @GetMapping("/dayVisitCount")
    public Response dayVisitCount() {
-        return ResponseUtil.success(countService.getDayVisitCount());
+        return Response.success(countService.getDayVisitCount());
    }

    @GetMapping("/ip/{ip}")
    public Response ipLocation(@PathVariable("ip") String ip) {
-        return ResponseUtil.success(visitorService.location(ip));
+        return Response.success(visitorService.location(ip));
    }

    /**
@@ -55,6 +54,6 @@ public class VisitorController {
     */
    @GetMapping("/ip")
    public Response getIp(HttpServletRequest request) {
-        return ResponseUtil.success(request.getRemoteAddr());
+        return Response.success(request.getRemoteAddr());
    }
 }
--- a/src/main/java/cn/celess/blog/controller/WebUpdateInfoController.java
+++ b/src/main/java/cn/celess/blog/controller/WebUpdateInfoController.java
@@ -2,7 +2,6 @@ package cn.celess.blog.controller;

 import cn.celess.blog.entity.Response;
 import cn.celess.blog.service.WebUpdateInfoService;
-import cn.celess.blog.util.ResponseUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

@@ -17,31 +16,32 @@ public class WebUpdateInfoController {

    @PostMapping("/admin/webUpdate/create")
    public Response create(@RequestParam("info") String info) {
-        return ResponseUtil.success(webUpdateInfoService.create(info));
+        return Response.success(webUpdateInfoService.create(info));
    }

    @DeleteMapping("/admin/webUpdate/del/{id}")
    public Response del(@PathVariable("id") long id) {
-        return ResponseUtil.success(webUpdateInfoService.del(id));
+        return Response.success(webUpdateInfoService.del(id));
    }

    @PutMapping("/admin/webUpdate/update")
    public Response update(@RequestParam("id") long id, @RequestParam("info") String info) {
-        return ResponseUtil.success(webUpdateInfoService.update(id, info));
+        return Response.success(webUpdateInfoService.update(id, info));
    }

    @GetMapping("/webUpdate")
    public Response findAll() {
-        return ResponseUtil.success(webUpdateInfoService.findAll());
+        return Response.success(webUpdateInfoService.findAll());
    }

    @GetMapping("/webUpdate/pages")
    public Response page(@RequestParam("page") int page, @RequestParam("count") int count) {
-        return ResponseUtil.success(webUpdateInfoService.pages(count, page));
+        return Response.success(webUpdateInfoService.pages(count, page));
    }
+
    @GetMapping("/lastestUpdate")
    public Response lastestUpdateTime() {
-        return ResponseUtil.success(webUpdateInfoService.getLastestUpdateTime());
+        return Response.success(webUpdateInfoService.getLastestUpdateTime());
    }


--- a/src/main/java/cn/celess/blog/enmu/CommentStatusEnum.java
+++ b/src/main/java/cn/celess/blog/enmu/CommentStatusEnum.java
@@ -0,0 +1,23 @@
+package cn.celess.blog.enmu;
+
+import lombok.Getter;
+
+/**
+ * @Author: 小海
+ * @Date: 2020-05-25 08:58
+ * @Desc:
+ */
+@Getter
+public enum CommentStatusEnum {
+    // 正常
+    NORMAL(0, "正常"),
+    DELETED(3, "已删除");
+
+    private final int code;
+    private final String msg;
+
+    CommentStatusEnum(int code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+}
--- a/src/main/java/cn/celess/blog/enmu/LevelEnum.java
+++ b/src/main/java/cn/celess/blog/enmu/LevelEnum.java
@@ -1,27 +0,0 @@
-package cn.celess.blog.enmu;
-
-import lombok.Getter;
-
-/**
- * @Author: 小海
- * @Date： 2019/06/29 00:00
- * @Description： 文章数据模型转换的级别（响应参数的选择）
- */
-@Getter
-public enum LevelEnum {
-    //低级
-    LOW(0),
-    //中级
-    MIDDLE(1),
-    //另一个级别的转化
-    BETWEEN_M_AND_H(2),
-    //高级
-    HEIGHT(3);
-
-    private int levelCode;
-
-    LevelEnum(int levelCode) {
-        this.levelCode = levelCode;
-    }
-
-}
--- a/src/main/java/cn/celess/blog/enmu/ResponseEnum.java
+++ b/src/main/java/cn/celess/blog/enmu/ResponseEnum.java
@@ -11,6 +11,8 @@ public enum ResponseEnum {
    FAILURE(-1, "失败"),
    ERROR(-2, "错误"),

+    DATA_IS_DELETED(1000, "数据已被删除"),
+
    //文章类
    ARTICLE_NOT_EXIST(2010, "文章不存在"),
    ARTICLE_HAS_EXIST(2020, "文章已存在"),
@@ -31,6 +33,8 @@ public enum ResponseEnum {
    PWD_SAME(3601, "新密码与原密码相同"),
    PWD_NOT_SAME(3602, "新密码与原密码不相同"),
    LOGIN_EXPIRED(3700, "登陆过期"),
+    LOGOUT(3710, "账户已注销"),
+    CAN_NOT_USE(3711, "账户不可用"),
    PWD_WRONG(3800, "密码不正确"),

    JWT_EXPIRED(3810, "Token过期"),
@@ -55,6 +59,9 @@ public enum ResponseEnum {
    DATA_HAS_EXIST(7020, "数据已存在"),

    //其他
+    APPLY_LINK_NO_ADD_THIS_SITE(7200, "暂未在您的网站中抓取到本站链接"),
+    DATA_EXPIRED(7300, "数据过期"),
+    CANNOT_GET_DATA(7400, "暂无法获取到数据"),

    //提交更新之前，没有获取数据/,
    DID_NOT_GET_THE_DATA(8020, "非法访问"),
@@ -68,9 +75,8 @@ public enum ResponseEnum {
    PARAMETERS_QQ_ERROR(8540, "QQ格式错误"),
    PARAMETERS_PWD_ERROR(8550, "密码格式错误"),
    VERIFY_OUT(8400, "已经验证过了");
-
-    private int code;
-    private String msg;
+    private final int code;
+    private final String msg;


    ResponseEnum(int code, String msg) {
--- a/src/main/java/cn/celess/blog/enmu/RoleEnum.java
+++ b/src/main/java/cn/celess/blog/enmu/RoleEnum.java
@@ -0,0 +1,23 @@
+package cn.celess.blog.enmu;
+
+import lombok.Getter;
+
+/**
+ * @Author: 小海
+ * @Date: 2020-05-24 16:31
+ * @Desc:
+ */
+@Getter
+public enum RoleEnum {
+    // admin 权限
+    ADMIN_ROLE("admin"),
+    // user 权限
+    USER_ROLE("user");
+
+
+    private final String roleName;
+
+    RoleEnum(String roleName) {
+        this.roleName = roleName;
+    }
+}
--- a/src/main/java/cn/celess/blog/enmu/UserAccountStatusEnum.java
+++ b/src/main/java/cn/celess/blog/enmu/UserAccountStatusEnum.java
@@ -0,0 +1,72 @@
+package cn.celess.blog.enmu;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Author: 小海
+ * @Date: 2020-05-22 21:32
+ * @Desc:
+ */
+public enum UserAccountStatusEnum {
+
+    /**
+     * 账户正常
+     */
+    NORMAL(0, "正常"),
+    /**
+     * 账户被锁定
+     */
+    LOCKED(1, "锁定"),
+    /**
+     * 账户被删除
+     */
+    DELETED(2, "已删除");
+
+
+    private final int code;
+    private final String desc;
+
+    UserAccountStatusEnum(int code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public static UserAccountStatusEnum get(int code) {
+        for (UserAccountStatusEnum value : UserAccountStatusEnum.values()) {
+            if (value.code == code) {
+                return value;
+            }
+        }
+        return null;
+    }
+
+    @JsonCreator
+    public static UserAccountStatusEnum get(Map<String, Object> map) {
+        for (UserAccountStatusEnum value : UserAccountStatusEnum.values()) {
+            if (value.code == (int) map.get("code") && value.desc.equals(map.get("desc"))) {
+                return value;
+            }
+        }
+        return null;
+    }
+
+    @JsonValue
+    public Map<String, Object> toJson() {
+        Map<String, Object> map = new HashMap<>(2);
+        map.put("code", code);
+        map.put("desc", desc);
+        return map;
+    }
+}
--- a/src/main/java/cn/celess/blog/entity/Article.java
+++ b/src/main/java/cn/celess/blog/entity/Article.java
@@ -3,6 +3,7 @@ package cn.celess.blog.entity;
 import lombok.Data;

 import java.util.Date;
+import java.util.List;

 /**
 * @author : xiaohai
@@ -41,16 +42,6 @@ public class Article {

    private Date updateDate = null;

-    private Long categoryId;
-
-    private String tagsId;
-
-    private Long authorId;
-
-    private Long preArticleId;
-
-    private Long nextArticleId;
-
    private Long readingNumber;

    /**
@@ -58,4 +49,15 @@ public class Article {
     */
    private Boolean open;

+    private Category category;
+
+    private List<Tag> tags;
+
+    private Integer likeCount;
+
+    private Integer dislikeCount;
+
+    private User user;
+
+    private boolean deleted = false;
 }
--- a/src/main/java/cn/celess/blog/entity/ArticleTag.java
+++ b/src/main/java/cn/celess/blog/entity/ArticleTag.java
@@ -0,0 +1,26 @@
+package cn.celess.blog.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author: 小海
+ * @Date: 2020-05-24 14:52
+ * @Desc:
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ArticleTag {
+    private Long id;
+
+    private Article article;
+
+    private TagCategory tag;
+
+    public ArticleTag(Article article, TagCategory tag) {
+        this.article = article;
+        this.tag = tag;
+    }
+}
--- a/src/main/java/cn/celess/blog/entity/Category.java
+++ b/src/main/java/cn/celess/blog/entity/Category.java
@@ -1,20 +1,14 @@
 package cn.celess.blog.entity;

-
-import lombok.Data;
-
+import lombok.NoArgsConstructor;

 /**
 * @author : xiaohai
 * @date : 2019/03/28 22:18
 */
-@Data
-public class Category {
-
-    private Long id;
-
-    private String name;
-
-    private String articles;
-
+@NoArgsConstructor
+public class Category extends TagCategory {
+    public Category(String name) {
+        super.setName(name);
+    }
 }
--- a/src/main/java/cn/celess/blog/entity/Comment.java
+++ b/src/main/java/cn/celess/blog/entity/Comment.java
@@ -14,27 +14,21 @@ public class Comment {

    private Long id;

-    /**
-     * 是评论还是留言 0:评论  其他（1）：留言
-     */
-    private Boolean type;
+    private int status;

-    private Long authorID;
+    private String pagePath;

    private String content;

-    private Long articleID;
-
    private Date date;

-    /**
-     * 回应着ID  默认为顶级回复
-     */
-    private String responseId = "";
+    private User fromUser;

+    private User toUser;
    /**
     * 评论的父ID
     */
    private Long pid;

+    //    private boolean delete;
 }
--- a/src/main/java/cn/celess/blog/entity/PartnerSite.java
+++ b/src/main/java/cn/celess/blog/entity/PartnerSite.java
@@ -19,6 +19,16 @@ public class PartnerSite {

    private Boolean open;

+    private String iconPath;
+
+    private String desc;
+
+    private Boolean delete = false;
+
+    private String email;
+
+    private Boolean notification = true;
+
    public PartnerSite() {
    }

--- a/src/main/java/cn/celess/blog/entity/Response.java
+++ b/src/main/java/cn/celess/blog/entity/Response.java
@@ -1,7 +1,9 @@
 package cn.celess.blog.entity;

+import cn.celess.blog.enmu.ResponseEnum;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.Data;
-import net.sf.json.JSONObject;
+import lombok.SneakyThrows;

 import java.io.Serializable;

@@ -10,25 +12,54 @@ import java.io.Serializable;
 * @date : 2019/03/28 15:24
 */
@Data
-public class Response implements Serializable {
+public class Response<T> implements Serializable {
    private int code;
    private String msg;
-    private Object result;
-    private long date;
+    private T result;

    public Response() {
    }

-    public Response(int code, String msg, Object result, long date) {
+    public Response(int code, String msg, T result) {
        this.code = code;
        this.msg = msg;
        this.result = result;
-        this.date = date;
    }

+    /**
+     * 成功相应
+     *
+     * @param result 结果
+     * @return Response
+     */
+    public static Response success(Object result) {
+        return new Response(ResponseEnum.SUCCESS.getCode(), ResponseEnum.SUCCESS.getMsg(), result);
+    }
+
+    /**
+     * 失败的响应
+     *
+     * @param result 结果
+     * @return Response
+     */
+    public static Response failure(String result) {
+        return new Response(ResponseEnum.FAILURE.getCode(), ResponseEnum.FAILURE.getMsg(), result);
+    }
+
+    /**
+     * 其他的响应
+     *
+     * @param r      枚举常量
+     * @param result 结果
+     * @return Response
+     */
+    public static Response response(ResponseEnum r, String result) {
+        return new Response(r.getCode(), r.getMsg(), result);
+    }
+
+    @SneakyThrows
    @Override
    public String toString() {
-        JSONObject jsonObject = JSONObject.fromObject(this);
-        return jsonObject.toString();
+        return new ObjectMapper().writeValueAsString(this);
    }
 }
--- a/src/main/java/cn/celess/blog/entity/Tag.java
+++ b/src/main/java/cn/celess/blog/entity/Tag.java
@@ -1,16 +1,15 @@
 package cn.celess.blog.entity;

-import lombok.Data;
+import lombok.NoArgsConstructor;

 /**
 * @author : xiaohai
 * @date : 2019/03/28 22:19
 */
-@Data
-public class Tag {
-    private Long id;
+@NoArgsConstructor
+public class Tag extends TagCategory {

-    private String name;
-
-    private String articles;
+    public Tag(String name) {
+        super.setName(name);
+    }
 }
--- a/src/main/java/cn/celess/blog/entity/TagCategory.java
+++ b/src/main/java/cn/celess/blog/entity/TagCategory.java
@@ -0,0 +1,19 @@
+package cn.celess.blog.entity;
+
+import lombok.Data;
+
+/**
+ * @Author: 小海
+ * @Date: 2020-05-24 14:03
+ * @Desc:
+ */
+@Data
+public class TagCategory {
+    private Long id;
+
+    private String name;
+
+    private Boolean category = true;
+
+    private Boolean deleted = false;
+}
--- a/src/main/java/cn/celess/blog/entity/User.java
+++ b/src/main/java/cn/celess/blog/entity/User.java
@@ -2,6 +2,7 @@ package cn.celess.blog.entity;

 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
+import lombok.NoArgsConstructor;

 import java.util.Date;

@@ -10,6 +11,7 @@ import java.util.Date;
 * @date : 2019/03/28 14:52
 */
@Data
+@NoArgsConstructor
 public class User {
    private Long id;

@@ -18,12 +20,6 @@ public class User {
     */
    private String email;

-    /**
-     * 用户唯一标识码
-     */
-    @JsonIgnore
-    private String uid;
-
    /**
     * 密码
     */
@@ -46,15 +42,12 @@ public class User {

    private Date recentlyLandedDate;

-    /**
-     * 随机码 用户验证邮箱/找回密码
-     * 暂时废弃这一字段
-     */
-    private String emailVerifyId;
-
    private String role = "user";

-    public User() {
-    }
+    private int status;

+    public User(String email, String pwd) {
+        this.email = email;
+        this.pwd = pwd;
+    }
 }
--- a/src/main/java/cn/celess/blog/entity/Visitor.java
+++ b/src/main/java/cn/celess/blog/entity/Visitor.java
@@ -15,6 +15,7 @@ public class Visitor {
    private String ip;
    private Date date;
    private String ua;
+    private boolean delete;

    public Visitor(String ip, Date date, String ua) {
        this.ip = ip;
--- a/src/main/java/cn/celess/blog/entity/WebUpdate.java
+++ b/src/main/java/cn/celess/blog/entity/WebUpdate.java
@@ -17,11 +17,12 @@ public class WebUpdate {

    private Date updateTime;

+    private boolean delete;
+
    public WebUpdate() {
    }

-    public WebUpdate(String updateInfo, Date updateTime) {
+    public WebUpdate(String updateInfo) {
        this.updateInfo = updateInfo;
-        this.updateTime = updateTime;
    }
 }
--- a/src/main/java/cn/celess/blog/entity/model/ArticleModel.java
+++ b/src/main/java/cn/celess/blog/entity/model/ArticleModel.java
@@ -1,9 +1,10 @@
 package cn.celess.blog.entity.model;

+import cn.celess.blog.entity.Tag;
 import lombok.Getter;
 import lombok.Setter;

-import java.io.Serializable;
+import java.util.List;

 /**
 * @author : xiaohai
@@ -57,40 +58,30 @@ public class ArticleModel {
    /**
     * 标签
     */
-    private String[] tags;
+    private List<Tag> tags;

    /**
     * 作者
     */
-    private Long authorId;
+    private UserModel author;

-    /**
-     * 作者名字
-     */
-    private String authorName;
+    private ArticleModel preArticle;

-    /**
-     * 上一篇文章
-     */
-    private Long preArticleId;
-
-    /**
-     * 下一篇文章
-     */
-    private Long nextArticleId;
-
-    private String preArticleTitle;
-
-    private String nextArticleTitle;
+    private ArticleModel nextArticle;

    /**
     * 阅读数
     */
    private Long readingNumber;

+    private Integer likeCount;
+
+    private Integer dislikeCount;
+
    /**
     * 文章的状态  true：公开  false:不公开
     */
    private Boolean open;

+    private boolean deleted;
 }
--- a/src/main/java/cn/celess/blog/entity/model/CategoryModel.java
+++ b/src/main/java/cn/celess/blog/entity/model/CategoryModel.java
@@ -1,12 +1,9 @@
 package cn.celess.blog.entity.model;

-import cn.celess.blog.entity.Category;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;

 /**
@@ -22,22 +19,6 @@ public class CategoryModel {

    private String name;

-    private List<Integer> articles;
-
-
-    public CategoryModel(Category category) {
-        this.id = category.getId();
-        this.name = category.getName();
-        if (category.getArticles() == null || category.getArticles().length() == 0) {
-            articles = null;
-        } else {
-            articles = new ArrayList<>();
-            for (String s : category.getArticles().split(",")) {
-                if ("".equals(s)) {
-                    return;
-                }
-                articles.add(Integer.parseInt(s));
-            }
-        }
-    }
+    private List<ArticleModel> articles;
+    private boolean deleted;
 }
--- a/src/main/java/cn/celess/blog/entity/model/CommentModel.java
+++ b/src/main/java/cn/celess/blog/entity/model/CommentModel.java
@@ -14,46 +14,31 @@ import java.util.List;
 public class CommentModel {
    private long id;

-    /**
-     * 是评论还是留言 0:评论  其他（1）：留言
-     */
-    private boolean isComment;
+    private UserModel fromUser;

-    private String authorName;
-
-    private String authorAvatarImgUrl;
+    private UserModel toUser;

    /**
     * 内容
     */
    private String content;

-    /**
-     * 文章ID
-     */
-    private long articleID;
-
    /**
     * 文章标题
     */
-    private String articleTitle;
+    private String pagePath;

    /**
     * 发布日期
     */
    private String date;

-    /**
-     * 回应着ID  默认为顶级回复
-     */
-    private String responseId = "";
-
    /**
     * 评论的父ID
     */
-    private long pid = -1;
+    private Long pid;

    private List<CommentModel> respComment;

-
+    private int status;
 }
--- a/src/main/java/cn/celess/blog/entity/model/PageData.java
+++ b/src/main/java/cn/celess/blog/entity/model/PageData.java
@@ -0,0 +1,38 @@
+package cn.celess.blog.entity.model;
+
+import com.github.pagehelper.PageInfo;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @Author: 小海
+ * @Date: 2020-05-25 17:13
+ * @Desc:
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class PageData<T> {
+
+    private List<T> list;
+
+    private long total;
+
+    private int pageSize;
+
+    private int pageNum;
+
+    public PageData(PageInfo pageInfo) {
+        this.pageNum = pageInfo.getPageNum();
+        this.pageSize = pageInfo.getPageSize();
+        this.total = pageInfo.getTotal();
+    }
+
+    public PageData(PageInfo pageInfo, List<T> data) {
+        this(pageInfo);
+        this.list = data;
+    }
+}
--- a/src/main/java/cn/celess/blog/entity/model/TagModel.java
+++ b/src/main/java/cn/celess/blog/entity/model/TagModel.java
@@ -1,11 +1,9 @@
 package cn.celess.blog.entity.model;

-import cn.celess.blog.entity.Tag;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

-import java.util.ArrayList;
 import java.util.List;

 /**
@@ -21,21 +19,7 @@ public class TagModel {

    private String name;

-    private List<Integer> articles;
+    private List<ArticleModel> articles;

-    public TagModel(Tag tag) {
-        this.id = tag.getId();
-        this.name = tag.getName();
-        if (tag.getArticles() == null || tag.getArticles().length() == 0) {
-            articles = null;
-        } else {
-            articles = new ArrayList<>();
-            for (String s : tag.getArticles().split(",")) {
-                if ("".equals(s)) {
-                    return;
-                }
-                articles.add(Integer.parseInt(s));
-            }
-        }
-    }
+    private boolean deleted;
 }
--- a/src/main/java/cn/celess/blog/entity/model/UserModel.java
+++ b/src/main/java/cn/celess/blog/entity/model/UserModel.java
@@ -1,5 +1,6 @@
 package cn.celess.blog.entity.model;

+import cn.celess.blog.enmu.UserAccountStatusEnum;
 import lombok.Getter;
 import lombok.Setter;

@@ -37,4 +38,6 @@ public class UserModel {
    private String role = "user";

    private String token;
+
+    private UserAccountStatusEnum status;
 }
--- a/src/main/java/cn/celess/blog/entity/model/WebUpdateModel.java
+++ b/src/main/java/cn/celess/blog/entity/model/WebUpdateModel.java
@@ -21,4 +21,6 @@ public class WebUpdateModel {
        this.info = info;
        this.time = time;
    }
+
+    private boolean deleted;
 }
--- a/src/main/java/cn/celess/blog/entity/request/ArticleReq.java
+++ b/src/main/java/cn/celess/blog/entity/request/ArticleReq.java
@@ -11,7 +11,7 @@ public class ArticleReq {
    private Long id;
    private String title;
    private String mdContent;
-    private String tags;
+    private String[] tags;
    private Boolean type;
    private String url;
    private String category;
--- a/src/main/java/cn/celess/blog/entity/request/CommentReq.java
+++ b/src/main/java/cn/celess/blog/entity/request/CommentReq.java
@@ -9,9 +9,8 @@ import lombok.Data;
@Data
 public class CommentReq {
    private Long id;
-    private Boolean comment;
    private String content;
-    private Long pid;
-    private Long articleID;
-    private String responseId;
+    private long pid = -1;
+    private String pagePath;
+    private long toUserId = -1;
 }
--- a/src/main/java/cn/celess/blog/entity/request/LinkApplyReq.java
+++ b/src/main/java/cn/celess/blog/entity/request/LinkApplyReq.java
@@ -0,0 +1,17 @@
+package cn.celess.blog.entity.request;
+
+import lombok.Data;
+
+/**
+ * @author : xiaohai
+ * @date : 2020/07/31 20:50
+ */
+@Data
+public class LinkApplyReq {
+    private String name;
+    private String email;
+    private String url;
+    private String linkUrl;
+    private String desc;
+    private String iconPath;
+}
--- a/src/main/java/cn/celess/blog/entity/request/LinkReq.java
+++ b/src/main/java/cn/celess/blog/entity/request/LinkReq.java
@@ -11,5 +11,7 @@ public class LinkReq {
    private long id;
    private String name;
    private String url;
+    private String iconPath;
+    private String desc;
    private boolean open;
 }
--- a/src/main/java/cn/celess/blog/entity/request/LoginReq.java
+++ b/src/main/java/cn/celess/blog/entity/request/LoginReq.java
@@ -1,12 +1,16 @@
 package cn.celess.blog.entity.request;

+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;

 /**
 * @author : xiaohai
 * @date : 2019/06/01 22:47
 */
@Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class LoginReq {
    private String email;
    private String password;
--- a/src/main/java/cn/celess/blog/exception/ExceptionHandle.java
+++ b/src/main/java/cn/celess/blog/exception/ExceptionHandle.java
@@ -26,12 +26,11 @@ import javax.servlet.http.HttpServletRequest;

@ControllerAdvice
 public class ExceptionHandle {
+    public static final Logger logger = LoggerFactory.getLogger(ExceptionHandle.class);
    @Autowired
    MailService mailService;
    @Autowired
    HttpServletRequest request;
-    public static final Logger logger = LoggerFactory.getLogger(ExceptionHandle.class);
-
    @Value("${spring.profiles.active}")
    private String activeModel;

@@ -40,28 +39,29 @@ public class ExceptionHandle {
    public Response handle(Exception e) {
        //自定义错误
        if (e instanceof MyException) {
-            logger.debug("返回了自定义的exception,[code={},msg={}]", ((MyException) e).getCode(), e.getMessage());
-            return new Response(((MyException) e).getCode(), e.getMessage(), null, System.currentTimeMillis());
+            MyException exception = (MyException) e;
+            logger.debug("返回了自定义的exception,[code={},msg={},result={}]", exception.getCode(), e.getMessage(), exception.getResult());
+            return new Response(exception.getCode(), e.getMessage(), exception.getResult());
        }
        //请求路径不支持该方法
        if (e instanceof HttpRequestMethodNotSupportedException) {
-            logger.debug("遇到请求路径与请求方法不匹配的请求，[msg={}，path:{},method:{}]", e.getMessage(),request.getRequestURL(),request.getMethod());
-            return new Response(ResponseEnum.ERROR.getCode(), e.getMessage(), null, System.currentTimeMillis());
+            logger.debug("遇到请求路径与请求方法不匹配的请求，[msg={}，path:{},method:{}]", e.getMessage(), request.getRequestURL(), request.getMethod());
+            return new Response(ResponseEnum.ERROR.getCode(), e.getMessage(), null);
        }
        //数据输入类型不匹配
        if (e instanceof MethodArgumentTypeMismatchException) {
            logger.debug("输入类型不匹配,[msg={}]", e.getMessage());
-            return new Response(ResponseEnum.PARAMETERS_ERROR.getCode(), "数据输入有问题，请修改后再访问", null, System.currentTimeMillis());
+            return new Response(ResponseEnum.PARAMETERS_ERROR.getCode(), "数据输入有问题，请修改后再访问", null);
        }
        //数据验证失败
        if (e instanceof BindException) {
            logger.debug("数据验证失败,[msg={}]", e.getMessage());
-            return new Response(ResponseEnum.PARAMETERS_ERROR.getCode(), "数据输入有问题，请修改", null, System.currentTimeMillis());
+            return new Response(ResponseEnum.PARAMETERS_ERROR.getCode(), "数据输入有问题，请修改", null);
        }
        //数据输入不完整
        if (e instanceof MissingServletRequestParameterException) {
            logger.debug("数据输入不完整,[msg={}]", e.getMessage());
-            return new Response(ResponseEnum.PARAMETERS_ERROR.getCode(), "数据输入不完整,请检查", null, System.currentTimeMillis());
+            return new Response(ResponseEnum.PARAMETERS_ERROR.getCode(), "数据输入不完整,请检查", null);
        }

        // 发送错误信息到邮箱
@@ -70,7 +70,7 @@ public class ExceptionHandle {
            sendMessage(e);
        }
        e.printStackTrace();
-        return new Response(ResponseEnum.ERROR.getCode(), "服务器出现错误，已记录", null, System.currentTimeMillis());
+        return new Response(ResponseEnum.ERROR.getCode(), "服务器出现错误，已记录", null);
    }

    /**
@@ -83,7 +83,12 @@ public class ExceptionHandle {
        simpleMailMessage.setTo("a@celess.cn");
        simpleMailMessage.setSubject("服务器出现了错误");
        StringBuilder msg = new StringBuilder();
-        msg.append("requirePath:\n").append(request.getRequestURL().toString()).append("?").append(request.getQueryString()).append("\n\n\n");
+        String queryString = request.getQueryString();
+        msg.append("requirePath:\n").append(request.getRequestURL().toString());
+        if (queryString != null) {
+            msg.append("?").append(queryString);
+        }
+        msg.append("\n\n\n");
        msg.append("msg:\n").append(e.getMessage()).append("\n\n\n");
        msg.append("date:\n").append(DateFormatUtil.getNow()).append("\n\n\n");
        msg.append("from:\n").append(request.getHeader("User-Agent")).append("\n\n\n");
--- a/src/main/java/cn/celess/blog/exception/MyException.java
+++ b/src/main/java/cn/celess/blog/exception/MyException.java
@@ -1,13 +1,16 @@
 package cn.celess.blog.exception;

 import cn.celess.blog.enmu.ResponseEnum;
+import lombok.Data;

 /**
 * @author : xiaohai
 * @date : 2019/03/28 16:56
 */
+@Data
 public class MyException extends RuntimeException {
    private int code;
+    private Object result;

    public MyException(int code, String msg) {
        super(msg);
@@ -19,16 +22,20 @@ public class MyException extends RuntimeException {
        this.code = e.getCode();
    }

+    public MyException(ResponseEnum e, Object result) {
+        super(e.getMsg());
+        this.code = e.getCode();
+        this.result = result;
+    }
+
    public MyException(ResponseEnum e, String msg) {
        super(msg + e.getMsg());
        this.code = e.getCode();
    }

-    public int getCode() {
-        return code;
-    }
-
-    public void setCode(int code) {
-        this.code = code;
+    public MyException(ResponseEnum e, String msg, Object result) {
+        super(e.getMsg());
+        this.code = e.getCode();
+        this.result = result;
    }
 }
--- a/src/main/java/cn/celess/blog/mapper/ArticleMapper.java
+++ b/src/main/java/cn/celess/blog/mapper/ArticleMapper.java
@@ -1,7 +1,7 @@
 package cn.celess.blog.mapper;

 import cn.celess.blog.entity.Article;
-import org.apache.ibatis.annotations.*;
+import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;

 import java.util.List;
@@ -21,21 +21,15 @@ public interface ArticleMapper {

    int update(Article a);

-    int updateNextArticleId(long targetArticleID, long nextArticleID);
-
-    int updatePreArticleId(long targetArticleID, long preArticleID);
-
-    long getLastestArticleId();
-
    Article getLastestArticle();

    Article findArticleById(long id);

    boolean existsByTitle(String title);

-    boolean existsById(long id);
+    boolean isDeletedById(long id);

-    List<Article> findAllByAuthorId(long authorID);
+    List<Article> findAllByAuthorId(long authorId);

    List<Article> findAllByOpen(boolean isOpen);

@@ -43,15 +37,15 @@ public interface ArticleMapper {

    List<Article> findAllByCategoryId(long id);

+    List<Article> findAllByCategoryIdAndOpen(long id);
+
    List<Article> findAll();

-    Article getSimpleInfo(long id);
+    Article getPreArticle(Long id);

-    List<Article> getSimpleInfoByCategory(long categoryId);
+    Article getNextArticle(Long id);

-    List<Article> getSimpleInfoByTag(List<String> idList);
-
-    int setReadingNumber(long number, long id);
+    int updateReadingNumber(long id);

    long count();

--- a/src/main/java/cn/celess/blog/mapper/ArticleTagMapper.java
+++ b/src/main/java/cn/celess/blog/mapper/ArticleTagMapper.java
@@ -0,0 +1,35 @@
+package cn.celess.blog.mapper;
+
+import cn.celess.blog.entity.ArticleTag;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @Author: 小海
+ * @Date: 2020-05-24 14:21
+ * @Desc:
+ */
+@Mapper
+@Repository
+public interface ArticleTagMapper {
+
+    int insert(ArticleTag articleTag);
+
+    int update(ArticleTag articleTag);
+
+    ArticleTag findOneById(Long id);
+
+    int deleteById(Long id);
+
+    int deleteByArticleId(Long articleId);
+
+    List<ArticleTag> findAllByArticleId(Long articleId);
+
+    int deleteMultiById(List<ArticleTag> articleTags);
+
+    List<ArticleTag> findArticleByTag(Long tagId);
+
+    List<ArticleTag> findArticleByTagAndOpen(Long tagId);
+}
--- a/src/main/java/cn/celess/blog/mapper/CategoryMapper.java
+++ b/src/main/java/cn/celess/blog/mapper/CategoryMapper.java
@@ -34,7 +34,7 @@ public interface CategoryMapper {

    String getNameById(long id);

-    Long getIDByName(String name);
+    Long getIdByName(String name);

    Category getLastestCategory();

--- a/src/main/java/cn/celess/blog/mapper/CommentMapper.java
+++ b/src/main/java/cn/celess/blog/mapper/CommentMapper.java
@@ -8,8 +8,8 @@ import java.util.List;

 /**
 * @Author: 小海
- * @Date： 2019/06/30 16:19
- * @Description：
+ * @Date: 2019/06/30 16:19
+ * @Description:
 */
@Mapper
@Repository
@@ -18,11 +18,9 @@ public interface CommentMapper {

    int updateContent(String content, long id);

-    int updateResponder(String responder, long id);
-
    int delete(long id);

-    int deleteByArticleId(long articleId);
+    int deleteByPagePath(String pagePath);

    boolean existsById(long id);

@@ -30,19 +28,17 @@ public interface CommentMapper {

    Comment getLastestComment();

-    List<Comment> findAllByAuthorIDAndType(long id, boolean isComment);
+    List<Comment> findAllByFromUser(long id);

-    List<Comment> findAllByPId(long pid);
+    List<Comment> findAllByPid(long pid);

-    List<Comment> findAllByArticleID(long articleId);
+    List<Comment> findAllByPagePath(String pagePath);

-    List<Comment> findAllByArticleIDAndPId(long articleID, long pid);
+    List<Comment> findAllByPagePathAndFromUser(String pagePath, long userId);

-    List<Comment> findCommentsByTypeAndPId(boolean isComment, long pid);
+    List<Comment> findAllByPagePathAndPidAndNormal(String pagePath, long pid);

-    List<Comment> findAllByPId(int pid);
+    long countByPagePath(String pagePath);

-    List<Comment> findAllByType(boolean isComment);
-
-    long countByType(boolean isComment);
+    long count();
 }
--- a/src/main/java/cn/celess/blog/mapper/PartnerMapper.java
+++ b/src/main/java/cn/celess/blog/mapper/PartnerMapper.java
@@ -36,5 +36,6 @@ public interface PartnerMapper {

    List<PartnerSite> findAll();

+    List<PartnerSite> findAll(Boolean deleted);

 }
--- a/src/main/java/cn/celess/blog/mapper/TagMapper.java
+++ b/src/main/java/cn/celess/blog/mapper/TagMapper.java
@@ -26,10 +26,6 @@ public interface TagMapper {

    Boolean existsByName(String name);

-    Long getIDByName(String name);
-
-    String getNameById(long id);
-
    Tag getLastestTag();

    List<Tag> findAll();
--- a/src/main/java/cn/celess/blog/mapper/UserMapper.java
+++ b/src/main/java/cn/celess/blog/mapper/UserMapper.java
@@ -4,7 +4,6 @@ import cn.celess.blog.entity.User;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;

-import java.util.Date;
 import java.util.List;

 /**
@@ -16,13 +15,13 @@ import java.util.List;
@Repository
 public interface UserMapper {

-    int addUser(String email, String pwd);
+    int addUser(User user);

    int updateInfo(String desc, String displayName, long id);

    int updateAvatarImgUrl(String avatarImgUrl, long id);

-    int updateLoginTime(String email, Date date);
+    int updateLoginTime(String email);

    int updateEmailStatus(String email, boolean status);

@@ -50,7 +49,11 @@ public interface UserMapper {

    int delete(long id);

-    int setUserRole(Long uid, String role);
+    int lock(long id);
+
+    int setUserRole(Long id, String role);
+
+    List<User> findAll(Integer status);

    List<User> findAll();

--- a/src/main/java/cn/celess/blog/mapper/VisitorMapper.java
+++ b/src/main/java/cn/celess/blog/mapper/VisitorMapper.java
@@ -20,5 +20,7 @@ public interface VisitorMapper {

    List<Visitor> findAll();

+    List<Visitor> findAllNotDeleted();
+
    long count();
 }
--- a/src/main/java/cn/celess/blog/mapper/WebUpdateInfoMapper.java
+++ b/src/main/java/cn/celess/blog/mapper/WebUpdateInfoMapper.java
@@ -4,7 +4,6 @@ import cn.celess.blog.entity.WebUpdate;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;

-import java.util.Date;
 import java.util.List;

 /**
@@ -27,5 +26,7 @@ public interface WebUpdateInfoMapper {

    List<WebUpdate> findAll();

+    List<WebUpdate> findAllNotDeleted();
+
    WebUpdate getLastestOne();
 }
--- a/src/main/java/cn/celess/blog/service/ArticleService.java
+++ b/src/main/java/cn/celess/blog/service/ArticleService.java
@@ -1,8 +1,8 @@
 package cn.celess.blog.service;

 import cn.celess.blog.entity.model.ArticleModel;
+import cn.celess.blog.entity.model.PageData;
 import cn.celess.blog.entity.request.ArticleReq;
-import com.github.pagehelper.PageInfo;
 import org.springframework.stereotype.Service;


@@ -39,11 +39,11 @@ public interface ArticleService {
    /**
     * 获取一篇文章的数据
     *
-     * @param articleID 文章id
+     * @param articleId 文章id
     * @param is4update 是否是因文章更新而请求数据
     * @return 文章数据
     */
-    ArticleModel retrieveOneByID(long articleID, boolean is4update);
+    ArticleModel retrieveOneById(long articleId, boolean is4update);

    /**
     * 管理员 获取分页数据
@@ -52,7 +52,7 @@ public interface ArticleService {
     * @param page  数据页
     * @return 分页数据
     */
-    PageInfo adminArticles(int count, int page);
+    PageData<ArticleModel> adminArticles(int count, int page, Boolean deleted);

    /**
     * 获取文章状态为开放的文章
@@ -61,7 +61,7 @@ public interface ArticleService {
     * @param page  数据页
     * @return 分页数据
     */
-    PageInfo retrievePageForOpen(int count, int page);
+    PageData<ArticleModel> retrievePageForOpen(int count, int page);

    /**
     * 根据分类名获取文章数据
@@ -71,7 +71,7 @@ public interface ArticleService {
     * @param page  数据页
     * @return 分页数据
     */
-    PageInfo findByCategory(String name, int page, int count);
+    PageData<ArticleModel> findByCategory(String name, int page, int count);

    /**
     * 根据标签名获取文章数据
@@ -81,5 +81,5 @@ public interface ArticleService {
     * @param page  数据页
     * @return 分页数据
     */
-    PageInfo findByTag(String name, int page, int count);
+    PageData<ArticleModel> findByTag(String name, int page, int count);
 }
--- a/src/main/java/cn/celess/blog/service/CategoryService.java
+++ b/src/main/java/cn/celess/blog/service/CategoryService.java
@@ -1,11 +1,9 @@
 package cn.celess.blog.service;

-import cn.celess.blog.entity.Category;
 import cn.celess.blog.entity.model.CategoryModel;
+import cn.celess.blog.entity.model.PageData;
 import org.springframework.stereotype.Service;

-import java.util.List;
-
 /**
 * @author : xiaohai
 * @date : 2019/03/28 22:42
@@ -20,14 +18,6 @@ public interface CategoryService {
     */
    CategoryModel create(String name);

-    /**
-     * 增加一个分类
-     *
-     * @param category 分类对象
-     * @return 所增加的分类数据
-     */
-    CategoryModel create(Category category);
-
    /**
     * 通过id删除分类
     *
@@ -50,6 +40,6 @@ public interface CategoryService {
     *
     * @return 全部的分类数据
     */
-    List<CategoryModel> retrievePage();
+    PageData<CategoryModel> retrievePage(int page, int count);

 }
--- a/src/main/java/cn/celess/blog/service/CommentService.java
+++ b/src/main/java/cn/celess/blog/service/CommentService.java
@@ -1,8 +1,8 @@
 package cn.celess.blog.service;

 import cn.celess.blog.entity.model.CommentModel;
+import cn.celess.blog.entity.model.PageData;
 import cn.celess.blog.entity.request.CommentReq;
-import com.github.pagehelper.PageInfo;
 import org.springframework.stereotype.Service;

 import java.util.List;
@@ -40,12 +40,12 @@ public interface CommentService {
    /**
     * 分页获取数据
     *
-     * @param isComment true：评论   false：留言
+     * @param pagePath pagePath
     * @param count    单页数据量
     * @param page     数据页
     * @return 分页数据
     */
-    PageInfo<CommentModel> retrievePage(Boolean isComment, int page, int count);
+    PageData<CommentModel> retrievePage(String pagePath, int page, int count);

    /**
     * 通过pid获取数据
@@ -59,43 +59,33 @@ public interface CommentService {
    /**
     * 根据评论者获取数据
     *
-     * @param isComment true：评论   false：留言
+     * @param pagePath pagePath
     * @param count    单页数据量
     * @param page     数据页
     * @return 分页数据
     */
-    PageInfo<CommentModel> retrievePageByAuthor(Boolean isComment, int page, int count);
+    PageData<CommentModel> retrievePageByAuthor(String pagePath, int page, int count);

-    /**
-     * 根据文章获取数据
-     *
-     * @param articleID 文章id
-     * @param pid       父id
-     * @param count     单页数据量
-     * @param page      数据页
-     * @return 分页数据
-     */
-    PageInfo<CommentModel> retrievePageByArticle(long articleID, long pid, int page, int count);

    /**
     * 根据数据的type和pid获取数据
     *
-     * @param isComment true：评论   false：留言
+     * @param pagePath pagePath
     * @param pid      父id
     * @param count    单页数据量
     * @param page     数据页
     * @return 分页数据
     */
-    PageInfo<CommentModel> retrievePageByTypeAndPid(Boolean isComment, int pid, int page, int count);
+    PageData<CommentModel> retrievePageByPageAndPid(String pagePath, long pid, int page, int count);

    /**
     * 根据type获取数据
     *
-     * @param isComment true：评论   false：留言
+     * @param pagePath pagePath
     * @param count    单页数据量
     * @param page     数据页
     * @return 分页数据
     */
-    PageInfo<CommentModel> retrievePageByType(Boolean isComment, int page, int count);
+    PageData<CommentModel> retrievePageByPage(String pagePath, int page, int count);

 }
--- a/src/main/java/cn/celess/blog/service/CountService.java
+++ b/src/main/java/cn/celess/blog/service/CountService.java
@@ -36,13 +36,6 @@ public interface CountService {
     */
    long getTagsCount();

-    /**
-     * 获取留言数量
-     *
-     * @return 留言数量
-     */
-    long getLeaveMessageCount();
-
    /**
     * 获取用户量
     *
--- a/src/main/java/cn/celess/blog/service/PartnerSiteService.java
+++ b/src/main/java/cn/celess/blog/service/PartnerSiteService.java
@@ -1,8 +1,9 @@
 package cn.celess.blog.service;

 import cn.celess.blog.entity.PartnerSite;
+import cn.celess.blog.entity.model.PageData;
+import cn.celess.blog.entity.request.LinkApplyReq;
 import cn.celess.blog.entity.request.LinkReq;
-import com.github.pagehelper.PageInfo;
 import org.springframework.stereotype.Service;

 import java.util.List;
@@ -44,7 +45,7 @@ public interface PartnerSiteService {
     * @param page  数据页
     * @return 分页数据
     */
-    PageInfo<PartnerSite> PartnerSitePages(int page, int count);
+    PageData<PartnerSite> partnerSitePages(int page, int count, Boolean deleted);

    /**
     * 获取全部数据
@@ -53,4 +54,19 @@ public interface PartnerSiteService {
     */
    List<PartnerSite> findAll();

+    /**
+     * 申请友链
+     *
+     * @param linkApplyReq linkApplyReq
+     * @return linkApplyReq
+     */
+    PartnerSite apply(LinkApplyReq linkApplyReq);
+
+    /**
+     * 重写申请友链
+     *
+     * @param key key
+     * @return msg
+     */
+    String reapply(String key);
 }
--- a/src/main/java/cn/celess/blog/service/TagService.java
+++ b/src/main/java/cn/celess/blog/service/TagService.java
@@ -1,8 +1,7 @@
 package cn.celess.blog.service;

-import cn.celess.blog.entity.Tag;
+import cn.celess.blog.entity.model.PageData;
 import cn.celess.blog.entity.model.TagModel;
-import com.github.pagehelper.PageInfo;
 import org.springframework.stereotype.Service;

 import java.util.List;
@@ -21,15 +20,6 @@ public interface TagService {
     */
    TagModel create(String name);

-    /**
-     * 新增数据
-     *
-     * @param tag tag对象
-     * @return 新增后的数据
-     */
-
-    TagModel create(Tag tag);
-
    /**
     * 删除数据
     *
@@ -47,23 +37,6 @@ public interface TagService {
     */
    TagModel update(Long id, String name);

-    /**
-     * 查询单个标签信息
-     *
-     * @param tagId id
-     * @return 标签的数据
-     */
-    TagModel retrieveOneById(long tagId);
-
-    /**
-     * 通过name查询标签的信息
-     *
-     * @param name tag的名称
-     * @return 标签数据
-     */
-    TagModel retrieveOneByName(String name);
-
-
    /**
     * 分页获取标签数据
     *
@@ -71,7 +44,7 @@ public interface TagService {
     * @param page  数据页
     * @return 分页数据
     */
-    PageInfo<TagModel> retrievePage(int page, int count);
+    PageData<TagModel> retrievePage(int page, int count);

    /**
     * 获取全部标签数据
--- a/src/main/java/cn/celess/blog/service/UserService.java
+++ b/src/main/java/cn/celess/blog/service/UserService.java
@@ -1,16 +1,12 @@
 package cn.celess.blog.service;

-import cn.celess.blog.entity.User;
+import cn.celess.blog.entity.model.PageData;
 import cn.celess.blog.entity.model.UserModel;
 import cn.celess.blog.entity.request.LoginReq;
 import cn.celess.blog.entity.request.UserReq;
-import com.github.pagehelper.PageInfo;
-import net.sf.json.JSONObject;
 import org.springframework.stereotype.Service;

-import javax.servlet.http.HttpServletRequest;
 import java.io.InputStream;
-import java.util.List;

 /**
 * @author : xiaohai
@@ -42,14 +38,6 @@ public interface UserService {
     */
    Object logout();

-    /**
-     * 获取用户头像的链接
-     *
-     * @param id 用户id
-     * @return 头像链接
-     */
-    String getAvatarImg(long id);
-
    /**
     * 更新用户数据
     *
@@ -83,14 +71,6 @@ public interface UserService {
     */
    String getUserRoleByEmail(String email);

-    /**
-     * 通过邮箱获取用户的信息
-     *
-     * @param email 用户邮箱
-     * @return 用户信息
-     */
-    User getUserInfoByEmail(String email);
-
    /**
     * 获取邮箱是否注册过
     *
@@ -99,14 +79,6 @@ public interface UserService {
     */
    boolean isExistOfEmail(String email);

-    /**
-     * 获取用户的name 优先返回displayName 否则返回email
-     *
-     * @param id 用户id
-     * @return name
-     */
-    String getNameById(long id);
-
    /**
     * 发送重置密码邮件
     *
@@ -157,7 +129,7 @@ public interface UserService {
     * @param page  数据页
     * @return 分页数据
     */
-    PageInfo<UserModel> getUserList(Integer page, Integer count);
+    PageData<UserModel> getUserList(Integer page, Integer count, Integer status);

    /**
     * 更改用户信息
@@ -177,10 +149,11 @@ public interface UserService {

    /**
     * 设置密码
-     * @param pwd
-     * @param newPwd
-     * @param confirmPwd
-     * @return
+     *
+     * @param pwd        pwd
+     * @param newPwd     newPwd
+     * @param confirmPwd confirmPwd
+     * @return UserModel
     */
    UserModel setPwd(String pwd, String newPwd, String confirmPwd);
 }
--- a/src/main/java/cn/celess/blog/service/VisitorService.java
+++ b/src/main/java/cn/celess/blog/service/VisitorService.java
@@ -1,7 +1,7 @@
 package cn.celess.blog.service;

+import cn.celess.blog.entity.model.PageData;
 import cn.celess.blog.entity.model.VisitorModel;
-import com.github.pagehelper.PageInfo;
 import org.springframework.stereotype.Service;

 import javax.servlet.http.HttpServletRequest;
@@ -20,7 +20,7 @@ public interface VisitorService {
     * @param showLocation 是否显示位置信息 开启改选项数据响应超慢
     * @return 分页数据
     */
-    PageInfo<VisitorModel> visitorPage(int page, int count, boolean showLocation);
+    PageData<VisitorModel> visitorPage(int page, int count, boolean showLocation);

    /**
     * 新增访客
--- a/src/main/java/cn/celess/blog/service/WebUpdateInfoService.java
+++ b/src/main/java/cn/celess/blog/service/WebUpdateInfoService.java
@@ -1,11 +1,11 @@
 package cn.celess.blog.service;

+import cn.celess.blog.entity.model.PageData;
 import cn.celess.blog.entity.model.WebUpdateModel;
-import com.github.pagehelper.PageInfo;
-import net.sf.json.JSONObject;
 import org.springframework.stereotype.Service;

 import java.util.List;
+import java.util.Map;

 /**
 * @author : xiaohai
@@ -45,7 +45,7 @@ public interface WebUpdateInfoService {
     * @param page  数据页
     * @return 分页数据
     */
-    PageInfo<WebUpdateModel> pages(int count, int page);
+    PageData<WebUpdateModel> pages(int count, int page);

    /**
     * 获取全部的更新记录
@@ -59,5 +59,5 @@ public interface WebUpdateInfoService {
     *
     * @return
     */
-    JSONObject getLastestUpdateTime();
+    Map<String, Object> getLastestUpdateTime();
 }
--- a/src/main/java/cn/celess/blog/service/serviceimpl/ArticleServiceImpl.java
+++ b/src/main/java/cn/celess/blog/service/serviceimpl/ArticleServiceImpl.java
@@ -1,35 +1,32 @@
 package cn.celess.blog.service.serviceimpl;

-import cn.celess.blog.enmu.LevelEnum;
 import cn.celess.blog.enmu.ResponseEnum;
+import cn.celess.blog.enmu.RoleEnum;
 import cn.celess.blog.entity.*;
 import cn.celess.blog.entity.model.ArticleModel;
+import cn.celess.blog.entity.model.PageData;
 import cn.celess.blog.entity.request.ArticleReq;
 import cn.celess.blog.exception.MyException;
-import cn.celess.blog.mapper.ArticleMapper;
-import cn.celess.blog.mapper.CategoryMapper;
-import cn.celess.blog.mapper.CommentMapper;
-import cn.celess.blog.mapper.TagMapper;
+import cn.celess.blog.mapper.*;
 import cn.celess.blog.service.ArticleService;
 import cn.celess.blog.service.UserService;
-import cn.celess.blog.util.DateFormatUtil;
+import cn.celess.blog.util.ModalTrans;
 import cn.celess.blog.util.RedisUserUtil;
 import cn.celess.blog.util.RegexUtil;
 import cn.celess.blog.util.StringFromHtmlUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.youbenzi.mdtool.tool.MDTool;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;


 /**
@@ -37,8 +34,8 @@ import java.util.List;
 * @date : 2019/03/28 15:21
 */
@Service
+@Slf4j
 public class ArticleServiceImpl implements ArticleService {
-    public static final Logger logger = LoggerFactory.getLogger(ArticleServiceImpl.class);

    @Autowired
    ArticleMapper articleMapper;
@@ -50,6 +47,8 @@ public class ArticleServiceImpl implements ArticleService {
    @Autowired
    CommentMapper commentMapper;
    @Autowired
+    ArticleTagMapper articleTagMapper;
+    @Autowired
    UserService userService;
    @Autowired
    HttpServletRequest request;
@@ -79,303 +78,179 @@ public class ArticleServiceImpl implements ArticleService {
        if (reqBody.getCategory() == null || reqBody.getCategory().replaceAll(" ", "").isEmpty()) {
            throw new MyException(ResponseEnum.PARAMETERS_ERROR);
        }
-        if (reqBody.getTags() == null || reqBody.getTags().replaceAll(" ", "").isEmpty()) {
+        if (reqBody.getTags() == null || reqBody.getTags().length == 0) {
            throw new MyException(ResponseEnum.PARAMETERS_ERROR);
        }
+        if (articleMapper.existsByTitle(reqBody.getTitle())) {
+            throw new MyException(ResponseEnum.ARTICLE_HAS_EXIST);
+        }
+        // 查看是否存在已有的分类
+        Category category = categoryMapper.findCategoryByName(reqBody.getCategory());
+        if (category == null) {
+            throw new MyException(ResponseEnum.CATEGORY_NOT_EXIST);
+        }

-
-        //写入数据库的数据
+        // 构建 需要写入数据库的对象数据
        Article article = new Article();
-        article.setTitle(reqBody.getTitle());
-        article.setOpen(reqBody.getOpen());
-        article.setMdContent(reqBody.getMdContent());
-        article.setUrl(reqBody.getUrl());
-        article.setType(reqBody.getType());
+        BeanUtils.copyProperties(reqBody, article);

-        article.setAuthorId(redisUserUtil.get().getId());
-        article.setPublishDate(new Date());
-
-        //防止出现 “null,xxx”这种情况
-        article.setTagsId("");
-
-
-        //是否需要更新上一篇文章
-        boolean isUpdatePreArticle = true;
-
-        Article preArticle = null;
-
-
-        if (articleMapper.count() == 0) {
-            isUpdatePreArticle = false;
-
-
-        } else {
-            //获取最新的一条数据
-            preArticle = articleMapper.getLastestArticle();
-        }
-
-        if (isUpdatePreArticle) {
-            logger.info("上一篇文章的id为：" + preArticle.getId());
-            //设置上一篇文章的id
-            article.setPreArticleId(preArticle.getId());
-        }
+        article.setUser(redisUserUtil.get());

        //markdown->html->summary
        String str = StringFromHtmlUtil.getString(MDTool.markdown2Html(article.getMdContent()));
        //获取摘要  摘要长度为255个字符
        String summary = str.length() > 240 ? str.substring(0, 240) + "......" : str;
-
-        //去除转换后存在的空格
-        String tagStr = reqBody.getTags().replaceAll(" ", "");
        article.setSummary(summary);

-        if (articleMapper.existsByTitle(article.getTitle())) {
-            throw new MyException(ResponseEnum.ARTICLE_HAS_EXIST);
-        }
-
-
-        //将分类写入数据库
-        Category category1 = categoryMapper.findCategoryByName(reqBody.getCategory());
-        if (category1 == null) {
-            category1 = new Category();
-            category1.setArticles("");
-            category1.setName(reqBody.getCategory());
-            categoryMapper.insert(category1);
-        }
-
-        article.setCategoryId(category1.getId());
+        article.setCategory(category);

        //文章存数据库
        articleMapper.insert(article);
-        //获取新增的文章
-
-        if (isUpdatePreArticle) {
-            //更新上一篇文章的“下一篇文章ID”
-            articleMapper.updateNextArticleId(preArticle.getId(), article.getId());
-        }
-
-        //无效
-        // articleMapper.updatePreArticleId(article.getId(), preArticle == null ? -1 : preArticle.getId());
-        article.setPreArticleId(preArticle == null ? -1 : preArticle.getId());
-
-        category1.setArticles(category1.getArticles() + article.getId() + ",");
-        categoryMapper.update(category1);
-
-
        //将标签写入数据库
-        for (String t : tagStr.split(",")) {
-            if (t.replaceAll(" ", "").length() == 0) {
+        for (String tagName : reqBody.getTags()) {
+            if (tagName.replaceAll(" ", "").length() == 0) {
                //单个标签只含空格
                continue;
            }
-            Tag tag = tagMapper.findTagByName(t);
+            Tag tag = tagMapper.findTagByName(tagName);
            if (tag == null) {
                tag = new Tag();
-                tag.setName(t);
-                tag.setArticles("");
+                tag.setName(tagName);
                tagMapper.insert(tag);
            }
-            tag.setArticles(tag.getArticles() + article.getId() + ",");
-            article.setTagsId(article.getTagsId() + tag.getId() + ",");
-            tagMapper.update(tag);
-        }
-        articleMapper.update(article);
-        return fullTransform(articleMapper.getLastestArticle());
+            ArticleTag articleTag = new ArticleTag(article, tag);
+            articleTagMapper.insert(articleTag);
        }
+        Article articleFromDb = articleMapper.findArticleById(article.getId());

+        ArticleModel articleModel = ModalTrans.article(articleFromDb);
+        articleModel.setPreArticle(ModalTrans.article(articleMapper.getPreArticle(article.getId()), true));
+        return articleModel;
+    }

    @Override
    @Transactional(rollbackFor = Exception.class)
-    public boolean delete(long articleID) {
-
-        Article articleForDel = articleMapper.findArticleById(articleID);
+    public boolean delete(long articleId) {
+        Article articleForDel = articleMapper.findArticleById(articleId);

        if (articleForDel == null) {
-            throw new MyException(ResponseEnum.ARTICLE_NOT_EXIST);//文章不存在
+            //文章不存在
+            throw new MyException(ResponseEnum.ARTICLE_NOT_EXIST);
        }

-        Article preArticle = articleMapper.findArticleById(articleForDel.getPreArticleId());
-        Article nextArticle = articleMapper.findArticleById(articleForDel.getNextArticleId());
-
-        //对访问情况进行判断  非博主/非自己文章 拒绝访问
+        //对访问情况进行判断  非admin 权限不可删除文章
        User user = redisUserUtil.get();
-        if (!user.getRole().contains("admin") && !articleForDel.getAuthorId().equals(user.getId())) {
+        if (!RoleEnum.ADMIN_ROLE.getRoleName().equals(user.getRole())) {
            throw new MyException(ResponseEnum.PERMISSION_ERROR);
        }
-
-        //删除的文章处于中间位置
-        if (nextArticle != null && preArticle != null) {
-
-            //修改上一篇文章的“下一篇文章”y
-            articleMapper.updateNextArticleId(articleForDel.getPreArticleId(), articleForDel.getNextArticleId());
-
-            //修改下一篇文章的 “上一篇文章”
-            articleMapper.updatePreArticleId(articleForDel.getNextArticleId(), articleForDel.getPreArticleId());
-        }
-        if (preArticle == null && nextArticle != null) {
-            //删除的是第一篇文章
-            articleMapper.updatePreArticleId(nextArticle.getId(), -1);
-        }
-        if (nextArticle == null && preArticle != null) {
-            //删除的是最后一篇文章
-            articleMapper.updateNextArticleId(preArticle.getId(), -1);
-        }
-        // delete count 为删除的数据数量
-        int deleteCount = commentMapper.deleteByArticleId(articleID);
-
-        //删除标签中的文章id
-        String tag = articleForDel.getTagsId();
-        if (tag.length() > 0) {
-            String[] tags = tag.split(",");
-            for (String t : tags) {
-                if (t != null) {
-                    //查询标签
-                    Tag tag1 = tagMapper.findTagById(Long.parseLong(t));
-                    //去除标签中的articleId中的待删除的文章id
-                    String s = tag1.getArticles().replaceAll(articleForDel.getId() + ",", "");
-                    tag1.setArticles(s);
-                    tagMapper.update(tag1);
-                }
-            }
-        }
-
-
-        //删除分类中的文章id
-        //获取文章的分类
-        long categoryId = articleForDel.getCategoryId();
-        Category category = categoryMapper.findCategoryById(categoryId);
-        //删除文章id
-        category.setArticles(category.getArticles().replaceAll(articleForDel.getId() + ",", ""));
-        //更新
-        categoryMapper.update(category);
-
        //删除指定文章
-        articleMapper.delete(articleID);
+        articleMapper.delete(articleId);
+
+        //articleTagMapper.deleteByArticleId(articleId);
+
        return true;
    }

    @Transactional(rollbackFor = Exception.class)
    @Override
    public ArticleModel update(ArticleReq reqBody) {
-        if (reqBody == null) {
+        if (reqBody == null || reqBody.getId() == null) {
            throw new MyException(ResponseEnum.PARAMETERS_ERROR);
        }
+        // 查找数据
+        Article article = articleMapper.findArticleById(reqBody.getId());
+
        //数据判断
-        if (reqBody.getTitle() == null || reqBody.getTitle().replaceAll(" ", "").isEmpty()) {
-            throw new MyException(ResponseEnum.PARAMETERS_ERROR);
-        } else if (reqBody.getMdContent() == null || reqBody.getMdContent().replaceAll(" ", "").isEmpty()) {
+        if (reqBody.getTitle() != null && !reqBody.getTitle().replaceAll(" ", "").isEmpty()) {
+            if (!article.getTitle().equals(reqBody.getTitle()) && articleMapper.existsByTitle(reqBody.getTitle())) {
+                throw new MyException(ResponseEnum.ARTICLE_HAS_EXIST);
+            }
+            article.setTitle(reqBody.getTitle());
+        }
+        if (reqBody.getMdContent() != null && !reqBody.getMdContent().replaceAll(" ", "").isEmpty()) {
+            article.setMdContent(reqBody.getMdContent());
+        }
+
+        //转载 判断链接
+        if (reqBody.getType() != null) {
+            if (!reqBody.getType() && reqBody.getUrl() == null) {
                throw new MyException(ResponseEnum.PARAMETERS_ERROR);
            }
-        //转载 判断链接
-        if (!reqBody.getType()) {
-            if (reqBody.getUrl() == null || reqBody.getUrl().replaceAll(" ", "").isEmpty()) {
-                throw new MyException(ResponseEnum.PARAMETERS_ERROR);
-            } else if (!RegexUtil.urlMatch(reqBody.getUrl())) {
+
+            if (!reqBody.getType() && !RegexUtil.urlMatch(reqBody.getUrl())) {
                throw new MyException(ResponseEnum.PARAMETERS_URL_ERROR);
            }
+            article.setType(reqBody.getType());
+            article.setUrl(reqBody.getUrl());
        }
-        if (reqBody.getCategory() == null || reqBody.getCategory().replaceAll(" ", "").isEmpty()) {
-            throw new MyException(ResponseEnum.PARAMETERS_ERROR);
+        if (reqBody.getCategory() != null && !reqBody.getCategory().replaceAll(" ", "").isEmpty()) {
+            Category category = categoryMapper.findCategoryByName(reqBody.getCategory());
+            if (category == null) {
+                category = new Category();
+                category.setName(reqBody.getCategory());
+                categoryMapper.insert(category);
            }
-        // 暂时不更新tags
-        if (reqBody.getTags() == null || reqBody.getTags().replaceAll(" ", "").isEmpty()) {
-            throw new MyException(ResponseEnum.PARAMETERS_ERROR);
+            article.setCategory(category);
        }

        //写入数据库的数据
-        Article article = new Article();
-        if (reqBody.getId() == null) {
-            throw new MyException(ResponseEnum.PARAMETERS_ERROR.getCode(), "id不能为空");
-        }
-        article.setId(reqBody.getId());
-        article.setTitle(reqBody.getTitle());
-        article.setOpen(reqBody.getOpen());
-        article.setMdContent(reqBody.getMdContent());
-        article.setUrl(reqBody.getUrl());
-        article.setType(reqBody.getType());
-
-
-        Article oldArticle = articleMapper.findArticleById(reqBody.getId());
-
-        Category category = categoryMapper.findCategoryById(oldArticle.getCategoryId());
-        if (!(category.getName()).equals(reqBody.getCategory())) {
-            //修改更新之前数据 的分类
-            category.setArticles(category.getArticles().replace(reqBody.getId() + ",", ""));
-            //更新
-            categoryMapper.update(category);
-
-            //更新 更新之后的分类
-            Category category1 = categoryMapper.findCategoryByName(reqBody.getCategory());
-            if (category1 == null) {
-                category1 = new Category();
-                category1.setName(reqBody.getCategory());
-                category1.setArticles(reqBody.getId() + ",");
-                categoryMapper.insert(category1);
-            }
-            article.setCategoryId(category1.getId());
-        } else {
-            article.setCategoryId(oldArticle.getCategoryId());
-        }
-
-        String[] newTags = reqBody.getTags().split(",");
-        String[] tagIds = oldArticle.getTagsId().split(",");
-        //防止出现 ‘null2’这种情况
-        article.setTagsId("");
-        for (String t : newTags) {
-            Tag tag = tagMapper.findTagByName(t);
-            if (tag == null) {
-                tag = new Tag();
-                tag.setName(t);
-                tag.setArticles(oldArticle.getId() + ",");
-                int status = tagMapper.insert(tag);
-                if (status == 0) {
-                    // 插入失败
-                    throw new MyException(ResponseEnum.FAILURE);
-                }
-                article.setTagsId(article.getTagsId() + tag.getId() + ",");
-                continue;
-            }
-            article.setTagsId(article.getTagsId() + tag.getId() + ",");
-        }
-        for (String tagId : tagIds) {
-            Tag tagById = tagMapper.findTagById(Long.parseLong(tagId));
-            // 在新更新的tag中是否有原有的tag
-            boolean isOldTag = false;
-            for (String s : newTags) {
-                if (s.equals(tagById.getName())) {
-                    isOldTag = true;
-                    break;
-                }
-            }
-            if (!isOldTag) {
-                tagById.setArticles(tagById.getArticles().replace(oldArticle.getId() + ",", ""));
-            }
-            tagMapper.update(tagById);
-        }
-//
-//        // TODO:::: tag的更新
-//        article.setTagsId(oldArticle.getTagsId());
-
-
-        article.setUpdateDate(new Date());
-        // TODO::::换用beansUtil
-        // 设置不定参数
-        article.setReadingNumber(oldArticle.getReadingNumber());
-        article.setPublishDate(oldArticle.getPublishDate());
-        article.setAuthorId(redisUserUtil.get().getId());
-        article.setPreArticleId(oldArticle.getPreArticleId());
-        article.setNextArticleId(oldArticle.getNextArticleId());
+        article.setOpen(reqBody.getOpen() == null ? article.getOpen() : reqBody.getOpen());
        String str = StringFromHtmlUtil.getString(MDTool.markdown2Html(article.getMdContent()));
        article.setSummary(str.length() > 240 ? str.substring(0, 240) + "......" : str);
        articleMapper.update(article);
+
+
+        List<ArticleTag> allByArticleId = articleTagMapper.findAllByArticleId(article.getId());
+        List<ArticleTag> updateList = new ArrayList<>();
+        List<ArticleTag> deleteList = new ArrayList<>();
+
+        // 获取要更新 的标签
+        for (String tag : reqBody.getTags()) {
+            boolean contain = allByArticleId.stream().anyMatch(articleTag -> articleTag.getTag().getName().equals(tag));
+            if (!contain) {
+                ArticleTag articleTag = new ArticleTag();
+                articleTag.setArticle(article);
+                Tag tagByName = tagMapper.findTagByName(tag);
+                if (tagByName == null) {
+                    tagByName = new Tag(tag);
+                    tagMapper.insert(tagByName);
+                }
+                articleTag.setTag(tagByName);
+                updateList.add(articleTag);
+            }
+        }
+        // 获取要删除的标签
+        allByArticleId.forEach(articleTag -> {
+            boolean contain = false;
+            for (String tag : reqBody.getTags()) {
+                if (articleTag.getTag().getName().equals(tag)) {
+                    contain = true;
+                    break;
+                }
+            }
+            if (!contain) {
+                deleteList.add(articleTag);
+            }
+        });
+
+        if (updateList.size() != 0) {
+            updateList.forEach(articleTag -> articleTagMapper.insert(articleTag));
+        }
+
+        if (deleteList.size() != 0) {
+            articleTagMapper.deleteMultiById(deleteList);
+        }
+
        //更新完成移除
        request.getSession().removeAttribute("article4update");
-        return fullTransform(article);
+        ArticleModel articleModel = ModalTrans.article(articleMapper.findArticleById(article.getId()));
+        setPreAndNextArticle(articleModel);
+        return articleModel;
    }

    @Override
-    public ArticleModel retrieveOneByID(long articleID, boolean is4update) {
-        Article article = articleMapper.findArticleById(articleID);
+    public ArticleModel retrieveOneById(long articleId, boolean is4update) {
+        Article article = articleMapper.findArticleById(articleId);
        if (article == null) {
            throw new MyException(ResponseEnum.ARTICLE_NOT_EXIST);
        }
@@ -385,178 +260,103 @@ public class ArticleServiceImpl implements ArticleService {
                throw new MyException(ResponseEnum.ARTICLE_NOT_PUBLIC);
            }
        }
-        article.setReadingNumber(article.getReadingNumber() + 1);
+        ArticleModel articleModel = ModalTrans.article(article);
+
        if (is4update) {
            //因更新而获取文章  不需要增加阅读量
            request.getSession().setAttribute("article4update", article);
-            return fullTransform(article);
+            return articleModel;
        }
-        articleMapper.setReadingNumber(article.getReadingNumber() + 1, articleID);
-        return fullTransform(article);
+        setPreAndNextArticle(articleModel);
+        articleMapper.updateReadingNumber(articleId);
+        return articleModel;
    }

    /**
     * @param count 数目
-     * @param page  页面 默认减1
-     * @return
+     * @param page  页面
+     * @return PageInfo
     */
    @Override
-    public PageInfo adminArticles(int count, int page) {
-        PageHelper.startPage(page, count);
+    public PageData<ArticleModel> adminArticles(int count, int page, Boolean deleted) {
        List<Article> articleList = articleMapper.findAll();
-        PageInfo pageInfo = new PageInfo(articleList);
-        pageInfo.setList(list2list(articleList, LevelEnum.BETWEEN_M_AND_H));
-        return pageInfo;
+
+        PageData<ArticleModel> pageData = new PageData<>(null, 0, count, page);
+        List<Article> collect;
+        if (deleted != null) {
+            collect = articleList.stream().filter(article -> article.isDeleted() == deleted).collect(Collectors.toList());
+        } else {
+            collect = articleList;
+        }
+        pageData.setTotal(collect.size());
+        List<ArticleModel> articleModels = collect.stream()
+                .peek(article -> article.setMdContent(null))
+                .map(ModalTrans::article)
+                .skip((page - 1) * count)
+                .limit(count)
+                .collect(Collectors.toList());
+        pageData.setList(articleModels);
+
+        return pageData;
    }

    @Override
-    public PageInfo retrievePageForOpen(int count, int page) {
+    public PageData<ArticleModel> retrievePageForOpen(int count, int page) {
        PageHelper.startPage(page, count);
        List<Article> articleList = articleMapper.findAllByOpen(true);
-        PageInfo pageInfo = new PageInfo(articleList);
-        pageInfo.setList(list2list(articleList, LevelEnum.MIDDLE));
-        return pageInfo;
+        PageData<ArticleModel> pageData = new PageData<>(new PageInfo<>(articleList));
+
+        List<ArticleModel> articleModelList = articleList
+                .stream()
+                .map(article -> setPreAndNextArticle(ModalTrans.article(article, true)))
+                .collect(Collectors.toList());
+        pageData.setList(articleModelList);
+        return pageData;
    }

    @Override
-    public PageInfo findByCategory(String name, int page, int count) {
-        Long idByName = categoryMapper.getIDByName(name);
-        if (idByName == null) {
+    public PageData<ArticleModel> findByCategory(String name, int page, int count) {
+        Category category = categoryMapper.findCategoryByName(name);
+        if (category == null) {
            throw new MyException(ResponseEnum.CATEGORY_NOT_EXIST);
        }
        PageHelper.startPage(page, count);
-        PageInfo pageInfo = new PageInfo(articleMapper.getSimpleInfoByCategory(idByName));
-        return pageInfo;
+        List<Article> open = articleMapper.findAllByCategoryIdAndOpen(category.getId());
+
+        List<ArticleModel> modelList = open.stream()
+                .map(article -> ModalTrans.article(article, true))
+                .peek(articleModel -> {
+                    articleModel.setNextArticle(null);
+                    articleModel.setPreArticle(null);
+                })
+                .collect(Collectors.toList());
+        return new PageData<>(new PageInfo<>(open), modelList);
    }

    @Override
-    public PageInfo findByTag(String name, int page, int count) {
+    public PageData<ArticleModel> findByTag(String name, int page, int count) {
        Tag tag = tagMapper.findTagByName(name);
        if (tag == null) {
            throw new MyException(ResponseEnum.TAG_NOT_EXIST);
        }
        PageHelper.startPage(page, count);
-        String[] split = tag.getArticles().split(",");
-        List<String> list = Arrays.asList(split);
-        List<Article> articleList = articleMapper.getSimpleInfoByTag(list);
-        PageInfo pageInfo = new PageInfo(articleList);
-        return pageInfo;
+        List<ArticleTag> articleByTag = articleTagMapper.findArticleByTagAndOpen(tag.getId());
+        List<ArticleModel> modelList = articleByTag
+                .stream()
+                .map(articleTag -> ModalTrans.article(articleTag.getArticle(), true))
+                .peek(articleModel -> {
+                    articleModel.setNextArticle(null);
+                    articleModel.setPreArticle(null);
+                }).collect(Collectors.toList());
+        return new PageData<>(new PageInfo<>(articleByTag), modelList);
    }

-    /**
-     * page转换
-     *
-     * @param articleList 数据源
-     * @param level       转换级别
-     * @return list
-     */
-    private List<ArticleModel> list2list(List<Article> articleList, LevelEnum level) {
-        List<ArticleModel> content = new ArrayList<>();
-        for (Article a : articleList) {
-            ArticleModel model;
-            switch (level.getLevelCode()) {
-                case 0:
-                    model = simpleTransform(a);
-                    break;
-                case 1:
-                    model = suitableTransform(a);
-                    break;
-                case 2:
-                    model = suitableTransformForAdmin(a);
-                    break;
-                case 3:
-                default:
-                    model = fullTransform(a);
+    private ArticleModel setPreAndNextArticle(ArticleModel articleModel) {
+        if (articleModel == null) {
+            return null;
        }
-            content.add(model);
+        articleModel.setPreArticle(ModalTrans.article(articleMapper.getPreArticle(articleModel.getId()), true));
+        articleModel.setNextArticle(ModalTrans.article(articleMapper.getNextArticle(articleModel.getId()), true));
+        return articleModel;
    }
-        return content;
-    }
-
-    /**
-     * 简单的模型转换
-     * [id,title,summary]
-     *
-     * @param a 源数据
-     * @return 模型
-     */
-    private ArticleModel simpleTransform(Article a) {
-        ArticleModel model = new ArticleModel();
-        model.setId(a.getId());
-        model.setTitle(a.getTitle());
-        model.setSummary(a.getSummary());
-
-        return model;
-    }
-
-    /**
-     * 中等转换
-     * [id,title,summary]
-     * +
-     * [original,tags,category]
-     *
-     * @param a
-     * @return
-     */
-    private ArticleModel suitableTransform(Article a) {
-        ArticleModel model = simpleTransform(a);
-        model.setAuthorName(userService.getNameById(a.getAuthorId()));
-        model.setPublishDateFormat(DateFormatUtil.get(a.getPublishDate()));
-        model.setOriginal(a.getType());
-        model.setCategory(categoryMapper.getNameById(a.getCategoryId()));
-        String[] split = a.getTagsId().split(",");
-        String[] tags = new String[split.length];
-        for (int i = 0; i < split.length; i++) {
-            if (split[i] == null || "".equals(split[i])) {
-                continue;
-            }
-            tags[i] = tagMapper.getNameById(Long.parseLong(split[i]));
-        }
-        model.setTags(tags);
-        return model;
-    }
-
-    /**
-     * 中等转换 for admin页面
-     * [id,title]
-     * +
-     * [original,UpdateDate,open,readingNumber]
-     *
-     * @param a
-     * @return
-     */
-    private ArticleModel suitableTransformForAdmin(Article a) {
-        ArticleModel model = simpleTransform(a);
-        model.setPublishDateFormat(DateFormatUtil.get(a.getPublishDate()));
-        model.setUpdateDateFormat(DateFormatUtil.get(a.getUpdateDate()));
-        model.setReadingNumber(a.getReadingNumber());
-        model.setOpen(a.getOpen());
-        model.setOriginal(a.getType());
-        model.setSummary(null);
-        return model;
-    }
-
-    /**
-     * 全转换
-     * [id,title,summary,original,tags,category]
-     * +
-     * [UpdateDate,MdContent,NextArticleId,NextArticleTitle,preArticleId,preArticleTitle,open,url,readingNumber]
-     *
-     * @param a
-     * @return
-     */
-    private ArticleModel fullTransform(Article a) {
-        ArticleModel model = suitableTransform(a);
-        model.setUpdateDateFormat(DateFormatUtil.get(a.getUpdateDate()));
-        model.setMdContent(a.getMdContent());
-        model.setNextArticleId(a.getNextArticleId());
-        model.setNextArticleTitle(a.getNextArticleId() == -1 ? "无" : articleMapper.getTitleById(a.getNextArticleId()));
-        model.setPreArticleId(a.getPreArticleId());
-        model.setPreArticleTitle(a.getPreArticleId() == -1 ? "无" : articleMapper.getTitleById(a.getPreArticleId()));
-        model.setOpen(a.getOpen());
-        model.setUrl(a.getUrl());
-        model.setReadingNumber(a.getReadingNumber());
-        return model;
-    }
-
 }
--- a/src/main/java/cn/celess/blog/service/serviceimpl/CategoryServiceImpl.java
+++ b/src/main/java/cn/celess/blog/service/serviceimpl/CategoryServiceImpl.java
@@ -3,17 +3,22 @@ package cn.celess.blog.service.serviceimpl;
 import cn.celess.blog.enmu.ResponseEnum;
 import cn.celess.blog.entity.Article;
 import cn.celess.blog.entity.Category;
+import cn.celess.blog.entity.model.ArticleModel;
 import cn.celess.blog.entity.model.CategoryModel;
+import cn.celess.blog.entity.model.PageData;
 import cn.celess.blog.exception.MyException;
 import cn.celess.blog.mapper.ArticleMapper;
 import cn.celess.blog.mapper.CategoryMapper;
 import cn.celess.blog.service.CategoryService;
+import cn.celess.blog.util.ModalTrans;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

 import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;

 /**
 * @author : xiaohai
@@ -35,46 +40,19 @@ public class CategoryServiceImpl implements CategoryService {
        }
        Category category = new Category();
        category.setName(name);
-        category.setArticles("");
        categoryMapper.insert(category);
-        return new CategoryModel(category);
-    }
-
-    @Override
-    public CategoryModel create(Category category) {
-        if (category == null) {
-            throw new MyException(ResponseEnum.PARAMETERS_ERROR);
-        }
-        categoryMapper.insert(category);
-        return new CategoryModel(category);
+        return ModalTrans.category(category);
    }

    @Override
    public boolean delete(long id) {
        Category category = categoryMapper.findCategoryById(id);
-
        if (category == null) {
            throw new MyException(ResponseEnum.CATEGORY_NOT_EXIST);
        }
-        String[] articleArray = category.getArticles().split(",");
-        for (int i = 0; i < articleArray.length; i++) {
-            if (articleArray[i] == null || "".equals(articleArray[i])) {
-                continue;
-            }
-            long articleId = Long.parseLong(articleArray[i]);
-            Article article = articleMapper.findArticleById(articleId);
-            if (article == null) {
-                continue;
-            }
-            article.setCategoryId(-1L);
-            //一个 文章只对应一个分类，分类不存在则文章默认不可见
-            article.setOpen(false);
-            articleMapper.update(article);
-        }
        return categoryMapper.delete(id) == 1;
    }

-
    @Override
    public CategoryModel update(Long id, String name) {
        if (id == null) {
@@ -83,13 +61,32 @@ public class CategoryServiceImpl implements CategoryService {
        Category category = categoryMapper.findCategoryById(id);
        category.setName(name);
        categoryMapper.update(category);
-        return new CategoryModel(category);
+        return ModalTrans.category(category);
    }

    @Override
-    public List<CategoryModel> retrievePage() {
-        List<CategoryModel> list = new ArrayList<>();
-        categoryMapper.findAll().forEach(e -> list.add(new CategoryModel(e)));
-        return list;
+    public PageData<CategoryModel> retrievePage(int page, int count) {
+        PageHelper.startPage(page, count);
+        List<Category> all = categoryMapper.findAll();
+        // 遍历没一个category
+        List<CategoryModel> modelList = all
+                .stream()
+                .map(ModalTrans::category)
+                .peek(categoryModel -> {
+                    // 根据category去查article，并赋值给categoryModel
+                    List<Article> allByCategoryId = articleMapper.findAllByCategoryId(categoryModel.getId());
+                    List<ArticleModel> articleModelList = allByCategoryId
+                            .stream()
+                            .map(article -> ModalTrans.article(article, true))
+                            .peek(articleModel -> {
+                                // 去除不必要的字段
+                                articleModel.setPreArticle(null);
+                                articleModel.setNextArticle(null);
+                                articleModel.setTags(null);
+                            })
+                            .collect(Collectors.toList());
+                    categoryModel.setArticles(articleModelList);
+                }).collect(Collectors.toList());
+        return new PageData<>(new PageInfo<>(all), modelList);
    }
 }
--- a/src/main/java/cn/celess/blog/service/serviceimpl/CommentServiceImpl.java
+++ b/src/main/java/cn/celess/blog/service/serviceimpl/CommentServiceImpl.java
@@ -1,26 +1,29 @@
 package cn.celess.blog.service.serviceimpl;

+import cn.celess.blog.enmu.CommentStatusEnum;
 import cn.celess.blog.enmu.ResponseEnum;
 import cn.celess.blog.entity.Comment;
+import cn.celess.blog.entity.User;
 import cn.celess.blog.entity.model.CommentModel;
+import cn.celess.blog.entity.model.PageData;
 import cn.celess.blog.entity.request.CommentReq;
 import cn.celess.blog.exception.MyException;
 import cn.celess.blog.mapper.ArticleMapper;
 import cn.celess.blog.mapper.CommentMapper;
+import cn.celess.blog.mapper.UserMapper;
 import cn.celess.blog.service.CommentService;
-import cn.celess.blog.service.UserService;
-import cn.celess.blog.util.DateFormatUtil;
+import cn.celess.blog.util.ModalTrans;
 import cn.celess.blog.util.RedisUserUtil;
-import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;

 /**
 * @author : xiaohai
@@ -31,7 +34,7 @@ public class CommentServiceImpl implements CommentService {
    @Autowired
    CommentMapper commentMapper;
    @Autowired
-    UserService userService;
+    UserMapper userMapper;
    @Autowired
    ArticleMapper articleMapper;
    @Autowired
@@ -41,52 +44,43 @@ public class CommentServiceImpl implements CommentService {

    @Override
    public CommentModel create(CommentReq reqBody) {
-
        if (reqBody == null) {
            throw new MyException(ResponseEnum.PARAMETERS_ERROR);
        }
-        long authorID = redisUserUtil.get().getId();
+        User user = redisUserUtil.get();
        Comment pComment = null;
-        if (reqBody.getPid() != null && reqBody.getPid() != -1) {
+        if (reqBody.getPid() != -1) {
            pComment = commentMapper.findCommentById(reqBody.getPid());
        }
-        if (reqBody.getPid() == null) {
-            reqBody.setPid(-1L);
-        }
        //不是一级评论
        if (reqBody.getPid() != -1 && pComment == null) {
            //父评论不存在
            throw new MyException(ResponseEnum.PARAMETERS_ERROR);
        }
        Comment comment = new Comment();
-        comment.setAuthorID(authorID);
-        comment.setType(reqBody.getComment());
-        if (reqBody.getComment()) {
-            //若为评论
-            if (reqBody.getArticleID() <= 0) {
-                throw new MyException(ResponseEnum.PARAMETERS_ERROR);
+        comment.setFromUser(user);
+        User userTo = new User();
+        userTo.setId(null);
+        if (reqBody.getToUserId() != -1) {
+            userTo = userMapper.findById(reqBody.getToUserId());
+            comment.setToUser(userTo);
        }
-            comment.setArticleID(reqBody.getArticleID());
-        } else {
-            comment.setArticleID(-1L);
-        }
-        comment.setContent(reqBody.getContent());
-        comment.setPid(reqBody.getPid());
-        comment.setDate(new Date());
-        comment.setResponseId("");
+        comment.setToUser(userTo);
+        userMapper.findById(reqBody.getToUserId());
+        BeanUtils.copyProperties(reqBody, comment);
        commentMapper.insert(comment);
-        if (reqBody.getPid() != -1) {
-            commentMapper.updateResponder(pComment.getResponseId() + comment.getId() + ",", reqBody.getPid());
-        }
-        return trans(comment);
+        return ModalTrans.comment(commentMapper.findCommentById(comment.getId()));
    }

    @Override
    public boolean delete(long id) {
-        boolean b = commentMapper.existsById(id);
-        if (!b) {
+        Comment b = commentMapper.findCommentById(id);
+        if (b == null) {
            throw new MyException(ResponseEnum.COMMENT_NOT_EXIST);
        }
+        if (b.getStatus() == CommentStatusEnum.DELETED.getCode()) {
+            throw new MyException(ResponseEnum.DATA_IS_DELETED);
+        }
        commentMapper.delete(id);
        return true;
    }
@@ -101,86 +95,59 @@ public class CommentServiceImpl implements CommentService {
            commentMapper.updateContent(reqBody.getContent(), reqBody.getId());
            comment.setContent(reqBody.getContent());
        }
-        if (!comment.getResponseId().equals(reqBody.getResponseId())) {
-            commentMapper.updateResponder(reqBody.getResponseId(), reqBody.getId());
-            comment.setResponseId(reqBody.getResponseId());
+        return ModalTrans.comment(comment);
    }
-        return trans(comment);
-    }
-

    @Override
-    public PageInfo<CommentModel> retrievePage(Boolean isComment, int page, int count) {
+    public PageData<CommentModel> retrievePage(String pagePath, int page, int count) {
        PageHelper.startPage(page, count);
-        List<Comment> commentList = commentMapper.findAllByType(isComment);
-        return pageTrans(commentList);
+        List<Comment> list = commentMapper.findAllByPagePathAndPidAndNormal(pagePath, -1);
+        return pageTrans(list);
    }

    @Override
    public List<CommentModel> retrievePageByPid(long pid) {
-        List<Comment> commentList = commentMapper.findAllByPId(pid);
-        List<CommentModel> modelList = new ArrayList<>();
-        commentList.forEach(m -> modelList.add(trans(m)));
-        return modelList;
+        List<Comment> allByPagePath = commentMapper.findAllByPid(pid);
+        return allByPagePath
+                .stream()
+                .filter(comment -> comment.getStatus() != CommentStatusEnum.DELETED.getCode())
+                .map(ModalTrans::comment)
+                .collect(Collectors.toList());
    }

    @Override
-    public PageInfo<CommentModel> retrievePageByArticle(long articleID, long pid, int page, int count) {
+    public PageData<CommentModel> retrievePageByAuthor(String pagePath, int page, int count) {
+        User user = redisUserUtil.get();
        PageHelper.startPage(page, count);
-        List<Comment> commentList = commentMapper.findAllByArticleIDAndPId(articleID, pid);
-        return pageTrans(commentList);
+        List<Comment> list = commentMapper.findAllByPagePathAndFromUser(pagePath, user.getId());
+        return pageTrans(list);
    }

    @Override
-    public PageInfo<CommentModel> retrievePageByTypeAndPid(Boolean isComment, int pid, int page, int count) {
+    public PageData<CommentModel> retrievePageByPageAndPid(String pagePath, long pid, int page, int count) {
        PageHelper.startPage(page, count);
-        List<Comment> commentList = commentMapper.findCommentsByTypeAndPId(isComment, pid);
-        return pageTrans(commentList);
+        List<Comment> list = commentMapper.findAllByPagePath(pagePath);
+        return pageTrans(list, true);
    }

    @Override
-    public PageInfo<CommentModel> retrievePageByAuthor(Boolean isComment, int page, int count) {
+    public PageData<CommentModel> retrievePageByPage(String pagePath, int page, int count) {
        PageHelper.startPage(page, count);
-        List<Comment> commentList = commentMapper.findAllByAuthorIDAndType(redisUserUtil.get().getId(), isComment);
-        return pageTrans(commentList);
+        List<Comment> list = commentMapper.findAllByPagePath(pagePath);
+        return pageTrans(list, true);
    }

-
-    @Override
-    public PageInfo<CommentModel> retrievePageByType(Boolean isComment, int page, int count) {
-        PageHelper.startPage(page, count);
-        List<Comment> commentList = commentMapper.findAllByType(isComment);
-        return pageTrans(commentList);
+    private PageData<CommentModel> pageTrans(List<Comment> commentList) {
+        return pageTrans(commentList, false);
    }

-    private CommentModel trans(Comment comment) {
-        CommentModel commentModel = new CommentModel();
-        commentModel.setId(comment.getId());
-        commentModel.setComment(comment.getType());
-        commentModel.setContent(comment.getContent());
-        commentModel.setArticleID(comment.getArticleID());
-        commentModel.setDate(DateFormatUtil.get(comment.getDate()));
-        commentModel.setResponseId(comment.getResponseId());
-        commentModel.setPid(comment.getPid());
-        commentModel.setAuthorName(userService.getNameById(comment.getAuthorID()));
-        commentModel.setAuthorAvatarImgUrl("http://cdn.celess.cn/" + userService.getAvatarImg(comment.getAuthorID()));
-
-        if (comment.getType() && commentModel.getArticleID() > 0) {
-            commentModel.setArticleTitle(articleMapper.getTitleById(comment.getArticleID()));
-        }
-        return commentModel;
-    }
-
-    private PageInfo<CommentModel> pageTrans(List<Comment> commentList) {
-        PageInfo p = new PageInfo(commentList);
-        List<CommentModel> modelList = new ArrayList<>();
-
-        commentList.forEach(l -> {
-            CommentModel model = trans(l);
-            model.setRespComment(this.retrievePageByPid(model.getId()));
-            modelList.add(model);
-        });
-        p.setList(modelList);
-        return p;
+    private PageData<CommentModel> pageTrans(List<Comment> commentList, boolean noResponseList) {
+        PageInfo<Comment> p = PageInfo.of(commentList);
+        List<CommentModel> modelList = commentList
+                .stream()
+                .map(ModalTrans::comment)
+                .peek(commentModel -> commentModel.setRespComment(this.retrievePageByPid(commentModel.getId())))
+                .collect(Collectors.toList());
+        return new PageData<>(p, modelList);
    }
 }
--- a/src/main/java/cn/celess/blog/service/serviceimpl/CountServiceImpl.java
+++ b/src/main/java/cn/celess/blog/service/serviceimpl/CountServiceImpl.java
@@ -29,7 +29,7 @@ public class CountServiceImpl implements CountService {

    @Override
    public long getCommentCount() {
-        return commentMapper.countByType(true);
+        return commentMapper.count();
    }

    @Override
@@ -47,11 +47,6 @@ public class CountServiceImpl implements CountService {
        return tagMapper.count();
    }

-    @Override
-    public long getLeaveMessageCount() {
-        return commentMapper.countByType(false);
-    }
-
    @Override
    public long getUserCount() {
        return userMapper.count();
--- a/src/main/java/cn/celess/blog/service/serviceimpl/PartnerSiteServiceImpl.java
+++ b/src/main/java/cn/celess/blog/service/serviceimpl/PartnerSiteServiceImpl.java
@@ -2,18 +2,30 @@ package cn.celess.blog.service.serviceimpl;

 import cn.celess.blog.enmu.ResponseEnum;
 import cn.celess.blog.entity.PartnerSite;
+import cn.celess.blog.entity.model.PageData;
+import cn.celess.blog.entity.request.LinkApplyReq;
 import cn.celess.blog.entity.request.LinkReq;
 import cn.celess.blog.exception.MyException;
 import cn.celess.blog.mapper.PartnerMapper;
+import cn.celess.blog.service.MailService;
 import cn.celess.blog.service.PartnerSiteService;
+import cn.celess.blog.util.HttpUtil;
+import cn.celess.blog.util.RedisUtil;
 import cn.celess.blog.util.RegexUtil;
+import com.alibaba.druid.util.StringUtils;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import lombok.SneakyThrows;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.mail.SimpleMailMessage;
 import org.springframework.stereotype.Service;

+import java.util.Date;
 import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;

 /**
 * @author : xiaohai
@@ -23,6 +35,13 @@ import java.util.List;
 public class PartnerSiteServiceImpl implements PartnerSiteService {
    @Autowired
    PartnerMapper partnerMapper;
+    @Autowired
+    MailService mailService;
+    @Autowired
+    RedisUtil redisUtil;
+    private static final String SITE_NAME = "小海博客";
+    private static final String SITE_URL = "celess.cn";
+    private static final String SITE_EMAIL = "a@celess.cn";

    @Override
    public PartnerSite create(LinkReq reqBody) {
@@ -51,6 +70,12 @@ public class PartnerSiteServiceImpl implements PartnerSiteService {
            reqBody.setUrl("http://" + reqBody.getUrl());
        }
        BeanUtils.copyProperties(reqBody, partnerSite);
+        if (reqBody.getIconPath() == null) {
+            partnerSite.setIconPath("");
+        }
+        if (reqBody.getDesc() == null) {
+            partnerSite.setDesc("");
+        }
        partnerMapper.insert(partnerSite);
        return partnerSite;
    }
@@ -79,26 +104,125 @@ public class PartnerSiteServiceImpl implements PartnerSiteService {
        if (!reqBody.getUrl().contains("http://") && !reqBody.getUrl().contains("https://")) {
            reqBody.setUrl("http://" + reqBody.getUrl());
        }
+        if (reqBody.isOpen() != partnerSite.getOpen() && !partnerSite.getNotification() && !StringUtils.isEmpty(partnerSite.getEmail())) {
+            SimpleMailMessage smm = new SimpleMailMessage();
+            smm.setTo(partnerSite.getEmail());
+            smm.setText("您的友链申请，已通过");
+            smm.setSubject("友链申请通过");
+            smm.setSentDate(new Date());
+            mailService.send(smm);
+            partnerSite.setNotification(true);
+        }
+        BeanUtils.copyProperties(reqBody, partnerSite);
+        partnerMapper.update(partnerSite);
        partnerSite.setName(reqBody.getName());
        partnerSite.setUrl(reqBody.getUrl());
        partnerSite.setOpen(reqBody.isOpen());
-        partnerMapper.update(partnerSite);
+
        return partnerSite;
    }

    @Override
-    public PageInfo<PartnerSite> PartnerSitePages(int page, int count) {
+    public PageData<PartnerSite> partnerSitePages(int page, int count, Boolean deleted) {
        PageHelper.startPage(page, count);
-        List<PartnerSite> sitePage = partnerMapper.findAll();
-        PageInfo pageInfo = new PageInfo(sitePage);
-        return pageInfo;
+        List<PartnerSite> sitePage = partnerMapper.findAll(deleted);
+        PageInfo<PartnerSite> pageInfo = new PageInfo<PartnerSite>(sitePage);
+        return new PageData<>(pageInfo, sitePage);
    }

    @Override
    public List<PartnerSite> findAll() {
        List<PartnerSite> all = partnerMapper.findAll();
+        all.forEach(partnerSite -> partnerSite.setDelete(null));
        return all;
    }

+    @SneakyThrows
+    @Override
+    public PartnerSite apply(LinkApplyReq linkApplyReq) {
+        // 空值字段
+        if (StringUtils.isEmpty(linkApplyReq.getName())
+                || StringUtils.isEmpty(linkApplyReq.getUrl())
+                || StringUtils.isEmpty(linkApplyReq.getEmail())
+                || StringUtils.isEmpty(linkApplyReq.getLinkUrl())) {
+            throw new MyException(ResponseEnum.PARAMETERS_ERROR);
+        }
+        // 链接不合法
+        if (!RegexUtil.emailMatch(linkApplyReq.getEmail())) {
+            throw new MyException(ResponseEnum.PARAMETERS_EMAIL_ERROR);
+        }
+        if (!RegexUtil.urlMatch(linkApplyReq.getLinkUrl()) || !RegexUtil.urlMatch(linkApplyReq.getUrl())) {
+            throw new MyException(ResponseEnum.PARAMETERS_URL_ERROR);
+        }
+        if (!StringUtils.isEmpty(linkApplyReq.getIconPath()) && !RegexUtil.urlMatch(linkApplyReq.getIconPath())) {
+            throw new MyException(ResponseEnum.PARAMETERS_URL_ERROR);
+        }
+        // 非强制字段 设置空
+        if (StringUtils.isEmpty(linkApplyReq.getIconPath())) {
+            linkApplyReq.setIconPath("");
+        }
+        // 抓取页面
+        String resp = HttpUtil.getAfterRendering(linkApplyReq.getLinkUrl());
+        if (resp == null) {
+            throw new MyException(ResponseEnum.CANNOT_GET_DATA);
+        }
+        PartnerSite ps = new PartnerSite();
+        if (resp.contains(SITE_URL)) {
+            //包含站点
+            BeanUtils.copyProperties(linkApplyReq, ps);
+            ps.setNotification(false);
+            ps.setOpen(false);
+            boolean exists = partnerMapper.existsByUrl(linkApplyReq.getUrl());
+            if (!exists) {
+                partnerMapper.insert(ps);
+            } else {
+                ps.setId(partnerMapper.findByUrl(linkApplyReq.getUrl()).getId());
+            }
+            SimpleMailMessage smm = new SimpleMailMessage();
+            smm.setSubject("友链申请");
+            smm.setText("有一条友链申请" + (exists ? "，已存在的友链链接" : "") + "，[\n" + linkApplyReq.toString() + "\n]");
+            smm.setTo(SITE_EMAIL);
+            smm.setSentDate(new Date());
+            mailService.send(smm);
+        } else {
+            //  不包含站点
+            String uuid;
+            ObjectMapper mapper = new ObjectMapper();
+            if (redisUtil.hasKey(linkApplyReq.getUrl())) {
+                uuid = redisUtil.get(linkApplyReq.getUrl());
+                if (!redisUtil.hasKey(uuid)) {
+                    redisUtil.setEx(uuid, mapper.writeValueAsString(linkApplyReq), 10, TimeUnit.MINUTES);
+                }
+            } else {
+                uuid = UUID.randomUUID().toString().replaceAll("-", "");
+                redisUtil.setEx(uuid, mapper.writeValueAsString(linkApplyReq), 10, TimeUnit.MINUTES);
+                redisUtil.setEx(linkApplyReq.getUrl(), uuid, 10, TimeUnit.MINUTES);
+            }
+            throw new MyException(ResponseEnum.APPLY_LINK_NO_ADD_THIS_SITE, null, uuid);
+        }
+        return ps;
+    }

+    @SneakyThrows
+    @Override
+    public String reapply(String key) {
+        if (!redisUtil.hasKey(key)) {
+            throw new MyException(ResponseEnum.DATA_EXPIRED);
+        }
+        String s = redisUtil.get(key);
+        ObjectMapper mapper = new ObjectMapper();
+        LinkApplyReq linkApplyReq = mapper.readValue(s, LinkApplyReq.class);
+        if (linkApplyReq == null) {
+            throw new MyException(ResponseEnum.DATA_NOT_EXIST);
+        }
+        SimpleMailMessage smm = new SimpleMailMessage();
+        smm.setSubject("友链申请");
+        smm.setText("有一条未抓取到信息的友链申请，[\n" + linkApplyReq.toString() + "\n]");
+        smm.setTo(SITE_EMAIL);
+        smm.setSentDate(new Date());
+        mailService.send(smm);
+        redisUtil.delete(key);
+        redisUtil.delete(linkApplyReq.getUrl());
+        return "success";
+    }
 }
--- a/src/main/java/cn/celess/blog/service/serviceimpl/QiniuServiceImpl.java
+++ b/src/main/java/cn/celess/blog/service/serviceimpl/QiniuServiceImpl.java
@@ -21,7 +21,7 @@ import java.io.InputStream;
 */
@Service
 public class QiniuServiceImpl implements QiniuService {
-    private static Configuration cfg = new Configuration(Zone.zone2());
+    private static final Configuration cfg = new Configuration(Zone.zone2());
    private static UploadManager uploadManager;
    private static BucketManager bucketManager;
    private static Auth auth;
--- a/src/main/java/cn/celess/blog/service/serviceimpl/TagServiceImpl.java
+++ b/src/main/java/cn/celess/blog/service/serviceimpl/TagServiceImpl.java
@@ -1,21 +1,27 @@
 package cn.celess.blog.service.serviceimpl;

 import cn.celess.blog.enmu.ResponseEnum;
-import cn.celess.blog.entity.Article;
+import cn.celess.blog.entity.ArticleTag;
 import cn.celess.blog.entity.Tag;
+import cn.celess.blog.entity.model.ArticleModel;
+import cn.celess.blog.entity.model.PageData;
 import cn.celess.blog.entity.model.TagModel;
 import cn.celess.blog.exception.MyException;
 import cn.celess.blog.mapper.ArticleMapper;
+import cn.celess.blog.mapper.ArticleTagMapper;
 import cn.celess.blog.mapper.TagMapper;
 import cn.celess.blog.service.TagService;
+import cn.celess.blog.util.ModalTrans;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;

 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;

 /**
 * @author : xiaohai
@@ -29,6 +35,8 @@ public class TagServiceImpl implements TagService {
    HttpServletRequest request;
    @Autowired
    ArticleMapper articleMapper;
+    @Autowired
+    ArticleTagMapper articleTagMapper;

    @Override
    public TagModel create(String name) {
@@ -39,40 +47,19 @@ public class TagServiceImpl implements TagService {
        Tag tag = new Tag();
        tag.setName(name);
        tagMapper.insert(tag);
-        return new TagModel(tag);
-    }
-
-    @Override
-    public TagModel create(Tag tag) {
-        if (tag == null) {
-            throw new MyException(ResponseEnum.PARAMETERS_ERROR);
-        }
-        tagMapper.insert(tag);
-        return new TagModel(tag);
+        return ModalTrans.tag(tag);
    }

    @Override
+    @Transactional(rollbackFor = Exception.class)
    public boolean delete(long tagId) {
        Tag tag = tagMapper.findTagById(tagId);
        if (tag == null) {
            throw new MyException(ResponseEnum.TAG_NOT_EXIST);
        }
-        if (tag.getArticles() == null) {
-            return tagMapper.delete(tagId) == 1;
-        }
-        String[] articleArray = tag.getArticles().split(",");
-        for (int i = 0; i < articleArray.length; i++) {
-            if (articleArray[i] == null || "".equals(articleArray[i])) {
-                continue;
-            }
-            long articleID = Long.parseLong(articleArray[i]);
-            Article article = articleMapper.findArticleById(articleID);
-            if (article == null) {
-                continue;
-            }
-            article.setTagsId(article.getTagsId().replace(tagId + ",", ""));
-            articleMapper.update(article);
-        }
+        List<ArticleTag> articleByTag = articleTagMapper.findArticleByTag(tagId);
+        // 删除文章
+        articleByTag.forEach(articleTag -> articleMapper.delete(articleTag.getArticle().getId()));
        return tagMapper.delete(tagId) == 1;
    }

@@ -82,47 +69,35 @@ public class TagServiceImpl implements TagService {
        if (id == null) {
            throw new MyException(ResponseEnum.PARAMETERS_ERROR.getCode(), "缺少ID");
        }
-        Tag tagFromDB = tagMapper.findTagById(id);
-        tagFromDB.setName(name);
-
-        tagMapper.update(tagFromDB);
-        return new TagModel(tagFromDB);
+        Tag tag = tagMapper.findTagById(id);
+        tag.setName(name);
+        tagMapper.update(tag);
+        return ModalTrans.tag(tag);

    }

    @Override
-    public TagModel retrieveOneById(long tagId) {
-        Tag tag = tagMapper.findTagById(tagId);
-        if (tag == null) {
-            throw new MyException(ResponseEnum.TAG_NOT_EXIST);
-        }
-        return new TagModel(tag);
-    }
-
-    @Override
-    public TagModel retrieveOneByName(String name) {
-        Tag tag = tagMapper.findTagByName(name);
-        if (tag == null) {
-            throw new MyException(ResponseEnum.TAG_NOT_EXIST);
-        }
-        return new TagModel(tag);
-    }
-
-    @Override
-    public PageInfo<TagModel> retrievePage(int page, int count) {
+    public PageData<TagModel> retrievePage(int page, int count) {
        PageHelper.startPage(page, count);
        List<Tag> tagList = tagMapper.findAll();
-        PageInfo pageInfo = new PageInfo(tagList);
-        List<TagModel> list = new ArrayList<>();
-        tagList.forEach(e -> list.add(new TagModel(e)));
-        pageInfo.setList(list);
-        return pageInfo;
+        List<TagModel> modelList = new ArrayList<>();
+        tagList.forEach(tag -> modelList.add(ModalTrans.tag(tag)));
+        return new PageData<>(new PageInfo<>(tagList), modelList);
    }

    @Override
    public List<TagModel> findAll() {
-        List<TagModel> list = new ArrayList<>();
-        tagMapper.findAll().forEach(e -> list.add(new TagModel(e)));
-        return list;
+        return tagMapper.findAll().stream()
+                .map(ModalTrans::tag)
+                .peek(tagModel -> {
+                    List<ArticleTag> articleByTagAndOpen = articleTagMapper.findArticleByTagAndOpen(tagModel.getId());
+                    tagModel.setArticles(
+                            articleByTagAndOpen
+                                    .stream()
+                                    .map(articleTag -> ModalTrans.article(articleTag.getArticle(), true))
+                                    .collect(Collectors.toList())
+                    );
+                })
+                .collect(Collectors.toList());
    }
 }
--- a/src/main/java/cn/celess/blog/service/serviceimpl/UserServiceImpl.java
+++ b/src/main/java/cn/celess/blog/service/serviceimpl/UserServiceImpl.java
@@ -1,7 +1,11 @@
 package cn.celess.blog.service.serviceimpl;

 import cn.celess.blog.enmu.ResponseEnum;
+import cn.celess.blog.enmu.RoleEnum;
+import cn.celess.blog.enmu.UserAccountStatusEnum;
+import cn.celess.blog.entity.Response;
 import cn.celess.blog.entity.User;
+import cn.celess.blog.entity.model.PageData;
 import cn.celess.blog.entity.model.QiniuResponse;
 import cn.celess.blog.entity.model.UserModel;
 import cn.celess.blog.entity.request.LoginReq;
@@ -14,8 +18,6 @@ import cn.celess.blog.service.UserService;
 import cn.celess.blog.util.*;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,11 +27,9 @@ import org.springframework.stereotype.Service;
 import javax.servlet.http.HttpServletRequest;
 import java.beans.Transient;
 import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;

 /**
 * @author : xiaohai
@@ -74,7 +74,8 @@ public class UserServiceImpl implements UserService {
        if (userMapper.existsByEmail(email)) {
            throw new MyException(ResponseEnum.USERNAME_HAS_EXIST);
        }
-        boolean b = userMapper.addUser(email, MD5Util.getMD5(password)) == 1;
+        User user = new User(email, MD5Util.getMD5(password));
+        boolean b = userMapper.addUser(user) == 1;
        if (b) {
            String verifyId = UUID.randomUUID().toString().replaceAll("-", "");
            redisUtil.setEx(email + "-verify", verifyId, 2, TimeUnit.DAYS);
@@ -99,6 +100,16 @@ public class UserServiceImpl implements UserService {
        if (!RegexUtil.pwdMatch(loginReq.getPassword())) {
            throw new MyException(ResponseEnum.PARAMETERS_PWD_ERROR);
        }
+
+        User user = userMapper.findByEmail(loginReq.getEmail());
+        if (user == null) {
+            // 用户不存在
+            throw new MyException(ResponseEnum.USER_NOT_EXIST);
+        }
+        if (user.getStatus() != UserAccountStatusEnum.NORMAL.getCode()) {
+            throw new MyException(ResponseEnum.CAN_NOT_USE, UserAccountStatusEnum.get(user.getStatus()));
+        }
+
        //获取redis缓存中登录失败次数
        String s = redisUtil.get(loginReq.getEmail() + "-passwordWrongTime");
        if (s != null) {
@@ -106,17 +117,12 @@ public class UserServiceImpl implements UserService {
                throw new MyException(ResponseEnum.LOGIN_LATER, loginReq.getEmail());
            }
        }
-        User user = null;
-        user = userMapper.findByEmail(loginReq.getEmail());
-        String token = null;
+
+        String token;
        // 密码比对
-        if (user == null) {
-            // 用户不存在
-            throw new MyException(ResponseEnum.USER_NOT_EXIST);
-        }
        if (user.getPwd().equals(MD5Util.getMD5(loginReq.getPassword()))) {
            logger.info("====> {}  进行权限认证  状态：登录成功 <====", loginReq.getEmail());
-            userMapper.updateLoginTime(loginReq.getEmail(), new Date());
+            userMapper.updateLoginTime(loginReq.getEmail());
            redisUtil.delete(loginReq.getEmail() + "-passwordWrongTime");
            // redis 标记
            redisUserUtil.set(user, loginReq.getIsRememberMe());
@@ -137,7 +143,7 @@ public class UserServiceImpl implements UserService {
            redisUtil.setEx(loginReq.getEmail() + "-passwordWrongTime", count + "", 2, TimeUnit.HOURS);
            throw new MyException(ResponseEnum.LOGIN_FAILURE);
        }
-        UserModel trans = trans(user);
+        UserModel trans = ModalTrans.userFullInfo(user);
        trans.setToken(token);
        return trans;

@@ -164,7 +170,7 @@ public class UserServiceImpl implements UserService {

        userMapper.updateInfo(desc, displayName, user.getId());
        redisUserUtil.set(user);
-        return trans(user);
+        return ModalTrans.userFullInfo(user);
    }

    @Override
@@ -176,20 +182,6 @@ public class UserServiceImpl implements UserService {
        return role;
    }

-    @Override
-    public User getUserInfoByEmail(String email) {
-        User user = userMapper.findByEmail(email);
-        if (user == null) {
-            throw new MyException(ResponseEnum.USER_NOT_EXIST);
-        }
-        return user;
-    }
-
-    @Override
-    public String getAvatarImg(long id) {
-        return userMapper.getAvatarImgUrlById(id);
-    }
-
    @Override
    public Object updateUserAavatarImg(InputStream is, String mime) {
        User user = redisUserUtil.get();
@@ -197,13 +189,13 @@ public class UserServiceImpl implements UserService {
        user.setAvatarImgUrl(upload.key);
        userMapper.updateAvatarImgUrl(upload.key, user.getId());
        redisUserUtil.set(user);
-        return ResponseUtil.success(user.getAvatarImgUrl());
+        return Response.success(user.getAvatarImgUrl());
    }

    @Override
    public UserModel getUserInfoBySession() {
        User user = redisUserUtil.get();
-        return trans(user);
+        return ModalTrans.userFullInfo(user);
    }

    @Override
@@ -211,18 +203,6 @@ public class UserServiceImpl implements UserService {
        return userMapper.existsByEmail(email);
    }

-    @Override
-    public String getNameById(long id) {
-        String name = userMapper.getDisPlayName(id);
-        if (name == null) {
-            name = userMapper.getEmail(id);
-            if (name == null) {
-                throw new MyException(ResponseEnum.USER_NOT_EXIST);
-            }
-        }
-        return name;
-    }
-
    /**
     * 找回密码
     */
@@ -254,7 +234,6 @@ public class UserServiceImpl implements UserService {
        return "发送成功!";
    }

-    //TODO
    @Override
    public Object sendVerifyEmail(String email) {
        if (!RegexUtil.emailMatch(email)) {
@@ -336,14 +315,14 @@ public class UserServiceImpl implements UserService {

    @Override
    public Object deleteUser(Integer[] id) {
-        JSONArray status = new JSONArray();
+        List<Map<String, Object>> status = new ArrayList<>();
        if (id == null || id.length == 0) {
            return null;
        }
        for (Integer integer : id) {
            String role = userMapper.getRoleById(integer);
            int deleteResult = 0;
-            JSONObject deleteStatus = new JSONObject();
+            Map<String, Object> deleteStatus = new HashMap<>(3);
            deleteStatus.put("id", integer);
            // 管理员账户不可删
            if ("admin".equals(role)) {
@@ -366,14 +345,11 @@ public class UserServiceImpl implements UserService {
    }

    @Override
-    public PageInfo<UserModel> getUserList(Integer page, Integer count) {
+    public PageData<UserModel> getUserList(Integer page, Integer count, Integer status) {
        PageHelper.startPage(page, count);
-        List<User> all = userMapper.findAll();
-        PageInfo pageInfo = PageInfo.of(all);
-        List<UserModel> modelList = new ArrayList<>();
-        all.forEach(user -> modelList.add(trans(user)));
-        pageInfo.setList(modelList);
-        return pageInfo;
+        List<User> all = userMapper.findAll(status);
+        List<UserModel> modelList = all.stream().map(ModalTrans::userFullInfo).collect(Collectors.toList());
+        return new PageData<>(PageInfo.of(all), modelList);
    }

    @Override
@@ -402,8 +378,7 @@ public class UserServiceImpl implements UserService {
            user.setPwd(MD5Util.getMD5(userReq.getPwd()));
        }
        if (userReq.getRole() != null) {
-            // TODO:用enum存放角色分类
-            if ("user".equals(userReq.getRole()) || "admin".equals(userReq.getRole())) {
+            if (RoleEnum.USER_ROLE.getRoleName().equals(userReq.getRole()) || RoleEnum.ADMIN_ROLE.getRoleName().equals(userReq.getRole())) {
                user.setRole(userReq.getRole());
            } else {
                throw new MyException(ResponseEnum.PARAMETERS_ERROR);
@@ -413,7 +388,6 @@ public class UserServiceImpl implements UserService {
            if (!RegexUtil.emailMatch(userReq.getEmail())) {
                throw new MyException(ResponseEnum.PARAMETERS_EMAIL_ERROR);
            }
-            // TODO :: 邮件提醒
            user.setEmail(userReq.getEmail());
        }
        // 数据写入
@@ -425,7 +399,7 @@ public class UserServiceImpl implements UserService {
            redisUserUtil.set(user);
        }
        logger.info("修改了用户 [id={}] 的用户的资料", userReq.getId());
-        return trans(user);
+        return ModalTrans.userFullInfo(user);
    }

    @Override
@@ -444,19 +418,6 @@ public class UserServiceImpl implements UserService {
            throw new MyException(ResponseEnum.PWD_NOT_SAME);
        }
        userMapper.updatePwd(user.getEmail(), MD5Util.getMD5(newPwd));
-        return trans(userMapper.findByEmail(user.getEmail()));
-    }
-
-    private UserModel trans(User u) {
-        UserModel user = new UserModel();
-        user.setId(u.getId());
-        user.setAvatarImgUrl(u.getAvatarImgUrl() == null ? null : "http://cdn.celess.cn/" + u.getAvatarImgUrl());
-        user.setEmail(u.getEmail());
-        user.setDesc(u.getDesc());
-        user.setDisplayName(u.getDisplayName() == null ? u.getEmail() : u.getDisplayName());
-        user.setEmailStatus(u.getEmailStatus());
-        user.setRecentlyLandedDate(DateFormatUtil.get(u.getRecentlyLandedDate()));
-        user.setRole(u.getRole());
-        return user;
+        return ModalTrans.userFullInfo(userMapper.findByEmail(user.getEmail()));
    }
 }
--- a/src/main/java/cn/celess/blog/service/serviceimpl/VisitorServiceImpl.java
+++ b/src/main/java/cn/celess/blog/service/serviceimpl/VisitorServiceImpl.java
@@ -2,10 +2,12 @@ package cn.celess.blog.service.serviceimpl;

 import cn.celess.blog.enmu.ResponseEnum;
 import cn.celess.blog.entity.Visitor;
+import cn.celess.blog.entity.model.PageData;
 import cn.celess.blog.entity.model.VisitorModel;
 import cn.celess.blog.exception.MyException;
 import cn.celess.blog.mapper.VisitorMapper;
 import cn.celess.blog.service.VisitorService;
+import cn.celess.blog.util.AddressUtil;
 import cn.celess.blog.util.DateFormatUtil;
 import cn.celess.blog.util.RedisUtil;
 import com.github.pagehelper.PageHelper;
@@ -14,7 +16,6 @@ import eu.bitwalker.useragentutils.Browser;
 import eu.bitwalker.useragentutils.OperatingSystem;
 import eu.bitwalker.useragentutils.UserAgent;
 import eu.bitwalker.useragentutils.Version;
-import org.apache.commons.lang.time.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.json.JsonParserFactory;
 import org.springframework.stereotype.Service;
@@ -25,6 +26,8 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.concurrent.TimeUnit;

@@ -45,12 +48,10 @@ public class VisitorServiceImpl implements VisitorService {
    }

    @Override
-    public PageInfo<VisitorModel> visitorPage(int page, int count, boolean showLocation) {
+    public PageData<VisitorModel> visitorPage(int page, int count, boolean showLocation) {
        PageHelper.startPage(page, count);
        List<Visitor> visitorList = visitorMapper.findAll();
-        PageInfo pageInfo = new PageInfo(visitorList);
-        pageInfo.setList(list2List(visitorList, showLocation));
-        return pageInfo;
+        return new PageData<>(new PageInfo<>(visitorList), list2List(visitorList, showLocation));
    }

    @Override
@@ -68,8 +69,9 @@ public class VisitorServiceImpl implements VisitorService {
        visitor.setUa(request.getHeader("User-Agent"));
        //记录当日的访问
        String dayVisitCount = redisUtil.get("dayVisitCount");
-        long secondsLeftToday = 86400 - DateUtils.getFragmentInSeconds(Calendar.getInstance(), Calendar.DATE);
-        Date date = new Date(Calendar.YEAR);
+
+        LocalDateTime midnight = LocalDateTime.now().plusDays(1).withHour(0).withMinute(0).withSecond(0).withNano(0);
+        long secondsLeftToday = ChronoUnit.SECONDS.between(LocalDateTime.now(), midnight);
        if (dayVisitCount == null) {
            redisUtil.setEx("dayVisitCount", "1", secondsLeftToday, TimeUnit.SECONDS);
        } else {
@@ -150,60 +152,7 @@ public class VisitorServiceImpl implements VisitorService {
     * @return
     */
    private String getLocation(String ip) {
-        StringBuilder result = new StringBuilder();
-        URL url;
-        HttpURLConnection conn = null;
-        InputStream inputStream = null;
-        InputStreamReader inputStreamReader = null;
-        BufferedReader bufferedReader = null;
-        try {
-            url = new URL("http://ip.taobao.com/service/getIpInfo.php?ip=" + ip);
-            conn = (HttpURLConnection) url.openConnection();
-            conn.setConnectTimeout(3000);
-            conn.setDoInput(true);
-            conn.setRequestMethod("GET");
-            inputStream = conn.getInputStream();
-            inputStreamReader = new InputStreamReader(inputStream);
-            bufferedReader = new BufferedReader(inputStreamReader);
-            String tmp;
-            while ((tmp = bufferedReader.readLine()) != null) {
-                result.append(tmp);
-            }
-        } catch (Exception e) {
-            // ignore
-        } finally {
-            try {
-                if (conn != null) {
-                    conn.disconnect();
-                }
-                if (inputStream != null) {
-                    inputStream.close();
-                }
-                if (inputStreamReader != null) {
-                    inputStreamReader.close();
-                }
-                if (bufferedReader != null) {
-                    bufferedReader.close();
-                }
-            } catch (Exception e) {
-                // ignore
-            }
-        }
-        StringBuilder sb = new StringBuilder();
-        if ("".equals(result.toString())) {
-            throw new MyException(ResponseEnum.FAILURE);
-        }
-        Map<String, Object> stringObjectMap = JsonParserFactory.getJsonParser().parseMap(result.toString());
-        if ((Integer) stringObjectMap.get("code") == 0) {
-            LinkedHashMap data = (LinkedHashMap) stringObjectMap.get("data");
-            sb.append(data.get("country"))
-                    .append("-")
-                    .append(data.get("region"))
-                    .append("-")
-                    .append(data.get("city"));
-        }
-        return sb.toString();
-
+        return AddressUtil.getCityInfo(ip);
    }


--- a/src/main/java/cn/celess/blog/service/serviceimpl/WebUpdateInfoServiceImpl.java
+++ b/src/main/java/cn/celess/blog/service/serviceimpl/WebUpdateInfoServiceImpl.java
@@ -2,26 +2,27 @@ package cn.celess.blog.service.serviceimpl;

 import cn.celess.blog.enmu.ResponseEnum;
 import cn.celess.blog.entity.WebUpdate;
+import cn.celess.blog.entity.model.PageData;
 import cn.celess.blog.entity.model.WebUpdateModel;
 import cn.celess.blog.exception.MyException;
 import cn.celess.blog.mapper.WebUpdateInfoMapper;
 import cn.celess.blog.service.WebUpdateInfoService;
 import cn.celess.blog.util.DateFormatUtil;
 import cn.celess.blog.util.HttpUtil;
+import cn.celess.blog.util.ModalTrans;
+import com.alibaba.druid.util.StringUtils;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

 import java.io.IOException;
-import java.text.SimpleDateFormat;
 import java.time.Instant;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;

 /**
 * @author : xiaohai
@@ -39,11 +40,11 @@ public class WebUpdateInfoServiceImpl implements WebUpdateInfoService {
        if (info == null || info.replaceAll(" ", "").isEmpty()) {
            throw new MyException(ResponseEnum.PARAMETERS_ERROR);
        }
-        WebUpdate webUpdate = new WebUpdate(info, new Date());
+        WebUpdate webUpdate = new WebUpdate(info);
        if (webUpdateInfoMapper.insert(webUpdate) == 0) {
            throw new MyException(ResponseEnum.FAILURE);
        }
-        return trans(webUpdate);
+        return ModalTrans.webUpdate(webUpdateInfoMapper.findById(webUpdate.getId()));
    }

    @Override
@@ -65,59 +66,49 @@ public class WebUpdateInfoServiceImpl implements WebUpdateInfoService {
        }
        webUpdate.setUpdateInfo(info);
        webUpdateInfoMapper.update(id, info);
-        return trans(webUpdate);
+        return ModalTrans.webUpdate(webUpdate);
    }

    @Override
-    public PageInfo<WebUpdateModel> pages(int count, int page) {
+    public PageData<WebUpdateModel> pages(int count, int page) {
        PageHelper.startPage(page, count);
        List<WebUpdate> updateList = webUpdateInfoMapper.findAll();
-        PageInfo pageInfo = new PageInfo(updateList);
-        pageInfo.setList(list2List(updateList));
-        return pageInfo;
+        return new PageData<>(new PageInfo<>(updateList), list2List(updateList));
    }

    @Override
    public List<WebUpdateModel> findAll() {
        List<WebUpdate> all = webUpdateInfoMapper.findAll();
-        List<WebUpdateModel> webUpdateModels = new ArrayList<>();
-        for (WebUpdate w : all) {
-            webUpdateModels.add(trans(w));
-        }
-        return webUpdateModels;
+        return list2List(all);
    }

    @Override
-    public JSONObject getLastestUpdateTime() {
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("lastUpdateTime", DateFormatUtil.get(webUpdateInfoMapper.getLastestOne().getUpdateTime()));
-        jsonObject.put("lastUpdateInfo", webUpdateInfoMapper.getLastestOne().getUpdateInfo());
+
+    public Map<String, Object> getLastestUpdateTime() {
+        Map<String, Object> map = new HashMap<>();
+        map.put("lastUpdateTime", DateFormatUtil.get(webUpdateInfoMapper.getLastestOne().getUpdateTime()));
+        map.put("lastUpdateInfo", webUpdateInfoMapper.getLastestOne().getUpdateInfo());
        try {
-            JSONArray array = JSONArray.fromObject(HttpUtil.get("https://api.github.com/repos/xiaohai2271/blog-frontEnd/commits?page=1&per_page=1"));
-            JSONObject object = array.getJSONObject(0);
-            JSONObject commit = object.getJSONObject("commit");
-            jsonObject.put("lastCommit", commit.getString("message"));
-            jsonObject.put("committerAuthor", commit.getJSONObject("committer").getString("name"));
-            SimpleDateFormat sdf = new SimpleDateFormat();
-            Instant parse = Instant.parse(commit.getJSONObject("committer").getString("date"));
-            jsonObject.put("committerDate", DateFormatUtil.get(Date.from(parse)));
-            jsonObject.put("commitUrl", "https://github.com/xiaohai2271/blog-frontEnd/tree/"+object.getString("sha"));
+            ObjectMapper mapper = new ObjectMapper();
+            String respStr = HttpUtil.get("https://api.github.com/repos/xiaohai2271/blog-frontEnd/commits?page=1&per_page=1");
+            if (!StringUtils.isEmpty(respStr)) {
+                JsonNode root = mapper.readTree(respStr);
+                Iterator<JsonNode> elements = root.elements();
+                JsonNode next = elements.next();
+                JsonNode commit = next.get("commit");
+                map.put("lastCommit", commit.get("message"));
+                map.put("committerAuthor", commit.get("committer").get("name"));
+                Instant parse = Instant.parse(commit.get("committer").get("date").asText());
+                map.put("committerDate", DateFormatUtil.get(Date.from(parse)));
+                map.put("commitUrl", "https://github.com/xiaohai2271/blog-frontEnd/tree/" + next.get("sha").asText());
+            }
        } catch (IOException e) {
            log.info("网络请求失败{}", e.getMessage());
        }
-        return jsonObject;
+        return map;
    }

    private List<WebUpdateModel> list2List(List<WebUpdate> webUpdates) {
-        List<WebUpdateModel> webUpdateModels = new ArrayList<>();
-        for (WebUpdate w : webUpdates) {
-            webUpdateModels.add(trans(w));
+        return webUpdates.stream().map(ModalTrans::webUpdate).collect(Collectors.toList());
    }
-        return webUpdateModels;
-    }
-
-    private WebUpdateModel trans(WebUpdate webUpdate) {
-        return new WebUpdateModel(webUpdate.getId(), webUpdate.getUpdateInfo(), DateFormatUtil.get(webUpdate.getUpdateTime()));
-    }
-
 }
--- a/src/main/java/cn/celess/blog/util/AddressUtil.java
+++ b/src/main/java/cn/celess/blog/util/AddressUtil.java
@@ -0,0 +1,71 @@
+package cn.celess.blog.util;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.FileUtils;
+import org.lionsoul.ip2region.DataBlock;
+import org.lionsoul.ip2region.DbConfig;
+import org.lionsoul.ip2region.DbSearcher;
+import org.lionsoul.ip2region.Util;
+
+import java.io.File;
+import java.lang.reflect.Method;
+import java.util.Objects;
+
+/**
+ * @author : xiaohai
+ * @date : 2020/09/04 9:36
+ */
+
+@Slf4j
+public class AddressUtil {
+
+    public static String getCityInfo(String ip) {
+        File file;
+        try {
+            //db
+            String dbPath = AddressUtil.class.getResource("/ip2region/ip2region.db").getPath();
+            file = new File(dbPath);
+            if (!file.exists()) {
+                String tmpDir = System.getProperties().getProperty("java.io.tmpdir");
+                dbPath = tmpDir + "ip.db";
+                file = new File(dbPath);
+                FileUtils.copyInputStreamToFile(Objects.requireNonNull(AddressUtil.class.getClassLoader().getResourceAsStream("classpath:ip2region/ip2region.db")), file);
+            }
+            //查询算法
+            //B-tree
+            int algorithm = DbSearcher.BTREE_ALGORITHM;
+            try {
+                DbConfig config = new DbConfig();
+                DbSearcher searcher = new DbSearcher(config, dbPath);
+                Method method = null;
+                switch (algorithm) {
+                    case DbSearcher.BTREE_ALGORITHM:
+                        method = searcher.getClass().getMethod("btreeSearch", String.class);
+                        break;
+                    case DbSearcher.BINARY_ALGORITHM:
+                        method = searcher.getClass().getMethod("binarySearch", String.class);
+                        break;
+                    case DbSearcher.MEMORY_ALGORITYM:
+                        method = searcher.getClass().getMethod("memorySearch", String.class);
+                        break;
+                }
+
+                DataBlock dataBlock;
+                if (!Util.isIpAddress(ip)) {
+                    System.out.println("Error: Invalid ip address");
+                }
+
+                dataBlock = (DataBlock) method.invoke(searcher, ip);
+
+                return dataBlock.getRegion();
+
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return null;
+    }
+}
--- a/src/main/java/cn/celess/blog/util/HttpUtil.java
+++ b/src/main/java/cn/celess/blog/util/HttpUtil.java
@@ -1,12 +1,15 @@
 package cn.celess.blog.util;

-import java.io.BufferedReader;
+import com.gargoylesoftware.htmlunit.BrowserVersion;
+import com.gargoylesoftware.htmlunit.NicelyResynchronizingAjaxController;
+import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
+import java.util.Objects;

 /**
 * @Author: 小海
@@ -14,38 +17,34 @@ import java.nio.charset.StandardCharsets;
 * @Desc:
 */
 public class HttpUtil {
+    private static final OkHttpClient CLIENT = new OkHttpClient();

-    public static String get(String urlStr) throws IOException {
-
-        StringBuffer sb = new StringBuffer();
-
-        HttpURLConnection urlConnection = null;
-        try {
-            URL url = new URL(urlStr);
-
-            //打开http
-            urlConnection = (HttpURLConnection) url.openConnection();
-            urlConnection.setDoInput(true);
-            urlConnection.setRequestMethod("GET");
-            urlConnection.connect();
-
-            try (
-                    InputStream inputStream = urlConnection.getInputStream();
-                    InputStreamReader inputStreamReader = new InputStreamReader(inputStream, StandardCharsets.UTF_8);
-                    BufferedReader bufferedReader = new BufferedReader(inputStreamReader);
-            ) {
-                //将bufferReader的值给放到buffer里
-                String str = null;
-                while ((str = bufferedReader.readLine()) != null) {
-                    sb.append(str);
+    public static String get(String urlStr) {
+        Request request = new Request.Builder()
+                .url(urlStr)
+                .get()
+                .build();
+        try (Response response = CLIENT.newCall(request).execute()) {
+            return Objects.requireNonNull(response.body()).string();
+        } catch (IOException e) {
+            return null;
        }
    }
-        } finally {
-            //断开连接
-            if (urlConnection != null) {
-                urlConnection.disconnect();
+
+
+    public static String getAfterRendering(String url) {
+        try (final WebClient webClient = new WebClient(BrowserVersion.CHROME)) {
+            webClient.getOptions().setCssEnabled(false);
+            webClient.getOptions().setJavaScriptEnabled(true);
+            webClient.getOptions().setThrowExceptionOnFailingStatusCode(false);
+            webClient.getOptions().setThrowExceptionOnScriptError(false);
+            webClient.getOptions().setDownloadImages(false);
+            webClient.getOptions().setActiveXNative(false);
+            webClient.setAjaxController(new NicelyResynchronizingAjaxController());
+            final HtmlPage page = webClient.getPage(url);
+            return page.asXml();
+        } catch (IOException e) {
+            return null;
        }
    }
-        return sb.toString();
-    }
 }
--- a/src/main/java/cn/celess/blog/util/JwtUtil.java
+++ b/src/main/java/cn/celess/blog/util/JwtUtil.java
@@ -21,17 +21,15 @@ import java.util.Map;
@Component
@Log4j2
 public class JwtUtil {
-    private static final String CLAIM_KEY_USERNAME = "sub";
-
    /**
     * 5天(毫秒)
     */
    public static final long EXPIRATION_LONG_TIME = 432000000;
-
    /**
     * 两小时（毫秒）
     */
    public static final long EXPIRATION_SHORT_TIME = 7200000;
+    private static final String CLAIM_KEY_USERNAME = "sub";
    /**
     * JWT 秘钥需自行设置不可泄露
     */
--- a/src/main/java/cn/celess/blog/util/ModalTrans.java
+++ b/src/main/java/cn/celess/blog/util/ModalTrans.java
@@ -0,0 +1,111 @@
+package cn.celess.blog.util;
+
+import cn.celess.blog.enmu.UserAccountStatusEnum;
+import cn.celess.blog.entity.*;
+import cn.celess.blog.entity.model.*;
+import org.springframework.beans.BeanUtils;
+
+/**
+ * @Author: 小海
+ * @Date: 2020-05-24 18:04
+ * @Desc:
+ */
+public class ModalTrans {
+
+    public static ArticleModel article(Article article) {
+        if (article == null) {
+            return null;
+        }
+        ArticleModel articleModel = new ArticleModel();
+        BeanUtils.copyProperties(article, articleModel);
+        articleModel.setPublishDateFormat(DateFormatUtil.get(article.getPublishDate()));
+        articleModel.setUpdateDateFormat(DateFormatUtil.get(article.getUpdateDate()));
+        articleModel.setOriginal(article.getType());
+        articleModel.setCategory(article.getCategory().getName());
+        articleModel.setAuthor(user(article.getUser()));
+        articleModel.getTags().forEach(tag -> {
+            tag.setCategory(null);
+            tag.setDeleted(null);
+        });
+        return articleModel;
+    }
+
+
+    public static ArticleModel article(Article article, boolean noMdContent) {
+        ArticleModel article1 = article(article);
+        if (!noMdContent || article1 == null) {
+            return article1;
+        }
+        article1.setMdContent(null);
+        article1.setOpen(null);
+        return article1;
+    }
+
+    public static UserModel userFullInfo(User user) {
+        if (user == null || user.getId() == -1) {
+            return null;
+        }
+        UserModel userModel = new UserModel();
+        BeanUtils.copyProperties(user, userModel);
+        userModel.setStatus(UserAccountStatusEnum.get(user.getStatus()));
+        userModel.setAvatarImgUrl(user.getAvatarImgUrl() == null || user.getAvatarImgUrl().length() == 0 ?
+                null :
+                "http://cdn.celess.cn/" + user.getAvatarImgUrl());
+        userModel.setDisplayName(user.getDisplayName() == null ? user.getEmail() : user.getDisplayName());
+        userModel.setRecentlyLandedDate(DateFormatUtil.get(user.getRecentlyLandedDate()));
+        return userModel;
+    }
+
+    public static UserModel user(User user) {
+        UserModel model = userFullInfo(user);
+        if (model == null) {
+            return null;
+        }
+        model.setRole(null);
+        model.setEmailStatus(null);
+        return model;
+    }
+
+    public static CategoryModel category(Category category) {
+        if (category == null) {
+            return null;
+        }
+        CategoryModel model = new CategoryModel();
+        BeanUtils.copyProperties(category, model);
+        return model;
+    }
+
+
+    public static TagModel tag(Tag tag) {
+        if (tag == null) {
+            return null;
+        }
+        TagModel model = new TagModel();
+        BeanUtils.copyProperties(tag, model);
+        return model;
+    }
+
+
+    public static WebUpdateModel webUpdate(WebUpdate update) {
+        if (update == null) {
+            return null;
+        }
+        WebUpdateModel model = new WebUpdateModel();
+        model.setId(update.getId());
+        model.setInfo(update.getUpdateInfo());
+        model.setTime(DateFormatUtil.get(update.getUpdateTime()));
+        return model;
+    }
+
+    public static CommentModel comment(Comment comment) {
+        if (comment == null) {
+            return null;
+        }
+        CommentModel model = new CommentModel();
+        BeanUtils.copyProperties(comment, model);
+        model.setFromUser(user(comment.getFromUser()));
+        model.setToUser(user(comment.getToUser()));
+        model.setDate(DateFormatUtil.get(comment.getDate()));
+        return model;
+    }
+}
--- a/src/main/java/cn/celess/blog/util/RedisUserUtil.java
+++ b/src/main/java/cn/celess/blog/util/RedisUserUtil.java
@@ -3,7 +3,8 @@ package cn.celess.blog.util;
 import cn.celess.blog.enmu.ResponseEnum;
 import cn.celess.blog.entity.User;
 import cn.celess.blog.exception.MyException;
-import net.sf.json.JSONObject;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

@@ -31,24 +32,27 @@ public class RedisUserUtil {
        return user;
    }

+    @SneakyThrows
    public User getWithOutExc() {
        String token = request.getHeader("Authorization");
        if (token == null || token.isEmpty()) {
            return null;
        }
        String email = jwtUtil.getUsernameFromToken(token);
-        return (User) JSONObject.toBean(JSONObject.fromObject(redisUtil.get(email + "-login")), User.class);
+        return new ObjectMapper().readValue(redisUtil.get(email + "-login"), User.class);
    }

+    @SneakyThrows
    public User set(User user) {
        Long expire = redisUtil.getExpire(user.getEmail() + "-login");
-        redisUtil.setEx(user.getEmail() + "-login", JSONObject.fromObject(user).toString(),
+        redisUtil.setEx(user.getEmail() + "-login", new ObjectMapper().writeValueAsString(user),
                expire > 0 ? expire : JwtUtil.EXPIRATION_SHORT_TIME, TimeUnit.MILLISECONDS);
        return user;
    }

+    @SneakyThrows
    public User set(User user, boolean isRemember) {
-        redisUtil.setEx(user.getEmail() + "-login", JSONObject.fromObject(user).toString(),
+        redisUtil.setEx(user.getEmail() + "-login", new ObjectMapper().writeValueAsString(user),
                isRemember ? JwtUtil.EXPIRATION_LONG_TIME : JwtUtil.EXPIRATION_SHORT_TIME, TimeUnit.MILLISECONDS);
        request.getSession().setAttribute("email", user.getEmail());
        return user;
--- a/src/main/java/cn/celess/blog/util/RedisUtil.java
+++ b/src/main/java/cn/celess/blog/util/RedisUtil.java
@@ -20,8 +20,8 @@ import java.util.concurrent.TimeUnit;
 * Redis工具类
 *
 * @author WangFan
- * @date 2018-02-24 下午03:09:50
 * @version 1.1 (GitHub文档: https://github.com/whvcse/RedisUtil )
+ * @date 2018-02-24 下午03:09:50
 */

@Component
@@ -29,14 +29,14 @@ public class RedisUtil {
    @Autowired
    private StringRedisTemplate redisTemplate;

-    public void setRedisTemplate(StringRedisTemplate redisTemplate) {
-        this.redisTemplate = redisTemplate;
-    }
-
    public StringRedisTemplate getRedisTemplate() {
        return this.redisTemplate;
    }

+    public void setRedisTemplate(StringRedisTemplate redisTemplate) {
+        this.redisTemplate = redisTemplate;
+    }
+
    /** -------------------key相关操作--------------------- */

    /**
@@ -196,6 +196,7 @@ public class RedisUtil {

    /**
     * 设置指定 key 的值
+     *
     * @param key
     * @param value
     */
@@ -205,6 +206,7 @@ public class RedisUtil {

    /**
     * 获取指定 key 的值
+     *
     * @param key
     * @return
     */
@@ -214,6 +216,7 @@ public class RedisUtil {

    /**
     * 返回 key 中字符串值的子字符
+     *
     * @param key
     * @param start
     * @param end
@@ -259,10 +262,8 @@ public class RedisUtil {
     * 设置ASCII码, 字符串'a'的ASCII码是97, 转为二进制是'01100001', 此方法是将二进制第offset位值变为value
     *
     * @param key
-     * @param postion
-     *            位置
-     * @param value
-     *            值,true为1, false为0
+     * @param offset 位置
+     * @param value   值,true为1, false为0
     * @return
     */
    public boolean setBit(String key, long offset, boolean value) {
@@ -274,10 +275,8 @@ public class RedisUtil {
     *
     * @param key
     * @param value
-     * @param timeout
-     *            过期时间
-     * @param unit
-     *            时间单位, 天:TimeUnit.DAYS 小时:TimeUnit.HOURS 分钟:TimeUnit.MINUTES
+     * @param timeout 过期时间
+     * @param unit    时间单位, 天:TimeUnit.DAYS 小时:TimeUnit.HOURS 分钟:TimeUnit.MINUTES
     *                秒:TimeUnit.SECONDS 毫秒:TimeUnit.MILLISECONDS
     */
    public void setEx(String key, String value, long timeout, TimeUnit unit) {
@@ -289,7 +288,7 @@ public class RedisUtil {
     *
     * @param key
     * @param value
-     * @return 之前已经存在返回false,不存在返回true
+     * @return 之前已经存在返回false, 不存在返回true
     */
    public boolean setIfAbsent(String key, String value) {
        return redisTemplate.opsForValue().setIfAbsent(key, value);
@@ -300,8 +299,7 @@ public class RedisUtil {
     *
     * @param key
     * @param value
-     * @param offset
-     *            从指定位置开始覆写
+     * @param offset 从指定位置开始覆写
     */
    public void setRange(String key, String value, long offset) {
        redisTemplate.opsForValue().set(key, value, offset);
@@ -330,7 +328,7 @@ public class RedisUtil {
     * 同时设置一个或多个 key-value 对，当且仅当所有给定 key 都不存在
     *
     * @param maps
-     * @return 之前已经存在返回false,不存在返回true
+     * @return 之前已经存在返回false, 不存在返回true
     */
    public boolean multiSetIfAbsent(Map<String, String> maps) {
        return redisTemplate.opsForValue().multiSetIfAbsent(maps);
@@ -340,7 +338,7 @@ public class RedisUtil {
     * 增加(自增长), 负数则为自减
     *
     * @param key
-     * @param value
+     * @param increment
     * @return
     */
    public Long incrBy(String key, long increment) {
@@ -348,9 +346,8 @@ public class RedisUtil {
    }

    /**
-     *
     * @param key
-     * @param value
+     * @param increment
     * @return
     */
    public Double incrByFloat(String key, double increment) {
@@ -526,10 +523,8 @@ public class RedisUtil {
     * 获取列表指定范围内的元素
     *
     * @param key
-     * @param start
-     *            开始位置, 0是开始位置
-     * @param end
-     *            结束位置, -1返回所有
+     * @param start 开始位置, 0是开始位置
+     * @param end   结束位置, -1返回所有
     * @return
     */
    public List<String> lRange(String key, long start, long end) {
@@ -548,7 +543,6 @@ public class RedisUtil {
    }

    /**
-     *
     * @param key
     * @param value
     * @return
@@ -558,7 +552,6 @@ public class RedisUtil {
    }

    /**
-     *
     * @param key
     * @param value
     * @return
@@ -591,7 +584,6 @@ public class RedisUtil {
    }

    /**
-     *
     * @param key
     * @param value
     * @return
@@ -601,7 +593,6 @@ public class RedisUtil {
    }

    /**
-     *
     * @param key
     * @param value
     * @return
@@ -611,7 +602,6 @@ public class RedisUtil {
    }

    /**
-     *
     * @param key
     * @param value
     * @return
@@ -647,8 +637,7 @@ public class RedisUtil {
     * 通过索引设置列表元素的值
     *
     * @param key
-     * @param index
-     *            位置
+     * @param index 位置
     * @param value
     */
    public void lSet(String key, long index, String value) {
@@ -669,10 +658,8 @@ public class RedisUtil {
     * 移出并获取列表的第一个元素， 如果列表没有元素会阻塞列表直到等待超时或发现可弹出元素为止
     *
     * @param key
-     * @param timeout
-     *            等待时间
-     * @param unit
-     *            时间单位
+     * @param timeout 等待时间
+     * @param unit    时间单位
     * @return
     */
    public String lBLeftPop(String key, long timeout, TimeUnit unit) {
@@ -693,10 +680,8 @@ public class RedisUtil {
     * 移出并获取列表的最后一个元素， 如果列表没有元素会阻塞列表直到等待超时或发现可弹出元素为止
     *
     * @param key
-     * @param timeout
-     *            等待时间
-     * @param unit
-     *            时间单位
+     * @param timeout 等待时间
+     * @param unit    时间单位
     * @return
     */
    public String lBRightPop(String key, long timeout, TimeUnit unit) {
@@ -734,8 +719,7 @@ public class RedisUtil {
     * 删除集合中值等于value得元素
     *
     * @param key
-     * @param index
-     *            index=0, 删除所有值等于value的元素; index>0, 从头部开始删除第一个值等于value的元素;
+     * @param index index=0, 删除所有值等于value的元素; index>0, 从头部开始删除第一个值等于value的元素;
     *              index<0, 从尾部开始删除第一个值等于value的元素;
     * @param value
     * @return
@@ -981,8 +965,6 @@ public class RedisUtil {
     * 获取集合所有元素
     *
     * @param key
-     * @param otherKeys
-     * @param destKey
     * @return
     */
    public Set<String> setMembers(String key) {
@@ -1022,7 +1004,6 @@ public class RedisUtil {
    }

    /**
-     *
     * @param key
     * @param options
     * @return
@@ -1046,7 +1027,6 @@ public class RedisUtil {
    }

    /**
-     *
     * @param key
     * @param values
     * @return
@@ -1056,7 +1036,6 @@ public class RedisUtil {
    }

    /**
-     *
     * @param key
     * @param values
     * @return
@@ -1103,10 +1082,8 @@ public class RedisUtil {
     * 获取集合的元素, 从小到大排序
     *
     * @param key
-     * @param start
-     *            开始位置
-     * @param end
-     *            结束位置, -1查询所有
+     * @param start 开始位置
+     * @param end   结束位置, -1查询所有
     * @return
     */
    public Set<String> zRange(String key, long start, long end) {
@@ -1130,10 +1107,8 @@ public class RedisUtil {
     * 根据Score值查询集合元素
     *
     * @param key
-     * @param min
-     *            最小值
-     * @param max
-     *            最大值
+     * @param min 最小值
+     * @param max 最大值
     * @return
     */
    public Set<String> zRangeByScore(String key, double min, double max) {
@@ -1144,10 +1119,8 @@ public class RedisUtil {
     * 根据Score值查询集合元素, 从小到大排序
     *
     * @param key
-     * @param min
-     *            最小值
-     * @param max
-     *            最大值
+     * @param min 最小值
+     * @param max 最大值
     * @return
     */
    public Set<TypedTuple<String>> zRangeByScoreWithScores(String key,
@@ -1156,7 +1129,6 @@ public class RedisUtil {
    }

    /**
-     *
     * @param key
     * @param min
     * @param max
@@ -1224,7 +1196,6 @@ public class RedisUtil {
    }

    /**
-     *
     * @param key
     * @param min
     * @param max
@@ -1318,7 +1289,6 @@ public class RedisUtil {
    }

    /**
-     *
     * @param key
     * @param otherKeys
     * @param destKey
@@ -1359,7 +1329,6 @@ public class RedisUtil {
    }

    /**
-     *
     * @param key
     * @param options
     * @return
@@ -1370,6 +1339,7 @@ public class RedisUtil {

    /**
     * 获取Redis List 序列化
+     *
     * @param key
     * @param targetClass
     * @param <T>
--- a/src/main/java/cn/celess/blog/util/ResponseUtil.java
+++ b/src/main/java/cn/celess/blog/util/ResponseUtil.java
@@ -1,59 +0,0 @@
-package cn.celess.blog.util;
-
-import cn.celess.blog.enmu.ResponseEnum;
-import cn.celess.blog.entity.Response;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * @author : xiaohai
- * @date : 2019/03/28 15:32
- */
-@ResponseBody
-public class ResponseUtil {
-
-    /**
-     * 成功相应
-     *
-     * @param result 结果
-     * @return
-     */
-    public static Response success(Object result) {
-        Response response = new Response();
-        response.setCode(ResponseEnum.SUCCESS.getCode());
-        response.setMsg(ResponseEnum.SUCCESS.getMsg());
-        response.setDate(System.currentTimeMillis());
-        response.setResult(result);
-        return response;
-    }
-
-    /**
-     * 失败的响应
-     *
-     * @param result 结果
-     * @return
-     */
-    public static Response failure(String result) {
-        Response response = new Response();
-        response.setCode(ResponseEnum.FAILURE.getCode());
-        response.setMsg(ResponseEnum.FAILURE.getMsg());
-        response.setDate(System.currentTimeMillis());
-        response.setResult(result);
-        return response;
-    }
-
-    /**
-     * 其他的响应
-     *
-     * @param r      枚举常量
-     * @param result 结果
-     * @return
-     */
-    public static Response response(ResponseEnum r, String result) {
-        Response response = new Response();
-        response.setCode(r.getCode());
-        response.setMsg(r.getMsg());
-        response.setDate(System.currentTimeMillis());
-        response.setResult(result);
-        return response;
-    }
-}
--- a/src/main/java/cn/celess/blog/util/SitemapGenerateUtil.java
+++ b/src/main/java/cn/celess/blog/util/SitemapGenerateUtil.java
@@ -24,6 +24,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;

 /**
 * @Author: 小海
@@ -33,18 +34,28 @@ import java.util.Map;
@Component
 public class SitemapGenerateUtil {

+    @Autowired
+    ArticleMapper articleMapper;
    @Value("${sitemap.path}")
    private String path;
    private Map<String, String> urlList;

-    @Autowired
-    ArticleMapper articleMapper;
+    private static DocumentBuilder getDocumentBuilder() {
+        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        DocumentBuilder db = null;
+        try {
+            db = dbf.newDocumentBuilder();
+        } catch (ParserConfigurationException e) {
+            e.printStackTrace();
+        }
+        return db;
+    }

    @Async
    public void createSitemap() {
        initList();
        if ("".equals(path) || "classpath".equals(path)) {
-            path = System.getProperty("user.dir")+"/sitemap.xml";
+            path = System.getProperty("user.dir") + "/sitemap.xml";
        }
        File file = new File(path);
        try {
@@ -89,24 +100,12 @@ public class SitemapGenerateUtil {
        urlList.put("https://www.celess.cn", DateFormatUtil.getForXmlDate(new Date()));
        urlList.put("https://www.celess.cn/links", DateFormatUtil.getForXmlDate(new Date()));
        urlList.put("https://www.celess.cn/leaveMsg", DateFormatUtil.getForXmlDate(new Date()));
-        List<Article> articles = articleMapper.findAll();
+        List<Article> articles = articleMapper.findAll().stream().filter(article -> article.getOpen()&&!article.isDeleted()).collect(Collectors.toList());
        articles.forEach(article -> {
            urlList.put("https://www.celess.cn/article/" + article.getId(), DateFormatUtil.getForXmlDate(
                    article.getUpdateDate() == null ? article.getPublishDate() : article.getUpdateDate()));
        });
    }

-
-    private static DocumentBuilder getDocumentBuilder() {
-        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-        DocumentBuilder db = null;
-        try {
-            db = dbf.newDocumentBuilder();
-        } catch (ParserConfigurationException e) {
-            e.printStackTrace();
-        }
-        return db;
-    }
-
 }

--- a/src/main/resources/application-openSource.properties
+++ b/src/main/resources/application-openSource.properties
@@ -26,6 +26,12 @@ spring.datasource.url=
 spring.datasource.username=
 spring.datasource.password=
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.platform=mysql
+# never / always / embedded
+spring.datasource.initialization-mode=never
+spring.datasource.sql-script-encoding=utf-8
+spring.datasource.schema=classpath:sql/schema.sql
+spring.datasource.data=classpath:sql/data.sql


 ##################  mybatis  ##################
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
禾几海	0b40522e93	feat: 默认返回位置信息	2020-09-05 16:35:45 +08:00
禾几海	9026ba0732	refactor: 简化代码	2020-09-05 15:43:43 +08:00
禾几海	f5f2437fa4	refactor: 简化代码	2020-09-05 15:42:03 +08:00
禾几海	0bcca091e1	refactor: 简化代码	2020-09-04 13:02:36 +08:00
禾几海	3c69baa4ad	Merge branch 'feature-ip2region'	2020-09-04 12:29:18 +08:00
禾几海	baf5b1bbb7	feat: 添加对jdk8以上环境的支持	2020-09-04 12:23:15 +08:00
禾几海	38621bcfa4	refactor: 换用ip2region	2020-09-04 12:11:14 +08:00
禾几海	cf435a588f	refactor: 添加ip2region	2020-09-04 09:42:55 +08:00
禾几海	feab26f4f7	docs: add some badge	2020-09-01 08:30:26 +08:00
禾几海	578dbe6cc5	docs: api参数变化 - '/admin/articles' deleted 参数可缺省 - '/admin/users' status 参数可缺省 - '/admin/links' deleted 参数可缺省	2020-08-31 13:14:37 +08:00
禾几海	f3b03f4853	ci: 调整webhook地址	2020-08-31 13:06:35 +08:00
禾几海	ee85b1f175	Merge pull request #11 from xiaohai2271/dev 分离不同状态的数据	2020-08-31 13:01:09 +08:00
禾几海	925e816f7a	fix(login): 账户不存在时引发的空值异常	2020-08-31 12:47:19 +08:00
禾几海	a59bb7f231	feat(login): 非正常账户不可登录	2020-08-31 12:45:49 +08:00
禾几海	7f17c20e01	移除无效脚本	2020-08-31 10:34:34 +08:00
禾几海	6eabb3ab22	refactor: 精简代码	2020-08-31 10:10:21 +08:00
禾几海	72674f4612	test: 补单元测试	2020-08-31 10:02:12 +08:00
禾几海	9b460ff33c	feat(link): 分离不同状态的数据	2020-08-31 09:46:15 +08:00
禾几海	a26946a583	feat: 反序列化	2020-08-31 01:10:12 +08:00
禾几海	01407aba7e	feat: 分离不同状态的数据	2020-08-31 00:53:48 +08:00
禾几海	a54e04abf3	feat: 序列化	2020-08-31 00:51:01 +08:00
禾几海	450b4a40bd	feat(user): 修改status字段类型	2020-08-31 00:17:21 +08:00
禾几海	9f883d12df	feat(article): 修改参数	2020-08-30 23:45:18 +08:00
禾几海	c17b56b436	style: 修改部分代码格式	2020-08-30 14:17:34 +08:00
禾几海	b55a50d548	fix(test): 不合理的测试例	2020-08-30 14:01:19 +08:00
禾几海	4c9b193857	Merge branch 'dev'	2020-08-15 16:08:44 +08:00
禾几海	18a8c916c3	Update README.md	2020-08-15 16:07:41 +08:00
禾几海	99f2907621	Update README.md	2020-08-15 16:07:41 +08:00
禾几海	939b06d0a9	切换到jackson(#10 ) 切换到jackson	2020-08-15 16:05:39 +08:00
禾几海	a7f947a017	fix: 修复部分测试异常	2020-08-15 16:03:22 +08:00
禾几海	40e1f4d6ab	fix: 空值异常	2020-08-15 16:00:05 +08:00
禾几海	6b77655c16	style: optimize imports	2020-08-15 15:44:34 +08:00
禾几海	7ff44fd73e	Merge branch 'dev' into feature-trans2jackson	2020-08-15 15:33:04 +08:00
禾几海	c9f91bf2c1	fix(test):外键约束引发的异常，替换随机字符串的生成	2020-08-15 15:26:41 +08:00
禾几海	03fcddb971	fix(test):外键约束引发的异常，替换随机字符串的生成	2020-08-15 15:12:07 +08:00
禾几海	dc851e84a4	fix(test): 唯一索引引发的异常	2020-08-15 15:03:16 +08:00
禾几海	b34acee733	refactor: 修改当日剩余时间的计算方法	2020-08-15 15:00:07 +08:00
禾几海	d46dada23a	refactor: 替换net.sf.json为fastJson	2020-08-15 14:59:45 +08:00
禾几海	47e5030f52	refactor: 替换net.sf.json为fastJson	2020-08-15 14:39:39 +08:00
禾几海	94c9fc1c46	refactor(Test): 将测试类中随机字符串的生成提到基类中	2020-08-15 12:16:39 +08:00
禾几海	bdcfaef5f8	refactor(Test): 重构 MultipleSubmitFilter	2020-08-15 12:13:08 +08:00
禾几海	3b6439c5cf	refactor(Test): 重构 AuthorizationFilter	2020-08-15 12:10:48 +08:00
禾几海	938a051487	refactor(Test): 重构 WebUpdateInfoControllerTest	2020-08-15 12:01:41 +08:00
禾几海	a04b51a82e	refactor(Test): 重构 VisitorControllerTest	2020-08-15 11:49:19 +08:00
禾几海	ee4c4bd87e	Update README.md	2020-08-15 09:48:19 +08:00
禾几海	e70ad72523	Update README.md	2020-08-15 09:47:34 +08:00
禾几海	c466ddddea	重新配置集成测试(#9 )	2020-08-15 02:39:45 +08:00
禾几海	7257f23ef6	refactor(ci): 重新配置ci	2020-08-15 02:27:40 +08:00
禾几海	7c96151830	fix(test): 修复后台服务未开启时测试不通过的情况	2020-08-14 21:37:17 +08:00
禾几海	5a47803611	fix(test): 修改内嵌redis的启动端口	2020-08-14 21:30:40 +08:00
禾几海	af9f243a83	refactor(ci): 重新配置ci	2020-08-14 21:19:53 +08:00
禾几海	3c8abc895a	fix(mvnw): 重新生成mvnw	2020-08-14 21:06:14 +08:00
禾几海	9ffa293d24	refactor(Test): 修改上传文件到图床的实现方式	2020-08-14 17:58:08 +08:00
禾几海	d13ab4e522	add(Test): 测试的配置文件	2020-08-14 17:55:36 +08:00
禾几海	2fce2d8a1c	refactor(Test): 内嵌redis	2020-08-14 17:17:36 +08:00
禾几海	6eb7d01875	style:修改sql格式	2020-08-14 17:17:35 +08:00
禾几海	aa751dbba1	refactor(Test)：内嵌h2	2020-08-14 17:16:49 +08:00
禾几海	14ff60ecfc	Update README.md	2020-08-10 16:43:50 +08:00
禾几海	5dae647885	Merge remote-tracking branch 'origin/master'	2020-08-10 16:40:12 +08:00
禾几海	bf2abd6072	Update README.md	2020-08-10 16:39:50 +08:00
禾几海	a62b395a8a	Update LICENSE	2020-08-10 16:24:06 +08:00
禾几海	5059859ae4	Update README.md	2020-08-10 16:20:28 +08:00
禾几海	ecdbf8e21c	Add Build document	2020-08-10 16:15:43 +08:00
禾几海	c69eee7027	Add api document	2020-08-10 15:59:30 +08:00
禾几海	8e8a7c809d	修复id异常	2020-08-04 22:25:20 +08:00
禾几海	c6a97e4c5b	外键约束	2020-08-04 22:01:02 +08:00
禾几海	d50cd93e55	移动sql位置，开启初始化数据库的设置	2020-08-04 21:47:46 +08:00
禾几海	e32600d892	Update README.md	2020-08-02 11:45:44 +08:00
禾几海	d473b5931b	Update test.yml	2020-08-02 11:40:34 +08:00
禾几海	ab6f9d894d	Rename deplay.yml to build.yml	2020-08-02 11:38:34 +08:00
禾几海	49ee7c73e2	空值异常	2020-08-01 23:56:10 +08:00
禾几海	4a65df2a7d	Update deplay.yml	2020-08-01 21:46:17 +08:00
禾几海	b6c6cda4ae	Merge pull request #7 from xiaohai2271/dev 最近的一些修改	2020-08-01 21:26:45 +08:00
禾几海	a9efb1c04d	Merge pull request #6 from xiaohai2271/feature-#5 Feature #5 申请友链时自动抓取网页信息	2020-08-01 21:24:46 +08:00
禾几海	4ac430445d	remove jacoco	2020-08-01 21:09:29 +08:00
禾几海	7ac3d69da4	单元测试	2020-08-01 12:21:25 +08:00
禾几海	657a200d81	...	2020-08-01 12:21:03 +08:00
禾几海	85c3541445	修改emailService的bean	2020-08-01 12:20:44 +08:00
禾几海	c6877c2b4a	添加unique约束	2020-08-01 12:19:55 +08:00
禾几海	9e98134003	空值异常	2020-08-01 09:23:48 +08:00
禾几海	7a81d8e4ce	友链申请通过通知，数据防重	2020-08-01 01:41:17 +08:00
禾几海	1b52e27b72	reapply接口	2020-08-01 01:13:15 +08:00
禾几海	cd9d9ff0e6	...	2020-08-01 01:00:47 +08:00
禾几海	dcf44cefb6	调整，非成功响应情况下返回数据	2020-08-01 01:00:07 +08:00
禾几海	d83e4de9a3	...	2020-07-31 23:26:30 +08:00
禾几海	9c949576aa	抓取网页信息，进行数据处理	2020-07-31 23:18:05 +08:00
禾几海	85b24891be	使用htmlunit获取js渲染后的数据	2020-07-31 23:16:56 +08:00
禾几海	da95470993	修改异常	2020-07-31 21:49:05 +08:00
禾几海	3b368c92cb	修改数据库字段	2020-07-31 21:19:48 +08:00
禾几海	ad5271f740	添加请求实体，修改请求	2020-07-31 21:19:33 +08:00
禾几海	d2cf640133	调整	2020-07-31 21:19:10 +08:00
禾几海	4a2abc47cc	修改HttpUtil	2020-07-31 21:17:35 +08:00
禾几海	6b29cd39d4	修改getResponse的类型参数	2020-07-31 20:34:00 +08:00
禾几海	69da168fc1	抽离json -> Response 对象的方法	2020-07-31 20:28:37 +08:00
禾几海	f375def613	active-profiles	2020-07-25 17:32:02 +08:00
禾几海	d6cede718b	null值异常	2020-07-25 12:08:44 +08:00
禾几海	7922ea558f	调整UserController的测试类	2020-07-25 11:23:03 +08:00
禾几海	f65c96fa2d	调整TagController的测试类	2020-07-24 22:02:24 +08:00
禾几海	af43657b5b	null值异常	2020-07-24 21:09:17 +08:00
禾几海	1bfd2d713e	.	2020-07-24 21:08:49 +08:00
禾几海	ffed0d5cd0	调整LinkController的测试类	2020-07-24 21:08:40 +08:00
禾几海	b9094c1345	.	2020-07-24 20:24:34 +08:00
禾几海	e9209d1852	调整CommentController的测试类	2020-07-24 20:24:13 +08:00
禾几海	9900605e1a	.	2020-07-24 20:06:59 +08:00
禾几海	883a78e872	调整CategoryController的测试类	2020-07-24 20:06:01 +08:00
禾几海	c7016dcf5f	修改getResponse的类型参数	2020-07-24 20:05:17 +08:00
禾几海	526b73b4f8	优化提示	2020-07-24 16:47:26 +08:00
禾几海	66b2b26b15	注销导致token无效的bug	2020-07-24 16:46:35 +08:00
禾几海	f1d3a79919	...	2020-07-24 13:51:44 +08:00
禾几海	003f74f5f1	调整ArticleController的测试类	2020-07-24 13:49:18 +08:00
禾几海	2f6253c175	抽离json -> Response 对象的方法	2020-07-24 13:48:50 +08:00
禾几海	aa3ee5db72	...	2020-07-24 00:46:46 +08:00
禾几海	d340ba8218	...	2020-07-24 00:36:13 +08:00
禾几海	7be1c9dfb0	调整ArticleController的测试类	2020-07-24 00:22:40 +08:00
禾几海	b7f26cbfdb	调整测试基类	2020-07-24 00:21:55 +08:00
禾几海	d9db98849a	调整测试基类	2020-07-23 23:32:42 +08:00
禾几海	6c3645ba15	增加获取已删除数据的选项	2020-07-23 23:08:03 +08:00
禾几海	43a5e2ab2f	抽离Mock请求的方法,过渡到jackson	2020-07-23 23:02:53 +08:00
禾几海	739256424f	.	2020-07-18 16:48:04 +08:00
禾几海	3c839ad8ca	数据库建表语句和测试数据	2020-07-18 13:33:33 +08:00
禾几海	efbd5b3d72	删除逻辑	2020-07-18 13:32:50 +08:00
禾几海	5ba7e684fa	生成sitemap过滤文章	2020-07-18 12:32:42 +08:00
禾几海	f7c1726d51	添加deleted字段	2020-07-18 12:30:53 +08:00
禾几海	5504abe3e0	Other.java -> CommonController.java	2020-07-18 12:29:07 +08:00
禾几海	5aeec0cfe4	.	2020-07-11 14:14:36 +08:00
禾几海	e2fe41c2e0	换用knife4j，swaggerUI	2020-07-11 14:12:57 +08:00
禾几海	48f485b378	.	2020-07-11 10:52:24 +08:00
禾几海	6ee8fb65c3	ci	2020-07-11 10:52:13 +08:00
禾几海	de5e40e6b8	pr进行ci测试	2020-05-27 18:30:08 +08:00
禾几海	2106bf4d94	pr 的ci测试	2020-05-27 18:11:27 +08:00
禾几海	72cef158a1	异常	2020-05-27 18:07:55 +08:00
禾几海	d1f08b58c0	Merge pull request #1 from xiaohai2271/dev 调整数据库字段，优化部分接口	2020-05-27 16:45:02 +08:00
禾几海	2ef9073650	调整评论的接口	2020-05-27 16:30:17 +08:00
禾几海	260ae53c8d	调整	2020-05-27 13:28:48 +08:00
禾几海	21adedea84	IDEA代码优化	2020-05-26 14:03:46 +08:00
禾几海	7d7a0fc82d	修改对象类型	2020-05-26 14:01:27 +08:00
禾几海	4770c37f4f	修改Response	2020-05-26 14:00:17 +08:00
禾几海	450978ecd9	修改Response 的date响应字段	2020-05-26 13:59:36 +08:00
禾几海	4035c7e024	更改sql文件	2020-05-26 12:56:57 +08:00
禾几海	7aebaaa98b	.	2020-05-26 12:54:51 +08:00
禾几海	03cb04ab06	修复bug	2020-05-26 12:54:24 +08:00
禾几海	aa882406d0	Service,dao层,视图,模型修改单元测试	2020-05-26 12:34:35 +08:00
禾几海	fde9b8511c	Service层修改单元测试	2020-05-26 00:27:50 +08:00
禾几海	9582725b3a	修改单元测试	2020-05-26 00:16:09 +08:00
禾几海	2f27578bb0	dao层修改	2020-05-26 00:13:57 +08:00
禾几海	d3757c5880	dao层修改	2020-05-26 00:10:34 +08:00
禾几海	c39dac30fb	Service层修改单元测试	2020-05-26 00:10:09 +08:00
禾几海	73a1d3eadf	Service层修改单元测试	2020-05-25 23:04:41 +08:00
禾几海	4e383b6598	Service层修改单元测试	2020-05-25 22:48:57 +08:00
禾几海	030aaaca25	Service层修改单元测试	2020-05-25 22:44:18 +08:00
禾几海	d19e5b6286	Service层修改单元测试	2020-05-25 22:18:50 +08:00
禾几海	c4ed6602e7	rename method	2020-05-25 22:06:13 +08:00
禾几海	ae7d063fdd	Service层修改单元测试	2020-05-25 22:05:46 +08:00
禾几海	67a1b1faf9	Service层修改单元测试	2020-05-25 21:43:53 +08:00
禾几海	9e6868b638	dao层修改单元测试	2020-05-25 14:48:05 +08:00
禾几海	9185ff8f58	dao层修改单元测试	2020-05-25 13:50:11 +08:00
禾几海	190e1624ca	dao层修改单元测试	2020-05-25 00:20:36 +08:00
禾几海	86b6bae6e6	dao层修改单元测试	2020-05-25 00:02:26 +08:00
禾几海	0adf936085	dao层修改单元测试	2020-05-24 23:54:13 +08:00
禾几海	4f63f7b3d5	dao层修改单元测试	2020-05-24 22:54:51 +08:00
禾几海	0136435a41	dao层修改单元测试	2020-05-24 22:02:41 +08:00
禾几海	87de48b5a0	dao层修改单元测试	2020-05-24 22:00:06 +08:00
禾几海	732bbe4444	修改sql	2020-05-24 19:22:38 +08:00
禾几海	9b6293fbeb	修改查询语句	2020-05-23 13:27:30 +08:00
禾几海	bc20173084	数据表改动	2020-05-23 00:16:08 +08:00
禾几海	8b255372dd	Merge remote-tracking branch 'origin/master'	2020-05-19 19:56:02 +08:00
小海	f88bf105a9	Update README.md	2020-05-19 19:55:26 +08:00
禾几海	0e26eab2e6	Merge branch 'dev'	2020-05-18 08:36:19 +08:00
小海	778c2dba58	Update README.md	2020-05-03 22:32:48 +08:00