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

# Conflicts:
#	PAS/src/main/resources/application.yml

PAS/src/main/resources/application.yml

@@ -1,8 +1,8 @@
 server:
   servlet:
     context-path: /
-  port: 8879
-#sa-token:
+  port: 8877
+#  sa-token:
 #  activity-timeout: 18000
 #  token-name: token
 #  token-style: tik
@@ -20,7 +20,7 @@ spring:
       max-file-size: 1000MB
       max-request-size: 1000MB
   profiles:
-    active: dev
+    active: prod2
   jackson:
     default-property-inclusion: non_null
     serialization:
@@ -44,4 +44,4 @@ mybatis-plus:
     map-underscore-to-camel-case: true
     cache-enabled: false
   mapper-locations: classpath:mapper/*.xml
-authorUrl: http://localhost:8880
+