bug修复

admin

2022-01-28 cd7767932dddeaf6d9c73a83d4a9b38f0341b77f

 src/main/java/com/yeshi/buwan/controller/parser/UserParser.java

@@ -15,8 +15,10 @@
import com.yeshi.buwan.dto.search.SolrShortVideoSearchFilter;
import com.yeshi.buwan.dto.search.SolrVideoSearchFilter;
import com.yeshi.buwan.dto.user.LoginInfoDto;
import com.yeshi.buwan.exception.SMSException;
import com.yeshi.buwan.exception.user.LoginUserException;
import com.yeshi.buwan.exception.user.RegisterUserException;
import com.yeshi.buwan.service.inter.SMSService;
import com.yeshi.buwan.videos.pptv.PPTVUtil;
import com.yeshi.buwan.service.imp.*;
import com.yeshi.buwan.service.inter.juhe.InternetSearchVideoService;
@@ -95,6 +97,9 @@

    @Resource
    private RedisManager redisManager;

    @Resource
    private SMSService smsService;

    public void getUid(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
        DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
@@ -721,7 +726,7 @@

    //新版热门搜索
    public void getHotSearchNew(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
        DetailSystemConfig config = configService.getConfigByKey("hot_search",  acceptData.getDetailSystem(), acceptData.getVersion());
        DetailSystemConfig config = configService.getConfigByKey("hot_search", acceptData.getDetailSystem(), acceptData.getVersion());
        if (config == null) {
            out.print(JsonUtil.loadFalseJson("无内容"));
            return;
@@ -1168,13 +1173,41 @@
            content = title;
        }

        boolean isS = MailSenderUtil.sendEmail(account, "ysyz17784739772@126.com", "weikou2014", title,
        boolean isS = MailSenderUtil.sendEmail(account, "app_yzm_zc@163.com", "KZKSRTEMDWEQRAQR", title,
                content);
        // }

        // }).start();
        out.print(JsonUtil.loadTrueJson("验证码发送成功"));
    }


    public void sendSMSCode(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
        String phone = request.getParameter("phone");

        if (StringUtil.isNullOrEmpty(phone)) {
            out.print(JsonUtil.loadFalseJson("电话号码不能为空"));
            return;
        }

        if (!StringUtil.isMobile(phone)) {
            out.print(JsonUtil.loadFalseJson("电话号码格式不正确"));
            return;
        }

        try {
            smsService.sendLoginVCode(phone, 6,acceptData.getDetailSystem().getId(),acceptData.getVersion());
        } catch (SMSException e) {
            e.printStackTrace();
            out.print(JsonUtil.loadFalseJson(e.getMessage()));
            return;
        } catch (Exception e) {
            out.print(JsonUtil.loadFalseJson("短信发送出错，请稍后再试"));
            return;
        }
        out.print(JsonUtil.loadTrueJson(""));
    }


    /**
     * 登录
@@ -1213,6 +1246,64 @@
        }
    }


    /**
     * 登录
     *
     * @param request
     * @param out
     */
    public void phoneLogin(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
        String account = request.getParameter("phone");// 邮箱
        String vcode = request.getParameter("code");// 密码
        if (StringUtil.isNullOrEmpty(account)) {
            out.print(JsonUtil.loadFalseJson("请上传手机号"));
            return;
        }

        if (StringUtil.isNullOrEmpty(vcode)) {
            out.print(JsonUtil.loadFalseJson("请上传验证码"));
            return;
        }

        if (!smsService.verifyLoginVCode(account, vcode,acceptData.getDetailSystem().getId(),acceptData.getVersion())) {
            out.print(JsonUtil.loadFalseJson("验证码错误"));
            return;
        }

        LoginInfoDto loginInfoDto = new LoginInfoDto();
        loginInfoDto.setLoginType(LoginUser.LOGIN_TYPE_PHONE);
        loginInfoDto.setSystemId(acceptData.getDetailSystem().getSystem().getId());
        loginInfoDto.setPhone(account);
        loginInfoDto.setSmsCode(vcode);
        loginInfoDto.setIpInfo(IPUtil.getRemotIP(request) + ":" + request.getRemotePort());
        try {
            LoginUser user = userService.login(loginInfoDto);
            out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(user)));
        } catch (LoginUserException e) {
            //用户不存在
            if (e.getCode() == LoginUserException.CODE_NO_USER) {
                //注册用户
                try {
                    userService.register(loginInfoDto);
                    //注册成功，开始登录
                    try {
                        LoginUser user = userService.login(loginInfoDto);
                        out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(user)));
                    } catch (LoginUserException e2) {
                        out.print(JsonUtil.loadFalseJson("登录出错，请稍后再试"));
                    }

                } catch (RegisterUserException e1) {
                    e1.printStackTrace();
                    out.print(JsonUtil.loadFalseJson("登录出错，请稍后再试"));
                }
            } else {
                out.print(JsonUtil.loadFalseJson(e.getMessage()));
            }
        }
    }

    /**
     * 更改用户信息
     *