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

pom.xml

@@ -116,18 +116,12 @@
             <artifactId>lombok</artifactId>
             <optional>true</optional>
         </dependency>
-
+        <!--    修改后的jwt -->
-        <!--    修改后的jjwt -->
       <dependency>
-            <groupId>jsonwebtoken</groupId>
-            <artifactId>habook-jjwt</artifactId>
-            <version>0.0.1</version>
-        </dependency>
-      <!--<dependency>
             <groupId>io.jsonwebtoken</groupId>
             <artifactId>jjwt</artifactId>
             <version>0.9.1</version>
-        </dependency>-->
+        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>