lywsvip/magic-api
1
0
Fork 0
mirror of https://gitee.com/ssssssss-team/magic-api.git synced 2026-06-09 02:13:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复未配置数据源时无法启动的问题

Browse Source
This commit is contained in:
mxd
2021-08-10 20:36:09 +08:00
parent 539b13704c
commit ad246b507c
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/MagicAPIAutoConfiguration.java
View File

@@ -230,9 +230,6 @@ public class MagicAPIAutoConfiguration implements WebMvcConfigurer, WebSocketCon
throw new MagicAPIException("当前未配置数据源，如已配置，请引入 spring-boot-starter-jdbc 后在试!");
}
MagicDynamicDataSource.DataSourceNode dataSourceNode = magicDynamicDataSource.getDataSource(resourceConfig.getDatasource());
if (dataSourceNode == null) {
throw new IllegalArgumentException(String.format("找不到数据源:%s", resourceConfig.getDatasource()));
}
return new DatabaseResource(new JdbcTemplate(dataSourceNode.getDataSource()), resourceConfig.getTableName(), resourceConfig.getPrefix(), resourceConfig.isReadonly());
}
@@ -250,9 +247,6 @@ public class MagicAPIAutoConfiguration implements WebMvcConfigurer, WebSocketCon
public MagicBackupService magicDatabaseBackupService(MagicDynamicDataSource magicDynamicDataSource) {
BackupConfig backupConfig = properties.getBackupConfig();
MagicDynamicDataSource.DataSourceNode dataSourceNode = magicDynamicDataSource.getDataSource(backupConfig.getDatasource());
if (dataSourceNode == null) {
throw new IllegalArgumentException(String.format("找不到数据源:%s", backupConfig.getDatasource()));
}
return new MagicDatabaseBackupService(new JdbcTemplate(dataSourceNode.getDataSource()), backupConfig.getTableName());
}
@@ -408,6 +402,9 @@ public class MagicAPIAutoConfiguration implements WebMvcConfigurer, WebSocketCon
PageProvider pageProvider,
SqlCache sqlCache) {
SQLModule sqlModule = new SQLModule(dynamicDataSource);
if(!dynamicDataSource.isEmpty()){
sqlModule.setDataSourceNode(dynamicDataSource.getDataSource());
}
sqlModule.setResultProvider(resultProvider);
sqlModule.setPageProvider(pageProvider);
sqlModule.setSqlInterceptors(sqlInterceptorsProvider.getIfAvailable(Collections::emptyList));

19
magic-api/src/main/java/org/ssssssss/magicapi/modules/SQLModule.java
View File

@@ -73,7 +73,6 @@ public class SQLModule extends HashMap<String, SQLModule> implements MagicModule
public SQLModule(MagicDynamicDataSource dynamicDataSource) {
this.dynamicDataSource = dynamicDataSource;
this.dataSourceNode = dynamicDataSource.getDataSource();
}
@UnableCall
@@ -115,7 +114,8 @@ public class SQLModule extends HashMap<String, SQLModule> implements MagicModule
this.sqlInterceptors = sqlInterceptors;
}
private void setDataSourceNode(DataSourceNode dataSourceNode) {
@UnableCall
public void setDataSourceNode(DataSourceNode dataSourceNode) {
this.dataSourceNode = dataSourceNode;
}
@@ -290,9 +290,16 @@ public class SQLModule extends HashMap<String, SQLModule> implements MagicModule
@UnableCall
public List<Map<String, Object>> select(BoundSql boundSql) {
assertDatasourceNotNull();
return boundSql.getCacheValue(this.sqlInterceptors, () -> dataSourceNode.getJdbcTemplate().query(boundSql.getSql(), this.columnMapRowMapper, boundSql.getParameters()));
}
private void assertDatasourceNotNull(){
if(dataSourceNode == null){
throw new NullPointerException("当前数据源未设置");
}
}
/**
* 执行update
*/
@@ -303,6 +310,7 @@ public class SQLModule extends HashMap<String, SQLModule> implements MagicModule
@UnableCall
public int update(BoundSql boundSql) {
assertDatasourceNotNull();
sqlInterceptors.forEach(sqlInterceptor -> sqlInterceptor.preHandle(boundSql, RequestContext.getRequestEntity()));
int value = dataSourceNode.getJdbcTemplate().update(boundSql.getSql(), boundSql.getParameters());
if (this.cacheName != null) {
@@ -330,6 +338,7 @@ public class SQLModule extends HashMap<String, SQLModule> implements MagicModule
}
void insert(BoundSql boundSql, MagicKeyHolder keyHolder) {
assertDatasourceNotNull();
sqlInterceptors.forEach(sqlInterceptor -> sqlInterceptor.preHandle(boundSql, RequestContext.getRequestEntity()));
dataSourceNode.getJdbcTemplate().update(con -> {
PreparedStatement ps = keyHolder.createPrepareStatement(con, boundSql.getSql());
@@ -346,6 +355,7 @@ public class SQLModule extends HashMap<String, SQLModule> implements MagicModule
*/
@Comment("批量执行insert操作，返回插入主键数组")
public int[] batchInsert(@Comment("`SQL`语句") String sql, @Comment("参数") List<Object[]> list) {
assertDatasourceNotNull();
return dataSourceNode.getJdbcTemplate().batchUpdate(sql, list);
}
@@ -354,6 +364,7 @@ public class SQLModule extends HashMap<String, SQLModule> implements MagicModule
*/
@Comment("批量执行insert操作，返回插入主键数组")
public int[] batchInsert(@Comment("`SQL`语句") String[] sqls) {
assertDatasourceNotNull();
return dataSourceNode.getJdbcTemplate().batchUpdate(sqls);
}
@@ -388,6 +399,7 @@ public class SQLModule extends HashMap<String, SQLModule> implements MagicModule
}
private Object page(BoundSql boundSql, Page page) {
assertDatasourceNotNull();
Dialect dialect = dataSourceNode.getDialect(dialectAdapter);
BoundSql countBoundSql = boundSql.copy(dialect.getCountSql(boundSql.getSql()));
int count = countBoundSql.getCacheValue(this.sqlInterceptors, () -> dataSourceNode.getJdbcTemplate().query(countBoundSql.getSql(), new SingleRowResultSetExtractor<>(Integer.class), countBoundSql.getParameters()));
@@ -410,6 +422,7 @@ public class SQLModule extends HashMap<String, SQLModule> implements MagicModule
@UnableCall
public Integer selectInt(BoundSql boundSql) {
assertDatasourceNotNull();
return boundSql.getCacheValue(this.sqlInterceptors, () -> dataSourceNode.getJdbcTemplate().query(boundSql.getSql(), new SingleRowResultSetExtractor<>(Integer.class), boundSql.getParameters()));
}
@@ -423,6 +436,7 @@ public class SQLModule extends HashMap<String, SQLModule> implements MagicModule
@UnableCall
public Map<String, Object> selectOne(BoundSql boundSql) {
assertDatasourceNotNull();
return boundSql.getCacheValue(this.sqlInterceptors, () -> {
Dialect dialect = dataSourceNode.getDialect(dialectAdapter);
BoundSql pageBoundSql = buildPageBoundSql(dialect, boundSql, 0, 1);
@@ -435,6 +449,7 @@ public class SQLModule extends HashMap<String, SQLModule> implements MagicModule
*/
@Comment("查询单行单列的值")
public Object selectValue(@Comment("`SQL`语句") String sql) {
assertDatasourceNotNull();
BoundSql boundSql = new BoundSql(sql, this);
return boundSql.getCacheValue(this.sqlInterceptors, () -> {
Dialect dialect = dataSourceNode.getDialect(dialectAdapter);