修改短信验证

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/SchemeServiceImpl.java

@@ -247,6 +247,8 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
             return R.error("保存方案查询记录失败!");
         }
 
+        //排序
+        list.sort(Comparator.comparing(Volunteer::getLowestMark).reversed());
         volunteerVo.setUserId(user.getId());
         volunteerVo.setVolunteers(list);
         return R.ok(volunteerVo);
@@ -711,7 +713,6 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
             List<Volunteer> volunteers = otherList.subList(0, number);
             result.addAll(volunteers);
         }
-        result.sort(Comparator.comparing(Volunteer::getLowestMark).reversed());
         return result;
     }
 }

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/SendSmsSerViceImpl.java

@@ -91,7 +91,7 @@ public class SendSmsSerViceImpl implements SendSmsSerVice {
             e.printStackTrace();
         }
 
-        return R.ok(bool);
+        return R.ok(0,true);
     }
 
     @Override
@@ -103,7 +103,7 @@ public class SendSmsSerViceImpl implements SendSmsSerVice {
         //判断缓存是否过期
         long time = redisService.getExpire(key);
         if (time < 0) {
-            return R.error("验证码已过期!");
+            return R.error(1,"验证码已过期!",false);
         }
 
         //redis中获取验证码
@@ -114,6 +114,8 @@ public class SendSmsSerViceImpl implements SendSmsSerVice {
                 //验证码存在，校验通过，清除验证码缓存
                 redisService.del(key);
                 return R.ok(0, true);
+            } else {
+                return R.error(1,"验证码错误!",false);
             }
         }
         return R.ok(1, false);

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserLoginServiceImpl.java

@@ -278,11 +278,11 @@ public class UserLoginServiceImpl extends ServiceImpl<UsersMapper, User> impleme
             return R.error("用户信息不存在，无法重置密码!");
         }
 
-//        //验证验证码
-//        R<Boolean> bool = sendSmsSerVice.valid(userVo.getPhone(), userVo.getCode(), userVo.getScene(), userVo.getSource());
-//        if (null != bool && bool.getCode() == ERROR_CODE) {
-//            return R.ok(1, false);
-//        }
+        //验证验证码
+        R<Boolean> bool = sendSmsSerVice.valid(userVo.getPhone(), userVo.getCode(), userVo.getScene(), userVo.getSource());
+        if (null != bool && bool.getCode() == ERROR_CODE) {
+            return R.error(1, bool.getMessage(), false);
+        }
 
         //3、设置新密码
         String password = Md5Util.digestMD5(userVo.getPassword() + userVo.getPhone());

wisenergy-web-admin/src/main/java/cn/wisenergy/web/config/swagger/Swagger2.java

@@ -39,7 +39,7 @@ public class Swagger2 {
     private ApiInfo apiInfo() {
         return new ApiInfoBuilder()
                 //页面标题
-                .title("智能垃圾分类")
+                .title("高考志愿一点通")
                 //创建人
                 .contact(new Contact("WYY", "", ""))
                 //版本号