aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev/3.1_release_merge' into dev-ltx

Browse Source 
# Conflicts:
#	src/main/java/com/ai/da/controller/GlobalAwardController.java
#	src/main/java/com/ai/da/model/dto/ContestantDTO.java
#	src/main/resources/application-dev.properties
#	src/main/resources/application-prod.properties
This commit is contained in:
litianxiang
2026-01-20 16:20:41 +08:00
parent 46d61cb73f 08f20fd1fe
commit 40518cab37
13 changed files with 204 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/ai/da/controller/GlobalAwardController.java
View File

@@ -2,6 +2,8 @@ package com.ai.da.controller;
import com.ai.da.common.response.Response;
import com.ai.da.model.dto.*;
import com.ai.da.model.dto.ContestantDTO;
import com.ai.da.model.vo.CheckOTPVO;
import com.ai.da.service.GlobalAwardService;
import com.ai.da.service.upload.UploadService;
import com.ai.da.service.upload.UploadTask;
@@ -145,6 +147,18 @@ public class GlobalAwardController {
ContestantDTO dto = globalAwardService.getContestantByEmail(email);
return Response.success(dto);
}
@GetMapping("/checkEmail")
public Response<String> checkEmail(@RequestParam("email") String email) {
globalAwardService.checkEmail(email);
return Response.success();
}
@GetMapping("/checkCode")
public Response<CheckOTPVO> checkOTP(@RequestParam("email") String email, @RequestParam("code") String code) {
return Response.success(globalAwardService.checkOTP(email, code));
}
}