ws优化
This commit is contained in:
@@ -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();
|
||||
}
|
||||
|
||||
@@ -1854,82 +1854,82 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
|
||||
log.info("邮箱绑定更改完成，用户id:{}，新邮箱：{}", accountId, newMailbox);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String googleCallback(String code, HttpSession session) {
|
||||
try {
|
||||
log.info("code:" + code);
|
||||
// 使用 code 获取 Google 用户信息
|
||||
GoogleUser googleUser = getGoogleUserFromCode(code);
|
||||
log.info("googleUser:" + JSON.toJSONString(googleUser));
|
||||
|
||||
// 检查数据库中是否已有该用户
|
||||
// QueryWrapper<AccountExtend> qw = new QueryWrapper<>();
|
||||
// qw.lambda().eq(AccountExtend::getAuth, googleUser.getId());
|
||||
// List<AccountExtend> accountExtends = accountExtendMapper.selectList(qw);
|
||||
// Account existingUser = findUserByGoogleId(googleUser.getId());
|
||||
return "Login successful";
|
||||
// if (CollectionUtil.isNotEmpty(accountExtends)) {
|
||||
// // 用户已存在，直接登录
|
||||
//// session.setAttribute("user", existingUser);
|
||||
// return "Login successful";
|
||||
// } else {
|
||||
// // 用户不存在，创建新用户（自动注册）
|
||||
//// User newUser = googleAuthService.registerNewUser(googleUser);
|
||||
//// session.setAttribute("user", newUser);
|
||||
// return "Registration and login successful";
|
||||
// }
|
||||
} catch (Exception e) {
|
||||
return "Error processing Google login: " + e.getMessage();
|
||||
}
|
||||
}
|
||||
|
||||
private static final String TOKEN_URL = "https://oauth2.googleapis.com/token";
|
||||
private static final String USER_INFO_URL = "https://www.googleapis.com/oauth2/v3/userinfo";
|
||||
private static final String CLIENT_ID = "194770296147-njd68pm7tnapgonkj2h48mhf63n15n3f.apps.googleusercontent.com";
|
||||
private static final String CLIENT_SECRET = "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";
|
||||
private static final String REDIRECT_URI = "https://develop.api.aida.com.hk/api/third/party/auth/google_callback";
|
||||
|
||||
public GoogleUser getGoogleUserFromCode(String code) {
|
||||
// Step 1: Exchange code for access_token
|
||||
String accessToken = getAccessToken(code);
|
||||
log.info("accessToken" + accessToken);
|
||||
|
||||
// Step 2: Use access_token to get Google User info
|
||||
return getGoogleUserInfo(accessToken);
|
||||
}
|
||||
|
||||
private String getAccessToken(String code) {
|
||||
RestTemplate restTemplate = new RestTemplate();
|
||||
Map<String, String> params = new HashMap<>();
|
||||
params.put("client_id", CLIENT_ID);
|
||||
params.put("client_secret", CLIENT_SECRET);
|
||||
params.put("redirect_uri", REDIRECT_URI);
|
||||
params.put("grant_type", "authorization_code");
|
||||
params.put("code", code);
|
||||
|
||||
// 使用 RestTemplate 发起请求以获取 access_token
|
||||
GoogleTokenResponse response = restTemplate.postForObject(TOKEN_URL, params, GoogleTokenResponse.class);
|
||||
return response.getAccessToken();
|
||||
}
|
||||
|
||||
private GoogleUser getGoogleUserInfo(String accessToken) {
|
||||
RestTemplate restTemplate = new RestTemplate();
|
||||
String url = USER_INFO_URL + "?access_token=" + accessToken;
|
||||
return restTemplate.getForObject(url, GoogleUser.class);
|
||||
}
|
||||
|
||||
// public User findUserByGoogleId(String googleId) {
|
||||
// // 从数据库中根据 Google ID 查找用户
|
||||
// return userRepository.findByGoogleId(googleId);
|
||||
// @Override
|
||||
// public String googleCallback(String code, HttpSession session) {
|
||||
// try {
|
||||
// log.info("code:" + code);
|
||||
// // 使用 code 获取 Google 用户信息
|
||||
// GoogleUser googleUser = getGoogleUserFromCode(code);
|
||||
// log.info("googleUser:" + JSON.toJSONString(googleUser));
|
||||
//
|
||||
// // 检查数据库中是否已有该用户
|
||||
//// QueryWrapper<AccountExtend> qw = new QueryWrapper<>();
|
||||
//// qw.lambda().eq(AccountExtend::getAuth, googleUser.getId());
|
||||
//// List<AccountExtend> accountExtends = accountExtendMapper.selectList(qw);
|
||||
//// Account existingUser = findUserByGoogleId(googleUser.getId());
|
||||
// return "Login successful";
|
||||
//// if (CollectionUtil.isNotEmpty(accountExtends)) {
|
||||
//// // 用户已存在，直接登录
|
||||
////// session.setAttribute("user", existingUser);
|
||||
//// return "Login successful";
|
||||
//// } else {
|
||||
//// // 用户不存在，创建新用户（自动注册）
|
||||
////// User newUser = googleAuthService.registerNewUser(googleUser);
|
||||
////// session.setAttribute("user", newUser);
|
||||
//// return "Registration and login successful";
|
||||
//// }
|
||||
// } catch (Exception e) {
|
||||
// return "Error processing Google login: " + e.getMessage();
|
||||
// }
|
||||
// }
|
||||
|
||||
// public User registerNewUser(GoogleUser googleUser) {
|
||||
// // 创建并保存新用户
|
||||
// User newUser = new User();
|
||||
// newUser.setGoogleId(googleUser.getId());
|
||||
// newUser.setEmail(googleUser.getEmail());
|
||||
// newUser.setUsername(googleUser.getName());
|
||||
// return userRepository.save(newUser);
|
||||
//
|
||||
// private static final String TOKEN_URL = "https://oauth2.googleapis.com/token";
|
||||
// private static final String USER_INFO_URL = "https://www.googleapis.com/oauth2/v3/userinfo";
|
||||
// private static final String CLIENT_ID = "194770296147-njd68pm7tnapgonkj2h48mhf63n15n3f.apps.googleusercontent.com";
|
||||
// private static final String CLIENT_SECRET = "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";
|
||||
// private static final String REDIRECT_URI = "https://develop.api.aida.com.hk/api/third/party/auth/google_callback";
|
||||
//
|
||||
// public GoogleUser getGoogleUserFromCode(String code) {
|
||||
// // Step 1: Exchange code for access_token
|
||||
// String accessToken = getAccessToken(code);
|
||||
// log.info("accessToken" + accessToken);
|
||||
//
|
||||
// // Step 2: Use access_token to get Google User info
|
||||
// return getGoogleUserInfo(accessToken);
|
||||
// }
|
||||
//
|
||||
// private String getAccessToken(String code) {
|
||||
// RestTemplate restTemplate = new RestTemplate();
|
||||
// Map<String, String> params = new HashMap<>();
|
||||
// params.put("client_id", CLIENT_ID);
|
||||
// params.put("client_secret", CLIENT_SECRET);
|
||||
// params.put("redirect_uri", REDIRECT_URI);
|
||||
// params.put("grant_type", "authorization_code");
|
||||
// params.put("code", code);
|
||||
//
|
||||
// // 使用 RestTemplate 发起请求以获取 access_token
|
||||
// GoogleTokenResponse response = restTemplate.postForObject(TOKEN_URL, params, GoogleTokenResponse.class);
|
||||
// return response.getAccessToken();
|
||||
// }
|
||||
//
|
||||
// private GoogleUser getGoogleUserInfo(String accessToken) {
|
||||
// RestTemplate restTemplate = new RestTemplate();
|
||||
// String url = USER_INFO_URL + "?access_token=" + accessToken;
|
||||
// return restTemplate.getForObject(url, GoogleUser.class);
|
||||
// }
|
||||
//
|
||||
//// public User findUserByGoogleId(String googleId) {
|
||||
//// // 从数据库中根据 Google ID 查找用户
|
||||
//// return userRepository.findByGoogleId(googleId);
|
||||
//// }
|
||||
//
|
||||
//// public User registerNewUser(GoogleUser googleUser) {
|
||||
//// // 创建并保存新用户
|
||||
//// User newUser = new User();
|
||||
//// newUser.setGoogleId(googleUser.getId());
|
||||
//// newUser.setEmail(googleUser.getEmail());
|
||||
//// newUser.setUsername(googleUser.getName());
|
||||
//// return userRepository.save(newUser);
|
||||
//// }
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user