merge and modify config file

src/main/resources/application-dev.yml

@@ -1,10 +1,10 @@
+
 spring:
     datasource:
         type: com.alibaba.druid.pool.DruidDataSource
         druid:
             driver-class-name: com.mysql.cj.jdbc.Driver
-#            url: jdbc:mysql://59.110.212.44:3306/e_book_test?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
-            url: jdbc:mysql://59.110.212.44:3306/e_book?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+            url: jdbc:mysql://59.110.212.44:3306/e_book_test?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
             username: root
             password: HSXY1234hsxy
             initial-size: 10
@@ -42,13 +42,6 @@ spring:
         username: admin
         password: 751019
         virtualHost: /
-
-
-#    redis:
-#        host: 82.157.238.238
-#        port: 6379
-#        password: redis970104
-
 aliyun:
     oss:
         file:
@@ -63,18 +56,5 @@ aliyun:
 
         templateCode: SMS_248840040
 
-
-##多数据源的配置
-#dynamic:
-#  datasource:
-#    slave1:
-#      driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-#      url: jdbc:sqlserver://localhost:1433;DatabaseName=renren_security
-#      username: sa
-#      password: 123456
-#    slave2:
-#      driver-class-name: org.postgresql.Driver
-#      url: jdbc:postgresql://localhost:5432/renren_security
-#      username: renren
-
-#      password: 123456
+server:
+    port: 9200