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

Merge branch 'refs/heads/dev/dev' into dev/dev_xp

Browse Source
This commit is contained in:
xupei
2024-11-19 17:09:36 +08:00
parent 4d756d5624 74e6d5a1da
commit 2ea19dcf03
18 changed files with 274 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/ai/da/controller/ConvenientInquiryController.java
View File

@@ -122,14 +122,16 @@ public class ConvenientInquiryController {
@ApiOperation("试用用户到正式用户的转化率")
@GetMapping("/conversionRate")
public Response<Map<String, Float>> conversionRate() {
return Response.success(convenientInquiryService.conversionRate());
public Response<Map<String, Object>> conversionRate(@ApiParam(value = "startTime") @RequestParam(required = false) @Nullable String startTime,
@ApiParam(value = "endTime") @RequestParam(required = false) @Nullable String endTime) {
return Response.success(convenientInquiryService.conversionRate(startTime, endTime));
}
@ApiOperation("试用用户国家/城市分布")
@GetMapping("/trialUserCountry")
public Response<Map<String, List<Object>>> trialUserCountry() {
return Response.success(convenientInquiryService.trialUserCountry());
public Response<Map<String, List<Object>>> trialUserCountry(@ApiParam(value = "startTime") @RequestParam(required = false) @Nullable String startTime,
@ApiParam(value = "endTime") @RequestParam(required = false) @Nullable String endTime) {
return Response.success(convenientInquiryService.trialUserCountry(startTime, endTime));
}
@ApiOperation("添加用户")

7
src/main/java/com/ai/da/controller/ThirdPartyController.java
View File

@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import javax.validation.Valid;
import java.security.cert.X509Certificate;
@@ -114,4 +115,10 @@ public class ThirdPartyController {
public Response<String> updateNoLoginRequiredNew(@RequestBody NoLoginRequiredDTO noLoginRequiredDTO, HttpServletRequest request) {
return Response.success(accountService.updateNoLoginRequiredNew(noLoginRequiredDTO, request));
}
@CrossOrigin
@GetMapping("/auth/google_callback")
public Response<String> googleCallback(@RequestParam("code") String code, HttpSession session) {
return Response.success(accountService.googleCallback(code, session));
}
}