From af135e8bddf056812d1ce71c83c580daa5fbf980 Mon Sep 17 00:00:00 2001 From: smallchill Date: Tue, 13 Aug 2019 23:22:42 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=BA=90=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gateway/props/AuthProperties.java | 2 + .../controller/DatasourceController.java | 113 ++++++++++++++++++ .../develop/entity/Datasource.java | 66 ++++++++++ .../develop/mapper/DatasourceMapper.java | 29 +++++ .../develop/mapper/DatasourceMapper.xml | 22 ++++ .../develop/service/IDatasourceService.java | 29 +++++ .../service/impl/DatasourceServiceImpl.java | 33 +++++ .../org/springblade/test/CodeGenerator.java | 6 +- doc/sql/update/mysql-update-2.0.6~2.0.7.sql | 39 ++++++ ....sql => postgresql-update-2.0.6~2.0.7.sql} | 0 10 files changed, 336 insertions(+), 3 deletions(-) create mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/develop/controller/DatasourceController.java create mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/develop/entity/Datasource.java create mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/develop/mapper/DatasourceMapper.java create mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/develop/mapper/DatasourceMapper.xml create mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/develop/service/IDatasourceService.java create mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/develop/service/impl/DatasourceServiceImpl.java rename doc/sql/update/{flowable-update-2.0.6~2.0.7.sql => postgresql-update-2.0.6~2.0.7.sql} (100%) diff --git a/blade-gateway/src/main/java/org/springblade/gateway/props/AuthProperties.java b/blade-gateway/src/main/java/org/springblade/gateway/props/AuthProperties.java index c0908a76..6d8f43ed 100644 --- a/blade-gateway/src/main/java/org/springblade/gateway/props/AuthProperties.java +++ b/blade-gateway/src/main/java/org/springblade/gateway/props/AuthProperties.java @@ -18,6 +18,7 @@ package org.springblade.gateway.props; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.cloud.context.config.annotation.RefreshScope; import java.util.ArrayList; import java.util.List; @@ -28,6 +29,7 @@ import java.util.List; * @author Chill */ @Data +@RefreshScope @ConfigurationProperties("blade.secure") public class AuthProperties { diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/develop/controller/DatasourceController.java b/blade-ops/blade-develop/src/main/java/org/springblade/develop/controller/DatasourceController.java new file mode 100644 index 00000000..5d366afe --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/develop/controller/DatasourceController.java @@ -0,0 +1,113 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package org.springblade.develop.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiOperationSupport; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; +import org.springblade.develop.entity.Datasource; +import org.springblade.develop.service.IDatasourceService; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; + +/** + * 数据源配置表 控制器 + * + * @author Chill + */ +@RestController +@AllArgsConstructor +@RequestMapping("/datasource") +@Api(value = "数据源配置表", tags = "数据源配置表接口") +public class DatasourceController extends BladeController { + + private IDatasourceService datasourceService; + + /** + * 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入datasource") + public R detail(Datasource datasource) { + Datasource detail = datasourceService.getOne(Condition.getQueryWrapper(datasource)); + return R.data(detail); + } + + /** + * 分页 数据源配置表 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入datasource") + public R> list(Datasource datasource, Query query) { + IPage pages = datasourceService.page(Condition.getPage(query), Condition.getQueryWrapper(datasource)); + return R.data(pages); + } + + /** + * 新增 数据源配置表 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @ApiOperation(value = "新增", notes = "传入datasource") + public R save(@Valid @RequestBody Datasource datasource) { + return R.status(datasourceService.save(datasource)); + } + + /** + * 修改 数据源配置表 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "修改", notes = "传入datasource") + public R update(@Valid @RequestBody Datasource datasource) { + return R.status(datasourceService.updateById(datasource)); + } + + /** + * 新增或修改 数据源配置表 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @ApiOperation(value = "新增或修改", notes = "传入datasource") + public R submit(@Valid @RequestBody Datasource datasource) { + return R.status(datasourceService.saveOrUpdate(datasource)); + } + + + /** + * 删除 数据源配置表 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "逻辑删除", notes = "传入ids") + public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + return R.status(datasourceService.deleteLogic(Func.toLongList(ids))); + } + + +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/develop/entity/Datasource.java b/blade-ops/blade-develop/src/main/java/org/springblade/develop/entity/Datasource.java new file mode 100644 index 00000000..a2e50266 --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/develop/entity/Datasource.java @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package org.springblade.develop.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import org.springblade.core.mp.base.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * 数据源配置表实体类 + * + * @author Chill + */ +@Data +@TableName("blade_datasource") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "Datasource对象", description = "数据源配置表") +public class Datasource extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 驱动类 + */ + @ApiModelProperty(value = "驱动类") + private String driverClass; + /** + * 连接地址 + */ + @ApiModelProperty(value = "连接地址") + private String jdbcUrl; + /** + * 用户名 + */ + @ApiModelProperty(value = "用户名") + private String username; + /** + * 密码 + */ + @ApiModelProperty(value = "密码") + private String password; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remark; + + +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/develop/mapper/DatasourceMapper.java b/blade-ops/blade-develop/src/main/java/org/springblade/develop/mapper/DatasourceMapper.java new file mode 100644 index 00000000..695c6928 --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/develop/mapper/DatasourceMapper.java @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package org.springblade.develop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springblade.develop.entity.Datasource; + +/** + * 数据源配置表 Mapper 接口 + * + * @author Chill + */ +public interface DatasourceMapper extends BaseMapper { + +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/develop/mapper/DatasourceMapper.xml b/blade-ops/blade-develop/src/main/java/org/springblade/develop/mapper/DatasourceMapper.xml new file mode 100644 index 00000000..44163f8a --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/develop/mapper/DatasourceMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/develop/service/IDatasourceService.java b/blade-ops/blade-develop/src/main/java/org/springblade/develop/service/IDatasourceService.java new file mode 100644 index 00000000..15080ba9 --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/develop/service/IDatasourceService.java @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package org.springblade.develop.service; + +import org.springblade.core.mp.base.BaseService; +import org.springblade.develop.entity.Datasource; + +/** + * 数据源配置表 服务类 + * + * @author Chill + */ +public interface IDatasourceService extends BaseService { + +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/develop/service/impl/DatasourceServiceImpl.java b/blade-ops/blade-develop/src/main/java/org/springblade/develop/service/impl/DatasourceServiceImpl.java new file mode 100644 index 00000000..31e867e8 --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/develop/service/impl/DatasourceServiceImpl.java @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package org.springblade.develop.service.impl; + +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.develop.entity.Datasource; +import org.springblade.develop.mapper.DatasourceMapper; +import org.springblade.develop.service.IDatasourceService; +import org.springframework.stereotype.Service; + +/** + * 数据源配置表 服务实现类 + * + * @author Chill + */ +@Service +public class DatasourceServiceImpl extends BaseServiceImpl implements IDatasourceService { + +} diff --git a/blade-ops/blade-develop/src/test/java/org/springblade/test/CodeGenerator.java b/blade-ops/blade-develop/src/test/java/org/springblade/test/CodeGenerator.java index 0eaec06b..331ac51c 100644 --- a/blade-ops/blade-develop/src/test/java/org/springblade/test/CodeGenerator.java +++ b/blade-ops/blade-develop/src/test/java/org/springblade/test/CodeGenerator.java @@ -33,11 +33,11 @@ public class CodeGenerator { /** * 代码所在服务名 */ - public static String SERVICE_NAME = "blade-oss"; + public static String SERVICE_NAME = "blade-develop"; /** * 代码生成的包名 */ - public static String PACKAGE_NAME = "org.springblade.oss"; + public static String PACKAGE_NAME = "org.springblade.develop"; /** * 前端代码生成所属系统 */ @@ -53,7 +53,7 @@ public class CodeGenerator { /** * 需要生成的表名(两者只能取其一) */ - public static String[] INCLUDE_TABLES = {"blade_oss"}; + public static String[] INCLUDE_TABLES = {"blade_datasource"}; /** * 需要排除的表名(两者只能取其一) */ diff --git a/doc/sql/update/mysql-update-2.0.6~2.0.7.sql b/doc/sql/update/mysql-update-2.0.6~2.0.7.sql index ca340a50..c42d30f8 100644 --- a/doc/sql/update/mysql-update-2.0.6~2.0.7.sql +++ b/doc/sql/update/mysql-update-2.0.6~2.0.7.sql @@ -1,2 +1,41 @@ ALTER TABLE `blade_user` ADD COLUMN `avatar` varchar(500) NULL COMMENT '头像' AFTER `real_name`; + +CREATE TABLE `blade_datasource` ( + `id` bigint(64) NOT NULL COMMENT '主键', + `driver_class` varchar(100) NULL COMMENT '驱动类', + `jdbc_url` varchar(500) NULL COMMENT '连接地址', + `username` varchar(50) NULL COMMENT '用户名', + `password` varchar(50) NULL COMMENT '密码', + `remark` varchar(255) NULL COMMENT '备注', + `create_user` bigint(64) NULL DEFAULT NULL COMMENT '创建人', + `create_dept` bigint(64) NULL DEFAULT NULL COMMENT '创建部门', + `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `update_user` bigint(64) NULL DEFAULT NULL COMMENT '修改人', + `update_time` datetime(0) NULL DEFAULT NULL COMMENT '修改时间', + `status` int(2) NULL DEFAULT NULL COMMENT '状态', + `is_deleted` int(2) NULL DEFAULT NULL COMMENT '是否已删除', + PRIMARY KEY (`id`) +) COMMENT = '数据源配置表' ; + +INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`) +VALUES ('1161272593873321991', '1123598815738675217', 'datasource', '数据源管理', 'menu', '/tool/datasource', 'iconfont icon-caidanguanli', 2, 1, 0, 1, NULL, 0); +INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`) +VALUES ('1161272593873321992', '1161272593873321991', 'datasource_add', '新增', 'add', '/tool/datasource/add', 'plus', 1, 2, 1, 1, NULL, 0); +INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`) +VALUES ('1161272593873321993', '1161272593873321991', 'datasource_edit', '修改', 'edit', '/tool/datasource/edit', 'form', 2, 2, 2, 2, NULL, 0); +INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`) +VALUES ('1161272593873321994', '1161272593873321991', 'datasource_delete', '删除', 'delete', '/api/blade-develop/datasource/remove', 'delete', 3, 2, 3, 3, NULL, 0); +INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`) +VALUES ('1161272593873321995', '1161272593873321991', 'datasource_view', '查看', 'view', '/tool/datasource/view', 'file-text', 4, 2, 2, 2, NULL, 0); + +INSERT INTO `blade_role_menu`(`id`,`menu_id`,`role_id`) +VALUES ('1161272593873322991', '1161272593873321991', '1123598816738675201'); +INSERT INTO `blade_role_menu`(`id`,`menu_id`,`role_id`) +VALUES ('1161272593873322992', '1161272593873321992', '1123598816738675201'); +INSERT INTO `blade_role_menu`(`id`,`menu_id`,`role_id`) +VALUES ('1161272593873322993', '1161272593873321993', '1123598816738675201'); +INSERT INTO `blade_role_menu`(`id`,`menu_id`,`role_id`) +VALUES ('1161272593873322994', '1161272593873321994', '1123598816738675201'); +INSERT INTO `blade_role_menu`(`id`,`menu_id`,`role_id`) +VALUES ('1161272593873322995', '1161272593873321995', '1123598816738675201'); diff --git a/doc/sql/update/flowable-update-2.0.6~2.0.7.sql b/doc/sql/update/postgresql-update-2.0.6~2.0.7.sql similarity index 100% rename from doc/sql/update/flowable-update-2.0.6~2.0.7.sql rename to doc/sql/update/postgresql-update-2.0.6~2.0.7.sql