Merge branch 'master-modify-cutAmount' into dev

# Conflicts:
#	xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/MsgBiz.java

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/MsgBiz.java

@@ -324,14 +324,11 @@ public class MsgBiz {
 
     public Integer getNumber() {
         Integer number = 0;
-        Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
-        if (MapUtils.isNotEmpty(dictionaryMap)) {
-            Dictionary dictionary = dictionaryMap.get(IM_TYPE + "_" + DictionaryKey.MSG_LIMIT_NUMBER);
+            Dictionary dictionary =  thirdFeign.findDictionaryByTypeAndCode(IM_TYPE, DictionaryKey.MSG_LIMIT_NUMBER);
             if (dictionary != null && StringUtils.isNotBlank(dictionary.getDetail())) {
                 log.info("查询IM限制数为字典表的结果为： dictionary = {}", dictionary.toString());
                 number = Integer.parseInt(dictionary.getDetail());
             }
-        }
         log.info("IM消息数限制为： number = {}", number);
         return number;
     }