Merge branch '2.0' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into 2.0

server/svr-authentication/src/main/java/com/yihu/jw/security/oauth2/provider/endpoint/WlyyLoginEndpoint.java

@@ -2668,6 +2668,27 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
                return ObjEnvelop.getSuccess("修改成功！");
            }
            return ObjEnvelop.getError("手机号未注册！");
        } else if ("xm_dsyy_wx".equalsIgnoreCase(wechatId)) {
            WlyyHospitalSysDictDO wlyyHospitalSysDictDO = wlyyhospitalSysdictDao.findDictById("isNeedSMS");
            if (wlyyHospitalSysDictDO != null && !StringUtils.isEmpty(wlyyHospitalSysDictDO.getDictValue())) {
                if (captcha.equalsIgnoreCase(wlyyHospitalSysDictDO.getDictValue())) {
                } else {
                    return ObjEnvelop.getError("验证码错误！");
                }
            } else {
                if (wlyyRedisVerifyCodeService.verification(client_id, mobile, captcha)) {
                    //验证码正确
                } else {
                    return ObjEnvelop.getError("验证码错误！");
                }
            }
            String rs = registerService.updateDoctorPw(mobile, pw, wechatId);
            if ("ok".equals(rs)) {
                return ObjEnvelop.getSuccess("修改成功！");
            }
            return ObjEnvelop.getError("手机号未注册！");
        } else {
            return ObjEnvelop.getError("暂未开放");

server/svr-authentication/src/main/java/com/yihu/jw/security/service/RegisterService.java

@@ -246,8 +246,6 @@ public class RegisterService {
        }else{
            return "-1";
        }
        return "ok";
    }