Merge remote-tracking branch 'origin/master'

platform-rest/src/main/resources/application-test.yml

@@ -18,7 +18,7 @@ spring:
     name: platform-rest
   redis:
     password:
-    port: 6397
+    port: 6379
     host: localhost
     database: 4
   jpa: