diff --git a/im-center-api/im-center-api.iml b/im-center-api/im-center-api.iml index 583d8ae..00585da 100644 --- a/im-center-api/im-center-api.iml +++ b/im-center-api/im-center-api.iml @@ -18,7 +18,7 @@ - + diff --git a/im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/AccountAbsentQuery.java b/im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/AccountAbsentQuery.java index f0d8e92..266228c 100644 --- a/im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/AccountAbsentQuery.java +++ b/im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/AccountAbsentQuery.java @@ -12,6 +12,14 @@ import javax.validation.constraints.NotNull; */ @Data public class AccountAbsentQuery { + + /** + * 消息应用端 + * 工人端、企业端、服务器 + * cm、cmp、system + */ + private String appType; + /** * 注册用户唯一标识,普通用户personId */ diff --git a/im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/AccountQuery.java b/im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/AccountQuery.java index 0fca611..ccb4033 100644 --- a/im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/AccountQuery.java +++ b/im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/AccountQuery.java @@ -18,7 +18,7 @@ public class AccountQuery { /** * 消息应用端 * 工人端、企业端、服务器 - * WORKER、ENTERPRISE、SYSTEM + * cm、cmp、system */ @NotNull(message = "消息应用端不能为空") private String appType; diff --git a/im-center-common/im-center-common.iml b/im-center-common/im-center-common.iml index 522097f..d7f5e31 100644 --- a/im-center-common/im-center-common.iml +++ b/im-center-common/im-center-common.iml @@ -17,7 +17,7 @@ - + diff --git a/im-center-server/im-center-server.iml b/im-center-server/im-center-server.iml index 9b0061a..50c8877 100644 --- a/im-center-server/im-center-server.iml +++ b/im-center-server/im-center-server.iml @@ -7,11 +7,6 @@ - - - - - @@ -21,11 +16,10 @@ - - + @@ -271,7 +265,7 @@ - + @@ -330,6 +324,28 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/im-center-server/src/main/java/cn/axzo/im/service/AccountService.java b/im-center-server/src/main/java/cn/axzo/im/service/AccountService.java index 1649dac..0e34462 100644 --- a/im-center-server/src/main/java/cn/axzo/im/service/AccountService.java +++ b/im-center-server/src/main/java/cn/axzo/im/service/AccountService.java @@ -190,7 +190,17 @@ public class AccountService { */ public List registerAccountIfAbsent(AccountAbsentQuery accountAbsentQuery) { List userAccountAll = Lists.newArrayList(); - for (AppTypeEnum appTypeEnum : AppTypeEnum.values()) { + AppTypeEnum[] target = new AppTypeEnum[1]; + if (StringUtils.isNotEmpty(accountAbsentQuery.getAppType())) { + AppTypeEnum appTypeEnum = AppTypeEnum.isValidAppType(accountAbsentQuery.getAppType()); + if (appTypeEnum == null) { + throw new ServiceException("请求参数AppType=["+accountAbsentQuery.getAppType()+"]异常!" ); + } + target[0] = appTypeEnum; + } else { + target = AppTypeEnum.values(); + } + for (AppTypeEnum appTypeEnum : target) { if (appTypeEnum == AppTypeEnum.SYSTEM) { continue; }