放行注册

wisenergy-mapper/src/main/resources/mapper/VolunteerMapper.xml

@@ -148,10 +148,10 @@
         <where>
             is_delete =0
             <if test="upGrade != null">
-                and #{upGrade} > lowest_mark
+                and #{upGrade} >= lowest_mark
             </if>
             <if test="downGrade != null">
-                and lowest_mark >#{downGrade}
+                and lowest_mark >=#{downGrade}
             </if>
             <if test="type != null">
                 and type =#{type}

wisenergy-model/src/main/java/cn/wisenergy/model/enums/SourceType.java

@@ -11,7 +11,9 @@ public enum SourceType {
     //PC
     PC(1, "PC"),
 
-    APP(2, "APP");
+    h5(2, "h5"),
+
+    Applet(3, "Applet");
     private Integer code;
 
     private String desc;

wisenergy-service/src/main/java/cn/wisenergy/service/app/SendSmsSerVice.java

@@ -26,7 +26,7 @@ public interface SendSmsSerVice {
      * @param phone  手机号码
      * @param code   手机验证码
      * @param type   场景类型 1:验证码登录 2:手机注册 3:修改密码 4：找回密码
-     * @param source 来源 PC/APP
+     * @param source 来源 PC/h5/小程序
      * @return 是否通过校验 true通过，false不通过
      */
     R<Boolean> valid(String phone, String code, Integer type, String source);

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/StaffUserVipController.java

@@ -36,6 +36,10 @@ public class StaffUserVipController {
         return staffUserVipService.staffLogin(loginVo);
     }
 
+   /* public R<Boolean> loginOut(){
+        return true;
+    }*/
+
     @ApiOperation(value = "添加Vip客户",notes = "添加Vip客户",httpMethod = "POST")
     @ApiModelProperty(name = "staffAddDto",value = "登录信息",dataType = "StaffAddDto")
     @PostMapping("/addVipUser")

wisenergy-web-admin/src/main/java/cn/wisenergy/web/shir/config/ShiroConfig.java

@@ -74,6 +74,8 @@ public class ShiroConfig {
 
         filterChainDefinitionMap.put("/authInformation/save", "anon");//存储设备IMEI号和手机SIM卡ID号
         filterChainDefinitionMap.put("/user/login/*", "anon"); // 登录页面-身份认证
+        filterChainDefinitionMap.put("/user/sendSms", "anon"); // 发送验证码
+        filterChainDefinitionMap.put("/user/valid", "anon"); // 缓存验证码
         filterChainDefinitionMap.put("/account/login", "anon"); // 登录页面-身份认证
         filterChainDefinitionMap.put("/staffUser/login", "anon"); // 登录页面-身份认证
         filterChainDefinitionMap.put("/swagger-ui.html", "anon"); // swagger接口-匿名访问