auto(2b9ed1c9fb01): session end @ 2026-07-07T16:05:32 (+2f)

This commit is contained in:
ssw committed 2026-07-07 16:05:32 +08:00
1 parent 1156f6bd51
commit ce8353b3cc
2 files changed
+58 -121

No files matched your search

@@ -1,45 +1,45 @@
package ssw.common.service.impl;
import lombok.RequiredArgsConstructor;
import cn.hutool.core.util.IdUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import ssw.common.service.DbLinkService;
import cn.hutool.core.util.IdUtil;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.PreparedStatement;
import java.util.HashMap;
import java.util.Map;
/**
* 数据库连接服务实现
* 数据库操作服务 (v0.19+ 精简: 删 jnpf 支持的 testConnection/getIdByEnCode)
*
* 保留: createDbLink (jnpf POST /api/system/DataSource 实测 NPE), createDatabase (jnpf 无)
*
* dacli app create step 2: /createDatabase
* dacli app create step 3: /create
*/
@Slf4j
@Service
@RequiredArgsConstructor
public class ExtDbLinkServiceImpl implements DbLinkService {
public class ExtDbLinkServiceImpl {
@Autowired
private JdbcTemplate jdbcTemplate;
@Override
/**
* 创建 DataSource (dacli app create step 3)
* v0.19+ 保留: jnpf POST /api/system/DataSource 实测 NPE (oracleExtend null)
*/
public String createDbLink(String fullName, String dbType, String host, Integer port,
String userName, String password, String serviceName, String description) {
// 检查是否已存在
String checkSql = "SELECT F_Id FROM base_db_link WHERE F_Full_Name = ?";
try {
Map<String, Object> existResult = jdbcTemplate.queryForMap(checkSql, fullName);
String existId = (String) existResult.get("F_Id");
log.warn("数据源已存在: {}, id={}", fullName, existId);
return existId;
} catch (Exception e) {
// 不存在,继续创建
}
} catch (Exception e) { /* 不存在, 继续创建 */ }
// 创建新数据源(使用雪花ID)
String id = String.valueOf(IdUtil.getSnowflakeNextId());
String insertSql = "INSERT INTO base_db_link " +
"(F_Id, F_Full_Name, F_Db_Type, F_Host, F_Port, F_User_Name, F_Password, F_Service_Name, " +
@@ -50,8 +50,6 @@ public class ExtDbLinkServiceImpl implements DbLinkService {
jdbcTemplate.update(insertSql, id, fullName, dbType, host, port, userName, password, serviceName, description);
log.info("数据源创建成功: id={}, fullName={}", id, fullName);
// 输出需要手动添加的配置信息 (URL/driver 动态按 dbType, 不再硬编码 MySQL)
log.info("========== 请手动添加到 application-dev.yml ==========");
log.info("在 datasource 配置块后添加:");
log.info(" {}:", fullName);
@@ -60,58 +58,24 @@ public class ExtDbLinkServiceImpl implements DbLinkService {
log.info(" password: ${{spring.datasource.password}}");
log.info(" driver-class-name: {}", getDriverClassName(dbType));
log.info("======================================================");
return id;
}
@Override
public String getIdByEnCode(String enCode) {
String sql = "SELECT F_Id FROM base_db_link WHERE F_Full_Name = ?";
try {
Map<String, Object> result = jdbcTemplate.queryForMap(sql, enCode);
return (String) result.get("F_Id");
} catch (Exception e) {
return null;
}
}
@Override
public Map<String, Object> testConnection(String dbType, String host, Integer port,
String userName, String password, String serviceName) {
Map<String, Object> result = new HashMap<>();
result.put("success", false);
result.put("message", "");
Connection conn = null;
try {
Class.forName(getDriverClassName(dbType));
String url = buildJdbcUrl(dbType, port, host, serviceName);
conn = DriverManager.getConnection(url, userName, password);
result.put("success", true);
result.put("message", "连接成功");
} catch (Exception e) {
log.error("数据库连接测试失败", e);
result.put("success", false);
result.put("message", e.getMessage());
} finally {
if (conn != null) {
try {
conn.close();
} catch (Exception e) {
// ignore
}
}
}
return result;
}
@Override
/**
* 实际创建数据库 (MySQL: CREATE DATABASE IF NOT EXISTS, PG: CREATE DATABASE)
*
* @param host DB 主机 (从 yml 读)
* @param port DB 端口
* @param userName DB 管理员用户名
* @param password DB 管理员密码
* @param dbName 数据库名
* @param dbType MySQL | PostgreSQL
*/
public boolean createDatabase(String host, Integer port, String userName, String password,
String dbName, String dbType) {
Connection conn = null;
try {
Class.forName(getDriverClassName(dbType));
// 连接时不指定数据库
String url = buildJdbcUrl(dbType, port, host, null);
conn = DriverManager.getConnection(url, userName, password);
@@ -134,27 +98,18 @@ public class ExtDbLinkServiceImpl implements DbLinkService {
return false;
} finally {
if (conn != null) {
try {
conn.close();
} catch (Exception e) {
// ignore
}
try { conn.close(); } catch (Exception e) { /* ignore */ }
}
}
}
private String getDriverClassName(String dbType) {
switch (dbType.toLowerCase()) {
case "mysql":
return "com.mysql.cj.jdbc.Driver";
case "postgresql":
return "org.postgresql.Driver";
case "oracle":
return "oracle.jdbc.OracleDriver";
case "sqlserver":
return "com.microsoft.sqlserver.jdbc.SQLServerDriver";
default:
return "com.mysql.cj.jdbc.Driver";
case "mysql": return "com.mysql.cj.jdbc.Driver";
case "postgresql": return "org.postgresql.Driver";
case "oracle": return "oracle.jdbc.OracleDriver";
case "sqlserver": return "com.microsoft.sqlserver.jdbc.SQLServerDriver";
default: return "com.mysql.cj.jdbc.Driver";
}
}
@@ -171,4 +126,4 @@ public class ExtDbLinkServiceImpl implements DbLinkService {
}
return String.format("jdbc:mysql://%s:%d/%s?useUnicode=true&characterEncoding=utf8", host, port, database);
}
}
}
@@ -7,23 +7,30 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import ssw.common.service.DbLinkService;
import ssw.common.service.impl.ExtDbLinkServiceImpl;
import java.util.Map;
/**
* 数据库连接控制器
* 提供应用初始化所需的数据库连接和创建功能
* 数据库操作控制器 (v0.19+ 精简: 删 jnpf 支持的端点)
*
* 保留 (jnpf 无等价 / jnpf endpoint 调不通):
* - POST /createDatabase: 真建物理数据库 (CREATE DATABASE) — jnpf 无等价
* - POST /create: 创建 DataSource (jnpf POST /api/system/DataSource 实测 400, 回退)
*
* 已删 (jnpf 替代):
* - GET /id/{enCode}: jnpf GET /api/system/DataSource 可查
* - POST /test: jnpf POST /api/system/DataSource/Actions/Test
*/
@Slf4j
@RestController
@RequestMapping("/api/common/dblinkExt")
@Tag(name = "数据库操作", description = "真建库 + DataSource 创建 (jnpf 无等价/不兼容)")
public class ExtDbLinkController {
@Autowired
private DbLinkService dbLinkService;
private ExtDbLinkServiceImpl dbCreateService;
// 默认数据源配置(从 application-dev.yml 读取,避免密码泄漏)
@Value("${spring.datasource.host:127.0.0.1}")
private String defaultHost;
@@ -37,14 +44,15 @@ public class ExtDbLinkController {
private String defaultPassword;
/**
* 创建数据库连接(数据源)
* 默认使用系统配置的数据源参数,无需传入敏感信息
* 创建 DataSource (dacli app create step 3)
*
* v0.19+: 曾尝试切到 jnpf POST /api/system/DataSource, 实测 400 NPE (oracleExtend null).
* 回退到 ssw 端点, 保留至 jnpf bug 修复.
*/
@PostMapping("/create")
@Operation(summary = "创建数据库连接", description = "创建新的数据库连接(数据源),默认使用系统配置")
@Operation(summary = "创建 DataSource", description = "创建数据库连接(数据源),默认使用系统配置;jnpf endpoint 不兼容")
public ActionResult<String> createDbLink(@RequestBody Map<String, Object> params) {
String fullName = (String) params.get("fullName");
// 如果未提供参数,使用系统默认配置
String dbType = (String) params.getOrDefault("dbType", "MySQL");
String host = (String) params.getOrDefault("host", defaultHost);
Integer port = params.get("port") != null ? ((Number) params.get("port")).intValue() : defaultPort;
@@ -53,53 +61,27 @@ public class ExtDbLinkController {
String serviceName = (String) params.get("serviceName");
String description = (String) params.getOrDefault("description", "");
String id = dbLinkService.createDbLink(fullName, dbType, host, port, userName, password, serviceName, description);
String id = dbCreateService.createDbLink(fullName, dbType, host, port, userName, password, serviceName, description);
return ActionResult.success(id);
}
/**
* 根据名称获取数据源ID
*/
@GetMapping("/id/{enCode}")
@Operation(summary = "获取数据源ID", description = "根据编码获取数据源ID")
public ActionResult<String> getIdByEnCode(@PathVariable String enCode) {
String id = dbLinkService.getIdByEnCode(enCode);
return ActionResult.success(id);
}
/**
* 测试数据库连接
* 默认使用系统配置的数据源参数
*/
@PostMapping("/test")
@Operation(summary = "测试数据库连接", description = "测试数据库连接是否成功")
public ActionResult<Map<String, Object>> testConnection(@RequestBody Map<String, Object> params) {
String dbType = (String) params.getOrDefault("dbType", "MySQL");
String host = (String) params.getOrDefault("host", defaultHost);
Integer port = params.get("port") != null ? ((Number) params.get("port")).intValue() : defaultPort;
String userName = (String) params.getOrDefault("userName", defaultUserName);
String password = (String) params.getOrDefault("password", defaultPassword);
String serviceName = (String) params.get("serviceName");
Map<String, Object> result = dbLinkService.testConnection(dbType, host, port, userName, password, serviceName);
return ActionResult.success(result);
}
/**
* 创建数据库
* 默认使用系统配置的数据源参数
* 真建数据库 (dacli app create step 2)
*/
@PostMapping("/createDatabase")
@Operation(summary = "创建数据库", description = "在指定数据库服务器上创建新数据库")
@Operation(summary = "创建数据库", description = "真建物理数据库 (MySQL CREATE DATABASE / PG CREATE DATABASE)")
public ActionResult<Boolean> createDatabase(@RequestBody Map<String, Object> params) {
String dbName = (String) params.get("dbName");
if (dbName == null || dbName.isEmpty()) {
return ActionResult.fail("dbName 必填");
}
String dbType = (String) params.getOrDefault("dbType", "MySQL");
String host = (String) params.getOrDefault("host", defaultHost);
Integer port = params.get("port") != null ? ((Number) params.get("port")).intValue() : defaultPort;
String userName = (String) params.getOrDefault("userName", defaultUserName);
String password = (String) params.getOrDefault("password", defaultPassword);
String dbName = (String) params.get("dbName");
String dbType = (String) params.getOrDefault("dbType", "MySQL");
boolean success = dbLinkService.createDatabase(host, port, userName, password, dbName, dbType);
return ActionResult.success(success);
boolean ok = dbCreateService.createDatabase(host, port, userName, password, dbName, dbType);
return ok ? ActionResult.success(true) : ActionResult.fail("数据库创建失败: " + dbName);
}
}
}