Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/club/joylink/xiannccda/config/SwaggerConfig.java
#	src/main/java/club/joylink/xiannccda/configuration/SpringSecurityConfiguration.java
#	src/main/java/club/joylink/xiannccda/controller/TestController.java
#	src/main/java/club/joylink/xiannccda/controller/advice/CommonResponseBody.java

pom.xml

@@ -23,11 +23,12 @@
   <dependencies>
     <dependency>
       <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
+      <artifactId>spring-boot-starter-security</artifactId>
     </dependency>
+
     <dependency>
       <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-security</artifactId>
+      <artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>

src/main/resources/application.yml

@@ -33,3 +33,7 @@ mybatis-plus:
     cache-enabled: false
     call-setters-on-nulls: true
     jdbc-type-for-null: 'null'
+jwt:
+  key:
+    pub: classpath:app.pub
+    prv: classpath:app.key