~

gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppLoginController.java

@@ -143,6 +143,7 @@ public class AppLoginController {
                     break;
             }
         } else {
+            log.info("其他学校：----------" + register.getInvitationCode());
             if ("其他".equals(appSchool.getName()) && org.apache.commons.lang3.StringUtils.isNotBlank(registerForm.getInvitationCode())) {
                 AppCode appCode = appCodeMapper.selectAppCodeByCode(registerForm.getInvitationCode());
                 if (appCode == null || appCode.getUserId() != null) {

gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PhoneCodeController.java

@@ -50,11 +50,13 @@ public class PhoneCodeController {
         if ("OK".equals(send)) {
             return AjaxResult.success();
         }
+        if (send.contains("触发分钟级流控")) {
+            return AjaxResult.error(2001,"发送频率过高，请1分钟后再试！");
+        }
         log.info("短信验证码发送失败:-------------------- " + send);
         return AjaxResult.error("短信验证码发送失败", send);
     }
 
-
     /**
      *  验证码校验
      * @param phoneNumber 手机号

gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/form/RegisterForm.java

@@ -10,6 +10,8 @@ import lombok.Data;
 @ApiModel("注册表单")
 public class RegisterForm {
 
+    private String code;
+
     @ApiModelProperty("邀请码")
     private String invitationCode;
 

gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserFriendServiceImpl.java

@@ -52,10 +52,12 @@ public class AppUserFriendServiceImpl implements IAppUserFriendService
         List<AppUserFriendVo> list = appUserFriendMapper.selectFriendList(appUserFriend);
         for (AppUserFriendVo appUserFriendVo : list) {
             AppUser appUser = appUserMapper.selectAppUserById(appUserFriendVo.getUserId());
-            appUserFriendVo.setFUsername(appUser.getUsername());
-            appUserFriendVo.setFAvatarUrl(appUser.getAvatarUrl());
-            appUserFriendVo.setFNickname(appUser.getNickname());
-            appUserFriendVo.setFCheck(appUser.getCheck());
+            if (appUser != null) {
+                appUserFriendVo.setFUsername(appUser.getUsername());
+                appUserFriendVo.setFAvatarUrl(appUser.getAvatarUrl());
+                appUserFriendVo.setFNickname(appUser.getNickname());
+                appUserFriendVo.setFCheck(appUser.getCheck());
+            }
         }
         return list;
     }

gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppMessageMapper.xml

@@ -34,8 +34,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="username != null "> and u.username like concat('%',#{username},'%')</if>
             <if test="content != null  and content != ''"> and a.content like concat('%',#{content},'%')</if>
             <if test="imgUrl != null  and imgUrl != ''"> and a.img_url = #{imgUrl}</if>
-            <if test="type != null  and type != ''"> and a.type = #{type}</if>
+            <if test="type != null"> and a.type = #{type}</if>
         </where>
+        order by a.create_time desc
     </select>
     
     <select id="selectAppMessageById" parameterType="Long" resultMap="AppMessageResult">