From b302ff3517a197e1d93fca11a9bb8259fd6a6ddd Mon Sep 17 00:00:00 2001
From: zuoqinbo <zuoqinbo@axzo.cn>
Date: Mon, 23 Oct 2023 18:07:18 +0800
Subject: [PATCH] =?UTF-8?q?feat:REQ-1419=20=E5=A2=9E=E5=8A=A0=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=B3=A8=E5=86=8CIM=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 im-center-api/im-center-api.iml               |  2 +-
 .../center/api/vo/req/AccountAbsentQuery.java |  8 +++++
 .../im/center/api/vo/req/AccountQuery.java    |  2 +-
 im-center-common/im-center-common.iml         |  2 +-
 im-center-server/im-center-server.iml         | 32 ++++++++++++++-----
 .../cn/axzo/im/service/AccountService.java    | 12 ++++++-
 6 files changed, 46 insertions(+), 12 deletions(-)

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 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <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.boot:spring-boot-autoconfigure:2.4.13" level="project" />
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 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <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: javax.validation:validation-api:2.0.1.Final" level="project" />
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 @@
     <facet type="web" name="Web">
       <configuration>
         <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>
     </facet>
   </component>
@@ -21,11 +16,10 @@
     <content url="file://$MODULE_DIR$">
       <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/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" generated="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <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" />
@@ -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: 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: 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.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" />
@@ -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.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.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="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" />
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<UserAccountResp> registerAccountIfAbsent(AccountAbsentQuery accountAbsentQuery) {
         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) {
                 continue;
             }