diff --git a/dependencies.gradle b/dependencies.gradle
index 9a11e694c7..5a6e591f15 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -137,7 +137,7 @@ ext {
     blankjUtilCodex = "1.30.4"
 
     acloudPush = "3.8.8.1"
-    jpushVersion = "5.2.4"
+    jpushVersion = "5.4.0"
 
     volcTlsVersion = "1.1.4"
 }
\ No newline at end of file
diff --git a/feature/jg_push/proguard-rules.pro b/feature/jg_push/proguard-rules.pro
index 26cb2ddc21..3f49f46eda 100644
--- a/feature/jg_push/proguard-rules.pro
+++ b/feature/jg_push/proguard-rules.pro
@@ -24,7 +24,7 @@
 
 -dontwarn cn.jpush.**
 -keep class cn.jpush.** { *; }
--keep class * extends cn.jpush.android.service.JPushMessageService { *; }
+-keep class * extends cn.jpush.android.service.JPushMessageReceiver { *; }
 
 -dontwarn cn.jiguang.**
 -keep class cn.jiguang.** { *; }
diff --git a/feature/jg_push/src/main/AndroidManifest.xml b/feature/jg_push/src/main/AndroidManifest.xml
index 7b323363bb..313af615f2 100644
--- a/feature/jg_push/src/main/AndroidManifest.xml
+++ b/feature/jg_push/src/main/AndroidManifest.xml
@@ -18,19 +18,15 @@
             </intent-filter>
         </service>
 
-        <!-- Required since 5.2.0 -->
-        <!-- 新的 tag/alias 接口结果返回需要开发者配置一个自定义的Service -->
-        <!-- 5.2.0开始所有事件将通过该类回调 -->
-        <!-- 该广播需要继承 JPush 提供的 JPushMessageService 类, 并如下新增一个 Intent-Filter -->
-        <service
-            android:name="com.gh.gamecenter.jg.push.service.HaloJPushMessageService"
+        <receiver
+            android:name="com.gh.gamecenter.jg.push.service.HaloJPushMessageReceiver"
             android:enabled="true"
             android:exported="false" >
             <intent-filter>
-                <action android:name="cn.jpush.android.intent.SERVICE_MESSAGE" />
+                <action android:name="cn.jpush.android.intent.RECEIVE_MESSAGE" />
                 <category android:name="${applicationId}" />
             </intent-filter>
-        </service>
+        </receiver>
 
         <provider
             android:name="cn.jpush.android.service.InitProvider"
diff --git a/feature/jg_push/src/main/java/com/gh/gamecenter/jg/push/JPushHelper.kt b/feature/jg_push/src/main/java/com/gh/gamecenter/jg/push/JPushHelper.kt
index 1d0cbf67d2..35cab7d91d 100644
--- a/feature/jg_push/src/main/java/com/gh/gamecenter/jg/push/JPushHelper.kt
+++ b/feature/jg_push/src/main/java/com/gh/gamecenter/jg/push/JPushHelper.kt
@@ -21,6 +21,8 @@ object JPushHelper {
     fun init(applicationContext: Context) {
         // 关闭SDK自启动 (https://docs.jiguang.cn/jverification/guideline/jghgzy)
         JCollectionAuth.enableAutoWakeup(applicationContext, false)
+        JPushInterface.setSmartPushEnable(applicationContext, false)
+        JPushInterface.setLinkMergeEnable(applicationContext, false)
 
         JPushInterface.setDebugMode(BuildConfig.DEBUG)
         JPushInterface.init(applicationContext)
diff --git a/feature/jg_push/src/main/java/com/gh/gamecenter/jg/push/service/HaloJPushMessageService.kt b/feature/jg_push/src/main/java/com/gh/gamecenter/jg/push/service/HaloJPushMessageReceiver.kt
similarity index 88%
rename from feature/jg_push/src/main/java/com/gh/gamecenter/jg/push/service/HaloJPushMessageService.kt
rename to feature/jg_push/src/main/java/com/gh/gamecenter/jg/push/service/HaloJPushMessageReceiver.kt
index c1c339ba54..0c15cdefcc 100644
--- a/feature/jg_push/src/main/java/com/gh/gamecenter/jg/push/service/HaloJPushMessageService.kt
+++ b/feature/jg_push/src/main/java/com/gh/gamecenter/jg/push/service/HaloJPushMessageReceiver.kt
@@ -2,11 +2,11 @@ package com.gh.gamecenter.jg.push.service
 
 import android.content.Context
 import cn.jpush.android.api.NotificationMessage
-import cn.jpush.android.service.JPushMessageService
+import cn.jpush.android.service.JPushMessageReceiver
 import com.gh.gamecenter.jg.push.JPushHelper
 import com.lightgame.utils.Utils
 
-class HaloJPushMessageService: JPushMessageService() {
+class HaloJPushMessageReceiver: JPushMessageReceiver() {
     override fun onRegister(context: Context?, registrationId: String?) {
         Utils.log(TAG, "onRegister: $registrationId")
         JPushHelper.bindRegistrationId(registrationId)
@@ -34,6 +34,6 @@ class HaloJPushMessageService: JPushMessageService() {
     }
 
     companion object {
-        const val TAG = "HaloJPushMessageService"
+        const val TAG = "HaloJPushMessageReceiver"
     }
 }
\ No newline at end of file