wangli/im-center
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:REQ-1419 增加用户注册IM接口

Browse Source
This commit is contained in:
zuoqinbo 2023-10-24 13:44:25 +08:00
parent 43a78491da
commit 52ad9159bd
3 changed files with 10 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
im-center-api/src/main/java/cn/axzo/im/center/api/vo/resp/UserAccountResp.java
View File

@ -34,5 +34,10 @@ public class UserAccountResp {
*/
private String desc;
/**
* appType
*/
private String appType;
}

33
im-center-server/src/main/java/cn/axzo/im/config/FeignConfig.java
View File

@ -28,28 +28,6 @@ import java.util.Objects;
@Profile({"dev", "test", "local"})
public class FeignConfig implements RequestInterceptor, EnvironmentAware {
private Environment environment;
@Value("${maokaiEnvUrl:http://dev-app.axzo.cn/maokai}")
private String maokaiEnvUrl;
@Value("${apolloEnvUrl:http://dev-app.axzo.cn/apollo}")
private String apolloEnvUrl;
@Value("${mnsEnvUrl:http://dev-app.axzo.cn/mns}")
private String mnsEnvUrl;
@Value("${pudgeEnvUrl:http://dev-app.axzo.cn/pudge}")
private String pudgeEnvUrl;
@Value("${outmanEnvUrl:http://dev-app.axzo.cn/outman}")
private String outmanEnvUrl;
@Value("${thronesEnvUrl:http://dev-app.axzo.cn/thrones}")
private String thronesEnvUrl;
@Value("${workspaceEnvUrl:http://dev-app.axzo.cn/workspace}")
private String workspaceEnvUrl;
@Value("${thirdPartUrl:http://dev-app.axzo.cn/thirdParty}")
private String thirdPartUrl;
@Value("${nanopartUrl:http://dev-app.axzo.cn/nanopart}")
private String nanopartUrl;
@Value("${tyrEnvUrl:http://dev-app.axzo.cn/tyr}")
private String tyrEnvUrl;
@Value("${msgCenterEnvUrl:http://dev-app.axzo.cn/msg-center}")
private String msgCenterEnvUrl;
@Value("${imCenterEnvUrl:http://dev-app.axzo.cn/im-center}")
private String imCenterEnvUrl;
private static String POD_NAMESPACE;
@ -69,17 +47,6 @@ public class FeignConfig implements RequestInterceptor, EnvironmentAware {
HardCodedTarget target = (HardCodedTarget) requestTemplate.feignTarget();
String url = requestTemplate.feignTarget().url();
// 如需修改微服务地址,建议通过外部化参数来调整
url = url.replace("http://maokai:8080", maokaiEnvUrl);
url = url.replace("http://apollo:11000", apolloEnvUrl);
url = url.replace("http://mns:8989", mnsEnvUrl);
url = url.replace("http://pudge:10099", pudgeEnvUrl);
url = url.replace("http://outman:8989", outmanEnvUrl);
url = url.replace("http://thrones", thronesEnvUrl);
url = url.replace("http://workspace:8080", workspaceEnvUrl);
url = url.replace("http://third-party:11000", thirdPartUrl);
url = url.replace("http://nanopart:8080", nanopartUrl);
url = url.replace("http://tyr:8080", tyrEnvUrl);
url = url.replace("http://msg-center:8080", msgCenterEnvUrl);
url = url.replace("http://im-center:8080", imCenterEnvUrl);
String profile = environment.getProperty("spring.profiles.active");
if(Objects.equals(profile, "test") && url.contains("dev-app.axzo.cn")) {

8
im-center-server/src/main/java/cn/axzo/im/service/AccountService.java
View File

@ -139,7 +139,7 @@ public class AccountService {
//1.1 如果已经创建直接返回
return UserAccountResp.builder()
.imAccount(accountRegister.getImAccount())
.userId(userIdWrapper)
.userId(userId)
.token(accountRegister.getToken())
.build();
@ -175,8 +175,9 @@ public class AccountService {
.list();
if (CollectionUtils.isNotEmpty(accountRegisterList)) {
return accountRegisterList.stream().map(accountRegister -> UserAccountResp.builder()
.userId(accountRegister.getAccountWrapper())
.userId(accountRegister.getAccountId())
.token(accountRegister.getToken())
.appType(accountRegister.getAppType())
.imAccount(accountRegister.getImAccount()).build()).collect(Collectors.toList());
}
return null;
@ -194,7 +195,7 @@ public class AccountService {
if (StringUtils.isNotEmpty(accountAbsentQuery.getAppType())) {
AppTypeEnum appTypeEnum = AppTypeEnum.isValidAppType(accountAbsentQuery.getAppType());
if (appTypeEnum == null) {
throw new ServiceException("请求参数AppType=["+accountAbsentQuery.getAppType()+"]异常!" );
throw new ServiceException("请求参数AppType=[" + accountAbsentQuery.getAppType() + "]异常!");
}
target[0] = appTypeEnum;
} else {
@ -216,6 +217,7 @@ public class AccountService {
userAccountReq.setUserId(accountAbsentQuery.getPersonId());
userAccountReq.setNickName(DEFAULT_NICK_NAME);
UserAccountResp accountResp = generateAccount(userAccountReq, iNotifyService);
accountResp.setAppType(appTypeEnum.getCode());
userAccountAll.add(accountResp);
}
}