♻️ Refactoring code. 使用openapi3 替代swagger2

2026-11-13 05:59:01 +08:00 · 2023-01-02 10:17:44 +08:00
1 parent 032c1b54d3
commit eb3387da9f
@@ -20,7 +20,7 @@ package com.pig4cloud.pigx.codegen;
 import com.pig4cloud.pigx.common.datasource.annotation.EnableDynamicDataSource;
 import com.pig4cloud.pigx.common.feign.annotation.EnablePigxFeignClients;
 import com.pig4cloud.pigx.common.security.annotation.EnablePigxResourceServer;
-import com.pig4cloud.pigx.common.swagger.annotation.EnablePigxSwagger2;
+import com.pig4cloud.pigx.common.swagger.annotation.EnableOpenApi;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
@@ -30,7 +30,7 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 * @date 2018/07/29 代码生成模块
 */
@EnableDynamicDataSource
-@EnablePigxSwagger2
+@EnableOpenApi("gen")
@EnablePigxFeignClients
@EnableDiscoveryClient
@EnablePigxResourceServer
@@ -5,8 +5,10 @@ import com.pig4cloud.pigx.codegen.service.GenDynamicService;
 import com.pig4cloud.pigx.codegen.util.SqlDto;
 import com.pig4cloud.pigx.common.core.util.R;
 import com.pig4cloud.pigx.common.security.annotation.Inner;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpHeaders;
 import org.springframework.web.bind.annotation.*;

 import java.util.LinkedHashMap;
@@ -22,7 +24,8 @@ import java.util.List;
@Inner(value = false)
@RequiredArgsConstructor
@RequestMapping("/dynamic")
-@Api(value = "dynamic", tags = "无代码管理")
+@Tag(description  = "dynamic", name =  "无代码管理")
+@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
 public class GenDynamicController {

 	private final GenDynamicService dynamicService;
@@ -25,9 +25,11 @@ import com.pig4cloud.pigx.codegen.service.GenFormConfService;
 import com.pig4cloud.pigx.common.core.util.R;
 import com.pig4cloud.pigx.common.log.annotation.SysLog;
 import com.pig4cloud.pigx.common.security.annotation.Inner;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.AllArgsConstructor;
+import org.springframework.http.HttpHeaders;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

@@ -40,7 +42,8 @@ import org.springframework.web.bind.annotation.*;
@RestController
@AllArgsConstructor
@RequestMapping("/form")
-@Api(value = "form", tags = "表单管理")
+@Tag(description = "form", name = "表单管理")
+@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
 public class GenFormConfController {

 	private final GenFormConfService genRecordService;
@@ -51,7 +54,7 @@ public class GenFormConfController {
 	 * @param formConf 生成记录
 	 * @return
 	 */
-	@ApiOperation(value = "分页查询", notes = "分页查询")
+	@Operation(summary = "分页查询", description = "分页查询")
 	@GetMapping("/page")
 	public R getGenFormConfPage(Page page, GenFormConf formConf) {
 		return R.ok(genRecordService.page(page, Wrappers.query(formConf)));
@@ -62,7 +65,7 @@ public class GenFormConfController {
 	 * @param id id
 	 * @return R
 	 */
-	@ApiOperation(value = "通过id查询", notes = "通过id查询")
+	@Operation(summary = "通过id查询", description = "通过id查询")
 	@GetMapping("/{id}")
 	public R getById(@PathVariable("id") Long id) {
 		return R.ok(genRecordService.getById(id));
@@ -74,7 +77,7 @@ public class GenFormConfController {
 	 * @param tableName tableName
 	 * @return R
 	 */
-	@ApiOperation(value = "通过tableName查询表单信息")
+	@Operation(summary = "通过tableName查询表单信息")
 	@Inner(value = false)
 	@GetMapping("/info")
 	public R form(String dsName, String tableName) {
@@ -86,7 +89,7 @@ public class GenFormConfController {
 	 * @param formConf 生成记录
 	 * @return R
 	 */
-	@ApiOperation(value = "新增生成记录", notes = "新增生成记录")
+	@Operation(summary = "新增生成记录", description = "新增生成记录")
 	@SysLog("新增生成记录")
 	@PostMapping
 	@PreAuthorize("@pms.hasPermission('gen_form_add')")
@@ -100,7 +103,7 @@ public class GenFormConfController {
 	 * @param formConf 生成记录
 	 * @return R
 	 */
-	@ApiOperation(value = "修改生成记录", notes = "修改生成记录")
+	@Operation(summary = "修改生成记录", description = "修改生成记录")
 	@SysLog("修改生成记录")
 	@PutMapping
 	@PreAuthorize("@pms.hasPermission('gen_form_edit')")
@@ -113,7 +116,7 @@ public class GenFormConfController {
 	 * @param id id
 	 * @return R
 	 */
-	@ApiOperation(value = "通过id删除生成记录", notes = "通过id删除生成记录")
+	@Operation(summary = "通过id删除生成记录", description = "通过id删除生成记录")
 	@SysLog("通过id删除生成记录")
 	@DeleteMapping("/{id}")
 	@PreAuthorize("@pms.hasPermission('gen_form_del')")
@@ -19,8 +19,7 @@ package com.pig4cloud.pigx.codegen.entity;

 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

@@ -35,7 +34,7 @@ import java.time.LocalDateTime;
@Data
@TableName("gen_form_conf")
@EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "生成记录")
+@Schema(description = "生成记录")
 public class GenFormConf extends Model<GenFormConf> {

 	private static final long serialVersionUID = 1L;
@@ -44,19 +43,19 @@ public class GenFormConf extends Model<GenFormConf> {
 	 * ID
 	 */
 	@TableId(type = IdType.ASSIGN_ID)
-	@ApiModelProperty(value = "ID")
+	@Schema(description = "ID")
 	private Long id;

 	/**
 	 * 表名称
 	 */
-	@ApiModelProperty(value = "表名称")
+	@Schema(description = "表名称")
 	private String tableName;

 	/**
 	 * 表单信息
 	 */
-	@ApiModelProperty(value = "表单信息")
+	@Schema(description = "表单信息")
 	private String formInfo;

 	/**
@@ -81,7 +80,7 @@ public class GenFormConf extends Model<GenFormConf> {
 	/**
 	 * 所属租户
 	 */
-	@ApiModelProperty(value = "所属租户", hidden = true)
+	@Schema(description = "所属租户", hidden = true)
 	private Long tenantId;

 }
@@ -41,7 +41,7 @@ import java.util.List;
@RestController
@RequiredArgsConstructor
@RequestMapping("/${pathName}" )
-@Api(value = "${pathName}", tags = "${comments}管理")
+@Tag(description  = "${pathName}", name =  "${comments}管理")
 public class ${className}Controller {

    private final  ${className}Service ${classname}Service;
@@ -52,7 +52,7 @@ public class ${className}Controller {
     * @param ${classname} ${comments}
     * @return
     */
-    @ApiOperation(value = "分页查询", notes = "分页查询")
+    @Operation(summary = "分页查询", description = "分页查询")
    @GetMapping("/page" )
    @PreAuthorize("@pms.hasPermission('${moduleName}_${pathName}_view')" )
    public R get${className}Page(Page page, ${className} ${classname}) {
@@ -65,7 +65,7 @@ public class ${className}Controller {
     * @param ${pk.lowerAttrName} id
     * @return R
     */
-    @ApiOperation(value = "通过id查询", notes = "通过id查询")
+    @Operation(summary = "通过id查询", description = "通过id查询")
    @GetMapping("/{${pk.lowerAttrName}}" )
    @PreAuthorize("@pms.hasPermission('${moduleName}_${pathName}_view')" )
    public R getById(@PathVariable("${pk.lowerAttrName}" ) ${pk.attrType} ${pk.lowerAttrName}) {
@@ -77,7 +77,7 @@ public class ${className}Controller {
     * @param ${classname} ${comments}
     * @return R
     */
-    @ApiOperation(value = "新增${comments}", notes = "新增${comments}")
+    @Operation(summary = "新增${comments}", description = "新增${comments}")
    @SysLog("新增${comments}" )
    @PostMapping
    @PreAuthorize("@pms.hasPermission('${moduleName}_${pathName}_add')" )
@@ -90,7 +90,7 @@ public class ${className}Controller {
     * @param ${classname} ${comments}
     * @return R
     */
-    @ApiOperation(value = "修改${comments}", notes = "修改${comments}")
+    @Operation(summary = "修改${comments}", description = "修改${comments}")
    @SysLog("修改${comments}" )
    @PutMapping
    @PreAuthorize("@pms.hasPermission('${moduleName}_${pathName}_edit')" )
@@ -103,7 +103,7 @@ public class ${className}Controller {
     * @param ${pk.lowerAttrName} id
     * @return R
     */
-    @ApiOperation(value = "通过id删除${comments}", notes = "通过id删除${comments}")
+    @Operation(summary = "通过id删除${comments}", description = "通过id删除${comments}")
    @SysLog("通过id删除${comments}" )
    @DeleteMapping("/{${pk.lowerAttrName}}" )
    @PreAuthorize("@pms.hasPermission('${moduleName}_${pathName}_del')" )
@@ -41,7 +41,7 @@ import java.time.LocalDateTime;
@Data
@TableName("${tableName}")
@EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "${comments}")
+@Schema(description = "${comments}")
 public class ${className} extends Model<${className}> {

    private static final long serialVersionUID = 1L;
@@ -53,7 +53,7 @@ public class ${className} extends Model<${className}> {
 #if($column.columnName == $pk.columnName)
    @TableId(type = IdType.ASSIGN_ID)
 #end
-    @ApiModelProperty(value="$column.comments"#if($column.hidden),hidden=$column.hidden#end)
+    @Schema(value="$column.comments"#if($column.hidden),hidden=$column.hidden#end)
    private $column.attrType $column.lowerAttrName;

 #end
@@ -47,10 +47,6 @@
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-common-job</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>com.pig4cloud</groupId>
-			<artifactId>pigx-common-swagger</artifactId>
-		</dependency>
 		<!--数据库-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
@@ -20,7 +20,6 @@ package com.pig4cloud.pigx.daemon.elastic;
 import com.pig4cloud.pigx.common.feign.annotation.EnablePigxFeignClients;
 import com.pig4cloud.pigx.common.job.annotation.EnablePigxXxlJob;
 import com.pig4cloud.pigx.common.security.annotation.EnablePigxResourceServer;
-import com.pig4cloud.pigx.common.swagger.annotation.EnablePigxSwagger2;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
@@ -30,7 +29,6 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 * @date 2018/7/24 分布式任务调度模块
 */
@EnablePigxXxlJob
-@EnablePigxSwagger2
@EnablePigxFeignClients
@EnablePigxResourceServer
@EnableDiscoveryClient
@@ -2,7 +2,7 @@ package com.pig4cloud.pigx.daemon.quartz;

 import com.pig4cloud.pigx.common.feign.annotation.EnablePigxFeignClients;
 import com.pig4cloud.pigx.common.security.annotation.EnablePigxResourceServer;
-import com.pig4cloud.pigx.common.swagger.annotation.EnablePigxSwagger2;
+import com.pig4cloud.pigx.common.swagger.annotation.EnableOpenApi;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
@@ -11,7 +11,7 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 * @author frwcloud
 * @date 2019/01/23 定时任务模块
 */
-@EnablePigxSwagger2
+@EnableOpenApi("job")
@EnablePigxFeignClients
@EnablePigxResourceServer
@EnableDiscoveryClient
@@ -29,10 +29,12 @@ import com.pig4cloud.pigx.daemon.quartz.entity.SysJobLog;
 import com.pig4cloud.pigx.daemon.quartz.service.SysJobLogService;
 import com.pig4cloud.pigx.daemon.quartz.service.SysJobService;
 import com.pig4cloud.pigx.daemon.quartz.util.TaskUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.AllArgsConstructor;
 import org.quartz.Scheduler;
+import org.springframework.http.HttpHeaders;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

@@ -47,7 +49,8 @@ import static com.pig4cloud.pigx.daemon.quartz.constants.PigxQuartzEnum.*;
@RestController
@AllArgsConstructor
@RequestMapping("/sys-job")
-@Api(value = "sys-job", tags = "定时任务")
+@Tag(description  = "sys-job", name =  "定时任务")
+@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
 public class SysJobController {

 	private final SysJobService sysJobService;
@@ -65,7 +68,7 @@ public class SysJobController {
 	 * @return
 	 */
 	@GetMapping("/page")
-	@ApiOperation(value = "分页定时业务查询")
+	@Operation(summary = "分页定时业务查询")
 	public R getSysJobPage(Page page, SysJob sysJob) {
 		return R.ok(sysJobService.page(page, Wrappers.query(sysJob)));
 	}
@@ -76,7 +79,7 @@ public class SysJobController {
 	 * @return R
 	 */
 	@GetMapping("/{id}")
-	@ApiOperation(value = "唯一标识查询定时任务")
+	@Operation(summary = "唯一标识查询定时任务")
 	public R getById(@PathVariable("id") Long id) {
 		return R.ok(sysJobService.getById(id));
 	}
@@ -89,7 +92,7 @@ public class SysJobController {
 	@SysLog("新增定时任务")
 	@PostMapping
 	@PreAuthorize("@pms.hasPermission('job_sys_job_add')")
-	@ApiOperation(value = "新增定时任务")
+	@Operation(summary = "新增定时任务")
 	public R save(@RequestBody SysJob sysJob) {
 		sysJob.setJobStatus(JOB_STATUS_RELEASE.getType());
 		sysJob.setCreateBy(SecurityUtils.getUser().getUsername());
@@ -104,7 +107,7 @@ public class SysJobController {
 	@SysLog("修改定时任务")
 	@PutMapping
 	@PreAuthorize("@pms.hasPermission('job_sys_job_edit')")
-	@ApiOperation(value = "修改定时任务")
+	@Operation(summary = "修改定时任务")
 	public R updateById(@RequestBody SysJob sysJob) {
 		sysJob.setUpdateBy(SecurityUtils.getUser().getUsername());
 		SysJob querySysJob = this.sysJobService.getById(sysJob.getJobId());
@@ -126,7 +129,7 @@ public class SysJobController {
 	@SysLog("删除定时任务")
 	@DeleteMapping("/{id}")
 	@PreAuthorize("@pms.hasPermission('job_sys_job_del')")
-	@ApiOperation(value = "唯一标识查询定时任务，暂停任务才能删除")
+	@Operation(summary = "唯一标识查询定时任务，暂停任务才能删除")
 	public R removeById(@PathVariable Long id) {
 		SysJob querySysJob = this.sysJobService.getById(id);
 		if (JOB_STATUS_NOT_RUNNING.getType().equals(querySysJob.getJobStatus())) {
@@ -146,7 +149,7 @@ public class SysJobController {
 	@SysLog("暂停全部定时任务")
 	@PostMapping("/shutdown-jobs")
 	@PreAuthorize("@pms.hasPermission('job_sys_job_shutdown_job')")
-	@ApiOperation(value = "暂停全部定时任务")
+	@Operation(summary = "暂停全部定时任务")
 	public R shutdownJobs() {
 		taskUtil.pauseJobs(scheduler);
 		long count = this.sysJobService
@@ -169,7 +172,7 @@ public class SysJobController {
 	@SysLog("启动全部定时任务")
 	@PostMapping("/start-jobs")
 	@PreAuthorize("@pms.hasPermission('job_sys_job_start_job')")
-	@ApiOperation(value = "启动全部定时任务")
+	@Operation(summary = "启动全部定时任务")
 	public R startJobs() {
 		// 更新定时任务状态条件，暂停状态3更新为运行状态2
 		this.sysJobService.update(SysJob.builder().jobStatus(JOB_STATUS_RUNNING.getType()).build(),
@@ -185,7 +188,7 @@ public class SysJobController {
 	@SysLog("刷新全部定时任务")
 	@PostMapping("/refresh-jobs")
 	@PreAuthorize("@pms.hasPermission('job_sys_job_refresh_job')")
-	@ApiOperation(value = "刷新全部定时任务")
+	@Operation(summary = "刷新全部定时任务")
 	public R refreshJobs() {
 		sysJobService.list().forEach((sysjob) -> {
 			if (JOB_STATUS_RELEASE.getType().equals(sysjob.getJobStatus())
@@ -211,7 +214,7 @@ public class SysJobController {
 	@SysLog("启动定时任务")
 	@PostMapping("/start-job/{id}")
 	@PreAuthorize("@pms.hasPermission('job_sys_job_start_job')")
-	@ApiOperation(value = "启动定时任务")
+	@Operation(summary = "启动定时任务")
 	public R startJob(@PathVariable("id") Long jobId) {
 		SysJob querySysJob = this.sysJobService.getById(jobId);
 		if (querySysJob != null && JOB_LOG_STATUS_FAIL.getType().equals(querySysJob.getJobStatus())) {
@@ -233,7 +236,7 @@ public class SysJobController {
 	@SysLog("立刻执行定时任务")
 	@PostMapping("/run-job/{id}")
 	@PreAuthorize("@pms.hasPermission('job_sys_job_run_job')")
-	@ApiOperation(value = "立刻执行定时任务")
+	@Operation(summary = "立刻执行定时任务")
 	public R runJob(@PathVariable("id") Long jobId) {
 		SysJob querySysJob = this.sysJobService.getById(jobId);
 		return TaskUtil.runOnce(scheduler, querySysJob) ? R.ok() : R.failed();
@@ -246,7 +249,7 @@ public class SysJobController {
 	@SysLog("暂停定时任务")
 	@PostMapping("/shutdown-job/{id}")
 	@PreAuthorize("@pms.hasPermission('job_sys_job_shutdown_job')")
-	@ApiOperation(value = "暂停定时任务")
+	@Operation(summary = "暂停定时任务")
 	public R shutdownJob(@PathVariable("id") Long id) {
 		SysJob querySysJob = this.sysJobService.getById(id);
 		// 更新定时任务状态条件，运行状态2更新为暂停状态3
@@ -261,7 +264,7 @@ public class SysJobController {
 	 * @return
 	 */
 	@GetMapping("/job-log")
-	@ApiOperation(value = "唯一标识查询定时执行日志")
+	@Operation(summary = "唯一标识查询定时执行日志")
 	public R getJobLog(Page page, SysJobLog sysJobLog) {
 		return R.ok(sysJobLogService.page(page, Wrappers.query(sysJobLog)));
 	}
@@ -271,7 +274,7 @@ public class SysJobController {
 	 * @return
 	 */
 	@GetMapping("/is-valid-task-name")
-	@ApiOperation(value = "检验任务名称和任务组联合是否唯一")
+	@Operation(summary = "检验任务名称和任务组联合是否唯一")
 	public R isValidTaskName(@RequestParam String jobName, @RequestParam String jobGroup) {
 		return this.sysJobService
 				.count(Wrappers.query(SysJob.builder().jobName(jobName).jobGroup(jobGroup).build())) > 0
@@ -23,9 +23,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.pig4cloud.pigx.common.core.util.R;
 import com.pig4cloud.pigx.daemon.quartz.entity.SysJobLog;
 import com.pig4cloud.pigx.daemon.quartz.service.SysJobLogService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.AllArgsConstructor;
+import org.springframework.http.HttpHeaders;
 import org.springframework.web.bind.annotation.*;

 /**
@@ -36,7 +38,8 @@ import org.springframework.web.bind.annotation.*;
@RestController
@AllArgsConstructor
@RequestMapping("/sys-job-log")
-@Api(value = "sys-job-log", tags = "定时任务日志")
+@Tag(description  = "sys-job-log", name =  "定时任务日志")
+@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
 public class SysJobLogController {

 	private final SysJobLogService sysJobLogService;
@@ -48,13 +51,13 @@ public class SysJobLogController {
 	 * @return
 	 */
 	@GetMapping("/page")
-	@ApiOperation(value = "分页定时任务日志查询")
+	@Operation(summary = "分页定时任务日志查询")
 	public R getSysJobLogPage(Page page, SysJobLog sysJobLog) {
 		return R.ok(sysJobLogService.page(page, Wrappers.query(sysJobLog)));
 	}

 	@DeleteMapping
-	@ApiOperation(value = "批量删除日志")
+	@Operation(summary = "批量删除日志")
 	public R deleteLogs(@RequestBody Long[] logIds) {
 		return R.ok(sysJobLogService.removeBatchByIds(CollUtil.newArrayList(logIds)));
 	}
@@ -22,7 +22,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -39,7 +39,7 @@ import java.time.LocalDateTime;
@Builder
@NoArgsConstructor
@AllArgsConstructor
-@ApiModel(value = "定时任务")
+@Schema(description = "定时任务")
 public class SysJob extends Model<SysJob> {

 	private static final long serialVersionUID = 1L;
@@ -22,7 +22,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -40,7 +40,7 @@ import java.time.LocalDateTime;
@Builder
@NoArgsConstructor
@AllArgsConstructor
-@ApiModel(value = "定时任务日志")
+@Schema(description = "定时任务日志")
 public class SysJobLog extends Model<SysJobLog> {

 	private static final long serialVersionUID = 1L;
@@ -63,11 +63,6 @@
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-common-core</artifactId>
 		</dependency>
-		<!--swagger-->
-		<dependency>
-			<groupId>com.pig4cloud</groupId>
-			<artifactId>pigx-common-swagger</artifactId>
-		</dependency>
 		<!--安全模块-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
@@ -19,7 +19,6 @@ package com.pig4cloud.pigx.mp;

 import com.pig4cloud.pigx.common.feign.annotation.EnablePigxFeignClients;
 import com.pig4cloud.pigx.common.security.annotation.EnablePigxResourceServer;
-import com.pig4cloud.pigx.common.swagger.annotation.EnablePigxSwagger2;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
@@ -28,7 +27,6 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 * @author lengleng
 * @date 2019/03/25 微信公众号管理模块
 */
-@EnablePigxSwagger2
@EnablePigxFeignClients
@EnablePigxResourceServer
@EnableDiscoveryClient
@@ -24,7 +24,6 @@ import org.springframework.data.redis.listener.RedisMessageListenerContainer;

 import javax.annotation.PostConstruct;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -17,7 +17,10 @@ import me.chanjar.weixin.mp.api.WxMpService;
 import me.chanjar.weixin.mp.bean.draft.WxMpAddDraft;
 import me.chanjar.weixin.mp.bean.draft.WxMpDraftArticles;
 import me.chanjar.weixin.mp.bean.draft.WxMpUpdateDraft;
-import me.chanjar.weixin.mp.bean.material.*;
+import me.chanjar.weixin.mp.bean.material.WxMediaImgUploadResult;
+import me.chanjar.weixin.mp.bean.material.WxMpMaterial;
+import me.chanjar.weixin.mp.bean.material.WxMpMaterialFileBatchGetResult;
+import me.chanjar.weixin.mp.bean.material.WxMpMaterialUploadResult;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -2,7 +2,7 @@ package com.pig4cloud.pigx.mp.entity;

 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

@@ -17,7 +17,7 @@ import java.time.LocalDateTime;
@Data
@TableName("wx_msg")
@EqualsAndHashCode(callSuper = true)
-@ApiModel(description = "微信消息")
+@Schema(description =  "微信消息")
 public class WxMsg extends Model<WxMsg> {

 	private static final long serialVersionUID = 1L;
@@ -148,10 +148,6 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>com.pig4cloud</groupId>
-			<artifactId>pigx-common-swagger</artifactId>
-		</dependency>
 		<!--安全模块-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
@@ -19,7 +19,6 @@ package com.pig4cloud.pigx.act;

 import com.pig4cloud.pigx.common.feign.annotation.EnablePigxFeignClients;
 import com.pig4cloud.pigx.common.security.annotation.EnablePigxResourceServer;
-import com.pig4cloud.pigx.common.swagger.annotation.EnablePigxSwagger2;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
@@ -28,7 +27,6 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 * @author lengleng
 * @date 2018/9/25 工作流管理模块
 */
-@EnablePigxSwagger2
@EnablePigxFeignClients
@EnablePigxResourceServer
@EnableDiscoveryClient
@@ -19,7 +19,7 @@ package com.pig4cloud.pigx.pay;

 import com.pig4cloud.pigx.common.feign.annotation.EnablePigxFeignClients;
 import com.pig4cloud.pigx.common.security.annotation.EnablePigxResourceServer;
-import com.pig4cloud.pigx.common.swagger.annotation.EnablePigxSwagger2;
+import com.pig4cloud.pigx.common.swagger.annotation.EnableOpenApi;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
@@ -30,7 +30,7 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 * <p>
 * 支付模块
 */
-@EnablePigxSwagger2
+@EnableOpenApi("pay")
@EnablePigxFeignClients
@EnableDiscoveryClient
@EnablePigxResourceServer
@@ -23,8 +23,10 @@ import com.pig4cloud.pigx.common.core.util.R;
 import com.pig4cloud.pigx.common.log.annotation.SysLog;
 import com.pig4cloud.pigx.pay.entity.PayChannel;
 import com.pig4cloud.pigx.pay.service.PayChannelService;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.AllArgsConstructor;
+import org.springframework.http.HttpHeaders;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

@@ -37,7 +39,8 @@ import org.springframework.web.bind.annotation.*;
@RestController
@AllArgsConstructor
@RequestMapping("/paychannel")
-@Api(value = "paychannel", tags = "paychannel管理")
+@Tag(description  = "paychannel", name =  "paychannel管理")
+@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
 public class PayChannelController {

 	private final PayChannelService payChannelService;
@@ -34,7 +34,8 @@ import com.pig4cloud.pigx.pay.service.PayChannelService;
 import com.pig4cloud.pigx.pay.service.PayGoodsOrderService;
 import com.pig4cloud.pigx.pay.utils.PayChannelNameEnum;
 import com.pig4cloud.pigx.pay.utils.PayConstants;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.AllArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
@@ -63,7 +64,8 @@ import java.util.Map;
@Controller
@AllArgsConstructor
@RequestMapping("/goods")
-@Api(value = "goods", tags = "商品订单管理")
+@Tag(description  = "goods", name =  "商品订单管理")
+@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
 public class PayGoodsOrderController {

 	private final PayGoodsOrderService payGoodsOrderService;
@@ -29,10 +29,12 @@ import com.pig4cloud.pigx.common.xss.core.XssCleanIgnore;
 import com.pig4cloud.pigx.pay.entity.PayNotifyRecord;
 import com.pig4cloud.pigx.pay.handler.PayNotifyCallbakHandler;
 import com.pig4cloud.pigx.pay.service.PayNotifyRecordService;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.AllArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpHeaders;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

@@ -50,7 +52,8 @@ import java.util.Map;
@RestController
@AllArgsConstructor
@RequestMapping("/notify")
-@Api(value = "notify", tags = "notify管理")
+@Tag(description  = "notify", name =  "notify管理")
+@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
 public class PayNotifyRecordController {

 	private final PayNotifyRecordService payNotifyRecordService;
@@ -23,8 +23,10 @@ import com.pig4cloud.pigx.common.core.util.R;
 import com.pig4cloud.pigx.common.log.annotation.SysLog;
 import com.pig4cloud.pigx.pay.entity.PayRefundOrder;
 import com.pig4cloud.pigx.pay.service.PayRefundOrderService;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.AllArgsConstructor;
+import org.springframework.http.HttpHeaders;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

@@ -37,7 +39,8 @@ import org.springframework.web.bind.annotation.*;
@RestController
@AllArgsConstructor
@RequestMapping("/payrefundorder")
-@Api(value = "payrefundorder", tags = "payrefundorder管理")
+@Tag(description  = "payrefundorder", name =  "payrefundorder管理")
+@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
 public class PayRefundOrderController {

 	private final PayRefundOrderService payRefundOrderService;
@@ -23,8 +23,10 @@ import com.pig4cloud.pigx.common.core.util.R;
 import com.pig4cloud.pigx.common.log.annotation.SysLog;
 import com.pig4cloud.pigx.pay.entity.PayTradeOrder;
 import com.pig4cloud.pigx.pay.service.PayTradeOrderService;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.AllArgsConstructor;
+import org.springframework.http.HttpHeaders;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

@@ -37,7 +39,8 @@ import org.springframework.web.bind.annotation.*;
@RestController
@AllArgsConstructor
@RequestMapping("/order")
-@Api(value = "order", tags = "订单")
+@Tag(description  = "order", name =  "订单")
+@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
 public class PayTradeOrderController {

 	private final PayTradeOrderService payTradeOrderService;
@@ -20,7 +20,7 @@ package com.pig4cloud.pigx.pay.entity;
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.pig4cloud.pigx.common.core.sensitive.Sensitive;
-import io.swagger.annotations.ApiModel;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

@@ -35,7 +35,7 @@ import java.time.LocalDateTime;
@Data
@TableName("pay_channel")
@EqualsAndHashCode(callSuper = true)
-@ApiModel(description = "渠道")
+@Schema(description =  "渠道")
 public class PayChannel extends Model<PayChannel> {

 	private static final long serialVersionUID = 1L;
@@ -19,7 +19,7 @@ package com.pig4cloud.pigx.pay.entity;

 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

@@ -34,7 +34,7 @@ import java.time.LocalDateTime;
@Data
@TableName("pay_goods_order")
@EqualsAndHashCode(callSuper = true)
-@ApiModel(description = "商品")
+@Schema(description =  "商品")
 public class PayGoodsOrder extends Model<PayGoodsOrder> {

 	private static final long serialVersionUID = 1L;
@@ -19,7 +19,7 @@ package com.pig4cloud.pigx.pay.entity;

 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

@@ -34,7 +34,7 @@ import java.time.LocalDateTime;
@Data
@TableName("pay_notify_record")
@EqualsAndHashCode(callSuper = true)
-@ApiModel(description = "异步通知记录")
+@Schema(description =  "异步通知记录")
 public class PayNotifyRecord extends Model<PayNotifyRecord> {

 	private static final long serialVersionUID = 1L;
@@ -19,7 +19,7 @@ package com.pig4cloud.pigx.pay.entity;

 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

@@ -34,7 +34,7 @@ import java.time.LocalDateTime;
@Data
@TableName("pay_refund_order")
@EqualsAndHashCode(callSuper = true)
-@ApiModel(description = "退款")
+@Schema(description =  "退款")
 public class PayRefundOrder extends Model<PayRefundOrder> {

 	private static final long serialVersionUID = 1L;
@@ -19,7 +19,7 @@ package com.pig4cloud.pigx.pay.entity;

 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

@@ -34,7 +34,7 @@ import java.time.LocalDateTime;
@Data
@TableName("pay_trade_order")
@EqualsAndHashCode(callSuper = true)
-@ApiModel(description = "支付")
+@Schema(description =  "支付")
 public class PayTradeOrder extends Model<PayTradeOrder> {

 	private static final long serialVersionUID = 1L;
@@ -32,6 +32,12 @@
            <groupId>com.anji-plus</groupId>
            <artifactId>spring-boot-gaea</artifactId>
            <version>2.0.3.RELEASE</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>swagger-annotations</artifactId>
+                    <groupId>io.swagger</groupId>
+                </exclusion>
+            </exclusions>
        </dependency>

        <dependency>
@@ -117,6 +123,11 @@
            <groupId>com.alibaba</groupId>
            <artifactId>druid-spring-boot-starter</artifactId>
        </dependency>
+
+        <dependency>
+            <groupId>com.pig4cloud</groupId>
+            <artifactId>pigx-common-swagger</artifactId>
+        </dependency>
    </dependencies>

    <dependencyManagement>
@@ -11,7 +11,7 @@ import com.anjiplus.template.gaea.business.modules.accessauthority.controller.dt
 import com.anjiplus.template.gaea.business.modules.accessauthority.controller.param.AccessAuthorityParam;
 import com.anjiplus.template.gaea.business.modules.accessauthority.dao.entity.AccessAuthority;
 import com.anjiplus.template.gaea.business.modules.accessauthority.service.AccessAuthorityService;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -25,7 +25,7 @@ import java.util.List;
 * @date 2019-02-17 08:50:10.009
 **/
@RestController
-@Api(tags = "权限管理管理")
+@Tag(name =  "权限管理管理")
@RequestMapping("/accessAuthority")
@Permission(code = "authorityManage", name = "权限管理")
 public class AccessAuthorityController
@@ -2,7 +2,7 @@
 package com.anjiplus.template.gaea.business.modules.accessauthority.controller.dto;

 import com.anji.plus.gaea.curd.dto.GaeaBaseDTO;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

 import javax.validation.constraints.NotEmpty;
@@ -18,39 +18,39 @@ import java.io.Serializable;
 public class AccessAuthorityDto extends GaeaBaseDTO implements Serializable {

 	/** 父菜单代码 */
-	@ApiModelProperty(value = "父菜单代码")
+	@Schema(description = "父菜单代码")
 	private String parentTarget;

 	/** 目标菜单 */
-	@ApiModelProperty(value = "菜单代码")
+	@Schema(description = "菜单代码")
 	@NotEmpty(message = "6002")
 	private String target;

 	/** 目标菜单名称 */
-	@ApiModelProperty(value = "菜单名称")
+	@Schema(description = "菜单名称")
 	@NotEmpty(message = "6002")
 	private String targetName;

 	/** 目标按钮 */
-	@ApiModelProperty(value = "按钮代码")
+	@Schema(description = "按钮代码")
 	@NotEmpty(message = "6002")
 	private String action;

 	/** 目标按钮名称 */
-	@ApiModelProperty(value = "按钮名称")
+	@Schema(description = "按钮名称")
 	@NotEmpty(message = "6002")
 	private String actionName;

 	/** 0--未删除 1--已删除 DIC_NAME=DEL_FLAG */
-	@ApiModelProperty(value = " 0--未删除 1--已删除 DIC_NAME=DEL_FLAG")
+	@Schema(description = " 0--未删除 1--已删除 DIC_NAME=DEL_FLAG")
 	private Integer deleteFlag;

 	/** 0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG */
-	@ApiModelProperty(value = "0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG")
+	@Schema(description = "0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG")
 	@NotNull(message = "6002")
 	private Integer enableFlag;

-	@ApiModelProperty(value = "sort")
+	@Schema(description = "sort")
 	private Integer sort;

 }
@@ -10,7 +10,7 @@ import com.anjiplus.template.gaea.business.modules.accessrole.controller.dto.Acc
 import com.anjiplus.template.gaea.business.modules.accessrole.controller.param.AccessRoleParam;
 import com.anjiplus.template.gaea.business.modules.accessrole.dao.entity.AccessRole;
 import com.anjiplus.template.gaea.business.modules.accessrole.service.AccessRoleService;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

@@ -22,7 +22,7 @@ import java.util.Map;
 * @date 2019-02-17 08:50:14.136
 **/
@RestController
-@Api(tags = "角色管理管理")
+@Tag(name =  "角色管理管理")
@RequestMapping("/accessRole")
@Permission(code = "roleManage", name = "角色管理")
 public class AccessRoleController extends GaeaBaseController<AccessRoleParam, AccessRole, AccessRoleDto> {
@@ -2,7 +2,7 @@
 package com.anjiplus.template.gaea.business.modules.accessrole.controller.dto;

 import com.anji.plus.gaea.curd.dto.GaeaBaseDTO;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

 import javax.validation.constraints.NotEmpty;
@@ -19,21 +19,21 @@ import java.util.List;
 public class AccessRoleDto extends GaeaBaseDTO implements Serializable {

 	/** 角色编码 */
-	@ApiModelProperty(value = "角色编码")
+	@Schema(description = "角色编码")
 	@NotEmpty(message = "6002")
 	private String roleCode;

 	/** 角色名称 */
-	@ApiModelProperty(value = "角色名称")
+	@Schema(description = "角色名称")
 	@NotEmpty(message = "6002")
 	private String roleName;

 	/** 0--未删除 1--已删除 DIC_NAME=DEL_FLAG */
-	@ApiModelProperty(value = " 0--未删除 1--已删除 DIC_NAME=DEL_FLAG")
+	@Schema(description = " 0--未删除 1--已删除 DIC_NAME=DEL_FLAG")
 	private Integer deleteFlag;

 	/** 0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG */
-	@ApiModelProperty(value = "0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG")
+	@Schema(description = "0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG")
 	@NotNull(message = "6002")
 	private Integer enableFlag;

@@ -12,7 +12,7 @@ import com.anjiplus.template.gaea.business.modules.accessuser.controller.dto.Upd
 import com.anjiplus.template.gaea.business.modules.accessuser.controller.param.AccessUserParam;
 import com.anjiplus.template.gaea.business.modules.accessuser.dao.entity.AccessUser;
 import com.anjiplus.template.gaea.business.modules.accessuser.service.AccessUserService;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -25,7 +25,7 @@ import java.util.Map;
 * @date 2019-02-17 08:50:11.902
 **/
@RestController
-@Api(tags = "用户管理管理")
+@Tag(name =  "用户管理管理")
@RequestMapping("/accessUser")
@Permission(code = "userManage", name = "用户管理")
 public class AccessUserController extends GaeaBaseController<AccessUserParam, AccessUser, AccessUserDto> {
@@ -2,7 +2,7 @@
 package com.anjiplus.template.gaea.business.modules.accessuser.controller.dto;

 import com.anji.plus.gaea.curd.dto.GaeaBaseDTO;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

 import javax.validation.constraints.NotEmpty;
@@ -20,42 +20,42 @@ import java.util.List;
 public class AccessUserDto extends GaeaBaseDTO implements Serializable {

 	/**  登录名 */
-	@ApiModelProperty(value = " 登录名")
+	@Schema(description = " 登录名")
 	@NotEmpty(message = "6002")
 	private String loginName;

 	/** 真实用户 */
-	@ApiModelProperty(value = "真实用户")
+	@Schema(description = "真实用户")
 	@NotEmpty(message = "6002")
 	private String realName;

 	/** 手机号码 */
-	@ApiModelProperty(value = "手机号码")
+	@Schema(description = "手机号码")
 	private String phone;

 	/** 用户邮箱 */
-	@ApiModelProperty(value = "用户邮箱")
+	@Schema(description = "用户邮箱")
 	private String email;

 	/** 0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG */
-	@ApiModelProperty(value = "0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG")
+	@Schema(description = "0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG")
 	@NotNull(message = "6002")
 	private Integer enableFlag;

 	/** 0--未删除 1--已删除 DIC_NAME=DEL_FLAG */
-	@ApiModelProperty(value = " 0--未删除 1--已删除 DIC_NAME=DEL_FLAG")
+	@Schema(description = " 0--未删除 1--已删除 DIC_NAME=DEL_FLAG")
 	private Integer deleteFlag;

 	/** 最后一次登录IP */
-	@ApiModelProperty(value = "最后一次登录IP")
+	@Schema(description = "最后一次登录IP")
 	private String lastLoginIp;

 	/** 最后一次登陆时间 */
-	@ApiModelProperty(value = "最后一次登陆时间")
+	@Schema(description = "最后一次登陆时间")
 	private Date lastLoginTime;

 	/** 备注 */
-	@ApiModelProperty(value = "备注")
+	@Schema(description = "备注")
 	private String remark;

 	/** 用户勾选的角色 */
@@ -1,21 +1,20 @@
 package com.anjiplus.template.gaea.business.modules.accessuser.controller.dto;

-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

 import javax.validation.constraints.NotBlank;
 import java.util.List;

-@ApiModel(value = "用户登录")
+@Schema(description = "用户登录")
@Data
 public class GaeaUserDto {

-	@ApiModelProperty(value = "登录名")
+	@Schema(description = "登录名")
 	@NotBlank
 	private String loginName;

-	@ApiModelProperty(value = "密码")
+	@Schema(description = "密码")
 	@NotBlank
 	private String password;

@@ -1,24 +1,23 @@
 package com.anjiplus.template.gaea.business.modules.accessuser.controller.dto;

-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

 import javax.validation.constraints.NotBlank;

-@ApiModel(value = "修改密码")
+@Schema(description = "修改密码")
@Data
 public class UpdatePasswordDto {

-	@ApiModelProperty(value = "旧密码密码")
+	@Schema(description = "旧密码密码")
 	@NotBlank
 	private String oldPassword;

-	@ApiModelProperty(value = "密码")
+	@Schema(description = "密码")
 	@NotBlank
 	private String password;

-	@ApiModelProperty(value = "密码")
+	@Schema(description = "密码")
 	@NotBlank
 	private String confirmPassword;

@@ -9,7 +9,7 @@ import com.anjiplus.template.gaea.business.modules.dashboard.controller.dto.Repo
 import com.anjiplus.template.gaea.business.modules.dashboard.service.ReportDashboardService;
 import com.anjiplus.template.gaea.business.modules.reportshare.controller.dto.ReportShareDto;
 import com.anjiplus.template.gaea.business.modules.reportshare.service.ReportShareService;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
@@ -26,7 +26,7 @@ import javax.servlet.http.HttpServletResponse;
 * @date 2021-04-12 14:52:21.761
 **/
@RestController
-@Api(tags = "大屏设计管理")
+@Tag(name =  "大屏设计管理")
@Permission(code = "bigScreenManage", name = "大屏报表")
@RequestMapping("/reportDashboard")
 public class ReportDashboardController {
@@ -5,7 +5,7 @@ import com.anji.plus.gaea.annotation.Unique;
 import com.anji.plus.gaea.curd.entity.GaeaBaseEntity;
 import com.anjiplus.template.gaea.business.code.ResponseCode;
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

 /**
@@ -17,38 +17,38 @@ import lombok.Data;
@Data
 public class ReportDashboard extends GaeaBaseEntity {

-	@ApiModelProperty(value = "报表编码")
+	@Schema(description = "报表编码")
 	@Unique(code = ResponseCode.REPORT_CODE_ISEXIST)
 	private String reportCode;

-	@ApiModelProperty(value = "看板标题")
+	@Schema(description = "看板标题")
 	private String title;

-	@ApiModelProperty(value = "宽度px")
+	@Schema(description = "宽度px")
 	private Long width;

-	@ApiModelProperty(value = "高度px")
+	@Schema(description = "高度px")
 	private Long height;

-	@ApiModelProperty(value = "背景色")
+	@Schema(description = "背景色")
 	private String backgroundColor;

-	@ApiModelProperty(value = "背景图片")
+	@Schema(description = "背景图片")
 	private String backgroundImage;

-	@ApiModelProperty(value = "工作台中的辅助线")
+	@Schema(description = "工作台中的辅助线")
 	private String presetLine;

-	@ApiModelProperty(value = "自动刷新间隔秒，数据字典REFRESH_TYPE")
+	@Schema(description = "自动刷新间隔秒，数据字典REFRESH_TYPE")
 	private Integer refreshSeconds;

-	@ApiModelProperty(value = "0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG")
+	@Schema(description = "0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG")
 	private Integer enableFlag;

-	@ApiModelProperty(value = " 0--未删除 1--已删除 DIC_NAME=DEL_FLAG")
+	@Schema(description = " 0--未删除 1--已删除 DIC_NAME=DEL_FLAG")
 	private Integer deleteFlag;

-	@ApiModelProperty(value = "排序，降序")
+	@Schema(description = "排序，降序")
 	private Integer sort;

 }
@@ -3,7 +3,7 @@ package com.anjiplus.template.gaea.business.modules.dashboardwidget.dao.entity;

 import com.anji.plus.gaea.curd.entity.GaeaBaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

 /**
@@ -15,36 +15,36 @@ import lombok.Data;
@Data
 public class ReportDashboardWidget extends GaeaBaseEntity {

-	@ApiModelProperty(value = "报表编码")
+	@Schema(description = "报表编码")
 	private String reportCode;

-	@ApiModelProperty(value = "组件类型参考字典DASHBOARD_PANEL_TYPE")
+	@Schema(description = "组件类型参考字典DASHBOARD_PANEL_TYPE")
 	private String type;

-	@ApiModelProperty(value = "组件的渲染属性json")
+	@Schema(description = "组件的渲染属性json")
 	private String setup;

-	@ApiModelProperty(value = "组件的数据属性json")
+	@Schema(description = "组件的数据属性json")
 	private String data;

-	@ApiModelProperty(value = "组件的配置属性json")
+	@Schema(description = "组件的配置属性json")
 	private String collapse;

-	@ApiModelProperty(value = "组件的大小位置属性json")
+	@Schema(description = "组件的大小位置属性json")
 	private String position;

 	private String options;

-	@ApiModelProperty(value = "自动刷新间隔秒")
+	@Schema(description = "自动刷新间隔秒")
 	private Integer refreshSeconds;

-	@ApiModelProperty(value = "0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG")
+	@Schema(description = "0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG")
 	private Integer enableFlag;

-	@ApiModelProperty(value = " 0--未删除 1--已删除 DIC_NAME=DEL_FLAG")
+	@Schema(description = " 0--未删除 1--已删除 DIC_NAME=DEL_FLAG")
 	private Integer deleteFlag;

-	@ApiModelProperty(value = "排序，图层的概念")
+	@Schema(description = "排序，图层的概念")
 	private Long sort;

 }
@@ -14,7 +14,7 @@ import com.anjiplus.template.gaea.business.modules.dataset.controller.param.Data
 import com.anjiplus.template.gaea.business.modules.dataset.controller.param.DataSetTestTransformParam;
 import com.anjiplus.template.gaea.business.modules.dataset.dao.entity.DataSet;
 import com.anjiplus.template.gaea.business.modules.dataset.service.DataSetService;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -27,7 +27,7 @@ import org.springframework.web.bind.annotation.*;
 * @date 2021-03-18 12:11:31.150755900
 **/
@RestController
-@Api(tags = "数据集管理")
+@Tag(name =  "数据集管理")
@Permission(code = "resultsetManage", name = "数据集管理")
@RequestMapping("/dataSet")
 public class DataSetController extends GaeaBaseController<DataSetParam, DataSet, DataSetDto> {
@@ -5,7 +5,7 @@ import com.anji.plus.gaea.annotation.Unique;
 import com.anji.plus.gaea.curd.entity.GaeaBaseEntity;
 import com.anjiplus.template.gaea.business.code.ResponseCode;
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

 /**
@@ -17,32 +17,32 @@ import lombok.Data;
@Data
 public class DataSet extends GaeaBaseEntity {

-	@ApiModelProperty(value = "数据集编码")
+	@Schema(description = "数据集编码")
 	@Unique(code = ResponseCode.SET_CODE_ISEXIST)
 	private String setCode;

-	@ApiModelProperty(value = "数据集名称")
+	@Schema(description = "数据集名称")
 	private String setName;

-	@ApiModelProperty(value = "数据集描述")
+	@Schema(description = "数据集描述")
 	private String setDesc;

-	@ApiModelProperty(value = "数据集类型")
+	@Schema(description = "数据集类型")
 	private String setType;

-	@ApiModelProperty(value = "数据源编码")
+	@Schema(description = "数据源编码")
 	private String sourceCode;

-	@ApiModelProperty(value = "动态查询sql或者接口中的请求体")
+	@Schema(description = "动态查询sql或者接口中的请求体")
 	private String dynSentence;

-	@ApiModelProperty(value = "结果案例")
+	@Schema(description = "结果案例")
 	private String caseResult;

-	@ApiModelProperty(value = "0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG")
+	@Schema(description = "0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG")
 	private Integer enableFlag;

-	@ApiModelProperty(value = "0--未删除 1--已删除 DIC_NAME=DELETE_FLAG")
+	@Schema(description = "0--未删除 1--已删除 DIC_NAME=DELETE_FLAG")
 	private Integer deleteFlag;

 }
@@ -9,7 +9,7 @@ import com.anjiplus.template.gaea.business.modules.datasetparam.controller.param
 import com.anjiplus.template.gaea.business.modules.datasetparam.controller.param.DataSetParamValidationParam;
 import com.anjiplus.template.gaea.business.modules.datasetparam.dao.entity.DataSetParam;
 import com.anjiplus.template.gaea.business.modules.datasetparam.service.DataSetParamService;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RestController;
 * @date 2021-03-18 12:12:33.108033200
 **/
@RestController
-@Api(tags = "数据集动态参数管理")
+@Tag(name =  "数据集动态参数管理")
@RequestMapping("/dataSetParam")
 public class DataSetParamController extends GaeaBaseController<DataSetParamParam, DataSetParam, DataSetParamDto> {

@@ -3,7 +3,7 @@ package com.anjiplus.template.gaea.business.modules.datasetparam.dao.entity;

 import com.anji.plus.gaea.curd.entity.GaeaBaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

 /**
@@ -15,34 +15,34 @@ import lombok.Data;
@Data
 public class DataSetParam extends GaeaBaseEntity {

-	@ApiModelProperty(value = "数据集编码")
+	@Schema(description = "数据集编码")
 	private String setCode;

-	@ApiModelProperty(value = "参数名")
+	@Schema(description = "参数名")
 	private String paramName;

-	@ApiModelProperty(value = "参数描述")
+	@Schema(description = "参数描述")
 	private String paramDesc;

-	@ApiModelProperty(value = "参数类型，字典=")
+	@Schema(description = "参数类型，字典=")
 	private String paramType;

-	@ApiModelProperty(value = "参数示例项")
+	@Schema(description = "参数示例项")
 	private String sampleItem;

-	@ApiModelProperty(value = "0--非必填 1--必填 DIC_NAME=REQUIRED_FLAG")
+	@Schema(description = "0--非必填 1--必填 DIC_NAME=REQUIRED_FLAG")
 	private Integer requiredFlag;

-	@ApiModelProperty(value = "js校验字段值规则，满足校验返回 true")
+	@Schema(description = "js校验字段值规则，满足校验返回 true")
 	private String validationRules;

-	@ApiModelProperty(value = "排序")
+	@Schema(description = "排序")
 	private Integer orderNum;

-	@ApiModelProperty(value = "0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG")
+	@Schema(description = "0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG")
 	private Integer enableFlag;

-	@ApiModelProperty(value = "0--未删除 1--已删除 DIC_NAME=DELETE_FLAG")
+	@Schema(description = "0--未删除 1--已删除 DIC_NAME=DELETE_FLAG")
 	private Integer deleteFlag;

 }
@@ -7,7 +7,7 @@ import com.anjiplus.template.gaea.business.modules.datasettransform.controller.d
 import com.anjiplus.template.gaea.business.modules.datasettransform.controller.param.DataSetTransformParam;
 import com.anjiplus.template.gaea.business.modules.datasettransform.dao.entity.DataSetTransform;
 import com.anjiplus.template.gaea.business.modules.datasettransform.service.DataSetTransformService;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController;
 * @date 2021-03-18 12:13:15.591309400
 **/
@RestController
-@Api(tags = "数据集数据转换管理")
+@Tag(name =  "数据集数据转换管理")
@RequestMapping("/dataSetTransform")
 public class DataSetTransformController
 		extends GaeaBaseController<DataSetTransformParam, DataSetTransform, DataSetTransformDto> {
@@ -3,7 +3,7 @@ package com.anjiplus.template.gaea.business.modules.datasettransform.dao.entity;

 import com.anji.plus.gaea.curd.entity.GaeaBaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

 /**
@@ -15,22 +15,22 @@ import lombok.Data;
@Data
 public class DataSetTransform extends GaeaBaseEntity {

-	@ApiModelProperty(value = "数据集编码")
+	@Schema(description = "数据集编码")
 	private String setCode;

-	@ApiModelProperty(value = "数据转换类型，DIC_NAME=TRANSFORM_TYPE; js，javaBean，字典转换")
+	@Schema(description = "数据转换类型，DIC_NAME=TRANSFORM_TYPE; js，javaBean，字典转换")
 	private String transformType;

-	@ApiModelProperty(value = "数据转换script,处理逻辑")
+	@Schema(description = "数据转换script,处理逻辑")
 	private String transformScript;

-	@ApiModelProperty(value = "排序,执行数据转换顺序")
+	@Schema(description = "排序,执行数据转换顺序")
 	private Integer orderNum;

-	@ApiModelProperty(value = "0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG")
+	@Schema(description = "0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG")
 	private Integer enableFlag;

-	@ApiModelProperty(value = "0--未删除 1--已删除 DIC_NAME=DELETE_FLAG")
+	@Schema(description = "0--未删除 1--已删除 DIC_NAME=DELETE_FLAG")
 	private Integer deleteFlag;

 }
@@ -10,7 +10,7 @@ import com.anjiplus.template.gaea.business.modules.datasource.controller.param.C
 import com.anjiplus.template.gaea.business.modules.datasource.controller.param.DataSourceParam;
 import com.anjiplus.template.gaea.business.modules.datasource.dao.entity.DataSource;
 import com.anjiplus.template.gaea.business.modules.datasource.service.DataSourceService;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*;
 * @date 2021-03-18 12:09:57.728203200
 **/
@RestController
-@Api(tags = "数据源管理")
+@Tag(name =  "数据源管理")
@Permission(code = "datasourceManage", name = "数据源管理")
@RequestMapping("/dataSource")
 public class DataSourceController extends GaeaBaseController<DataSourceParam, DataSource, DataSourceDto> {
@@ -5,7 +5,7 @@ import com.anji.plus.gaea.annotation.Unique;
 import com.anji.plus.gaea.curd.entity.GaeaBaseEntity;
 import com.anjiplus.template.gaea.business.code.ResponseCode;
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

 /**
@@ -17,28 +17,28 @@ import lombok.Data;
@Data
 public class DataSource extends GaeaBaseEntity {

-	@ApiModelProperty(value = "数据源编码")
+	@Schema(description = "数据源编码")
 	@Unique(code = ResponseCode.SOURCE_CODE_ISEXIST)
 	private String sourceCode;

-	@ApiModelProperty(value = "数据源名称")
+	@Schema(description = "数据源名称")
 	private String sourceName;

-	@ApiModelProperty(value = "数据源描述")
+	@Schema(description = "数据源描述")
 	private String sourceDesc;

-	@ApiModelProperty(
-			value = "数据源类型 DIC_NAME=SOURCE_TYPE; mysql，orace，sqlserver，elasticsearch，接口，javaBean，数据源类型字典中item-extend动态生成表单")
+	@Schema(
+			description = "数据源类型 DIC_NAME=SOURCE_TYPE; mysql，orace，sqlserver，elasticsearch，接口，javaBean，数据源类型字典中item-extend动态生成表单")
 	private String sourceType;

-	@ApiModelProperty(
-			value = "数据源连接配置json：关系库{ jdbcUrl:'', username:'', password:'','driverName':''}ES-sql{ apiUrl:'http://127.0.0.1:9092/_xpack/sql?format=json','method':'POST','body':'{\"query\":\"select 1\"}' }  接口{ apiUrl:'http://ip:port/url', method:'' } javaBean{ beanNamw:'xxx' }")
+	@Schema(
+			description = "数据源连接配置json：关系库{ jdbcUrl:'', username:'', password:'','driverName':''}ES-sql{ apiUrl:'http://127.0.0.1:9092/_xpack/sql?format=json','method':'POST','body':'{\"query\":\"select 1\"}' }  接口{ apiUrl:'http://ip:port/url', method:'' } javaBean{ beanNamw:'xxx' }")
 	private String sourceConfig;

-	@ApiModelProperty(value = "0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG")
+	@Schema(description = "0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG")
 	private Integer enableFlag;

-	@ApiModelProperty(value = "0--未删除 1--已删除 DIC_NAME=DELETE_FLAG")
+	@Schema(description = "0--未删除 1--已删除 DIC_NAME=DELETE_FLAG")
 	private Integer deleteFlag;

 }
@@ -10,7 +10,7 @@ import com.anjiplus.template.gaea.business.modules.dict.controller.param.GaeaDic
 import com.anjiplus.template.gaea.business.modules.dict.dao.entity.GaeaDict;
 import com.anjiplus.template.gaea.business.modules.dict.service.GaeaDictItemService;
 import com.anjiplus.template.gaea.business.modules.dict.service.GaeaDictService;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.web.bind.annotation.*;
@@ -28,7 +28,7 @@ import java.util.Map;
 */
@RestController
@RequestMapping("/gaeaDict")
-@Api(value = "/gaeaDict", tags = "")
+@Tag(description  = "/gaeaDict", name =  "")
 public class GaeaDictController extends GaeaBaseController<GaeaDictParam, GaeaDict, GaeaDictDTO> {

 	@Autowired
@@ -6,7 +6,7 @@ import com.anjiplus.template.gaea.business.modules.dict.controller.dto.GaeaDictI
 import com.anjiplus.template.gaea.business.modules.dict.controller.param.GaeaDictItemParam;
 import com.anjiplus.template.gaea.business.modules.dict.dao.entity.GaeaDictItem;
 import com.anjiplus.template.gaea.business.modules.dict.service.GaeaDictItemService;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController;
 */
@RestController
@RequestMapping("/gaeaDictItem")
-@Api(value = "/gaeaDictItem", tags = "数据字典项")
+@Tag(description  = "/gaeaDictItem", name =  "数据字典项")
 public class GaeaDictItemController extends GaeaBaseController<GaeaDictItemParam, GaeaDictItem, GaeaDictItemDTO> {

 	@Autowired
@@ -1,8 +1,7 @@
 package com.anjiplus.template.gaea.business.modules.dict.controller.dto;

 import com.anji.plus.gaea.curd.dto.GaeaBaseDTO;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

 import java.io.Serializable;
@@ -13,26 +12,26 @@ import java.io.Serializable;
 * @author lr
 * @since 2021-02-23 10:01:02
 */
-@ApiModel(value = "")
+@Schema(description = "")
@Data
 public class GaeaDictDTO extends GaeaBaseDTO implements Serializable {

 	/**
 	 * 字典名称
 	 */
-	@ApiModelProperty(value = "字典名称")
+	@Schema(description = "字典名称")
 	private String dictName;

 	/**
 	 * 字典编号
 	 */
-	@ApiModelProperty(value = "字典编号")
+	@Schema(description = "字典编号")
 	private String dictCode;

 	/**
 	 * 字典描述
 	 */
-	@ApiModelProperty(value = "字典描述")
+	@Schema(description = "字典描述")
 	private String remark;

 }
@@ -1,8 +1,7 @@
 package com.anjiplus.template.gaea.business.modules.dict.controller.dto;

 import com.anji.plus.gaea.curd.dto.GaeaBaseDTO;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

 import java.io.Serializable;
@@ -13,50 +12,50 @@ import java.io.Serializable;
 * @author lirui
 * @since 2021-03-10 13:05:59
 */
-@ApiModel(value = "数据字典项")
+@Schema(description = "数据字典项")
@Data
 public class GaeaDictItemDTO extends GaeaBaseDTO implements Serializable {

 	/**
 	 * 数据字典编码
 	 */
-	@ApiModelProperty(value = "数据字典编码")
+	@Schema(description = "数据字典编码")
 	private String dictCode;

 	/**
 	 * 字典项名称
 	 */
-	@ApiModelProperty(value = "字典项名称")
+	@Schema(description = "字典项名称")
 	private String itemName;

 	/**
 	 * 字典项值
 	 */
-	@ApiModelProperty(value = "字典项值")
+	@Schema(description = "字典项值")
 	private String itemValue;

 	/**
 	 * 字典项扩展
 	 */
-	@ApiModelProperty(value = "字典项扩展")
+	@Schema(description = "字典项扩展")
 	private String itemExtend;

 	/**
 	 * 语言标识
 	 */
-	@ApiModelProperty(value = "语言标识")
+	@Schema(description = "语言标识")
 	private String locale;

 	/**
 	 * 描述
 	 */
-	@ApiModelProperty(value = "描述")
+	@Schema(description = "描述")
 	private String remark;

 	/**
 	 * 排序
 	 */
-	@ApiModelProperty(value = "排序")
+	@Schema(description = "排序")
 	private Integer sort;

 	/**
@@ -8,7 +8,7 @@ import com.anjiplus.template.gaea.business.modules.file.controller.dto.GaeaFileD
 import com.anjiplus.template.gaea.business.modules.file.controller.param.GaeaFileParam;
 import com.anjiplus.template.gaea.business.modules.file.entity.GaeaFile;
 import com.anjiplus.template.gaea.business.modules.file.service.GaeaFileService;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -25,7 +25,7 @@ import javax.servlet.http.HttpServletResponse;
 */
@RestController
@RequestMapping("/file")
-@Api(value = "/file", tags = "")
+@Tag(description  = "/file", name =  "")
 public class GaeaFileController extends BaseController<GaeaFileParam, GaeaFile, GaeaFileDTO> {

 	@Autowired
@@ -2,7 +2,7 @@ package com.anjiplus.template.gaea.business.modules.file.entity;

 import com.anji.plus.gaea.curd.entity.GaeaBaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

 import java.io.Serializable;
@@ -17,19 +17,19 @@ import java.io.Serializable;
@Data
 public class GaeaFile extends GaeaBaseEntity implements Serializable {

-	@ApiModelProperty(value = "文件标识")
+	@Schema(description = "文件标识")
 	private String fileId;

-	@ApiModelProperty(value = "文件类型")
+	@Schema(description = "文件类型")
 	private String fileType;

-	@ApiModelProperty(value = "文件路径")
+	@Schema(description = "文件路径")
 	private String filePath;

-	@ApiModelProperty(value = "url路径")
+	@Schema(description = "url路径")
 	private String urlPath;

-	@ApiModelProperty(value = "内容说明")
+	@Schema(description = "内容说明")
 	private String fileInstruction;

 }
@@ -9,7 +9,7 @@ import com.anjiplus.template.gaea.business.modules.report.controller.dto.ReportD
 import com.anjiplus.template.gaea.business.modules.report.controller.param.ReportParam;
 import com.anjiplus.template.gaea.business.modules.report.dao.entity.Report;
 import com.anjiplus.template.gaea.business.modules.report.service.ReportService;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
 * @date 2021/3/26 10:19
 */
@RestController
-@Api(tags = "报表数据管理")
+@Tag(name =  "报表数据管理")
@Permission(code = "reportManage", name = "报表管理")
@RequestMapping("/report")
 public class ReportController extends GaeaBaseController<ReportParam, Report, ReportDto> {
@@ -4,7 +4,7 @@ import com.anji.plus.gaea.annotation.Unique;
 import com.anji.plus.gaea.curd.entity.GaeaBaseEntity;
 import com.anjiplus.template.gaea.business.code.ResponseCode;
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

 /**
@@ -17,35 +17,35 @@ import lombok.Data;
@Data
 public class Report extends GaeaBaseEntity {

-	@ApiModelProperty(value = "名称")
+	@Schema(description = "名称")
 	private String reportName;

-	@ApiModelProperty(value = "报表编码")
+	@Schema(description = "报表编码")
 	@Unique(code = ResponseCode.REPORT_CODE_ISEXIST)
 	private String reportCode;

-	@ApiModelProperty(value = "分组")
+	@Schema(description = "分组")
 	private String reportGroup;

-	@ApiModelProperty(value = "报表描述")
+	@Schema(description = "报表描述")
 	private String reportDesc;

-	@ApiModelProperty(value = "报表类型")
+	@Schema(description = "报表类型")
 	private String reportType;

-	@ApiModelProperty(value = "报表缩略图")
+	@Schema(description = "报表缩略图")
 	private String reportImage;

-	@ApiModelProperty(value = "报表作者")
+	@Schema(description = "报表作者")
 	private String reportAuthor;

-	@ApiModelProperty(value = "下载次数")
+	@Schema(description = "下载次数")
 	private Long downloadCount;

-	@ApiModelProperty(value = "0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG")
+	@Schema(description = "0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG")
 	private Integer enableFlag;

-	@ApiModelProperty(value = "0--未删除 1--已删除 DIC_NAME=DELETE_FLAG")
+	@Schema(description = "0--未删除 1--已删除 DIC_NAME=DELETE_FLAG")
 	private Integer deleteFlag;

 }
@@ -12,7 +12,7 @@ import com.anjiplus.template.gaea.business.modules.reportexcel.dao.entity.Report
 import com.anjiplus.template.gaea.business.modules.reportexcel.service.ReportExcelService;
 import com.anjiplus.template.gaea.business.modules.reportshare.controller.dto.ReportShareDto;
 import com.anjiplus.template.gaea.business.modules.reportshare.service.ReportShareService;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*;
 * @date 2021/4/13 15:12
 */
@RestController
-@Api(tags = "报表表格管理")
+@Tag(name =  "报表表格管理")
@Permission(code = "excelManage", name = "报表管理")
@RequestMapping("/reportExcel")
 public class ReportExcelController extends GaeaBaseController<ReportExcelParam, ReportExcel, ReportExcelDto> {
@@ -2,7 +2,7 @@ package com.anjiplus.template.gaea.business.modules.reportexcel.dao.entity;

 import com.anji.plus.gaea.curd.entity.GaeaBaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

 /**
@@ -13,22 +13,22 @@ import lombok.Data;
@Data
 public class ReportExcel extends GaeaBaseEntity {

-	@ApiModelProperty(value = "报表编码")
+	@Schema(description = "报表编码")
 	private String reportCode;

-	@ApiModelProperty(value = "数据集编码，以|分割")
+	@Schema(description = "数据集编码，以|分割")
 	private String setCodes;

-	@ApiModelProperty(value = "数据集查询参数")
+	@Schema(description = "数据集查询参数")
 	private String setParam;

-	@ApiModelProperty(value = "报表json字符串")
+	@Schema(description = "报表json字符串")
 	private String jsonStr;

-	@ApiModelProperty(value = "0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG")
+	@Schema(description = "0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG")
 	private Integer enableFlag;

-	@ApiModelProperty(value = "0--未删除 1--已删除 DIC_NAME=DELETE_FLAG")
+	@Schema(description = "0--未删除 1--已删除 DIC_NAME=DELETE_FLAG")
 	private Integer deleteFlag;

 }
@@ -12,7 +12,7 @@ import com.anjiplus.template.gaea.business.modules.reportshare.controller.dto.Re
 import com.anjiplus.template.gaea.business.modules.reportshare.controller.param.ReportShareParam;
 import com.anjiplus.template.gaea.business.modules.reportshare.dao.entity.ReportShare;
 import com.anjiplus.template.gaea.business.modules.reportshare.service.ReportShareService;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*;
 * @date 2021-08-18 13:37:26.663
 **/
@RestController
-@Api(tags = "报表分享管理")
+@Tag(name =  "报表分享管理")
@RequestMapping("/reportShare")
@Permission(code = "reportShareManage", name = "报表分享管理")
 public class ReportShareController extends GaeaBaseController<ReportShareParam, ReportShare, ReportShareDto> {
@@ -2,7 +2,7 @@
 package com.anjiplus.template.gaea.business.modules.reportshare.controller.dto;

 import com.anji.plus.gaea.curd.dto.GaeaBaseDTO;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

 import javax.validation.constraints.NotEmpty;
@@ -19,38 +19,38 @@ import java.util.Date;
 public class ReportShareDto extends GaeaBaseDTO implements Serializable {

 	/** 分享编码，系统生成，默认UUID */
-	@ApiModelProperty(value = "分享编码，系统生成，默认UUID")
+	@Schema(description = "分享编码，系统生成，默认UUID")
 	private String shareCode;

 	/** 分享有效期类型，DIC_NAME=SHARE_VAILD */
-	@ApiModelProperty(value = "分享有效期类型，DIC_NAME=SHARE_VAILD")
+	@Schema(description = "分享有效期类型，DIC_NAME=SHARE_VAILD")
 	@NotNull(message = "6002")
 	private Integer shareValidType;

 	/** 分享有效期 */
-	@ApiModelProperty(value = "分享有效期")
+	@Schema(description = "分享有效期")
 	private Date shareValidTime;

 	/** 分享token */
-	@ApiModelProperty(value = "分享token")
+	@Schema(description = "分享token")
 	private String shareToken;

 	/** 分享url */
-	@ApiModelProperty(value = "分享url")
+	@Schema(description = "分享url")
 	@NotEmpty(message = "6002")
 	private String shareUrl;

 	/** 报表编码 */
-	@ApiModelProperty(value = "报表编码")
+	@Schema(description = "报表编码")
 	@NotEmpty(message = "6002")
 	private String reportCode;

 	/** 0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG */
-	@ApiModelProperty(value = "0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG")
+	@Schema(description = "0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG")
 	private Integer enableFlag;

 	/** 0--未删除 1--已删除 DIC_NAME=DELETE_FLAG */
-	@ApiModelProperty(value = "0--未删除 1--已删除 DIC_NAME=DELETE_FLAG")
+	@Schema(description = "0--未删除 1--已删除 DIC_NAME=DELETE_FLAG")
 	private Integer deleteFlag;

 	/** 分享码 */