Merge branch 'release/3.0' into dev/dev_xp

# Conflicts:
#	pom.xml
#	src/main/java/com/ai/da/common/utils/SendEmailUtil.java

src/main/resources/application-dev.properties

@@ -1,5 +1,6 @@
 server.port=5567
 
+#datasource
 spring.datasource.primary.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.primary.jdbcUrl=jdbc:mysql://18.167.251.121:33008/aida?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
 spring.datasource.primary.username=aida_con
@@ -10,8 +11,6 @@ spring.datasource.secondary.jdbcUrl=jdbc:mysql://18.167.251.121:33008/attribute_
 spring.datasource.secondary.username=aida_con
 spring.datasource.secondary.password=123456
 
-
-
 #security
 spring.security.jwtSecret=JWTSECRET
 spring.security.jwtTokenHeader=Authorization