From fa5b2965a5f826b804de4ee37641783381cc3e2b Mon Sep 17 00:00:00 2001
From: xsx <825657193@qq.com>
Date: Mon, 16 Sep 2024 13:49:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E5=90=8D=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                                 | 2 +-
 im-client/pom.xml                                          | 2 +-
 {im-commom => im-common}/pom.xml                           | 2 +-
 .../src/main/java/com/bx/imcommon/contant/IMConstant.java  | 0
 .../src/main/java/com/bx/imcommon/contant/IMRedisKey.java  | 0
 .../src/main/java/com/bx/imcommon/enums/IMCmdType.java     | 0
 .../main/java/com/bx/imcommon/enums/IMListenerType.java    | 0
 .../src/main/java/com/bx/imcommon/enums/IMSendCode.java    | 0
 .../main/java/com/bx/imcommon/enums/IMTerminalType.java    | 0
 .../main/java/com/bx/imcommon/model/IMGroupMessage.java    | 0
 .../main/java/com/bx/imcommon/model/IMHeartbeatInfo.java   | 0
 .../src/main/java/com/bx/imcommon/model/IMLoginInfo.java   | 0
 .../main/java/com/bx/imcommon/model/IMPrivateMessage.java  | 0
 .../src/main/java/com/bx/imcommon/model/IMRecvInfo.java    | 0
 .../src/main/java/com/bx/imcommon/model/IMSendInfo.java    | 0
 .../src/main/java/com/bx/imcommon/model/IMSendResult.java  | 0
 .../src/main/java/com/bx/imcommon/model/IMSessionInfo.java | 0
 .../main/java/com/bx/imcommon/model/IMSystemMessage.java   | 0
 .../src/main/java/com/bx/imcommon/model/IMUserInfo.java    | 0
 .../src/main/java/com/bx/imcommon/mq/RedisMQConfig.java    | 0
 .../src/main/java/com/bx/imcommon/mq/RedisMQConsumer.java  | 0
 .../src/main/java/com/bx/imcommon/mq/RedisMQListener.java  | 0
 .../src/main/java/com/bx/imcommon/mq/RedisMQPullTask.java  | 0
 .../src/main/java/com/bx/imcommon/mq/RedisMQTemplate.java  | 0
 .../com/bx/imcommon/serializer/DateToLongSerializer.java   | 0
 .../src/main/java/com/bx/imcommon/util/CommaTextUtils.java | 0
 .../src/main/java/com/bx/imcommon/util/JwtUtil.java        | 0
 .../com/bx/imcommon/util/ThreadPoolExecutorFactory.java    | 0
 im-server/pom.xml                                          | 2 +-
 im-uniapp/manifest.json                                    | 7 ++++---
 pom.xml                                                    | 2 +-
 31 files changed, 9 insertions(+), 8 deletions(-)
 rename {im-commom => im-common}/pom.xml (97%)
 rename {im-commom => im-common}/src/main/java/com/bx/imcommon/contant/IMConstant.java (100%)
 rename {im-commom => im-common}/src/main/java/com/bx/imcommon/contant/IMRedisKey.java (100%)
 rename {im-commom => im-common}/src/main/java/com/bx/imcommon/enums/IMCmdType.java (100%)
 rename {im-commom => im-common}/src/main/java/com/bx/imcommon/enums/IMListenerType.java (100%)
 rename {im-commom => im-common}/src/main/java/com/bx/imcommon/enums/IMSendCode.java (100%)
 rename {im-commom => im-common}/src/main/java/com/bx/imcommon/enums/IMTerminalType.java (100%)
 rename {im-commom => im-common}/src/main/java/com/bx/imcommon/model/IMGroupMessage.java (100%)
 rename {im-commom => im-common}/src/main/java/com/bx/imcommon/model/IMHeartbeatInfo.java (100%)
 rename {im-commom => im-common}/src/main/java/com/bx/imcommon/model/IMLoginInfo.java (100%)
 rename {im-commom => im-common}/src/main/java/com/bx/imcommon/model/IMPrivateMessage.java (100%)
 rename {im-commom => im-common}/src/main/java/com/bx/imcommon/model/IMRecvInfo.java (100%)
 rename {im-commom => im-common}/src/main/java/com/bx/imcommon/model/IMSendInfo.java (100%)
 rename {im-commom => im-common}/src/main/java/com/bx/imcommon/model/IMSendResult.java (100%)
 rename {im-commom => im-common}/src/main/java/com/bx/imcommon/model/IMSessionInfo.java (100%)
 rename {im-commom => im-common}/src/main/java/com/bx/imcommon/model/IMSystemMessage.java (100%)
 rename {im-commom => im-common}/src/main/java/com/bx/imcommon/model/IMUserInfo.java (100%)
 rename {im-commom => im-common}/src/main/java/com/bx/imcommon/mq/RedisMQConfig.java (100%)
 rename {im-commom => im-common}/src/main/java/com/bx/imcommon/mq/RedisMQConsumer.java (100%)
 rename {im-commom => im-common}/src/main/java/com/bx/imcommon/mq/RedisMQListener.java (100%)
 rename {im-commom => im-common}/src/main/java/com/bx/imcommon/mq/RedisMQPullTask.java (100%)
 rename {im-commom => im-common}/src/main/java/com/bx/imcommon/mq/RedisMQTemplate.java (100%)
 rename {im-commom => im-common}/src/main/java/com/bx/imcommon/serializer/DateToLongSerializer.java (100%)
 rename {im-commom => im-common}/src/main/java/com/bx/imcommon/util/CommaTextUtils.java (100%)
 rename {im-commom => im-common}/src/main/java/com/bx/imcommon/util/JwtUtil.java (100%)
 rename {im-commom => im-common}/src/main/java/com/bx/imcommon/util/ThreadPoolExecutorFactory.java (100%)

diff --git a/.gitignore b/.gitignore
index 083aa4a..10f5a2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,7 @@
 /im-platform/src/main/resources/logback-prod.xml
 /im-server/src/main/resources/application-prod.yml
 /im-server/src/main/resources/logback-prod.xml
-/im-commom/im-commom.iml
+/im-common/im-common.iml
 /im-uniapp/node_modules/
 /im-web/package-lock.json
 /im-uniapp/unpackage/
diff --git a/im-client/pom.xml b/im-client/pom.xml
index 4634ec7..dbe3d30 100644
--- a/im-client/pom.xml
+++ b/im-client/pom.xml
@@ -14,7 +14,7 @@
     <dependencies>
         <dependency>
             <groupId>com.bx</groupId>
-            <artifactId>im-commom</artifactId>
+            <artifactId>im-common</artifactId>
             <version>3.0.0</version>
         </dependency>
     </dependencies>
diff --git a/im-commom/pom.xml b/im-common/pom.xml
similarity index 97%
rename from im-commom/pom.xml
rename to im-common/pom.xml
index 92599d1..3e87e6f 100644
--- a/im-commom/pom.xml
+++ b/im-common/pom.xml
@@ -8,7 +8,7 @@
         <version>3.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>im-commom</artifactId>
+    <artifactId>im-common</artifactId>
     <packaging>jar</packaging>
     <dependencies>
         <dependency>
diff --git a/im-commom/src/main/java/com/bx/imcommon/contant/IMConstant.java b/im-common/src/main/java/com/bx/imcommon/contant/IMConstant.java
similarity index 100%
rename from im-commom/src/main/java/com/bx/imcommon/contant/IMConstant.java
rename to im-common/src/main/java/com/bx/imcommon/contant/IMConstant.java
diff --git a/im-commom/src/main/java/com/bx/imcommon/contant/IMRedisKey.java b/im-common/src/main/java/com/bx/imcommon/contant/IMRedisKey.java
similarity index 100%
rename from im-commom/src/main/java/com/bx/imcommon/contant/IMRedisKey.java
rename to im-common/src/main/java/com/bx/imcommon/contant/IMRedisKey.java
diff --git a/im-commom/src/main/java/com/bx/imcommon/enums/IMCmdType.java b/im-common/src/main/java/com/bx/imcommon/enums/IMCmdType.java
similarity index 100%
rename from im-commom/src/main/java/com/bx/imcommon/enums/IMCmdType.java
rename to im-common/src/main/java/com/bx/imcommon/enums/IMCmdType.java
diff --git a/im-commom/src/main/java/com/bx/imcommon/enums/IMListenerType.java b/im-common/src/main/java/com/bx/imcommon/enums/IMListenerType.java
similarity index 100%
rename from im-commom/src/main/java/com/bx/imcommon/enums/IMListenerType.java
rename to im-common/src/main/java/com/bx/imcommon/enums/IMListenerType.java
diff --git a/im-commom/src/main/java/com/bx/imcommon/enums/IMSendCode.java b/im-common/src/main/java/com/bx/imcommon/enums/IMSendCode.java
similarity index 100%
rename from im-commom/src/main/java/com/bx/imcommon/enums/IMSendCode.java
rename to im-common/src/main/java/com/bx/imcommon/enums/IMSendCode.java
diff --git a/im-commom/src/main/java/com/bx/imcommon/enums/IMTerminalType.java b/im-common/src/main/java/com/bx/imcommon/enums/IMTerminalType.java
similarity index 100%
rename from im-commom/src/main/java/com/bx/imcommon/enums/IMTerminalType.java
rename to im-common/src/main/java/com/bx/imcommon/enums/IMTerminalType.java
diff --git a/im-commom/src/main/java/com/bx/imcommon/model/IMGroupMessage.java b/im-common/src/main/java/com/bx/imcommon/model/IMGroupMessage.java
similarity index 100%
rename from im-commom/src/main/java/com/bx/imcommon/model/IMGroupMessage.java
rename to im-common/src/main/java/com/bx/imcommon/model/IMGroupMessage.java
diff --git a/im-commom/src/main/java/com/bx/imcommon/model/IMHeartbeatInfo.java b/im-common/src/main/java/com/bx/imcommon/model/IMHeartbeatInfo.java
similarity index 100%
rename from im-commom/src/main/java/com/bx/imcommon/model/IMHeartbeatInfo.java
rename to im-common/src/main/java/com/bx/imcommon/model/IMHeartbeatInfo.java
diff --git a/im-commom/src/main/java/com/bx/imcommon/model/IMLoginInfo.java b/im-common/src/main/java/com/bx/imcommon/model/IMLoginInfo.java
similarity index 100%
rename from im-commom/src/main/java/com/bx/imcommon/model/IMLoginInfo.java
rename to im-common/src/main/java/com/bx/imcommon/model/IMLoginInfo.java
diff --git a/im-commom/src/main/java/com/bx/imcommon/model/IMPrivateMessage.java b/im-common/src/main/java/com/bx/imcommon/model/IMPrivateMessage.java
similarity index 100%
rename from im-commom/src/main/java/com/bx/imcommon/model/IMPrivateMessage.java
rename to im-common/src/main/java/com/bx/imcommon/model/IMPrivateMessage.java
diff --git a/im-commom/src/main/java/com/bx/imcommon/model/IMRecvInfo.java b/im-common/src/main/java/com/bx/imcommon/model/IMRecvInfo.java
similarity index 100%
rename from im-commom/src/main/java/com/bx/imcommon/model/IMRecvInfo.java
rename to im-common/src/main/java/com/bx/imcommon/model/IMRecvInfo.java
diff --git a/im-commom/src/main/java/com/bx/imcommon/model/IMSendInfo.java b/im-common/src/main/java/com/bx/imcommon/model/IMSendInfo.java
similarity index 100%
rename from im-commom/src/main/java/com/bx/imcommon/model/IMSendInfo.java
rename to im-common/src/main/java/com/bx/imcommon/model/IMSendInfo.java
diff --git a/im-commom/src/main/java/com/bx/imcommon/model/IMSendResult.java b/im-common/src/main/java/com/bx/imcommon/model/IMSendResult.java
similarity index 100%
rename from im-commom/src/main/java/com/bx/imcommon/model/IMSendResult.java
rename to im-common/src/main/java/com/bx/imcommon/model/IMSendResult.java
diff --git a/im-commom/src/main/java/com/bx/imcommon/model/IMSessionInfo.java b/im-common/src/main/java/com/bx/imcommon/model/IMSessionInfo.java
similarity index 100%
rename from im-commom/src/main/java/com/bx/imcommon/model/IMSessionInfo.java
rename to im-common/src/main/java/com/bx/imcommon/model/IMSessionInfo.java
diff --git a/im-commom/src/main/java/com/bx/imcommon/model/IMSystemMessage.java b/im-common/src/main/java/com/bx/imcommon/model/IMSystemMessage.java
similarity index 100%
rename from im-commom/src/main/java/com/bx/imcommon/model/IMSystemMessage.java
rename to im-common/src/main/java/com/bx/imcommon/model/IMSystemMessage.java
diff --git a/im-commom/src/main/java/com/bx/imcommon/model/IMUserInfo.java b/im-common/src/main/java/com/bx/imcommon/model/IMUserInfo.java
similarity index 100%
rename from im-commom/src/main/java/com/bx/imcommon/model/IMUserInfo.java
rename to im-common/src/main/java/com/bx/imcommon/model/IMUserInfo.java
diff --git a/im-commom/src/main/java/com/bx/imcommon/mq/RedisMQConfig.java b/im-common/src/main/java/com/bx/imcommon/mq/RedisMQConfig.java
similarity index 100%
rename from im-commom/src/main/java/com/bx/imcommon/mq/RedisMQConfig.java
rename to im-common/src/main/java/com/bx/imcommon/mq/RedisMQConfig.java
diff --git a/im-commom/src/main/java/com/bx/imcommon/mq/RedisMQConsumer.java b/im-common/src/main/java/com/bx/imcommon/mq/RedisMQConsumer.java
similarity index 100%
rename from im-commom/src/main/java/com/bx/imcommon/mq/RedisMQConsumer.java
rename to im-common/src/main/java/com/bx/imcommon/mq/RedisMQConsumer.java
diff --git a/im-commom/src/main/java/com/bx/imcommon/mq/RedisMQListener.java b/im-common/src/main/java/com/bx/imcommon/mq/RedisMQListener.java
similarity index 100%
rename from im-commom/src/main/java/com/bx/imcommon/mq/RedisMQListener.java
rename to im-common/src/main/java/com/bx/imcommon/mq/RedisMQListener.java
diff --git a/im-commom/src/main/java/com/bx/imcommon/mq/RedisMQPullTask.java b/im-common/src/main/java/com/bx/imcommon/mq/RedisMQPullTask.java
similarity index 100%
rename from im-commom/src/main/java/com/bx/imcommon/mq/RedisMQPullTask.java
rename to im-common/src/main/java/com/bx/imcommon/mq/RedisMQPullTask.java
diff --git a/im-commom/src/main/java/com/bx/imcommon/mq/RedisMQTemplate.java b/im-common/src/main/java/com/bx/imcommon/mq/RedisMQTemplate.java
similarity index 100%
rename from im-commom/src/main/java/com/bx/imcommon/mq/RedisMQTemplate.java
rename to im-common/src/main/java/com/bx/imcommon/mq/RedisMQTemplate.java
diff --git a/im-commom/src/main/java/com/bx/imcommon/serializer/DateToLongSerializer.java b/im-common/src/main/java/com/bx/imcommon/serializer/DateToLongSerializer.java
similarity index 100%
rename from im-commom/src/main/java/com/bx/imcommon/serializer/DateToLongSerializer.java
rename to im-common/src/main/java/com/bx/imcommon/serializer/DateToLongSerializer.java
diff --git a/im-commom/src/main/java/com/bx/imcommon/util/CommaTextUtils.java b/im-common/src/main/java/com/bx/imcommon/util/CommaTextUtils.java
similarity index 100%
rename from im-commom/src/main/java/com/bx/imcommon/util/CommaTextUtils.java
rename to im-common/src/main/java/com/bx/imcommon/util/CommaTextUtils.java
diff --git a/im-commom/src/main/java/com/bx/imcommon/util/JwtUtil.java b/im-common/src/main/java/com/bx/imcommon/util/JwtUtil.java
similarity index 100%
rename from im-commom/src/main/java/com/bx/imcommon/util/JwtUtil.java
rename to im-common/src/main/java/com/bx/imcommon/util/JwtUtil.java
diff --git a/im-commom/src/main/java/com/bx/imcommon/util/ThreadPoolExecutorFactory.java b/im-common/src/main/java/com/bx/imcommon/util/ThreadPoolExecutorFactory.java
similarity index 100%
rename from im-commom/src/main/java/com/bx/imcommon/util/ThreadPoolExecutorFactory.java
rename to im-common/src/main/java/com/bx/imcommon/util/ThreadPoolExecutorFactory.java
diff --git a/im-server/pom.xml b/im-server/pom.xml
index 2e6edbf..f53f68a 100644
--- a/im-server/pom.xml
+++ b/im-server/pom.xml
@@ -15,7 +15,7 @@
     <dependencies>
         <dependency>
             <groupId>com.bx</groupId>
-            <artifactId>im-commom</artifactId>
+            <artifactId>im-common</artifactId>
             <version>3.0.0</version>
         </dependency>
         <dependency>
diff --git a/im-uniapp/manifest.json b/im-uniapp/manifest.json
index d69c7ad..bad16f3 100644
--- a/im-uniapp/manifest.json
+++ b/im-uniapp/manifest.json
@@ -2,8 +2,8 @@
     "name" : "盒子IM",
     "appid" : "__UNI__69DD57A",
     "description" : "",
-    "versionName" : "1.0.7",
-    "versionCode" : 107,
+    "versionName" : "3.0.0",
+    "versionCode" : 300,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -54,7 +54,8 @@
                 "privacyDescription" : {
                     "NSMicrophoneUsageDescription" : "",
                     "NSCameraUsageDescription" : ""
-                }
+                },
+                "idfa" : false
             },
             /* SDK配置 */
             "sdkConfigs" : {
diff --git a/pom.xml b/pom.xml
index a00400d..fc2b886 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
     <modules>
         <module>im-platform</module>
         <module>im-server</module>
-        <module>im-commom</module>
+        <module>im-common</module>
         <module>im-client</module>
     </modules>