♻️ Refactoring code. 使用openapi3 替代swagger2

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<Long> role;
 
 }

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;
 
 }

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<AppMenu> {
 
 	private static final long serialVersionUID = 1L;
@@ -46,85 +45,85 @@ public class AppMenu extends Model<AppMenu> {
 	 * 菜单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;
 
 }

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<AppRole> {
 
 	private static final long serialVersionUID = 1L;
@@ -46,61 +45,61 @@ public class AppRole extends Model<AppRole> {
 	 * 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;
 
 }

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<AppRoleMenu> {
 
 	private static final long serialVersionUID = 1L;
@@ -44,13 +43,13 @@ public class AppRoleMenu extends Model<AppRoleMenu> {
 	 * 角色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;
 
 }

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<AppSocialDetails> {
 
@@ -43,20 +42,20 @@ public class AppSocialDetails extends Model<AppSocialDetails> {
 	 * 主鍵
 	 */
 	@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<AppSocialDetails> {
 	 */
 	@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<AppSocialDetails> {
 	 */
 	@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<AppSocialDetails> {
 	 */
 	@TableLogic
 	@TableField(fill = FieldFill.INSERT)
-	@ApiModelProperty(value = "删除标记,1:已删除,0:正常")
+	@Schema(description = "删除标记,1:已删除,0:正常")
 	private String delFlag;
 
 }

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<AppUser> {
 
 	private static final long serialVersionUID = 1L;
@@ -45,90 +44,90 @@ public class AppUser extends Model<AppUser> {
 	 * 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<AppUser> {
 	/**
 	 * 所属租户
 	 */
-	@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;
 
 }

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<AppUserRole> {
 
 	private static final long serialVersionUID = 1L;
@@ -44,13 +43,13 @@ public class AppUserRole extends Model<AppUserRole> {
 	 * 用户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;
 
 }

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 {
 
 	/**

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<AppRole> roleList;
 
 }

pigx-app-server/pigx-app-server-biz/pom.xml

@@ -89,11 +89,6 @@
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-common-swagger</artifactId>
 		</dependency>
-		<!--测试: spring boot test-->
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

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;
  * <p>
  * 项目启动类
  */
-@EnablePigxSwagger2
+@EnableOpenApi("app")
 @EnablePigxFeignClients
 @EnableDiscoveryClient
 @EnablePigxResourceServer

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;

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')")

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')")

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;

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')")

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')")

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;

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;
 
 /**

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;
 

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;

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;

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;
 
 /**

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;
 

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;
 
 /**

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;
 

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;
 
 /**

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;
 

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;
 

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;

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;