feat:REQ-1419 增加用户注册IM接口
This commit is contained in:
parent
9b9db53818
commit
b302ff3517
@ -18,7 +18,7 @@
|
|||||||
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
|
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/target" />
|
<excludeFolder url="file://$MODULE_DIR$/target" />
|
||||||
</content>
|
</content>
|
||||||
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
|
<orderEntry type="inheritedJdk" />
|
||||||
<orderEntry type="sourceFolder" forTests="false" />
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:3.0.2" level="project" />
|
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:3.0.2" level="project" />
|
||||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.4.13" level="project" />
|
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.4.13" level="project" />
|
||||||
|
|||||||
@ -12,6 +12,14 @@ import javax.validation.constraints.NotNull;
|
|||||||
*/
|
*/
|
||||||
@Data
|
@Data
|
||||||
public class AccountAbsentQuery {
|
public class AccountAbsentQuery {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 消息应用端
|
||||||
|
* 工人端、企业端、服务器
|
||||||
|
* cm、cmp、system
|
||||||
|
*/
|
||||||
|
private String appType;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 注册用户唯一标识,普通用户personId
|
* 注册用户唯一标识,普通用户personId
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -18,7 +18,7 @@ public class AccountQuery {
|
|||||||
/**
|
/**
|
||||||
* 消息应用端
|
* 消息应用端
|
||||||
* 工人端、企业端、服务器
|
* 工人端、企业端、服务器
|
||||||
* WORKER、ENTERPRISE、SYSTEM
|
* cm、cmp、system
|
||||||
*/
|
*/
|
||||||
@NotNull(message = "消息应用端不能为空")
|
@NotNull(message = "消息应用端不能为空")
|
||||||
private String appType;
|
private String appType;
|
||||||
|
|||||||
@ -17,7 +17,7 @@
|
|||||||
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
|
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/target" />
|
<excludeFolder url="file://$MODULE_DIR$/target" />
|
||||||
</content>
|
</content>
|
||||||
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
|
<orderEntry type="inheritedJdk" />
|
||||||
<orderEntry type="sourceFolder" forTests="false" />
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
<orderEntry type="library" name="Maven: cn.axzo.basics:basics-common:2.0.0-SNAPSHOT" level="project" />
|
<orderEntry type="library" name="Maven: cn.axzo.basics:basics-common:2.0.0-SNAPSHOT" level="project" />
|
||||||
<orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
|
<orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
|
||||||
|
|||||||
@ -7,11 +7,6 @@
|
|||||||
<facet type="web" name="Web">
|
<facet type="web" name="Web">
|
||||||
<configuration>
|
<configuration>
|
||||||
<webroots />
|
<webroots />
|
||||||
<sourceRoots>
|
|
||||||
<root url="file://$MODULE_DIR$/src/main/java" />
|
|
||||||
<root url="file://$MODULE_DIR$/src/main/resources" />
|
|
||||||
<root url="file://$MODULE_DIR$/target/generated-sources/annotations" />
|
|
||||||
</sourceRoots>
|
|
||||||
</configuration>
|
</configuration>
|
||||||
</facet>
|
</facet>
|
||||||
</component>
|
</component>
|
||||||
@ -21,11 +16,10 @@
|
|||||||
<content url="file://$MODULE_DIR$">
|
<content url="file://$MODULE_DIR$">
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
|
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
|
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" generated="true" />
|
<sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" generated="true" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/target" />
|
<excludeFolder url="file://$MODULE_DIR$/target" />
|
||||||
</content>
|
</content>
|
||||||
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
|
<orderEntry type="inheritedJdk" />
|
||||||
<orderEntry type="sourceFolder" forTests="false" />
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
<orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.8.4" level="project" />
|
<orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.8.4" level="project" />
|
||||||
<orderEntry type="library" name="Maven: com.xuxueli:xxl-job-core:2.2.0" level="project" />
|
<orderEntry type="library" name="Maven: com.xuxueli:xxl-job-core:2.2.0" level="project" />
|
||||||
@ -271,7 +265,7 @@
|
|||||||
<orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
|
<orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
|
||||||
<orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.3.1" level="project" />
|
<orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.3.1" level="project" />
|
||||||
<orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:2.3.1" level="project" />
|
<orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:2.3.1" level="project" />
|
||||||
<orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
|
<orderEntry type="library" scope="RUNTIME" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
|
||||||
<orderEntry type="library" scope="TEST" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
|
<orderEntry type="library" scope="TEST" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
|
||||||
<orderEntry type="library" scope="TEST" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
|
<orderEntry type="library" scope="TEST" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
|
||||||
<orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.18.1" level="project" />
|
<orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.18.1" level="project" />
|
||||||
@ -330,6 +324,28 @@
|
|||||||
<orderEntry type="library" name="Maven: cn.axzo.trade:trade-data-security-base:2.0.0-SNAPSHOT" level="project" />
|
<orderEntry type="library" name="Maven: cn.axzo.trade:trade-data-security-base:2.0.0-SNAPSHOT" level="project" />
|
||||||
<orderEntry type="library" name="Maven: cn.axzo.basics:basics-auth-api:2.0.0-SNAPSHOT" level="project" />
|
<orderEntry type="library" name="Maven: cn.axzo.basics:basics-auth-api:2.0.0-SNAPSHOT" level="project" />
|
||||||
<orderEntry type="library" name="Maven: cn.axzo.basics:basics-auth-dto:2.0.0-SNAPSHOT" level="project" />
|
<orderEntry type="library" name="Maven: cn.axzo.basics:basics-auth-dto:2.0.0-SNAPSHOT" level="project" />
|
||||||
|
<orderEntry type="library" name="Maven: cn.axzo.tyr:tyr-api:2.0.0-SNAPSHOT" level="project" />
|
||||||
|
<orderEntry type="library" name="Maven: cn.axzo.framework:axzo-consumer-spring-cloud-starter:1.0.0-SNAPSHOT" level="project" />
|
||||||
|
<orderEntry type="library" name="Maven: cn.axzo.framework.client:feign-starter:1.0.0-SNAPSHOT" level="project" />
|
||||||
|
<orderEntry type="library" name="Maven: io.github.openfeign:feign-hystrix:10.12" level="project" />
|
||||||
|
<orderEntry type="library" name="Maven: com.netflix.archaius:archaius-core:0.7.6" level="project" />
|
||||||
|
<orderEntry type="library" name="Maven: io.github.openfeign:feign-okhttp:10.12" level="project" />
|
||||||
|
<orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.14.9" level="project" />
|
||||||
|
<orderEntry type="library" name="Maven: com.squareup.okio:okio:1.17.2" level="project" />
|
||||||
|
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-hystrix:2.2.8.RELEASE" level="project" />
|
||||||
|
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-hystrix:2.2.8.RELEASE" level="project" />
|
||||||
|
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.2.8.RELEASE" level="project" />
|
||||||
|
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.2.8.RELEASE" level="project" />
|
||||||
|
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-archaius:2.2.8.RELEASE" level="project" />
|
||||||
|
<orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
|
||||||
|
<orderEntry type="library" name="Maven: commons-lang:commons-lang:2.4" level="project" />
|
||||||
|
<orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.5.18" level="project" />
|
||||||
|
<orderEntry type="library" name="Maven: io.reactivex:rxjava:1.3.8" level="project" />
|
||||||
|
<orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-serialization:1.5.18" level="project" />
|
||||||
|
<orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-metrics-event-stream:1.5.18" level="project" />
|
||||||
|
<orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-javanica:1.5.18" level="project" />
|
||||||
|
<orderEntry type="library" name="Maven: io.reactivex:rxjava-reactive-streams:1.2.1" level="project" />
|
||||||
|
<orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.3.1" level="project" />
|
||||||
<orderEntry type="module" module-name="im-center-api" />
|
<orderEntry type="module" module-name="im-center-api" />
|
||||||
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:3.0.2" level="project" />
|
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:3.0.2" level="project" />
|
||||||
<orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" />
|
<orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" />
|
||||||
|
|||||||
@ -190,7 +190,17 @@ public class AccountService {
|
|||||||
*/
|
*/
|
||||||
public List<UserAccountResp> registerAccountIfAbsent(AccountAbsentQuery accountAbsentQuery) {
|
public List<UserAccountResp> registerAccountIfAbsent(AccountAbsentQuery accountAbsentQuery) {
|
||||||
List<UserAccountResp> userAccountAll = Lists.newArrayList();
|
List<UserAccountResp> 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) {
|
if (appTypeEnum == AppTypeEnum.SYSTEM) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user