Merge branch 'master' into feature/admin-auth-satoken

# Conflicts:
#	src/main/java/cn/xf/basedemo/interceptor/TokenInterceptor.java
#	src/main/java/cn/xf/basedemo/service/impl/UserServiceImpl.java

pom.xml

@@ -91,6 +91,10 @@
             <artifactId>java-jwt</artifactId>
             <version>${jwt.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-crypto</artifactId>
+        </dependency>
         <!--redis连接池需要依赖-->
         <dependency>
             <groupId>org.apache.commons</groupId>