From d88f2f81e9e23524b6087e336be860dc3f2e46d1 Mon Sep 17 00:00:00 2001 From: EightMonth Date: Wed, 27 Dec 2023 11:05:28 +0800 Subject: [PATCH] =?UTF-8?q?knife4j=E5=8D=87=E7=BA=A74.4.0=E6=B3=A8?= =?UTF-8?q?=E8=A7=A3=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/jeecg/common/api/vo/Result.java | 15 +- .../system/base/entity/JeecgEntity.java | 12 +- .../test/controller/JeecgDemoController.java | 24 +- .../JeecgDynamicDataController.java | 9 +- .../modules/demo/test/entity/JeecgDemo.java | 29 +- .../controller/QuartzJobController.java | 10 +- .../controller/DuplicateCheckController.java | 8 +- .../system/controller/LoginController.java | 18 +- .../controller/SysCheckRuleController.java | 20 +- .../controller/SysCommentController.java | 30 +- .../controller/SysDataSourceController.java | 18 +- .../SysDepartPermissionController.java | 18 +- .../controller/SysDepartRoleController.java | 18 +- .../controller/SysDictItemController.java | 8 +- .../controller/SysFillRuleController.java | 18 +- .../controller/SysFormFileController.java | 18 +- .../controller/SysGatewayRouteController.java | 4 +- .../controller/SysPositionController.java | 22 +- .../controller/SysRoleIndexController.java | 20 +- .../SysTableWhiteListController.java | 16 +- .../controller/ThirdLoginController.java | 4 +- .../modules/system/entity/SysCheckRule.java | 23 +- .../modules/system/entity/SysComment.java | 27 +- .../modules/system/entity/SysDataSource.java | 37 +- .../system/entity/SysDepartPermission.java | 13 +- .../modules/system/entity/SysDepartRole.java | 23 +- .../entity/SysDepartRolePermission.java | 17 +- .../system/entity/SysDepartRoleUser.java | 11 +- .../modules/system/entity/SysFillRule.java | 23 +- .../modules/system/entity/SysFormFile.java | 19 +- .../system/entity/SysGatewayRoute.java | 33 +- .../system/entity/SysPackPermission.java | 19 +- .../modules/system/entity/SysPosition.java | 27 +- .../modules/system/entity/SysRoleIndex.java | 29 +- .../system/entity/SysTableWhiteList.java | 21 +- .../modules/system/entity/SysTenantPack.java | 25 +- .../system/entity/SysTenantPackUser.java | 21 +- .../system/entity/SysThirdAccount.java | 23 +- .../system/entity/SysThirdAppConfig.java | 21 +- .../system/entity/SysUserPosition.java | 19 +- .../modules/system/entity/SysUserTenant.java | 21 +- .../system/model/DuplicateCheckVo.java | 14 +- .../modules/system/model/SysLoginModel.java | 14 +- .../service/ISysThirdAppConfigService.java | 1 - .../jeecg/modules/system/vo/SysCommentVO.java | 4 +- .../controller/${entityName}Controller.javai | 18 +- .../entity/${entityName}.javai | 6 +- .../controller/${entityName}Controller.javai | 20 +- .../entity/${entityName}.javai | 6 +- .../${entityPackage}/entity/[1-n]Entity.javai | 6 +- .../vo/${entityName}Page.javai | 10 +- .../controller/${entityName}Controller.javai | 22 +- .../entity/${entityName}.javai | 6 +- .../controller/${entityName}Controller.javai | 26 +- .../entity/${entityName}.javai | 6 +- .../${entityPackage}/entity/[1-n]Entity.javai | 6 +- .../controller/${entityName}Controller.javai | 20 +- .../entity/${entityName}.javai | 6 +- .../${entityPackage}/entity/[1-n]Entity.javai | 6 +- .../vo/${entityName}Page.javai | 10 +- .../controller/${entityName}Controller.javai | 20 +- .../entity/${entityName}.javai | 6 +- .../${entityPackage}/entity/[1-n]Entity.javai | 6 +- .../vo/${entityName}Page.javai | 10 +- .../controller/${entityName}Controller.javai | 20 +- .../entity/${entityName}.javai | 6 +- .../${entityPackage}/entity/[1-n]Entity.javai | 6 +- .../vo/${entityName}Page.javai | 10 +- .../controller/${entityName}Controller.javai | 18 +- .../entity/${entityName}.javai | 8 +- .../${entityName}Controller.javai | 18 +- .../${entityPackage}/${entityName}.javai | 7 +- .../controller/${entityName}Controller.javai | 20 +- .../entity/${entityName}.javai | 8 +- .../${entityPackage}/entity/[1-n]Entity.javai | 7 +- .../vo/${entityName}Page.javai | 8 +- .../controller/${entityName}Controller.javai | 28 +- .../entity/${entityName}.javai | 8 +- .../${entityPackage}/entity/[1-n]Entity.javai | 8 +- .../vo/${entityName}Page.javai | 8 +- .../swagger/MySwaggerResourceProvider.java | 320 +++++++++--------- .../swagger/SwaggerResourceController.java | 104 +++--- .../org/jeecg/loader/DynamicRouteLoader.java | 8 +- .../controller/JeecgTestFeignController.java | 12 +- .../controller/JeecgMqTestController.java | 10 +- .../controller/SeataOrderController.java | 13 +- .../JeecgShardingDemoController.java | 14 +- 87 files changed, 841 insertions(+), 868 deletions(-) diff --git a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/vo/Result.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/vo/Result.java index 53b23971..2db1edc2 100644 --- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/vo/Result.java +++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/vo/Result.java @@ -1,8 +1,7 @@ package org.jeecg.common.api.vo; import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.jeecg.common.constant.CommonConstant; @@ -15,7 +14,7 @@ import java.io.Serializable; * @date 2019年1月19日 */ @Data -@ApiModel(value="接口返回对象", description="接口返回对象") +@Schema(description="接口返回对象") public class Result implements Serializable { private static final long serialVersionUID = 1L; @@ -23,31 +22,31 @@ public class Result implements Serializable { /** * 成功标志 */ - @ApiModelProperty(value = "成功标志") + @Schema(description = "成功标志") private boolean success = true; /** * 返回处理消息 */ - @ApiModelProperty(value = "返回处理消息") + @Schema(description = "返回处理消息") private String message = ""; /** * 返回代码 */ - @ApiModelProperty(value = "返回代码") + @Schema(description = "返回代码") private Integer code = 0; /** * 返回数据对象 data */ - @ApiModelProperty(value = "返回数据对象") + @Schema(description = "返回数据对象") private T result; /** * 时间戳 */ - @ApiModelProperty(value = "时间戳") + @Schema(description = "时间戳") private long timestamp = System.currentTimeMillis(); public Result() { diff --git a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/entity/JeecgEntity.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/entity/JeecgEntity.java index 2eebaffd..4d49cf7d 100644 --- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/entity/JeecgEntity.java +++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/entity/JeecgEntity.java @@ -2,6 +2,7 @@ package org.jeecg.common.system.base.entity; import java.io.Serializable; +import io.swagger.v3.oas.annotations.media.Schema; import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; @@ -9,7 +10,6 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -30,20 +30,20 @@ public class JeecgEntity implements Serializable { * ID */ @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "ID") + @Schema(description = "ID") private java.lang.String id; /** * 创建人 */ - @ApiModelProperty(value = "创建人") + @Schema(description = "创建人") @Excel(name = "创建人", width = 15) private java.lang.String createBy; /** * 创建时间 */ - @ApiModelProperty(value = "创建时间") + @Schema(description = "创建时间") @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @@ -52,14 +52,14 @@ public class JeecgEntity implements Serializable { /** * 更新人 */ - @ApiModelProperty(value = "更新人") + @Schema(description = "更新人") @Excel(name = "更新人", width = 15) private java.lang.String updateBy; /** * 更新时间 */ - @ApiModelProperty(value = "更新时间") + @Schema(description = "更新时间") @Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgDemoController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgDemoController.java index 39439e16..113e6a48 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgDemoController.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgDemoController.java @@ -8,9 +8,9 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; import org.apache.shiro.SecurityUtils; import org.apache.shiro.mgt.DefaultSecurityManager; @@ -45,7 +45,7 @@ import java.util.List; * @Version:V2.0 */ @Slf4j -@Api(tags = "单表DEMO") +@Tag(name = "单表DEMO") @RestController @RequestMapping("/test/jeecgDemo") public class JeecgDemoController extends JeecgController { @@ -64,7 +64,7 @@ public class JeecgDemoController extends JeecgController list(JeecgDemo jeecgDemo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, @@ -89,7 +89,7 @@ public class JeecgDemoController extends JeecgController add(@RequestBody JeecgDemo jeecgDemo) { jeecgDemoService.save(jeecgDemo); return Result.OK("添加成功！"); @@ -102,7 +102,7 @@ public class JeecgDemoController extends JeecgController edit(@RequestBody JeecgDemo jeecgDemo) { jeecgDemoService.updateById(jeecgDemo); @@ -117,7 +117,7 @@ public class JeecgDemoController extends JeecgController delete(@RequestParam(name = "id", required = true) String id) { jeecgDemoService.removeById(id); return Result.OK("删除成功!"); @@ -130,7 +130,7 @@ public class JeecgDemoController extends JeecgController deleteBatch(@RequestParam(name = "ids", required = true) String ids) { this.jeecgDemoService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功！"); @@ -143,8 +143,8 @@ public class JeecgDemoController extends JeecgController queryById(@ApiParam(name = "id", value = "示例id", required = true) @RequestParam(name = "id", required = true) String id) { + @Operation(summary = "通过ID查询DEMO") + public Result queryById(@Parameter(name = "id", description = "示例id", required = true) @RequestParam(name = "id", required = true) String id) { JeecgDemo jeecgDemo = jeecgDemoService.getById(id); return Result.OK(jeecgDemo); } @@ -477,7 +477,7 @@ public class JeecgDemoController extends JeecgController test() { //解决shiro报错No SecurityManager accessible to the calling code, either bound to the org.apache.shiro diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgDynamicDataController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgDynamicDataController.java index 4036fb3e..b6a61ff9 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgDynamicDataController.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgDynamicDataController.java @@ -1,8 +1,7 @@ package org.jeecg.modules.demo.test.controller; -import io.lettuce.core.dynamic.annotation.Param; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; @@ -21,7 +20,7 @@ import java.util.List; * @Date:2020-04-21 */ @Slf4j -@Api(tags = "动态数据源测试") +@Tag(name = "动态数据源测试") @RestController @RequestMapping("/test/dynamic") public class JeecgDynamicDataController extends JeecgController { @@ -37,7 +36,7 @@ public class JeecgDynamicDataController extends JeecgController> selectSpelByKey(@RequestParam(required = false) String dsName) { List list = jeecgDynamicDataService.selectSpelByKey(dsName); return Result.OK(list); diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgDemo.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgDemo.java index b0c1b6c5..721a2259 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgDemo.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgDemo.java @@ -3,6 +3,7 @@ package org.jeecg.modules.demo.test.entity; import java.io.Serializable; import com.baomidou.mybatisplus.annotation.Version; +import io.swagger.v3.oas.annotations.media.Schema; import org.jeecg.common.system.base.entity.JeecgEntity; import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; @@ -10,8 +11,6 @@ import org.springframework.format.annotation.DateTimeFormat; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -25,59 +24,59 @@ import lombok.experimental.Accessors; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@ApiModel(value="测试DEMO对象", description="测试DEMO") +@Schema(description="测试DEMO") @TableName("demo") public class JeecgDemo extends JeecgEntity implements Serializable { private static final long serialVersionUID = 1L; /** 姓名 */ @Excel(name="姓名",width=25) - @ApiModelProperty(value = "姓名") + @Schema(description = "姓名") private java.lang.String name; /** 关键词 */ - @ApiModelProperty(value = "关键词") + @Schema(description = "关键词") @Excel(name="关键词",width=15) private java.lang.String keyWord; /** 打卡时间 */ - @ApiModelProperty(value = "打卡时间") + @Schema(description = "打卡时间") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name="打卡时间",width=20,format="yyyy-MM-dd HH:mm:ss") private java.util.Date punchTime; /** 工资 */ - @ApiModelProperty(value = "工资",example = "0") + @Schema(description = "工资",example = "0") @Excel(name="工资",type = 4,width=15) private java.math.BigDecimal salaryMoney; /** 奖金 */ - @ApiModelProperty(value = "奖金",example = "0") + @Schema(description = "奖金",example = "0") @Excel(name="奖金",type = 4,width=15) private java.lang.Double bonusMoney; /** 性别 {男:1,女:2} */ - @ApiModelProperty(value = "性别") + @Schema(description = "性别") @Excel(name = "性别", width = 15, dicCode = "sex") private java.lang.String sex; /** 年龄 */ - @ApiModelProperty(value = "年龄",example = "0") + @Schema(description = "年龄",example = "0") @Excel(name="年龄",type = 4,width=15) private java.lang.Integer age; /** 生日 */ - @ApiModelProperty(value = "生日") + @Schema(description = "生日") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") @Excel(name="生日",format="yyyy-MM-dd") private java.util.Date birthday; /** 邮箱 */ - @ApiModelProperty(value = "邮箱") + @Schema(description = "邮箱") @Excel(name="邮箱",width=30) private java.lang.String email; /** 个人简介 */ - @ApiModelProperty(value = "个人简介") + @Schema(description = "个人简介") private java.lang.String content; /** 部门编码 */ @Excel(name="部门编码",width=25) - @ApiModelProperty(value = "部门编码") + @Schema(description = "部门编码") private java.lang.String sysOrgCode; - @ApiModelProperty(value = "租户ID") + @Schema(description = "租户ID") private java.lang.Integer tenantId; /** 乐观锁字段 */ @Version diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/controller/QuartzJobController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/controller/QuartzJobController.java index 57e0634e..741f5ab4 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/controller/QuartzJobController.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/controller/QuartzJobController.java @@ -3,8 +3,8 @@ package org.jeecg.modules.quartz.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -48,7 +48,7 @@ import java.util.Map; @RestController @RequestMapping("/sys/quartzJob") @Slf4j -@Api(tags = "定时任务接口") +@Tag(name = "定时任务接口") public class QuartzJobController { @Autowired private IQuartzJobService quartzJobService; @@ -155,7 +155,7 @@ public class QuartzJobController { //@RequiresRoles("admin") @RequiresPermissions("system:quartzJob:pause") @GetMapping(value = "/pause") - @ApiOperation(value = "停止定时任务") + @Operation(summary = "停止定时任务") public Result pauseJob(@RequestParam(name = "id") String id) { QuartzJob job = quartzJobService.getById(id); if (job == null) { @@ -174,7 +174,7 @@ public class QuartzJobController { //@RequiresRoles("admin") @RequiresPermissions("system:quartzJob:resume") @GetMapping(value = "/resume") - @ApiOperation(value = "启动定时任务") + @Operation(summary = "启动定时任务") public Result resumeJob(@RequestParam(name = "id") String id) { QuartzJob job = quartzJobService.getById(id); if (job == null) { diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/DuplicateCheckController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/DuplicateCheckController.java index 89902353..84bc35b2 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/DuplicateCheckController.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/DuplicateCheckController.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.controller; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; @@ -24,7 +24,7 @@ import javax.servlet.http.HttpServletRequest; @Slf4j @RestController @RequestMapping("/sys/duplicate") -@Api(tags="重复校验") +@Tag(name="重复校验") public class DuplicateCheckController { @Autowired @@ -36,7 +36,7 @@ public class DuplicateCheckController { * @return */ @RequestMapping(value = "/check", method = RequestMethod.GET) - @ApiOperation("重复校验接口") + @Operation(summary ="重复校验接口") public Result doDuplicateCheck(DuplicateCheckVo duplicateCheckVo, HttpServletRequest request) { log.debug("----duplicate check------："+ duplicateCheckVo.toString()); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java index c9ac2c3e..6085346e 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java @@ -5,8 +5,8 @@ import com.alibaba.fastjson.JSONObject; import com.aliyuncs.exceptions.ClientException; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresRoles; @@ -46,7 +46,7 @@ import java.util.stream.Collectors; */ @RestController @RequestMapping("/sys") -@Api(tags="用户登录") +@Tag(name="用户登录") @Slf4j public class LoginController { @Autowired @@ -70,7 +70,7 @@ public class LoginController { private final String BASE_CHECK_CODES = "qwertyuiplkjhgfdsazxcvbnmQWERTYUPLKJHGFDSAZXCVBNM1234567890"; - @ApiOperation("登录接口") + @Operation(summary = "登录接口") @RequestMapping(value = "/login", method = RequestMethod.POST) public Result login(@RequestBody SysLoginModel sysLoginModel, HttpServletRequest request){ Result result = new Result(); @@ -404,7 +404,7 @@ public class LoginController { * @param jsonObject * @return */ - @ApiOperation("手机号登录接口") + @Operation(summary = "手机号登录接口") @PostMapping("/phoneLogin") public Result phoneLogin(@RequestBody JSONObject jsonObject, HttpServletRequest request) { Result result = new Result(); @@ -523,7 +523,7 @@ public class LoginController { * @param response * @param key */ - @ApiOperation("获取验证码") + @Operation(summary = "获取验证码") @GetMapping(value = "/randomImage/{key}") public Result randomImage(HttpServletResponse response,@PathVariable("key") String key){ Result res = new Result(); @@ -668,7 +668,7 @@ public class LoginController { /** * 登录二维码 */ - @ApiOperation(value = "登录二维码", notes = "登录二维码") + @Operation(summary = "登录二维码") @GetMapping("/getLoginQrcode") public Result getLoginQrcode() { String qrcodeId = CommonConstant.LOGIN_QRCODE_PRE+IdWorker.getIdStr(); @@ -682,7 +682,7 @@ public class LoginController { /** * 扫码二维码 */ - @ApiOperation(value = "扫码登录二维码", notes = "扫码登录二维码") + @Operation(summary = "扫码登录二维码") @PostMapping("/scanLoginQrcode") public Result scanLoginQrcode(@RequestParam String qrcodeId, @RequestParam String token) { Object check = redisUtil.get(CommonConstant.LOGIN_QRCODE + qrcodeId); @@ -699,7 +699,7 @@ public class LoginController { /** * 获取用户扫码后保存的token */ - @ApiOperation(value = "获取用户扫码后保存的token", notes = "获取用户扫码后保存的token") + @Operation(summary = "获取用户扫码后保存的token") @GetMapping("/getQrcodeToken") public Result getQrcodeToken(@RequestParam String qrcodeId) { Object token = redisUtil.get(CommonConstant.LOGIN_QRCODE_TOKEN + qrcodeId); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCheckRuleController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCheckRuleController.java index c7e75847..2f1156e9 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCheckRuleController.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCheckRuleController.java @@ -4,8 +4,8 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; @@ -30,7 +30,7 @@ import java.util.Arrays; * @Version: V1.0 */ @Slf4j -@Api(tags = "编码校验规则") +@Tag(name = "编码校验规则") @RestController @RequestMapping("/sys/checkRule") public class SysCheckRuleController extends JeecgController { @@ -48,7 +48,7 @@ public class SysCheckRuleController extends JeecgController> queryListByForm(SysComment sysComment) { List list = sysCommentService.queryFormCommentInfo(sysComment); @@ -74,7 +74,7 @@ public class SysCommentController extends JeecgController> queryFileList(SysComment sysComment) { List list = sysCommentService.queryFormFileList(sysComment.getTableName(), sysComment.getTableDataId()); @@ -83,14 +83,14 @@ public class SysCommentController extends JeecgController addText(@RequestBody SysComment sysComment) { String commentId = sysCommentService.saveOne(sysComment); return Result.OK(commentId); } - @ApiOperation(value = "系统评论表-添加文件", notes = "系统评论表-添加文件") + @Operation(summary = "系统评论表-添加文件") @PostMapping(value = "/addFile") public Result addFile(HttpServletRequest request) { try { @@ -107,7 +107,7 @@ public class SysCommentController extends JeecgController appAddFile(HttpServletRequest request) { try { @@ -119,7 +119,7 @@ public class SysCommentController extends JeecgController deleteOne(@RequestParam(name = "id", required = true) String id) { SysComment comment = sysCommentService.getById(id); @@ -162,7 +162,7 @@ public class SysCommentController extends JeecgController> queryPageList(SysComment sysComment, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @@ -181,7 +181,7 @@ public class SysCommentController extends JeecgController add(@RequestBody SysComment sysComment) { @@ -196,7 +196,7 @@ public class SysCommentController extends JeecgController edit(@RequestBody SysComment sysComment) { @@ -211,7 +211,7 @@ public class SysCommentController extends JeecgController delete(@RequestParam(name = "id", required = true) String id) { @@ -226,7 +226,7 @@ public class SysCommentController extends JeecgController deleteBatch(@RequestParam(name = "ids", required = true) String ids) { @@ -241,7 +241,7 @@ public class SysCommentController extends JeecgController queryById(@RequestParam(name = "id", required = true) String id) { SysComment sysComment = sysCommentService.getById(id); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDataSourceController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDataSourceController.java index 1b70326e..b670fee6 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDataSourceController.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDataSourceController.java @@ -7,8 +7,8 @@ import com.baomidou.dynamic.datasource.DynamicRoutingDataSource; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -43,7 +43,7 @@ import java.util.List; * @Version: V1.0 */ @Slf4j -@Api(tags = "多数据源管理") +@Tag(name = "多数据源管理") @RestController @RequestMapping("/sys/dataSource") public class SysDataSourceController extends JeecgController { @@ -62,7 +62,7 @@ public class SysDataSourceController extends JeecgController queryPageList( @@ -111,7 +111,7 @@ public class SysDataSourceController extends JeecgController add(@RequestBody SysDataSource sysDataSource) { //update-begin-author:taoyan date:2022-8-10 for: jdbc连接地址漏洞问题 @@ -132,7 +132,7 @@ public class SysDataSourceController extends JeecgController edit(@RequestBody SysDataSource sysDataSource) { //update-begin-author:taoyan date:2022-8-10 for: jdbc连接地址漏洞问题 @@ -153,7 +153,7 @@ public class SysDataSourceController extends JeecgController delete(@RequestParam(name = "id") String id) { return sysDataSourceService.deleteDataSource(id); @@ -166,7 +166,7 @@ public class SysDataSourceController extends JeecgController deleteBatch(@RequestParam(name = "ids") String ids) { List idList = Arrays.asList(ids.split(",")); @@ -185,7 +185,7 @@ public class SysDataSourceController extends JeecgController queryById(@RequestParam(name = "id") String id) throws InterruptedException { SysDataSource sysDataSource = sysDataSourceService.getById(id); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartPermissionController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartPermissionController.java index 219be7fe..3fad7e34 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartPermissionController.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartPermissionController.java @@ -8,6 +8,8 @@ import javax.servlet.http.HttpServletResponse; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.CommonConstant; @@ -34,8 +36,6 @@ import org.jeecg.modules.system.service.ISysPermissionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; /** * @Description: 部门权限表 @@ -44,7 +44,7 @@ import io.swagger.annotations.ApiOperation; * @Version: V1.0 */ @Slf4j -@Api(tags="部门权限表") +@Tag(name="部门权限表") @RestController @RequestMapping("/sys/sysDepartPermission") public class SysDepartPermissionController extends JeecgController { @@ -72,7 +72,7 @@ public class SysDepartPermissionController extends JeecgController queryPageList(SysDepartPermission sysDepartPermission, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -90,7 +90,7 @@ public class SysDepartPermissionController extends JeecgController add(@RequestBody SysDepartPermission sysDepartPermission) { sysDepartPermissionService.save(sysDepartPermission); @@ -103,7 +103,7 @@ public class SysDepartPermissionController extends JeecgController edit(@RequestBody SysDepartPermission sysDepartPermission) { sysDepartPermissionService.updateById(sysDepartPermission); @@ -116,7 +116,7 @@ public class SysDepartPermissionController extends JeecgController delete(@RequestParam(name="id",required=true) String id) { sysDepartPermissionService.removeById(id); @@ -129,7 +129,7 @@ public class SysDepartPermissionController extends JeecgController deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.sysDepartPermissionService.removeByIds(Arrays.asList(ids.split(","))); @@ -142,7 +142,7 @@ public class SysDepartPermissionController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) { SysDepartPermission sysDepartPermission = sysDepartPermissionService.getById(id); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartRoleController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartRoleController.java index 8cfc2d16..938df5c3 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartRoleController.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartRoleController.java @@ -8,6 +8,8 @@ import javax.servlet.http.HttpServletResponse; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresRoles; @@ -29,8 +31,6 @@ import org.jeecg.common.system.base.controller.JeecgController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; /** * @Description: 部门角色 @@ -39,7 +39,7 @@ import io.swagger.annotations.ApiOperation; * @Version: V1.0 */ @Slf4j -@Api(tags="部门角色") +@Tag(name="部门角色") @RestController @RequestMapping("/sys/sysDepartRole") public class SysDepartRoleController extends JeecgController { @@ -70,7 +70,7 @@ public class SysDepartRoleController extends JeecgController queryPageList(SysDepartRole sysDepartRole, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -111,7 +111,7 @@ public class SysDepartRoleController extends JeecgController add(@RequestBody SysDepartRole sysDepartRole) { sysDepartRoleService.save(sysDepartRole); @@ -124,7 +124,7 @@ public class SysDepartRoleController extends JeecgController edit(@RequestBody SysDepartRole sysDepartRole) { @@ -139,7 +139,7 @@ public class SysDepartRoleController extends JeecgController delete(@RequestParam(name="id",required=true) String id) { @@ -154,7 +154,7 @@ public class SysDepartRoleController extends JeecgController deleteBatch(@RequestParam(name="ids",required=true) String ids) { @@ -169,7 +169,7 @@ public class SysDepartRoleController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) { SysDepartRole sysDepartRole = sysDepartRoleService.getById(id); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDictItemController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDictItemController.java index d341b8df..e1b1893a 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDictItemController.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDictItemController.java @@ -7,8 +7,8 @@ import java.util.Date; import javax.servlet.http.HttpServletRequest; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import org.apache.commons.lang.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresRoles; @@ -40,7 +40,7 @@ import lombok.extern.slf4j.Slf4j; * @Author zhangweijian * @since 2018-12-28 */ -@Api(tags = "数据字典") +@Tag(name = "数据字典") @RestController @RequestMapping("/sys/dictItem") @Slf4j @@ -162,7 +162,7 @@ public class SysDictItemController { * @return */ @RequestMapping(value = "/dictItemCheck", method = RequestMethod.GET) - @ApiOperation("字典重复校验接口") + @Operation(summary ="字典重复校验接口") public Result doDictItemCheck(SysDictItem sysDictItem, HttpServletRequest request) { Long num = Long.valueOf(0); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysFillRuleController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysFillRuleController.java index 29354fb8..7a96fff8 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysFillRuleController.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysFillRuleController.java @@ -5,8 +5,8 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; @@ -30,7 +30,7 @@ import java.util.Arrays; * @Version: V1.0 */ @Slf4j -@Api(tags = "填值规则") +@Tag(name = "填值规则") @RestController @RequestMapping("/sys/fillRule") public class SysFillRuleController extends JeecgController { @@ -47,7 +47,7 @@ public class SysFillRuleController extends JeecgController queryPageList(SysFillRule sysFillRule, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @@ -78,7 +78,7 @@ public class SysFillRuleController extends JeecgController add(@RequestBody SysFillRule sysFillRule) { sysFillRuleService.save(sysFillRule); @@ -92,7 +92,7 @@ public class SysFillRuleController extends JeecgController edit(@RequestBody SysFillRule sysFillRule) { sysFillRuleService.updateById(sysFillRule); @@ -106,7 +106,7 @@ public class SysFillRuleController extends JeecgController delete(@RequestParam(name = "id", required = true) String id) { sysFillRuleService.removeById(id); @@ -120,7 +120,7 @@ public class SysFillRuleController extends JeecgController deleteBatch(@RequestParam(name = "ids", required = true) String ids) { this.sysFillRuleService.removeByIds(Arrays.asList(ids.split(","))); @@ -134,7 +134,7 @@ public class SysFillRuleController extends JeecgController queryById(@RequestParam(name = "id", required = true) String id) { SysFillRule sysFillRule = sysFillRuleService.getById(id); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysFormFileController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysFormFileController.java index 33dca546..2d6db07d 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysFormFileController.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysFormFileController.java @@ -3,8 +3,8 @@ package org.jeecg.modules.system.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; @@ -27,7 +27,7 @@ import java.util.Arrays; * @Version: V1.0 */ @Slf4j -@Api(tags = "表单评论文件") +@Tag(name = "表单评论文件") @RestController @RequestMapping("/sys/formFile") public class SysFormFileController extends JeecgController { @@ -44,7 +44,7 @@ public class SysFormFileController extends JeecgController queryPageList(SysFormFile sysFormFile, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @@ -63,7 +63,7 @@ public class SysFormFileController extends JeecgController add(@RequestBody SysFormFile sysFormFile) { sysFormFileService.save(sysFormFile); @@ -77,7 +77,7 @@ public class SysFormFileController extends JeecgController edit(@RequestBody SysFormFile sysFormFile) { sysFormFileService.updateById(sysFormFile); @@ -91,7 +91,7 @@ public class SysFormFileController extends JeecgController delete(@RequestParam(name = "id", required = true) String id) { sysFormFileService.removeById(id); @@ -105,7 +105,7 @@ public class SysFormFileController extends JeecgController deleteBatch(@RequestParam(name = "ids", required = true) String ids) { this.sysFormFileService.removeByIds(Arrays.asList(ids.split(","))); @@ -119,7 +119,7 @@ public class SysFormFileController extends JeecgController queryById(@RequestParam(name = "id", required = true) String id) { SysFormFile sysFormFile = sysFormFileService.getById(id); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysGatewayRouteController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysGatewayRouteController.java index 33e56059..5b2bfbf7 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysGatewayRouteController.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysGatewayRouteController.java @@ -3,7 +3,7 @@ package org.jeecg.modules.system.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import io.swagger.annotations.Api; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -25,7 +25,7 @@ import java.util.List; * @Date: 2020-05-26 * @Version: V1.0 */ -@Api(tags = "gateway路由管理") +@Tag(name = "gateway路由管理") @RestController @RequestMapping("/sys/gatewayRoute") @Slf4j diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPositionController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPositionController.java index 98803d91..5f3de909 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPositionController.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPositionController.java @@ -5,8 +5,8 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; @@ -52,7 +52,7 @@ import java.util.stream.Collectors; * @Version: V1.0 */ @Slf4j -@Api(tags = "职务表") +@Tag(name = "职务表") @RestController @RequestMapping("/sys/position") public class SysPositionController { @@ -76,7 +76,7 @@ public class SysPositionController { * @return */ @AutoLog(value = "职务表-分页列表查询") - @ApiOperation(value = "职务表-分页列表查询", notes = "职务表-分页列表查询") + @Operation(summary = "职务表-分页列表查询") @GetMapping(value = "/list") public Result> queryPageList(SysPosition sysPosition, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @@ -104,7 +104,7 @@ public class SysPositionController { * @return */ @AutoLog(value = "职务表-添加") - @ApiOperation(value = "职务表-添加", notes = "职务表-添加") + @Operation(summary = "职务表-添加") @PostMapping(value = "/add") public Result add(@RequestBody SysPosition sysPosition) { Result result = new Result(); @@ -132,7 +132,7 @@ public class SysPositionController { * @return */ @AutoLog(value = "职务表-编辑") - @ApiOperation(value = "职务表-编辑", notes = "职务表-编辑") + @Operation(summary = "职务表-编辑") @RequestMapping(value = "/edit", method ={RequestMethod.PUT, RequestMethod.POST}) public Result edit(@RequestBody SysPosition sysPosition) { Result result = new Result(); @@ -157,7 +157,7 @@ public class SysPositionController { * @return */ @AutoLog(value = "职务表-通过id删除") - @ApiOperation(value = "职务表-通过id删除", notes = "职务表-通过id删除") + @Operation(summary = "职务表-通过id删除") @DeleteMapping(value = "/delete") public Result delete(@RequestParam(name = "id", required = true) String id) { try { @@ -178,7 +178,7 @@ public class SysPositionController { * @return */ @AutoLog(value = "职务表-批量删除") - @ApiOperation(value = "职务表-批量删除", notes = "职务表-批量删除") + @Operation(summary = "职务表-批量删除") @DeleteMapping(value = "/deleteBatch") public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { Result result = new Result(); @@ -198,7 +198,7 @@ public class SysPositionController { * @return */ @AutoLog(value = "职务表-通过id查询") - @ApiOperation(value = "职务表-通过id查询", notes = "职务表-通过id查询") + @Operation(summary = "职务表-通过id查询") @GetMapping(value = "/queryById") public Result queryById(@RequestParam(name = "id", required = true) String id) { Result result = new Result(); @@ -303,7 +303,7 @@ public class SysPositionController { * @return */ @AutoLog(value = "职务表-通过code查询") - @ApiOperation(value = "职务表-通过code查询", notes = "职务表-通过code查询") + @Operation(summary = "职务表-通过code查询") @GetMapping(value = "/queryByCode") public Result queryByCode(@RequestParam(name = "code", required = true) String code) { Result result = new Result(); @@ -327,7 +327,7 @@ public class SysPositionController { * @return */ @AutoLog(value = "职务表-通过多个查询") - @ApiOperation(value = "职务表-通过多个id查询", notes = "职务表-通过多个id查询") + @Operation(summary = "职务表-通过多个id查询") @GetMapping(value = "/queryByIds") public Result> queryByIds(@RequestParam(name = "ids") String ids) { Result> result = new Result<>(); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleIndexController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleIndexController.java index 19274630..e48a8a57 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleIndexController.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleIndexController.java @@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecg.common.api.vo.Result; @@ -29,7 +29,7 @@ import java.util.Arrays; * @Version: V1.0 */ @Slf4j -@Api(tags = "角色首页配置") +@Tag(name = "角色首页配置") @RestController @RequestMapping("/sys/sysRoleIndex") public class SysRoleIndexController extends JeecgController { @@ -46,7 +46,7 @@ public class SysRoleIndexController extends JeecgController queryPageList(SysRoleIndex sysRoleIndex, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @@ -66,7 +66,7 @@ public class SysRoleIndexController extends JeecgController add(@RequestBody SysRoleIndex sysRoleIndex,HttpServletRequest request) { @@ -82,7 +82,7 @@ public class SysRoleIndexController extends JeecgController edit(@RequestBody SysRoleIndex sysRoleIndex,HttpServletRequest request) { @@ -97,7 +97,7 @@ public class SysRoleIndexController extends JeecgController delete(@RequestParam(name = "id", required = true) String id) { sysRoleIndexService.removeById(id); @@ -111,7 +111,7 @@ public class SysRoleIndexController extends JeecgController deleteBatch(@RequestParam(name = "ids", required = true) String ids) { this.sysRoleIndexService.removeByIds(Arrays.asList(ids.split(","))); @@ -125,7 +125,7 @@ public class SysRoleIndexController extends JeecgController queryById(@RequestParam(name = "id", required = true) String id) { SysRoleIndex sysRoleIndex = sysRoleIndexService.getById(id); @@ -162,7 +162,7 @@ public class SysRoleIndexController extends JeecgController queryByCode(@RequestParam(name = "roleCode", required = true) String roleCode,HttpServletRequest request) { diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTableWhiteListController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTableWhiteListController.java index fc2dbda8..2f09102a 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTableWhiteListController.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTableWhiteListController.java @@ -3,8 +3,8 @@ package org.jeecg.modules.system.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresRoles; @@ -26,7 +26,7 @@ import javax.servlet.http.HttpServletRequest; * @Version: V1.0 */ @Slf4j -@Api(tags = "系统表白名单") +@Tag(name = "系统表白名单") @RestController @RequestMapping("/sys/tableWhiteList") public class SysTableWhiteListController extends JeecgController { @@ -65,7 +65,7 @@ public class SysTableWhiteListController extends JeecgController bindingThirdPhone(@RequestBody JSONObject jsonObject) { diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysCheckRule.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysCheckRule.java index a287f352..96d681ae 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysCheckRule.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysCheckRule.java @@ -4,8 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -24,44 +23,44 @@ import java.util.Date; @TableName("sys_check_rule") @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@ApiModel(value = "sys_check_rule对象", description = "编码校验规则") +@Schema(description = "编码校验规则") public class SysCheckRule { /** * 主键id */ @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键id") + @Schema(description = "主键id") private String id; /** * 规则名称 */ @Excel(name = "规则名称", width = 15) - @ApiModelProperty(value = "规则名称") + @Schema(description = "规则名称") private String ruleName; /** * 规则Code */ @Excel(name = "规则Code", width = 15) - @ApiModelProperty(value = "规则Code") + @Schema(description = "规则Code") private String ruleCode; /** * 规则JSON */ @Excel(name = "规则JSON", width = 15) - @ApiModelProperty(value = "规则JSON") + @Schema(description = "规则JSON") private String ruleJson; /** * 规则描述 */ @Excel(name = "规则描述", width = 15) - @ApiModelProperty(value = "规则描述") + @Schema(description = "规则描述") private String ruleDescription; /** * 更新人 */ @Excel(name = "更新人", width = 15) - @ApiModelProperty(value = "更新人") + @Schema(description = "更新人") private String updateBy; /** * 更新时间 @@ -69,13 +68,13 @@ public class SysCheckRule { @Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "更新时间") + @Schema(description = "更新时间") private Date updateTime; /** * 创建人 */ @Excel(name = "创建人", width = 15) - @ApiModelProperty(value = "创建人") + @Schema(description = "创建人") private String createBy; /** * 创建时间 @@ -83,6 +82,6 @@ public class SysCheckRule { @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "创建时间") + @Schema(description = "创建时间") private Date createTime; } diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysComment.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysComment.java index 7eee0008..2f35e902 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysComment.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysComment.java @@ -5,8 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -27,56 +26,56 @@ import java.util.Date; @TableName("sys_comment") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="sys_comment对象", description="系统评论回复表") +@Schema(description="系统评论回复表") public class SysComment implements Serializable { private static final long serialVersionUID = 1L; /**id*/ @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "id") + @Schema(description = "id") private String id; /**表名*/ @Excel(name = "表名", width = 15) - @ApiModelProperty(value = "表名") + @Schema(description = "表名") private String tableName; /**数据id*/ @Excel(name = "数据id", width = 15) - @ApiModelProperty(value = "数据id") + @Schema(description = "数据id") private String tableDataId; /**来源用户id*/ @Excel(name = "来源用户id", width = 15) - @ApiModelProperty(value = "来源用户id") + @Schema(description = "来源用户id") @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname") private String fromUserId; /**发送给用户id(允许为空)*/ @Excel(name = "发送给用户id(允许为空)", width = 15) - @ApiModelProperty(value = "发送给用户id(允许为空)") + @Schema(description = "发送给用户id(允许为空)") @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname") private String toUserId; /**评论id(允许为空，不为空时，则为回复)*/ @Excel(name = "评论id(允许为空，不为空时，则为回复)", width = 15) - @ApiModelProperty(value = "评论id(允许为空，不为空时，则为回复)") + @Schema(description = "评论id(允许为空，不为空时，则为回复)") @Dict(dictTable = "sys_comment", dicCode = "id", dicText = "comment_content") private String commentId; /**回复内容*/ @Excel(name = "回复内容", width = 15) - @ApiModelProperty(value = "回复内容") + @Schema(description = "回复内容") private String commentContent; /**创建人*/ - @ApiModelProperty(value = "创建人") + @Schema(description = "创建人") private String createBy; /**创建日期*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "创建日期") + @Schema(description = "创建日期") private Date createTime; /**更新人*/ - @ApiModelProperty(value = "更新人") + @Schema(description = "更新人") private String updateBy; /**更新日期*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "更新日期") + @Schema(description = "更新日期") private Date updateTime; /** diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDataSource.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDataSource.java index 76c0e802..6ae74443 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDataSource.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDataSource.java @@ -4,8 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -23,102 +22,102 @@ import org.springframework.format.annotation.DateTimeFormat; @TableName("sys_data_source") @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@ApiModel(value = "sys_data_source对象", description = "多数据源管理") +@Schema(description = "多数据源管理") public class SysDataSource { /** * id */ @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "id") + @Schema(description = "id") private java.lang.String id; /** * 数据源编码 */ @Excel(name = "数据源编码", width = 15) - @ApiModelProperty(value = "数据源编码") + @Schema(description = "数据源编码") private java.lang.String code; /** * 数据源名称 */ @Excel(name = "数据源名称", width = 15) - @ApiModelProperty(value = "数据源名称") + @Schema(description = "数据源名称") private java.lang.String name; /** * 描述 */ @Excel(name = "备注", width = 15) - @ApiModelProperty(value = "备注") + @Schema(description = "备注") private java.lang.String remark; /** * 数据库类型 */ @Dict(dicCode = "database_type") @Excel(name = "数据库类型", width = 15, dicCode = "database_type") - @ApiModelProperty(value = "数据库类型") + @Schema(description = "数据库类型") private java.lang.String dbType; /** * 驱动类 */ @Excel(name = "驱动类", width = 15) - @ApiModelProperty(value = "驱动类") + @Schema(description = "驱动类") private java.lang.String dbDriver; /** * 数据源地址 */ @Excel(name = "数据源地址", width = 15) - @ApiModelProperty(value = "数据源地址") + @Schema(description = "数据源地址") private java.lang.String dbUrl; /** * 数据库名称 */ @Excel(name = "数据库名称", width = 15) - @ApiModelProperty(value = "数据库名称") + @Schema(description = "数据库名称") private java.lang.String dbName; /** * 用户名 */ @Excel(name = "用户名", width = 15) - @ApiModelProperty(value = "用户名") + @Schema(description = "用户名") private java.lang.String dbUsername; /** * 密码 */ @Excel(name = "密码", width = 15) - @ApiModelProperty(value = "密码") + @Schema(description = "密码") private java.lang.String dbPassword; /** * 创建人 */ - @ApiModelProperty(value = "创建人") + @Schema(description = "创建人") private java.lang.String createBy; /** * 创建日期 */ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "创建日期") + @Schema(description = "创建日期") private java.util.Date createTime; /** * 更新人 */ - @ApiModelProperty(value = "更新人") + @Schema(description = "更新人") private java.lang.String updateBy; /** * 更新日期 */ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "更新日期") + @Schema(description = "更新日期") private java.util.Date updateTime; /** * 所属部门 */ @Excel(name = "所属部门", width = 15) - @ApiModelProperty(value = "所属部门") + @Schema(description = "所属部门") private java.lang.String sysOrgCode; /**租户ID*/ - @ApiModelProperty(value = "租户ID") + @Schema(description = "租户ID") private java.lang.Integer tenantId; } diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartPermission.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartPermission.java index a833af4d..db48e453 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartPermission.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartPermission.java @@ -6,8 +6,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableField; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -25,23 +24,23 @@ import org.jeecgframework.poi.excel.annotation.Excel; @TableName("sys_depart_permission") @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@ApiModel(value="sys_depart_permission对象", description="部门权限表") +@Schema(description="部门权限表") public class SysDepartPermission { /**id*/ @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "id") + @Schema(description = "id") private java.lang.String id; /**部门id*/ @Excel(name = "部门id", width = 15) - @ApiModelProperty(value = "部门id") + @Schema(description = "部门id") private java.lang.String departId; /**权限id*/ @Excel(name = "权限id", width = 15) - @ApiModelProperty(value = "权限id") + @Schema(description = "权限id") private java.lang.String permissionId; /**数据规则id*/ - @ApiModelProperty(value = "数据规则id") + @Schema(description = "数据规则id") private java.lang.String dataRuleIds; public SysDepartPermission() { diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRole.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRole.java index cc3f74f4..8314a761 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRole.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRole.java @@ -6,8 +6,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableField; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -26,49 +25,49 @@ import org.jeecgframework.poi.excel.annotation.Excel; @TableName("sys_depart_role") @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@ApiModel(value="sys_depart_role对象", description="部门角色") +@Schema(description="部门角色") public class SysDepartRole { /**id*/ @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "id") + @Schema(description = "id") private java.lang.String id; /**部门id*/ @Excel(name = "部门id", width = 15) - @ApiModelProperty(value = "部门id") + @Schema(description = "部门id") @Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id") private java.lang.String departId; /**部门角色名称*/ @Excel(name = "部门角色名称", width = 15) - @ApiModelProperty(value = "部门角色名称") + @Schema(description = "部门角色名称") private java.lang.String roleName; /**部门角色编码*/ @Excel(name = "部门角色编码", width = 15) - @ApiModelProperty(value = "部门角色编码") + @Schema(description = "部门角色编码") private java.lang.String roleCode; /**描述*/ @Excel(name = "描述", width = 15) - @ApiModelProperty(value = "描述") + @Schema(description = "描述") private java.lang.String description; /**创建人*/ @Excel(name = "创建人", width = 15) - @ApiModelProperty(value = "创建人") + @Schema(description = "创建人") private java.lang.String createBy; /**创建时间*/ @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "创建时间") + @Schema(description = "创建时间") private java.util.Date createTime; /**更新人*/ @Excel(name = "更新人", width = 15) - @ApiModelProperty(value = "更新人") + @Schema(description = "更新人") private java.lang.String updateBy; /**更新时间*/ @Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "更新时间") + @Schema(description = "更新时间") private java.util.Date updateTime; diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRolePermission.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRolePermission.java index 61b3fc2c..e34ab423 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRolePermission.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRolePermission.java @@ -6,8 +6,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableField; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -25,34 +24,34 @@ import org.jeecgframework.poi.excel.annotation.Excel; @TableName("sys_depart_role_permission") @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@ApiModel(value="sys_depart_role_permission对象", description="部门角色权限") +@Schema( description="部门角色权限") public class SysDepartRolePermission { /**id*/ @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "id") + @Schema(description = "id") private java.lang.String id; /**部门id*/ @Excel(name = "部门id", width = 15) - @ApiModelProperty(value = "部门id") + @Schema(description = "部门id") private java.lang.String departId; /**角色id*/ @Excel(name = "角色id", width = 15) - @ApiModelProperty(value = "角色id") + @Schema(description = "角色id") private java.lang.String roleId; /**权限id*/ @Excel(name = "权限id", width = 15) - @ApiModelProperty(value = "权限id") + @Schema(description = "权限id") private java.lang.String permissionId; /**dataRuleIds*/ @Excel(name = "dataRuleIds", width = 15) - @ApiModelProperty(value = "dataRuleIds") + @Schema(description = "dataRuleIds") private java.lang.String dataRuleIds; /** 操作时间 */ @Excel(name = "操作时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "操作时间") + @Schema(description = "操作时间") private java.util.Date operateDate; /** 操作ip */ private java.lang.String operateIp; diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRoleUser.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRoleUser.java index 01316dc3..1e8af5c1 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRoleUser.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRoleUser.java @@ -6,8 +6,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableField; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -25,20 +24,20 @@ import org.jeecgframework.poi.excel.annotation.Excel; @TableName("sys_depart_role_user") @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@ApiModel(value="sys_depart_role_user对象", description="部门角色人员信息") +@Schema(description="部门角色人员信息") public class SysDepartRoleUser { /**主键id*/ @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键id") + @Schema(description = "主键id") private java.lang.String id; /**用户id*/ @Excel(name = "用户id", width = 15) - @ApiModelProperty(value = "用户id") + @Schema(description = "用户id") private java.lang.String userId; /**角色id*/ @Excel(name = "角色id", width = 15) - @ApiModelProperty(value = "角色id") + @Schema(description = "角色id") private java.lang.String droleId; public SysDepartRoleUser() { diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFillRule.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFillRule.java index 928ce016..9ead1cf0 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFillRule.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFillRule.java @@ -4,8 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -22,44 +21,44 @@ import org.springframework.format.annotation.DateTimeFormat; @TableName("sys_fill_rule") @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@ApiModel(value = "sys_fill_rule对象", description = "填值规则") +@Schema(description = "填值规则") public class SysFillRule { /** * 主键ID */ @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键ID") + @Schema(description = "主键ID") private java.lang.String id; /** * 规则名称 */ @Excel(name = "规则名称", width = 15) - @ApiModelProperty(value = "规则名称") + @Schema(description = "规则名称") private java.lang.String ruleName; /** * 规则Code */ @Excel(name = "规则Code", width = 15) - @ApiModelProperty(value = "规则Code") + @Schema(description = "规则Code") private java.lang.String ruleCode; /** * 规则实现类 */ @Excel(name = "规则实现类", width = 15) - @ApiModelProperty(value = "规则实现类") + @Schema(description = "规则实现类") private java.lang.String ruleClass; /** * 规则参数 */ @Excel(name = "规则参数", width = 15) - @ApiModelProperty(value = "规则参数") + @Schema(description = "规则参数") private java.lang.String ruleParams; /** * 修改人 */ @Excel(name = "修改人", width = 15) - @ApiModelProperty(value = "修改人") + @Schema(description = "修改人") private java.lang.String updateBy; /** * 修改时间 @@ -67,13 +66,13 @@ public class SysFillRule { @Excel(name = "修改时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "修改时间") + @Schema(description = "修改时间") private java.util.Date updateTime; /** * 创建人 */ @Excel(name = "创建人", width = 15) - @ApiModelProperty(value = "创建人") + @Schema(description = "创建人") private java.lang.String createBy; /** * 创建时间 @@ -81,6 +80,6 @@ public class SysFillRule { @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "创建时间") + @Schema(description = "创建时间") private java.util.Date createTime; } diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFormFile.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFormFile.java index 77057880..5cb736fb 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFormFile.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFormFile.java @@ -4,8 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -23,37 +22,37 @@ import java.util.Date; @TableName("sys_form_file") @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@ApiModel(value="sys_form_file对象", description="表单评论文件") +@Schema(description="表单评论文件") public class SysFormFile { /**id*/ @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "id") + @Schema(description = "id") private String id; /**表名*/ @Excel(name = "表名", width = 15) - @ApiModelProperty(value = "表名") + @Schema(description = "表名") private String tableName; /**数据id*/ @Excel(name = "数据id", width = 15) - @ApiModelProperty(value = "数据id") + @Schema(description = "数据id") private String tableDataId; /**关联文件id*/ @Excel(name = "关联文件id", width = 15) - @ApiModelProperty(value = "关联文件id") + @Schema(description = "关联文件id") private String fileId; /**文档类型（folder:文件夹 excel:excel doc:word pp:ppt image:图片 archive:其他文档 video:视频）*/ @Excel(name = "文档类型（folder:文件夹 excel:excel doc:word pp:ppt image:图片 archive:其他文档 video:视频）", width = 15) - @ApiModelProperty(value = "文档类型（folder:文件夹 excel:excel doc:word pp:ppt image:图片 archive:其他文档 video:视频）") + @Schema(description = "文档类型（folder:文件夹 excel:excel doc:word pp:ppt image:图片 archive:其他文档 video:视频）") private String fileType; /**创建人登录名称*/ @Excel(name = "创建人登录名称", width = 15) - @ApiModelProperty(value = "创建人登录名称") + @Schema(description = "创建人登录名称") private String createBy; /**创建日期*/ @Excel(name = "创建日期", width = 20, format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "创建日期") + @Schema(description = "创建日期") private Date createTime; } diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysGatewayRoute.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysGatewayRoute.java index f5a30ac7..2cb46f21 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysGatewayRoute.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysGatewayRoute.java @@ -5,8 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -27,27 +26,27 @@ import java.util.Date; @TableName("sys_gateway_route") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="sys_gateway_route对象", description="gateway路由管理") +@Schema(description="gateway路由管理") public class SysGatewayRoute implements Serializable { private static final long serialVersionUID = 1L; /**主键*/ @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键") + @Schema(description = "主键") private String id; /**routerKEy*/ - @ApiModelProperty(value = "路由ID") + @Schema(description = "路由ID") private String routerId; /**服务名*/ @Excel(name = "服务名", width = 15) - @ApiModelProperty(value = "服务名") + @Schema(description = "服务名") private String name; /**服务地址*/ @Excel(name = "服务地址", width = 15) - @ApiModelProperty(value = "服务地址") + @Schema(description = "服务地址") private String uri; /** @@ -62,41 +61,41 @@ public class SysGatewayRoute implements Serializable { /**是否忽略前缀0-否 1-是*/ @Excel(name = "忽略前缀", width = 15) - @ApiModelProperty(value = "忽略前缀") + @Schema(description = "忽略前缀") @Dict(dicCode = "yn") private Integer stripPrefix; /**是否重试0-否 1-是*/ @Excel(name = "是否重试", width = 15) - @ApiModelProperty(value = "是否重试") + @Schema(description = "是否重试") @Dict(dicCode = "yn") private Integer retryable; /**是否为保留数据:0-否 1-是*/ @Excel(name = "保留数据", width = 15) - @ApiModelProperty(value = "保留数据") + @Schema(description = "保留数据") @Dict(dicCode = "yn") private Integer persistable; /**是否在接口文档中展示:0-否 1-是*/ @Excel(name = "在接口文档中展示", width = 15) - @ApiModelProperty(value = "在接口文档中展示") + @Schema(description = "在接口文档中展示") @Dict(dicCode = "yn") private Integer showApi; /**状态 1有效 0无效*/ @Excel(name = "状态", width = 15) - @ApiModelProperty(value = "状态") + @Schema(description = "状态") @Dict(dicCode = "yn") private Integer status; /**创建人*/ - @ApiModelProperty(value = "创建人") + @Schema(description = "创建人") private String createBy; /**创建日期*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "创建日期") + @Schema(description = "创建日期") private Date createTime; /** @@ -105,14 +104,14 @@ public class SysGatewayRoute implements Serializable { @TableLogic private Integer delFlag; /* *//**更新人*//* - @ApiModelProperty(value = "更新人") + @Schema(description = "更新人") private String updateBy; *//**更新日期*//* @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "更新日期") + @Schema(description = "更新日期") private Date updateTime; *//**所属部门*//* - @ApiModelProperty(value = "所属部门") + @Schema(description = "所属部门") private String sysOrgCode;*/ } diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPackPermission.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPackPermission.java index 44319a1e..6664ed76 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPackPermission.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPackPermission.java @@ -5,12 +5,11 @@ import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -24,36 +23,36 @@ import lombok.experimental.Accessors; @TableName("sys_tenant_pack_perms") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="sys_tenant_pack_perms对象", description="产品包菜单关系表") +@Schema(description="产品包菜单关系表") public class SysPackPermission implements Serializable { private static final long serialVersionUID = 1L; /**主键编号*/ @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键编号") + @Schema(description = "主键编号") private String id; /**租户产品包名称*/ @Excel(name = "租户产品包名称", width = 15) - @ApiModelProperty(value = "租户产品包名称") + @Schema(description = "租户产品包名称") private String packId; /**菜单id*/ @Excel(name = "菜单id", width = 15) - @ApiModelProperty(value = "菜单id") + @Schema(description = "菜单id") private String permissionId; /**创建人*/ - @ApiModelProperty(value = "创建人") + @Schema(description = "创建人") private String createBy; /**创建时间*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "创建时间") + @Schema(description = "创建时间") private Date createTime; /**更新人*/ - @ApiModelProperty(value = "更新人") + @Schema(description = "更新人") private String updateBy; /**更新时间*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "更新时间") + @Schema(description = "更新时间") private Date updateTime; } diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPosition.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPosition.java index 83f7dbcf..480982de 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPosition.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPosition.java @@ -4,8 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -23,70 +22,70 @@ import org.springframework.format.annotation.DateTimeFormat; @TableName("sys_position") @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@ApiModel(value = "sys_position对象", description = "职务表") +@Schema(description = "职务表") public class SysPosition { /** * id */ @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "id") + @Schema(description = "id") private java.lang.String id; /** * 职务编码 */ @Excel(name = "职务编码", width = 15) - @ApiModelProperty(value = "职务编码") + @Schema(description = "职务编码") private java.lang.String code; /** * 职务名称 */ @Excel(name = "职务名称", width = 15) - @ApiModelProperty(value = "职务名称") + @Schema(description = "职务名称") private java.lang.String name; /** * 职级 */ //@Excel(name = "职级", width = 15,dicCode ="position_rank") - @ApiModelProperty(value = "职级") + @Schema(description = "职级") @Dict(dicCode = "position_rank") private java.lang.String postRank; /** * 公司id */ - @ApiModelProperty(value = "公司id") + @Schema(description = "公司id") private java.lang.String companyId; /** * 创建人 */ - @ApiModelProperty(value = "创建人") + @Schema(description = "创建人") private java.lang.String createBy; /** * 创建时间 */ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "创建时间") + @Schema(description = "创建时间") private java.util.Date createTime; /** * 修改人 */ - @ApiModelProperty(value = "修改人") + @Schema(description = "修改人") private java.lang.String updateBy; /** * 修改时间 */ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "修改时间") + @Schema(description = "修改时间") private java.util.Date updateTime; /** * 组织机构编码 */ - @ApiModelProperty(value = "组织机构编码") + @Schema(description = "组织机构编码") private java.lang.String sysOrgCode; /**租户ID*/ - @ApiModelProperty(value = "租户ID") + @Schema(description = "租户ID") private java.lang.Integer tenantId; } diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysRoleIndex.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysRoleIndex.java index d270fc5c..20439289 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysRoleIndex.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysRoleIndex.java @@ -6,8 +6,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableField; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -25,63 +24,63 @@ import org.jeecgframework.poi.excel.annotation.Excel; @TableName("sys_role_index") @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@ApiModel(value="sys_role_index对象", description="角色首页配置") +@Schema(description="角色首页配置") public class SysRoleIndex { /**id*/ @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "id") + @Schema(description = "id") private java.lang.String id; /**角色编码*/ @Excel(name = "角色编码", width = 15) - @ApiModelProperty(value = "角色编码") + @Schema(description = "角色编码") private java.lang.String roleCode; /**路由地址*/ @Excel(name = "路由地址", width = 15) - @ApiModelProperty(value = "路由地址") + @Schema(description = "路由地址") private java.lang.String url; /**路由地址*/ @Excel(name = "路由地址", width = 15) - @ApiModelProperty(value = "组件") + @Schema(description = "组件") private java.lang.String component; /** * 是否路由菜单: 0:不是 1:是（默认值1） */ @Excel(name = "是否路由菜单", width = 15) - @ApiModelProperty(value = "是否路由菜单") + @Schema(description = "是否路由菜单") @TableField(value="is_route") private boolean route; /**优先级*/ @Excel(name = "优先级", width = 15) - @ApiModelProperty(value = "优先级") + @Schema(description = "优先级") private java.lang.Integer priority; /**路由地址*/ @Excel(name = "状态", width = 15) - @ApiModelProperty(value = "状态") + @Schema(description = "状态") private java.lang.String status; /**创建人登录名称*/ @Excel(name = "创建人登录名称", width = 15) - @ApiModelProperty(value = "创建人登录名称") + @Schema(description = "创建人登录名称") private java.lang.String createBy; /**创建日期*/ @Excel(name = "创建日期", width = 20, format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "创建日期") + @Schema(description = "创建日期") private java.util.Date createTime; /**更新人登录名称*/ @Excel(name = "更新人登录名称", width = 15) - @ApiModelProperty(value = "更新人登录名称") + @Schema(description = "更新人登录名称") private java.lang.String updateBy; /**更新日期*/ @Excel(name = "更新日期", width = 20, format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "更新日期") + @Schema(description = "更新日期") private java.util.Date updateTime; /**所属部门*/ @Excel(name = "所属部门", width = 15) - @ApiModelProperty(value = "所属部门") + @Schema(description = "所属部门") private java.lang.String sysOrgCode; diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTableWhiteList.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTableWhiteList.java index f5eecc37..7a1bed8f 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTableWhiteList.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTableWhiteList.java @@ -4,8 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -22,38 +21,38 @@ import org.springframework.format.annotation.DateTimeFormat; @TableName("sys_table_white_list") @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@ApiModel(value = "sys_table_white_list对象", description = "系统表白名单") +@Schema(description = "系统表白名单") public class SysTableWhiteList { /** * 主键id */ @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键id") + @Schema(description = "主键id") private java.lang.String id; /** * 允许的表名 */ @Excel(name = "允许的表名", width = 15) - @ApiModelProperty(value = "允许的表名") + @Schema(description = "允许的表名") private java.lang.String tableName; /** * 允许的字段名，多个用逗号分割 */ @Excel(name = "允许的字段名", width = 15) - @ApiModelProperty(value = "允许的字段名") + @Schema(description = "允许的字段名") private java.lang.String fieldName; /** * 状态，1=启用，0=禁用 */ @Excel(name = "状态", width = 15) - @ApiModelProperty(value = "状态") + @Schema(description = "状态") private java.lang.String status; /** * 创建人 */ @Excel(name = "创建人", width = 15) - @ApiModelProperty(value = "创建人") + @Schema(description = "创建人") private java.lang.String createBy; /** * 创建时间 @@ -61,13 +60,13 @@ public class SysTableWhiteList { @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "创建时间") + @Schema(description = "创建时间") private java.util.Date createTime; /** * 更新人 */ @Excel(name = "更新人", width = 15) - @ApiModelProperty(value = "更新人") + @Schema(description = "更新人") private java.lang.String updateBy; /** * 更新时间 @@ -75,6 +74,6 @@ public class SysTableWhiteList { @Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "更新时间") + @Schema(description = "更新时间") private java.util.Date updateTime; } diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTenantPack.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTenantPack.java index 9542ab9e..7e456d25 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTenantPack.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTenantPack.java @@ -4,12 +4,11 @@ import java.io.Serializable; import java.util.Date; import com.baomidou.mybatisplus.annotation.*; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -23,49 +22,49 @@ import lombok.experimental.Accessors; @TableName("sys_tenant_pack") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="sys_tenant_pack对象", description="租户产品包") +@Schema(description="租户产品包") public class SysTenantPack implements Serializable { private static final long serialVersionUID = 1L; /**主键id*/ @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键id") + @Schema(description = "主键id") private String id; /**租户id*/ @Excel(name = "租户id", width = 15) - @ApiModelProperty(value = "租户id") + @Schema(description = "租户id") private Integer tenantId; /**产品包名*/ @Excel(name = "产品包名", width = 15) - @ApiModelProperty(value = "产品包名") + @Schema(description = "产品包名") private String packName; /**开启状态(0 未开启 1开启)*/ @Excel(name = "开启状态(0 未开启 1开启)", width = 15) - @ApiModelProperty(value = "开启状态(0 未开启 1开启)") + @Schema(description = "开启状态(0 未开启 1开启)") private String status; /**备注*/ @Excel(name = "备注", width = 15) - @ApiModelProperty(value = "备注") + @Schema(description = "备注") private String remarks; /**创建人*/ - @ApiModelProperty(value = "创建人") + @Schema(description = "创建人") private String createBy; /**创建时间*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "创建时间") + @Schema(description = "创建时间") private Date createTime; /**更新人*/ - @ApiModelProperty(value = "更新人") + @Schema(description = "更新人") private String updateBy; /**更新时间*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "更新时间") + @Schema(description = "更新时间") private Date updateTime; /**产品包类型(default 默认产品包 custom 自定义产品包)*/ @Excel(name = "产品包类型", width = 15) - @ApiModelProperty(value = "产品包类型") + @Schema(description = "产品包类型") private String packType; /**菜单id 临时字段用于新增编辑菜单id传递*/ diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTenantPackUser.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTenantPackUser.java index 9b299823..ade5cfd4 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTenantPackUser.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTenantPackUser.java @@ -4,8 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -24,41 +23,41 @@ import java.io.Serializable; @TableName("sys_tenant_pack_user") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="sys_tenant_pack_user对象", description="租户产品包用户关系表") +@Schema(description="租户产品包用户关系表") public class SysTenantPackUser implements Serializable { private static final long serialVersionUID = 1L; /**id*/ @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "id") + @Schema(description = "id") private java.lang.String id; /**租户产品包ID*/ @Excel(name = "租户产品包ID", width = 15) - @ApiModelProperty(value = "租户产品包ID") + @Schema(description = "租户产品包ID") private java.lang.String packId; /**用户ID*/ @Excel(name = "用户ID", width = 15) - @ApiModelProperty(value = "用户ID") + @Schema(description = "用户ID") private java.lang.String userId; /**租户ID*/ @Excel(name = "租户ID", width = 15) - @ApiModelProperty(value = "租户ID") + @Schema(description = "租户ID") private java.lang.Integer tenantId; /**创建人*/ - @ApiModelProperty(value = "创建人") + @Schema(description = "创建人") private java.lang.String createBy; /**创建时间*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "创建时间") + @Schema(description = "创建时间") private java.util.Date createTime; /**更新人*/ - @ApiModelProperty(value = "更新人") + @Schema(description = "更新人") private java.lang.String updateBy; /**更新时间*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "更新时间") + @Schema(description = "更新时间") private java.util.Date updateTime; private transient String realname; diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysThirdAccount.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysThirdAccount.java index 85a88c29..a08e325e 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysThirdAccount.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysThirdAccount.java @@ -4,8 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -22,44 +21,44 @@ import org.springframework.format.annotation.DateTimeFormat; @TableName("sys_third_account") @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@ApiModel(value="sys_third_account对象", description="第三方登录账号表") +@Schema(description="第三方登录账号表") public class SysThirdAccount { /**编号*/ @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "编号") + @Schema(description = "编号") private java.lang.String id; /**第三方登录id*/ @Excel(name = "第三方登录id", width = 15) - @ApiModelProperty(value = "第三方登录id") + @Schema(description = "第三方登录id") private java.lang.String sysUserId; /**登录来源*/ @Excel(name = "登录来源", width = 15) - @ApiModelProperty(value = "登录来源") + @Schema(description = "登录来源") private java.lang.String thirdType; /**头像*/ @Excel(name = "头像", width = 15) - @ApiModelProperty(value = "头像") + @Schema(description = "头像") private java.lang.String avatar; /**状态(1-正常,2-冻结)*/ @Excel(name = "状态(1-正常,2-冻结)", width = 15) - @ApiModelProperty(value = "状态(1-正常,2-冻结)") + @Schema(description = "状态(1-正常,2-冻结)") private java.lang.Integer status; /**删除状态(0-正常,1-已删除)*/ @Excel(name = "删除状态(0-正常,1-已删除)", width = 15) - @ApiModelProperty(value = "删除状态(0-正常,1-已删除)") + @Schema(description = "删除状态(0-正常,1-已删除)") private java.lang.Integer delFlag; /**真实姓名*/ @Excel(name = "真实姓名", width = 15) - @ApiModelProperty(value = "真实姓名") + @Schema(description = "真实姓名") private java.lang.String realname; /**第三方用户uuid*/ @Excel(name = "第三方用户uuid", width = 15) - @ApiModelProperty(value = "第三方用户uuid") + @Schema(description = "第三方用户uuid") private java.lang.String thirdUserUuid; /**第三方用户账号*/ @Excel(name = "第三方用户账号", width = 15) - @ApiModelProperty(value = "第三方用户账号") + @Schema(description = "第三方用户账号") private java.lang.String thirdUserId; /**创建人*/ @Excel(name = "创建人", width = 15) diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysThirdAppConfig.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysThirdAppConfig.java index b3fd6720..fe040570 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysThirdAppConfig.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysThirdAppConfig.java @@ -4,8 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -23,47 +22,47 @@ import java.util.Date; @TableName("sys_third_app_config") @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@ApiModel(value="sys_third_app_config对象", description="第三方配置表") +@Schema(description="第三方配置表") public class SysThirdAppConfig { /**编号*/ @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "编号") + @Schema(description = "编号") private String id; /**租户id*/ @Excel(name = "租户id", width = 15) - @ApiModelProperty(value = "租户id") + @Schema(description = "租户id") private Integer tenantId; /**钉钉/企业微信第三方企业应用标识*/ @Excel(name = "钉钉/企业微信第三方企业应用标识", width = 15) - @ApiModelProperty(value = "钉钉/企业微信第三方企业应用标识") + @Schema(description = "钉钉/企业微信第三方企业应用标识") private String agentId; /**钉钉/企业微信 应用id*/ @Excel(name = "钉钉/企业微信 应用id", width = 15) - @ApiModelProperty(value = "钉钉/企业微信 应用id") + @Schema(description = "钉钉/企业微信 应用id") private String clientId; /**钉钉/企业微信应用id对应的秘钥*/ @Excel(name = "钉钉/企业微信应用id对应的秘钥", width = 15) - @ApiModelProperty(value = "钉钉/企业微信应用id对应的秘钥") + @Schema(description = "钉钉/企业微信应用id对应的秘钥") private String clientSecret; /**钉钉企业id*/ @Excel(name = "钉钉企业id", width = 15) - @ApiModelProperty(value = "钉钉企业id") + @Schema(description = "钉钉企业id") private String corpId; /**第三方类别(dingtalk 钉钉 wechat_enterprise 企业微信)*/ @Excel(name = "第三方类别(dingtalk 钉钉 wechat_enterprise 企业微信)", width = 15) - @ApiModelProperty(value = "第三方类别(dingtalk 钉钉 wechat_enterprise 企业微信)") + @Schema(description = "第三方类别(dingtalk 钉钉 wechat_enterprise 企业微信)") private String thirdType; /**是否启用(0-否,1-是)*/ @Excel(name = "是否启用(0-否,1-是)", width = 15) - @ApiModelProperty(value = "是否启用(0-否,1-是)") + @Schema(description = "是否启用(0-否,1-是)") private Integer status; /**创建日期*/ diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserPosition.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserPosition.java index 7576d0b8..027f2b42 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserPosition.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserPosition.java @@ -4,13 +4,12 @@ import java.io.Serializable; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; import java.util.Date; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; /** * @Description: 用户职位关系表 @@ -18,7 +17,7 @@ import io.swagger.annotations.ApiModelProperty; * @Date: 2023-02-14 * @Version: V1.0 */ -@ApiModel(value="sys_user_position对象", description="用户职位关系表") +@Schema(description="用户职位关系表") @Data @TableName("sys_user_position") public class SysUserPosition implements Serializable { @@ -26,29 +25,29 @@ public class SysUserPosition implements Serializable { /**主键*/ @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键") + @Schema(description = "主键") private String id; /**用户id*/ @Excel(name = "用户id", width = 15) - @ApiModelProperty(value = "用户id") + @Schema(description = "用户id") private String userId; /**职位id*/ - @ApiModelProperty(value = "职位id") + @Schema(description = "职位id") private String positionId; /**创建人*/ - @ApiModelProperty(value = "创建人") + @Schema(description = "创建人") private String createBy; /**创建时间*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "创建时间") + @Schema(description = "创建时间") private Date createTime; /**修改人*/ - @ApiModelProperty(value = "修改人") + @Schema(description = "修改人") private String updateBy; /**修改时间*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "修改时间") + @Schema(description = "修改时间") private Date updateTime; } diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserTenant.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserTenant.java index d85931ea..03f67360 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserTenant.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserTenant.java @@ -5,12 +5,11 @@ import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -24,40 +23,40 @@ import lombok.experimental.Accessors; @TableName("sys_user_tenant") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="sys_user_tenant对象", description="sys_user_tenant") +@Schema(description="sys_user_tenant") public class SysUserTenant implements Serializable { private static final long serialVersionUID = 1L; /**主键id*/ @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键id") + @Schema(description = "主键id") private String id; /**用户id*/ @Excel(name = "用户id", width = 15) - @ApiModelProperty(value = "用户id") + @Schema(description = "用户id") private String userId; /**租户id*/ @Excel(name = "租户id", width = 15) - @ApiModelProperty(value = "租户id") + @Schema(description = "租户id") private Integer tenantId; /**状态(1 正常 2 冻结 3 待审核 4 拒绝)*/ @Excel(name = "状态(1 正常 2 冻结 3 待审核 4 拒绝)", width = 15) - @ApiModelProperty(value = "状态(1 正常 2 冻结 3 待审核 4 拒绝)") + @Schema(description = "状态(1 正常 2 冻结 3 待审核 4 拒绝)") private String status; /**创建人登录名称*/ - @ApiModelProperty(value = "创建人登录名称") + @Schema(description = "创建人登录名称") private String createBy; /**创建日期*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "创建日期") + @Schema(description = "创建日期") private Date createTime; /**更新人登录名称*/ - @ApiModelProperty(value = "更新人登录名称") + @Schema(description = "更新人登录名称") private String updateBy; /**更新日期*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "更新日期") + @Schema(description = "更新日期") private Date updateTime; } \ No newline at end of file diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/DuplicateCheckVo.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/DuplicateCheckVo.java index c00dd97b..9bdd36b0 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/DuplicateCheckVo.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/DuplicateCheckVo.java @@ -1,8 +1,8 @@ package org.jeecg.modules.system.model; import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; /** @@ -13,32 +13,32 @@ import lombok.Data; * @Version V1.0 */ @Data -@ApiModel(value="重复校验数据模型",description="重复校验数据模型") +@Schema(description="重复校验数据模型") public class DuplicateCheckVo implements Serializable { private static final long serialVersionUID = 1L; /** * 表名 */ - @ApiModelProperty(value="表名",name="tableName",example="sys_log") + @Schema(description="表名",name="tableName",example="sys_log") private String tableName; /** * 字段名 */ - @ApiModelProperty(value="字段名",name="fieldName",example="id") + @Schema(description="字段名",name="fieldName",example="id") private String fieldName; /** * 字段值 */ - @ApiModelProperty(value="字段值",name="fieldVal",example="1000") + @Schema(description="字段值",name="fieldVal",example="1000") private String fieldVal; /** * 数据ID */ - @ApiModelProperty(value="数据ID",name="dataId",example="2000") + @Schema(description="数据ID",name="dataId",example="2000") private String dataId; } \ No newline at end of file diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/SysLoginModel.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/SysLoginModel.java index 01dfeae7..71e67871 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/SysLoginModel.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/SysLoginModel.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; /** * 登录表单 @@ -9,15 +9,15 @@ import io.swagger.annotations.ApiModelProperty; * @Author scott * @since 2019-01-18 */ -@ApiModel(value="登录对象", description="登录对象") +@Schema(description="登录对象") public class SysLoginModel { - @ApiModelProperty(value = "账号") + @Schema(description = "账号") private String username; - @ApiModelProperty(value = "密码") + @Schema(description = "密码") private String password; - @ApiModelProperty(value = "验证码") + @Schema(description = "验证码") private String captcha; - @ApiModelProperty(value = "验证码key") + @Schema(description = "验证码key") private String checkKey; public String getUsername() { diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysThirdAppConfigService.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysThirdAppConfigService.java index 8bb930b8..b35a18aa 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysThirdAppConfigService.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysThirdAppConfigService.java @@ -1,7 +1,6 @@ package org.jeecg.modules.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import io.swagger.models.auth.In; import org.jeecg.modules.system.entity.SysThirdAppConfig; import java.util.List; diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/SysCommentVO.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/SysCommentVO.java index d11bbab1..5388ce0e 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/SysCommentVO.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/SysCommentVO.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.vo; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.jeecg.common.aspect.annotation.Dict; import org.springframework.format.annotation.DateTimeFormat; @@ -45,7 +45,7 @@ public class SysCommentVO implements Serializable { */ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "创建日期") + @Schema(description = "创建日期") private Date createTime; /** diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai index 3ff8605d..d0d6a8b2 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai @@ -34,8 +34,8 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import com.alibaba.fastjson.JSON; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import org.jeecg.common.aspect.annotation.AutoLog; import org.apache.shiro.authz.annotation.RequiresPermissions; <#assign bpm_flag=false> @@ -55,7 +55,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; * @Date: ${.now?string["yyyy-MM-dd"]} * @Version: V1.0 */ -@Api(tags="${tableVo.ftlDescription}") +@Tag(name="${tableVo.ftlDescription}") @RestController @RequestMapping("/${entityPackagePath}/${entityName?uncap_first}") @Slf4j @@ -73,7 +73,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e * @return */ //@AutoLog(value = "${tableVo.ftlDescription}-分页列表查询") - @ApiOperation(value="${tableVo.ftlDescription}-分页列表查询", notes="${tableVo.ftlDescription}-分页列表查询") + @Operation(summary = "${tableVo.ftlDescription}-分页列表查询") @GetMapping(value = "/list") public Result> queryPageList(${entityName} ${entityName?uncap_first}, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -104,7 +104,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e * @return */ @AutoLog(value = "${tableVo.ftlDescription}-添加") - @ApiOperation(value="${tableVo.ftlDescription}-添加", notes="${tableVo.ftlDescription}-添加") + @Operation(summary = "${tableVo.ftlDescription}-添加") @RequiresPermissions("${entityPackage}:${tableName}:add") @PostMapping(value = "/add") public Result add(@RequestBody ${entityName} ${entityName?uncap_first}) { @@ -122,7 +122,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e * @return */ @AutoLog(value = "${tableVo.ftlDescription}-编辑") - @ApiOperation(value="${tableVo.ftlDescription}-编辑", notes="${tableVo.ftlDescription}-编辑") + @Operation(summary = "${tableVo.ftlDescription}-编辑") @RequiresPermissions("${entityPackage}:${tableName}:edit") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) public Result edit(@RequestBody ${entityName} ${entityName?uncap_first}) { @@ -137,7 +137,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e * @return */ @AutoLog(value = "${tableVo.ftlDescription}-通过id删除") - @ApiOperation(value="${tableVo.ftlDescription}-通过id删除", notes="${tableVo.ftlDescription}-通过id删除") + @Operation(summary = "${tableVo.ftlDescription}-通过id删除") @RequiresPermissions("${entityPackage}:${tableName}:delete") @DeleteMapping(value = "/delete") public Result delete(@RequestParam(name="id",required=true) String id) { @@ -152,7 +152,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e * @return */ @AutoLog(value = "${tableVo.ftlDescription}-批量删除") - @ApiOperation(value="${tableVo.ftlDescription}-批量删除", notes="${tableVo.ftlDescription}-批量删除") + @Operation(summary = "${tableVo.ftlDescription}-批量删除") @RequiresPermissions("${entityPackage}:${tableName}:deleteBatch") @DeleteMapping(value = "/deleteBatch") public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { @@ -167,7 +167,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e * @return */ //@AutoLog(value = "${tableVo.ftlDescription}-通过id查询") - @ApiOperation(value="${tableVo.ftlDescription}-通过id查询", notes="${tableVo.ftlDescription}-通过id查询") + @Operation(summary = "${tableVo.ftlDescription}-通过id查询") @GetMapping(value = "/queryById") public Result<${entityName}> queryById(@RequestParam(name="id",required=true) String id) { ${entityName} ${entityName?uncap_first} = ${entityName?uncap_first}Service.getById(id); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai index 8fbd5d6c..2b5e5ebd 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai @@ -16,8 +16,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecg.common.aspect.annotation.Dict; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; + import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -31,7 +31,7 @@ import lombok.experimental.Accessors; @TableName("${tableName}") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="${tableName}对象", description="${tableVo.ftlDescription}") +@Schema(description="${tableVo.ftlDescription}") public class ${entityName} implements Serializable { private static final long serialVersionUID = 1L; diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai index 23566ba1..94ae4c4e 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai @@ -42,8 +42,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; import com.alibaba.fastjson.JSON; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import org.jeecg.common.aspect.annotation.AutoLog; import org.apache.shiro.authz.annotation.RequiresPermissions; <#assign bpm_flag=false> @@ -59,7 +59,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; * @Date: ${.now?string["yyyy-MM-dd"]} * @Version: V1.0 */ -@Api(tags="${tableVo.ftlDescription}") +@Tag(name="${tableVo.ftlDescription}") @RestController @RequestMapping("/${entityPackagePath}/${entityName?uncap_first}") @Slf4j @@ -81,7 +81,7 @@ public class ${entityName}Controller { * @return */ //@AutoLog(value = "${tableVo.ftlDescription}-分页列表查询") - @ApiOperation(value="${tableVo.ftlDescription}-分页列表查询", notes="${tableVo.ftlDescription}-分页列表查询") + @Operation(summary = "${tableVo.ftlDescription}-分页列表查询") @GetMapping(value = "/list") public Result> queryPageList(${entityName} ${entityName?uncap_first}, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -100,7 +100,7 @@ public class ${entityName}Controller { * @return */ @AutoLog(value = "${tableVo.ftlDescription}-添加") - @ApiOperation(value="${tableVo.ftlDescription}-添加", notes="${tableVo.ftlDescription}-添加") + @Operation(summary = "${tableVo.ftlDescription}-添加") @RequiresPermissions("${entityPackage}:${tableName}:add") @PostMapping(value = "/add") public Result add(@RequestBody ${entityName}Page ${entityName?uncap_first}Page) { @@ -120,7 +120,7 @@ public class ${entityName}Controller { * @return */ @AutoLog(value = "${tableVo.ftlDescription}-编辑") - @ApiOperation(value="${tableVo.ftlDescription}-编辑", notes="${tableVo.ftlDescription}-编辑") + @Operation(summary = "${tableVo.ftlDescription}-编辑") @RequiresPermissions("${entityPackage}:${tableName}:edit") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) public Result edit(@RequestBody ${entityName}Page ${entityName?uncap_first}Page) { @@ -141,7 +141,7 @@ public class ${entityName}Controller { * @return */ @AutoLog(value = "${tableVo.ftlDescription}-通过id删除") - @ApiOperation(value="${tableVo.ftlDescription}-通过id删除", notes="${tableVo.ftlDescription}-通过id删除") + @Operation(summary = "${tableVo.ftlDescription}-通过id删除") @RequiresPermissions("${entityPackage}:${tableName}:delete") @DeleteMapping(value = "/delete") public Result delete(@RequestParam(name="id",required=true) String id) { @@ -156,7 +156,7 @@ public class ${entityName}Controller { * @return */ @AutoLog(value = "${tableVo.ftlDescription}-批量删除") - @ApiOperation(value="${tableVo.ftlDescription}-批量删除", notes="${tableVo.ftlDescription}-批量删除") + @Operation(summary = "${tableVo.ftlDescription}-批量删除") @RequiresPermissions("${entityPackage}:${tableName}:deleteBatch") @DeleteMapping(value = "/deleteBatch") public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { @@ -171,7 +171,7 @@ public class ${entityName}Controller { * @return */ //@AutoLog(value = "${tableVo.ftlDescription}-通过id查询") - @ApiOperation(value="${tableVo.ftlDescription}-通过id查询", notes="${tableVo.ftlDescription}-通过id查询") + @Operation(summary = "${tableVo.ftlDescription}-通过id查询") @GetMapping(value = "/queryById") public Result<${entityName}> queryById(@RequestParam(name="id",required=true) String id) { ${entityName} ${entityName?uncap_first} = ${entityName?uncap_first}Service.getById(id); @@ -190,7 +190,7 @@ public class ${entityName}Controller { * @return */ //@AutoLog(value = "${sub.ftlDescription}通过主表ID查询") - @ApiOperation(value="${sub.ftlDescription}主表ID查询", notes="${sub.ftlDescription}-通主表ID查询") + @Operation(summary = "${sub.ftlDescription}-通主表ID查询") @GetMapping(value = "/query${sub.entityName}ByMainId") public Result> query${sub.entityName}ListByMainId(@RequestParam(name="id",required=true) String id) { List<${sub.entityName}> ${sub.entityName?uncap_first}List = ${sub.entityName?uncap_first}Service.selectByMainId(id); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai index c882ef9e..89b8e05b 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai @@ -13,8 +13,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecg.common.aspect.annotation.Dict; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; + /** * @Description: ${tableVo.ftlDescription} @@ -22,7 +22,7 @@ import io.swagger.annotations.ApiModelProperty; * @Date: ${.now?string["yyyy-MM-dd"]} * @Version: V1.0 */ -@ApiModel(value="${tableName}对象", description="${tableVo.ftlDescription}") +@Schema(description="${tableVo.ftlDescription}") @Data @TableName("${tableName}") public class ${entityName} implements Serializable { diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai index 05469abb..04fea51b 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai @@ -13,8 +13,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; import java.util.Date; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; + import java.io.UnsupportedEncodingException; /** @@ -23,7 +23,7 @@ import java.io.UnsupportedEncodingException; * @Date: ${.now?string["yyyy-MM-dd"]} * @Version: V1.0 */ -@ApiModel(value="${subTab.tableName}对象", description="${subTab.ftlDescription}") +@Schema(description="${subTab.ftlDescription}") @Data @TableName("${subTab.tableName}") public class ${subTab.entityName} implements Serializable { diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai index c10a67f4..081d760a 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai @@ -13,8 +13,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; import org.jeecg.common.aspect.annotation.Dict; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; + /** * @Description: ${tableVo.ftlDescription} @@ -23,7 +23,7 @@ import io.swagger.annotations.ApiModelProperty; * @Version: V1.0 */ @Data -@ApiModel(value="${tableName}Page对象", description="${tableVo.ftlDescription}") +@Schema(description="${tableVo.ftlDescription}") public class ${entityName}Page { <#assign excel_ignore_arr=['createBy','createTime','updateBy','updateTime','sysOrgCode']> @@ -67,7 +67,7 @@ public class ${entityName}Page { @Dict(${list_field_dictCode?substring(2)}) - @ApiModelProperty(value = "${po.filedComment}") + @Schema(description = "${po.filedComment}") <#if po.fieldDbType=='Blob'> private java.lang.String ${po.fieldName}String; <#else> @@ -77,7 +77,7 @@ public class ${entityName}Page { <#list subTables as sub> @ExcelCollection(name="${sub.ftlDescription}") - @ApiModelProperty(value = "${sub.ftlDescription}") + @Schema(description = "${sub.ftlDescription}") private List<${sub.entityName}> ${sub.entityName?uncap_first}List; diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai index 3e61d583..9a81fa05 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai @@ -33,8 +33,8 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import com.alibaba.fastjson.JSON; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import org.jeecg.common.aspect.annotation.AutoLog; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -50,7 +50,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; <#assign pidFieldName = po.fieldName> -@Api(tags="${tableVo.ftlDescription}") +@Tag(name="${tableVo.ftlDescription}") @RestController @RequestMapping("/${entityPackagePath}/${entityName?uncap_first}") @Slf4j @@ -68,7 +68,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e * @return */ //@AutoLog(value = "${tableVo.ftlDescription}-分页列表查询") - @ApiOperation(value="${tableVo.ftlDescription}-分页列表查询", notes="${tableVo.ftlDescription}-分页列表查询") + @Operation(summary = "${tableVo.ftlDescription}-分页列表查询") @GetMapping(value = "/rootList") public Result> queryPageList(${entityName} ${entityName?uncap_first}, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -164,7 +164,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e * @return */ //@AutoLog(value = "${tableVo.ftlDescription}-获取子数据") - @ApiOperation(value="${tableVo.ftlDescription}-获取子数据", notes="${tableVo.ftlDescription}-获取子数据") + @Operation(summary = "${tableVo.ftlDescription}-获取子数据") @GetMapping(value = "/childList") public Result> queryPageList(${entityName} ${entityName?uncap_first},HttpServletRequest req) { QueryWrapper<${entityName}> queryWrapper = QueryGenerator.initQueryWrapper(${entityName?uncap_first}, req.getParameterMap()); @@ -182,7 +182,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e * @return */ //@AutoLog(value = "${tableVo.ftlDescription}-批量获取子数据") - @ApiOperation(value="${tableVo.ftlDescription}-批量获取子数据", notes="${tableVo.ftlDescription}-批量获取子数据") + @Operation(summary = "${tableVo.ftlDescription}-批量获取子数据") @GetMapping("/getChildListBatch") public Result getChildListBatch(@RequestParam("parentIds") String parentIds) { try { @@ -206,7 +206,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e * @return */ @AutoLog(value = "${tableVo.ftlDescription}-添加") - @ApiOperation(value="${tableVo.ftlDescription}-添加", notes="${tableVo.ftlDescription}-添加") + @Operation(summary = "${tableVo.ftlDescription}-添加") @RequiresPermissions("${entityPackage}:${tableName}:add") @PostMapping(value = "/add") public Result add(@RequestBody ${entityName} ${entityName?uncap_first}) { @@ -221,7 +221,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e * @return */ @AutoLog(value = "${tableVo.ftlDescription}-编辑") - @ApiOperation(value="${tableVo.ftlDescription}-编辑", notes="${tableVo.ftlDescription}-编辑") + @Operation(summary = "${tableVo.ftlDescription}-编辑") @RequiresPermissions("${entityPackage}:${tableName}:edit") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) public Result edit(@RequestBody ${entityName} ${entityName?uncap_first}) { @@ -236,7 +236,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e * @return */ @AutoLog(value = "${tableVo.ftlDescription}-通过id删除") - @ApiOperation(value="${tableVo.ftlDescription}-通过id删除", notes="${tableVo.ftlDescription}-通过id删除") + @Operation(summary = "${tableVo.ftlDescription}-通过id删除") @RequiresPermissions("${entityPackage}:${tableName}:delete") @DeleteMapping(value = "/delete") public Result delete(@RequestParam(name="id",required=true) String id) { @@ -251,7 +251,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e * @return */ @AutoLog(value = "${tableVo.ftlDescription}-批量删除") - @ApiOperation(value="${tableVo.ftlDescription}-批量删除", notes="${tableVo.ftlDescription}-批量删除") + @Operation(summary = "${tableVo.ftlDescription}-批量删除") @RequiresPermissions("${entityPackage}:${tableName}:deleteBatch") @DeleteMapping(value = "/deleteBatch") public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { @@ -266,7 +266,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e * @return */ //@AutoLog(value = "${tableVo.ftlDescription}-通过id查询") - @ApiOperation(value="${tableVo.ftlDescription}-通过id查询", notes="${tableVo.ftlDescription}-通过id查询") + @Operation(summary = "${tableVo.ftlDescription}-通过id查询") @GetMapping(value = "/queryById") public Result<${entityName}> queryById(@RequestParam(name="id",required=true) String id) { ${entityName} ${entityName?uncap_first} = ${entityName?uncap_first}Service.getById(id); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai index a76c0ae0..26ae6d64 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai @@ -15,8 +15,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecg.common.aspect.annotation.Dict; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; + import java.io.UnsupportedEncodingException; /** @@ -27,7 +27,7 @@ import java.io.UnsupportedEncodingException; */ @Data @TableName("${tableName}") -@ApiModel(value="${tableName}对象", description="${tableVo.ftlDescription}") +@Schema(description="${tableVo.ftlDescription}") public class ${entityName} implements Serializable { private static final long serialVersionUID = 1L; diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai index a0037519..528fa9f9 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai @@ -24,8 +24,8 @@ import ${bussiPackage}.${entityPackage}.service.I${entityName}Service; <#list subTables as sub> import ${bussiPackage}.${entityPackage}.service.I${sub.entityName}Service; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import org.jeecg.common.aspect.annotation.AutoLog; import org.apache.shiro.SecurityUtils; import org.jeecg.common.system.vo.LoginUser; @@ -53,7 +53,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; * @Date: ${.now?string["yyyy-MM-dd"]} * @Version: V1.0 */ -@Api(tags="${tableVo.ftlDescription}") +@Tag(name="${tableVo.ftlDescription}") @RestController @RequestMapping("/${entityPackagePath}/${entityName?uncap_first}") @Slf4j @@ -79,7 +79,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e * @return */ //@AutoLog(value = "${tableVo.ftlDescription}-分页列表查询") - @ApiOperation(value="${tableVo.ftlDescription}-分页列表查询", notes="${tableVo.ftlDescription}-分页列表查询") + @Operation(summary = "${tableVo.ftlDescription}-分页列表查询") @GetMapping(value = "/list") public Result> queryPageList(${entityName} ${entityName?uncap_first}, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -109,7 +109,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e * @return */ @AutoLog(value = "${tableVo.ftlDescription}-添加") - @ApiOperation(value="${tableVo.ftlDescription}-添加", notes="${tableVo.ftlDescription}-添加") + @Operation(summary = "${tableVo.ftlDescription}-添加") @RequiresPermissions("${entityPackage}:${tableName}:add") @PostMapping(value = "/add") public Result add(@RequestBody ${entityName} ${entityName?uncap_first}) { @@ -123,7 +123,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e * @return */ @AutoLog(value = "${tableVo.ftlDescription}-编辑") - @ApiOperation(value="${tableVo.ftlDescription}-编辑", notes="${tableVo.ftlDescription}-编辑") + @Operation(summary = "${tableVo.ftlDescription}-编辑") @RequiresPermissions("${entityPackage}:${tableName}:edit") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) public Result edit(@RequestBody ${entityName} ${entityName?uncap_first}) { @@ -137,7 +137,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e * @return */ @AutoLog(value = "${tableVo.ftlDescription}-通过id删除") - @ApiOperation(value="${tableVo.ftlDescription}-通过id删除", notes="${tableVo.ftlDescription}-通过id删除") + @Operation(summary = "${tableVo.ftlDescription}-通过id删除") @RequiresPermissions("${entityPackage}:${tableName}:delete") @DeleteMapping(value = "/delete") public Result delete(@RequestParam(name="id",required=true) String id) { @@ -151,7 +151,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e * @return */ @AutoLog(value = "${tableVo.ftlDescription}-批量删除") - @ApiOperation(value="${tableVo.ftlDescription}-批量删除", notes="${tableVo.ftlDescription}-批量删除") + @Operation(summary = "${tableVo.ftlDescription}-批量删除") @RequiresPermissions("${entityPackage}:${tableName}:deleteBatch") @DeleteMapping(value = "/deleteBatch") public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { @@ -188,7 +188,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e * @return */ //@AutoLog(value = "${sub.ftlDescription}-通过主表ID查询") - @ApiOperation(value="${sub.ftlDescription}-通过主表ID查询", notes="${sub.ftlDescription}-通过主表ID查询") + @Operation(summary = "${sub.ftlDescription}-通过主表ID查询") @GetMapping(value = "/list${sub.entityName}ByMainId") public Result> list${sub.entityName}ByMainId(${sub.entityName} ${sub.entityName?uncap_first}, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @@ -206,7 +206,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e * @return */ @AutoLog(value = "${sub.ftlDescription}-添加") - @ApiOperation(value="${sub.ftlDescription}-添加", notes="${sub.ftlDescription}-添加") + @Operation(summary = "${sub.ftlDescription}-添加") @PostMapping(value = "/add${sub.entityName}") public Result add${sub.entityName}(@RequestBody ${sub.entityName} ${sub.entityName?uncap_first}) { ${sub.entityName?uncap_first}Service.save(${sub.entityName?uncap_first}); @@ -219,7 +219,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e * @return */ @AutoLog(value = "${sub.ftlDescription}-编辑") - @ApiOperation(value="${sub.ftlDescription}-编辑", notes="${sub.ftlDescription}-编辑") + @Operation(summary = "${sub.ftlDescription}-编辑") @RequestMapping(value = "/edit${sub.entityName}", method = {RequestMethod.PUT,RequestMethod.POST}) public Result edit${sub.entityName}(@RequestBody ${sub.entityName} ${sub.entityName?uncap_first}) { ${sub.entityName?uncap_first}Service.updateById(${sub.entityName?uncap_first}); @@ -232,7 +232,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e * @return */ @AutoLog(value = "${sub.ftlDescription}-通过id删除") - @ApiOperation(value="${sub.ftlDescription}-通过id删除", notes="${sub.ftlDescription}-通过id删除") + @Operation(summary = "${sub.ftlDescription}-通过id删除") @DeleteMapping(value = "/delete${sub.entityName}") public Result delete${sub.entityName}(@RequestParam(name="id",required=true) String id) { ${sub.entityName?uncap_first}Service.removeById(id); @@ -245,7 +245,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e * @return */ @AutoLog(value = "${sub.ftlDescription}-批量删除") - @ApiOperation(value="${sub.ftlDescription}-批量删除", notes="${sub.ftlDescription}-批量删除") + @Operation(summary = "${sub.ftlDescription}-批量删除") @DeleteMapping(value = "/deleteBatch${sub.entityName}") public Result deleteBatch${sub.entityName}(@RequestParam(name="ids",required=true) String ids) { this.${sub.entityName?uncap_first}Service.removeByIds(Arrays.asList(ids.split(","))); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai index 727b12a7..8ca7f744 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai @@ -15,8 +15,8 @@ import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; import org.jeecg.common.aspect.annotation.Dict; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; + /** * @Description: ${tableVo.ftlDescription} @@ -26,7 +26,7 @@ import io.swagger.annotations.ApiModelProperty; */ @Data @TableName("${tableName}") -@ApiModel(value="${tableName}对象", description="${tableVo.ftlDescription}") +@Schema(description="${tableVo.ftlDescription}") public class ${entityName} implements Serializable { private static final long serialVersionUID = 1L; diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai index dab41f08..61858229 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai @@ -16,8 +16,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; import java.util.Date; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; + import java.io.UnsupportedEncodingException; /** @@ -28,7 +28,7 @@ import java.io.UnsupportedEncodingException; */ @Data @TableName("${subTab.tableName}") -@ApiModel(value="${subTab.tableName}对象", description="${subTab.ftlDescription}") +@Schema(description="${subTab.ftlDescription}") public class ${subTab.entityName} implements Serializable { private static final long serialVersionUID = 1L; diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai index 8e01ccaa..d8edde59 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai @@ -44,8 +44,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; import com.alibaba.fastjson.JSON; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import org.jeecg.common.aspect.annotation.AutoLog; import org.apache.shiro.authz.annotation.RequiresPermissions; <#assign has_multi_query_field=false> @@ -60,7 +60,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; * @Date: ${.now?string["yyyy-MM-dd"]} * @Version: V1.0 */ -@Api(tags="${tableVo.ftlDescription}") +@Tag(name="${tableVo.ftlDescription}") @RestController @RequestMapping("/${entityPackagePath}/${entityName?uncap_first}") @Slf4j @@ -82,7 +82,7 @@ public class ${entityName}Controller { * @return */ //@AutoLog(value = "${tableVo.ftlDescription}-分页列表查询") - @ApiOperation(value="${tableVo.ftlDescription}-分页列表查询", notes="${tableVo.ftlDescription}-分页列表查询") + @Operation(summary = "${tableVo.ftlDescription}-分页列表查询") @GetMapping(value = "/list") public Result> queryPageList(${entityName} ${entityName?uncap_first}, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -113,7 +113,7 @@ public class ${entityName}Controller { * @return */ @AutoLog(value = "${tableVo.ftlDescription}-添加") - @ApiOperation(value="${tableVo.ftlDescription}-添加", notes="${tableVo.ftlDescription}-添加") + @Operation(summary = "${tableVo.ftlDescription}-添加") @RequiresPermissions("${entityPackage}:${tableName}:add") @PostMapping(value = "/add") public Result add(@RequestBody ${entityName}Page ${entityName?uncap_first}Page) { @@ -130,7 +130,7 @@ public class ${entityName}Controller { * @return */ @AutoLog(value = "${tableVo.ftlDescription}-编辑") - @ApiOperation(value="${tableVo.ftlDescription}-编辑", notes="${tableVo.ftlDescription}-编辑") + @Operation(summary = "${tableVo.ftlDescription}-编辑") @RequiresPermissions("${entityPackage}:${tableName}:edit") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) public Result edit(@RequestBody ${entityName}Page ${entityName?uncap_first}Page) { @@ -151,7 +151,7 @@ public class ${entityName}Controller { * @return */ @AutoLog(value = "${tableVo.ftlDescription}-通过id删除") - @ApiOperation(value="${tableVo.ftlDescription}-通过id删除", notes="${tableVo.ftlDescription}-通过id删除") + @Operation(summary = "${tableVo.ftlDescription}-通过id删除") @RequiresPermissions("${entityPackage}:${tableName}:delete") @DeleteMapping(value = "/delete") public Result delete(@RequestParam(name="id",required=true) String id) { @@ -166,7 +166,7 @@ public class ${entityName}Controller { * @return */ @AutoLog(value = "${tableVo.ftlDescription}-批量删除") - @ApiOperation(value="${tableVo.ftlDescription}-批量删除", notes="${tableVo.ftlDescription}-批量删除") + @Operation(summary = "${tableVo.ftlDescription}-批量删除") @RequiresPermissions("${entityPackage}:${tableName}:deleteBatch") @DeleteMapping(value = "/deleteBatch") public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { @@ -181,7 +181,7 @@ public class ${entityName}Controller { * @return */ //@AutoLog(value = "${tableVo.ftlDescription}-通过id查询") - @ApiOperation(value="${tableVo.ftlDescription}-通过id查询", notes="${tableVo.ftlDescription}-通过id查询") + @Operation(summary = "${tableVo.ftlDescription}-通过id查询") @GetMapping(value = "/queryById") public Result<${entityName}> queryById(@RequestParam(name="id",required=true) String id) { ${entityName} ${entityName?uncap_first} = ${entityName?uncap_first}Service.getById(id); @@ -200,7 +200,7 @@ public class ${entityName}Controller { * @return */ //@AutoLog(value = "${sub.ftlDescription}-通过主表ID查询") - @ApiOperation(value="${sub.ftlDescription}-通过主表ID查询", notes="${sub.ftlDescription}-通过主表ID查询") + @Operation(summary = "${sub.ftlDescription}-通过主表ID查询") @GetMapping(value = "/query${sub.entityName}ByMainId") public Result> query${sub.entityName}ListByMainId(@RequestParam(name="id",required=true) String id) { List<${sub.entityName}> ${sub.entityName?uncap_first}List = ${sub.entityName?uncap_first}Service.selectByMainId(id); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai index e60998e4..64dfde34 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai @@ -15,8 +15,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecg.common.aspect.annotation.Dict; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; + /** * @Description: ${tableVo.ftlDescription} @@ -24,7 +24,7 @@ import io.swagger.annotations.ApiModelProperty; * @Date: ${.now?string["yyyy-MM-dd"]} * @Version: V1.0 */ -@ApiModel(value="${tableName}对象", description="${tableVo.ftlDescription}") +@Schema(description="${tableVo.ftlDescription}") @Data @TableName("${tableName}") public class ${entityName} implements Serializable { diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai index 49d34a40..cbd4c657 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai @@ -16,8 +16,8 @@ import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; import java.util.Date; import org.jeecg.common.aspect.annotation.Dict; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; + import java.io.UnsupportedEncodingException; /** @@ -26,7 +26,7 @@ import java.io.UnsupportedEncodingException; * @Date: ${.now?string["yyyy-MM-dd"]} * @Version: V1.0 */ -@ApiModel(value="${subTab.tableName}对象", description="${subTab.ftlDescription}") +@Schema(description="${subTab.ftlDescription}") @Data @TableName("${subTab.tableName}") public class ${subTab.entityName} implements Serializable { diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai index dee2c71d..c13ab990 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai @@ -15,8 +15,8 @@ import java.util.Date; import org.jeecg.common.aspect.annotation.Dict; import org.jeecg.common.constant.ProvinceCityArea; import org.jeecg.common.util.SpringContextUtils; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; + /** * @Description: ${tableVo.ftlDescription} @@ -25,7 +25,7 @@ import io.swagger.annotations.ApiModelProperty; * @Version: V1.0 */ @Data -@ApiModel(value="${tableName}Page对象", description="${tableVo.ftlDescription}") +@Schema(description="${tableVo.ftlDescription}") public class ${entityName}Page { <#assign excel_ignore_arr=['createBy','createTime','updateBy','updateTime','sysOrgCode']> @@ -72,7 +72,7 @@ public class ${entityName}Page { - @ApiModelProperty(value = "${po.filedComment}") + @Schema(description = "${po.filedComment}") <#if po.fieldDbType=='Blob'> private java.lang.String ${po.fieldName}String; <#elseif po.classType=='pca'> @@ -110,7 +110,7 @@ public class ${entityName}Page { <#list subTables as sub> @ExcelCollection(name="${sub.ftlDescription}") - @ApiModelProperty(value = "${sub.ftlDescription}") + @Schema(description = "${sub.ftlDescription}") private List<${sub.entityName}> ${sub.entityName?uncap_first}List; diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai index 2c4bf573..faae6c93 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai @@ -44,8 +44,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; import com.alibaba.fastjson.JSON; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import org.jeecg.common.aspect.annotation.AutoLog; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -69,7 +69,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; * @Date: ${.now?string["yyyy-MM-dd"]} * @Version: V1.0 */ -@Api(tags="${tableVo.ftlDescription}") +@Tag(name="${tableVo.ftlDescription}") @RestController @RequestMapping("/${entityPackagePath}/${entityName?uncap_first}") @Slf4j @@ -91,7 +91,7 @@ public class ${entityName}Controller { * @return */ //@AutoLog(value = "${tableVo.ftlDescription}-分页列表查询") - @ApiOperation(value="${tableVo.ftlDescription}-分页列表查询", notes="${tableVo.ftlDescription}-分页列表查询") + @Operation(summary = "${tableVo.ftlDescription}-分页列表查询") @GetMapping(value = "/list") public Result> queryPageList(${entityName} ${entityName?uncap_first}, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -122,7 +122,7 @@ public class ${entityName}Controller { * @return */ @AutoLog(value = "${tableVo.ftlDescription}-添加") - @ApiOperation(value="${tableVo.ftlDescription}-添加", notes="${tableVo.ftlDescription}-添加") + @Operation(summary = "${tableVo.ftlDescription}-添加") @RequiresPermissions("${entityPackage}:${tableName}:add") @PostMapping(value = "/add") public Result add(@RequestBody ${entityName}Page ${entityName?uncap_first}Page) { @@ -142,7 +142,7 @@ public class ${entityName}Controller { * @return */ @AutoLog(value = "${tableVo.ftlDescription}-编辑") - @ApiOperation(value="${tableVo.ftlDescription}-编辑", notes="${tableVo.ftlDescription}-编辑") + @Operation(summary = "${tableVo.ftlDescription}-编辑") @RequiresPermissions("${entityPackage}:${tableName}:edit") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) public Result edit(@RequestBody ${entityName}Page ${entityName?uncap_first}Page) { @@ -163,7 +163,7 @@ public class ${entityName}Controller { * @return */ @AutoLog(value = "${tableVo.ftlDescription}-通过id删除") - @ApiOperation(value="${tableVo.ftlDescription}-通过id删除", notes="${tableVo.ftlDescription}-通过id删除") + @Operation(summary = "${tableVo.ftlDescription}-通过id删除") @RequiresPermissions("${entityPackage}:${tableName}:delete") @DeleteMapping(value = "/delete") public Result delete(@RequestParam(name="id",required=true) String id) { @@ -178,7 +178,7 @@ public class ${entityName}Controller { * @return */ @AutoLog(value = "${tableVo.ftlDescription}-批量删除") - @ApiOperation(value="${tableVo.ftlDescription}-批量删除", notes="${tableVo.ftlDescription}-批量删除") + @Operation(summary = "${tableVo.ftlDescription}-批量删除") @RequiresPermissions("${entityPackage}:${tableName}:deleteBatch") @DeleteMapping(value = "/deleteBatch") public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { @@ -193,7 +193,7 @@ public class ${entityName}Controller { * @return */ //@AutoLog(value = "${tableVo.ftlDescription}-通过id查询") - @ApiOperation(value="${tableVo.ftlDescription}-通过id查询", notes="${tableVo.ftlDescription}-通过id查询") + @Operation(summary = "${tableVo.ftlDescription}-通过id查询") @GetMapping(value = "/queryById") public Result<${entityName}> queryById(@RequestParam(name="id",required=true) String id) { ${entityName} ${entityName?uncap_first} = ${entityName?uncap_first}Service.getById(id); @@ -212,7 +212,7 @@ public class ${entityName}Controller { * @return */ //@AutoLog(value = "${sub.ftlDescription}通过主表ID查询") - @ApiOperation(value="${sub.ftlDescription}主表ID查询", notes="${sub.ftlDescription}-通主表ID查询") + @Operation(summary = "${sub.ftlDescription}-通主表ID查询") @GetMapping(value = "/query${sub.entityName}ByMainId") public Result> query${sub.entityName}ListByMainId(@RequestParam(name="id",required=true) String id) { List<${sub.entityName}> ${sub.entityName?uncap_first}List = ${sub.entityName?uncap_first}Service.selectByMainId(id); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai index 042b2e6c..76c34882 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai @@ -15,8 +15,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecg.common.aspect.annotation.Dict; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; + /** * @Description: ${tableVo.ftlDescription} @@ -24,7 +24,7 @@ import io.swagger.annotations.ApiModelProperty; * @Date: ${.now?string["yyyy-MM-dd"]} * @Version: V1.0 */ -@ApiModel(value="${tableName}对象", description="${tableVo.ftlDescription}") +@Schema(description="${tableVo.ftlDescription}") @Data @TableName("${tableName}") public class ${entityName} implements Serializable { diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai index fe3892b5..68b826f4 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai @@ -15,8 +15,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; import java.util.Date; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; + import java.io.UnsupportedEncodingException; /** @@ -25,7 +25,7 @@ import java.io.UnsupportedEncodingException; * @Date: ${.now?string["yyyy-MM-dd"]} * @Version: V1.0 */ -@ApiModel(value="${subTab.tableName}对象", description="${subTab.ftlDescription}") +@Schema(description="${subTab.ftlDescription}") @Data @TableName("${subTab.tableName}") public class ${subTab.entityName} implements Serializable { diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai index 996285f6..541236b9 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai @@ -15,8 +15,8 @@ import java.util.Date; import org.jeecg.common.aspect.annotation.Dict; import org.jeecg.common.constant.ProvinceCityArea; import org.jeecg.common.util.SpringContextUtils; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; + /** * @Description: ${tableVo.ftlDescription} @@ -25,7 +25,7 @@ import io.swagger.annotations.ApiModelProperty; * @Version: V1.0 */ @Data -@ApiModel(value="${tableName}Page对象", description="${tableVo.ftlDescription}") +@Schema(description="${tableVo.ftlDescription}") public class ${entityName}Page { <#assign excel_ignore_arr=['createBy','createTime','updateBy','updateTime','sysOrgCode']> @@ -72,7 +72,7 @@ public class ${entityName}Page { @Dict(${list_field_dictCode?substring(2)}) - @ApiModelProperty(value = "${po.filedComment}") + @Schema(description = "${po.filedComment}") <#if po.fieldDbType=='Blob'> private java.lang.String ${po.fieldName}String; <#elseif po.classType=='pca'> @@ -110,7 +110,7 @@ public class ${entityName}Page { <#list subTables as sub> @ExcelCollection(name="${sub.ftlDescription}") - @ApiModelProperty(value = "${sub.ftlDescription}") + @Schema(description = "${sub.ftlDescription}") private List<${sub.entityName}> ${sub.entityName?uncap_first}List; diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai index 07be175b..fd0aca7d 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai @@ -44,8 +44,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; import com.alibaba.fastjson.JSON; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import org.jeecg.common.aspect.annotation.AutoLog; import org.apache.shiro.authz.annotation.RequiresPermissions; <#assign has_multi_query_field=false> @@ -60,7 +60,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; * @Date: ${.now?string["yyyy-MM-dd"]} * @Version: V1.0 */ -@Api(tags="${tableVo.ftlDescription}") +@Tag(name="${tableVo.ftlDescription}") @RestController @RequestMapping("/${entityPackagePath}/${entityName?uncap_first}") @Slf4j @@ -82,7 +82,7 @@ public class ${entityName}Controller { * @return */ //@AutoLog(value = "${tableVo.ftlDescription}-分页列表查询") - @ApiOperation(value="${tableVo.ftlDescription}-分页列表查询", notes="${tableVo.ftlDescription}-分页列表查询") + @Operation(summary = "${tableVo.ftlDescription}-分页列表查询") @GetMapping(value = "/list") public Result> queryPageList(${entityName} ${entityName?uncap_first}, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -113,7 +113,7 @@ public class ${entityName}Controller { * @return */ @AutoLog(value = "${tableVo.ftlDescription}-添加") - @ApiOperation(value="${tableVo.ftlDescription}-添加", notes="${tableVo.ftlDescription}-添加") + @Operation(summary = "${tableVo.ftlDescription}-添加") @RequiresPermissions("${entityPackage}:${tableName}:add") @PostMapping(value = "/add") public Result add(@RequestBody ${entityName}Page ${entityName?uncap_first}Page) { @@ -130,7 +130,7 @@ public class ${entityName}Controller { * @return */ @AutoLog(value = "${tableVo.ftlDescription}-编辑") - @ApiOperation(value="${tableVo.ftlDescription}-编辑", notes="${tableVo.ftlDescription}-编辑") + @Operation(summary = "${tableVo.ftlDescription}-编辑") @RequiresPermissions("${entityPackage}:${tableName}:edit") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) public Result edit(@RequestBody ${entityName}Page ${entityName?uncap_first}Page) { @@ -151,7 +151,7 @@ public class ${entityName}Controller { * @return */ @AutoLog(value = "${tableVo.ftlDescription}-通过id删除") - @ApiOperation(value="${tableVo.ftlDescription}-通过id删除", notes="${tableVo.ftlDescription}-通过id删除") + @Operation(summary = "${tableVo.ftlDescription}-通过id删除") @RequiresPermissions("${entityPackage}:${tableName}:delete") @DeleteMapping(value = "/delete") public Result delete(@RequestParam(name="id",required=true) String id) { @@ -166,7 +166,7 @@ public class ${entityName}Controller { * @return */ @AutoLog(value = "${tableVo.ftlDescription}-批量删除") - @ApiOperation(value="${tableVo.ftlDescription}-批量删除", notes="${tableVo.ftlDescription}-批量删除") + @Operation(summary = "${tableVo.ftlDescription}-批量删除") @RequiresPermissions("${entityPackage}:${tableName}:deleteBatch") @DeleteMapping(value = "/deleteBatch") public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { @@ -181,7 +181,7 @@ public class ${entityName}Controller { * @return */ //@AutoLog(value = "${tableVo.ftlDescription}-通过id查询") - @ApiOperation(value="${tableVo.ftlDescription}-通过id查询", notes="${tableVo.ftlDescription}-通过id查询") + @Operation(summary = "${tableVo.ftlDescription}-通过id查询") @GetMapping(value = "/queryById") public Result<${entityName}> queryById(@RequestParam(name="id",required=true) String id) { ${entityName} ${entityName?uncap_first} = ${entityName?uncap_first}Service.getById(id); @@ -200,7 +200,7 @@ public class ${entityName}Controller { * @return */ //@AutoLog(value = "${sub.ftlDescription}通过主表ID查询") - @ApiOperation(value="${sub.ftlDescription}主表ID查询", notes="${sub.ftlDescription}-通主表ID查询") + @Operation(summary = "${sub.ftlDescription}-通主表ID查询") @GetMapping(value = "/query${sub.entityName}ByMainId") public Result> query${sub.entityName}ListByMainId(@RequestParam(name="id",required=true) String id) { List<${sub.entityName}> ${sub.entityName?uncap_first}List = ${sub.entityName?uncap_first}Service.selectByMainId(id); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai index 42c33c1d..30931ac0 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai @@ -15,8 +15,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecg.common.aspect.annotation.Dict; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; + /** * @Description: ${tableVo.ftlDescription} @@ -24,7 +24,7 @@ import io.swagger.annotations.ApiModelProperty; * @Date: ${.now?string["yyyy-MM-dd"]} * @Version: V1.0 */ -@ApiModel(value="${tableName}对象", description="${tableVo.ftlDescription}") +@Schema(description="${tableVo.ftlDescription}") @Data @TableName("${tableName}") public class ${entityName} implements Serializable { diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai index fe3892b5..68b826f4 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai @@ -15,8 +15,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; import java.util.Date; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; + import java.io.UnsupportedEncodingException; /** @@ -25,7 +25,7 @@ import java.io.UnsupportedEncodingException; * @Date: ${.now?string["yyyy-MM-dd"]} * @Version: V1.0 */ -@ApiModel(value="${subTab.tableName}对象", description="${subTab.ftlDescription}") +@Schema(description="${subTab.ftlDescription}") @Data @TableName("${subTab.tableName}") public class ${subTab.entityName} implements Serializable { diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai index 32920937..a8182f86 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai @@ -15,8 +15,8 @@ import java.util.Date; import org.jeecg.common.aspect.annotation.Dict; import org.jeecg.common.constant.ProvinceCityArea; import org.jeecg.common.util.SpringContextUtils; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; + /** * @Description: ${tableVo.ftlDescription} @@ -25,7 +25,7 @@ import io.swagger.annotations.ApiModelProperty; * @Version: V1.0 */ @Data -@ApiModel(value="${tableName}Page对象", description="${tableVo.ftlDescription}") +@Schema(description="${tableVo.ftlDescription}") public class ${entityName}Page { <#assign excel_ignore_arr=['createBy','createTime','updateBy','updateTime','sysOrgCode']> @@ -72,7 +72,7 @@ public class ${entityName}Page { @Dict(${list_field_dictCode?substring(2)}) - @ApiModelProperty(value = "${po.filedComment}") + @Schema(description = "${po.filedComment}") <#if po.fieldDbType=='Blob'> private java.lang.String ${po.fieldName}String; <#elseif po.classType=='pca'> @@ -110,7 +110,7 @@ public class ${entityName}Page { <#list subTables as sub> @ExcelCollection(name="${sub.ftlDescription}") - @ApiModelProperty(value = "${sub.ftlDescription}") + @Schema(description = "${sub.ftlDescription}") private List<${sub.entityName}> ${sub.entityName?uncap_first}List; diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai index 60900d2a..3651338e 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai @@ -32,8 +32,8 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import com.alibaba.fastjson.JSON; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; /** * @Description: ${tableVo.ftlDescription} @@ -42,7 +42,7 @@ import io.swagger.annotations.ApiOperation; * @Version: V1.0 */ @Slf4j -@Api(tags="${tableVo.ftlDescription}") +@Tag(name="${tableVo.ftlDescription}") @RestController @RequestMapping("/${entityPackage}/${entityName?uncap_first}") public class ${entityName}Controller extends JeecgController<${entityName}, I${entityName}Service> { @@ -59,7 +59,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e * @return */ @AutoLog(value = "${tableVo.ftlDescription}-分页列表查询") - @ApiOperation(value="${tableVo.ftlDescription}-分页列表查询", notes="${tableVo.ftlDescription}-分页列表查询") + @Operation(summary = "${tableVo.ftlDescription}-分页列表查询") @GetMapping(value = "/list") public Result queryPageList(${entityName} ${entityName?uncap_first}, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -78,7 +78,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e * @return */ @AutoLog(value = "${tableVo.ftlDescription}-添加") - @ApiOperation(value="${tableVo.ftlDescription}-添加", notes="${tableVo.ftlDescription}-添加") + @Operation(summary = "${tableVo.ftlDescription}-添加") @PostMapping(value = "/add") public Result add(@RequestBody ${entityName} ${entityName?uncap_first}) { ${entityName?uncap_first}Service.save(${entityName?uncap_first}); @@ -92,7 +92,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e * @return */ @AutoLog(value = "${tableVo.ftlDescription}-编辑") - @ApiOperation(value="${tableVo.ftlDescription}-编辑", notes="${tableVo.ftlDescription}-编辑") + @Operation(summary = "${tableVo.ftlDescription}-编辑") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) public Result edit(@RequestBody ${entityName} ${entityName?uncap_first}) { ${entityName?uncap_first}Service.updateById(${entityName?uncap_first}); @@ -106,7 +106,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e * @return */ @AutoLog(value = "${tableVo.ftlDescription}-通过id删除") - @ApiOperation(value="${tableVo.ftlDescription}-通过id删除", notes="${tableVo.ftlDescription}-通过id删除") + @Operation(summary = "${tableVo.ftlDescription}-通过id删除") @DeleteMapping(value = "/delete") public Result delete(@RequestParam(name="id",required=true) String id) { ${entityName?uncap_first}Service.removeById(id); @@ -120,7 +120,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e * @return */ @AutoLog(value = "${tableVo.ftlDescription}-批量删除") - @ApiOperation(value="${tableVo.ftlDescription}-批量删除", notes="${tableVo.ftlDescription}-批量删除") + @Operation(summary = "${tableVo.ftlDescription}-批量删除") @DeleteMapping(value = "/deleteBatch") public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.${entityName?uncap_first}Service.removeByIds(Arrays.asList(ids.split(","))); @@ -134,7 +134,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e * @return */ @AutoLog(value = "${tableVo.ftlDescription}-通过id查询") - @ApiOperation(value="${tableVo.ftlDescription}-通过id查询", notes="${tableVo.ftlDescription}-通过id查询") + @Operation(summary = "${tableVo.ftlDescription}-通过id查询") @GetMapping(value = "/queryById") public Result queryById(@RequestParam(name="id",required=true) String id) { ${entityName} ${entityName?uncap_first} = ${entityName?uncap_first}Service.getById(id); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai index bf557352..681dfaf3 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai @@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableField; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; + import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -25,7 +25,7 @@ import org.jeecgframework.poi.excel.annotation.Excel; @TableName("${tableName}") @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@ApiModel(value="${tableName}对象", description="${tableVo.ftlDescription}") +@Schema(description="${tableVo.ftlDescription}") public class ${entityName} { <#list originalColumns as po> @@ -47,7 +47,7 @@ public class ${entityName} { @Excel(name = "${po.filedComment}", width = 15) - @ApiModelProperty(value = "${po.filedComment}") + @Schema(description = "${po.filedComment}") private <#if po.fieldType=='java.sql.Blob'>byte[]<#else>${po.fieldType} ${po.fieldName}; } diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/controller/${entityPackage}/${entityName}Controller.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/controller/${entityPackage}/${entityName}Controller.javai index 57b69bec..ac72a567 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/controller/${entityPackage}/${entityName}Controller.javai +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/controller/${entityPackage}/${entityName}Controller.javai @@ -35,8 +35,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; import com.alibaba.fastjson.JSON; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import org.jeecg.common.aspect.annotation.AutoLog; /** @@ -45,7 +45,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; * @Date: ${.now?string["yyyy-MM-dd"]} * @Version: V1.0 */ -@Api(tags="${tableVo.ftlDescription}") +@Tag(name="${tableVo.ftlDescription}") @RestController @RequestMapping("/${entityPackage}/${entityName?uncap_first}") @Slf4j @@ -63,7 +63,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e * @return */ @AutoLog(value = "${tableVo.ftlDescription}-分页列表查询") - @ApiOperation(value="${tableVo.ftlDescription}-分页列表查询", notes="${tableVo.ftlDescription}-分页列表查询") + @Operation(summary = "${tableVo.ftlDescription}-分页列表查询") @GetMapping(value = "/list") public Result queryPageList(${entityName} ${entityName?uncap_first}, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -82,7 +82,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e * @return */ @AutoLog(value = "${tableVo.ftlDescription}-添加") - @ApiOperation(value="${tableVo.ftlDescription}-添加", notes="${tableVo.ftlDescription}-添加") + @Operation(summary = "${tableVo.ftlDescription}-添加") @PostMapping(value = "/add") public Result add(@RequestBody ${entityName} ${entityName?uncap_first}) { ${entityName?uncap_first}Service.save(${entityName?uncap_first}); @@ -96,7 +96,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e * @return */ @AutoLog(value = "${tableVo.ftlDescription}-编辑") - @ApiOperation(value="${tableVo.ftlDescription}-编辑", notes="${tableVo.ftlDescription}-编辑") + @Operation(summary = "${tableVo.ftlDescription}-编辑") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) public Result edit(@RequestBody ${entityName} ${entityName?uncap_first}) { ${entityName?uncap_first}Service.updateById(${entityName?uncap_first}); @@ -109,7 +109,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e * @return */ @AutoLog(value = "${tableVo.ftlDescription}-通过id删除") - @ApiOperation(value="${tableVo.ftlDescription}-通过id删除", notes="${tableVo.ftlDescription}-通过id删除") + @Operation(summary = "${tableVo.ftlDescription}-通过id删除") @DeleteMapping(value = "/delete") public Result delete(@RequestParam(name="id",required=true) String id) { ${entityName?uncap_first}Service.removeById(id); @@ -123,7 +123,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e * @return */ @AutoLog(value = "${tableVo.ftlDescription}-批量删除") - @ApiOperation(value="${tableVo.ftlDescription}-批量删除", notes="${tableVo.ftlDescription}-批量删除") + @Operation(summary = "${tableVo.ftlDescription}-批量删除") @DeleteMapping(value = "/deleteBatch") public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.${entityName?uncap_first}Service.removeByIds(Arrays.asList(ids.split(","))); @@ -137,7 +137,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e * @return */ @AutoLog(value = "${tableVo.ftlDescription}-通过id查询") - @ApiOperation(value="${tableVo.ftlDescription}-通过id查询", notes="${tableVo.ftlDescription}-通过id查询") + @Operation(summary = "${tableVo.ftlDescription}-通过id查询") @GetMapping(value = "/queryById") public Result queryById(@RequestParam(name="id",required=true) String id) { ${entityName} ${entityName?uncap_first} = ${entityName?uncap_first}Service.getById(id); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/entity/${entityPackage}/${entityName}.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/entity/${entityPackage}/${entityName}.javai index faf00a86..484f6a47 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/entity/${entityPackage}/${entityName}.javai +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/entity/${entityPackage}/${entityName}.javai @@ -9,8 +9,7 @@ import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; /** * @Description: ${tableVo.ftlDescription} @@ -20,7 +19,7 @@ import io.swagger.annotations.ApiModelProperty; */ @Data @TableName("${tableName}") -@ApiModel(value="${tableName}对象", description="${tableVo.ftlDescription}") +@Schema(description="${tableVo.ftlDescription}") public class ${entityName} implements Serializable { private static final long serialVersionUID = 1L; @@ -43,7 +42,7 @@ public class ${entityName} implements Serializable { @Excel(name = "${po.filedComment}", width = 15) - @ApiModelProperty(value = "${po.filedComment}") + @Schema(description = "${po.filedComment}") private <#if po.fieldType=='java.sql.Blob'>byte[]<#else>${po.fieldType} ${po.fieldName}; } diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai index 8a253502..f4f08bd6 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai @@ -41,8 +41,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; import com.alibaba.fastjson.JSON; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import org.jeecg.common.aspect.annotation.AutoLog; /** @@ -51,7 +51,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; * @Date: ${.now?string["yyyy-MM-dd"]} * @Version: V1.0 */ -@Api(tags="${tableVo.ftlDescription}") +@Tag(name="${tableVo.ftlDescription}") @RestController @RequestMapping("/${entityPackage}/${entityName?uncap_first}") @Slf4j @@ -73,7 +73,7 @@ public class ${entityName}Controller { * @return */ @AutoLog(value = "${tableVo.ftlDescription}-分页列表查询") - @ApiOperation(value="${tableVo.ftlDescription}-分页列表查询", notes="${tableVo.ftlDescription}-分页列表查询") + @Operation(summary = "${tableVo.ftlDescription}-分页列表查询") @GetMapping(value = "/list") public Result queryPageList(${entityName} ${entityName?uncap_first}, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -92,7 +92,7 @@ public class ${entityName}Controller { * @return */ @AutoLog(value = "${tableVo.ftlDescription}-添加") - @ApiOperation(value="${tableVo.ftlDescription}-添加", notes="${tableVo.ftlDescription}-添加") + @Operation(summary = "${tableVo.ftlDescription}-添加") @PostMapping(value = "/add") public Result add(@RequestBody ${entityName}Page ${entityName?uncap_first}Page) { ${entityName} ${entityName?uncap_first} = new ${entityName}(); @@ -108,7 +108,7 @@ public class ${entityName}Controller { * @return */ @AutoLog(value = "${tableVo.ftlDescription}-编辑") - @ApiOperation(value="${tableVo.ftlDescription}-编辑", notes="${tableVo.ftlDescription}-编辑") + @Operation(summary = "${tableVo.ftlDescription}-编辑") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) public Result edit(@RequestBody ${entityName}Page ${entityName?uncap_first}Page) { ${entityName} ${entityName?uncap_first} = new ${entityName}(); @@ -124,7 +124,7 @@ public class ${entityName}Controller { * @return */ @AutoLog(value = "${tableVo.ftlDescription}-通过id删除") - @ApiOperation(value="${tableVo.ftlDescription}-通过id删除", notes="${tableVo.ftlDescription}-通过id删除") + @Operation(summary = "${tableVo.ftlDescription}-通过id删除") @DeleteMapping(value = "/delete") public Result delete(@RequestParam(name="id",required=true) String id) { ${entityName?uncap_first}Service.delMain(id); @@ -138,7 +138,7 @@ public class ${entityName}Controller { * @return */ @AutoLog(value = "${tableVo.ftlDescription}-批量删除") - @ApiOperation(value="${tableVo.ftlDescription}-批量删除", notes="${tableVo.ftlDescription}-批量删除") + @Operation(summary = "${tableVo.ftlDescription}-批量删除") @DeleteMapping(value = "/deleteBatch") public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.${entityName?uncap_first}Service.delBatchMain(Arrays.asList(ids.split(","))); @@ -152,7 +152,7 @@ public class ${entityName}Controller { * @return */ @AutoLog(value = "${tableVo.ftlDescription}-通过id查询") - @ApiOperation(value="${tableVo.ftlDescription}-通过id查询", notes="${tableVo.ftlDescription}-通过id查询") + @Operation(summary = "${tableVo.ftlDescription}-通过id查询") @GetMapping(value = "/queryById") public Result queryById(@RequestParam(name="id",required=true) String id) { ${entityName} ${entityName?uncap_first} = ${entityName?uncap_first}Service.getById(id); @@ -167,7 +167,7 @@ public class ${entityName}Controller { * @return */ @AutoLog(value = "${sub.ftlDescription}-通过主表ID查询") - @ApiOperation(value="${sub.ftlDescription}-通过主表ID查询", notes="${tableVo.ftlDescription}-通过主表ID查询") + @Operation(summary = "${tableVo.ftlDescription}-通过主表ID查询") @GetMapping(value = "/query${sub.entityName}ByMainId") public Result query${sub.entityName}ListByMainId(@RequestParam(name="id",required=true) String id) { List<${sub.entityName}> ${sub.entityName?uncap_first}List = ${sub.entityName?uncap_first}Service.selectByMainId(id); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai index 3adee3a3..0b770504 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai @@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; + /** * @Description: ${tableVo.ftlDescription} @@ -19,7 +19,7 @@ import io.swagger.annotations.ApiModelProperty; */ @Data @TableName("${tableName}") -@ApiModel(value="${tableName}对象", description="${tableVo.ftlDescription}") +@Schema(description="${tableVo.ftlDescription}") public class ${entityName} implements Serializable { private static final long serialVersionUID = 1L; @@ -37,7 +37,7 @@ public class ${entityName} implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "${po.filedComment}") + @Schema(description = "${po.filedComment}") private <#if po.fieldType=='java.sql.Blob'>byte[]<#else>${po.fieldType} ${po.fieldName}; } diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai index 89c15b96..5a13e9b3 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai @@ -11,8 +11,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; import java.util.Date; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; /** * @Description: ${subTab.ftlDescription} @@ -22,7 +21,7 @@ import io.swagger.annotations.ApiModelProperty; */ @Data @TableName("${subTab.tableName}") -@ApiModel(value="${tableName}对象", description="${tableVo.ftlDescription}") +@Schema(description="${tableVo.ftlDescription}") public class ${subTab.entityName} implements Serializable { private static final long serialVersionUID = 1L; @@ -47,7 +46,7 @@ public class ${subTab.entityName} implements Serializable { - @ApiModelProperty(value = "${po.filedComment}") + @Schema(description = "${po.filedComment}") private <#if po.fieldType=='java.sql.Blob'>byte[]<#else>${po.fieldType} ${po.fieldName}; } diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai index 245e6883..af568c12 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai @@ -11,8 +11,8 @@ import org.jeecgframework.poi.excel.annotation.ExcelCollection; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; + /** * @Description: ${tableVo.ftlDescription} @@ -21,7 +21,7 @@ import io.swagger.annotations.ApiModelProperty; * @Version: V1.0 */ @Data -@ApiModel(value="${tableName}Page对象", description="${tableVo.ftlDescription}") +@Schema(description="${tableVo.ftlDescription}") public class ${entityName}Page { <#list originalColumns as po> @@ -47,7 +47,7 @@ public class ${entityName}Page { <#list subTables as sub> @ExcelCollection(name="${sub.ftlDescription}") - @ApiModelProperty(value = "${sub.ftlDescription}") + @Schema(description = "${sub.ftlDescription}") private List<${sub.entityName}> ${sub.entityName?uncap_first}List; diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai index 9ed4850c..853d1f0c 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai @@ -40,8 +40,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; import com.alibaba.fastjson.JSON; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import org.jeecg.common.aspect.annotation.AutoLog; /** @@ -50,7 +50,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; * @Date: ${.now?string["yyyy-MM-dd"]} * @Version: V1.0 */ -@Api(tags="${tableVo.ftlDescription}") +@Tag(name="${tableVo.ftlDescription}") @RestController @RequestMapping("/${entityPackage}/${entityName?uncap_first}") @Slf4j @@ -72,7 +72,7 @@ public class ${entityName}Controller { * @return */ @AutoLog(value = "${tableVo.ftlDescription}-分页列表查询") - @ApiOperation(value="${tableVo.ftlDescription}-分页列表查询", notes="${tableVo.ftlDescription}-分页列表查询") + @Operation(summary = "${tableVo.ftlDescription}-分页列表查询") @GetMapping(value = "/list") public Result queryPageList(${entityName} ${entityName?uncap_first}, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -91,7 +91,7 @@ public class ${entityName}Controller { * @return */ @AutoLog(value = "${tableVo.ftlDescription}-添加") - @ApiOperation(value="${tableVo.ftlDescription}-添加", notes="${tableVo.ftlDescription}-添加") + @Operation(summary = "${tableVo.ftlDescription}-添加") @PostMapping(value = "/add") public Result add(@RequestBody ${entityName}Page ${entityName?uncap_first}Page) { ${entityName} ${entityName?uncap_first} = new ${entityName}(); @@ -107,7 +107,7 @@ public class ${entityName}Controller { * @return */ @AutoLog(value = "${tableVo.ftlDescription}-编辑") - @ApiOperation(value="${tableVo.ftlDescription}-", notes="${tableVo.ftlDescription}-编辑") + @Operation(summary = "${tableVo.ftlDescription}-编辑") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) public Result edit(@RequestBody ${entityName}Page ${entityName?uncap_first}Page) { ${entityName} ${entityName?uncap_first} = new ${entityName}(); @@ -123,7 +123,7 @@ public class ${entityName}Controller { * @return */ @AutoLog(value = "${tableVo.ftlDescription}-通过id删除") - @ApiOperation(value="${tableVo.ftlDescription}-通过id删除", notes="${tableVo.ftlDescription}-通过id删除") + @Operation(summary = "${tableVo.ftlDescription}-通过id删除") @DeleteMapping(value = "/delete") public Result delete(@RequestParam(name="id",required=true) String id) { ${entityName?uncap_first}Service.delMain(id); @@ -137,7 +137,7 @@ public class ${entityName}Controller { * @return */ @AutoLog(value = "${tableVo.ftlDescription}-批量删除") - @ApiOperation(value="${tableVo.ftlDescription}-批量删除", notes="${tableVo.ftlDescription}-批量删除") + @Operation(summary = "${tableVo.ftlDescription}-批量删除") @DeleteMapping(value = "/deleteBatch") public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.${entityName?uncap_first}Service.removeByIds(Arrays.asList(ids.split(","))); @@ -151,7 +151,7 @@ public class ${entityName}Controller { * @return */ @AutoLog(value = "${tableVo.ftlDescription}-通过id查询") - @ApiOperation(value="${tableVo.ftlDescription}-通过id查询", notes="${tableVo.ftlDescription}-通过id查询") + @Operation(summary = "${tableVo.ftlDescription}-通过id查询") @GetMapping(value = "/queryById") public Result queryById(@RequestParam(name="id",required=true) String id) { ${entityName} ${entityName?uncap_first} = ${entityName?uncap_first}Service.getById(id); @@ -168,7 +168,7 @@ public class ${entityName}Controller { * @return */ @AutoLog(value = "${sub.ftlDescription}-通过主表id查询") - @ApiOperation(value="${sub.ftlDescription}-通过主表id查询", notes="${sub.ftlDescription}-通过主表id查询") + @Operation(summary = "${sub.ftlDescription}-通过主表id查询") <#-- update-begin--Author:kangxiaolin Date:20190905 for：[442]主子表分开维护，生成的代码子表的分页改为真实的分页-------------------- --> @GetMapping(value = "/list${sub.entityName}ByMainId") public Result list${sub.entityName}ByMainId(${sub.entityName} ${sub.entityName?uncap_first}, @@ -208,7 +208,7 @@ ${sub.entityName?uncap_first}.get${key}()!=null<#rt/> * @return */ @AutoLog(value = "${sub.ftlDescription}-添加") - @ApiOperation(value="${sub.ftlDescription}-添加", notes="${sub.ftlDescription}-添加") + @Operation(summary = "${sub.ftlDescription}-添加") @PostMapping(value = "/add${sub.entityName}") public Result add${sub.entityName}(@RequestBody ${sub.entityName} ${sub.entityName?uncap_first}) { ${sub.entityName?uncap_first}Service.save(${sub.entityName?uncap_first}); @@ -222,7 +222,7 @@ ${sub.entityName?uncap_first}.get${key}()!=null<#rt/> * @return */ @AutoLog(value = "${sub.ftlDescription}-编辑") - @ApiOperation(value="${sub.ftlDescription}-编辑", notes="${sub.ftlDescription}-编辑") + @Operation(summary = "${sub.ftlDescription}-编辑") @RequestMapping(value = "/edit${sub.entityName}", method = {RequestMethod.PUT,RequestMethod.POST}) public Result edit${sub.entityName}(@RequestBody ${sub.entityName} ${sub.entityName?uncap_first}) { ${sub.entityName?uncap_first}Service.updateById(${sub.entityName?uncap_first}); @@ -236,7 +236,7 @@ ${sub.entityName?uncap_first}.get${key}()!=null<#rt/> * @return */ @AutoLog(value = "${sub.ftlDescription}-通过id删除") - @ApiOperation(value="${sub.ftlDescription}-通过id删除", notes="${sub.ftlDescription}-通过id删除") + @Operation(summary = "${sub.ftlDescription}-通过id删除") @DeleteMapping(value = "/delete${sub.entityName}") public Result delete${sub.entityName}(@RequestParam(name = "id", required = true) String id) { ${sub.entityName?uncap_first}Service.removeById(id); @@ -250,7 +250,7 @@ ${sub.entityName?uncap_first}.get${key}()!=null<#rt/> * @return */ @AutoLog(value = "${sub.ftlDescription}-批量删除") - @ApiOperation(value="${sub.ftlDescription}-批量删除", notes="${sub.ftlDescription}-批量删除") + @Operation(summary = "${sub.ftlDescription}-批量删除") @DeleteMapping(value = "/deleteBatch${sub.entityName}") public Result deleteBatch${sub.entityName}(@RequestParam(name = "ids", required = true) String ids) { if (ids == null || "".equals(ids.trim())) { diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai index 3adee3a3..0b770504 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai @@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; + /** * @Description: ${tableVo.ftlDescription} @@ -19,7 +19,7 @@ import io.swagger.annotations.ApiModelProperty; */ @Data @TableName("${tableName}") -@ApiModel(value="${tableName}对象", description="${tableVo.ftlDescription}") +@Schema(description="${tableVo.ftlDescription}") public class ${entityName} implements Serializable { private static final long serialVersionUID = 1L; @@ -37,7 +37,7 @@ public class ${entityName} implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "${po.filedComment}") + @Schema(description = "${po.filedComment}") private <#if po.fieldType=='java.sql.Blob'>byte[]<#else>${po.fieldType} ${po.fieldName}; } diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai index 54f3e9af..b878914c 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai @@ -10,8 +10,8 @@ import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; + /** * @Description: ${subTab.ftlDescription} @@ -21,7 +21,7 @@ import io.swagger.annotations.ApiModelProperty; */ @Data @TableName("${subTab.tableName}") -@ApiModel(value="${tableName}对象", description="${tableVo.ftlDescription}") +@Schema(description="${tableVo.ftlDescription}") public class ${subTab.entityName} implements Serializable { private static final long serialVersionUID = 1L; @@ -46,7 +46,7 @@ public class ${subTab.entityName} implements Serializable { - @ApiModelProperty(value = "${po.filedComment}") + @Schema(description = "${po.filedComment}") private <#if po.fieldType=='java.sql.Blob'>byte[]<#else>${po.fieldType} ${po.fieldName}; } diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai index 496d9d3a..36de3f15 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai @@ -10,8 +10,8 @@ import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecgframework.poi.excel.annotation.ExcelCollection; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; + /** * @Description: ${tableVo.ftlDescription} @@ -20,7 +20,7 @@ import io.swagger.annotations.ApiModelProperty; * @Version: V1.0 */ @Data -@ApiModel(value="${tableName}Page对象", description="${tableVo.ftlDescription}") +@Schema(description="${tableVo.ftlDescription}") public class ${entityName}Page { <#list originalColumns as po> @@ -46,7 +46,7 @@ public class ${entityName}Page { <#list subTables as sub> @ExcelCollection(name="${sub.ftlDescription}") - @ApiModelProperty(value = "${sub.ftlDescription}") + @Schema(description = "${sub.ftlDescription}") private List<${sub.entityName}> ${sub.entityName?uncap_first}List; diff --git a/jeecg-boot/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/handler/swagger/MySwaggerResourceProvider.java b/jeecg-boot/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/handler/swagger/MySwaggerResourceProvider.java index babaf1e9..37937f40 100644 --- a/jeecg-boot/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/handler/swagger/MySwaggerResourceProvider.java +++ b/jeecg-boot/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/handler/swagger/MySwaggerResourceProvider.java @@ -1,160 +1,160 @@ -package org.jeecg.handler.swagger; - -import cn.hutool.core.util.ArrayUtil; -import cn.hutool.core.util.ObjectUtil; -import com.alibaba.nacos.api.naming.NamingFactory; -import com.alibaba.nacos.api.naming.NamingService; -import com.alibaba.nacos.api.naming.pojo.Instance; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.cloud.gateway.route.RouteLocator; -import org.springframework.context.annotation.Primary; -import org.springframework.stereotype.Component; - -import springfox.documentation.swagger.web.SwaggerResource; -import springfox.documentation.swagger.web.SwaggerResourcesProvider; - -import java.util.*; - -/** - * 聚合各个服务的swagger接口 - * @author zyf - * @date: 2022/4/21 10:55 - */ -@Component -@Slf4j -@Primary -public class MySwaggerResourceProvider implements SwaggerResourcesProvider { - /** - * swagger2默认的url后缀 - */ - private static final String SWAGGER2URL = "/v2/api-docs"; - - /** - * 网关路由 - */ - private final RouteLocator routeLocator; - /** - * Nacos名字服务 - */ - private NamingService naming; - - /** - * nacos服务地址 - */ - @Value("${spring.cloud.nacos.discovery.server-addr}") - private String serverAddr; - /** - * nacos namespace - */ - @Value("${spring.cloud.nacos.discovery.namespace:#{null}}") - private String namespace; - - /** - * nacos groupName - */ - @Value("${spring.cloud.nacos.config.group:DEFAULT_GROUP:#{null}}") - private String group; - - /** - * nacos username - */ - @Value("${spring.cloud.nacos.discovery.username:#{null}}") - private String username; - /** - * nacos password - */ - @Value("${spring.cloud.nacos.discovery.password:#{null}}") - private String password; - - /** - * Swagger中需要排除的服务 - */ - private String[] excludeServiceIds=new String[]{"jeecg-cloud-monitor"}; - - - /** - * 网关应用名称 - */ - @Value("${spring.application.name}") - private String self; - - @Autowired - public MySwaggerResourceProvider(RouteLocator routeLocator) { - this.routeLocator = routeLocator; - } - - @Override - public List get() { - List resources = new ArrayList<>(); - List routeHosts = new ArrayList<>(); - // 获取所有可用的host：serviceId - routeLocator.getRoutes().filter(route -> route.getUri().getHost() != null) - .filter(route -> !self.equals(route.getUri().getHost())) - .subscribe(route ->{ - //update-begin---author:zyf ---date:20220413 for：过滤掉无效路由,避免接口文档报错无法打开 - boolean hasRoute=checkRoute(route.getId()); - if(hasRoute){ - routeHosts.add(route.getUri().getHost()); - } - //update-end---author:zyf ---date:20220413 for：过滤掉无效路由,避免接口文档报错无法打开 - }); - - // 记录已经添加过的server，存在同一个应用注册了多个服务在nacos上 - Set dealed = new HashSet<>(); - routeHosts.forEach(instance -> { - // 拼接url - String url = "/" + instance.toLowerCase() + SWAGGER2URL; - if (!dealed.contains(url)) { - dealed.add(url); - log.info(" Gateway add SwaggerResource: {}",url); - SwaggerResource swaggerResource = new SwaggerResource(); - swaggerResource.setUrl(url); - swaggerResource.setSwaggerVersion("2.0"); - swaggerResource.setName(instance); - //Swagger排除不展示的服务 - if(!ArrayUtil.contains(excludeServiceIds,instance)){ - resources.add(swaggerResource); - } - } - }); - return resources; - } - - /** - * 检测nacos中是否有健康实例 - * @param routeId - * @return - */ - private Boolean checkRoute(String routeId) { - Boolean hasRoute = false; - try { - //修复使用带命名空间启动网关swagger看不到接口文档的问题 - Properties properties=new Properties(); - properties.setProperty("serverAddr",serverAddr); - if(namespace!=null && !"".equals(namespace)){ - log.info("nacos.discovery.namespace = {}", namespace); - properties.setProperty("namespace",namespace); - } - if(username!=null && !"".equals(username)){ - properties.setProperty("username",username); - } - if(password!=null && !"".equals(password)){ - properties.setProperty("password",password); - } - //【issues/5115】因swagger文档导致gateway内存溢出 - if (this.naming == null) { - this.naming = NamingFactory.createNamingService(properties); - } - log.info(" config.group : {}", group); - List list = this.naming.selectInstances(routeId, group , true); - if (ObjectUtil.isNotEmpty(list)) { - hasRoute = true; - } - } catch (Exception e) { - e.printStackTrace(); - } - return hasRoute; - } -} \ No newline at end of file +//package org.jeecg.handler.swagger; +// +//import cn.hutool.core.util.ArrayUtil; +//import cn.hutool.core.util.ObjectUtil; +//import com.alibaba.nacos.api.naming.NamingFactory; +//import com.alibaba.nacos.api.naming.NamingService; +//import com.alibaba.nacos.api.naming.pojo.Instance; +//import lombok.extern.slf4j.Slf4j; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.beans.factory.annotation.Value; +//import org.springframework.cloud.gateway.route.RouteLocator; +//import org.springframework.context.annotation.Primary; +//import org.springframework.stereotype.Component; +// +//import springfox.documentation.swagger.web.SwaggerResource; +//import springfox.documentation.swagger.web.SwaggerResourcesProvider; +// +//import java.util.*; +// +///** +// * 聚合各个服务的swagger接口 +// * @author zyf +// * @date: 2022/4/21 10:55 +// */ +//@Component +//@Slf4j +//@Primary +//public class MySwaggerResourceProvider implements SwaggerResourcesProvider { +// /** +// * swagger2默认的url后缀 +// */ +// private static final String SWAGGER2URL = "/v2/api-docs"; +// +// /** +// * 网关路由 +// */ +// private final RouteLocator routeLocator; +// /** +// * Nacos名字服务 +// */ +// private NamingService naming; +// +// /** +// * nacos服务地址 +// */ +// @Value("${spring.cloud.nacos.discovery.server-addr}") +// private String serverAddr; +// /** +// * nacos namespace +// */ +// @Value("${spring.cloud.nacos.discovery.namespace:#{null}}") +// private String namespace; +// +// /** +// * nacos groupName +// */ +// @Value("${spring.cloud.nacos.config.group:DEFAULT_GROUP:#{null}}") +// private String group; +// +// /** +// * nacos username +// */ +// @Value("${spring.cloud.nacos.discovery.username:#{null}}") +// private String username; +// /** +// * nacos password +// */ +// @Value("${spring.cloud.nacos.discovery.password:#{null}}") +// private String password; +// +// /** +// * Swagger中需要排除的服务 +// */ +// private String[] excludeServiceIds=new String[]{"jeecg-cloud-monitor"}; +// +// +// /** +// * 网关应用名称 +// */ +// @Value("${spring.application.name}") +// private String self; +// +// @Autowired +// public MySwaggerResourceProvider(RouteLocator routeLocator) { +// this.routeLocator = routeLocator; +// } +// +// @Override +// public List get() { +// List resources = new ArrayList<>(); +// List routeHosts = new ArrayList<>(); +// // 获取所有可用的host：serviceId +// routeLocator.getRoutes().filter(route -> route.getUri().getHost() != null) +// .filter(route -> !self.equals(route.getUri().getHost())) +// .subscribe(route ->{ +// //update-begin---author:zyf ---date:20220413 for：过滤掉无效路由,避免接口文档报错无法打开 +// boolean hasRoute=checkRoute(route.getId()); +// if(hasRoute){ +// routeHosts.add(route.getUri().getHost()); +// } +// //update-end---author:zyf ---date:20220413 for：过滤掉无效路由,避免接口文档报错无法打开 +// }); +// +// // 记录已经添加过的server，存在同一个应用注册了多个服务在nacos上 +// Set dealed = new HashSet<>(); +// routeHosts.forEach(instance -> { +// // 拼接url +// String url = "/" + instance.toLowerCase() + SWAGGER2URL; +// if (!dealed.contains(url)) { +// dealed.add(url); +// log.info(" Gateway add SwaggerResource: {}",url); +// SwaggerResource swaggerResource = new SwaggerResource(); +// swaggerResource.setUrl(url); +// swaggerResource.setSwaggerVersion("2.0"); +// swaggerResource.setName(instance); +// //Swagger排除不展示的服务 +// if(!ArrayUtil.contains(excludeServiceIds,instance)){ +// resources.add(swaggerResource); +// } +// } +// }); +// return resources; +// } +// +// /** +// * 检测nacos中是否有健康实例 +// * @param routeId +// * @return +// */ +// private Boolean checkRoute(String routeId) { +// Boolean hasRoute = false; +// try { +// //修复使用带命名空间启动网关swagger看不到接口文档的问题 +// Properties properties=new Properties(); +// properties.setProperty("serverAddr",serverAddr); +// if(namespace!=null && !"".equals(namespace)){ +// log.info("nacos.discovery.namespace = {}", namespace); +// properties.setProperty("namespace",namespace); +// } +// if(username!=null && !"".equals(username)){ +// properties.setProperty("username",username); +// } +// if(password!=null && !"".equals(password)){ +// properties.setProperty("password",password); +// } +// //【issues/5115】因swagger文档导致gateway内存溢出 +// if (this.naming == null) { +// this.naming = NamingFactory.createNamingService(properties); +// } +// log.info(" config.group : {}", group); +// List list = this.naming.selectInstances(routeId, group , true); +// if (ObjectUtil.isNotEmpty(list)) { +// hasRoute = true; +// } +// } catch (Exception e) { +// e.printStackTrace(); +// } +// return hasRoute; +// } +//} \ No newline at end of file diff --git a/jeecg-boot/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/handler/swagger/SwaggerResourceController.java b/jeecg-boot/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/handler/swagger/SwaggerResourceController.java index b2dc31ab..1268d720 100644 --- a/jeecg-boot/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/handler/swagger/SwaggerResourceController.java +++ b/jeecg-boot/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/handler/swagger/SwaggerResourceController.java @@ -1,52 +1,52 @@ -package org.jeecg.handler.swagger; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import springfox.documentation.swagger.web.*; - -import java.util.ArrayList; -import java.util.List; - -/** - * swagger聚合接口，三个接口都是 doc.html需要访问的接口 - * @author zyf - * @date: 2022/4/21 10:55 - */ -@RestController -@RequestMapping("/swagger-resources") -public class SwaggerResourceController { - private MySwaggerResourceProvider swaggerResourceProvider; - /** - * 生产环境，关闭swagger文档 - */ - @Value("${knife4j.production:#{null}}") - private Boolean production; - - @Autowired - public SwaggerResourceController(MySwaggerResourceProvider swaggerResourceProvider) { - this.swaggerResourceProvider = swaggerResourceProvider; - } - - @RequestMapping(value = "/configuration/security") - public ResponseEntity securityConfiguration() { - return new ResponseEntity<>(SecurityConfigurationBuilder.builder().build(), HttpStatus.OK); - } - - @RequestMapping(value = "/configuration/ui") - public ResponseEntity uiConfiguration() { - return new ResponseEntity<>(UiConfigurationBuilder.builder().build(), HttpStatus.OK); - } - - @RequestMapping - public ResponseEntity> swaggerResources() { - // 是否开启生产环境屏蔽swagger - if (production != null && production) { - return new ResponseEntity<>(new ArrayList<>(), HttpStatus.OK); - } - return new ResponseEntity<>(swaggerResourceProvider.get(), HttpStatus.OK); - } -} \ No newline at end of file +//package org.jeecg.handler.swagger; +// +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.beans.factory.annotation.Value; +//import org.springframework.http.HttpStatus; +//import org.springframework.http.ResponseEntity; +//import org.springframework.web.bind.annotation.RequestMapping; +//import org.springframework.web.bind.annotation.RestController; +//import springfox.documentation.swagger.web.*; +// +//import java.util.ArrayList; +//import java.util.List; +// +///** +// * swagger聚合接口，三个接口都是 doc.html需要访问的接口 +// * @author zyf +// * @date: 2022/4/21 10:55 +// */ +//@RestController +//@RequestMapping("/swagger-resources") +//public class SwaggerResourceController { +// private MySwaggerResourceProvider swaggerResourceProvider; +// /** +// * 生产环境，关闭swagger文档 +// */ +// @Value("${knife4j.production:#{null}}") +// private Boolean production; +// +// @Autowired +// public SwaggerResourceController(MySwaggerResourceProvider swaggerResourceProvider) { +// this.swaggerResourceProvider = swaggerResourceProvider; +// } +// +// @RequestMapping(value = "/configuration/security") +// public ResponseEntity securityConfiguration() { +// return new ResponseEntity<>(SecurityConfigurationBuilder.builder().build(), HttpStatus.OK); +// } +// +// @RequestMapping(value = "/configuration/ui") +// public ResponseEntity uiConfiguration() { +// return new ResponseEntity<>(UiConfigurationBuilder.builder().build(), HttpStatus.OK); +// } +// +// @RequestMapping +// public ResponseEntity> swaggerResources() { +// // 是否开启生产环境屏蔽swagger +// if (production != null && production) { +// return new ResponseEntity<>(new ArrayList<>(), HttpStatus.OK); +// } +// return new ResponseEntity<>(swaggerResourceProvider.get(), HttpStatus.OK); +// } +//} \ No newline at end of file diff --git a/jeecg-boot/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/loader/DynamicRouteLoader.java b/jeecg-boot/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/loader/DynamicRouteLoader.java index cafdc3b7..1fd52d44 100644 --- a/jeecg-boot/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/loader/DynamicRouteLoader.java +++ b/jeecg-boot/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/loader/DynamicRouteLoader.java @@ -9,10 +9,9 @@ import com.alibaba.nacos.api.NacosFactory; import com.alibaba.nacos.api.config.ConfigService; import com.alibaba.nacos.api.config.listener.Listener; import com.alibaba.nacos.api.exception.NacosException; +import com.alibaba.nacos.common.utils.StringUtils; import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.ObjectUtils; -import org.apache.commons.lang3.StringUtils; import org.jeecg.common.base.BaseMap; import org.jeecg.common.constant.CacheConstant; import org.jeecg.common.util.RedisUtil; @@ -32,6 +31,7 @@ import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisherAware; import org.springframework.context.annotation.DependsOn; import org.springframework.stereotype.Component; +import org.springframework.util.ObjectUtils; import reactor.core.publisher.Mono; import java.net.URI; @@ -170,9 +170,9 @@ public class DynamicRouteLoader implements ApplicationEventPublisherAware { dynamicRouteService.add(definition); } } - if(ObjectUtils.isNotEmpty(baseMap)){ + if(!ObjectUtils.isEmpty(baseMap)){ String delRouterId = baseMap.get("delRouterId"); - if (ObjectUtils.isNotEmpty(delRouterId)) { + if (!ObjectUtils.isEmpty(delRouterId)) { dynamicRouteService.delete(delRouterId); } } diff --git a/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/src/main/java/org/jeecg/modules/test/feign/controller/JeecgTestFeignController.java b/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/src/main/java/org/jeecg/modules/test/feign/controller/JeecgTestFeignController.java index cc4d6752..7dfa3b3e 100644 --- a/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/src/main/java/org/jeecg/modules/test/feign/controller/JeecgTestFeignController.java +++ b/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/src/main/java/org/jeecg/modules/test/feign/controller/JeecgTestFeignController.java @@ -1,6 +1,8 @@ package org.jeecg.modules.test.feign.controller; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.jeecg.common.api.vo.Result; @@ -8,8 +10,6 @@ import org.jeecg.modules.test.feign.client.JeecgTestClient; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import com.alibaba.csp.sentinel.annotation.SentinelResource; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; /** * 微服务单元测试 @@ -19,7 +19,7 @@ import io.swagger.annotations.ApiOperation; @Slf4j @RestController @RequestMapping("/sys/test") -@Api(tags = "【微服务】单元测试") +@Tag(name = "【微服务】单元测试") public class JeecgTestFeignController { @Autowired @@ -32,7 +32,7 @@ public class JeecgTestFeignController { * @return */ @GetMapping("/getMessage") - @ApiOperation(value = "测试feign调用demo服务1", notes = "测试feign @SentinelResource熔断写法 | 测试熔断关闭jeecg-demo服务") + @Operation(summary = "测试feign @SentinelResource熔断写法 | 测试熔断关闭jeecg-demo服务") @SentinelResource(value = "test_more_getMessage", fallback = "getDefaultUser") public Result getMessage(@RequestParam(value = "name", required = false) String name) { log.info("---------Feign fallbackFactory优先级高于@SentinelResource-----------------"); @@ -47,7 +47,7 @@ public class JeecgTestFeignController { * @return */ @GetMapping("/getMessage2") - @ApiOperation(value = "测试feign调用demo服务2", notes = "测试feign fallbackFactory熔断写法 | 测试熔断关闭jeecg-demo服务") + @Operation(summary = "测试feign fallbackFactory熔断写法 | 测试熔断关闭jeecg-demo服务") public Result getMessage2(@RequestParam(value = "name", required = false) String name) { log.info("---------测试 Feign fallbackFactory-----------------"); String resultMsg = jeecgTestClient.getMessage(" I am jeecg-system 服务节点，呼叫 jeecg-demo!"); @@ -56,7 +56,7 @@ public class JeecgTestFeignController { @GetMapping("/fallback") - @ApiOperation(value = "测试熔断", notes = "测试熔断") + @Operation(summary = "测试熔断") @SentinelResource(value = "test_more_fallback", fallback = "getDefaultUser") public Result test(@RequestParam(value = "name", required = false) String name) { if (StringUtils.isEmpty(name)) { diff --git a/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/src/main/java/org/jeecg/modules/test/rabbitmq/controller/JeecgMqTestController.java b/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/src/main/java/org/jeecg/modules/test/rabbitmq/controller/JeecgMqTestController.java index 25c699fa..cfd93881 100644 --- a/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/src/main/java/org/jeecg/modules/test/rabbitmq/controller/JeecgMqTestController.java +++ b/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/src/main/java/org/jeecg/modules/test/rabbitmq/controller/JeecgMqTestController.java @@ -3,6 +3,8 @@ package org.jeecg.modules.test.rabbitmq.controller; import javax.servlet.http.HttpServletRequest; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import org.jeecg.boot.starter.rabbitmq.client.RabbitMqClient; import org.jeecg.common.api.vo.Result; import org.jeecg.common.base.BaseMap; @@ -13,8 +15,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import cn.hutool.core.util.RandomUtil; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; /** @@ -24,7 +24,7 @@ import io.swagger.annotations.ApiOperation; */ @RestController @RequestMapping("/sys/test") -@Api(tags = "【微服务】MQ单元测试") +@Tag(name = "【微服务】MQ单元测试") public class JeecgMqTestController { @Autowired @@ -39,7 +39,7 @@ public class JeecgMqTestController { * @return */ @GetMapping(value = "/rabbitmq") - @ApiOperation(value = "测试rabbitmq", notes = "测试rabbitmq") + @Operation(summary = "测试rabbitmq") public Result rabbitMqClientTest(HttpServletRequest req) { //rabbitmq消息队列测试 BaseMap map = new BaseMap(); @@ -50,7 +50,7 @@ public class JeecgMqTestController { } @GetMapping(value = "/rabbitmq2") - @ApiOperation(value = "rabbitmq消息总线测试", notes = "rabbitmq消息总线测试") + @Operation(summary = "rabbitmq消息总线测试") public Result rabbitmq2(HttpServletRequest req) { //rabbitmq消息总线测试 diff --git a/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/src/main/java/org/jeecg/modules/test/seata/order/controller/SeataOrderController.java b/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/src/main/java/org/jeecg/modules/test/seata/order/controller/SeataOrderController.java index 04f983bb..7b758e5e 100644 --- a/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/src/main/java/org/jeecg/modules/test/seata/order/controller/SeataOrderController.java +++ b/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/src/main/java/org/jeecg/modules/test/seata/order/controller/SeataOrderController.java @@ -6,9 +6,8 @@ package org.jeecg.modules.test.seata.order.controller; * @date: 2022/01/24 * @version: V1.0 */ -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; - +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import org.jeecg.modules.test.seata.order.dto.PlaceOrderRequest; import org.jeecg.modules.test.seata.order.service.SeataOrderService; import org.springframework.beans.factory.annotation.Autowired; @@ -20,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/test/seata/order") -@Api(tags = "seata测试") +@Tag(name = "seata测试") public class SeataOrderController { @Autowired @@ -30,7 +29,7 @@ public class SeataOrderController { * 自由下单 */ @PostMapping("/placeOrder") - @ApiOperation(value = "自由下单", notes = "自由下单") + @Operation(summary = "自由下单") public String placeOrder(@Validated @RequestBody PlaceOrderRequest request) { orderService.placeOrder(request); return "下单成功"; @@ -40,7 +39,7 @@ public class SeataOrderController { * 测试商品库存不足-异常回滚 */ @PostMapping("/test1") - @ApiOperation(value = "测试商品库存不足", notes = "测试商品库存不足") + @Operation(summary = "测试商品库存不足") public String test1() { //商品单价10元，库存20个,用户余额50元，模拟一次性购买22个。 期望异常回滚 orderService.placeOrder(new PlaceOrderRequest(1L, 1L, 22)); @@ -51,7 +50,7 @@ public class SeataOrderController { * 测试用户账户余额不足-异常回滚 */ @PostMapping("/test2") - @ApiOperation(value = "测试用户账户余额不足", notes = "测试用户账户余额不足") + @Operation(summary = "测试用户账户余额不足") public String test2() { //商品单价10元，库存20个，用户余额50元，模拟一次性购买6个。 期望异常回滚 orderService.placeOrder(new PlaceOrderRequest(1L, 1L, 6)); diff --git a/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/src/main/java/org/jeecg/modules/test/sharding/controller/JeecgShardingDemoController.java b/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/src/main/java/org/jeecg/modules/test/sharding/controller/JeecgShardingDemoController.java index ab4f70d0..4b783cc8 100644 --- a/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/src/main/java/org/jeecg/modules/test/sharding/controller/JeecgShardingDemoController.java +++ b/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/src/main/java/org/jeecg/modules/test/sharding/controller/JeecgShardingDemoController.java @@ -1,5 +1,7 @@ package org.jeecg.modules.test.sharding.controller; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.base.controller.JeecgController; @@ -10,8 +12,6 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; /** @@ -21,7 +21,7 @@ import lombok.extern.slf4j.Slf4j; * @version: V1.0 */ @Slf4j -@Api(tags = "分库分表测试") +@Tag(name = "分库分表测试") @RestController @RequestMapping("/sharding") public class JeecgShardingDemoController extends JeecgController { @@ -33,7 +33,7 @@ public class JeecgShardingDemoController extends JeecgController add() { log.info("---------------------------------单库分表插入--------------------------------"); int size = 10; @@ -52,7 +52,7 @@ public class JeecgShardingDemoController extends JeecgController list() { return Result.OK(shardingSysLogService.list()); } @@ -62,7 +62,7 @@ public class JeecgShardingDemoController extends JeecgController test2() { int start=20; int size=30; @@ -81,7 +81,7 @@ public class JeecgShardingDemoController extends JeecgController list2() { return Result.OK(shardingSysLogService.list()); }