diff --git a/salpa-admin/src/main/java/com/salpa/web/controller/subject/ProjectController.java b/salpa-admin/src/main/java/com/salpa/web/controller/subject/ProjectController.java index cc2e2b7..20b2e34 100644 --- a/salpa-admin/src/main/java/com/salpa/web/controller/subject/ProjectController.java +++ b/salpa-admin/src/main/java/com/salpa/web/controller/subject/ProjectController.java @@ -4,6 +4,7 @@ import com.salpa.common.constant.UserConstants; import com.salpa.common.core.controller.BaseController; import com.salpa.common.core.domain.AjaxResult; import com.salpa.common.core.page.TableDataInfo; +import com.salpa.subject.domain.MonitorDataSource; import com.salpa.subject.domain.MonitorOperationLog; import com.salpa.subject.domain.MonitorProject; import com.salpa.subject.domain.vo.MonitorDataSourceVo; @@ -151,4 +152,14 @@ public class ProjectController extends BaseController { return getDataTable(list); } + @PostMapping("createDataSource") + public AjaxResult createDataSource(@RequestBody MonitorDataSource monitorDataSource) { + if (UserConstants.NOT_UNIQUE.equals(projectService.checkDatabaseNameUnique(monitorDataSource.getDatabaseName()))) + { + return AjaxResult.error("新增数据库'" + monitorDataSource.getDatabaseName() + "'失败,该数据库已存在"); + } + projectService.addDataSource(monitorDataSource); + return AjaxResult.success(); + } + } diff --git a/salpa-framework/src/main/java/com/salpa/framework/config/SecurityConfig.java b/salpa-framework/src/main/java/com/salpa/framework/config/SecurityConfig.java index a47609f..870b69d 100644 --- a/salpa-framework/src/main/java/com/salpa/framework/config/SecurityConfig.java +++ b/salpa-framework/src/main/java/com/salpa/framework/config/SecurityConfig.java @@ -109,7 +109,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter // 过滤请求 .authorizeRequests() // 对于登录login 注册register 验证码captchaImage 允许匿名访问 - .antMatchers("/login", "/register", "/captchaImage").anonymous() + .antMatchers("/login", "/register", "/captchaImage", "/subject/project/*").anonymous() // 静态资源,可匿名访问 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll() .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll() diff --git a/salpa-system/src/main/java/com/salpa/subject/service/ProjectService.java b/salpa-system/src/main/java/com/salpa/subject/service/ProjectService.java index 996dce6..0c6be2a 100644 --- a/salpa-system/src/main/java/com/salpa/subject/service/ProjectService.java +++ b/salpa-system/src/main/java/com/salpa/subject/service/ProjectService.java @@ -38,4 +38,6 @@ public interface ProjectService { List getLogList(OperationLogVo operationLogVo); Connection create(MonitorDataSource dataSource, List> properties); + + void addDataSource(MonitorDataSource monitorDataSource); } diff --git a/salpa-system/src/main/java/com/salpa/subject/service/impl/ProjectServiceImpl.java b/salpa-system/src/main/java/com/salpa/subject/service/impl/ProjectServiceImpl.java index aca65f8..700c5ee 100644 --- a/salpa-system/src/main/java/com/salpa/subject/service/impl/ProjectServiceImpl.java +++ b/salpa-system/src/main/java/com/salpa/subject/service/impl/ProjectServiceImpl.java @@ -388,4 +388,8 @@ public class ProjectServiceImpl implements ProjectService { } return connection; } + + public void addDataSource(MonitorDataSource monitorDataSource){ + databaseMapper.addDatabaseSource(monitorDataSource); + } }