Merge branch 'dev' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into dongj
This commit is contained in:
commit
d07b4eea66
|
@ -160,7 +160,7 @@ public class DsDataSourceUtil {
|
|||
return false;
|
||||
}
|
||||
} catch (Exception e) {
|
||||
logger.info("==================连接数据源失败===================");
|
||||
logger.error("测试数据源失败:"+e.getMessage());
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -131,7 +131,8 @@ public class SysApplicationDatabaseEntity extends BaseEntity {
|
|||
break;
|
||||
case "2": //sqlsever
|
||||
//jdbc:sqlserver://221.12.175.82:1433;DatabaseName=U8CLOUD;encrypt=false;trustServerCertificate=true
|
||||
sourceUrl.append("jdbc:jtds:sqlserver://").append(sourceIp).append(":").append(sourcePort).append("/").append(dbName).append(";encrypt=false;trustServerCertificate=true");
|
||||
//sourceUrl.append("jdbc:jtds:sqlserver://").append(sourceIp).append(":").append(sourcePort).append("/").append(dbName).append(";encrypt=false;trustServerCertificate=true");
|
||||
sourceUrl.append("jdbc:sqlserver://").append(sourceIp).append(":").append(sourcePort).append(";DatabaseName=").append(dbName).append(";encrypt=false;trustServerCertificate=true");
|
||||
break;
|
||||
case "3": //mysql
|
||||
//jdbc:mysql://hzya.ufyct.com:9096/businesscenternew?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
|
||||
|
|
Loading…
Reference in New Issue