novalon/gym-manage
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完成一键登录和支付功能

Browse Source
This commit was merged in pull request #43.
This commit is contained in:
future
2026-06-28 14:47:42 +08:00
parent 35e7532f1b
commit fc48db071e
77 changed files with 4816 additions and 686 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gym-manage-api/gym-auth/src/main/java/cn/novalon/gym/manage/auth/config/DCloudUniverifyConfig.java
+18
View File
@@ -0,0 +1,18 @@
package cn.novalon.gym.manage.auth.config;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
@Data
@Configuration
@ConfigurationProperties(prefix = "dcloud.univerify")
public class DCloudUniverifyConfig {
private String appid;
private String appkey;
private String apiSecret;
private String apiUrl = "https://developer.dcloud.net.cn/api/client/univerify/getPhoneNumber";
private String proxyHost;
private Integer proxyPort;
private Integer timeout = 10000;
}
gym-manage-api/gym-auth/src/main/java/cn/novalon/gym/manage/auth/dto/PhoneLoginDto.java
+2 -7
View File
@@ -1,25 +1,20 @@
package cn.novalon.gym.manage.auth.dto;
import jakarta.validation.constraints.NotBlank;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* 手机号一键登录请求DTO
* uniapp官方一键登录流程：前端通过云函数获取access_token和openid传给后端换取手机号
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class PhoneLoginDto {
@NotBlank(message = "access_token不能为空")
private String phone;
private String accessToken;
@NotBlank(message = "openid不能为空")
private String openid;
private String nickname;
gym-manage-api/gym-auth/src/main/java/cn/novalon/gym/manage/auth/service/impl/PhoneAuthServiceImpl.java
+83 -42
View File
@@ -1,5 +1,6 @@
package cn.novalon.gym.manage.auth.service.impl;
import cn.novalon.gym.manage.auth.config.DCloudUniverifyConfig;
import cn.novalon.gym.manage.auth.config.SmsProperties;
import cn.novalon.gym.manage.auth.dto.PhoneCodeLoginDto;
import cn.novalon.gym.manage.auth.dto.PhoneLoginDto;
@@ -16,22 +17,19 @@ import cn.novalon.gym.manage.member.util.AesUtil;
import cn.novalon.gym.manage.member.util.EsSyncUtils;
import cn.novalon.gym.manage.member.util.MemberNoGenerator;
import cn.novalon.gym.manage.sys.security.JwtTokenProvider;
import com.aliyuncs.DefaultAcsClient;
import com.aliyuncs.IAcsClient;
import com.aliyuncs.dypnsapi.model.v20170525.GetMobileRequest;
import com.aliyuncs.dypnsapi.model.v20170525.GetMobileResponse;
import com.aliyuncs.exceptions.ClientException;
import com.aliyuncs.exceptions.ServerException;
import com.aliyuncs.profile.DefaultProfile;
import jakarta.annotation.PostConstruct;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Service;
import org.springframework.web.reactive.function.client.WebClient;
import reactor.core.publisher.Mono;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Slf4j
@Service
@@ -44,32 +42,41 @@ public class PhoneAuthServiceImpl implements PhoneAuthService {
private final JwtTokenProvider jwtTokenProvider;
private final SmsService smsService;
private final SmsProperties smsProperties;
private final DCloudUniverifyConfig dCloudUniverifyConfig;
private WebClient webClient;
private EsSyncUtils.EntitySyncer<Member, MemberES, String> memberSyncer;
@PostConstruct
public void init() {
this.memberSyncer = esSyncUtils.bind(Member.class, MemberES.class, memberESRepository);
this.webClient = WebClient.builder()
.baseUrl(dCloudUniverifyConfig.getApiUrl())
.defaultHeader("Content-Type", MediaType.APPLICATION_JSON_VALUE)
.build();
}
@Override
public Mono<PhoneLoginVO> oneClickLogin(PhoneLoginDto request) {
log.info("手机号一键登录请求, accessToken: {}, openid: {}", request.getAccessToken(), request.getOpenid());
log.info("手机号一键登录请求, phone: {}, accessToken: {}, openid: {}", request.getPhone(), request.getAccessToken(), request.getOpenid());
return Mono.fromCallable(() -> getPhoneByToken(request.getAccessToken(), request.getOpenid()))
if (request.getPhone() != null && !request.getPhone().isEmpty()) {
log.info("直接使用手机号登录");
String encryptedPhone = encryptPhone(request.getPhone());
return processPhoneLogin(encryptedPhone, request);
}
if (request.getAccessToken() == null || request.getAccessToken().isEmpty()) {
log.error("一键登录失败: accessToken为空");
return Mono.error(new SystemException(ErrorCode.AUTH_PHONE_ERROR, "登录凭证无效，请重试"));
}
return getPhoneByDcloudApi(request.getAccessToken(), request.getOpenid())
.flatMap(phone -> {
log.info("通过access_token获取手机号成功: {}", maskPhone(phone));
String encryptedPhone = encryptPhone(phone);
return memberRepository.findByPhone(encryptedPhone)
.flatMap(existingMember -> {
log.info("手机号已注册，直接登录, memberId: {}", existingMember.getId());
return doLogin(existingMember, false, request);
})
.switchIfEmpty(Mono.defer(() -> {
log.info("手机号未注册，创建新会员");
return createNewMemberAndLogin(request, encryptedPhone);
}));
return processPhoneLogin(encryptedPhone, request);
})
.onErrorResume(e -> {
log.error("一键登录失败", e);
@@ -77,30 +84,64 @@ public class PhoneAuthServiceImpl implements PhoneAuthService {
});
}
/**
* 通过access_token和openid获取手机号
* 使用阿里云DYPNS API
*/
private String getPhoneByToken(String accessToken, String openid) throws Exception {
DefaultProfile profile = DefaultProfile.getProfile("cn-hangzhou", smsProperties.getAccessKeyId(), smsProperties.getAccessKeySecret());
IAcsClient client = new DefaultAcsClient(profile);
GetMobileRequest request = new GetMobileRequest();
request.setAccessToken(accessToken);
private Mono<PhoneLoginVO> processPhoneLogin(String encryptedPhone, PhoneLoginDto request) {
return memberRepository.findByPhone(encryptedPhone)
.flatMap(existingMember -> {
log.info("手机号已注册，直接登录, memberId: {}", existingMember.getId());
return doLogin(existingMember, false, request);
})
.switchIfEmpty(Mono.defer(() -> {
log.info("手机号未注册，创建新会员");
return createNewMemberAndLogin(request, encryptedPhone);
}));
}
try {
GetMobileResponse response = client.getAcsResponse(request);
if ("OK".equals(response.getCode())) {
return response.getGetMobileResultDTO().getMobile();
}
log.warn("DYPNS API返回错误: code={}, message={}", response.getCode(), response.getMessage());
throw new SystemException(ErrorCode.AUTH_PHONE_ERROR, "手机号获取失败: " + response.getMessage());
} catch (ServerException e) {
log.error("阿里云DYPNS API服务端异常", e);
throw new SystemException(ErrorCode.AUTH_PHONE_ERROR, "手机号获取失败");
} catch (ClientException e) {
log.error("阿里云DYPNS API客户端异常", e);
throw new SystemException(ErrorCode.AUTH_PHONE_ERROR, "手机号获取失败");
}
private Mono<String> getPhoneByDcloudApi(String accessToken, String openid) {
Map<String, String> requestBody = new HashMap<>();
requestBody.put("appid", dCloudUniverifyConfig.getAppid());
requestBody.put("appkey", dCloudUniverifyConfig.getAppkey());
requestBody.put("apiSecret", dCloudUniverifyConfig.getApiSecret());
requestBody.put("access_token", accessToken);
requestBody.put("openid", openid);
log.info("调用DCloud Univerify API, params: {}", requestBody);
return webClient.post()
.bodyValue(requestBody)
.retrieve()
.bodyToMono(Map.class)
.flatMap(response -> {
log.info("DCloud API响应: {}", response);
Integer code = (Integer) response.get("code");
Boolean success = (Boolean) response.get("success");
if ((code != null && code == 0) || (success != null && success)) {
Map<String, Object> data = (Map<String, Object>) response.get("data");
if (data != null) {
String phoneNumber = (String) data.get("phoneNumber");
if (phoneNumber != null && !phoneNumber.isEmpty()) {
return Mono.just(phoneNumber);
}
}
String phoneNumber = (String) response.get("phoneNumber");
if (phoneNumber != null && !phoneNumber.isEmpty()) {
return Mono.just(phoneNumber);
}
String phone = (String) response.get("phone");
if (phone != null && !phone.isEmpty()) {
return Mono.just(phone);
}
}
String message = (String) response.get("message");
log.warn("DCloud API返回错误: code={}, success={}, message={}", code, success, message);
return Mono.error(new SystemException(ErrorCode.AUTH_PHONE_ERROR, "手机号获取失败: " + message));
})
.onErrorResume(e -> {
log.error("调用DCloud API失败", e);
return Mono.error(new SystemException(ErrorCode.AUTH_PHONE_ERROR, "手机号获取失败: " + e.getMessage()));
});
}
/**