代码修改

common/common-util/src/main/java/com/yihu/jw/util/sql/SqlConstants.java

@@ -78,7 +78,7 @@ public class SqlConstants {
    public static final String EVENT_NO = "event_no";
    public static final String EVENT_TIME = "event_time";
    public static final String ORG_CODE = "rscom_org_code";
    public static final String MYSQL_DRIVER = "com.mysql.jdbc.Driver";
    public static final String MYSQL_DRIVER = "com.mysql.cj.jdbc.Driver";
    public static final String ORACLE_DRIVER = "oracle.jdbc.driver.OracleDriver";
    public static final String SQLSERVER_DRIVER = "com.microsoft.sqlserver.jdbc.SQLServerDriver";
    public static final String MYSQL = "mysql";

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

@@ -2143,7 +2143,8 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
        return ObjEnvelop.getError("登录失败！");
    }*/
    @RequestMapping(value = "/oauth/registerPatientAndLogin", method = RequestMethod.POST)
    public ObjEnvelop registerPatientAndLogin(String name, String mobile, String idcard, String ssc, String pw,String client_id,String login_type,String captcha,String openid,String wxId
    public ObjEnvelop registerPatientAndLogin(String name, String mobile, String idcard, String ssc, String pw,
                                              String client_id,String login_type,String captcha,String openid,String wxId
    ,String geetestChallenge,String geetestValidate,String geetestSeccode )throws Exception{
        if (StringUtils.isEmpty(client_id)) {
@@ -2239,7 +2240,7 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
        }else {
            try {
                Map<String,Object> rs = registerService.registerPatient(mobile,pw,name,idcard,openid);
                Map<String,Object> rs = registerService.registerPatient(mobile,pw,name,idcard,ssc,openid);
                String code = rs.get("code").toString();
                if(!"1".equals(code)){
                    ObjEnvelop objEnvelop = new ObjEnvelop();
@@ -2296,27 +2297,55 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
    }
    @RequestMapping(value = "/oauth/findPatientPw", method = RequestMethod.POST)
    public Envelop findPatientPw(String mobile,String client_id,String login_type,String captcha,String pw)throws Exception {
        WlyyHospitalSysDictDO wlyyHospitalSysDictDO = wlyyhospitalSysdictDao.findDictById("isNeedSMS");
        if (wlyyHospitalSysDictDO!=null&&!StringUtils.isEmpty(wlyyHospitalSysDictDO.getDictValue())){
            if (captcha.equalsIgnoreCase(wlyyHospitalSysDictDO.getDictValue())){
    public Envelop findPatientPw(String mobile,String client_id,String login_type,String captcha
            ,String pw,String key,String idcard,String text){
        try {
            if(StringUtils.isEmpty(idcard)){
                return ObjEnvelop.getError("手机号码不能为空！");
            }
            if(StringUtils.isEmpty(mobile)){
                return ObjEnvelop.getError("手机号码不能为空！");
            }
            if(StringUtils.isEmpty(key)||StringUtils.isEmpty(text)){
                return ObjEnvelop.getError("图形验证码不能为空！");
            }
            if(!verifyCaptcha(key,text)){
                throw new ImgCaptchaException("图形验证码错误！");
            }
            Integer re = registerService.checkeMobileAndIdcard(mobile,idcard);
            if(re == -1){
                return ObjEnvelop.getError("居民不存在！");
            }else if(re == -2){
                return ObjEnvelop.getError("身份证和手机号码不匹配！");
            }
            WlyyHospitalSysDictDO wlyyHospitalSysDictDO = wlyyhospitalSysdictDao.findDictById("isNeedSMS");
            if (wlyyHospitalSysDictDO!=null&&!StringUtils.isEmpty(wlyyHospitalSysDictDO.getDictValue())){
                if (captcha.equalsIgnoreCase(wlyyHospitalSysDictDO.getDictValue())){
                }else {
                    return ObjEnvelop.getError("短信验证码错误！");
                }
            }else {
                return ObjEnvelop.getError("验证码错误！");
                if (wlyyRedisVerifyCodeService.verification(client_id, mobile, captcha)) {
                    //验证码正确
                } else {
                    return ObjEnvelop.getError("短信验证码错误！");
                }
            }
        }else {
            if (wlyyRedisVerifyCodeService.verification(client_id, mobile, captcha)) {
                //验证码正确
            } else {
                return ObjEnvelop.getError("验证码错误！");
            String rs = registerService.updatePatientPw(pw,mobile);
            if("ok".equals(rs)){
                return ObjEnvelop.getSuccess("修改成功！");
            }
        }
        String rs = registerService.updatePatientPw(pw,mobile);
        if("ok".equals(rs)){
            return ObjEnvelop.getSuccess("修改成功！");
        }
        return ObjEnvelop.getError("手机号未注册！");
            return ObjEnvelop.getError("手机号未注册！");
        }catch (Exception e){
            e.printStackTrace();
        }
        return Envelop.getError("系统繁忙，请稍后在试");
    }
    @RequestMapping(value = "/oauth/findDoctorPw", method = RequestMethod.POST)
    public Envelop findDoctorPw(String mobile,String client_id,String captcha,String pw) throws Exception{

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

@@ -123,7 +123,7 @@ public class RegisterService {
        rs.put("mes","保存用户信息失败");
        return rs;
    }
    public Map<String,Object> registerPatient(String mobile,String pw,String name,String idcard,String openid)throws Exception{
    public Map<String,Object> registerPatient(String mobile,String pw,String name,String idcard,String ssc,String openid)throws Exception{
        Map<String,Object> rs = new HashedMap();
        try{
@@ -141,6 +141,7 @@ public class RegisterService {
            patient.setDel("1");
            patient.setEnabled(1);
            patient.setLocked(0);
            patient.setSsc(ssc);
            patient.setCreateTime(new Date());
            patient.setUpdateTime(new Date());
            if(StringUtils.isNoneBlank(name)){
@@ -195,6 +196,17 @@ public class RegisterService {
        return rs;
    }
    public Integer checkeMobileAndIdcard(String mobile,String idcard){
        BasePatientDO patientDO =  basePatientDao.findByIdcardAndDel(idcard, "1");
        if(patientDO==null){
            return -1;
        }
        if(!mobile.equals(patientDO.getMobile())){
            return -2;
        }
        return 1;
    }
    public String updatePatientPw(String pw,String mobile){
        List<BasePatientDO> list = basePatientDao.findByMobileAndDel(mobile,"1");

starter/mysql-starter/src/main/java/com/yihu/jw/mysql/jdbc/DBDriver.java

@@ -28,7 +28,7 @@ public class DBDriver {
    public static String getDriver(String uri) {
        if (uri.startsWith("jdbc:mysql")) {
            return "com.mysql.jdbc.Driver";
            return "com.mysql.cj.jdbc.Driver";
        } else if (uri.startsWith("jdbc:oracle")) {
            return "oracle.jdbc.driver.OracleDriver";
        } else if (uri.startsWith("jdbc:hive2")) {

svr/svr-basic/src/main/java/com/yihu/jw/basic/system/dao/DatasourceDao.java

@@ -4,7 +4,6 @@ import com.yihu.jw.basic.standard.dao.SQLGeneralDAO;
import com.yihu.jw.basic.system.model.SystemDatasource;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import org.hibernate.query.Query;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.stereotype.Repository;
import org.springframework.util.StringUtils;
@@ -34,7 +33,7 @@ public class DatasourceDao extends SQLGeneralDAO {
        {
            case "mysql"://"MYSQL"
            {
                driver = "com.mysql.jdbc.Driver";
                driver = "com.mysql.cj.jdbc.Driver";
                break;
            }
            case "oracle"://ORACLE