update

liujie

2026-08-26 d7fd9123c3e100e5fc8079fea8d9cacf8afd4a32

 cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java

@@ -11,6 +11,7 @@
import com.dsh.account.model.AdvertisementChangeStateDTO;
import com.dsh.account.model.AppUserByNameAndPhoneDTO;
import com.dsh.account.model.AppUserIdsByCityName;
import com.dsh.account.model.ImageCaptchaVo;
import com.dsh.account.model.JoinPlayPaiVo;
import com.dsh.account.model.LoginSMSCodeVo;
import com.dsh.account.model.LoginWeChatVo;
@@ -61,6 +62,8 @@

    @Autowired
    private TAppUserService appUserService;
    @Autowired
    private ImageCaptchaService imageCaptchaService;
    @Autowired
    private VipClient vipClient;

@@ -316,28 +319,121 @@
    }

    @ResponseBody
    @PostMapping("/base/appUser/getSMSCode")
    @ApiOperation(value = "获取短信验证码", tags = {"APP-登录注册"})
    @PostMapping("/base/appUser/imageCaptcha")
    @ApiOperation(value = "获取短信发送前置图形验证码", tags = {"APP-登录注册"})
    @ApiImplicitParams({
            @ApiImplicitParam(value = "类型（1：登录，2：注册，3：修改密码，4：忘记密码）", name = "type", dataType = "int", required = true),
            @ApiImplicitParam(value = "电话号码", name = "phone", dataType = "string", required = true)
    })
    public ResultUtil getSMSCode(Integer type, String phone) {
        if (ToolUtil.isEmpty(phone)) {
    public ResultUtil<ImageCaptchaVo> getImageCaptcha(Integer type, String phone, HttpServletRequest request) {
        if (!isValidPhone(phone)) {
            return ResultUtil.paranErr("phone");
        }
        if (ToolUtil.isEmpty(type)) {
        if (!isValidSmsType(type)) {
            return ResultUtil.paranErr("type");
        }
        try {
            ResultUtil smsCode = appUserService.getSMSCode(type, phone);
            return smsCode;
            ImageCaptchaVo captcha = imageCaptchaService.create(phone, type, getClientIp(request));
            if (captcha == null) {
                return ResultUtil.error("图形验证码获取过于频繁，请稍后重试", null);
            }
            return ResultUtil.success(captcha);
        } catch (Exception e) {
            e.printStackTrace();
            return ResultUtil.runErr();
        }
    }

    @ResponseBody
    @PostMapping("/base/appUser/getSMSCode")
    @ApiOperation(value = "获取短信验证码", tags = {"APP-登录注册"})
    @ApiImplicitParams({
            @ApiImplicitParam(value = "类型（1：登录，2：注册，3：修改密码，4：忘记密码）", name = "type", dataType = "int", required = true),
            @ApiImplicitParam(value = "电话号码", name = "phone", dataType = "string", required = true),
            @ApiImplicitParam(value = "图形验证码唯一标识", name = "captchaId", dataType = "string", required = true),
            @ApiImplicitParam(value = "图形验证码", name = "captchaCode", dataType = "string", required = true)
    })
    public ResultUtil getSMSCode(Integer type, String phone, String captchaId, String captchaCode,
                                 HttpServletRequest request) {
        if (!isValidPhone(phone)) {
            return ResultUtil.paranErr("phone");
        }
        if (!isValidSmsType(type)) {
            return ResultUtil.paranErr("type");
        }
        if (ToolUtil.isEmpty(captchaId)|| ToolUtil.isEmpty(captchaCode) ) {
            return ResultUtil.error("系统维护中，注册或登录请联系场地管理员");
        }
        if (!imageCaptchaService.verifyAndConsume(captchaId, captchaCode, phone, type)) {
            return ResultUtil.error("图形验证码错误或已失效，请刷新后重试");
        }
        try {
            return appUserService.getSMSCode(type, phone, getClientIp(request));
        } catch (Exception e) {
            e.printStackTrace();
            return ResultUtil.runErr();
        }
    }

    private boolean isValidPhone(String phone) {
        return phone != null && phone.matches("^1\\d{10}$");
    }

    private boolean isValidSmsType(Integer type) {
        return type != null && type >= 1 && type <= 4;
    }

    private String getClientIp(HttpServletRequest request) {
        String remoteAddress = request.getRemoteAddr();
        if (!isInternalProxyAddress(remoteAddress)) {
            return remoteAddress;
        }

        String forwardedFor = request.getHeader("X-Forwarded-For");
        if (ToolUtil.isNotEmpty(forwardedFor)) {
            String[] addresses = forwardedFor.split(",");
            for (int i = addresses.length - 1; i >= 0; i--) {
                String clientIp = addresses[i].trim();
                if (isValidIpText(clientIp) && !isInternalProxyAddress(clientIp)) {
                    return clientIp;
                }
            }
        }
        String realIp = request.getHeader("X-Real-IP");
        if (isValidIpText(realIp)) {
            return realIp.trim();
        }
        return remoteAddress;
    }

    private boolean isInternalProxyAddress(String ip) {
        if (ip == null) {
            return false;
        }
        if ("127.0.0.1".equals(ip) || "0:0:0:0:0:0:0:1".equals(ip) || "::1".equals(ip)
                || ip.startsWith("10.") || ip.startsWith("192.168.")) {
            return true;
        }
        if (ip.startsWith("172.")) {
            String[] parts = ip.split("\\.");
            if (parts.length == 4) {
                try {
                    int secondPart = Integer.parseInt(parts[1]);
                    return secondPart >= 16 && secondPart <= 31;
                } catch (NumberFormatException ignored) {
                    return false;
                }
            }
        }
        return false;
    }

    private boolean isValidIpText(String ip) {
        return ToolUtil.isNotEmpty(ip)
                && ip.length() <= 45
                && ip.trim().matches("[0-9a-fA-F:.]+");
    }


    @Autowired
    private TStudentService studentService;