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 @@
com.bx
- im-commom
+ im-common
3.0.0
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 @@
3.0.0
4.0.0
- im-commom
+ im-common
jar
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 @@
com.bx
- im-commom
+ im-common
3.0.0
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 @@
im-platform
im-server
- im-commom
+ im-common
im-client