Merge remote-tracking branch 'origin/master'

web/src/main/resources/application-test.yml

@@ -1,30 +1,21 @@
 server:
-  port: 8086
+  port: 8080
   servlet:
     context-path: /campus-admission-server
 
 spring:
   datasource:
-    url: jdbc:log4jdbc:mysql://47.92.161.104:3306/campus_admission?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+    url: jdbc:log4jdbc:mysql://mysql57:3306/campus_admission?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
     username: root
-    password: jpsoft2016
+    password: jpsoft8121234
   devtools:
     restart:
       enabled: true
   redis:
     # Redis数据库索引（默认为0）
-    database: 5
+    database: 7
     # Redis服务器地址
-    host: 127.0.0.1
-    # Redis服务器连接端口
-    port: 6379
-    password:
+    host: myredis
 logger:
   level: WARN
   dir: E:/logs/campus-admission-server/
-
-springfox:
-  documentation:
-    swagger:
-      v2:
-        host: g9s9tv.natappfree.cc