init

ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/AuthAppController.java

@@ -5,10 +5,12 @@ import cn.hutool.core.util.PhoneUtil;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.xq.dto.app.login.LoginUser;
+import com.ruoyi.xq.dto.app.auth.LoginUser;
-import com.ruoyi.xq.dto.app.login.LoginVo;
+import com.ruoyi.xq.dto.app.auth.LoginVo;
+import com.ruoyi.xq.dto.app.auth.RegisterCode;
 import com.ruoyi.xq.dto.app.user.ResetPasswordReq;
 import com.ruoyi.xq.dto.common.sms.SmsCodeReq;
+import com.ruoyi.xq.enums.common.CodeEnum;
 import com.ruoyi.xq.manager.LoginManager;
 import com.ruoyi.xq.manager.CurrentUserManager;
 import com.ruoyi.xq.service.SmsVerifyService;
@@ -76,6 +78,19 @@ public class AuthAppController {
         return R.ok();
     }
 
+
+    @PostMapping("/resetPassword/code")
+    @Operation(summary = "获取重置密码验证码")
+    @Log(title = "获取重置密码验证码", businessType = BusinessType.OTHER, isSaveDb = false)
+    public R<Map<String,String>> resetPasswordCode(@Validated @RequestBody RegisterCode code){
+        boolean mobile = PhoneUtil.isMobile(code.getMobile());
+        if(!mobile){
+            return R.fail(600,"请输入正确的手机格式");
+        }
+        smsVerifyService.put(CodeEnum.RESET_PASSWORD,code.getMobile());
+        return R.ok("发送成功");
+    }
+
     @PostMapping("/resetPassword")
     @Operation(summary = "重置密码")
     @Log(title = "重置密码", businessType = BusinessType.OTHER, isSaveDb = false)

ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/areacode/AreaCodeQuery.java

@@ -7,4 +7,6 @@ import lombok.Data;
 public class AreaCodeQuery {
     @Schema(description = "父级节点（传0返回一级节点）")
     private Integer pcode;
+    @Schema(description = "查询区域 province:省份、city:市、district:区县")
+    private String level;
 }

ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/auth/LoginUser.java

@@ -1,4 +1,4 @@
-package com.ruoyi.xq.dto.app.login;
+package com.ruoyi.xq.dto.app.auth;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/auth/LoginVo.java

@@ -1,4 +1,4 @@
-package com.ruoyi.xq.dto.app.login;
+package com.ruoyi.xq.dto.app.auth;
 
 import com.ruoyi.xq.dto.app.user.vo.CurrentUserInfoVo;
 import lombok.Data;

ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/auth/RegisterCode.java

@@ -0,0 +1,11 @@
+package com.ruoyi.xq.dto.app.auth;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+
+@Data
+public class RegisterCode {
+    @NotEmpty(message = "手机号不能为空")
+    private String mobile;
+}

ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/AreaCodeServiceImpl.java

@@ -1,5 +1,6 @@
 package com.ruoyi.xq.service.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.xq.domain.AreaCode;
@@ -22,7 +23,8 @@ public class AreaCodeServiceImpl extends ServiceImpl<AreaCodeMapper,AreaCode> im
     @Override
     public List<AreaCode> listAreaCode(AreaCodeQuery query) {
         List<AreaCode> list = this.list(Wrappers.lambdaQuery(AreaCode.class)
-                .eq(AreaCode::getPcode, query.getPcode()));
+                .eq(query.getPcode() != null,AreaCode::getPcode, query.getPcode())
+                .eq(StringUtils.isNotBlank(query.getLevel()),AreaCode::getLevel,query.getLevel()));
         return list;
     }
 }