master-info

src/main/java/com/xjrsoft/module/system/controller/DatabaselinkController.java

@@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.db.meta.Column;
 import cn.hutool.db.meta.MetaUtil;
 import cn.hutool.db.meta.Table;
+import com.alibaba.druid.pool.DruidDataSource;
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -102,20 +103,19 @@ public class DatabaselinkController {
     }
 
 
-//    @GetMapping("/master-info")
-//    @ApiOperation(value = "查询主数据库链接详情")
-//    public R masterInfo() {
-//        DatabaseLinkVo vo = new DatabaseLinkVo();
-//        String primary = dataSourceProperties.getPrimary();
-//        vo.setId(primary);
-//        vo.setDbName("默认数据库");
-//        DataSourceProperty dataSourceProperty = dataSourceProperties.getDatasource().get(primary);
-//        vo.setDbType(JdbcUtils.getDbType(dataSourceProperty.getUrl()).getDb());
-//        vo.setHost(dataSourceProperty.getUrl());
-//        vo.setUsername(dataSourceProperty.getUsername());
-//        vo.setDriver(dataSourceProperty.getDriverClassName());
-//        return R.ok(vo);
-//    }
+    @GetMapping("/master-info")
+    @ApiOperation(value = "查询主数据库链接详情")
+    public R masterInfo() {
+        DatabaseLinkVo vo = new DatabaseLinkVo();
+        vo.setId(GlobalConstant.DEFAULT_DATASOURCE_KEY);
+        vo.setDbName("默认数据库");
+        DruidDataSource druidDataSource = DatasourceUtil.getDruidDataSource();
+        vo.setDbType(JdbcUtils.getDbType(druidDataSource.getUrl()).getDb());
+        vo.setHost(druidDataSource.getUrl());
+        vo.setUsername(druidDataSource.getUsername());
+        vo.setDriver(druidDataSource.getDriverClassName());
+        return R.ok(vo);
+    }
 
     @GetMapping("/info")
     @ApiOperation(value = "查询数据库链接详情")