diff --git a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/dto/AppUserDTO.java b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/dto/AppUserDTO.java index 237e2c19f..6b5c02894 100644 --- a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/dto/AppUserDTO.java +++ b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/dto/AppUserDTO.java @@ -1,22 +1,21 @@ package com.pig4cloud.pigx.app.api.dto; import com.pig4cloud.pigx.app.api.entity.AppUser; -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 java.util.List; @Data -@ApiModel(value = "APP用户传输对象") +@Schema(description = "APP用户传输对象") @EqualsAndHashCode(callSuper = true) public class AppUserDTO extends AppUser { /** * 角色ID */ - @ApiModelProperty(value = "角色id集合") + @Schema(description = "角色id集合") private List role; } diff --git a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/dto/AppUserInfo.java b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/dto/AppUserInfo.java index 07188837d..68fd258bf 100644 --- a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/dto/AppUserInfo.java +++ b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/dto/AppUserInfo.java @@ -20,8 +20,7 @@ package com.pig4cloud.pigx.app.api.dto; import com.pig4cloud.pigx.app.api.entity.AppUser; -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; @@ -31,25 +30,25 @@ import java.io.Serializable; * @date 2017/11/11 */ @Data -@ApiModel(value = "用户信息") +@Schema(description = "用户信息") public class AppUserInfo implements Serializable { /** * 用户基本信息 */ - @ApiModelProperty(value = "用户基本信息") + @Schema(description = "用户基本信息") private AppUser appUser; /** * 权限标识集合 */ - @ApiModelProperty(value = "权限标识集合") + @Schema(description = "权限标识集合") private String[] permissions; /** * 角色集合 */ - @ApiModelProperty(value = "角色标识集合") + @Schema(description = "角色标识集合") private Long[] roles; } diff --git a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppMenu.java b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppMenu.java index 600905885..03f6201c6 100644 --- a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppMenu.java +++ b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppMenu.java @@ -21,8 +21,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; 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; @@ -37,7 +36,7 @@ import java.time.LocalDateTime; @Data @TableName("app_menu") @EqualsAndHashCode(callSuper = true) -@ApiModel(value = "菜单权限表") +@Schema(description = "菜单权限表") public class AppMenu extends Model { private static final long serialVersionUID = 1L; @@ -46,85 +45,85 @@ public class AppMenu extends Model { * 菜单ID */ @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "菜单ID") + @Schema(description = "菜单ID") private Long menuId; /** * name */ - @ApiModelProperty(value = "name") + @Schema(description = "name") private String name; /** * permission */ - @ApiModelProperty(value = "permission") + @Schema(description = "permission") private String permission; /** * path */ - @ApiModelProperty(value = "path") + @Schema(description = "path") private String path; /** * 父菜单ID */ - @ApiModelProperty(value = "父菜单ID") + @Schema(description = "父菜单ID") private Long parentId; /** * 是否显示 */ - @ApiModelProperty(value = "是否显示") + @Schema(description = "是否显示") private String visible; /** * 排序值 */ - @ApiModelProperty(value = "排序值") + @Schema(description = "排序值") private Integer sortOrder; /** * menuType */ - @ApiModelProperty(value = "menuType") + @Schema(description = "menuType") private String menuType; /** * 创建人 */ - @ApiModelProperty(value = "创建人") + @Schema(description = "创建人") private String createBy; /** * 创建时间 */ - @ApiModelProperty(value = "创建时间") + @Schema(description = "创建时间") private LocalDateTime createTime; /** * 修改人 */ - @ApiModelProperty(value = "修改人") + @Schema(description = "修改人") private String updateBy; /** * 更新时间 */ - @ApiModelProperty(value = "更新时间") + @Schema(description = "更新时间") private LocalDateTime updateTime; /** * delFlag */ - @ApiModelProperty(value = "delFlag") + @Schema(description = "delFlag") private String delFlag; /** * 租户ID */ - @ApiModelProperty(value = "租户ID", hidden = true) + @Schema(description = "租户ID", hidden = true) private Long tenantId; } diff --git a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppRole.java b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppRole.java index ccf9e312d..ed34378bc 100644 --- a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppRole.java +++ b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppRole.java @@ -21,8 +21,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; 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; @@ -37,7 +36,7 @@ import java.time.LocalDateTime; @Data @TableName("app_role") @EqualsAndHashCode(callSuper = true) -@ApiModel(value = "app角色表") +@Schema(description = "app角色表") public class AppRole extends Model { private static final long serialVersionUID = 1L; @@ -46,61 +45,61 @@ public class AppRole extends Model { * roleId */ @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "roleId") + @Schema(description = "roleId") private Long roleId; /** * roleName */ - @ApiModelProperty(value = "roleName") + @Schema(description = "roleName") private String roleName; /** * roleCode */ - @ApiModelProperty(value = "roleCode") + @Schema(description = "roleCode") private String roleCode; /** * roleDesc */ - @ApiModelProperty(value = "roleDesc") + @Schema(description = "roleDesc") private String roleDesc; /** * 创建人 */ - @ApiModelProperty(value = "创建人") + @Schema(description = "创建人") private String createBy; /** * 修改人 */ - @ApiModelProperty(value = "修改人") + @Schema(description = "修改人") private String updateBy; /** * createTime */ - @ApiModelProperty(value = "createTime") + @Schema(description = "createTime") private LocalDateTime createTime; /** * updateTime */ - @ApiModelProperty(value = "updateTime") + @Schema(description = "updateTime") private LocalDateTime updateTime; /** * delFlag */ - @ApiModelProperty(value = "delFlag") + @Schema(description = "delFlag") private String delFlag; /** * tenantId */ - @ApiModelProperty(value = "tenantId", hidden = true) + @Schema(description = "tenantId", hidden = true) private Long tenantId; } diff --git a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppRoleMenu.java b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppRoleMenu.java index 28e650023..208191037 100644 --- a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppRoleMenu.java +++ b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppRoleMenu.java @@ -21,8 +21,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; 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 lombok.EqualsAndHashCode; @Data @TableName("app_role_menu") @EqualsAndHashCode(callSuper = true) -@ApiModel(value = "角色菜单表") +@Schema(description = "角色菜单表") public class AppRoleMenu extends Model { private static final long serialVersionUID = 1L; @@ -44,13 +43,13 @@ public class AppRoleMenu extends Model { * 角色ID */ @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "角色ID") + @Schema(description = "角色ID") private Long roleId; /** * 菜单ID */ - @ApiModelProperty(value = "菜单ID") + @Schema(description = "菜单ID") private Long menuId; } diff --git a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppSocialDetails.java b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppSocialDetails.java index 3ac236583..f61781e9d 100644 --- a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppSocialDetails.java +++ b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppSocialDetails.java @@ -21,8 +21,7 @@ import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.pig4cloud.pigx.common.core.sensitive.Sensitive; import com.pig4cloud.pigx.common.core.util.ValidGroup; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -33,7 +32,7 @@ import java.time.LocalDateTime; * app 社交账号登录 */ @Data -@ApiModel(value = "第三方账号信息") +@Schema(description = "第三方账号信息") @EqualsAndHashCode(callSuper = true) public class AppSocialDetails extends Model { @@ -43,20 +42,20 @@ public class AppSocialDetails extends Model { * 主鍵 */ @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键") + @Schema(description = "主键") private Long id; /** * 类型 */ @NotBlank(message = "类型不能为空") - @ApiModelProperty(value = "账号类型") + @Schema(description = "账号类型") private String type; /** * 描述 */ - @ApiModelProperty(value = "描述") + @Schema(description = "描述") private String remark; /** @@ -64,7 +63,7 @@ public class AppSocialDetails extends Model { */ @Sensitive(prefixNoMaskLen = 4, suffixNoMaskLen = 4) @NotBlank(message = "账号不能为空") - @ApiModelProperty(value = "appId") + @Schema(description = "appId") private String appId; /** @@ -72,46 +71,46 @@ public class AppSocialDetails extends Model { */ @Sensitive(prefixNoMaskLen = 9, suffixNoMaskLen = 9) @NotBlank(message = "密钥不能为空", groups = { ValidGroup.Insert.class }) - @ApiModelProperty(value = "app secret") + @Schema(description = "app secret") private String appSecret; /** * 回调地址 */ - @ApiModelProperty(value = "回调地址") + @Schema(description = "回调地址") private String redirectUrl; /** * 拓展字段 */ - @ApiModelProperty(value = "拓展字段") + @Schema(description = "拓展字段") private String ext; /** * 创建人 */ @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "创建人") + @Schema(description = "创建人") private String createBy; /** * 修改人 */ @TableField(fill = FieldFill.UPDATE) - @ApiModelProperty(value = "修改人") + @Schema(description = "修改人") private String updateBy; /** * 创建时间 */ - @ApiModelProperty(value = "创建时间") + @Schema(description = "创建时间") @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; /** * 更新时间 */ - @ApiModelProperty(value = "更新时间") + @Schema(description = "更新时间") @TableField(fill = FieldFill.UPDATE) private LocalDateTime updateTime; @@ -120,7 +119,7 @@ public class AppSocialDetails extends Model { */ @TableLogic @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "删除标记,1:已删除,0:正常") + @Schema(description = "删除标记,1:已删除,0:正常") private String delFlag; } diff --git a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppUser.java b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppUser.java index 401512a8b..12f5d5e63 100644 --- a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppUser.java +++ b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppUser.java @@ -20,8 +20,7 @@ package com.pig4cloud.pigx.app.api.entity; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; 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 lombok.EqualsAndHashCode; @@ -36,7 +35,7 @@ import java.time.LocalDateTime; @Data @TableName("app_user") @EqualsAndHashCode(callSuper = true) -@ApiModel(value = "app用户表") +@Schema(description = "app用户表") public class AppUser extends Model { private static final long serialVersionUID = 1L; @@ -45,90 +44,90 @@ public class AppUser extends Model { * userId */ @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "userId") + @Schema(description = "userId") private Long userId; /** * 用户名 */ - @ApiModelProperty(value = "用户名") + @Schema(description = "用户名") private String username; /** * 密码 */ - @ApiModelProperty(value = "密码") + @Schema(description = "密码") private String password; /** * 随机盐 */ @JsonIgnore - @ApiModelProperty(value = "随机盐") + @Schema(description = "随机盐") private String salt; /** * 手机号 */ - @ApiModelProperty(value = "手机号") + @Schema(description = "手机号") private String phone; /** * 头像 */ - @ApiModelProperty(value = "头像") + @Schema(description = "头像") private String avatar; /** * 昵称 */ - @ApiModelProperty(value = "拓展字段:昵称") + @Schema(description = "拓展字段:昵称") private String nickname; /** * 姓名 */ - @ApiModelProperty(value = "拓展字段:姓名") + @Schema(description = "拓展字段:姓名") private String name; /** * 邮箱 */ - @ApiModelProperty(value = "拓展字段:邮箱") + @Schema(description = "拓展字段:邮箱") private String email; /** * 创建人 */ - @ApiModelProperty(value = "创建人") + @Schema(description = "创建人") @TableField(fill = FieldFill.INSERT) private String createBy; /** * 修改人 */ - @ApiModelProperty(value = "修改人") + @Schema(description = "修改人") @TableField(fill = FieldFill.UPDATE) private String updateBy; /** * 创建时间 */ - @ApiModelProperty(value = "创建时间") + @Schema(description = "创建时间") @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; /** * 修改时间 */ - @ApiModelProperty(value = "修改时间") + @Schema(description = "修改时间") @TableField(fill = FieldFill.UPDATE) private LocalDateTime updateTime; /** * 删除标记 */ - @ApiModelProperty(value = "删除标记,1:已删除,0:正常") + @Schema(description = "删除标记,1:已删除,0:正常") @TableField(fill = FieldFill.INSERT) @TableLogic private String delFlag; @@ -136,25 +135,25 @@ public class AppUser extends Model { /** * 所属租户 */ - @ApiModelProperty(value = "所属租户", hidden = true) + @Schema(description = "所属租户", hidden = true) private Long tenantId; /** * 最后一次密码修改时间 */ - @ApiModelProperty(value = "最后一次密码修改时间") + @Schema(description = "最后一次密码修改时间") private LocalDateTime lastModifiedTime; /** * 锁定标记 */ - @ApiModelProperty(value = "锁定标记") + @Schema(description = "锁定标记") private String lockFlag; /** * 微信小程序登录openId */ - @ApiModelProperty(value = "微信小程序登录openId") + @Schema(description = "微信小程序登录openId") private String wxOpenid; } diff --git a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppUserRole.java b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppUserRole.java index 0e2eea27c..1de90b88d 100644 --- a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppUserRole.java +++ b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppUserRole.java @@ -21,8 +21,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; 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 lombok.EqualsAndHashCode; @Data @TableName("app_user_role") @EqualsAndHashCode(callSuper = true) -@ApiModel(value = "用户角色表") +@Schema(description = "用户角色表") public class AppUserRole extends Model { private static final long serialVersionUID = 1L; @@ -44,13 +43,13 @@ public class AppUserRole extends Model { * 用户ID */ @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "用户ID") + @Schema(description = "用户ID") private Long userId; /** * 角色ID */ - @ApiModelProperty(value = "角色ID") + @Schema(description = "角色ID") private Long roleId; } diff --git a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/vo/AppRoleVO.java b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/vo/AppRoleVO.java index 6cfb2390d..89532b06d 100644 --- a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/vo/AppRoleVO.java +++ b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/vo/AppRoleVO.java @@ -17,7 +17,7 @@ package com.pig4cloud.pigx.app.api.vo; -import io.swagger.annotations.ApiModel; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; /** @@ -25,7 +25,7 @@ import lombok.Data; * @date 2020/2/10 */ @Data -@ApiModel(value = "前端角色展示对象") +@Schema(description = "前端角色展示对象") public class AppRoleVO { /** diff --git a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/vo/AppUserVo.java b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/vo/AppUserVo.java index 2b7a4fa08..8371b326a 100644 --- a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/vo/AppUserVo.java +++ b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/vo/AppUserVo.java @@ -3,7 +3,7 @@ package com.pig4cloud.pigx.app.api.vo; import com.pig4cloud.pigx.app.api.entity.AppRole; import com.pig4cloud.pigx.common.core.sensitive.Sensitive; import com.pig4cloud.pigx.common.core.sensitive.SensitiveTypeEnum; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serializable; @@ -16,86 +16,86 @@ public class AppUserVo implements Serializable { /** * 主键 */ - @ApiModelProperty(value = "主键") + @Schema(description = "主键") private Long userId; /** * 用户名 */ - @ApiModelProperty(value = "用户名") + @Schema(description = "用户名") private String username; /** * 密码 */ - @ApiModelProperty(value = "密码") + @Schema(description = "密码") private String password; /** * 手机号 */ - @ApiModelProperty(value = "手机号") + @Schema(description = "手机号") @Sensitive(type = SensitiveTypeEnum.MOBILE_PHONE) private String phone; /** * 头像 */ - @ApiModelProperty(value = "头像") + @Schema(description = "头像") private String avatar; /** * 昵称 */ - @ApiModelProperty(value = "拓展字段:昵称") + @Schema(description = "拓展字段:昵称") private String nickname; /** * 姓名 */ - @ApiModelProperty(value = "拓展字段:姓名") + @Schema(description = "拓展字段:姓名") private String name; /** * 邮箱 */ - @ApiModelProperty(value = "拓展字段:邮箱") + @Schema(description = "拓展字段:邮箱") private String email; /** * 创建时间 */ - @ApiModelProperty(value = "创建时间") + @Schema(description = "创建时间") private LocalDateTime createTime; /** * 删除标记 */ - @ApiModelProperty(value = "删除标记,1:已删除,0:正常") + @Schema(description = "删除标记,1:已删除,0:正常") private String delFlag; /** * 所属租户 */ - @ApiModelProperty(value = "所属租户") + @Schema(description = "所属租户") private Long tenantId; /** * 最后一次密码修改时间 */ - @ApiModelProperty(value = "最后一次密码修改时间") + @Schema(description = "最后一次密码修改时间") private LocalDateTime lastModifiedTime; /** * 锁定标记 */ - @ApiModelProperty(value = "锁定标记") + @Schema(description = "锁定标记") private String lockFlag; /** * 角色列表 */ - @ApiModelProperty(value = "拥有的角色列表") + @Schema(description = "拥有的角色列表") private List roleList; } diff --git a/pigx-app-server/pigx-app-server-biz/pom.xml b/pigx-app-server/pigx-app-server-biz/pom.xml index fdc178d05..6a4d36eb0 100644 --- a/pigx-app-server/pigx-app-server-biz/pom.xml +++ b/pigx-app-server/pigx-app-server-biz/pom.xml @@ -89,11 +89,6 @@ com.pig4cloud pigx-common-swagger - - - org.springframework.boot - spring-boot-starter-test - diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/PigxAppApplication.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/PigxAppApplication.java index 5d737d3ed..4fb0df4d8 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/PigxAppApplication.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/PigxAppApplication.java @@ -2,7 +2,7 @@ package com.pig4cloud.pigx.app; 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; @@ -12,7 +12,7 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient; *

* 项目启动类 */ -@EnablePigxSwagger2 +@EnableOpenApi("app") @EnablePigxFeignClients @EnableDiscoveryClient @EnablePigxResourceServer diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppMenuController.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppMenuController.java index 32f73746e..817101e8f 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppMenuController.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppMenuController.java @@ -17,24 +17,20 @@ package com.pig4cloud.pigx.app.controller; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.pig4cloud.pigx.admin.api.entity.SysMenu; -import com.pig4cloud.pigx.common.core.util.R; -import com.pig4cloud.pigx.common.log.annotation.SysLog; import com.pig4cloud.pigx.app.api.entity.AppMenu; import com.pig4cloud.pigx.app.service.AppMenuService; +import com.pig4cloud.pigx.common.core.util.R; +import com.pig4cloud.pigx.common.log.annotation.SysLog; import com.pig4cloud.pigx.common.security.util.SecurityUtils; -import org.springframework.security.access.prepost.PreAuthorize; -import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +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.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; import java.util.HashSet; -import java.util.List; import java.util.Set; import java.util.stream.Collectors; @@ -47,7 +43,8 @@ import java.util.stream.Collectors; @RestController @RequiredArgsConstructor @RequestMapping("/appmenu") -@Api(value = "appmenu", tags = "菜单权限表管理") +@Tag(description = "appmenu", name = "菜单权限表管理") +@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) public class AppMenuController { private final AppMenuService appMenuService; diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppRoleController.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppRoleController.java index 2cddd424a..f6fd4ad30 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppRoleController.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppRoleController.java @@ -19,17 +19,18 @@ package com.pig4cloud.pigx.app.controller; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.pig4cloud.pigx.admin.api.vo.RoleVO; -import com.pig4cloud.pigx.app.api.vo.AppRoleVO; -import com.pig4cloud.pigx.common.core.util.R; -import com.pig4cloud.pigx.common.log.annotation.SysLog; import com.pig4cloud.pigx.app.api.entity.AppRole; +import com.pig4cloud.pigx.app.api.vo.AppRoleVO; import com.pig4cloud.pigx.app.service.AppRoleService; -import org.springframework.security.access.prepost.PreAuthorize; +import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import com.pig4cloud.pigx.common.log.annotation.SysLog; +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.RequiredArgsConstructor; +import org.springframework.http.HttpHeaders; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -43,7 +44,8 @@ import java.util.List; @RestController @RequiredArgsConstructor @RequestMapping("/approle") -@Api(value = "approle", tags = "app角色表管理") +@Tag(description = "approle", name = "app角色表管理") +@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) public class AppRoleController { private final AppRoleService appRoleService; @@ -54,7 +56,7 @@ public class AppRoleController { * @param appRole app角色表 * @return */ - @ApiOperation(value = "分页查询", notes = "分页查询") + @Operation(summary = "分页查询", description = "分页查询") @GetMapping("/page") public R getAppRolePage(Page page, AppRole appRole) { return R.ok(appRoleService.page(page, Wrappers.query(appRole))); @@ -64,7 +66,7 @@ public class AppRoleController { * 查询全部角色 * @return */ - @ApiOperation(value = "查询全部", notes = "查询全部") + @Operation(summary = "查询全部", description = "查询全部") @GetMapping("/list") public R list() { return R.ok(appRoleService.list(Wrappers.emptyWrapper())); @@ -75,7 +77,7 @@ public class AppRoleController { * @param roleId id * @return R */ - @ApiOperation(value = "通过id查询", notes = "通过id查询") + @Operation(summary = "通过id查询", description = "通过id查询") @GetMapping("/{roleId}") @PreAuthorize("@pms.hasPermission('app_approle_view')") public R getById(@PathVariable("roleId") Long roleId) { @@ -87,7 +89,7 @@ public class AppRoleController { * @param appRole app角色表 * @return R */ - @ApiOperation(value = "新增app角色表", notes = "新增app角色表") + @Operation(summary = "新增app角色表", description = "新增app角色表") @SysLog("新增app角色表") @PostMapping @PreAuthorize("@pms.hasPermission('app_approle_add')") @@ -100,7 +102,7 @@ public class AppRoleController { * @param appRole app角色表 * @return R */ - @ApiOperation(value = "修改app角色表", notes = "修改app角色表") + @Operation(summary = "修改app角色表", description = "修改app角色表") @SysLog("修改app角色表") @PutMapping @PreAuthorize("@pms.hasPermission('app_approle_edit')") @@ -113,7 +115,7 @@ public class AppRoleController { * @param roleId id * @return R */ - @ApiOperation(value = "通过id删除app角色表", notes = "通过id删除app角色表") + @Operation(summary = "通过id删除app角色表", description = "通过id删除app角色表") @SysLog("通过id删除app角色表") @DeleteMapping("/{roleId}") @PreAuthorize("@pms.hasPermission('app_approle_del')") diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppRoleMenuController.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppRoleMenuController.java index 158ee7576..60d92334a 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppRoleMenuController.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppRoleMenuController.java @@ -19,15 +19,17 @@ package com.pig4cloud.pigx.app.controller; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.pig4cloud.pigx.common.core.util.R; -import com.pig4cloud.pigx.common.log.annotation.SysLog; import com.pig4cloud.pigx.app.api.entity.AppRoleMenu; import com.pig4cloud.pigx.app.service.AppRoleMenuService; -import org.springframework.security.access.prepost.PreAuthorize; +import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import com.pig4cloud.pigx.common.log.annotation.SysLog; +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.RequiredArgsConstructor; +import org.springframework.http.HttpHeaders; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -41,7 +43,8 @@ import java.util.List; @RestController @RequiredArgsConstructor @RequestMapping("/approlemenu") -@Api(value = "approlemenu", tags = "角色菜单表管理") +@Tag(description = "approlemenu", name = "角色菜单表管理") +@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) public class AppRoleMenuController { private final AppRoleMenuService appRoleMenuService; @@ -52,7 +55,7 @@ public class AppRoleMenuController { * @param appRoleMenu 角色菜单表 * @return */ - @ApiOperation(value = "分页查询", notes = "分页查询") + @Operation(summary = "分页查询", description = "分页查询") @GetMapping("/page") @PreAuthorize("@pms.hasPermission('app_approlemenu_view')") public R getAppRoleMenuPage(Page page, AppRoleMenu appRoleMenu) { @@ -64,7 +67,7 @@ public class AppRoleMenuController { * @param roleId id * @return R */ - @ApiOperation(value = "通过id查询", notes = "通过id查询") + @Operation(summary = "通过id查询", description = "通过id查询") @GetMapping("/{roleId}") @PreAuthorize("@pms.hasPermission('app_approlemenu_view')") public R getById(@PathVariable("roleId") Long roleId) { @@ -76,7 +79,7 @@ public class AppRoleMenuController { * @param appRoleMenu 角色菜单表 * @return R */ - @ApiOperation(value = "新增角色菜单表", notes = "新增角色菜单表") + @Operation(summary = "新增角色菜单表", description = "新增角色菜单表") @SysLog("新增角色菜单表") @PostMapping @PreAuthorize("@pms.hasPermission('app_approlemenu_add')") @@ -89,7 +92,7 @@ public class AppRoleMenuController { * @param appRoleMenu 角色菜单表 * @return R */ - @ApiOperation(value = "修改角色菜单表", notes = "修改角色菜单表") + @Operation(summary = "修改角色菜单表", description = "修改角色菜单表") @SysLog("修改角色菜单表") @PutMapping @PreAuthorize("@pms.hasPermission('app_approlemenu_edit')") @@ -102,7 +105,7 @@ public class AppRoleMenuController { * @param roleId id * @return R */ - @ApiOperation(value = "通过id删除角色菜单表", notes = "通过id删除角色菜单表") + @Operation(summary = "通过id删除角色菜单表", description = "通过id删除角色菜单表") @SysLog("通过id删除角色菜单表") @DeleteMapping("/{roleId}") @PreAuthorize("@pms.hasPermission('app_approlemenu_del')") diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppSocialDetailsController.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppSocialDetailsController.java index e7b857d8c..1a798d3ec 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppSocialDetailsController.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppSocialDetailsController.java @@ -25,8 +25,10 @@ import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.core.util.ValidGroup; import com.pig4cloud.pigx.common.log.annotation.SysLog; 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.AllArgsConstructor; +import org.springframework.http.HttpHeaders; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -36,7 +38,8 @@ import javax.validation.Valid; @RestController @RequestMapping("/social") @AllArgsConstructor -@Api(value = "social", tags = "三方账号管理模块") +@Tag(description = "social", name = "三方账号管理模块") +@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) public class AppSocialDetailsController { private final AppSocialDetailsService appSocialDetailsService; diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppUserController.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppUserController.java index ac75b5ffc..0f49b9918 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppUserController.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppUserController.java @@ -19,22 +19,23 @@ package com.pig4cloud.pigx.app.controller; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.pig4cloud.pigx.admin.api.entity.SysUser; import com.pig4cloud.pigx.app.api.dto.AppUserDTO; +import com.pig4cloud.pigx.app.api.entity.AppUser; import com.pig4cloud.pigx.app.api.vo.AppUserExcelVO; +import com.pig4cloud.pigx.app.service.AppUserService; import com.pig4cloud.pigx.common.core.exception.ErrorCodes; import com.pig4cloud.pigx.common.core.util.MsgUtils; import com.pig4cloud.pigx.common.core.util.R; +import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel; import com.pig4cloud.pigx.common.log.annotation.SysLog; -import com.pig4cloud.pigx.app.api.entity.AppUser; -import com.pig4cloud.pigx.app.service.AppUserService; import com.pig4cloud.pigx.common.security.annotation.Inner; import com.pig4cloud.pigx.common.security.util.SecurityUtils; -import org.springframework.security.access.prepost.PreAuthorize; -import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel; -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.RequiredArgsConstructor; +import org.springframework.http.HttpHeaders; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -48,7 +49,8 @@ import java.util.List; @RestController @RequiredArgsConstructor @RequestMapping("/appuser") -@Api(value = "appuser", tags = "app用户表管理") +@Tag(description = "appuser", name = "app用户表管理") +@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) public class AppUserController { private final AppUserService appUserService; @@ -83,7 +85,7 @@ public class AppUserController { * @param appUserDTO app用户表 * @return */ - @ApiOperation(value = "分页查询", notes = "分页查询") + @Operation(summary = "分页查询", description = "分页查询") @GetMapping("/page") public R getAppUserPage(Page page, AppUserDTO appUserDTO) { return R.ok(appUserService.getUsersWithRolePage(page, appUserDTO)); @@ -94,7 +96,7 @@ public class AppUserController { * @param userId id * @return R */ - @ApiOperation(value = "通过id查询", notes = "通过id查询") + @Operation(summary = "通过id查询", description = "通过id查询") @GetMapping("/{userId}") public R getById(@PathVariable("userId") Long userId) { return R.ok(appUserService.getById(userId)); @@ -105,7 +107,7 @@ public class AppUserController { * @param appUser app用户表 * @return R */ - @ApiOperation(value = "新增app用户表", notes = "新增app用户表") + @Operation(summary = "新增app用户表", description = "新增app用户表") @SysLog("新增app用户表") @PostMapping @PreAuthorize("@pms.hasPermission('app_appuser_add')") @@ -118,7 +120,7 @@ public class AppUserController { * @param appUser app用户表 * @return R */ - @ApiOperation(value = "修改app用户表", notes = "修改app用户表") + @Operation(summary = "修改app用户表", description = "修改app用户表") @SysLog("修改app用户表") @PutMapping @PreAuthorize("@pms.hasPermission('app_appuser_edit')") @@ -131,7 +133,7 @@ public class AppUserController { * @param userId id * @return R */ - @ApiOperation(value = "通过id删除app用户表", notes = "通过id删除app用户表") + @Operation(summary = "通过id删除app用户表", description = "通过id删除app用户表") @SysLog("通过id删除app用户表") @DeleteMapping("/{userId}") @PreAuthorize("@pms.hasPermission('app_appuser_del')") diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppUserRoleController.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppUserRoleController.java index e1e0b1e23..862c5b44f 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppUserRoleController.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppUserRoleController.java @@ -19,15 +19,17 @@ package com.pig4cloud.pigx.app.controller; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.pig4cloud.pigx.common.core.util.R; -import com.pig4cloud.pigx.common.log.annotation.SysLog; import com.pig4cloud.pigx.app.api.entity.AppUserRole; import com.pig4cloud.pigx.app.service.AppUserRoleService; -import org.springframework.security.access.prepost.PreAuthorize; +import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import com.pig4cloud.pigx.common.log.annotation.SysLog; +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.RequiredArgsConstructor; +import org.springframework.http.HttpHeaders; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -41,7 +43,8 @@ import java.util.List; @RestController @RequiredArgsConstructor @RequestMapping("/appuserrole") -@Api(value = "appuserrole", tags = "用户角色表管理") +@Tag(description = "appuserrole", name = "用户角色表管理") +@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) public class AppUserRoleController { private final AppUserRoleService appUserRoleService; @@ -52,7 +55,7 @@ public class AppUserRoleController { * @param appUserRole 用户角色表 * @return */ - @ApiOperation(value = "分页查询", notes = "分页查询") + @Operation(summary = "分页查询", description = "分页查询") @GetMapping("/page") @PreAuthorize("@pms.hasPermission('app_appuserrole_view')") public R getAppUserRolePage(Page page, AppUserRole appUserRole) { @@ -64,7 +67,7 @@ public class AppUserRoleController { * @param userId id * @return R */ - @ApiOperation(value = "通过id查询", notes = "通过id查询") + @Operation(summary = "通过id查询", description = "通过id查询") @GetMapping("/{userId}") @PreAuthorize("@pms.hasPermission('app_appuserrole_view')") public R getById(@PathVariable("userId") Long userId) { @@ -76,7 +79,7 @@ public class AppUserRoleController { * @param appUserRole 用户角色表 * @return R */ - @ApiOperation(value = "新增用户角色表", notes = "新增用户角色表") + @Operation(summary = "新增用户角色表", description = "新增用户角色表") @SysLog("新增用户角色表") @PostMapping @PreAuthorize("@pms.hasPermission('app_appuserrole_add')") @@ -89,7 +92,7 @@ public class AppUserRoleController { * @param appUserRole 用户角色表 * @return R */ - @ApiOperation(value = "修改用户角色表", notes = "修改用户角色表") + @Operation(summary = "修改用户角色表", description = "修改用户角色表") @SysLog("修改用户角色表") @PutMapping @PreAuthorize("@pms.hasPermission('app_appuserrole_edit')") @@ -102,7 +105,7 @@ public class AppUserRoleController { * @param userId id * @return R */ - @ApiOperation(value = "通过id删除用户角色表", notes = "通过id删除用户角色表") + @Operation(summary = "通过id删除用户角色表", description = "通过id删除用户角色表") @SysLog("通过id删除用户角色表") @DeleteMapping("/{userId}") @PreAuthorize("@pms.hasPermission('app_appuserrole_del')") diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/MobileController.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/MobileController.java index 771554a71..7caa99298 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/MobileController.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/MobileController.java @@ -20,8 +20,10 @@ package com.pig4cloud.pigx.app.controller; import com.pig4cloud.pigx.app.service.MobileService; 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.AllArgsConstructor; +import org.springframework.http.HttpHeaders; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; @@ -36,7 +38,8 @@ import org.springframework.web.bind.annotation.RestController; @RestController @AllArgsConstructor @RequestMapping("/mobile") -@Api(value = "mobile", tags = "手机管理模块") +@Tag(description = "mobile", name = "手机管理模块") +@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) public class MobileController { private final MobileService mobileService; diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/handler/AbstractLoginHandler.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/handler/AbstractLoginHandler.java index 84c07a1e1..2b2aff986 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/handler/AbstractLoginHandler.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/handler/AbstractLoginHandler.java @@ -17,7 +17,6 @@ package com.pig4cloud.pigx.app.handler; -import com.pig4cloud.pigx.admin.api.dto.UserInfo; import com.pig4cloud.pigx.app.api.dto.AppUserInfo; /** diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/handler/LoginHandler.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/handler/LoginHandler.java index 654294559..1137d8f65 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/handler/LoginHandler.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/handler/LoginHandler.java @@ -17,8 +17,6 @@ package com.pig4cloud.pigx.app.handler; -import com.pig4cloud.pigx.admin.api.dto.UserInfo; -import com.pig4cloud.pigx.admin.api.entity.SysUser; import com.pig4cloud.pigx.app.api.dto.AppUserInfo; import com.pig4cloud.pigx.app.api.entity.AppUser; diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/mapper/AppMenuMapper.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/mapper/AppMenuMapper.java index 960f52854..c1bc2f342 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/mapper/AppMenuMapper.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/mapper/AppMenuMapper.java @@ -17,8 +17,8 @@ package com.pig4cloud.pigx.app.mapper; -import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper; import com.pig4cloud.pigx.app.api.entity.AppMenu; +import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/mapper/AppRoleMapper.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/mapper/AppRoleMapper.java index 895e84211..9173e7f67 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/mapper/AppRoleMapper.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/mapper/AppRoleMapper.java @@ -17,8 +17,8 @@ package com.pig4cloud.pigx.app.mapper; -import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper; import com.pig4cloud.pigx.app.api.entity.AppRole; +import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/mapper/AppRoleMenuMapper.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/mapper/AppRoleMenuMapper.java index f5631ef38..bf9c253e2 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/mapper/AppRoleMenuMapper.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/mapper/AppRoleMenuMapper.java @@ -17,8 +17,8 @@ package com.pig4cloud.pigx.app.mapper; -import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper; import com.pig4cloud.pigx.app.api.entity.AppRoleMenu; +import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper; import org.apache.ibatis.annotations.Mapper; /** diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/mapper/AppUserMapper.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/mapper/AppUserMapper.java index 9b70a8b70..7561ea571 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/mapper/AppUserMapper.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/mapper/AppUserMapper.java @@ -20,9 +20,9 @@ package com.pig4cloud.pigx.app.mapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.app.api.dto.AppUserDTO; +import com.pig4cloud.pigx.app.api.entity.AppUser; import com.pig4cloud.pigx.app.api.vo.AppUserVo; import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper; -import com.pig4cloud.pigx.app.api.entity.AppUser; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/mapper/AppUserRoleMapper.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/mapper/AppUserRoleMapper.java index 249df7e42..a789cb6dd 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/mapper/AppUserRoleMapper.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/mapper/AppUserRoleMapper.java @@ -17,8 +17,8 @@ package com.pig4cloud.pigx.app.mapper; -import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper; import com.pig4cloud.pigx.app.api.entity.AppUserRole; +import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper; import org.apache.ibatis.annotations.Mapper; /** diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/AppMenuService.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/AppMenuService.java index 445c48e69..4745bffd0 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/AppMenuService.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/AppMenuService.java @@ -19,7 +19,6 @@ package com.pig4cloud.pigx.app.service; import cn.hutool.core.lang.tree.Tree; import com.baomidou.mybatisplus.extension.service.IService; -import com.pig4cloud.pigx.admin.api.entity.SysMenu; import com.pig4cloud.pigx.app.api.entity.AppMenu; import com.pig4cloud.pigx.common.core.util.R; diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/AppRoleService.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/AppRoleService.java index ee28639be..65bad5e30 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/AppRoleService.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/AppRoleService.java @@ -21,7 +21,6 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.pig4cloud.pigx.app.api.entity.AppRole; import com.pig4cloud.pigx.app.api.vo.AppRoleVO; -import java.util.Arrays; import java.util.List; /** diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/AppSocialDetailsService.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/AppSocialDetailsService.java index 1302a3964..23085ae4c 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/AppSocialDetailsService.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/AppSocialDetailsService.java @@ -18,8 +18,6 @@ package com.pig4cloud.pigx.app.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.pig4cloud.pigx.admin.api.dto.UserInfo; -import com.pig4cloud.pigx.admin.api.entity.SysSocialDetails; import com.pig4cloud.pigx.app.api.dto.AppUserInfo; import com.pig4cloud.pigx.app.api.entity.AppSocialDetails; diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppMenuServiceImpl.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppMenuServiceImpl.java index b5b4b648a..45f909ca2 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppMenuServiceImpl.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppMenuServiceImpl.java @@ -23,8 +23,6 @@ import cn.hutool.core.lang.tree.TreeUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pig4cloud.pigx.admin.api.entity.SysMenu; -import com.pig4cloud.pigx.admin.api.entity.SysRoleMenu; import com.pig4cloud.pigx.app.api.entity.AppMenu; import com.pig4cloud.pigx.app.api.entity.AppRoleMenu; import com.pig4cloud.pigx.app.mapper.AppMenuMapper; @@ -39,7 +37,6 @@ import com.pig4cloud.pigx.common.core.util.R; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.cache.annotation.CacheEvict; -import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppRoleMenuServiceImpl.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppRoleMenuServiceImpl.java index a682433a8..cd8365d13 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppRoleMenuServiceImpl.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppRoleMenuServiceImpl.java @@ -19,11 +19,9 @@ package com.pig4cloud.pigx.app.service.impl; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pig4cloud.pigx.admin.api.entity.SysRoleMenu; import com.pig4cloud.pigx.app.api.entity.AppRoleMenu; import com.pig4cloud.pigx.app.mapper.AppRoleMenuMapper; import com.pig4cloud.pigx.app.service.AppRoleMenuService; -import com.pig4cloud.pigx.common.core.constant.CacheConstants; import org.springframework.stereotype.Service; import java.util.Arrays; diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppUserServiceImpl.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppUserServiceImpl.java index 9b5ee23fb..0711c86fb 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppUserServiceImpl.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppUserServiceImpl.java @@ -23,30 +23,25 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pig4cloud.pigx.admin.api.entity.SysMenu; -import com.pig4cloud.pigx.admin.api.entity.SysRole; -import com.pig4cloud.pigx.admin.api.entity.SysUserRole; import com.pig4cloud.pigx.app.api.dto.AppUserDTO; import com.pig4cloud.pigx.app.api.dto.AppUserInfo; import com.pig4cloud.pigx.app.api.entity.AppMenu; import com.pig4cloud.pigx.app.api.entity.AppRole; import com.pig4cloud.pigx.app.api.entity.AppUser; import com.pig4cloud.pigx.app.api.entity.AppUserRole; +import com.pig4cloud.pigx.app.api.vo.AppUserExcelVO; import com.pig4cloud.pigx.app.mapper.AppUserMapper; import com.pig4cloud.pigx.app.service.AppMenuService; import com.pig4cloud.pigx.app.service.AppRoleService; import com.pig4cloud.pigx.app.service.AppUserRoleService; import com.pig4cloud.pigx.app.service.AppUserService; -import com.pig4cloud.pigx.app.api.vo.AppUserExcelVO; import com.pig4cloud.pigx.common.core.constant.CommonConstants; -import com.pig4cloud.pigx.common.data.resolver.ParamResolver; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; -import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml index f7217c3a0..f6a3b180e 100644 --- a/pigx-common/pigx-common-bom/pom.xml +++ b/pigx-common/pigx-common-bom/pom.xml @@ -18,7 +18,7 @@ 4.6.0 - 3.5.1 + 3.5.3.1 3.5.2 1.2.9 5.8.10 @@ -26,7 +26,8 @@ 21.3.0.0 8.4.1.jre8 8.1.2.79 - 1.5.22 + 2.2.0 + 1.6.9 4.4.0 2.8.0 3.0.3 @@ -229,15 +230,26 @@ ${fastjson.version} + - io.swagger - swagger-models + org.springdoc + springdoc-openapi-webmvc-core + ${springdoc.version} + + + io.swagger.core.v3 + swagger-annotations ${swagger.core.version} - io.swagger - swagger-annotations - ${swagger.core.version} + org.springdoc + springdoc-openapi-webflux-ui + ${springdoc.version} + + + org.springdoc + springdoc-openapi-security + ${springdoc.version} diff --git a/pigx-common/pigx-common-core/pom.xml b/pigx-common/pigx-common-core/pom.xml index 4de0a773a..32a77c992 100644 --- a/pigx-common/pigx-common-core/pom.xml +++ b/pigx-common/pigx-common-core/pom.xml @@ -68,7 +68,7 @@ - io.swagger + io.swagger.core.v3 swagger-annotations diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/R.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/R.java index 0dee9033a..50db0f9e6 100644 --- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/R.java +++ b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/R.java @@ -20,8 +20,7 @@ package com.pig4cloud.pigx.common.core.util; import com.pig4cloud.pigx.common.core.constant.CommonConstants; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import lombok.experimental.Accessors; @@ -38,24 +37,24 @@ import java.io.Serializable; @NoArgsConstructor @AllArgsConstructor @Accessors(chain = true) -@ApiModel(value = "响应信息主体") +@Schema(description = "响应信息主体") public class R implements Serializable { private static final long serialVersionUID = 1L; @Getter @Setter - @ApiModelProperty(value = "返回标记：成功标记=0，失败标记=1") + @Schema(description = "返回标记：成功标记=0，失败标记=1") private int code; @Getter @Setter - @ApiModelProperty(value = "返回信息") + @Schema(description = "返回信息") private String msg; @Getter @Setter - @ApiModelProperty(value = "数据") + @Schema(description = "数据") private T data; public static R ok() { diff --git a/pigx-common/pigx-common-gateway/src/main/java/com/pig4cloud/pigx/common/gateway/configuration/DynamicRouteAutoConfiguration.java b/pigx-common/pigx-common-gateway/src/main/java/com/pig4cloud/pigx/common/gateway/configuration/DynamicRouteAutoConfiguration.java index 2701106a8..0257a384e 100644 --- a/pigx-common/pigx-common-gateway/src/main/java/com/pig4cloud/pigx/common/gateway/configuration/DynamicRouteAutoConfiguration.java +++ b/pigx-common/pigx-common-gateway/src/main/java/com/pig4cloud/pigx/common/gateway/configuration/DynamicRouteAutoConfiguration.java @@ -23,8 +23,6 @@ import com.pig4cloud.pigx.common.gateway.support.DynamicRouteHealthIndicator; import com.pig4cloud.pigx.common.gateway.support.RouteCacheHolder; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; -import org.springframework.cloud.gateway.config.GatewayProperties; -import org.springframework.cloud.gateway.config.PropertiesRouteDefinitionLocator; import org.springframework.cloud.gateway.event.RefreshRoutesEvent; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; @@ -47,14 +45,6 @@ import org.springframework.data.redis.serializer.StringRedisSerializer; @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE) public class DynamicRouteAutoConfiguration { - /** - * 配置文件设置为空 redis 加载为准 - * @return - */ - @Bean - public PropertiesRouteDefinitionLocator propertiesRouteDefinitionLocator() { - return new PropertiesRouteDefinitionLocator(new GatewayProperties()); - } /** * redis 监听配置 diff --git a/pigx-common/pigx-common-swagger/pom.xml b/pigx-common/pigx-common-swagger/pom.xml index bdab312b8..803ab931d 100644 --- a/pigx-common/pigx-common-swagger/pom.xml +++ b/pigx-common/pigx-common-swagger/pom.xml @@ -19,70 +19,59 @@ --> - 4.0.0 - - com.pig4cloud - pigx-common - 4.6.0 - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + com.pig4cloud + pigx-common + 4.6.0 + - pigx-common-swagger - jar + pigx-common-swagger + jar - pigx 接口文档 + pigx 接口文档 - - - - io.springfox - springfox-swagger-ui - ${swagger.fox.version} - - - io.springfox - springfox-swagger2 - ${swagger.fox.version} - - - io.springfox - springfox-oas - ${swagger.fox.version} - - - - com.github.xiaoymin - knife4j-spring-ui - ${knife4j.version} - - - - com.github.xiaoymin - knife4j-micro-spring-boot-starter - ${knife4j.version} - - - - org.springframework - spring-webflux - provided - - - - org.springframework.cloud - spring-cloud-gateway-server - provided - - - org.springframework.cloud - spring-cloud-commons - provided - - - org.springframework - spring-webmvc - provided - - + + + + org.springdoc + springdoc-openapi-webmvc-core + + + org.springdoc + springdoc-openapi-security + + + io.swagger.core.v3 + swagger-annotations + + + + org.springframework + spring-webflux + provided + + + + org.springframework.cloud + spring-cloud-gateway-server + provided + + + org.springframework.cloud + spring-cloud-commons + provided + + + org.springframework + spring-webmvc + provided + + + com.pig4cloud + pigx-common-core + + diff --git a/pigx-common/pigx-common-swagger/src/main/java/com/pig4cloud/pigx/common/swagger/annotation/EnablePigxSwagger2.java b/pigx-common/pigx-common-swagger/src/main/java/com/pig4cloud/pigx/common/swagger/annotation/EnablePigxSwagger2.java deleted file mode 100644 index 667801cd2..000000000 --- a/pigx-common/pigx-common-swagger/src/main/java/com/pig4cloud/pigx/common/swagger/annotation/EnablePigxSwagger2.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ - -package com.pig4cloud.pigx.common.swagger.annotation; - -import com.pig4cloud.pigx.common.swagger.support.SwaggerBeanDefinitionRegistrar; -import com.pig4cloud.pigx.common.swagger.support.SwaggerProperties; -import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.context.annotation.Import; -import springfox.documentation.swagger2.annotations.EnableSwagger2; - -import java.lang.annotation.*; - -/** - * @author lengleng - * @date 2020/10/2 开启pigx swagger - */ -@Target({ ElementType.TYPE }) -@Retention(RetentionPolicy.RUNTIME) -@Documented -@Inherited -@EnableSwagger2 -@EnableConfigurationProperties(SwaggerProperties.class) -@Import({ SwaggerBeanDefinitionRegistrar.class }) -public @interface EnablePigxSwagger2 { - -} diff --git a/pigx-common/pigx-common-swagger/src/main/java/com/pig4cloud/pigx/common/swagger/config/GatewaySwaggerAutoConfiguration.java b/pigx-common/pigx-common-swagger/src/main/java/com/pig4cloud/pigx/common/swagger/config/GatewaySwaggerAutoConfiguration.java deleted file mode 100644 index eee6cdb71..000000000 --- a/pigx-common/pigx-common-swagger/src/main/java/com/pig4cloud/pigx/common/swagger/config/GatewaySwaggerAutoConfiguration.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.pig4cloud.pigx.common.swagger.config; - -import com.pig4cloud.pigx.common.swagger.support.*; -import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.ObjectProvider; -import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; -import org.springframework.cloud.client.discovery.DiscoveryClient; -import org.springframework.cloud.gateway.route.RouteDefinitionRepository; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Primary; -import org.springframework.http.MediaType; -import org.springframework.web.reactive.function.server.RequestPredicates; -import org.springframework.web.reactive.function.server.RouterFunction; -import org.springframework.web.reactive.function.server.RouterFunctions; -import org.springframework.web.reactive.function.server.ServerResponse; -import springfox.documentation.swagger.web.SecurityConfiguration; -import springfox.documentation.swagger.web.SecurityConfigurationBuilder; -import springfox.documentation.swagger.web.UiConfiguration; -import springfox.documentation.swagger.web.UiConfigurationBuilder; - -/** - * @author lengleng - * @date 2020/10/2 - *

- * 网关swagger 配置类，仅在webflux 环境生效哦 - */ -@RequiredArgsConstructor -@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE) -public class GatewaySwaggerAutoConfiguration { - - @Bean - @Primary - public SwaggerProvider swaggerProvider(RouteDefinitionRepository repository, SwaggerProperties swaggerProperties, - DiscoveryClient discoveryClient) { - return new SwaggerProvider(repository, swaggerProperties, discoveryClient); - } - - @Bean - public SwaggerResourceHandler swaggerResourceHandler(SwaggerProvider swaggerProvider) { - return new SwaggerResourceHandler(swaggerProvider); - } - - @Bean - public WebFluxSwaggerConfiguration fluxSwaggerConfiguration() { - return new WebFluxSwaggerConfiguration(); - } - - @Bean - public SwaggerSecurityHandler swaggerSecurityHandler( - ObjectProvider securityConfigurationObjectProvider) { - SecurityConfiguration securityConfiguration = securityConfigurationObjectProvider - .getIfAvailable(() -> SecurityConfigurationBuilder.builder().build()); - return new SwaggerSecurityHandler(securityConfiguration); - } - - @Bean - public SwaggerUiHandler swaggerUiHandler(ObjectProvider uiConfigurationObjectProvider) { - UiConfiguration uiConfiguration = uiConfigurationObjectProvider - .getIfAvailable(() -> UiConfigurationBuilder.builder().build()); - return new SwaggerUiHandler(uiConfiguration); - } - - @Bean - public RouterFunction swaggerRouterFunction(SwaggerProperties swaggerProperties, SwaggerUiHandler swaggerUiHandler, - SwaggerSecurityHandler swaggerSecurityHandler, SwaggerResourceHandler swaggerResourceHandler) { - // 开启swagger 正常执行路由 - if (swaggerProperties.getEnabled()) { - return RouterFunctions - .route(RequestPredicates.GET("/swagger-resources").and(RequestPredicates.accept(MediaType.ALL)), - swaggerResourceHandler) - .andRoute(RequestPredicates.GET("/swagger-resources/configuration/ui") - .and(RequestPredicates.accept(MediaType.ALL)), swaggerUiHandler) - .andRoute(RequestPredicates.GET("/swagger-resources/configuration/security") - .and(RequestPredicates.accept(MediaType.ALL)), swaggerSecurityHandler); - } - else { - // 关闭时，返回404 - return RouterFunctions - .route(RequestPredicates.GET("/*/v2/api-docs").and(RequestPredicates.accept(MediaType.ALL)), - serverRequest -> ServerResponse.notFound().build()) - .andRoute(RequestPredicates.GET("/swagger-ui/**").and(RequestPredicates.accept(MediaType.ALL)), - serverRequest -> ServerResponse.notFound().build()) - .andRoute(RequestPredicates.GET("/doc.html").and(RequestPredicates.accept(MediaType.ALL)), - serverRequest -> ServerResponse.notFound().build()); - } - } - -} diff --git a/pigx-common/pigx-common-swagger/src/main/java/com/pig4cloud/pigx/common/swagger/config/OpenAPIDefinition.java b/pigx-common/pigx-common-swagger/src/main/java/com/pig4cloud/pigx/common/swagger/config/OpenAPIDefinition.java new file mode 100644 index 000000000..8d12971e0 --- /dev/null +++ b/pigx-common/pigx-common-swagger/src/main/java/com/pig4cloud/pigx/common/swagger/config/OpenAPIDefinition.java @@ -0,0 +1,96 @@ +/* + * Copyright (c) 2018-2025, lengleng All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the pig4cloud.com developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: lengleng (wangiegie@gmail.com) + */ +package com.pig4cloud.pigx.common.swagger.config; + +import com.pig4cloud.pigx.common.swagger.support.SwaggerProperties; +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.info.Info; +import io.swagger.v3.oas.models.security.OAuthFlow; +import io.swagger.v3.oas.models.security.OAuthFlows; +import io.swagger.v3.oas.models.security.Scopes; +import io.swagger.v3.oas.models.security.SecurityScheme; +import io.swagger.v3.oas.models.servers.Server; +import lombok.RequiredArgsConstructor; +import lombok.Setter; +import org.springframework.beans.BeansException; +import org.springframework.beans.factory.InitializingBean; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.cloud.client.ServiceInstance; +import org.springframework.context.ApplicationContext; +import org.springframework.context.ApplicationContextAware; +import org.springframework.http.HttpHeaders; + +import java.util.ArrayList; +import java.util.List; + +/** + * swagger配置 + * + *

+ * 禁用方法1：使用注解@Profile({"dev","test"}) + * + * 表示在开发或测试环境开启，而在生产关闭。（推荐使用） 禁用方法2：使用注解@ConditionalOnProperty(name = "swagger.enable", + * + * havingValue = "true") 然后在测试配置或者开发配置中添加swagger.enable=true即可开启，生产环境不填则默认关闭Swagger. + *

+ * + * @author lengleng + */ +@RequiredArgsConstructor +@ConditionalOnProperty(name = "swagger.enabled", matchIfMissing = true) +public class OpenAPIDefinition extends OpenAPI implements InitializingBean, ApplicationContextAware { + + @Setter + private String path; + + private ApplicationContext applicationContext; + + private SecurityScheme securityScheme(SwaggerProperties swaggerProperties) { + OAuthFlow clientCredential = new OAuthFlow(); + clientCredential.setTokenUrl(swaggerProperties.getTokenUrl()); + clientCredential.setScopes(new Scopes().addString(swaggerProperties.getScope(), swaggerProperties.getScope())); + OAuthFlows oauthFlows = new OAuthFlows(); + oauthFlows.password(clientCredential); + SecurityScheme securityScheme = new SecurityScheme(); + securityScheme.setType(SecurityScheme.Type.OAUTH2); + securityScheme.setFlows(oauthFlows); + return securityScheme; + } + + @Override + public void afterPropertiesSet() throws Exception { + SwaggerProperties swaggerProperties = applicationContext.getBean(SwaggerProperties.class); + this.info(new Info().title(swaggerProperties.getTitle())); + // oauth2.0 password + this.schemaRequirement(HttpHeaders.AUTHORIZATION, this.securityScheme(swaggerProperties)); + // servers + List serverList = new ArrayList<>(); + serverList.add(new Server().url(swaggerProperties.getGateway() + "/" + path)); + this.servers(serverList); + + // 修改 ServiceInstance Metadata + ServiceInstance serviceInstance = applicationContext.getBean(ServiceInstance.class); + serviceInstance.getMetadata().put("spring-doc", path); + + } + + @Override + public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { + this.applicationContext = applicationContext; + } + +} diff --git a/pigx-common/pigx-common-swagger/src/main/java/com/pig4cloud/pigx/common/swagger/config/OpenAPIDefinitionImportSelector.java b/pigx-common/pigx-common-swagger/src/main/java/com/pig4cloud/pigx/common/swagger/config/OpenAPIDefinitionImportSelector.java new file mode 100644 index 000000000..01b97f1aa --- /dev/null +++ b/pigx-common/pigx-common-swagger/src/main/java/com/pig4cloud/pigx/common/swagger/config/OpenAPIDefinitionImportSelector.java @@ -0,0 +1,36 @@ +package com.pig4cloud.pigx.common.swagger.config; + +import com.pig4cloud.pigx.common.swagger.annotation.EnableOpenApi; +import org.springframework.beans.factory.support.BeanDefinitionBuilder; +import org.springframework.beans.factory.support.BeanDefinitionRegistry; +import org.springframework.context.annotation.ImportBeanDefinitionRegistrar; +import org.springframework.core.type.AnnotationMetadata; + +import java.util.Map; +import java.util.Objects; + +/** + * openapi 配置类 + * + * @author lengleng + * @date 2023/1/1 + */ +public class OpenAPIDefinitionImportSelector implements ImportBeanDefinitionRegistrar { + + @Override + public void registerBeanDefinitions(AnnotationMetadata metadata, BeanDefinitionRegistry registry) { + + Map annotationAttributes = metadata.getAnnotationAttributes(EnableOpenApi.class.getName(), + true); + Object value = annotationAttributes.get("value"); + if (Objects.isNull(value)) { + return; + } + + BeanDefinitionBuilder definition = BeanDefinitionBuilder.genericBeanDefinition(OpenAPIDefinition.class); + definition.addPropertyValue("path", value); + + registry.registerBeanDefinition("openAPIDefinition", definition.getBeanDefinition()); + } + +} diff --git a/pigx-common/pigx-common-swagger/src/main/java/com/pig4cloud/pigx/common/swagger/config/SwaggerAutoConfiguration.java b/pigx-common/pigx-common-swagger/src/main/java/com/pig4cloud/pigx/common/swagger/config/SwaggerAutoConfiguration.java deleted file mode 100644 index ec45ef6db..000000000 --- a/pigx-common/pigx-common-swagger/src/main/java/com/pig4cloud/pigx/common/swagger/config/SwaggerAutoConfiguration.java +++ /dev/null @@ -1,182 +0,0 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ -package com.pig4cloud.pigx.common.swagger.config; - -import com.pig4cloud.pigx.common.swagger.support.SwaggerProperties; -import lombok.RequiredArgsConstructor; -import org.springframework.beans.BeansException; -import org.springframework.beans.factory.config.BeanPostProcessor; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.util.ReflectionUtils; -import org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping; -import springfox.documentation.builders.ApiInfoBuilder; -import springfox.documentation.builders.PathSelectors; -import springfox.documentation.builders.RequestHandlerSelectors; -import springfox.documentation.builders.RequestParameterBuilder; -import springfox.documentation.schema.ScalarType; -import springfox.documentation.service.*; -import springfox.documentation.spi.DocumentationType; -import springfox.documentation.spi.service.contexts.SecurityContext; -import springfox.documentation.spring.web.plugins.ApiSelectorBuilder; -import springfox.documentation.spring.web.plugins.Docket; -import springfox.documentation.spring.web.plugins.WebMvcRequestHandlerProvider; - -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.function.Predicate; -import java.util.stream.Collectors; - -/** - * @author lengleng swagger配置 禁用方法1：使用注解@Profile({"dev","test"}) - * 表示在开发或测试环境开启，而在生产关闭。（推荐使用） 禁用方法2：使用注解@ConditionalOnProperty(name = "swagger.enable", - * havingValue = "true") 然后在测试配置或者开发配置中添加swagger.enable=true即可开启，生产环境不填则默认关闭Swagger. - */ -@Configuration -@EnableAutoConfiguration -@RequiredArgsConstructor -@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET) -public class SwaggerAutoConfiguration { - - /** - * 默认的排除路径，排除Spring Boot默认的错误处理路径和端点 - */ - private static final List DEFAULT_EXCLUDE_PATH = Arrays.asList("/error", "/actuator/**"); - - private static final String BASE_PATH = "/**"; - - private final SwaggerProperties swaggerProperties; - - @Bean - @ConditionalOnProperty(name = "swagger.enabled", matchIfMissing = true) - public Docket api() { - // base-path处理 - if (swaggerProperties.getBasePath().isEmpty()) { - swaggerProperties.getBasePath().add(BASE_PATH); - } - - // exclude-path处理 - if (swaggerProperties.getExcludePath().isEmpty()) { - swaggerProperties.getExcludePath().addAll(DEFAULT_EXCLUDE_PATH); - } - List> excludePath = new ArrayList<>(); - swaggerProperties.getExcludePath().forEach(path -> excludePath.add(PathSelectors.ant(path))); - - // 版本请求头处理 - List pars = new ArrayList<>(); - - RequestParameterBuilder versionPar = new RequestParameterBuilder().description("灰度路由版本信息") - .in(ParameterType.HEADER).name("VERSION").required(false) - .query(param -> param.model(model -> model.scalarModel(ScalarType.STRING))); - - pars.add(versionPar.build()); - - ApiSelectorBuilder builder = new Docket(DocumentationType.SWAGGER_2).host(swaggerProperties.getHost()) - .apiInfo(apiInfo(swaggerProperties)).globalRequestParameters(pars).select() - .apis(RequestHandlerSelectors.basePackage(swaggerProperties.getBasePackage())); - - swaggerProperties.getBasePath().forEach(p -> builder.paths(PathSelectors.ant(p))); - swaggerProperties.getExcludePath().forEach(p -> builder.paths(PathSelectors.ant(p).negate())); - - return builder.build().securitySchemes(Collections.singletonList(securitySchema())) - .securityContexts(Collections.singletonList(securityContext())).pathMapping("/"); - } - - /** - * 配置默认的全局鉴权策略的开关，通过正则表达式进行匹配；默认匹配所有URL - * @return - */ - private SecurityContext securityContext() { - return SecurityContext.builder().securityReferences(defaultAuth()).build(); - } - - /** - * 默认的全局鉴权策略 - * @return - */ - private List defaultAuth() { - ArrayList authorizationScopeList = new ArrayList<>(); - swaggerProperties.getAuthorization().getAuthorizationScopeList() - .forEach(authorizationScope -> authorizationScopeList.add( - new AuthorizationScope(authorizationScope.getScope(), authorizationScope.getDescription()))); - AuthorizationScope[] authorizationScopes = new AuthorizationScope[authorizationScopeList.size()]; - return Collections - .singletonList(SecurityReference.builder().reference(swaggerProperties.getAuthorization().getName()) - .scopes(authorizationScopeList.toArray(authorizationScopes)).build()); - } - - private OAuth securitySchema() { - ArrayList authorizationScopeList = new ArrayList<>(); - swaggerProperties.getAuthorization().getAuthorizationScopeList() - .forEach(authorizationScope -> authorizationScopeList.add( - new AuthorizationScope(authorizationScope.getScope(), authorizationScope.getDescription()))); - ArrayList grantTypes = new ArrayList<>(); - swaggerProperties.getAuthorization().getTokenUrlList() - .forEach(tokenUrl -> grantTypes.add(new ResourceOwnerPasswordCredentialsGrant(tokenUrl))); - return new OAuth(swaggerProperties.getAuthorization().getName(), authorizationScopeList, grantTypes); - } - - private ApiInfo apiInfo(SwaggerProperties swaggerProperties) { - return new ApiInfoBuilder().title(swaggerProperties.getTitle()).description(swaggerProperties.getDescription()) - .license(swaggerProperties.getLicense()).licenseUrl(swaggerProperties.getLicenseUrl()) - .termsOfServiceUrl(swaggerProperties.getTermsOfServiceUrl()) - .contact(new Contact(swaggerProperties.getContact().getName(), swaggerProperties.getContact().getUrl(), - swaggerProperties.getContact().getEmail())) - .version(swaggerProperties.getVersion()).build(); - } - - @Bean - public BeanPostProcessor springfoxHandlerProviderBeanPostProcessor() { - return new BeanPostProcessor() { - - @Override - public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException { - if (bean instanceof WebMvcRequestHandlerProvider) { - customizeSpringfoxHandlerMappings(getHandlerMappings(bean)); - } - return bean; - } - - private void customizeSpringfoxHandlerMappings( - List mappings) { - List copy = mappings.stream().filter(mapping -> mapping.getPatternParser() == null) - .collect(Collectors.toList()); - mappings.clear(); - mappings.addAll(copy); - } - - @SuppressWarnings("unchecked") - private List getHandlerMappings(Object bean) { - try { - Field field = ReflectionUtils.findField(bean.getClass(), "handlerMappings"); - field.setAccessible(true); - return (List) field.get(bean); - } - catch (IllegalArgumentException | IllegalAccessException e) { - throw new IllegalStateException(e); - } - } - }; - } - -} diff --git a/pigx-common/pigx-common-swagger/src/main/java/com/pig4cloud/pigx/common/swagger/config/WebFluxSwaggerConfiguration.java b/pigx-common/pigx-common-swagger/src/main/java/com/pig4cloud/pigx/common/swagger/config/WebFluxSwaggerConfiguration.java deleted file mode 100644 index 3ab96aa47..000000000 --- a/pigx-common/pigx-common-swagger/src/main/java/com/pig4cloud/pigx/common/swagger/config/WebFluxSwaggerConfiguration.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.pig4cloud.pigx.common.swagger.config; - -import org.springframework.web.reactive.config.ResourceHandlerRegistry; -import org.springframework.web.reactive.config.WebFluxConfigurer; - -/** - * @author lengleng - * @date 2020/10/2 - *

- * webflux 网关 swagger 资源路径配置 - */ -public class WebFluxSwaggerConfiguration implements WebFluxConfigurer { - - @Override - public void addResourceHandlers(ResourceHandlerRegistry registry) { - registry.addResourceHandler("/swagger-ui/**") - .addResourceLocations("classpath:/META-INF/resources/webjars/springfox-swagger-ui/") - .resourceChain(false); - } - -} \ No newline at end of file diff --git a/pigx-common/pigx-common-swagger/src/main/java/com/pig4cloud/pigx/common/swagger/support/SwaggerBeanDefinitionRegistrar.java b/pigx-common/pigx-common-swagger/src/main/java/com/pig4cloud/pigx/common/swagger/support/SwaggerBeanDefinitionRegistrar.java deleted file mode 100644 index da8a7d475..000000000 --- a/pigx-common/pigx-common-swagger/src/main/java/com/pig4cloud/pigx/common/swagger/support/SwaggerBeanDefinitionRegistrar.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.pig4cloud.pigx.common.swagger.support; - -import com.pig4cloud.pigx.common.swagger.config.GatewaySwaggerAutoConfiguration; -import com.pig4cloud.pigx.common.swagger.config.SwaggerAutoConfiguration; -import org.springframework.beans.factory.support.BeanDefinitionRegistry; -import org.springframework.beans.factory.support.GenericBeanDefinition; -import org.springframework.context.annotation.ImportBeanDefinitionRegistrar; -import org.springframework.core.type.AnnotationMetadata; - -/** - * @author lengleng - * @date 2022/6/28 - */ -public class SwaggerBeanDefinitionRegistrar implements ImportBeanDefinitionRegistrar { - - /** - * 根据注解值动态注入资源服务器的相关属性 - * @param metadata 注解信息 - * @param registry 注册器 - */ - @Override - public void registerBeanDefinitions(AnnotationMetadata metadata, BeanDefinitionRegistry registry) { - - // swagger 功能依赖系统的动态路由，需要读取路由表中的参数 - if (registry.isBeanNameInUse("com.pig4cloud.pigx.common.gateway.configuration.DynamicRouteAutoConfiguration")) { - GenericBeanDefinition gatewaySwagger = new GenericBeanDefinition(); - gatewaySwagger.setBeanClass(GatewaySwaggerAutoConfiguration.class); - registry.registerBeanDefinition(GatewaySwaggerAutoConfiguration.class.getSimpleName(), gatewaySwagger); - } - else { - GenericBeanDefinition swaggerAutoConfiguration = new GenericBeanDefinition(); - swaggerAutoConfiguration.setBeanClass(SwaggerAutoConfiguration.class); - registry.registerBeanDefinition(SwaggerAutoConfiguration.class.getSimpleName(), swaggerAutoConfiguration); - } - } - -} diff --git a/pigx-common/pigx-common-swagger/src/main/java/com/pig4cloud/pigx/common/swagger/support/SwaggerProperties.java b/pigx-common/pigx-common-swagger/src/main/java/com/pig4cloud/pigx/common/swagger/support/SwaggerProperties.java index f462a735b..8fcd28693 100644 --- a/pigx-common/pigx-common-swagger/src/main/java/com/pig4cloud/pigx/common/swagger/support/SwaggerProperties.java +++ b/pigx-common/pigx-common-swagger/src/main/java/com/pig4cloud/pigx/common/swagger/support/SwaggerProperties.java @@ -17,21 +17,19 @@ package com.pig4cloud.pigx.common.swagger.support; import lombok.Data; -import lombok.NoArgsConstructor; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.stereotype.Component; import java.util.ArrayList; import java.util.List; +import java.util.Map; /** * SwaggerProperties * - * @author: lengleng - * @date: 2018/7/25 14:00 + * @author lengleng + * @date 2018/7/25 14:00 */ @Data -@Component @ConfigurationProperties("swagger") public class SwaggerProperties { @@ -66,103 +64,23 @@ public class SwaggerProperties { private String title = ""; /** - * 描述 - **/ - private String description = ""; - - /** - * 版本 - **/ - private String version = ""; - - /** - * 许可证 - **/ - private String license = ""; - - /** - * 许可证URL - **/ - private String licenseUrl = ""; - - /** - * 服务条款URL - **/ - private String termsOfServiceUrl = ""; - - /** - * host信息 - **/ - private String host = ""; - - /** - * 联系人信息 + * 网关 */ - private Contact contact = new Contact(); + private String gateway; /** - * 全局统一鉴权配置 - **/ - private Authorization authorization = new Authorization(); + * 获取token + */ + private String tokenUrl; - @Data - @NoArgsConstructor - public static class Contact { + /** + * 作用域 + */ + private String scope; - /** - * 联系人 - **/ - private String name = ""; - - /** - * 联系人url - **/ - private String url = ""; - - /** - * 联系人email - **/ - private String email = ""; - - } - - @Data - @NoArgsConstructor - public static class Authorization { - - /** - * 鉴权策略ID，需要和SecurityReferences ID保持一致 - */ - private String name = ""; - - /** - * 需要开启鉴权URL的正则 - */ - private String authRegex = "^.*$"; - - /** - * 鉴权作用域列表 - */ - private List authorizationScopeList = new ArrayList<>(); - - private List tokenUrlList = new ArrayList<>(); - - } - - @Data - @NoArgsConstructor - public static class AuthorizationScope { - - /** - * 作用域名称 - */ - private String scope = ""; - - /** - * 作用域描述 - */ - private String description = ""; - - } + /** + * 服务转发配置 + */ + private Map services; } diff --git a/pigx-common/pigx-common-swagger/src/main/java/com/pig4cloud/pigx/common/swagger/support/SwaggerProvider.java b/pigx-common/pigx-common-swagger/src/main/java/com/pig4cloud/pigx/common/swagger/support/SwaggerProvider.java deleted file mode 100644 index 4c982d0a6..000000000 --- a/pigx-common/pigx-common-swagger/src/main/java/com/pig4cloud/pigx/common/swagger/support/SwaggerProvider.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ - -package com.pig4cloud.pigx.common.swagger.support; - -import lombok.RequiredArgsConstructor; -import org.springframework.cloud.client.discovery.DiscoveryClient; -import org.springframework.cloud.gateway.route.RouteDefinition; -import org.springframework.cloud.gateway.route.RouteDefinitionRepository; -import org.springframework.cloud.gateway.support.NameUtils; -import springfox.documentation.swagger.web.SwaggerResource; -import springfox.documentation.swagger.web.SwaggerResourcesProvider; - -import java.util.ArrayList; -import java.util.Comparator; -import java.util.List; -import java.util.stream.Collectors; - -/** - * @author Sywd 聚合接口文档注册，和zuul实现类似 - */ -@RequiredArgsConstructor -public class SwaggerProvider implements SwaggerResourcesProvider { - - private static final String API_URI = "/v2/api-docs"; - - private final RouteDefinitionRepository routeDefinitionRepository; - - private final SwaggerProperties swaggerProperties; - - private final DiscoveryClient discoveryClient; - - @Override - public List get() { - List routes = new ArrayList<>(); - routeDefinitionRepository.getRouteDefinitions() - // swagger 显示服务名称根据 路由的order 字段进行升序排列 - .sort(Comparator.comparingInt(RouteDefinition::getOrder)).subscribe(routes::add); - - return routes.stream() - .flatMap(routeDefinition -> routeDefinition.getPredicates().stream() - .filter(predicateDefinition -> "Path".equalsIgnoreCase(predicateDefinition.getName())) - .filter(predicateDefinition -> !swaggerProperties.getIgnoreProviders() - .contains(routeDefinition.getId())) - .map(predicateDefinition -> swaggerResource(routeDefinition.getId(), - predicateDefinition.getArgs().get(NameUtils.GENERATED_NAME_PREFIX + "0").replace("/**", - API_URI)))) - // 只显示注册中心 内已经正确启动的服务 - .filter(swaggerResource -> discoveryClient.getServices().stream() - .anyMatch(s -> s.equals(swaggerResource.getName()))) - .collect(Collectors.toList()); - } - - private static SwaggerResource swaggerResource(String name, String location) { - SwaggerResource swaggerResource = new SwaggerResource(); - swaggerResource.setName(name); - swaggerResource.setLocation(location); - swaggerResource.setSwaggerVersion("2.0"); - return swaggerResource; - } - -} diff --git a/pigx-common/pigx-common-swagger/src/main/java/com/pig4cloud/pigx/common/swagger/support/SwaggerResourceHandler.java b/pigx-common/pigx-common-swagger/src/main/java/com/pig4cloud/pigx/common/swagger/support/SwaggerResourceHandler.java deleted file mode 100644 index 3bf66df79..000000000 --- a/pigx-common/pigx-common-swagger/src/main/java/com/pig4cloud/pigx/common/swagger/support/SwaggerResourceHandler.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ - -package com.pig4cloud.pigx.common.swagger.support; - -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.web.reactive.function.BodyInserters; -import org.springframework.web.reactive.function.server.HandlerFunction; -import org.springframework.web.reactive.function.server.ServerRequest; -import org.springframework.web.reactive.function.server.ServerResponse; -import reactor.core.publisher.Mono; -import springfox.documentation.swagger.web.SwaggerResourcesProvider; - -/** - * @author lengleng - * @date 2018-07-19 SwaggerResourceHandler - */ -@Slf4j -@AllArgsConstructor -public class SwaggerResourceHandler implements HandlerFunction { - - private final SwaggerResourcesProvider swaggerResources; - - /** - * Handle the given request. - * @param request the request to handler - * @return the response - */ - @Override - public Mono handle(ServerRequest request) { - return ServerResponse.status(HttpStatus.OK).contentType(MediaType.APPLICATION_JSON) - .body(BodyInserters.fromValue(swaggerResources.get())); - } - -} diff --git a/pigx-common/pigx-common-swagger/src/main/java/com/pig4cloud/pigx/common/swagger/support/SwaggerSecurityHandler.java b/pigx-common/pigx-common-swagger/src/main/java/com/pig4cloud/pigx/common/swagger/support/SwaggerSecurityHandler.java deleted file mode 100644 index 5fb542e7e..000000000 --- a/pigx-common/pigx-common-swagger/src/main/java/com/pig4cloud/pigx/common/swagger/support/SwaggerSecurityHandler.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ - -package com.pig4cloud.pigx.common.swagger.support; - -import lombok.RequiredArgsConstructor; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.web.reactive.function.BodyInserters; -import org.springframework.web.reactive.function.server.HandlerFunction; -import org.springframework.web.reactive.function.server.ServerRequest; -import org.springframework.web.reactive.function.server.ServerResponse; -import reactor.core.publisher.Mono; -import springfox.documentation.swagger.web.SecurityConfiguration; -import springfox.documentation.swagger.web.SecurityConfigurationBuilder; - -import java.util.Optional; - -/** - * @author lengleng - * @date 2018-07-19 SwaggerSecurityHandler - */ -@RequiredArgsConstructor -public class SwaggerSecurityHandler implements HandlerFunction { - - private final SecurityConfiguration securityConfiguration; - - /** - * Handle the given request. - * @param request the request to handler - * @return the response - */ - @Override - public Mono handle(ServerRequest request) { - return ServerResponse.status(HttpStatus.OK).contentType(MediaType.APPLICATION_JSON) - .body(BodyInserters.fromValue(Optional.ofNullable(securityConfiguration) - .orElse(SecurityConfigurationBuilder.builder().build()))); - } - -} diff --git a/pigx-common/pigx-common-swagger/src/main/java/com/pig4cloud/pigx/common/swagger/support/SwaggerUiHandler.java b/pigx-common/pigx-common-swagger/src/main/java/com/pig4cloud/pigx/common/swagger/support/SwaggerUiHandler.java deleted file mode 100644 index 2b5f9dbd4..000000000 --- a/pigx-common/pigx-common-swagger/src/main/java/com/pig4cloud/pigx/common/swagger/support/SwaggerUiHandler.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ - -package com.pig4cloud.pigx.common.swagger.support; - -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.web.reactive.function.BodyInserters; -import org.springframework.web.reactive.function.server.HandlerFunction; -import org.springframework.web.reactive.function.server.ServerRequest; -import org.springframework.web.reactive.function.server.ServerResponse; -import reactor.core.publisher.Mono; -import springfox.documentation.swagger.web.UiConfiguration; -import springfox.documentation.swagger.web.UiConfigurationBuilder; - -import java.util.Optional; - -/** - * @author lengleng - * @date 2018-07-19 SwaggerUiHandler - */ -@Slf4j -@RequiredArgsConstructor -public class SwaggerUiHandler implements HandlerFunction { - - private final UiConfiguration uiConfiguration; - - /** - * Handle the given request. - * @param request the request to handler - * @return the response - */ - @Override - public Mono handle(ServerRequest request) { - return ServerResponse.status(HttpStatus.OK).contentType(MediaType.APPLICATION_JSON).body(BodyInserters - .fromValue(Optional.ofNullable(uiConfiguration).orElse(UiConfigurationBuilder.builder().build()))); - } - -} diff --git a/pigx-common/pigx-common-swagger/src/main/resources/openapi-config.yaml b/pigx-common/pigx-common-swagger/src/main/resources/openapi-config.yaml new file mode 100644 index 000000000..1aaae169c --- /dev/null +++ b/pigx-common/pigx-common-swagger/src/main/resources/openapi-config.yaml @@ -0,0 +1,7 @@ +# swagger 配置 +swagger: + enabled: true + title: PigX Swagger API + gateway: http://${GATEWAY-HOST:pigx-gateway}:${GATEWAY-PORT:9999} + token-url: ${swagger.gateway}/auth/oauth2/token + scope: server diff --git a/pigx-gateway/pom.xml b/pigx-gateway/pom.xml index e1ea188a1..abb94eb8b 100644 --- a/pigx-gateway/pom.xml +++ b/pigx-gateway/pom.xml @@ -92,10 +92,10 @@ com.github.ben-manes.caffeine caffeine - + - com.pig4cloud - pigx-common-swagger + org.springdoc + springdoc-openapi-webflux-ui diff --git a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/PigxGatewayApplication.java b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/PigxGatewayApplication.java index 4c495958f..68025070e 100644 --- a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/PigxGatewayApplication.java +++ b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/PigxGatewayApplication.java @@ -20,7 +20,6 @@ package com.pig4cloud.pigx.gateway; import com.pig4cloud.pigx.common.gateway.annotation.EnablePigxDynamicRoute; -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; @@ -29,7 +28,6 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient; * @author lengleng * @date 2018年06月21日 网关应用 */ -@EnablePigxSwagger2 @EnablePigxDynamicRoute @EnableDiscoveryClient @SpringBootApplication diff --git a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/config/SpringDocConfiguration.java b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/config/SpringDocConfiguration.java new file mode 100644 index 000000000..e6f93b67d --- /dev/null +++ b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/config/SpringDocConfiguration.java @@ -0,0 +1,85 @@ +package com.pig4cloud.pigx.gateway.config; + +import cn.hutool.core.util.StrUtil; +import lombok.Data; +import lombok.RequiredArgsConstructor; +import org.springdoc.core.GroupedOpenApi; +import org.springdoc.core.SwaggerUiConfigParameters; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.cloud.client.ServiceInstance; +import org.springframework.cloud.client.discovery.DiscoveryClient; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; +import org.springframework.stereotype.Component; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +/** + * @author lengleng + * @date 2022/3/26 + *

+ * swagger 3.0 展示 + */ +@RequiredArgsConstructor +@Configuration(proxyBeanMethods = false) +public class SpringDocConfiguration { + + private final DiscoveryClient discoveryClient; + + @Bean + @Lazy(false) + @ConditionalOnProperty(name = "springdoc.api-docs.enabled", matchIfMissing = true) + public List apis(SwaggerUiConfigParameters swaggerUiConfigParameters) { + List groups = new ArrayList<>(); + + for (String serviceId : discoveryClient.getServices()) { + for (ServiceInstance instance : discoveryClient.getInstances(serviceId)) { + String doc = instance.getMetadata().get("spring-doc"); + if (StrUtil.isNotBlank(doc)){ + swaggerUiConfigParameters.addGroup(doc,serviceId); + } + } + } + return groups; + + } + + @Data + @Component + @ConfigurationProperties("swagger") + public class SwaggerDocProperties { + + private Map services; + + /** + * 认证参数 + */ + private SwaggerBasic basic = new SwaggerBasic(); + + @Data + public class SwaggerBasic { + + /** + * 是否开启 basic 认证 + */ + private Boolean enabled; + + /** + * 用户名 + */ + private String username; + + /** + * 密码 + */ + private String password; + + } + + } + +} diff --git a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/PigxRequestGlobalFilter.java b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/PigxRequestGlobalFilter.java index 8fce581ac..c8b74b4f6 100644 --- a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/PigxRequestGlobalFilter.java +++ b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/PigxRequestGlobalFilter.java @@ -78,7 +78,7 @@ public class PigxRequestGlobalFilter implements GlobalFilter, Ordered { @Override public int getOrder() { - return -1000; + return 10; } } diff --git a/pigx-gateway/src/main/resources/application.yml b/pigx-gateway/src/main/resources/application.yml index 184492e17..f83e61d07 100644 --- a/pigx-gateway/src/main/resources/application.yml +++ b/pigx-gateway/src/main/resources/application.yml @@ -10,7 +10,16 @@ spring: server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848} config: server-addr: ${spring.cloud.nacos.discovery.server-addr} + gateway: + routes: + # 固定路由转发配置 无修改 + - id: openapi + uri: lb://pigx-gateway + predicates: + - Path=/v3/api-docs/** + filters: + - RewritePath=/v3/api-docs/(?.*), /$\{path}/$\{path}/v3/api-docs config: import: - optional:nacos:application-@profiles.active@.yml - - optional:nacos:${spring.application.name}-@profiles.active@.yml \ No newline at end of file + - optional:nacos:${spring.application.name}-@profiles.active@.yml diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/SysLogDTO.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/SysLogDTO.java index 3e0d69c9a..2223f7a86 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/SysLogDTO.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/SysLogDTO.java @@ -1,6 +1,6 @@ package com.pig4cloud.pigx.admin.api.dto; -import io.swagger.annotations.ApiModel; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -13,7 +13,7 @@ import java.time.LocalDateTime; * 日志查询传输对象 */ @Data -@ApiModel(value = "日志查询对象") +@Schema(description = "日志查询对象") public class SysLogDTO { /** diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/UserDTO.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/UserDTO.java index d1467fceb..42bf9a176 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/UserDTO.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/UserDTO.java @@ -20,8 +20,7 @@ package com.pig4cloud.pigx.admin.api.dto; import com.pig4cloud.pigx.admin.api.entity.SysUser; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -32,20 +31,20 @@ import java.util.List; * @date 2017/11/5 */ @Data -@ApiModel(value = "系统用户传输对象") +@Schema(description = "系统用户传输对象") @EqualsAndHashCode(callSuper = true) public class UserDTO extends SysUser { /** * 角色ID */ - @ApiModelProperty(value = "角色id集合") + @Schema(description = "角色id集合") private List role; /** * 部门id */ - @ApiModelProperty(value = "部门id") + @Schema(description = "部门id") private Long deptId; /** @@ -56,7 +55,7 @@ public class UserDTO extends SysUser { /** * 新密码 */ - @ApiModelProperty(value = "新密码") + @Schema(description = "新密码") private String newpassword1; } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/UserInfo.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/UserInfo.java index da9886a90..42409e493 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/UserInfo.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/UserInfo.java @@ -20,8 +20,7 @@ package com.pig4cloud.pigx.admin.api.dto; import com.pig4cloud.pigx.admin.api.entity.SysUser; -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; @@ -31,25 +30,25 @@ import java.io.Serializable; * @date 2017/11/11 */ @Data -@ApiModel(value = "用户信息") +@Schema(description = "用户信息") public class UserInfo implements Serializable { /** * 用户基本信息 */ - @ApiModelProperty(value = "用户基本信息") + @Schema(description = "用户基本信息") private SysUser sysUser; /** * 权限标识集合 */ - @ApiModelProperty(value = "权限标识集合") + @Schema(description = "权限标识集合") private String[] permissions; /** * 角色集合 */ - @ApiModelProperty(value = "角色标识集合") + @Schema(description = "角色标识集合") private Long[] roles; } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDept.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDept.java index 8e4f6cf97..0a2d415d9 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDept.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDept.java @@ -21,8 +21,7 @@ package com.pig4cloud.pigx.admin.api.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; @@ -39,69 +38,69 @@ import java.time.LocalDateTime; * @since 2018-01-22 */ @Data -@ApiModel(value = "部门") +@Schema(description = "部门") @EqualsAndHashCode(callSuper = true) public class SysDept extends Model { private static final long serialVersionUID = 1L; @TableId(value = "dept_id", type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "部门id") + @Schema(description = "部门id") private Long deptId; /** * 部门名称 */ @NotBlank(message = "部门名称不能为空") - @ApiModelProperty(value = "部门名称") + @Schema(description = "部门名称") private String name; /** * 排序 */ @NotNull(message = "排序值不能为空") - @ApiModelProperty(value = "排序值") + @Schema(description = "排序值") private Integer sortOrder; /** * 创建人 */ @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "创建人") + @Schema(description = "创建人") private String createBy; /** * 修改人 */ @TableField(fill = FieldFill.UPDATE) - @ApiModelProperty(value = "修改人") + @Schema(description = "修改人") private String updateBy; /** * 创建时间 */ - @ApiModelProperty(value = "创建时间") + @Schema(description = "创建时间") @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; /** * 修改时间 */ - @ApiModelProperty(value = "修改时间") + @Schema(description = "修改时间") @TableField(fill = FieldFill.UPDATE) private LocalDateTime updateTime; /** * 父级部门id */ - @ApiModelProperty(value = "父级部门id") + @Schema(description = "父级部门id") private Long parentId; /** * 是否删除 1：已删除 0：正常 */ @TableLogic - @ApiModelProperty(value = "删除标记,1:已删除,0:正常") + @Schema(description = "删除标记,1:已删除,0:正常") @TableField(fill = FieldFill.INSERT) private String delFlag; diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDeptRelation.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDeptRelation.java index 728060a8d..a11fd61ae 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDeptRelation.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDeptRelation.java @@ -20,8 +20,7 @@ package com.pig4cloud.pigx.admin.api.entity; 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; @@ -34,7 +33,7 @@ import lombok.EqualsAndHashCode; * @since 2018-01-22 */ @Data -@ApiModel(value = "部门关系") +@Schema(description = "部门关系") @EqualsAndHashCode(callSuper = true) public class SysDeptRelation extends Model { @@ -43,13 +42,13 @@ public class SysDeptRelation extends Model { /** * 祖先节点 */ - @ApiModelProperty(value = "祖先节点") + @Schema(description = "祖先节点") private Long ancestor; /** * 后代节点 */ - @ApiModelProperty(value = "后代节点") + @Schema(description = "后代节点") private Long descendant; } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDict.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDict.java index 4d8675365..a2af1f189 100755 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDict.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDict.java @@ -18,8 +18,7 @@ package com.pig4cloud.pigx.admin.api.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; @@ -32,7 +31,7 @@ import java.time.LocalDateTime; * @date 2019/03/19 */ @Data -@ApiModel(value = "字典类型") +@Schema(description = "字典类型") @EqualsAndHashCode(callSuper = true) public class SysDict extends Model { @@ -42,59 +41,59 @@ public class SysDict extends Model { * 编号 */ @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "字典编号") + @Schema(description = "字典编号") private Long id; /** * 类型 */ - @ApiModelProperty(value = "字典类型") + @Schema(description = "字典类型") private String dictType; /** * 描述 */ - @ApiModelProperty(value = "字典描述") + @Schema(description = "字典描述") private String description; /** * 创建时间 */ - @ApiModelProperty(value = "创建时间") + @Schema(description = "创建时间") @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; /** * 更新时间 */ - @ApiModelProperty(value = "更新时间") + @Schema(description = "更新时间") @TableField(fill = FieldFill.UPDATE) private LocalDateTime updateTime; /** * 是否是系统内置 */ - @ApiModelProperty(value = "是否系统内置") + @Schema(description = "是否系统内置") private String systemFlag; /** * 备注信息 */ - @ApiModelProperty(value = "备注信息") + @Schema(description = "备注信息") private String remarks; /** * 创建人 */ @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "创建人") + @Schema(description = "创建人") private String createBy; /** * 修改人 */ @TableField(fill = FieldFill.UPDATE) - @ApiModelProperty(value = "修改人") + @Schema(description = "修改人") private String updateBy; /** @@ -102,7 +101,7 @@ public class SysDict extends Model { */ @TableLogic @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "删除标记,1:已删除,0:正常") + @Schema(description = "删除标记,1:已删除,0:正常") private String delFlag; } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDictItem.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDictItem.java index bf8c33f22..ae3273041 100755 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDictItem.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDictItem.java @@ -19,8 +19,7 @@ package com.pig4cloud.pigx.admin.api.entity; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.fasterxml.jackson.annotation.JsonProperty; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -33,7 +32,7 @@ import java.time.LocalDateTime; * @date 2019/03/19 */ @Data -@ApiModel(value = "字典项") +@Schema(description = "字典项") @EqualsAndHashCode(callSuper = true) public class SysDictItem extends Model { @@ -43,78 +42,78 @@ public class SysDictItem extends Model { * 编号 */ @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "字典项id") + @Schema(description = "字典项id") private Long id; /** * 所属字典类id */ - @ApiModelProperty(value = "所属字典类id") + @Schema(description = "所属字典类id") private Long dictId; /** * 数据值 */ - @ApiModelProperty(value = "数据值") + @Schema(description = "数据值") @JsonProperty(value = "value") private String itemValue; /** * 标签名 */ - @ApiModelProperty(value = "标签名") + @Schema(description = "标签名") private String label; /** * 类型 */ - @ApiModelProperty(value = "类型") + @Schema(description = "类型") private String dictType; /** * 描述 */ - @ApiModelProperty(value = "描述") + @Schema(description = "描述") private String description; /** * 排序（升序） */ - @ApiModelProperty(value = "排序值，默认升序") + @Schema(description = "排序值，默认升序") private Integer sortOrder; /** * 创建人 */ @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "创建人") + @Schema(description = "创建人") private String createBy; /** * 修改人 */ @TableField(fill = FieldFill.UPDATE) - @ApiModelProperty(value = "修改人") + @Schema(description = "修改人") private String updateBy; /** * 创建时间 */ @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "创建时间") + @Schema(description = "创建时间") private LocalDateTime createTime; /** * 更新时间 */ @TableField(fill = FieldFill.UPDATE) - @ApiModelProperty(value = "更新时间") + @Schema(description = "更新时间") private LocalDateTime updateTime; /** * 备注信息 */ - @ApiModelProperty(value = "备注信息") + @Schema(description = "备注信息") private String remarks; /** @@ -122,7 +121,7 @@ public class SysDictItem extends Model { */ @TableLogic @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "删除标记,1:已删除,0:正常") + @Schema(description = "删除标记,1:已删除,0:正常") private String delFlag; } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysFile.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysFile.java index 3fd4f83ee..8884b4a5b 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysFile.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysFile.java @@ -19,8 +19,7 @@ package com.pig4cloud.pigx.admin.api.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; @@ -33,7 +32,7 @@ import java.time.LocalDateTime; * @date 2019-06-18 17:18:42 */ @Data -@ApiModel(value = "文件") +@Schema(description = "文件") @EqualsAndHashCode(callSuper = true) public class SysFile extends Model { @@ -43,65 +42,65 @@ public class SysFile extends Model { * 编号 */ @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "文件编号") + @Schema(description = "文件编号") private Long id; /** * 文件名 */ - @ApiModelProperty(value = "文件名") + @Schema(description = "文件名") private String fileName; /** * 原文件名 */ - @ApiModelProperty(value = "原始文件名") + @Schema(description = "原始文件名") private String original; /** * 容器名称 */ - @ApiModelProperty(value = "存储桶名称") + @Schema(description = "存储桶名称") private String bucketName; /** * 文件类型 */ - @ApiModelProperty(value = "文件类型") + @Schema(description = "文件类型") private String type; /** * 文件大小 */ - @ApiModelProperty(value = "文件大小") + @Schema(description = "文件大小") private Long fileSize; /** * 上传人 */ @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "创建者") + @Schema(description = "创建者") private String createBy; /** * 上传时间 */ @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "创建时间") + @Schema(description = "创建时间") private LocalDateTime createTime; /** * 更新人 */ @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "更新者") + @Schema(description = "更新者") private String updateBy; /** * 更新时间 */ @TableField(fill = FieldFill.UPDATE) - @ApiModelProperty(value = "更新时间") + @Schema(description = "更新时间") private LocalDateTime updateTime; /** @@ -109,7 +108,7 @@ public class SysFile extends Model { */ @TableLogic @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "删除标记,1:已删除,0:正常") + @Schema(description = "删除标记,1:已删除,0:正常") private String delFlag; } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysLog.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysLog.java index 37a8ef785..6303fda6f 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysLog.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysLog.java @@ -22,8 +22,7 @@ package com.pig4cloud.pigx.admin.api.entity; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.*; -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; @@ -39,7 +38,7 @@ import java.time.LocalDateTime; * @since 2017-11-20 */ @Data -@ApiModel(value = "日志") +@Schema(description = "日志") public class SysLog implements Serializable { private static final long serialVersionUID = 1L; @@ -49,7 +48,7 @@ public class SysLog implements Serializable { */ @TableId(type = IdType.ASSIGN_ID) @ExcelProperty("日志编号") - @ApiModelProperty(value = "日志编号") + @Schema(description = "日志编号") private Long id; /** @@ -57,7 +56,7 @@ public class SysLog implements Serializable { */ @NotBlank(message = "日志类型不能为空") @ExcelProperty("日志类型（0-正常 9-错误）") - @ApiModelProperty(value = "日志类型") + @Schema(description = "日志类型") private String logType; /** @@ -65,7 +64,7 @@ public class SysLog implements Serializable { */ @NotBlank(message = "日志标题不能为空") @ExcelProperty("日志标题") - @ApiModelProperty(value = "日志标题") + @Schema(description = "日志标题") private String title; /** @@ -73,7 +72,7 @@ public class SysLog implements Serializable { */ @ExcelProperty("创建人") @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "创建人") + @Schema(description = "创建人") private String createBy; /** @@ -81,7 +80,7 @@ public class SysLog implements Serializable { */ @ExcelProperty("创建时间") @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "创建时间") + @Schema(description = "创建时间") private LocalDateTime createTime; /** @@ -89,62 +88,62 @@ public class SysLog implements Serializable { */ @ExcelIgnore @TableField(fill = FieldFill.UPDATE) - @ApiModelProperty(value = "更新时间") + @Schema(description = "更新时间") private LocalDateTime updateTime; /** * 操作IP地址 */ @ExcelProperty("操作ip地址") - @ApiModelProperty(value = "操作ip地址") + @Schema(description = "操作ip地址") private String remoteAddr; /** * 用户代理 */ - @ApiModelProperty(value = "用户代理") + @Schema(description = "用户代理") private String userAgent; /** * 请求URI */ @ExcelProperty("浏览器") - @ApiModelProperty(value = "请求uri") + @Schema(description = "请求uri") private String requestUri; /** * 操作方式 */ @ExcelProperty("操作方式") - @ApiModelProperty(value = "操作方式") + @Schema(description = "操作方式") private String method; /** * 操作提交的数据 */ @ExcelProperty("提交数据") - @ApiModelProperty(value = "提交数据") + @Schema(description = "提交数据") private String params; /** * 执行时间 */ @ExcelProperty("执行时间") - @ApiModelProperty(value = "方法执行时间") + @Schema(description = "方法执行时间") private Long time; /** * 异常信息 */ @ExcelProperty("异常信息") - @ApiModelProperty(value = "异常信息") + @Schema(description = "异常信息") private String exception; /** * 服务ID */ @ExcelProperty("应用标识") - @ApiModelProperty(value = "应用标识") + @Schema(description = "应用标识") private String serviceId; /** @@ -153,7 +152,7 @@ public class SysLog implements Serializable { @TableLogic @ExcelIgnore @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "删除标记,1:已删除,0:正常") + @Schema(description = "删除标记,1:已删除,0:正常") private String delFlag; } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMenu.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMenu.java index 951d758cb..9e9987c02 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMenu.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMenu.java @@ -21,8 +21,7 @@ package com.pig4cloud.pigx.admin.api.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; @@ -39,7 +38,7 @@ import java.time.LocalDateTime; * @since 2017-11-08 */ @Data -@ApiModel(value = "菜单") +@Schema(description = "菜单") @EqualsAndHashCode(callSuper = true) public class SysMenu extends Model { @@ -49,92 +48,92 @@ public class SysMenu extends Model { * 菜单ID */ @TableId(value = "menu_id", type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "菜单id") + @Schema(description = "菜单id") private Long menuId; /** * 菜单名称 */ @NotBlank(message = "菜单名称不能为空") - @ApiModelProperty(value = "菜单名称") + @Schema(description = "菜单名称") private String name; /** * 菜单权限标识 */ - @ApiModelProperty(value = "菜单权限标识") + @Schema(description = "菜单权限标识") private String permission; /** * 父菜单ID */ @NotNull(message = "菜单父ID不能为空") - @ApiModelProperty(value = "菜单父id") + @Schema(description = "菜单父id") private Long parentId; /** * 图标 */ - @ApiModelProperty(value = "菜单图标") + @Schema(description = "菜单图标") private String icon; /** * 前端路由标识路径，默认和 comment 保持一致 过期 */ - @ApiModelProperty(value = "前端路由标识路径") + @Schema(description = "前端路由标识路径") private String path; /** * 排序值 */ - @ApiModelProperty(value = "排序值") + @Schema(description = "排序值") private Integer sortOrder; /** * 菜单类型 （0菜单 1按钮） */ @NotNull(message = "菜单类型不能为空") - @ApiModelProperty(value = "菜单类型,0:菜单 1:按钮") + @Schema(description = "菜单类型,0:菜单 1:按钮") private String menuType; /** * 路由缓冲 */ - @ApiModelProperty(value = "路由缓冲") + @Schema(description = "路由缓冲") private String keepAlive; /** * 菜单显示隐藏控制 */ - @ApiModelProperty(value = "菜单是否显示") + @Schema(description = "菜单是否显示") private String visible; /** * 创建人 */ @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "创建人") + @Schema(description = "创建人") private String createBy; /** * 修改人 */ @TableField(fill = FieldFill.UPDATE) - @ApiModelProperty(value = "修改人") + @Schema(description = "修改人") private String updateBy; /** * 创建时间 */ @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "创建时间") + @Schema(description = "创建时间") private LocalDateTime createTime; /** * 更新时间 */ @TableField(fill = FieldFill.UPDATE) - @ApiModelProperty(value = "更新时间") + @Schema(description = "更新时间") private LocalDateTime updateTime; /** @@ -142,7 +141,7 @@ public class SysMenu extends Model { */ @TableLogic @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "删除标记,1:已删除,0:正常") + @Schema(description = "删除标记,1:已删除,0:正常") private String delFlag; } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysOauthClientDetails.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysOauthClientDetails.java index 9682740f8..46c8e31c9 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysOauthClientDetails.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysOauthClientDetails.java @@ -21,8 +21,7 @@ package com.pig4cloud.pigx.admin.api.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; @@ -38,83 +37,83 @@ import java.time.LocalDateTime; * @since 2018-05-15 */ @Data -@ApiModel(value = "客户端信息") +@Schema(description = "客户端信息") @EqualsAndHashCode(callSuper = true) public class SysOauthClientDetails extends Model { private static final long serialVersionUID = 1L; @TableId(value = "id", type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "id") + @Schema(description = "id") private Long id; /** * 客户端ID */ @NotBlank(message = "client_id 不能为空") - @ApiModelProperty(value = "客户端id") + @Schema(description = "客户端id") private String clientId; /** * 客户端密钥 */ @NotBlank(message = "client_secret 不能为空") - @ApiModelProperty(value = "客户端密钥") + @Schema(description = "客户端密钥") private String clientSecret; /** * 资源ID */ - @ApiModelProperty(value = "资源id列表") + @Schema(description = "资源id列表") private String resourceIds; /** * 作用域 */ @NotBlank(message = "scope 不能为空") - @ApiModelProperty(value = "作用域") + @Schema(description = "作用域") private String scope; /** * 授权方式[A,B,C] */ - @ApiModelProperty(value = "授权方式") + @Schema(description = "授权方式") private String[] authorizedGrantTypes; /** * 回调地址 */ - @ApiModelProperty(value = "回调地址") + @Schema(description = "回调地址") private String webServerRedirectUri; /** * 权限 */ - @ApiModelProperty(value = "权限列表") + @Schema(description = "权限列表") private String authorities; /** * 请求令牌有效时间 */ - @ApiModelProperty(value = "请求令牌有效时间") + @Schema(description = "请求令牌有效时间") private Integer accessTokenValidity; /** * 刷新令牌有效时间 */ - @ApiModelProperty(value = "刷新令牌有效时间") + @Schema(description = "刷新令牌有效时间") private Integer refreshTokenValidity; /** * 扩展信息 */ - @ApiModelProperty(value = "扩展信息") + @Schema(description = "扩展信息") private String additionalInformation; /** * 是否自动放行 */ - @ApiModelProperty(value = "是否自动放行") + @Schema(description = "是否自动放行") private String autoapprove; /** @@ -122,35 +121,35 @@ public class SysOauthClientDetails extends Model { */ @TableLogic @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "删除标记,1:已删除,0:正常") + @Schema(description = "删除标记,1:已删除,0:正常") private String delFlag; /** * 创建人 */ @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "创建人") + @Schema(description = "创建人") private String createBy; /** * 修改人 */ @TableField(fill = FieldFill.UPDATE) - @ApiModelProperty(value = "修改人") + @Schema(description = "修改人") private String updateBy; /** * 创建时间 */ @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "创建时间") + @Schema(description = "创建时间") private LocalDateTime createTime; /** * 更新时间 */ @TableField(fill = FieldFill.UPDATE) - @ApiModelProperty(value = "更新时间") + @Schema(description = "更新时间") private LocalDateTime updateTime; } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysPost.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysPost.java index 9a2efa3a0..42137b6a5 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysPost.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysPost.java @@ -19,8 +19,7 @@ package com.pig4cloud.pigx.admin.api.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; @@ -37,7 +36,7 @@ import java.time.LocalDateTime; @Data @TableName("sys_post") @EqualsAndHashCode(callSuper = true) -@ApiModel(value = "岗位信息表") +@Schema(description = "岗位信息表") public class SysPost extends Model { private static final long serialVersionUID = 1L; @@ -46,48 +45,48 @@ public class SysPost extends Model { * 岗位ID */ @TableId(value = "post_id", type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "岗位ID") + @Schema(description = "岗位ID") private Long postId; /** * 岗位编码 */ @NotBlank(message = "岗位编码不能为空") - @ApiModelProperty(value = "岗位编码") + @Schema(description = "岗位编码") private String postCode; /** * 岗位名称 */ @NotBlank(message = "岗位名称不能为空") - @ApiModelProperty(value = "岗位名称") + @Schema(description = "岗位名称") private String postName; /** * 岗位排序 */ @NotNull(message = "排序值不能为空") - @ApiModelProperty(value = "岗位排序") + @Schema(description = "岗位排序") private Integer postSort; /** * 岗位描述 */ - @ApiModelProperty(value = "岗位描述") + @Schema(description = "岗位描述") private String remark; /** * 创建人 */ @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "创建人") + @Schema(description = "创建人") private String createBy; /** * 修改人 */ @TableField(fill = FieldFill.UPDATE) - @ApiModelProperty(value = "修改人") + @Schema(description = "修改人") private String updateBy; /** @@ -95,20 +94,20 @@ public class SysPost extends Model { */ @TableLogic @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "是否删除 -1：已删除 0：正常") + @Schema(description = "是否删除 -1：已删除 0：正常") private String delFlag; /** * 创建时间 */ - @ApiModelProperty(value = "创建时间") + @Schema(description = "创建时间") @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; /** * 更新时间 */ - @ApiModelProperty(value = "更新时间") + @Schema(description = "更新时间") @TableField(fill = FieldFill.UPDATE) private LocalDateTime updateTime; diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysPublicParam.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysPublicParam.java index a7793302f..5c978830a 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysPublicParam.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysPublicParam.java @@ -19,8 +19,7 @@ package com.pig4cloud.pigx.admin.api.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; @@ -33,7 +32,7 @@ import java.time.LocalDateTime; * @date 2019-04-29 */ @Data -@ApiModel(value = "公共参数") +@Schema(description = "公共参数") @EqualsAndHashCode(callSuper = true) public class SysPublicParam extends Model { @@ -43,63 +42,63 @@ public class SysPublicParam extends Model { * 编号 */ @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "公共参数编号") + @Schema(description = "公共参数编号") private Long publicId; /** * 公共参数名称 */ - @ApiModelProperty(value = "公共参数名称", required = true, example = "公共参数名称") + @Schema(description = "公共参数名称", required = true, example = "公共参数名称") private String publicName; /** * 公共参数地址值,英文大写+下划线 */ - @ApiModelProperty(value = "键[英文大写+下划线]", required = true, example = "PIGX_PUBLIC_KEY") + @Schema(description = "键[英文大写+下划线]", required = true, example = "PIGX_PUBLIC_KEY") private String publicKey; /** * 值 */ - @ApiModelProperty(value = "值", required = true, example = "999") + @Schema(description = "值", required = true, example = "999") private String publicValue; /** * 状态（1有效；2无效；） */ - @ApiModelProperty(value = "标识[1有效；2无效]", example = "1") + @Schema(description = "标识[1有效；2无效]", example = "1") private String status; /** * 公共参数编码 */ - @ApiModelProperty(value = "编码", example = "^(PIG|PIGX)$") + @Schema(description = "编码", example = "^(PIG|PIGX)$") private String validateCode; /** * 是否是系统内置 */ - @ApiModelProperty(value = "是否是系统内置") + @Schema(description = "是否是系统内置") private String systemFlag; /** * 配置类型：0-默认；1-检索；2-原文；3-报表；4-安全；5-文档；6-消息；9-其他 */ - @ApiModelProperty(value = "类型[1-检索；2-原文...]", example = "1") + @Schema(description = "类型[1-检索；2-原文...]", example = "1") private String publicType; /** * 创建人 */ @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "创建人") + @Schema(description = "创建人") private String createBy; /** * 修改人 */ @TableField(fill = FieldFill.UPDATE) - @ApiModelProperty(value = "修改人") + @Schema(description = "修改人") private String updateBy; /** @@ -107,21 +106,21 @@ public class SysPublicParam extends Model { */ @TableLogic @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "删除标记,1:已删除,0:正常") + @Schema(description = "删除标记,1:已删除,0:正常") private String delFlag; /** * 创建时间 */ @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "创建时间") + @Schema(description = "创建时间") private LocalDateTime createTime; /** * 更新时间 */ @TableField(fill = FieldFill.UPDATE) - @ApiModelProperty(value = "更新时间") + @Schema(description = "更新时间") private LocalDateTime updateTime; } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRole.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRole.java index 99b2de188..4b5370207 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRole.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRole.java @@ -21,8 +21,7 @@ package com.pig4cloud.pigx.admin.api.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; @@ -39,62 +38,62 @@ import java.time.LocalDateTime; * @since 2017-10-29 */ @Data -@ApiModel(value = "角色") +@Schema(description = "角色") @EqualsAndHashCode(callSuper = true) public class SysRole extends Model { private static final long serialVersionUID = 1L; @TableId(value = "role_id", type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "角色编号") + @Schema(description = "角色编号") private Long roleId; @NotBlank(message = "角色名称不能为空") - @ApiModelProperty(value = "角色名称") + @Schema(description = "角色名称") private String roleName; @NotBlank(message = "角色标识不能为空") - @ApiModelProperty(value = "角色标识") + @Schema(description = "角色标识") private String roleCode; - @ApiModelProperty(value = "角色描述") + @Schema(description = "角色描述") private String roleDesc; @NotNull(message = "数据权限类型不能为空") - @ApiModelProperty(value = "数据权限类型") + @Schema(description = "数据权限类型") private Integer dsType; /** * 数据权限作用范围 */ - @ApiModelProperty(value = "数据权限作用范围") + @Schema(description = "数据权限作用范围") private String dsScope; /** * 创建人 */ @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "创建人") + @Schema(description = "创建人") private String createBy; /** * 修改人 */ @TableField(fill = FieldFill.UPDATE) - @ApiModelProperty(value = "修改人") + @Schema(description = "修改人") private String updateBy; /** * 创建时间 */ - @ApiModelProperty(value = "创建时间") + @Schema(description = "创建时间") @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; /** * 修改时间 */ - @ApiModelProperty(value = "修改时间") + @Schema(description = "修改时间") @TableField(fill = FieldFill.UPDATE) private LocalDateTime updateTime; @@ -103,7 +102,7 @@ public class SysRole extends Model { */ @TableLogic @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "删除标记,1:已删除,0:正常") + @Schema(description = "删除标记,1:已删除,0:正常") private String delFlag; } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRoleMenu.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRoleMenu.java index 617f75d75..be42abe7c 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRoleMenu.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRoleMenu.java @@ -20,8 +20,7 @@ package com.pig4cloud.pigx.admin.api.entity; 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; @@ -34,7 +33,7 @@ import lombok.EqualsAndHashCode; * @since 2017-10-29 */ @Data -@ApiModel(value = "角色菜单") +@Schema(description = "角色菜单") @EqualsAndHashCode(callSuper = true) public class SysRoleMenu extends Model { @@ -43,13 +42,13 @@ public class SysRoleMenu extends Model { /** * 角色ID */ - @ApiModelProperty(value = "角色id") + @Schema(description = "角色id") private Long roleId; /** * 菜单ID */ - @ApiModelProperty(value = "菜单id") + @Schema(description = "菜单id") private Long menuId; } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRouteConf.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRouteConf.java index e20bdaa35..8273833aa 100755 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRouteConf.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRouteConf.java @@ -20,8 +20,7 @@ package com.pig4cloud.pigx.admin.api.entity; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; 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 lombok.EqualsAndHashCode; @@ -34,7 +33,7 @@ import java.time.LocalDateTime; * @date 2018-11-06 10:17:18 */ @Data -@ApiModel(value = "网关路由信息") +@Schema(description = "网关路由信息") @EqualsAndHashCode(callSuper = true) public class SysRouteConf extends Model { @@ -42,73 +41,73 @@ public class SysRouteConf extends Model { @JsonIgnore @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键") + @Schema(description = "主键") private Long id; /** * 路由ID */ - @ApiModelProperty(value = "路由id") + @Schema(description = "路由id") private String routeId; /** * 路由名称 */ - @ApiModelProperty(value = "路由名称") + @Schema(description = "路由名称") private String routeName; /** * 断言 */ - @ApiModelProperty(value = "断言") + @Schema(description = "断言") private String predicates; /** * 过滤器 */ - @ApiModelProperty(value = "过滤器") + @Schema(description = "过滤器") private String filters; /** * uri */ - @ApiModelProperty(value = "请求uri") + @Schema(description = "请求uri") private String uri; /** * 排序 */ - @ApiModelProperty(value = "排序值") + @Schema(description = "排序值") private Integer sortOrder; - @ApiModelProperty(value = "元数据") + @Schema(description = "元数据") private String metadata; /** * 创建人 */ @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "创建人") + @Schema(description = "创建人") private String createBy; /** * 修改人 */ @TableField(fill = FieldFill.UPDATE) - @ApiModelProperty(value = "修改人") + @Schema(description = "修改人") private String updateBy; /** * 创建时间 */ - @ApiModelProperty(value = "创建时间") + @Schema(description = "创建时间") @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; /** * 修改时间 */ - @ApiModelProperty(value = "修改时间") + @Schema(description = "修改时间") @TableField(fill = FieldFill.UPDATE) private LocalDateTime updateTime; @@ -116,7 +115,7 @@ public class SysRouteConf extends Model { * 删除标识（0-正常,1-删除） */ @TableLogic - @ApiModelProperty(value = "删除标记,1:已删除,0:正常") + @Schema(description = "删除标记,1:已删除,0:正常") @TableField(fill = FieldFill.INSERT) private String delFlag; diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysSocialDetails.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysSocialDetails.java index 1ad7dc16a..f6117b23b 100755 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysSocialDetails.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysSocialDetails.java @@ -21,8 +21,7 @@ import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.pig4cloud.pigx.common.core.sensitive.Sensitive; import com.pig4cloud.pigx.common.core.util.ValidGroup; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -36,7 +35,7 @@ import java.time.LocalDateTime; * @date 2018-08-16 21:30:41 */ @Data -@ApiModel(value = "第三方账号信息") +@Schema(description = "第三方账号信息") @EqualsAndHashCode(callSuper = true) public class SysSocialDetails extends Model { @@ -46,20 +45,20 @@ public class SysSocialDetails extends Model { * 主鍵 */ @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键") + @Schema(description = "主键") private Long id; /** * 类型 */ @NotBlank(message = "类型不能为空") - @ApiModelProperty(value = "账号类型") + @Schema(description = "账号类型") private String type; /** * 描述 */ - @ApiModelProperty(value = "描述") + @Schema(description = "描述") private String remark; /** @@ -67,7 +66,7 @@ public class SysSocialDetails extends Model { */ @Sensitive(prefixNoMaskLen = 4, suffixNoMaskLen = 4) @NotBlank(message = "账号不能为空") - @ApiModelProperty(value = "appId") + @Schema(description = "appId") private String appId; /** @@ -75,46 +74,46 @@ public class SysSocialDetails extends Model { */ @Sensitive(prefixNoMaskLen = 9, suffixNoMaskLen = 9) @NotBlank(message = "密钥不能为空", groups = { ValidGroup.Insert.class }) - @ApiModelProperty(value = "app secret") + @Schema(description = "app secret") private String appSecret; /** * 回调地址 */ - @ApiModelProperty(value = "回调地址") + @Schema(description = "回调地址") private String redirectUrl; /** * 拓展字段 */ - @ApiModelProperty(value = "拓展字段") + @Schema(description = "拓展字段") private String ext; /** * 创建人 */ @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "创建人") + @Schema(description = "创建人") private String createBy; /** * 修改人 */ @TableField(fill = FieldFill.UPDATE) - @ApiModelProperty(value = "修改人") + @Schema(description = "修改人") private String updateBy; /** * 创建时间 */ - @ApiModelProperty(value = "创建时间") + @Schema(description = "创建时间") @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; /** * 更新时间 */ - @ApiModelProperty(value = "更新时间") + @Schema(description = "更新时间") @TableField(fill = FieldFill.UPDATE) private LocalDateTime updateTime; @@ -123,7 +122,7 @@ public class SysSocialDetails extends Model { */ @TableLogic @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "删除标记,1:已删除,0:正常") + @Schema(description = "删除标记,1:已删除,0:正常") private String delFlag; } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysTenant.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysTenant.java index 246252395..e7b7d3d96 100755 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysTenant.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysTenant.java @@ -19,8 +19,7 @@ package com.pig4cloud.pigx.admin.api.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; @@ -33,7 +32,7 @@ import java.time.LocalDateTime; * @date 2019-05-15 15:55:41 */ @Data -@ApiModel(value = "租户信息") +@Schema(description = "租户信息") @EqualsAndHashCode(callSuper = true) public class SysTenant extends Model { @@ -43,60 +42,60 @@ public class SysTenant extends Model { * 租户id */ @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "租户id") + @Schema(description = "租户id") private Long id; /** * 租户名称 */ - @ApiModelProperty(value = "租户名称") + @Schema(description = "租户名称") private String name; /** * 租户编号 */ - @ApiModelProperty(value = "租户编号") + @Schema(description = "租户编号") private String code; /** * 租户域名 */ - @ApiModelProperty(value = "租户域名") + @Schema(description = "租户域名") private String tenantDomain; /** * 开始时间 */ - @ApiModelProperty(value = "开始时间") + @Schema(description = "开始时间") private LocalDateTime startTime; /** * 结束时间 */ - @ApiModelProperty(value = "结束时间") + @Schema(description = "结束时间") private LocalDateTime endTime; /** * 0正常 9-冻结 */ - @ApiModelProperty(value = "租户冻结标记,9:冻结,0:正常") + @Schema(description = "租户冻结标记,9:冻结,0:正常") private String status; - @ApiModelProperty("租户菜单ID") + @Schema(description = "租户菜单ID") private String menuId; /** * 创建人 */ @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "创建人") + @Schema(description = "创建人") private String createBy; /** * 修改人 */ @TableField(fill = FieldFill.UPDATE) - @ApiModelProperty(value = "修改人") + @Schema(description = "修改人") private String updateBy; /** @@ -104,21 +103,21 @@ public class SysTenant extends Model { */ @TableLogic @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "删除标记,1:已删除,0:正常") + @Schema(description = "删除标记,1:已删除,0:正常") private String delFlag; /** * 创建时间 */ @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "创建时间") + @Schema(description = "创建时间") private LocalDateTime createTime; /** * 更新时间 */ @TableField(fill = FieldFill.UPDATE) - @ApiModelProperty(value = "更新时间") + @Schema(description = "更新时间") private LocalDateTime updateTime; } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysTenantMenu.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysTenantMenu.java index f85a02ff3..6c481d32b 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysTenantMenu.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysTenantMenu.java @@ -2,8 +2,7 @@ package com.pig4cloud.pigx.admin.api.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; @@ -13,7 +12,7 @@ import java.time.LocalDateTime; * 租户菜单 */ @Data -@ApiModel(value = "租户菜单") +@Schema(description = "租户菜单") @EqualsAndHashCode(callSuper = true) public class SysTenantMenu extends Model { @@ -21,39 +20,39 @@ public class SysTenantMenu extends Model { * id */ @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "id") + @Schema(description = "id") private Long id; /** * 租户菜单名称 */ - @ApiModelProperty(value = "租户菜单名称") + @Schema(description = "租户菜单名称") private String name; /** * 菜单id集合 */ - @ApiModelProperty(value = "菜单id集合") + @Schema(description = "菜单id集合") private String menuIds; /** * 0正常 9-冻结 */ - @ApiModelProperty(value = "租户菜单,9:冻结,0:正常") + @Schema(description = "租户菜单,9:冻结,0:正常") private String status; /** * 创建人 */ @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "创建人") + @Schema(description = "创建人") private String createBy; /** * 修改人 */ @TableField(fill = FieldFill.UPDATE) - @ApiModelProperty(value = "修改人") + @Schema(description = "修改人") private String updateBy; /** @@ -61,21 +60,21 @@ public class SysTenantMenu extends Model { */ @TableLogic @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "删除标记,1:已删除,0:正常") + @Schema(description = "删除标记,1:已删除,0:正常") private String delFlag; /** * 创建时间 */ @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "创建时间") + @Schema(description = "创建时间") private LocalDateTime createTime; /** * 更新时间 */ @TableField(fill = FieldFill.UPDATE) - @ApiModelProperty(value = "更新时间") + @Schema(description = "更新时间") private LocalDateTime updateTime; } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUser.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUser.java index 42ac89bde..1913a96ed 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUser.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUser.java @@ -21,8 +21,7 @@ package com.pig4cloud.pigx.admin.api.entity; import com.baomidou.mybatisplus.annotation.*; 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 java.io.Serializable; @@ -37,7 +36,7 @@ import java.time.LocalDateTime; * @since 2017-10-29 */ @Data -@ApiModel(value = "用户") +@Schema(description = "用户") public class SysUser implements Serializable { private static final long serialVersionUID = 1L; @@ -46,54 +45,54 @@ public class SysUser implements Serializable { * 主键ID */ @TableId(value = "user_id", type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键id") + @Schema(description = "主键id") private Long userId; /** * 用户名 */ - @ApiModelProperty(value = "用户名") + @Schema(description = "用户名") private String username; /** * 密码 */ - @ApiModelProperty(value = "密码") + @Schema(description = "密码") private String password; /** * 随机盐 */ @JsonIgnore - @ApiModelProperty(value = "随机盐") + @Schema(description = "随机盐") private String salt; /** * 创建人 */ @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "创建人") + @Schema(description = "创建人") private String createBy; /** * 修改人 */ @TableField(fill = FieldFill.UPDATE) - @ApiModelProperty(value = "修改人") + @Schema(description = "修改人") private String updateBy; /** * 创建时间 */ @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "创建时间") + @Schema(description = "创建时间") private LocalDateTime createTime; /** * 修改时间 */ @TableField(fill = FieldFill.UPDATE) - @ApiModelProperty(value = "修改时间") + @Schema(description = "修改时间") private LocalDateTime updateTime; /** @@ -101,85 +100,85 @@ public class SysUser implements Serializable { */ @TableLogic @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "删除标记,1:已删除,0:正常") + @Schema(description = "删除标记,1:已删除,0:正常") private String delFlag; /** * 锁定标记 */ - @ApiModelProperty(value = "锁定标记") + @Schema(description = "锁定标记") private String lockFlag; /** * 手机号 */ - @ApiModelProperty(value = "手机号") + @Schema(description = "手机号") private String phone; /** * 头像 */ - @ApiModelProperty(value = "头像地址") + @Schema(description = "头像地址") private String avatar; /** * 部门ID */ - @ApiModelProperty(value = "用户所属部门id") + @Schema(description = "用户所属部门id") private Long deptId; /** * 租户ID */ - @ApiModelProperty(value = "用户所属租户id") + @Schema(description = "用户所属租户id") private Long tenantId; /** * 微信openid */ - @ApiModelProperty(value = "微信openid") + @Schema(description = "微信openid") private String wxOpenid; /** * 微信小程序openId */ - @ApiModelProperty(value = "微信小程序openid") + @Schema(description = "微信小程序openid") private String miniOpenid; /** * QQ openid */ - @ApiModelProperty(value = "QQ openid") + @Schema(description = "QQ openid") private String qqOpenid; /** * 码云唯一标识 */ - @ApiModelProperty(value = "码云唯一标识") + @Schema(description = "码云唯一标识") private String giteeLogin; /** * 开源中国唯一标识 */ - @ApiModelProperty(value = "开源中国唯一标识") + @Schema(description = "开源中国唯一标识") private String oscId; /** * 昵称 */ - @ApiModelProperty(value = "昵称") + @Schema(description = "昵称") private String nickname; /** * 姓名 */ - @ApiModelProperty(value = "姓名") + @Schema(description = "姓名") private String name; /** * 邮箱 */ - @ApiModelProperty(value = "邮箱") + @Schema(description = "邮箱") private String email; } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUserPost.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUserPost.java index a83dce85e..0018a45ab 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUserPost.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUserPost.java @@ -17,7 +17,7 @@ package com.pig4cloud.pigx.admin.api.entity; import com.baomidou.mybatisplus.extension.activerecord.Model; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -37,13 +37,13 @@ public class SysUserPost extends Model { /** * 用户ID */ - @ApiModelProperty(value = "用户id") + @Schema(description = "用户id") private Long userId; /** * 岗位ID */ - @ApiModelProperty(value = "岗位id") + @Schema(description = "岗位id") private Long postId; } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUserRole.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUserRole.java index a3d6d1a99..de5de054d 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUserRole.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUserRole.java @@ -20,8 +20,7 @@ package com.pig4cloud.pigx.admin.api.entity; 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; @@ -34,7 +33,7 @@ import lombok.EqualsAndHashCode; * @since 2017-10-29 */ @Data -@ApiModel(value = "用户角色") +@Schema(description = "用户角色") @EqualsAndHashCode(callSuper = true) public class SysUserRole extends Model { @@ -43,13 +42,13 @@ public class SysUserRole extends Model { /** * 用户ID */ - @ApiModelProperty(value = "用户id") + @Schema(description = "用户id") private Long userId; /** * 角色ID */ - @ApiModelProperty(value = "角色id") + @Schema(description = "角色id") private Long roleId; } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteTokenService.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteTokenService.java index c2d493882..e13d51eb7 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteTokenService.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteTokenService.java @@ -23,7 +23,6 @@ import com.pig4cloud.pigx.common.core.constant.SecurityConstants; import com.pig4cloud.pigx.common.core.constant.ServiceNameConstants; import com.pig4cloud.pigx.common.core.util.R; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.*; import java.util.Map; diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/DeptExcelVo.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/DeptExcelVo.java index ea3427291..058fb8b0a 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/DeptExcelVo.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/DeptExcelVo.java @@ -6,7 +6,6 @@ import com.pig4cloud.pigx.common.excel.annotation.ExcelLine; import lombok.Data; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import java.io.Serializable; /** diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/PreLogVO.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/PreLogVO.java index 9ffd22d68..a45fd1469 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/PreLogVO.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/PreLogVO.java @@ -17,8 +17,7 @@ package com.pig4cloud.pigx.admin.api.vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; /** @@ -26,49 +25,49 @@ import lombok.Data; * @date 2018/8/27 前端日志vo */ @Data -@ApiModel(value = "前端日志展示对象") +@Schema(description = "前端日志展示对象") public class PreLogVO { /** * 请求url */ - @ApiModelProperty(value = "请求url") + @Schema(description = "请求url") private String url; /** * 请求耗时 */ - @ApiModelProperty(value = "请求耗时") + @Schema(description = "请求耗时") private String time; /** * 请求用户 */ - @ApiModelProperty(value = "请求用户") + @Schema(description = "请求用户") private String user; /** * 请求结果 */ - @ApiModelProperty(value = "请求结果0:成功9:失败") + @Schema(description = "请求结果0:成功9:失败") private String type; /** * 请求传递参数 */ - @ApiModelProperty(value = "请求传递参数") + @Schema(description = "请求传递参数") private String message; /** * 异常信息 */ - @ApiModelProperty(value = "异常信息") + @Schema(description = "异常信息") private String stack; /** * 日志标题 */ - @ApiModelProperty(value = "日志标题") + @Schema(description = "日志标题") private String info; } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/RoleVO.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/RoleVO.java index bb450814c..ed698bf9d 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/RoleVO.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/RoleVO.java @@ -17,7 +17,7 @@ package com.pig4cloud.pigx.admin.api.vo; -import io.swagger.annotations.ApiModel; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; /** @@ -25,7 +25,7 @@ import lombok.Data; * @date 2020/2/10 */ @Data -@ApiModel(value = "前端角色展示对象") +@Schema(description = "前端角色展示对象") public class RoleVO { /** diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/UserVO.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/UserVO.java index 6d6574395..f4b1feea3 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/UserVO.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/UserVO.java @@ -23,8 +23,7 @@ import com.pig4cloud.pigx.admin.api.entity.SysPost; import com.pig4cloud.pigx.admin.api.entity.SysRole; import com.pig4cloud.pigx.common.core.sensitive.Sensitive; import com.pig4cloud.pigx.common.core.sensitive.SensitiveTypeEnum; -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; @@ -36,7 +35,7 @@ import java.util.List; * @date 2017/10/29 */ @Data -@ApiModel(value = "前端用户展示对象") +@Schema(description = "前端用户展示对象") public class UserVO implements Serializable { private static final long serialVersionUID = 1L; @@ -44,98 +43,98 @@ public class UserVO implements Serializable { /** * 主键ID */ - @ApiModelProperty(value = "主键") + @Schema(description = "主键") private Long userId; /** * 用户名 */ - @ApiModelProperty(value = "用户名") + @Schema(description = "用户名") private String username; /** * 密码 */ - @ApiModelProperty(value = "密码") + @Schema(description = "密码") private String password; /** * 随机盐 */ - @ApiModelProperty(value = "随机盐") + @Schema(description = "随机盐") private String salt; /** * 微信openid */ - @ApiModelProperty(value = "微信open id") + @Schema(description = "微信open id") private String wxOpenid; /** * QQ openid */ - @ApiModelProperty(value = "qq open id") + @Schema(description = "qq open id") private String qqOpenid; /** * 创建时间 */ - @ApiModelProperty(value = "创建时间") + @Schema(description = "创建时间") private LocalDateTime createTime; /** * 修改时间 */ - @ApiModelProperty(value = "修改时间") + @Schema(description = "修改时间") private LocalDateTime updateTime; /** * 0-正常，1-删除 */ - @ApiModelProperty(value = "删除标记,1:已删除,0:正常") + @Schema(description = "删除标记,1:已删除,0:正常") private String delFlag; /** * 锁定标记 */ - @ApiModelProperty(value = "锁定标记,0:正常,9:已锁定") + @Schema(description = "锁定标记,0:正常,9:已锁定") private String lockFlag; /** * 手机号 */ @Sensitive(type = SensitiveTypeEnum.MOBILE_PHONE) - @ApiModelProperty(value = "手机号") + @Schema(description = "手机号") private String phone; /** * 头像 */ - @ApiModelProperty(value = "头像") + @Schema(description = "头像") private String avatar; /** * 部门ID */ - @ApiModelProperty(value = "所属部门") + @Schema(description = "所属部门") private Long deptId; /** * 租户ID */ - @ApiModelProperty(value = "所属租户") + @Schema(description = "所属租户") private Long tenantId; /** * 部门名称 */ - @ApiModelProperty(value = "所属部门名称") + @Schema(description = "所属部门名称") private String deptName; /** * 角色列表 */ - @ApiModelProperty(value = "拥有的角色列表") + @Schema(description = "拥有的角色列表") private List roleList; /** @@ -146,19 +145,19 @@ public class UserVO implements Serializable { /** * 昵称 */ - @ApiModelProperty(value = "昵称") + @Schema(description = "昵称") private String nickname; /** * 姓名 */ - @ApiModelProperty(value = "姓名") + @Schema(description = "姓名") private String name; /** * 邮箱 */ - @ApiModelProperty(value = "邮箱") + @Schema(description = "邮箱") private String email; } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/PigxAdminApplication.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/PigxAdminApplication.java index bb21ddad0..0968550e3 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/PigxAdminApplication.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/PigxAdminApplication.java @@ -21,7 +21,7 @@ package com.pig4cloud.pigx.admin; 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; @@ -32,7 +32,7 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient; *

* 用户统一管理系统 */ -@EnablePigxSwagger2 +@EnableOpenApi("admin") @EnablePigxFeignClients @EnablePigxResourceServer @EnableDiscoveryClient diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/ConnectController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/ConnectController.java index 1d5d10896..3cd2c7167 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/ConnectController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/ConnectController.java @@ -4,8 +4,10 @@ import com.pig4cloud.pigx.admin.api.entity.SysDept; import com.pig4cloud.pigx.admin.service.ConnectService; import com.pig4cloud.pigx.admin.service.SysDeptService; import com.pig4cloud.pigx.common.core.util.R; -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.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -20,7 +22,8 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequiredArgsConstructor @RequestMapping("/connect") -@Api(value = "connect", tags = "开放互联") +@Tag(description = "connect", name = "开放互联") +@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) public class ConnectController { private final ConnectService connectService; diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MobileController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MobileController.java index 99d231004..a6835797b 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MobileController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MobileController.java @@ -20,8 +20,10 @@ package com.pig4cloud.pigx.admin.controller; import com.pig4cloud.pigx.admin.service.MobileService; 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.AllArgsConstructor; +import org.springframework.http.HttpHeaders; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; @@ -36,7 +38,8 @@ import org.springframework.web.bind.annotation.RestController; @RestController @AllArgsConstructor @RequestMapping("/mobile") -@Api(value = "mobile", tags = "手机管理模块") +@Tag(description = "mobile", name = "手机管理模块") +@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) public class MobileController { private final MobileService mobileService; diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/RegisterController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/RegisterController.java index c674ec178..b64953102 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/RegisterController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/RegisterController.java @@ -5,8 +5,10 @@ import com.pig4cloud.pigx.admin.service.SysUserService; 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.v3.oas.annotations.security.SecurityRequirement; import lombok.RequiredArgsConstructor; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.http.HttpHeaders; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -22,6 +24,7 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("/register") @RequiredArgsConstructor @ConditionalOnProperty(name = "register.user", matchIfMissing = true) +@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) public class RegisterController { private final SysUserService userService; diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysClientController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysClientController.java index 5c2564ee5..9ddebfa6e 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysClientController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysClientController.java @@ -27,8 +27,10 @@ import com.pig4cloud.pigx.admin.service.SysOauthClientDetailsService; 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.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.*; @@ -45,7 +47,8 @@ import javax.validation.Valid; @RestController @AllArgsConstructor @RequestMapping("/client") -@Api(value = "client", tags = "客户端管理模块") +@Tag(description = "client", name = "客户端管理模块") +@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) public class SysClientController { private final SysOauthClientDetailsService clientDetailsService; diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysDeptController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysDeptController.java index 131e480be..80e20ba97 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysDeptController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysDeptController.java @@ -22,7 +22,6 @@ package com.pig4cloud.pigx.admin.controller; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.pig4cloud.pigx.admin.api.entity.SysDept; import com.pig4cloud.pigx.admin.api.entity.SysDeptRelation; -import com.pig4cloud.pigx.admin.api.vo.CpUserExcelVo; import com.pig4cloud.pigx.admin.api.vo.DeptExcelVo; import com.pig4cloud.pigx.admin.service.SysDeptRelationService; import com.pig4cloud.pigx.admin.service.SysDeptService; @@ -30,9 +29,10 @@ import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.excel.annotation.RequestExcel; import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel; import com.pig4cloud.pigx.common.log.annotation.SysLog; -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 oracle.jdbc.proxy.annotation.Post; +import org.springframework.http.HttpHeaders; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; @@ -52,7 +52,8 @@ import java.util.List; @RestController @AllArgsConstructor @RequestMapping("/dept") -@Api(value = "dept", tags = "部门管理模块") +@Tag(description = "dept", name = "部门管理模块") +@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) public class SysDeptController { private final SysDeptRelationService relationService; diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysDictController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysDictController.java index ef97d8eaf..27657f401 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysDictController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysDictController.java @@ -29,10 +29,12 @@ import com.pig4cloud.pigx.admin.service.SysDictService; import com.pig4cloud.pigx.common.core.constant.CacheConstants; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.log.annotation.SysLog; -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.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; +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.List; @RestController @AllArgsConstructor @RequestMapping("/dict") -@Api(value = "dict", tags = "字典管理模块") +@Tag(description = "dict", name = "字典管理模块") +@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) public class SysDictController { private final SysDictService sysDictService; diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysFileController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysFileController.java index e399d36f8..874c0f736 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysFileController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysFileController.java @@ -25,11 +25,13 @@ import com.pig4cloud.pigx.admin.service.SysFileService; 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 lombok.SneakyThrows; import org.springframework.core.io.ClassPathResource; +import org.springframework.http.HttpHeaders; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -45,7 +47,8 @@ import javax.servlet.http.HttpServletResponse; @RestController @AllArgsConstructor @RequestMapping("/sys-file") -@Api(value = "sys-file", tags = "文件管理") +@Tag(description = "sys-file", name = "文件管理") +@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) public class SysFileController { private final SysFileService sysFileService; @@ -56,7 +59,7 @@ public class SysFileController { * @param sysFile 文件管理 * @return */ - @ApiOperation(value = "分页查询", notes = "分页查询") + @Operation(summary = "分页查询", description = "分页查询") @GetMapping("/page") public R getSysFilePage(Page page, SysFile sysFile) { return R.ok(sysFileService.page(page, Wrappers.query(sysFile))); @@ -67,7 +70,7 @@ public class SysFileController { * @param id id * @return R */ - @ApiOperation(value = "通过id删除文件管理", notes = "通过id删除文件管理") + @Operation(summary = "通过id删除文件管理", description = "通过id删除文件管理") @SysLog("删除文件管理") @DeleteMapping("/{id}") @PreAuthorize("@pms.hasPermission('sys_file_del')") diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysLogController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysLogController.java index 8653af23e..c28bdc4d6 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysLogController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysLogController.java @@ -29,8 +29,10 @@ import com.pig4cloud.pigx.admin.service.SysLogService; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel; 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.AllArgsConstructor; +import org.springframework.http.HttpHeaders; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -48,7 +50,8 @@ import java.util.List; @RestController @AllArgsConstructor @RequestMapping("/log") -@Api(value = "log", tags = "日志管理模块") +@Tag(description = "log", name = "日志管理模块") +@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) public class SysLogController { private final SysLogService sysLogService; diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysMenuController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysMenuController.java index cd210ec2b..f20be43f2 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysMenuController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysMenuController.java @@ -24,8 +24,10 @@ import com.pig4cloud.pigx.admin.service.SysMenuService; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.log.annotation.SysLog; import com.pig4cloud.pigx.common.security.util.SecurityUtils; -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.*; @@ -41,7 +43,8 @@ import java.util.stream.Collectors; @RestController @AllArgsConstructor @RequestMapping("/menu") -@Api(value = "menu", tags = "菜单管理模块") +@Tag(description = "menu", name = "菜单管理模块") +@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) public class SysMenuController { private final SysMenuService sysMenuService; diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysPostController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysPostController.java index 61d20916b..9ea61117e 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysPostController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysPostController.java @@ -26,9 +26,11 @@ import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.excel.annotation.RequestExcel; import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel; import com.pig4cloud.pigx.common.log.annotation.SysLog; -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.RequiredArgsConstructor; +import org.springframework.http.HttpHeaders; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; @@ -44,7 +46,8 @@ import java.util.List; @RestController @RequiredArgsConstructor @RequestMapping("/post") -@Api(value = "post", tags = "岗位信息表管理") +@Tag(description = "post", name = "岗位信息表管理") +@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) public class SysPostController { private final SysPostService sysPostService; @@ -64,7 +67,7 @@ public class SysPostController { * @param sysPost 岗位信息表 * @return */ - @ApiOperation(value = "分页查询", notes = "分页查询") + @Operation(summary = "分页查询", description = "分页查询") @GetMapping("/page") @PreAuthorize("@pms.hasPermission('sys_post_view')") public R getSysPostPage(Page page, SysPost sysPost) { @@ -76,7 +79,7 @@ public class SysPostController { * @param postId id * @return R */ - @ApiOperation(value = "通过id查询", notes = "通过id查询") + @Operation(summary = "通过id查询", description = "通过id查询") @GetMapping("/{postId}") @PreAuthorize("@pms.hasPermission('sys_post_view')") public R getById(@PathVariable("postId") Long postId) { @@ -88,7 +91,7 @@ public class SysPostController { * @param sysPost 岗位信息表 * @return R */ - @ApiOperation(value = "新增岗位信息表", notes = "新增岗位信息表") + @Operation(summary = "新增岗位信息表", description = "新增岗位信息表") @SysLog("新增岗位信息表") @PostMapping @PreAuthorize("@pms.hasPermission('sys_post_add')") @@ -101,7 +104,7 @@ public class SysPostController { * @param sysPost 岗位信息表 * @return R */ - @ApiOperation(value = "修改岗位信息表", notes = "修改岗位信息表") + @Operation(summary = "修改岗位信息表", description = "修改岗位信息表") @SysLog("修改岗位信息表") @PutMapping @PreAuthorize("@pms.hasPermission('sys_post_edit')") @@ -114,7 +117,7 @@ public class SysPostController { * @param postId id * @return R */ - @ApiOperation(value = "通过id删除岗位信息表", notes = "通过id删除岗位信息表") + @Operation(summary = "通过id删除岗位信息表", description = "通过id删除岗位信息表") @SysLog("通过id删除岗位信息表") @DeleteMapping("/{postId}") @PreAuthorize("@pms.hasPermission('sys_post_del')") diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysPublicParamController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysPublicParamController.java index 307a4e9a7..1e4df2018 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysPublicParamController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysPublicParamController.java @@ -24,9 +24,11 @@ import com.pig4cloud.pigx.admin.service.SysPublicParamService; 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.*; @@ -39,7 +41,8 @@ import org.springframework.web.bind.annotation.*; @RestController @AllArgsConstructor @RequestMapping("/param") -@Api(value = "param", tags = "公共参数配置") +@Tag(description = "param", name = "公共参数配置") +@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) public class SysPublicParamController { private final SysPublicParamService sysPublicParamService; @@ -50,7 +53,7 @@ public class SysPublicParamController { * @return */ @Inner(value = false) - @ApiOperation(value = "查询公共参数值", notes = "根据key查询公共参数值") + @Operation(summary = "查询公共参数值", description = "根据key查询公共参数值") @GetMapping("/publicValue/{publicKey}") public R publicKey(@PathVariable("publicKey") String publicKey) { return R.ok(sysPublicParamService.getSysPublicParamKeyToValue(publicKey)); @@ -62,7 +65,7 @@ public class SysPublicParamController { * @param sysPublicParam 公共参数 * @return */ - @ApiOperation(value = "分页查询", notes = "分页查询") + @Operation(summary = "分页查询", description = "分页查询") @GetMapping("/page") public R getSysPublicParamPage(Page page, SysPublicParam sysPublicParam) { return R.ok(sysPublicParamService.page(page, Wrappers.query(sysPublicParam))); @@ -73,7 +76,7 @@ public class SysPublicParamController { * @param publicId id * @return R */ - @ApiOperation(value = "通过id查询公共参数", notes = "通过id查询公共参数") + @Operation(summary = "通过id查询公共参数", description = "通过id查询公共参数") @GetMapping("/{publicId}") public R getById(@PathVariable("publicId") Long publicId) { return R.ok(sysPublicParamService.getById(publicId)); @@ -84,7 +87,7 @@ public class SysPublicParamController { * @param sysPublicParam 公共参数 * @return R */ - @ApiOperation(value = "新增公共参数", notes = "新增公共参数") + @Operation(summary = "新增公共参数", description = "新增公共参数") @SysLog("新增公共参数") @PostMapping @PreAuthorize("@pms.hasPermission('admin_syspublicparam_add')") @@ -97,7 +100,7 @@ public class SysPublicParamController { * @param sysPublicParam 公共参数 * @return R */ - @ApiOperation(value = "修改公共参数", notes = "修改公共参数") + @Operation(summary = "修改公共参数", description = "修改公共参数") @SysLog("修改公共参数") @PutMapping @PreAuthorize("@pms.hasPermission('admin_syspublicparam_edit')") @@ -110,7 +113,7 @@ public class SysPublicParamController { * @param publicId id * @return R */ - @ApiOperation(value = "删除公共参数", notes = "删除公共参数") + @Operation(summary = "删除公共参数", description = "删除公共参数") @SysLog("删除公共参数") @DeleteMapping("/{publicId}") @PreAuthorize("@pms.hasPermission('admin_syspublicparam_del')") diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysRoleController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysRoleController.java index ff94564e7..5b41d50c8 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysRoleController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysRoleController.java @@ -32,9 +32,11 @@ import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.excel.annotation.RequestExcel; import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel; import com.pig4cloud.pigx.common.log.annotation.SysLog; -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.cache.annotation.CacheEvict; +import org.springframework.http.HttpHeaders; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; @@ -49,7 +51,8 @@ import java.util.List; @RestController @AllArgsConstructor @RequestMapping("/role") -@Api(value = "role", tags = "角色管理模块") +@Tag(description = "role", name = "角色管理模块") +@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) public class SysRoleController { private final SysRoleService sysRoleService; diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysRouteConfController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysRouteConfController.java index 47b46635e..58f628342 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysRouteConfController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysRouteConfController.java @@ -21,8 +21,10 @@ import cn.hutool.json.JSONArray; import com.pig4cloud.pigx.admin.service.SysRouteConfService; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.log.annotation.SysLog; -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.web.bind.annotation.*; /** @@ -34,7 +36,8 @@ import org.springframework.web.bind.annotation.*; @RestController @AllArgsConstructor @RequestMapping("/route") -@Api(value = "route", tags = "动态路由管理模块") +@Tag(description = "route", name = "动态路由管理模块") +@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) public class SysRouteConfController { private final SysRouteConfService sysRouteConfService; diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysSocialDetailsController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysSocialDetailsController.java index f424fbd2e..862869829 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysSocialDetailsController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysSocialDetailsController.java @@ -25,8 +25,10 @@ import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.core.util.ValidGroup; import com.pig4cloud.pigx.common.log.annotation.SysLog; 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.AllArgsConstructor; +import org.springframework.http.HttpHeaders; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -42,7 +44,8 @@ import javax.validation.Valid; @RestController @RequestMapping("/social") @AllArgsConstructor -@Api(value = "social", tags = "三方账号管理模块") +@Tag(description = "social", name = "三方账号管理模块") +@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) public class SysSocialDetailsController { private final SysSocialDetailsService sysSocialDetailsService; diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysTenantController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysTenantController.java index 0cb15504b..a58616539 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysTenantController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysTenantController.java @@ -25,9 +25,11 @@ import com.pig4cloud.pigx.common.core.constant.CacheConstants; 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.v3.oas.annotations.security.SecurityRequirement; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.cache.annotation.CacheEvict; +import org.springframework.http.HttpHeaders; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -44,7 +46,8 @@ import java.util.stream.Collectors; @RestController @RequiredArgsConstructor @RequestMapping("/tenant") -@Api(value = "tenant", tags = "租户管理") +@Tag(description = "tenant", name = "租户管理") +@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) public class SysTenantController { private final SysTenantService sysTenantService; diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysTenantMenuController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysTenantMenuController.java index 821c404c4..33ef21139 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysTenantMenuController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysTenantMenuController.java @@ -9,9 +9,11 @@ import com.pig4cloud.pigx.common.core.constant.CommonConstants; 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.v3.oas.annotations.security.SecurityRequirement; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.cache.annotation.CacheEvict; +import org.springframework.http.HttpHeaders; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -20,7 +22,8 @@ import java.util.List; @RestController @RequiredArgsConstructor @RequestMapping("/tenant-menu") -@Api(value = "tenant", tags = "租户菜单管理") +@Tag(description = "tenant", name = "租户菜单管理") +@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) public class SysTenantMenuController { private final SysTenantMenuService sysTenantMenuService; diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysTokenController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysTokenController.java index c1f9d4e76..9a6c30703 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysTokenController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysTokenController.java @@ -21,8 +21,10 @@ import com.pig4cloud.pigx.admin.api.feign.RemoteTokenService; import com.pig4cloud.pigx.common.core.constant.SecurityConstants; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.log.annotation.SysLog; -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.*; @@ -35,7 +37,8 @@ import java.util.Map; @RestController @AllArgsConstructor @RequestMapping("/token") -@Api(value = "token", tags = "令牌管理模块") +@Tag(description = "token", name = "令牌管理模块") +@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) public class SysTokenController { private final RemoteTokenService remoteTokenService; diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysUserController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysUserController.java index 96fcb4cac..2347ebc2f 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysUserController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysUserController.java @@ -36,10 +36,11 @@ import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel; import com.pig4cloud.pigx.common.log.annotation.SysLog; import com.pig4cloud.pigx.common.security.annotation.Inner; import com.pig4cloud.pigx.common.security.util.SecurityUtils; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -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.validation.BindingResult; import org.springframework.web.bind.annotation.*; @@ -54,7 +55,8 @@ import java.util.List; @RestController @AllArgsConstructor @RequestMapping("/user") -@Api(value = "user", tags = "用户管理模块") +@Tag(description = "user", name = "用户管理模块") +@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) public class SysUserController { private final SysUserService userService; @@ -129,8 +131,7 @@ public class SysUserController { @SysLog("删除用户信息") @DeleteMapping("/{id}") @PreAuthorize("@pms.hasPermission('sys_user_del')") - @ApiOperation(value = "删除用户", notes = "根据ID删除用户") - @ApiImplicitParam(name = "id", value = "用户ID", required = true, dataType = "int", paramType = "path") + @Operation(summary = "删除用户", description = "根据ID删除用户") public R userDel(@PathVariable Long id) { SysUser sysUser = userService.getById(id); return R.ok(userService.deleteUserById(sysUser)); diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptServiceImpl.java index cbd2bc060..62e2be923 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptServiceImpl.java @@ -28,13 +28,10 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pig4cloud.pigx.admin.api.entity.SysDept; import com.pig4cloud.pigx.admin.api.entity.SysDeptRelation; -import com.pig4cloud.pigx.admin.api.vo.CpUserExcelVo; import com.pig4cloud.pigx.admin.api.vo.DeptExcelVo; import com.pig4cloud.pigx.admin.mapper.SysDeptMapper; import com.pig4cloud.pigx.admin.service.SysDeptRelationService; import com.pig4cloud.pigx.admin.service.SysDeptService; -import com.pig4cloud.pigx.common.core.exception.ErrorCodes; -import com.pig4cloud.pigx.common.core.util.MsgUtils; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.data.datascope.DataScope; import com.pig4cloud.pigx.common.excel.vo.ErrorMessage; @@ -46,7 +43,6 @@ import org.springframework.validation.BindingResult; import java.util.*; import java.util.stream.Collectors; -import java.util.stream.Stream; /** *

diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/PigxCodeGenApplication.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/PigxCodeGenApplication.java index 5fd996662..5d376d85b 100755 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/PigxCodeGenApplication.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/PigxCodeGenApplication.java @@ -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 diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenDynamicController.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenDynamicController.java index ff8f116cc..29afda7fd 100644 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenDynamicController.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenDynamicController.java @@ -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; diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenFormConfController.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenFormConfController.java index 664b836cc..8e73cbd46 100755 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenFormConfController.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenFormConfController.java @@ -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')") diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/entity/GenFormConf.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/entity/GenFormConf.java index 83c8200a3..0093ede4f 100755 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/entity/GenFormConf.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/entity/GenFormConf.java @@ -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 { private static final long serialVersionUID = 1L; @@ -44,19 +43,19 @@ public class GenFormConf extends Model { * 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 { /** * 所属租户 */ - @ApiModelProperty(value = "所属租户", hidden = true) + @Schema(description = "所属租户", hidden = true) private Long tenantId; } diff --git a/pigx-visual/pigx-codegen/src/main/resources/template/Controller.java.vm b/pigx-visual/pigx-codegen/src/main/resources/template/Controller.java.vm index 9e882a590..32bc07b0a 100755 --- a/pigx-visual/pigx-codegen/src/main/resources/template/Controller.java.vm +++ b/pigx-visual/pigx-codegen/src/main/resources/template/Controller.java.vm @@ -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')" ) diff --git a/pigx-visual/pigx-codegen/src/main/resources/template/Entity.java.vm b/pigx-visual/pigx-codegen/src/main/resources/template/Entity.java.vm index 8305a6aa7..f5d2ef49d 100755 --- a/pigx-visual/pigx-codegen/src/main/resources/template/Entity.java.vm +++ b/pigx-visual/pigx-codegen/src/main/resources/template/Entity.java.vm @@ -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 diff --git a/pigx-visual/pigx-daemon-elastic-job/pom.xml b/pigx-visual/pigx-daemon-elastic-job/pom.xml index d6ea56fdb..5696e9f54 100644 --- a/pigx-visual/pigx-daemon-elastic-job/pom.xml +++ b/pigx-visual/pigx-daemon-elastic-job/pom.xml @@ -47,10 +47,6 @@ com.pig4cloud pigx-common-job - - com.pig4cloud - pigx-common-swagger - com.pig4cloud diff --git a/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/PigxDaemonElasticJobApplication.java b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/PigxDaemonElasticJobApplication.java index 2fb507b61..ba3d7e0cd 100644 --- a/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/PigxDaemonElasticJobApplication.java +++ b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/PigxDaemonElasticJobApplication.java @@ -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 diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/PigxDaemonQuartzApplication.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/PigxDaemonQuartzApplication.java index 5857cc876..f0cb7cb24 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/PigxDaemonQuartzApplication.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/PigxDaemonQuartzApplication.java @@ -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 diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/controller/SysJobController.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/controller/SysJobController.java index 3ef6fdd96..38d2c8a60 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/controller/SysJobController.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/controller/SysJobController.java @@ -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 diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/controller/SysJobLogController.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/controller/SysJobLogController.java index 802c06c15..bbf6301fc 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/controller/SysJobLogController.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/controller/SysJobLogController.java @@ -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))); } diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/entity/SysJob.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/entity/SysJob.java index 960aaa085..8fa4004ed 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/entity/SysJob.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/entity/SysJob.java @@ -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 { private static final long serialVersionUID = 1L; diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/entity/SysJobLog.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/entity/SysJobLog.java index b1e0ce454..b6d08866f 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/entity/SysJobLog.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/entity/SysJobLog.java @@ -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 { private static final long serialVersionUID = 1L; diff --git a/pigx-visual/pigx-mp-platform/pom.xml b/pigx-visual/pigx-mp-platform/pom.xml index 95f7cb2a5..a61519c64 100755 --- a/pigx-visual/pigx-mp-platform/pom.xml +++ b/pigx-visual/pigx-mp-platform/pom.xml @@ -63,11 +63,6 @@ com.pig4cloud pigx-common-core - - - com.pig4cloud - pigx-common-swagger - com.pig4cloud diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/PigxMpPlatformApplication.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/PigxMpPlatformApplication.java index 35e7a2ae9..e7631f7ec 100755 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/PigxMpPlatformApplication.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/PigxMpPlatformApplication.java @@ -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 diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/config/WxMpInitConfigRunner.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/config/WxMpInitConfigRunner.java index 0cf2cb254..e1a573ccf 100755 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/config/WxMpInitConfigRunner.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/config/WxMpInitConfigRunner.java @@ -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; diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxMaterialController.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxMaterialController.java index 826384d6c..7378133c1 100644 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxMaterialController.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxMaterialController.java @@ -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; diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxMsg.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxMsg.java index 889298bcf..21978310e 100644 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxMsg.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxMsg.java @@ -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 { private static final long serialVersionUID = 1L; diff --git a/pigx-visual/pigx-oa-platform/pom.xml b/pigx-visual/pigx-oa-platform/pom.xml index e29b5f52a..51faf230d 100644 --- a/pigx-visual/pigx-oa-platform/pom.xml +++ b/pigx-visual/pigx-oa-platform/pom.xml @@ -148,10 +148,6 @@ org.springframework.boot spring-boot-starter-web - - com.pig4cloud - pigx-common-swagger - com.pig4cloud diff --git a/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/PigxActivitiApplication.java b/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/PigxActivitiApplication.java index 11e6f5cc2..68f7c3e95 100644 --- a/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/PigxActivitiApplication.java +++ b/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/PigxActivitiApplication.java @@ -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 diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/PigxPayPlatformApplication.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/PigxPayPlatformApplication.java index 98238e20e..45f2ecab6 100755 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/PigxPayPlatformApplication.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/PigxPayPlatformApplication.java @@ -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; *

* 支付模块 */ -@EnablePigxSwagger2 +@EnableOpenApi("pay") @EnablePigxFeignClients @EnableDiscoveryClient @EnablePigxResourceServer diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayChannelController.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayChannelController.java index 900d3e96a..7382273e5 100755 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayChannelController.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayChannelController.java @@ -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; diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayGoodsOrderController.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayGoodsOrderController.java index 185348973..baab3fbc5 100755 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayGoodsOrderController.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayGoodsOrderController.java @@ -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; diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayNotifyRecordController.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayNotifyRecordController.java index 3f188a7a3..c070835b0 100755 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayNotifyRecordController.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayNotifyRecordController.java @@ -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; diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayRefundOrderController.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayRefundOrderController.java index dbb304dc8..7c1bd2bc8 100755 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayRefundOrderController.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayRefundOrderController.java @@ -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; diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayTradeOrderController.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayTradeOrderController.java index ba8114326..9ce340d4e 100755 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayTradeOrderController.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayTradeOrderController.java @@ -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; diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayChannel.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayChannel.java index 737f6eae8..20dc06beb 100755 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayChannel.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayChannel.java @@ -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 { private static final long serialVersionUID = 1L; diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayGoodsOrder.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayGoodsOrder.java index d4b5a9c10..0b7733376 100755 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayGoodsOrder.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayGoodsOrder.java @@ -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 { private static final long serialVersionUID = 1L; diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayNotifyRecord.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayNotifyRecord.java index 3cc343e26..f9985b75a 100755 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayNotifyRecord.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayNotifyRecord.java @@ -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 { private static final long serialVersionUID = 1L; diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayRefundOrder.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayRefundOrder.java index 51293fa23..a3027e433 100755 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayRefundOrder.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayRefundOrder.java @@ -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 { private static final long serialVersionUID = 1L; diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayTradeOrder.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayTradeOrder.java index ff0df98c6..bff70679a 100755 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayTradeOrder.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayTradeOrder.java @@ -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 { private static final long serialVersionUID = 1L; diff --git a/pigx-visual/pigx-report-platform/pom.xml b/pigx-visual/pigx-report-platform/pom.xml index c7550ee80..696de5293 100644 --- a/pigx-visual/pigx-report-platform/pom.xml +++ b/pigx-visual/pigx-report-platform/pom.xml @@ -32,6 +32,12 @@ com.anji-plus spring-boot-gaea 2.0.3.RELEASE + + + swagger-annotations + io.swagger + + @@ -117,6 +123,11 @@ com.alibaba druid-spring-boot-starter + + + com.pig4cloud + pigx-common-swagger + diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessauthority/controller/AccessAuthorityController.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessauthority/controller/AccessAuthorityController.java index 36c34ed52..cf47ef1cf 100755 --- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessauthority/controller/AccessAuthorityController.java +++ b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessauthority/controller/AccessAuthorityController.java @@ -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 diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessauthority/controller/dto/AccessAuthorityDto.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessauthority/controller/dto/AccessAuthorityDto.java index ad736a28a..d52442da3 100755 --- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessauthority/controller/dto/AccessAuthorityDto.java +++ b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessauthority/controller/dto/AccessAuthorityDto.java @@ -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; } diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessrole/controller/AccessRoleController.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessrole/controller/AccessRoleController.java index 2cc256104..a208665ae 100755 --- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessrole/controller/AccessRoleController.java +++ b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessrole/controller/AccessRoleController.java @@ -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 { diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessrole/controller/dto/AccessRoleDto.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessrole/controller/dto/AccessRoleDto.java index 9f5b849e7..6f9e93985 100755 --- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessrole/controller/dto/AccessRoleDto.java +++ b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessrole/controller/dto/AccessRoleDto.java @@ -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; diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/controller/AccessUserController.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/controller/AccessUserController.java index 9997f8bce..20e0f975d 100755 --- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/controller/AccessUserController.java +++ b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/controller/AccessUserController.java @@ -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 { diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/controller/dto/AccessUserDto.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/controller/dto/AccessUserDto.java index fd3dee914..23c820bde 100755 --- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/controller/dto/AccessUserDto.java +++ b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/controller/dto/AccessUserDto.java @@ -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; /** 用户勾选的角色 */ diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/controller/dto/GaeaUserDto.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/controller/dto/GaeaUserDto.java index 1da9381dc..7556311f6 100644 --- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/controller/dto/GaeaUserDto.java +++ b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/controller/dto/GaeaUserDto.java @@ -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; diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/controller/dto/UpdatePasswordDto.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/controller/dto/UpdatePasswordDto.java index 4dec1569d..670e90331 100644 --- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/controller/dto/UpdatePasswordDto.java +++ b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/controller/dto/UpdatePasswordDto.java @@ -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; diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/controller/ReportDashboardController.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/controller/ReportDashboardController.java index 601c81a10..f9f4d6940 100644 --- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/controller/ReportDashboardController.java +++ b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/controller/ReportDashboardController.java @@ -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 { diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/dao/entity/ReportDashboard.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/dao/entity/ReportDashboard.java index d7eb14ffb..9d17733c7 100644 --- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/dao/entity/ReportDashboard.java +++ b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/dao/entity/ReportDashboard.java @@ -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; } diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/dao/entity/ReportDashboardWidget.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/dao/entity/ReportDashboardWidget.java index c369d3d08..60421154a 100644 --- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/dao/entity/ReportDashboardWidget.java +++ b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/dao/entity/ReportDashboardWidget.java @@ -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; } diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/controller/DataSetController.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/controller/DataSetController.java index 21b9b0291..ae73174c4 100644 --- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/controller/DataSetController.java +++ b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/controller/DataSetController.java @@ -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 { diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/dao/entity/DataSet.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/dao/entity/DataSet.java index 37ac3baad..549e308ef 100644 --- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/dao/entity/DataSet.java +++ b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/dao/entity/DataSet.java @@ -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; } diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/controller/DataSetParamController.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/controller/DataSetParamController.java index 9afa3a343..4adbb0cfa 100644 --- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/controller/DataSetParamController.java +++ b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/controller/DataSetParamController.java @@ -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 { diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/dao/entity/DataSetParam.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/dao/entity/DataSetParam.java index 022da663c..08e06eb1c 100644 --- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/dao/entity/DataSetParam.java +++ b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/dao/entity/DataSetParam.java @@ -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; } diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/controller/DataSetTransformController.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/controller/DataSetTransformController.java index f9b583b13..8471d1c6c 100644 --- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/controller/DataSetTransformController.java +++ b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/controller/DataSetTransformController.java @@ -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 { diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/dao/entity/DataSetTransform.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/dao/entity/DataSetTransform.java index a3ef052de..70abb455b 100644 --- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/dao/entity/DataSetTransform.java +++ b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/dao/entity/DataSetTransform.java @@ -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; } diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/controller/DataSourceController.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/controller/DataSourceController.java index 47db1d24a..66c2ab5da 100644 --- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/controller/DataSourceController.java +++ b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/controller/DataSourceController.java @@ -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 { diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/dao/entity/DataSource.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/dao/entity/DataSource.java index d2e14d21e..c135018af 100644 --- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/dao/entity/DataSource.java +++ b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/dao/entity/DataSource.java @@ -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; } diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dict/controller/GaeaDictController.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dict/controller/GaeaDictController.java index 549e53a0c..aa3cf73a6 100644 --- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dict/controller/GaeaDictController.java +++ b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dict/controller/GaeaDictController.java @@ -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 { @Autowired diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dict/controller/GaeaDictItemController.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dict/controller/GaeaDictItemController.java index cb78a1dfb..c652f14f3 100644 --- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dict/controller/GaeaDictItemController.java +++ b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dict/controller/GaeaDictItemController.java @@ -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 { @Autowired diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dict/controller/dto/GaeaDictDTO.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dict/controller/dto/GaeaDictDTO.java index eb49a4972..aff6dee30 100644 --- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dict/controller/dto/GaeaDictDTO.java +++ b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dict/controller/dto/GaeaDictDTO.java @@ -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; } diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dict/controller/dto/GaeaDictItemDTO.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dict/controller/dto/GaeaDictItemDTO.java index ccd4acbc2..d97bad7d4 100644 --- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dict/controller/dto/GaeaDictItemDTO.java +++ b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dict/controller/dto/GaeaDictItemDTO.java @@ -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; /** diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/file/controller/GaeaFileController.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/file/controller/GaeaFileController.java index 57ceffd00..0158d21a7 100644 --- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/file/controller/GaeaFileController.java +++ b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/file/controller/GaeaFileController.java @@ -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 { @Autowired diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/file/entity/GaeaFile.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/file/entity/GaeaFile.java index c07d81818..b60ca1c57 100644 --- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/file/entity/GaeaFile.java +++ b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/file/entity/GaeaFile.java @@ -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; } diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/report/controller/ReportController.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/report/controller/ReportController.java index 0a7560ff4..1451f805c 100644 --- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/report/controller/ReportController.java +++ b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/report/controller/ReportController.java @@ -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 { diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/report/dao/entity/Report.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/report/dao/entity/Report.java index c8c294db3..99a4eb9fc 100644 --- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/report/dao/entity/Report.java +++ b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/report/dao/entity/Report.java @@ -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; } diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/controller/ReportExcelController.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/controller/ReportExcelController.java index 8abb7435d..46f30ac22 100644 --- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/controller/ReportExcelController.java +++ b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/controller/ReportExcelController.java @@ -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 { diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/dao/entity/ReportExcel.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/dao/entity/ReportExcel.java index c563e79ca..fff0d86fe 100644 --- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/dao/entity/ReportExcel.java +++ b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/dao/entity/ReportExcel.java @@ -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; } diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/reportshare/controller/ReportShareController.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/reportshare/controller/ReportShareController.java index 4e74992e1..69025965f 100644 --- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/reportshare/controller/ReportShareController.java +++ b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/reportshare/controller/ReportShareController.java @@ -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 { diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/reportshare/controller/dto/ReportShareDto.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/reportshare/controller/dto/ReportShareDto.java index 5d78884da..86d480a4d 100644 --- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/reportshare/controller/dto/ReportShareDto.java +++ b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/reportshare/controller/dto/ReportShareDto.java @@ -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; /** 分享码 */