Merge branch 'release/3.0' into dev/dev

# Conflicts:
#	src/main/java/com/ai/da/common/security/filter/AuthenticationFilter.java
#	src/main/java/com/ai/da/controller/ThirdPartyController.java
#	src/main/java/com/ai/da/service/AccountService.java
#	src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
This commit is contained in:
shahaibo
2024-09-29 17:56:49 +08:00
6 changed files with 296 additions and 33 deletions

View File

@@ -168,8 +168,6 @@ public interface AccountService extends IService<Account> {
void registerUserToVisitor();
String updateNoLoginRequiredNew(NoLoginRequiredDTO noLoginRequiredDTO, HttpServletRequest request);
Map<String, Long> getNicknameModifyTimes();
void editUserName(String newUserName);
@@ -179,4 +177,6 @@ public interface AccountService extends IService<Account> {
void changeUserEmail(String newMailbox);
void activateNewEmail(String token);
String updateNoLoginRequiredNew(NoLoginRequiredDTO noLoginRequiredDTO, HttpServletRequest request);
}