From 812d42f3f3cc1b6d90ccf31fbd8f4d51b281bdf1 Mon Sep 17 00:00:00 2001 From: smallchill Date: Sat, 18 May 2019 14:47:30 +0800 Subject: [PATCH] :tada: 2.3.1.RELEASE --- README.md | 3 + blade-auth/pom.xml | 2 +- blade-common/pom.xml | 2 +- blade-gateway/pom.xml | 2 +- blade-ops/blade-admin/pom.xml | 2 +- blade-ops/blade-develop/pom.xml | 2 +- .../system/controller/TenantController.java | 125 ------------------ .../org/springblade/system/dto/TenantDTO.java | 33 ----- .../org/springblade/system/entity/Tenant.java | 61 --------- .../system/mapper/TenantMapper.java | 41 ------ .../system/mapper/TenantMapper.xml | 25 ---- .../system/service/ITenantService.java | 40 ------ .../service/impl/TenantServiceImpl.java | 40 ------ .../org/springblade/system/vo/TenantVO.java | 35 ----- .../system/wrapper/TenantWrapper.java | 49 ------- .../main/java/templates/sql/tenant.menu.mysql | 11 -- blade-ops/pom.xml | 2 +- blade-service-api/blade-desk-api/pom.xml | 2 +- .../org/springblade/desk/entity/Notice.java | 9 ++ blade-service-api/blade-dict-api/pom.xml | 2 +- blade-service-api/blade-system-api/pom.xml | 2 +- .../springblade/system/entity/AuthClient.java | 121 +++++++++-------- .../org/springblade/system/entity/Param.java | 9 ++ .../org/springblade/system/entity/Tenant.java | 9 ++ blade-service-api/blade-user-api/pom.xml | 2 +- .../springblade/system/user/entity/User.java | 10 ++ blade-service-api/pom.xml | 4 +- blade-service/blade-desk/pom.xml | 2 +- blade-service/blade-log/pom.xml | 2 +- blade-service/blade-system/pom.xml | 2 +- .../springblade/system/mapper/MenuMapper.xml | 2 +- blade-service/blade-user/pom.xml | 2 +- blade-service/pom.xml | 4 +- doc/nacos/blade.yaml | 4 + doc/sql/blade-update-2.3.1.sql | 9 ++ pic/springblade-framework.png | Bin 219603 -> 165226 bytes pom.xml | 8 +- 37 files changed, 141 insertions(+), 539 deletions(-) delete mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/system/controller/TenantController.java delete mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/system/dto/TenantDTO.java delete mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/system/entity/Tenant.java delete mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/system/mapper/TenantMapper.java delete mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/system/mapper/TenantMapper.xml delete mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/system/service/ITenantService.java delete mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java delete mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/system/vo/TenantVO.java delete mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/system/wrapper/TenantWrapper.java delete mode 100644 blade-ops/blade-develop/src/main/java/templates/sql/tenant.menu.mysql create mode 100644 doc/sql/blade-update-2.3.1.sql diff --git a/README.md b/README.md index 75af866..5cd0279 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,9 @@ * 稳定生产了一年,经历了从Camden -> Greenwich的技术架构,也经历了从fat jar -> docker -> k8s + jenkins的部署架构 * 项目分包明确,规范微服务的开发模式,使包与包之间的分工清晰。 +## 架构图 + + ## 工程结构 ``` SpringBlade diff --git a/blade-auth/pom.xml b/blade-auth/pom.xml index 1469a7a..676ba1b 100644 --- a/blade-auth/pom.xml +++ b/blade-auth/pom.xml @@ -8,7 +8,7 @@ SpringBlade org.springblade - 2.3.0 + 2.3.1 blade-auth diff --git a/blade-common/pom.xml b/blade-common/pom.xml index 75e3fd4..ccb0a8b 100644 --- a/blade-common/pom.xml +++ b/blade-common/pom.xml @@ -5,7 +5,7 @@ SpringBlade org.springblade - 2.3.0 + 2.3.1 4.0.0 diff --git a/blade-gateway/pom.xml b/blade-gateway/pom.xml index ab85461..28e65e2 100644 --- a/blade-gateway/pom.xml +++ b/blade-gateway/pom.xml @@ -5,7 +5,7 @@ SpringBlade org.springblade - 2.3.0 + 2.3.1 4.0.0 diff --git a/blade-ops/blade-admin/pom.xml b/blade-ops/blade-admin/pom.xml index fdb5551..d57322f 100644 --- a/blade-ops/blade-admin/pom.xml +++ b/blade-ops/blade-admin/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.3.0 + 2.3.1 4.0.0 diff --git a/blade-ops/blade-develop/pom.xml b/blade-ops/blade-develop/pom.xml index 56cd304..d3cd477 100644 --- a/blade-ops/blade-develop/pom.xml +++ b/blade-ops/blade-develop/pom.xml @@ -6,7 +6,7 @@ org.springblade blade-ops - 2.3.0 + 2.3.1 4.0.0 diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/system/controller/TenantController.java b/blade-ops/blade-develop/src/main/java/org/springblade/system/controller/TenantController.java deleted file mode 100644 index ad80469..0000000 --- a/blade-ops/blade-develop/src/main/java/org/springblade/system/controller/TenantController.java +++ /dev/null @@ -1,125 +0,0 @@ -/** - * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com). - *

- * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - *

- * http://www.apache.org/licenses/LICENSE-2.0 - *

- * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springblade.system.controller; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import lombok.AllArgsConstructor; -import javax.validation.Valid; - -import org.springblade.core.mp.support.Condition; -import org.springblade.core.mp.support.Query; -import org.springblade.system.feign.IDictClient; -import org.springblade.core.tool.api.R; -import org.springblade.core.tool.utils.Func; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.bind.annotation.RequestParam; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.system.entity.Tenant; -import org.springblade.system.vo.TenantVO; -import org.springblade.system.wrapper.TenantWrapper; -import org.springblade.system.service.ITenantService; -import org.springblade.core.boot.ctrl.BladeController; -import java.util.List; - -/** - * 控制器 - * - * @author Blade - * @since 2019-04-17 - */ -@RestController -@AllArgsConstructor -@RequestMapping("/tenant") -@Api(value = "", tags = "接口") -public class TenantController extends BladeController { - - private ITenantService tenantService; - - private IDictClient dictClient; - - /** - * 详情 - */ - @GetMapping("/detail") - @ApiOperation(value = "详情", notes = "传入tenant", position = 1) - public R detail(Tenant tenant) { - Tenant detail = tenantService.getOne(Condition.getQueryWrapper(tenant)); - TenantWrapper tenantWrapper = new TenantWrapper(dictClient); - return R.data(tenantWrapper.entityVO(detail)); - } - - /** - * 分页 - */ - @GetMapping("/list") - @ApiOperation(value = "分页", notes = "传入tenant", position = 2) - public R> list(Tenant tenant, Query query) { - IPage pages = tenantService.page(Condition.getPage(query), Condition.getQueryWrapper(tenant)); - TenantWrapper tenantWrapper = new TenantWrapper(dictClient); - return R.data(tenantWrapper.pageVO(pages)); - } - - /** - * 自定义分页 - */ - @GetMapping("/page") - @ApiOperation(value = "分页", notes = "传入tenant", position = 3) - public R> page(TenantVO tenant, Query query) { - IPage pages = tenantService.selectTenantPage(Condition.getPage(query), tenant); - return R.data(pages); - } - - /** - * 新增 - */ - @PostMapping("/save") - @ApiOperation(value = "新增", notes = "传入tenant", position = 4) - public R save(@Valid @RequestBody Tenant tenant) { - return R.status(tenantService.save(tenant)); - } - - /** - * 修改 - */ - @PostMapping("/update") - @ApiOperation(value = "修改", notes = "传入tenant", position = 5) - public R update(@Valid @RequestBody Tenant tenant) { - return R.status(tenantService.updateById(tenant)); - } - - /** - * 新增或修改 - */ - @PostMapping("/submit") - @ApiOperation(value = "新增或修改", notes = "传入tenant", position = 6) - public R submit(@Valid @RequestBody Tenant tenant) { - return R.status(tenantService.saveOrUpdate(tenant)); - } - - - /** - * 删除 - */ - @PostMapping("/remove") - @ApiOperation(value = "逻辑删除", notes = "传入ids", position = 7) - public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(tenantService.deleteLogic(Func.toIntList(ids))); - } - - -} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/system/dto/TenantDTO.java b/blade-ops/blade-develop/src/main/java/org/springblade/system/dto/TenantDTO.java deleted file mode 100644 index 43d70c2..0000000 --- a/blade-ops/blade-develop/src/main/java/org/springblade/system/dto/TenantDTO.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com). - *

- * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - *

- * http://www.apache.org/licenses/LICENSE-2.0 - *

- * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springblade.system.dto; - -import org.springblade.system.entity.Tenant; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 数据传输对象实体类 - * - * @author Blade - * @since 2019-04-17 - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class TenantDTO extends Tenant { - private static final long serialVersionUID = 1L; - -} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/system/entity/Tenant.java b/blade-ops/blade-develop/src/main/java/org/springblade/system/entity/Tenant.java deleted file mode 100644 index fcf0621..0000000 --- a/blade-ops/blade-develop/src/main/java/org/springblade/system/entity/Tenant.java +++ /dev/null @@ -1,61 +0,0 @@ -/** - * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com). - *

- * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - *

- * http://www.apache.org/licenses/LICENSE-2.0 - *

- * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springblade.system.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 Blade - * @since 2019-04-17 - */ -@Data -@TableName("blade_tenant") -@EqualsAndHashCode(callSuper = true) -@ApiModel(value = "Tenant对象", description = "Tenant对象") -public class Tenant extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 租户名称 - */ - @ApiModelProperty(value = "租户名称") - private String tenantName; - /** - * 联系人 - */ - @ApiModelProperty(value = "联系人") - private String linkman; - /** - * 联系电话 - */ - @ApiModelProperty(value = "联系电话") - private String contactNumber; - /** - * 联系地址 - */ - @ApiModelProperty(value = "联系地址") - private String address; - - -} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/system/mapper/TenantMapper.java b/blade-ops/blade-develop/src/main/java/org/springblade/system/mapper/TenantMapper.java deleted file mode 100644 index a2a4110..0000000 --- a/blade-ops/blade-develop/src/main/java/org/springblade/system/mapper/TenantMapper.java +++ /dev/null @@ -1,41 +0,0 @@ -/** - * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com). - *

- * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - *

- * http://www.apache.org/licenses/LICENSE-2.0 - *

- * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springblade.system.mapper; - -import org.springblade.system.entity.Tenant; -import org.springblade.system.vo.TenantVO; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import java.util.List; - -/** - * Mapper 接口 - * - * @author Blade - * @since 2019-04-17 - */ -public interface TenantMapper extends BaseMapper { - - /** - * 自定义分页 - * - * @param page - * @param tenant - * @return - */ - List selectTenantPage(IPage page, TenantVO tenant); - -} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/system/mapper/TenantMapper.xml b/blade-ops/blade-develop/src/main/java/org/springblade/system/mapper/TenantMapper.xml deleted file mode 100644 index 4f06512..0000000 --- a/blade-ops/blade-develop/src/main/java/org/springblade/system/mapper/TenantMapper.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/system/service/ITenantService.java b/blade-ops/blade-develop/src/main/java/org/springblade/system/service/ITenantService.java deleted file mode 100644 index 531d53f..0000000 --- a/blade-ops/blade-develop/src/main/java/org/springblade/system/service/ITenantService.java +++ /dev/null @@ -1,40 +0,0 @@ -/** - * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com). - *

- * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - *

- * http://www.apache.org/licenses/LICENSE-2.0 - *

- * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springblade.system.service; - -import org.springblade.system.entity.Tenant; -import org.springblade.system.vo.TenantVO; -import org.springblade.core.mp.base.BaseService; -import com.baomidou.mybatisplus.core.metadata.IPage; - -/** - * 服务类 - * - * @author Blade - * @since 2019-04-17 - */ -public interface ITenantService extends BaseService { - - /** - * 自定义分页 - * - * @param page - * @param tenant - * @return - */ - IPage selectTenantPage(IPage page, TenantVO tenant); - -} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java b/blade-ops/blade-develop/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java deleted file mode 100644 index c71ebea..0000000 --- a/blade-ops/blade-develop/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java +++ /dev/null @@ -1,40 +0,0 @@ -/** - * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com). - *

- * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - *

- * http://www.apache.org/licenses/LICENSE-2.0 - *

- * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springblade.system.service.impl; - -import org.springblade.system.entity.Tenant; -import org.springblade.system.vo.TenantVO; -import org.springblade.system.mapper.TenantMapper; -import org.springblade.system.service.ITenantService; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.core.metadata.IPage; - -/** - * 服务实现类 - * - * @author Blade - * @since 2019-04-17 - */ -@Service -public class TenantServiceImpl extends BaseServiceImpl implements ITenantService { - - @Override - public IPage selectTenantPage(IPage page, TenantVO tenant) { - return page.setRecords(baseMapper.selectTenantPage(page, tenant)); - } - -} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/system/vo/TenantVO.java b/blade-ops/blade-develop/src/main/java/org/springblade/system/vo/TenantVO.java deleted file mode 100644 index 20998c1..0000000 --- a/blade-ops/blade-develop/src/main/java/org/springblade/system/vo/TenantVO.java +++ /dev/null @@ -1,35 +0,0 @@ -/** - * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com). - *

- * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - *

- * http://www.apache.org/licenses/LICENSE-2.0 - *

- * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springblade.system.vo; - -import org.springblade.system.entity.Tenant; -import lombok.Data; -import lombok.EqualsAndHashCode; -import io.swagger.annotations.ApiModel; - -/** - * 视图实体类 - * - * @author Blade - * @since 2019-04-17 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@ApiModel(value = "TenantVO对象", description = "TenantVO对象") -public class TenantVO extends Tenant { - private static final long serialVersionUID = 1L; - -} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/system/wrapper/TenantWrapper.java b/blade-ops/blade-develop/src/main/java/org/springblade/system/wrapper/TenantWrapper.java deleted file mode 100644 index 0ce1000..0000000 --- a/blade-ops/blade-develop/src/main/java/org/springblade/system/wrapper/TenantWrapper.java +++ /dev/null @@ -1,49 +0,0 @@ -/** - * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com). - *

- * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - *

- * http://www.apache.org/licenses/LICENSE-2.0 - *

- * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springblade.system.wrapper; - -import lombok.AllArgsConstructor; -import org.springblade.core.mp.support.BaseEntityWrapper; -import org.springblade.core.tool.utils.BeanUtil; -import org.springblade.system.feign.IDictClient; -import org.springblade.system.entity.Tenant; -import org.springblade.system.vo.TenantVO; - -/** - * 包装类,返回视图层所需的字段 - * - * @author Blade - * @since 2019-04-17 - */ -@AllArgsConstructor -public class TenantWrapper extends BaseEntityWrapper { - - private IDictClient dictClient; - - @Override - public TenantVO entityVO(Tenant tenant) { - TenantVO tenantVO = BeanUtil.copy(tenant, TenantVO.class); - - /*R dict = dictClient.getValue("tenant" , tenantVO.getCategory()); - if (dict.isSuccess()) { - String categoryName = dict.getData(); - tenantVO.setCategoryName(categoryName); - }*/ - - return tenantVO; - } - -} diff --git a/blade-ops/blade-develop/src/main/java/templates/sql/tenant.menu.mysql b/blade-ops/blade-develop/src/main/java/templates/sql/tenant.menu.mysql deleted file mode 100644 index 7496716..0000000 --- a/blade-ops/blade-develop/src/main/java/templates/sql/tenant.menu.mysql +++ /dev/null @@ -1,11 +0,0 @@ -INSERT INTO `blade_menu`(`parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`) -VALUES (0, 'tenant', '租户管理', 'menu', '/system/tenant', NULL, 1, 1, 0, 1, NULL, 0); -set @parentid = (SELECT LAST_INSERT_ID()); -INSERT INTO `blade_menu`(`parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`) -VALUES (@parentid, 'tenant_add', '新增', 'add', '/system/tenant/add', 'plus', 1, 2, 1, 1, NULL, 0); -INSERT INTO `blade_menu`(`parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`) -VALUES (@parentid, 'tenant_edit', '修改', 'edit', '/system/tenant/edit', 'form', 2, 2, 1, 2, NULL, 0); -INSERT INTO `blade_menu`(`parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`) -VALUES (@parentid, 'tenant_delete', '删除', 'delete', '/api/blade-system/tenant/remove', 'delete', 3, 2, 1, 3, NULL, 0); -INSERT INTO `blade_menu`(`parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`) -VALUES (@parentid, 'tenant_view', '查看', 'view', '/system/tenant/view', 'file-text', 4, 2, 1, 2, NULL, 0); diff --git a/blade-ops/pom.xml b/blade-ops/pom.xml index b0ea399..44fe3a4 100644 --- a/blade-ops/pom.xml +++ b/blade-ops/pom.xml @@ -5,7 +5,7 @@ SpringBlade org.springblade - 2.3.0 + 2.3.1 4.0.0 diff --git a/blade-service-api/blade-desk-api/pom.xml b/blade-service-api/blade-desk-api/pom.xml index bbd1dda..5dffc93 100644 --- a/blade-service-api/blade-desk-api/pom.xml +++ b/blade-service-api/blade-desk-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 2.3.0 + 2.3.1 4.0.0 diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/entity/Notice.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/entity/Notice.java index 41ce214..6df6af9 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/entity/Notice.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/entity/Notice.java @@ -15,6 +15,8 @@ */ package org.springblade.desk.entity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -35,6 +37,13 @@ public class Notice extends BaseEntity { private static final long serialVersionUID = 1L; + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + @ApiModelProperty(value = "主键id") + private Integer id; + /** * 标题 */ diff --git a/blade-service-api/blade-dict-api/pom.xml b/blade-service-api/blade-dict-api/pom.xml index 1e3edb2..4752f0d 100644 --- a/blade-service-api/blade-dict-api/pom.xml +++ b/blade-service-api/blade-dict-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 2.3.0 + 2.3.1 4.0.0 diff --git a/blade-service-api/blade-system-api/pom.xml b/blade-service-api/blade-system-api/pom.xml index 07ca446..3e28248 100644 --- a/blade-service-api/blade-system-api/pom.xml +++ b/blade-service-api/blade-system-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 2.3.0 + 2.3.1 4.0.0 diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/AuthClient.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/AuthClient.java index 7f2067e..a10c8bb 100644 --- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/AuthClient.java +++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/AuthClient.java @@ -15,6 +15,8 @@ */ package org.springblade.system.entity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -34,63 +36,70 @@ import org.springblade.core.mp.base.BaseEntity; @ApiModel(value = "Client对象", description = "Client对象") public class AuthClient extends BaseEntity { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; - /** - * 客户端id - */ - @ApiModelProperty(value = "客户端id") - private String clientId; - /** - * 客户端密钥 - */ - @ApiModelProperty(value = "客户端密钥") - private String clientSecret; - /** - * 资源集合 - */ - @ApiModelProperty(value = "资源集合") - private String resourceIds; - /** - * 授权范围 - */ - @ApiModelProperty(value = "授权范围") - private String scope; - /** - * 授权类型 - */ - @ApiModelProperty(value = "授权类型") - private String authorizedGrantTypes; - /** - * 回调地址 - */ - @ApiModelProperty(value = "回调地址") - private String webServerRedirectUri; - /** - * 权限 - */ - @ApiModelProperty(value = "权限") - private String authorities; - /** - * 令牌过期秒数 - */ - @ApiModelProperty(value = "令牌过期秒数") - private Integer accessTokenValidity; - /** - * 刷新令牌过期秒数 - */ - @ApiModelProperty(value = "刷新令牌过期秒数") - private Integer refreshTokenValidity; - /** - * 附加说明 - */ - @ApiModelProperty(value = "附加说明") - private String additionalInformation; - /** - * 自动授权 - */ - @ApiModelProperty(value = "自动授权") - private String autoapprove; + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + @ApiModelProperty(value = "主键id") + private Integer id; + + /** + * 客户端id + */ + @ApiModelProperty(value = "客户端id") + private String clientId; + /** + * 客户端密钥 + */ + @ApiModelProperty(value = "客户端密钥") + private String clientSecret; + /** + * 资源集合 + */ + @ApiModelProperty(value = "资源集合") + private String resourceIds; + /** + * 授权范围 + */ + @ApiModelProperty(value = "授权范围") + private String scope; + /** + * 授权类型 + */ + @ApiModelProperty(value = "授权类型") + private String authorizedGrantTypes; + /** + * 回调地址 + */ + @ApiModelProperty(value = "回调地址") + private String webServerRedirectUri; + /** + * 权限 + */ + @ApiModelProperty(value = "权限") + private String authorities; + /** + * 令牌过期秒数 + */ + @ApiModelProperty(value = "令牌过期秒数") + private Integer accessTokenValidity; + /** + * 刷新令牌过期秒数 + */ + @ApiModelProperty(value = "刷新令牌过期秒数") + private Integer refreshTokenValidity; + /** + * 附加说明 + */ + @ApiModelProperty(value = "附加说明") + private String additionalInformation; + /** + * 自动授权 + */ + @ApiModelProperty(value = "自动授权") + private String autoapprove; } diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Param.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Param.java index 7392e9d..d9261f2 100644 --- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Param.java +++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Param.java @@ -15,6 +15,8 @@ */ package org.springblade.system.entity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -35,6 +37,13 @@ public class Param extends BaseEntity { private static final long serialVersionUID = 1L; + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + @ApiModelProperty(value = "主键id") + private Integer id; + /** * 参数名 */ diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Tenant.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Tenant.java index f80520e..2816d57 100644 --- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Tenant.java +++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Tenant.java @@ -15,6 +15,8 @@ */ package org.springblade.system.entity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -35,6 +37,13 @@ public class Tenant extends BaseEntity { private static final long serialVersionUID = 1L; + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + @ApiModelProperty(value = "主键id") + private Integer id; + /** * 租户编号 */ diff --git a/blade-service-api/blade-user-api/pom.xml b/blade-service-api/blade-user-api/pom.xml index 95799ea..18c9b9d 100644 --- a/blade-service-api/blade-user-api/pom.xml +++ b/blade-service-api/blade-user-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 2.3.0 + 2.3.1 4.0.0 diff --git a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java index af809cc..0e6490f 100644 --- a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java +++ b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java @@ -15,7 +15,10 @@ */ package org.springblade.system.user.entity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.TenantEntity; @@ -34,6 +37,13 @@ public class User extends TenantEntity { private static final long serialVersionUID = 1L; + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + @ApiModelProperty(value = "主键id") + private Integer id; + /** * 账号 */ diff --git a/blade-service-api/pom.xml b/blade-service-api/pom.xml index 5aa2220..0f0fc05 100644 --- a/blade-service-api/pom.xml +++ b/blade-service-api/pom.xml @@ -5,13 +5,13 @@ SpringBlade org.springblade - 2.3.0 + 2.3.1 4.0.0 blade-service-api ${project.artifactId} - 2.3.0 + 2.3.1 pom SpringBlade 微服务API集合 diff --git a/blade-service/blade-desk/pom.xml b/blade-service/blade-desk/pom.xml index e885274..ed6fd0b 100644 --- a/blade-service/blade-desk/pom.xml +++ b/blade-service/blade-desk/pom.xml @@ -6,7 +6,7 @@ org.springblade blade-service - 2.3.0 + 2.3.1 4.0.0 diff --git a/blade-service/blade-log/pom.xml b/blade-service/blade-log/pom.xml index 04f0007..dcc1149 100644 --- a/blade-service/blade-log/pom.xml +++ b/blade-service/blade-log/pom.xml @@ -5,7 +5,7 @@ blade-service org.springblade - 2.3.0 + 2.3.1 4.0.0 diff --git a/blade-service/blade-system/pom.xml b/blade-service/blade-system/pom.xml index 8599277..d50a4c0 100644 --- a/blade-service/blade-system/pom.xml +++ b/blade-service/blade-system/pom.xml @@ -5,7 +5,7 @@ blade-service org.springblade - 2.3.0 + 2.3.1 4.0.0 diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.xml index 381c986..260c931 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.xml +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.xml @@ -30,7 +30,7 @@ select - id, code, parent_code, name, alias, path, source, sort, category, action, is_open, remark, is_deleted + id, code, parent_id, name, alias, path, source, sort, category, action, is_open, remark, is_deleted