Pre Merge pull request !143 from 尹先生/master-jdk17

pull/143/MERGE
尹先生 2024-10-07 08:27:02 +00:00 committed by Gitee
commit 8ad5e3a8b1
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 17 additions and 26 deletions

View File

@ -35,7 +35,11 @@
<artifactId>yudao-module-infra-api</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>cn.iocoder.cloud</groupId>
<artifactId>yudao-module-member-api</artifactId>
<version>${revision}</version>
</dependency>
<!-- 业务组件 -->
<dependency>
<groupId>cn.iocoder.cloud</groupId>

View File

@ -3,10 +3,11 @@ package cn.iocoder.yudao.module.system.framework.rpc.config;
import cn.iocoder.yudao.module.infra.api.config.ConfigApi;
import cn.iocoder.yudao.module.infra.api.file.FileApi;
import cn.iocoder.yudao.module.infra.api.websocket.WebSocketSenderApi;
import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.context.annotation.Configuration;
@Configuration(proxyBeanMethods = false)
@EnableFeignClients(clients = {FileApi.class, WebSocketSenderApi.class, ConfigApi.class})
@EnableFeignClients(clients = {FileApi.class, WebSocketSenderApi.class, ConfigApi.class, MemberUserApi.class})
public class RpcConfiguration {
}

View File

@ -1,9 +1,8 @@
package cn.iocoder.yudao.module.system.service.member;
import cn.hutool.core.util.ClassUtil;
import cn.hutool.core.util.ReflectUtil;
import cn.hutool.extra.spring.SpringUtil;
import org.springframework.beans.factory.annotation.Value;
import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
/**
@ -14,41 +13,28 @@ import org.springframework.stereotype.Service;
@Service
public class MemberServiceImpl implements MemberService {
@Value("${yudao.info.base-package}")
private String basePackage;
private volatile Object memberUserApi;
@Resource
private MemberUserApi memberUserApi;
@Override
public String getMemberUserMobile(Long id) {
Object user = getMemberUser(id);
MemberUserRespDTO user = getMemberUser(id);
if (user == null) {
return null;
}
return ReflectUtil.invoke(user, "getMobile");
return user.getMobile();
}
@Override
public String getMemberUserEmail(Long id) {
Object user = getMemberUser(id);
if (user == null) {
return null;
}
return ReflectUtil.invoke(user, "getEmail");
throw new UnsupportedOperationException("暂不支持获取邮箱功能,请联系管理员!");
}
private Object getMemberUser(Long id) {
private MemberUserRespDTO getMemberUser(Long id) {
if (id == null) {
return null;
}
return ReflectUtil.invoke(getMemberUserApi(), "getUser", id);
}
private Object getMemberUserApi() {
if (memberUserApi == null) {
memberUserApi = SpringUtil.getBean(ClassUtil.loadClass(String.format("%s.module.member.api.user.MemberUserApi", basePackage)));
}
return memberUserApi;
return memberUserApi.getUser(id).getCheckedData();
}
}