修改好友欢迎提示方式，默认为关，需要在客户端上实现后打开

broker/src/main/java/io/moquette/BrokerConstants.java

@@ -135,6 +135,7 @@ public final class BrokerConstants {
     public static final String FRIEND_Repeat_Request_Duration = "friend.repeat_request_duration";
     public static final String FRIEND_Reject_Request_Duration = "friend.reject_request_duration";
     public static final String FRIEND_Request_Expiration_Duration = "friend.request_expiration_duration";
+    public static final String FRIEND_New_Welcome_Message = "friend.new_welcome_message";
 
     public static final String CHATROOM_Participant_Idle_Time = "chatroom.participant_idle_time";
     public static final String CHATROOM_Rejoin_When_Active = "chatroom.rejoin_when_active";

broker/src/main/java/io/moquette/imhandler/HandleFriendRequestHandler.java

@@ -43,7 +43,12 @@ public class HandleFriendRequestHandler extends IMHandler<WFCMessage.HandleFrien
                     if (session != null && !StringUtil.isNullOrEmpty(session.getLanguage())) {
                         language = session.getLanguage();
                     }
-                    WFCMessage.MessageContent.Builder contentBuilder = WFCMessage.MessageContent.newBuilder().setType(90).setContent(I18n.getString(language, "Above_Greeting_Message"));
+                    WFCMessage.MessageContent.Builder contentBuilder = WFCMessage.MessageContent.newBuilder();
+                    if (m_messagesStore.isNewFriendWelcomeMessage()) {
+                        contentBuilder.setType(92);
+                    } else {
+                        contentBuilder.setType(90).setContent(I18n.getString(language, "Above_Greeting_Message"));
+                    }
 
                     builder = WFCMessage.Message.newBuilder();
                     builder.setFromUser(request.getTargetUid());
@@ -56,7 +61,12 @@ public class HandleFriendRequestHandler extends IMHandler<WFCMessage.HandleFrien
                     builder.setMessageId(messageId);
                     saveAndPublish(request.getTargetUid(), null, builder.build(), false);
 
-                    contentBuilder.setContent(I18n.getString(language, "Friend_Can_Start_Chat"));
+                    if (m_messagesStore.isNewFriendWelcomeMessage()) {
+                        contentBuilder.setType(93);
+                    } else {
+                        contentBuilder.setContent(I18n.getString(language, "Friend_Can_Start_Chat"));
+                    }
+
                     builder.setContent(contentBuilder);
                     messageId = MessageShardingUtil.generateId();
                     builder.setMessageId(messageId);

broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java

@@ -127,6 +127,7 @@ public class MemoryMessagesStore implements IMessagesStore {
     private long mFriendRequestDuration = 7 * 24 * 60 * 60 * 1000;
     private long mFriendRejectDuration = 30 * 24 * 60 * 60 * 1000;
     private long mFriendRequestExpiration = 7 * 24 * 60 * 60 * 1000;
+    private boolean mFriendNewWelcomeMessage = false;
 
     private boolean mMultiPlatformNotification = false;
     private boolean mDisableStrangerChat = false;
@@ -204,6 +205,15 @@ public class MemoryMessagesStore implements IMessagesStore {
             printMissConfigLog(FRIEND_Request_Expiration_Duration, mFriendRequestExpiration + "");
         }
 
+        try {
+            mFriendNewWelcomeMessage = Boolean.parseBoolean(m_Server.getConfig().getProperty(FRIEND_New_Welcome_Message));
+        } catch (Exception e) {
+            e.printStackTrace();
+            Utility.printExecption(LOG, e);
+            printMissConfigLog(FRIEND_New_Welcome_Message, mFriendNewWelcomeMessage + "");
+        }
+
+
         try {
             mChatroomRejoinWhenActive = Boolean.parseBoolean(m_Server.getConfig().getProperty(BrokerConstants.CHATROOM_Rejoin_When_Active));
         } catch (Exception e) {
@@ -2436,6 +2446,11 @@ public class MemoryMessagesStore implements IMessagesStore {
         return true;
     }
 
+    @Override
+    public boolean isNewFriendWelcomeMessage() {
+        return mFriendNewWelcomeMessage;
+    }
+
     @Override
     public ErrorCode deleteFriend(String userId, String friendUid, long[] head) {
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();

broker/src/main/java/io/moquette/spi/IMessagesStore.java

@@ -167,6 +167,7 @@ public interface IMessagesStore {
 
     ErrorCode saveAddFriendRequest(String userId, WFCMessage.AddFriendRequest request, long[] head);
     ErrorCode handleFriendRequest(String userId, WFCMessage.HandleFriendRequest request, WFCMessage.Message.Builder msgBuilder, long[] heads, boolean isAdmin);
+    boolean isNewFriendWelcomeMessage();
     ErrorCode deleteFriend(String userId, String friendUid, long[] head);
     ErrorCode blackUserRequest(String fromUser, String targetUserId, int status, long[] head);
     FriendData getFriendData(String fromUser, String targetUserId);