Merge remote-tracking branch 'origin/master-modify-cutAmount' into master-modify-cutAmount

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java

@@ -1024,8 +1024,10 @@ public class AppPermissionService {
         }
         Map<Integer, AppUserDetail> userIdAndAppUserDetail = appUserDetailBiz.findUserIdAndUserDetailMapByMemberIds(Arrays.asList(appUserLogin.getId()));
         AppUserDetail appUserDetail = userIdAndAppUserDetail.get(appUserLogin.getId());
-        imiVo.setNickname(appUserDetail.getNickname());
-        imiVo.setHeadimgurl(appUserDetail.getHeadimgurl());
+        if (appUserDetail != null) {
+            imiVo.setNickname(appUserDetail.getNickname());
+            imiVo.setHeadimgurl(appUserDetail.getHeadimgurl());
+        }
         return imiVo;
     }
 

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/constant/DictionaryKey.java

@@ -7,6 +7,15 @@ public class DictionaryKey {
      */
     public static final String APP_ORDER ="APP_ORDER";
 
+    /**
+     * IM类型
+     */
+    public static final String IM_TYPE ="IM_TYPE";
+
+    /**
+     * IM限制条数
+     */
+    public static final String MSG_LIMIT_NUMBER ="MSG_LIMIT_NUMBER";
     /**
      * 支付
      */