Merge remote-tracking branch 'origin/master'

src/main/resources/application-dev.properties

@@ -1,8 +1,8 @@
 
 #mysql配置
-spring.datasource.url=jdbc:mysql://localhost:3306/active4j_boot?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8
+spring.datasource.url=jdbc:mysql://192.168.254.123:3306/active4j_boot?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8
 spring.datasource.username=root
-spring.datasource.password=123456
+spring.datasource.password=qwer1234
 spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
 spring.datasource.validationQuery=SELECT 1