From ea4cd297230c37bde59de4f1cf441c258232f7c2 Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Thu, 28 Nov 2024 17:26:53 +0800
Subject: [PATCH] to dev

---
 .../com/ai/da/controller/ThirdPartyController.java     | 10 +++++-----
 src/main/java/com/ai/da/service/AccountService.java    |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/ai/da/controller/ThirdPartyController.java b/src/main/java/com/ai/da/controller/ThirdPartyController.java
index b8d3ebbc..e077fa8c 100644
--- a/src/main/java/com/ai/da/controller/ThirdPartyController.java
+++ b/src/main/java/com/ai/da/controller/ThirdPartyController.java
@@ -116,9 +116,9 @@ public class ThirdPartyController {
         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));
-//    }
+    @CrossOrigin
+    @GetMapping("/auth/google_callback")
+    public Response<String> googleCallback(@RequestParam("code") String code, HttpSession session) {
+        return Response.success(accountService.googleCallback(code, session));
+    }
 }
diff --git a/src/main/java/com/ai/da/service/AccountService.java b/src/main/java/com/ai/da/service/AccountService.java
index 276c5645..bd9c99b4 100644
--- a/src/main/java/com/ai/da/service/AccountService.java
+++ b/src/main/java/com/ai/da/service/AccountService.java
@@ -183,7 +183,7 @@ public interface AccountService extends IService<Account> {
 
     void halfPricePromotion();
 
-//    String googleCallback(String code, HttpSession session);
+    String googleCallback(String code, HttpSession session);
 
     List<String> getPaidCustomerEmail();
 }