包名修正

2 years ago · fa5b2965a5
31 changed files with 9 additions and 8 deletions
--- 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/
--- 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>
--- a/im-common/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>
--- a/im-common/src/main/java/com/bx/imcommon/contant/IMConstant.java
+++ b/im-common/src/main/java/com/bx/imcommon/contant/IMConstant.java
--- a/im-common/src/main/java/com/bx/imcommon/contant/IMRedisKey.java
+++ b/im-common/src/main/java/com/bx/imcommon/contant/IMRedisKey.java
--- a/im-common/src/main/java/com/bx/imcommon/enums/IMCmdType.java
+++ b/im-common/src/main/java/com/bx/imcommon/enums/IMCmdType.java
--- a/im-common/src/main/java/com/bx/imcommon/enums/IMListenerType.java
+++ b/im-common/src/main/java/com/bx/imcommon/enums/IMListenerType.java
--- a/im-common/src/main/java/com/bx/imcommon/enums/IMSendCode.java
+++ b/im-common/src/main/java/com/bx/imcommon/enums/IMSendCode.java
--- a/im-common/src/main/java/com/bx/imcommon/enums/IMTerminalType.java
+++ b/im-common/src/main/java/com/bx/imcommon/enums/IMTerminalType.java
--- a/im-common/src/main/java/com/bx/imcommon/model/IMGroupMessage.java
+++ b/im-common/src/main/java/com/bx/imcommon/model/IMGroupMessage.java
--- a/im-common/src/main/java/com/bx/imcommon/model/IMHeartbeatInfo.java
+++ b/im-common/src/main/java/com/bx/imcommon/model/IMHeartbeatInfo.java
--- a/im-common/src/main/java/com/bx/imcommon/model/IMLoginInfo.java
+++ b/im-common/src/main/java/com/bx/imcommon/model/IMLoginInfo.java
--- a/im-common/src/main/java/com/bx/imcommon/model/IMPrivateMessage.java
+++ b/im-common/src/main/java/com/bx/imcommon/model/IMPrivateMessage.java
--- a/im-common/src/main/java/com/bx/imcommon/model/IMRecvInfo.java
+++ b/im-common/src/main/java/com/bx/imcommon/model/IMRecvInfo.java
--- a/im-common/src/main/java/com/bx/imcommon/model/IMSendInfo.java
+++ b/im-common/src/main/java/com/bx/imcommon/model/IMSendInfo.java
--- a/im-common/src/main/java/com/bx/imcommon/model/IMSendResult.java
+++ b/im-common/src/main/java/com/bx/imcommon/model/IMSendResult.java
--- a/im-common/src/main/java/com/bx/imcommon/model/IMSessionInfo.java
+++ b/im-common/src/main/java/com/bx/imcommon/model/IMSessionInfo.java
--- a/im-common/src/main/java/com/bx/imcommon/model/IMSystemMessage.java
+++ b/im-common/src/main/java/com/bx/imcommon/model/IMSystemMessage.java
--- a/im-common/src/main/java/com/bx/imcommon/model/IMUserInfo.java
+++ b/im-common/src/main/java/com/bx/imcommon/model/IMUserInfo.java
--- a/im-common/src/main/java/com/bx/imcommon/mq/RedisMQConfig.java
+++ b/im-common/src/main/java/com/bx/imcommon/mq/RedisMQConfig.java
--- a/im-common/src/main/java/com/bx/imcommon/mq/RedisMQConsumer.java
+++ b/im-common/src/main/java/com/bx/imcommon/mq/RedisMQConsumer.java
--- a/im-common/src/main/java/com/bx/imcommon/mq/RedisMQListener.java
+++ b/im-common/src/main/java/com/bx/imcommon/mq/RedisMQListener.java
--- a/im-common/src/main/java/com/bx/imcommon/mq/RedisMQPullTask.java
+++ b/im-common/src/main/java/com/bx/imcommon/mq/RedisMQPullTask.java
--- a/im-common/src/main/java/com/bx/imcommon/mq/RedisMQTemplate.java
+++ b/im-common/src/main/java/com/bx/imcommon/mq/RedisMQTemplate.java
--- a/im-common/src/main/java/com/bx/imcommon/serializer/DateToLongSerializer.java
+++ b/im-common/src/main/java/com/bx/imcommon/serializer/DateToLongSerializer.java
--- a/im-common/src/main/java/com/bx/imcommon/util/CommaTextUtils.java
+++ b/im-common/src/main/java/com/bx/imcommon/util/CommaTextUtils.java
--- a/im-common/src/main/java/com/bx/imcommon/util/JwtUtil.java
+++ b/im-common/src/main/java/com/bx/imcommon/util/JwtUtil.java
--- a/im-common/src/main/java/com/bx/imcommon/util/ThreadPoolExecutorFactory.java
+++ b/im-common/src/main/java/com/bx/imcommon/util/ThreadPoolExecutorFactory.java
--- 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>
--- 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" : {
--- 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>