From bf22b365a8ded3a01a67598261b72f0e81bfae56 Mon Sep 17 00:00:00 2001 From: heavyrian2012 Date: Wed, 18 Sep 2024 13:01:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=B2=A1=E6=9C=89=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E9=B8=BF=E8=92=99=E6=8E=A8=E9=80=81=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E5=BA=94=E8=AF=A5=E5=9B=9E=E8=90=BD=E5=88=B0?= =?UTF-8?q?Android=EF=BC=8C=E9=81=BF=E5=85=8D=E5=AF=B9android=E9=80=A0?= =?UTF-8?q?=E6=88=90=E5=BD=B1=E5=93=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- broker/config/wildfirechat.conf | 2 +- broker/src/main/java/cn/wildfirechat/push/PushServer.java | 3 --- distribution/src/main/resources/wildfirechat.conf | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/broker/config/wildfirechat.conf b/broker/config/wildfirechat.conf index 1d97cceb4..0008826e7 100755 --- a/broker/config/wildfirechat.conf +++ b/broker/config/wildfirechat.conf @@ -341,7 +341,7 @@ push.android.server.address http://localhost:8085/android/push ##注意回调是单线程回调，接收服务必须在同一内网，且异步处理快速返回，否则会有延迟问题！！ push.ios.server.address http://localhost:8085/ios/push -##鸿蒙推送服务器地址，如果不配置会使用android的地址。 +##鸿蒙推送服务器地址 ##注意回调是单线程回调，接收服务必须在同一内网，且异步处理快速返回，否则会有延迟问题！！ push.harmony.server.address http://localhost:8085/harmony/push diff --git a/broker/src/main/java/cn/wildfirechat/push/PushServer.java b/broker/src/main/java/cn/wildfirechat/push/PushServer.java index e003ab084..f06951c1c 100644 --- a/broker/src/main/java/cn/wildfirechat/push/PushServer.java +++ b/broker/src/main/java/cn/wildfirechat/push/PushServer.java @@ -60,9 +60,6 @@ public void init(IConfig config, ISessionsStore sessionsStore) { this.androidPushServerUrl = config.getProperty(PUSH_ANDROID_SERVER_ADDRESS); this.iOSPushServerUrl = config.getProperty(PUSH_IOS_SERVER_ADDRESS); this.harmonyPushServerUrl = config.getProperty(PUSH_HARMONY_SERVER_ADDRESS); - if(StringUtil.isNullOrEmpty(harmonyPushServerUrl)) { - harmonyPushServerUrl = androidPushServerUrl; - } } public void pushMessage(PushMessage pushMessage, String deviceId, String pushContent) { diff --git a/distribution/src/main/resources/wildfirechat.conf b/distribution/src/main/resources/wildfirechat.conf index 2813f1487..ede2ce2d8 100755 --- a/distribution/src/main/resources/wildfirechat.conf +++ b/distribution/src/main/resources/wildfirechat.conf @@ -336,7 +336,7 @@ push.android.server.address http://localhost:8085/android/push ##注意回调是单线程回调，接收服务必须在同一内网，且异步处理快速返回，否则会有延迟问题！！ push.ios.server.address http://localhost:8085/ios/push -##鸿蒙推送服务器地址，如果不配置会使用android的地址。 +##鸿蒙推送服务器地址 ##注意回调是单线程回调，接收服务必须在同一内网，且异步处理快速返回，否则会有延迟问题！！ push.harmony.server.address http://localhost:8085/harmony/push