Merge remote-tracking branch 'origin/release/3.0' into test/stable

# Conflicts:
#	src/main/resources/application-prod.properties

src/main/resources/application-prod.properties

@@ -1,10 +1,11 @@
-server.port=5566
+server.port=5567
 
 #datasource
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.url=jdbc:mysql://18.167.251.121:3306/aida?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
 spring.datasource.username=root
 spring.datasource.password=QWa998345
+#spring.datasource.password=QWa998345
 
 #security
 spring.security.jwtSecret=JWTSECRET