Merge remote-tracking branch 'origin/master'

src/main/resources/application-dev.yml

 spring:
   datasource:
-    url: jdbc:mysql://localhost:3306/db-mcms-open?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true
-    username: root
-    password: root
+    url: jdbc:mysql://imingsoft.cn:3307/db-mcms-5.0?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true
+    username: mcms
+    password: mcms
     filters: wall,mergeStat
     type: com.alibaba.druid.pool.DruidDataSource
\ No newline at end of file