ZhuDeKang 5 月之前
父節點
當前提交
86e4cc0e6b

+ 2 - 1
ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/controller/SysMetaDatasourceController.java

@@ -111,7 +111,8 @@ public class SysMetaDatasourceController extends BaseController {
                 sysMetaDatasourceService.getTableNames(dsCode));
     }
 
-    public AjaxResult query(SysMetaQueryVo queryVo){
+    @PostMapping("/query")
+    public AjaxResult query(@RequestBody SysMetaQueryVo queryVo){
         return success(sysMetaDatasourceService.queryTableData(queryVo));
     }
 

+ 3 - 3
ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/database/DynamicDataSourceManager.java

@@ -29,7 +29,7 @@ public class DynamicDataSourceManager {
 
     public DataSource getSysDataSource(SysMetaDatasource datasource){
 
-        String url = "jdbc:"+datasource.getDsType()+"://"+datasource.getDsIp()+":"+datasource.getDsPort()+"/"+datasource.getDsTitle();
+        String url = "jdbc:"+datasource.getDsType()+"://"+datasource.getDsIp()+":"+datasource.getDsPort()+"/"+datasource.getDsDbname();
         return getOrCreateDataSource(url,
                 datasource.getDsUser(),
                 datasource.getDsPass(),
@@ -78,8 +78,8 @@ public class DynamicDataSourceManager {
 
         // 配置连接池参数
         dataSource.setInitialSize(1);
-        dataSource.setMinIdle(3);
-        dataSource.setMaxActive(20);
+        dataSource.setMinIdle(1);
+        dataSource.setMaxActive(2);
         dataSource.setMaxWait(60000);
         dataSource.setTimeBetweenEvictionRunsMillis(60000);
         dataSource.setMinEvictableIdleTimeMillis(300000);

+ 1 - 1
ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/service/impl/SysMetaDatasourceServiceImpl.java

@@ -150,7 +150,7 @@ public class SysMetaDatasourceServiceImpl implements ISysMetaDatasourceService {
 
         JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
 
-        String sql = DynamicDataSourceManager.buildPaginationSql(queryVo.getSql(), 1, 100, sysMetaDatasource.getDsType());
+        String sql = DynamicDataSourceManager.buildPaginationSql(queryVo.getSql(), 1, 20, sysMetaDatasource.getDsType());
 
 
         return jdbcTemplate.query(sql, (rs, rowNum) -> {