diff --git a/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java b/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java
index 01117be2d..7fdcf9a13 100644
--- a/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java
+++ b/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java
@@ -20,15 +20,12 @@ import android.annotation.TargetApi;
 import android.app.ActivityManager;
 import android.app.Application;
 import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
 import android.graphics.Color;
 import android.net.http.HttpResponseCache;
 import android.os.Build;
 import android.os.Environment;
 import android.provider.Settings;
 import android.text.TextUtils;
-import android.util.ArrayMap;
 import android.util.Log;
 
 import androidx.multidex.MultiDex;
@@ -125,6 +122,7 @@ import org.greenrobot.eventbus.EventBus;
 import java.io.File;
 import java.io.IOException;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import io.reactivex.plugins.RxJavaPlugins;
 import io.realm.Realm;
@@ -214,12 +212,12 @@ public class XChatApplication extends Application {
         isInitOtherSDK = true;
         Context context = BasicConfig.INSTANCE.getAppContext();
         Application application = (Application) context.getApplicationContext();
-        HeytapPushManager.init(context,false);
+        HeytapPushManager.init(context, false);
         // 初始化 sp
         long startTime = System.currentTimeMillis();
 
         String channel = "";
-         channel = ChannelReaderUtil.getChannel(instance);
+        channel = ChannelReaderUtil.getChannel(instance);
         if (TextUtils.isEmpty(channel)) {
             channel = "official";
         }
@@ -554,7 +552,7 @@ public class XChatApplication extends Application {
      */
     @SuppressLint("CheckResult")
     public static void initRxNet(Context context, String url) {
-        Map<String, String> httpParams = new ArrayMap<>();
+        Map<String, String> httpParams = new ConcurrentHashMap<>();
         httpParams.put("os", "android");
         httpParams.put("osVersion", Build.VERSION.RELEASE);
         httpParams.put("app", XChatConstants.APP_MARK);
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/interceptor/ParamsInterceptor.java b/core/src/main/java/com/yizhuan/xchat_android_core/interceptor/ParamsInterceptor.java
index 89cfe21ab..372d95e59 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/interceptor/ParamsInterceptor.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/interceptor/ParamsInterceptor.java
@@ -3,6 +3,8 @@ package com.yizhuan.xchat_android_core.interceptor;
 
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+
 import com.yizhuan.xchat_android_core.auth.AuthModel;
 import com.yizhuan.xchat_android_core.utils.APIEncryptUtil;
 import com.yizhuan.xchat_android_core.utils.OaidUtil;
@@ -36,6 +38,7 @@ public class ParamsInterceptor implements Interceptor {
         this.mHttpParams = params;
     }
 
+    @NonNull
     @Override
     public Response intercept(Chain chain) throws IOException {
         Request oldRequest = chain.request();