From 670376791fb9e060d984a431e01b9a2a070e12b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98=E2=80=98?= Date: Sun, 30 Apr 2023 04:54:54 +0800 Subject: [PATCH] =?UTF-8?q?feature-1.0-img:fixbug=E5=B9=B6=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E4=B8=8A=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bnyer/img/api/domain/TiktokImg.java | 3 - .../bnyer/img/api/dto/TiktokImgMiniDto.java | 3 - .../com/bnyer/img/api/model/LoginCreator.java | 1 - bnyer-auth/pom.xml | 8 +- .../com/bnyer/common/core/domain/AiPaint.java | 2 - .../bnyer/common/core/domain/BaseDomain.java | 1 - .../com/bnyer/common/core/domain/BzData.java | 1 - .../com/bnyer/common/core/domain/CdkLog.java | 2 - .../common/core/domain/CreatorAccount.java | 1 - .../common/core/domain/CreatorProfit.java | 2 - .../common/core/domain/ImgSignRelation.java | 4 - .../bnyer/common/core/domain/InviteLog.java | 2 - .../bnyer/common/core/domain/PaintCdk.java | 1 - .../common/core/domain/ProductOrder.java | 1 - .../common/core/domain/ProfitVerifyOrder.java | 4 - .../common/core/domain/TiktokCollection.java | 2 - .../bnyer/common/core/domain/TiktokImg.java | 2 - .../bnyer/common/core/domain/TiktokLike.java | 2 - .../bnyer/common/core/domain/VerifyLog.java | 3 - .../bnyer/common/core/domain/WithdrawLog.java | 1 - .../com/bnyer/common/core/dto/BannerDto.java | 1 - .../bnyer/common/core/dto/CollectionDto.java | 2 - .../common/core/dto/CollectionUserDto.java | 1 - .../common/core/dto/CreatorAccountDto.java | 2 - .../core/dto/CreatorAccountExistDto.java | 1 - .../dto/CreatorHandleConfirmProfitDto.java | 2 - .../core/dto/CreatorImgsDetailsDto.java | 1 - .../core/dto/CreatorInviteLogPageDto.java | 1 - .../core/dto/CreatorProfitAdInsertDto.java | 3 - .../dto/CreatorProfitInviteInsertDto.java | 2 - .../core/dto/CreatorProfitUpdateDto.java | 3 - .../common/core/dto/CreatorUpdateDto.java | 1 - .../common/core/dto/CreatorUploadDto.java | 1 - .../core/dto/CreatorWithdrawPageDto.java | 1 - .../bnyer/common/core/dto/FeedBackDto.java | 1 - .../com/bnyer/common/core/dto/FhUserDto.java | 1 - .../com/bnyer/common/core/dto/FollowDto.java | 2 - .../core/dto/ImgSignRelationPageDto.java | 2 - .../bnyer/common/core/dto/LevelInfoDto.java | 1 - .../bnyer/common/core/dto/ModifySignDto.java | 2 - .../com/bnyer/common/core/dto/NoticeDto.java | 1 - .../bnyer/common/core/dto/PaintCdkUseDto.java | 1 - .../bnyer/common/core/dto/PaintStyleDto.java | 1 - .../com/bnyer/common/core/dto/ProductDto.java | 1 - .../common/core/dto/ProfitInOrEndDto.java | 1 - .../common/core/dto/ProfitStatusDto.java | 1 - .../common/core/dto/ProfitVerifyOrderDto.java | 2 - .../core/dto/ProfitVerifyOrderUpdateDto.java | 2 - .../com/bnyer/common/core/dto/PromptDto.java | 1 - .../core/dto/SetCreatorAccountStatusDto.java | 2 - .../com/bnyer/common/core/dto/SignDto.java | 2 - .../bnyer/common/core/dto/SignFrontDto.java | 2 - .../bnyer/common/core/dto/SignImgPageDto.java | 2 - .../common/core/dto/SignTypePageDto.java | 1 - .../com/bnyer/common/core/dto/StatusDto.java | 1 - .../bnyer/common/core/dto/TiktokImgDto.java | 3 - .../common/core/dto/TiktokImgMiniDto.java | 3 - .../common/core/dto/TiktokImgPageDto.java | 2 - .../common/core/dto/TiktokImgTypeDto.java | 1 - .../bnyer/common/core/dto/TiktokUserDto.java | 1 - .../common/core/dto/TiktokUserMiniDto.java | 1 - .../com/bnyer/common/core/dto/TypeDto.java | 1 - .../com/bnyer/common/core/dto/UserIdDto.java | 1 - .../com/bnyer/common/core/dto/UserVipDto.java | 1 - .../common/core/dto/VerifyCreatorDto.java | 2 - .../com/bnyer/common/core/dto/VerifyDto.java | 2 - .../bnyer/common/core/dto/WithdrawDto.java | 1 - .../com/bnyer/common/core/dto/WxUserDto.java | 1 - .../core/dto/checkUserCanDownloadDto.java | 1 - .../common/core/dto/checkWithdrawDto.java | 1 - .../bnyer/common/core/vo/ConfirmProfitVo.java | 1 - .../common/core/vo/CreatorAccountVo.java | 2 - .../bnyer/common/core/vo/CreatorLoginVo.java | 1 - .../bnyer/common/core/vo/CreatorProfitVo.java | 2 - .../bnyer/common/core/vo/FhUserLoginVo.java | 1 - .../common/core/vo/TiktokUserLoginVo.java | 1 - .../bnyer/common/core/vo/WxUserLoginVo.java | 1 - bnyer-gateway/pom.xml | 6 -- bnyer-services/bnyer-ai/pom.xml | 6 -- bnyer-services/bnyer-file/pom.xml | 5 -- .../com/bnyer/file/dto/FileUploadDto.java | 3 - .../java/com/bnyer/file/vo/TiktokImgVo.java | 3 - bnyer-services/bnyer-img/pom.xml | 6 -- .../java/com/bnyer/img/config/JsonConfig.java | 36 +++++++++ .../com/bnyer/img/mapper/TiktokImgMapper.java | 4 +- .../serializer/LongToStringSerializer.java | 24 ++++++ .../img/service/impl/CreatorServiceImpl.java | 13 +++- .../main/java/com/bnyer/img/vo/AiPaintVo.java | 1 - .../main/java/com/bnyer/img/vo/BannerVo.java | 1 - .../com/bnyer/img/vo/CreatorDetailsVo.java | 1 - .../com/bnyer/img/vo/CreatorFansLikeVo.java | 6 +- .../com/bnyer/img/vo/CreatorFollowVo.java | 1 - .../java/com/bnyer/img/vo/CreatorHotVo.java | 1 - .../bnyer/img/vo/CreatorProfitEndAmtVo.java | 3 - .../bnyer/img/vo/CreatorProfitInAmtVo.java | 3 - .../com/bnyer/img/vo/CreatorProfitPreVo.java | 3 - .../bnyer/img/vo/CreatorTypeImgBackVo.java | 1 - .../com/bnyer/img/vo/CreatorTypeImgEmoVo.java | 1 - .../bnyer/img/vo/CreatorTypeImgFriendVo.java | 1 - .../com/bnyer/img/vo/CreatorTypeImgGifVo.java | 1 - .../bnyer/img/vo/CreatorTypeImgHeadVo.java | 1 - .../bnyer/img/vo/CreatorTypeImgWatchVo.java | 1 - .../java/com/bnyer/img/vo/CreatorTypeVo.java | 1 - .../main/java/com/bnyer/img/vo/CreatorVo.java | 1 - .../main/java/com/bnyer/img/vo/ImgSignVo.java | 3 - .../java/com/bnyer/img/vo/InviteLogVo.java | 3 - .../main/java/com/bnyer/img/vo/NoticeVo.java | 1 - .../java/com/bnyer/img/vo/PaintStyleVo.java | 1 - .../main/java/com/bnyer/img/vo/ProductVo.java | 1 - .../main/java/com/bnyer/img/vo/PromptVo.java | 1 - .../main/java/com/bnyer/img/vo/SignImgVo.java | 2 - .../java/com/bnyer/img/vo/SignRelationVo.java | 2 - .../main/java/com/bnyer/img/vo/SignVo.java | 1 - .../com/bnyer/img/vo/TiktokCollectionVo.java | 4 - .../java/com/bnyer/img/vo/TiktokImgVo.java | 3 - .../java/com/bnyer/img/vo/TiktokUserVo.java | 1 - .../main/java/com/bnyer/img/vo/TypeVo.java | 1 - .../main/java/com/bnyer/img/vo/UserVipVo.java | 1 - .../java/com/bnyer/img/vo/VerifyLogVo.java | 1 - .../java/com/bnyer/img/vo/WithdrawLogVo.java | 2 - bnyer-services/bnyer-order/pom.xml | 5 -- bnyer-services/bnyer-pay/pom.xml | 6 -- bnyer-services/bnyer-system/pom.xml | 6 -- bnyer-visual/bnyer-monitor/pom.xml | 76 ------------------- .../monitor/BnyerMonitorApplication.java | 27 ------- .../monitor/config/WebSecurityConfigurer.java | 49 ------------ .../src/main/resources/bootstrap-dev.yml | 22 ------ .../src/main/resources/bootstrap-grey.yml | 22 ------ .../src/main/resources/bootstrap-prod.yml | 22 ------ .../src/main/resources/bootstrap-test.yml | 22 ------ .../src/main/resources/bootstrap.yml | 15 ---- .../src/main/resources/logback.xml | 74 ------------------ bnyer-visual/pom.xml | 22 ------ pom.xml | 1 - 134 files changed, 77 insertions(+), 583 deletions(-) create mode 100644 bnyer-services/bnyer-img/src/main/java/com/bnyer/img/config/JsonConfig.java create mode 100644 bnyer-services/bnyer-img/src/main/java/com/bnyer/img/serializer/LongToStringSerializer.java delete mode 100644 bnyer-visual/bnyer-monitor/pom.xml delete mode 100644 bnyer-visual/bnyer-monitor/src/main/java/com/bnyer/modules/monitor/BnyerMonitorApplication.java delete mode 100644 bnyer-visual/bnyer-monitor/src/main/java/com/bnyer/modules/monitor/config/WebSecurityConfigurer.java delete mode 100644 bnyer-visual/bnyer-monitor/src/main/resources/bootstrap-dev.yml delete mode 100644 bnyer-visual/bnyer-monitor/src/main/resources/bootstrap-grey.yml delete mode 100644 bnyer-visual/bnyer-monitor/src/main/resources/bootstrap-prod.yml delete mode 100644 bnyer-visual/bnyer-monitor/src/main/resources/bootstrap-test.yml delete mode 100644 bnyer-visual/bnyer-monitor/src/main/resources/bootstrap.yml delete mode 100644 bnyer-visual/bnyer-monitor/src/main/resources/logback.xml delete mode 100644 bnyer-visual/pom.xml diff --git a/bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/domain/TiktokImg.java b/bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/domain/TiktokImg.java index ad2e416..6446180 100644 --- a/bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/domain/TiktokImg.java +++ b/bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/domain/TiktokImg.java @@ -21,7 +21,6 @@ public class TiktokImg implements Serializable { * id */ @ApiModelProperty(value="id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; /** @@ -34,14 +33,12 @@ public class TiktokImg implements Serializable { * 艺术家id */ @ApiModelProperty(value="艺术家id") - @JsonSerialize(using = ToStringSerializer.class) private Long creatorId; /** * 分类id */ @ApiModelProperty(value="分类id") - @JsonSerialize(using = ToStringSerializer.class) private Long typeId; /** diff --git a/bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/dto/TiktokImgMiniDto.java b/bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/dto/TiktokImgMiniDto.java index d353e48..569f7c9 100644 --- a/bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/dto/TiktokImgMiniDto.java +++ b/bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/dto/TiktokImgMiniDto.java @@ -19,18 +19,15 @@ import java.util.List; public class TiktokImgMiniDto implements Serializable { @ApiModelProperty(value="id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty(value="图片地址") private List imgUrl; @ApiModelProperty(value="艺术家id") - @JsonSerialize(using = ToStringSerializer.class) private Long creatorId; @ApiModelProperty(value="分类id") - @JsonSerialize(using = ToStringSerializer.class) private Long typeId; @ApiModelProperty(value="状态(0->待审核;2->审核拒绝;3->已上架;4->已下架)") diff --git a/bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/model/LoginCreator.java b/bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/model/LoginCreator.java index 74820ae..d2cf2be 100644 --- a/bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/model/LoginCreator.java +++ b/bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/model/LoginCreator.java @@ -28,7 +28,6 @@ public class LoginCreator implements Serializable { /** * 主键id */ - @JsonSerialize(using = ToStringSerializer.class) private Long creatorId; /** diff --git a/bnyer-auth/pom.xml b/bnyer-auth/pom.xml index d9b1957..197b2d0 100644 --- a/bnyer-auth/pom.xml +++ b/bnyer-auth/pom.xml @@ -39,13 +39,7 @@ org.springframework.boot spring-boot-starter-web - - - - org.springframework.boot - spring-boot-starter-actuator - - + com.dimensionalnode diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/AiPaint.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/AiPaint.java index e3b1104..9c1f801 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/AiPaint.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/AiPaint.java @@ -33,7 +33,6 @@ public class AiPaint implements Serializable { */ @ApiModelProperty(value="主键Id") @TableId(value = "id", type = IdType.ASSIGN_ID) - @JsonSerialize(using = ToStringSerializer.class) private Long id; /** @@ -48,7 +47,6 @@ public class AiPaint implements Serializable { */ @ApiModelProperty(value="绘图者id") @TableField(value = "painter_id") - @JsonSerialize(using = ToStringSerializer.class) private Long painterId; /** diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/BaseDomain.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/BaseDomain.java index 306801f..07d92c3 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/BaseDomain.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/BaseDomain.java @@ -26,7 +26,6 @@ public class BaseDomain implements Serializable { */ @ApiModelProperty(value="id") @TableId(value = "id", type = IdType.ASSIGN_ID) - @JsonSerialize(using = ToStringSerializer.class) private Long id; /** diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/BzData.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/BzData.java index 000daf2..de0cba9 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/BzData.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/BzData.java @@ -23,7 +23,6 @@ public class BzData { */ @ApiModelProperty(value="主键id") @TableId(value = "id", type = IdType.ASSIGN_ID) - @JsonSerialize(using = ToStringSerializer.class) private Long id; /** diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/CdkLog.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/CdkLog.java index a23183e..519fe93 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/CdkLog.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/CdkLog.java @@ -29,7 +29,6 @@ public class CdkLog implements Serializable { */ @ApiModelProperty(value="主键id") @TableId(value = "id", type = IdType.ASSIGN_ID) - @JsonSerialize(using = ToStringSerializer.class) private Long id; /** @@ -51,7 +50,6 @@ public class CdkLog implements Serializable { */ @ApiModelProperty(value="用户id") @TableField(value = "user_id") - @JsonSerialize(using = ToStringSerializer.class) private Long userId; /** diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/CreatorAccount.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/CreatorAccount.java index 12e11c2..a6fdf88 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/CreatorAccount.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/CreatorAccount.java @@ -26,7 +26,6 @@ public class CreatorAccount extends BaseDomain { */ @ApiModelProperty(value="艺术家id") @TableField(value = "creator_id") - @JsonSerialize(using = ToStringSerializer.class) private Long creatorId; /** diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/CreatorProfit.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/CreatorProfit.java index 2660d42..73f887e 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/CreatorProfit.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/CreatorProfit.java @@ -42,7 +42,6 @@ public class CreatorProfit extends BaseDomain { */ @ApiModelProperty(value="艺术家id") @TableField(value = "creator_id") - @JsonSerialize(using = ToStringSerializer.class) private Long creatorId; /** @@ -57,7 +56,6 @@ public class CreatorProfit extends BaseDomain { */ @ApiModelProperty(value="图片id") @TableField(value = "img_id") - @JsonSerialize(using = ToStringSerializer.class) private Long imgId; /** diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/ImgSignRelation.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/ImgSignRelation.java index f132743..e1ea0bc 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/ImgSignRelation.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/ImgSignRelation.java @@ -27,7 +27,6 @@ public class ImgSignRelation implements Serializable { */ @ApiModelProperty(value="id") @TableId(value = "id", type = IdType.ASSIGN_ID) - @JsonSerialize(using = ToStringSerializer.class) private Long id; /** @@ -35,7 +34,6 @@ public class ImgSignRelation implements Serializable { */ @ApiModelProperty(value="图片id") @TableField(value = "img_id") - @JsonSerialize(using = ToStringSerializer.class) private Long imgId; /** @@ -43,7 +41,6 @@ public class ImgSignRelation implements Serializable { */ @ApiModelProperty(value="分类id") @TableField(value = "type_id") - @JsonSerialize(using = ToStringSerializer.class) private Long typeId; /** @@ -51,7 +48,6 @@ public class ImgSignRelation implements Serializable { */ @ApiModelProperty(value="标签id") @TableField(value = "sign_id") - @JsonSerialize(using = ToStringSerializer.class) private Long signId; /** diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/InviteLog.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/InviteLog.java index 4de2dab..be53037 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/InviteLog.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/InviteLog.java @@ -31,7 +31,6 @@ public class InviteLog extends BaseDomain { */ @TableField(value = "creator_id") @ApiModelProperty(value="邀请者id") - @JsonSerialize(using = ToStringSerializer.class) private Long creatorId; /** @@ -39,7 +38,6 @@ public class InviteLog extends BaseDomain { */ @ApiModelProperty(value="被邀请者id") @TableField(value = "invited_creator_id") - @JsonSerialize(using = ToStringSerializer.class) private Long invitedCreatorId; private static final long serialVersionUID = 1L; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/PaintCdk.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/PaintCdk.java index c652f7c..f5eb15f 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/PaintCdk.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/PaintCdk.java @@ -29,7 +29,6 @@ public class PaintCdk implements Serializable { */ @ApiModelProperty(value="主键Id") @TableId(value = "id", type = IdType.ASSIGN_ID) - @JsonSerialize(using = ToStringSerializer.class) private Long id; /** diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/ProductOrder.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/ProductOrder.java index 966a5cd..aca3379 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/ProductOrder.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/ProductOrder.java @@ -28,7 +28,6 @@ public class ProductOrder implements Serializable { */ @ApiModelProperty(value="id") @TableId(value = "id", type = IdType.ASSIGN_ID) - @JsonSerialize(using = ToStringSerializer.class) private Long id; /** diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/ProfitVerifyOrder.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/ProfitVerifyOrder.java index 6867ac4..e602b7e 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/ProfitVerifyOrder.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/ProfitVerifyOrder.java @@ -36,7 +36,6 @@ public class ProfitVerifyOrder implements Serializable { */ @ApiModelProperty(value="id") @TableId(value = "id", type = IdType.ASSIGN_ID) - @JsonSerialize(using = ToStringSerializer.class) private Long id; /** @@ -50,7 +49,6 @@ public class ProfitVerifyOrder implements Serializable { * 创建订单管理员id */ @TableField(value = "admin_id") - @JsonSerialize(using = ToStringSerializer.class) @ApiModelProperty(value="创建订单管理员id") private Long adminId; @@ -73,7 +71,6 @@ public class ProfitVerifyOrder implements Serializable { */ @ApiModelProperty(value="修改管理员id") @TableField(value = "update_admin_id") - @JsonSerialize(using = ToStringSerializer.class) private Long updateAdminId; /** @@ -95,7 +92,6 @@ public class ProfitVerifyOrder implements Serializable { */ @ApiModelProperty(value="审核管理员id") @TableField(value = "verify_admin_id") - @JsonSerialize(using = ToStringSerializer.class) private Long verifyAdminId; /** diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/TiktokCollection.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/TiktokCollection.java index f4e7e3a..2f7169e 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/TiktokCollection.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/TiktokCollection.java @@ -24,7 +24,6 @@ public class TiktokCollection extends BaseDomain { */ @ApiModelProperty(value="用户id") @TableField(value = "user_id") - @JsonSerialize(using = ToStringSerializer.class) private Long userId; /** @@ -32,7 +31,6 @@ public class TiktokCollection extends BaseDomain { */ @ApiModelProperty(value="图片id") @TableField(value = "img_id") - @JsonSerialize(using = ToStringSerializer.class) private Long imgId; /** diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/TiktokImg.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/TiktokImg.java index bb2f969..87f9eeb 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/TiktokImg.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/TiktokImg.java @@ -31,7 +31,6 @@ public class TiktokImg extends BaseDomain { */ @ApiModelProperty(value="艺术家id") @TableField(value = "creator_id") - @JsonSerialize(using = ToStringSerializer.class) private Long creatorId; /** @@ -39,7 +38,6 @@ public class TiktokImg extends BaseDomain { */ @ApiModelProperty(value="分类id") @TableField(value = "type_id") - @JsonSerialize(using = ToStringSerializer.class) private Long typeId; /** diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/TiktokLike.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/TiktokLike.java index fc5cfed..19f3a65 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/TiktokLike.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/TiktokLike.java @@ -32,7 +32,6 @@ public class TiktokLike extends BaseDomain { */ @ApiModelProperty(value="用户id") @TableField(value = "user_id") - @JsonSerialize(using = ToStringSerializer.class) private Long userId; /** @@ -40,7 +39,6 @@ public class TiktokLike extends BaseDomain { */ @ApiModelProperty(value="图片id") @TableField(value = "img_id") - @JsonSerialize(using = ToStringSerializer.class) private Long imgId; /** diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/VerifyLog.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/VerifyLog.java index a628fb0..e868c3c 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/VerifyLog.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/VerifyLog.java @@ -35,7 +35,6 @@ public class VerifyLog implements Serializable { */ @ApiModelProperty(value="id") @TableId(value = "id", type = IdType.ASSIGN_ID) - @JsonSerialize(using = ToStringSerializer.class) private Long id; /** @@ -43,7 +42,6 @@ public class VerifyLog implements Serializable { */ @ApiModelProperty(value="艺术家id") @TableField(value = "creator_id") - @JsonSerialize(using = ToStringSerializer.class) private Long creatorId; /** @@ -51,7 +49,6 @@ public class VerifyLog implements Serializable { */ @ApiModelProperty(value="管理员id") @TableField(value = "admin_id") - @JsonSerialize(using = ToStringSerializer.class) private Long adminId; /** diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/WithdrawLog.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/WithdrawLog.java index db3a0c5..39c0a8c 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/WithdrawLog.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/WithdrawLog.java @@ -35,7 +35,6 @@ public class WithdrawLog extends BaseDomain { */ @ApiModelProperty(value="艺术家id") @TableField(value = "creator_id") - @JsonSerialize(using = ToStringSerializer.class) private Long creatorId; /** diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/BannerDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/BannerDto.java index 6babdd3..6770c26 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/BannerDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/BannerDto.java @@ -19,7 +19,6 @@ import java.io.Serializable; public class BannerDto implements Serializable { @ApiModelProperty(value="id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @NotNull(message = "banner名称不能为空！") diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CollectionDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CollectionDto.java index 5eb4b8d..f302c85 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CollectionDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CollectionDto.java @@ -18,11 +18,9 @@ public class CollectionDto implements Serializable { @NotNull(message = "用户id不能为空！") @ApiModelProperty(value="用户id") - @JsonSerialize(using = ToStringSerializer.class) private Long userId; @NotNull(message = "图片id不能为空！") @ApiModelProperty(value="图片id") - @JsonSerialize(using = ToStringSerializer.class) private Long imgId; } diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CollectionUserDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CollectionUserDto.java index bed3206..73c22ac 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CollectionUserDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CollectionUserDto.java @@ -21,6 +21,5 @@ public class CollectionUserDto extends BasePageDto { @NotNull(message = "用户id不能为空！") @ApiModelProperty(value="用户id") - @JsonSerialize(using = ToStringSerializer.class) private Long userId; } diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorAccountDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorAccountDto.java index 2526934..5f84bb2 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorAccountDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorAccountDto.java @@ -22,11 +22,9 @@ import java.io.Serializable; public class CreatorAccountDto implements Serializable { @ApiModelProperty(value="主键id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty(value="艺术家id") - @JsonSerialize(using = ToStringSerializer.class) private Long creatorId; @NotBlank(message = "姓名不能为空!") diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorAccountExistDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorAccountExistDto.java index a1621f3..d0bd160 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorAccountExistDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorAccountExistDto.java @@ -18,7 +18,6 @@ import java.io.Serializable; public class CreatorAccountExistDto implements Serializable { @ApiModelProperty(value="艺术家id") - @JsonSerialize(using = ToStringSerializer.class) private Long creatorId; @Desensitized(type = SensitiveTypeEnum.MOBILE_PHONE) diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorHandleConfirmProfitDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorHandleConfirmProfitDto.java index bd1432e..cf963f4 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorHandleConfirmProfitDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorHandleConfirmProfitDto.java @@ -18,12 +18,10 @@ public class CreatorHandleConfirmProfitDto implements Serializable { @NotNull(message = "艺术家id不能为空!") @ApiModelProperty(value="id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @NotNull(message = "艺术家id不能为空!") @ApiModelProperty(value="艺术家id") - @JsonSerialize(using = ToStringSerializer.class) private Long creatorId; } diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorImgsDetailsDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorImgsDetailsDto.java index 4140161..3662e0b 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorImgsDetailsDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorImgsDetailsDto.java @@ -20,6 +20,5 @@ public class CreatorImgsDetailsDto extends BasePageDto { private String scanCode; @ApiModelProperty(value="分类id") - @JsonSerialize(using = ToStringSerializer.class) private Long typeId; } diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorInviteLogPageDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorInviteLogPageDto.java index 877b6a6..066eb65 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorInviteLogPageDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorInviteLogPageDto.java @@ -17,7 +17,6 @@ public class CreatorInviteLogPageDto extends BasePageDto { @NotNull(message = "艺术家id不能为空!") @ApiModelProperty(value="艺术家id") - @JsonSerialize(using = ToStringSerializer.class) private Long creatorId; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorProfitAdInsertDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorProfitAdInsertDto.java index 2f79f3c..09c3c46 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorProfitAdInsertDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorProfitAdInsertDto.java @@ -19,7 +19,6 @@ public class CreatorProfitAdInsertDto implements Serializable { @NotNull(message = "艺术家id不能为空!") @ApiModelProperty(value="艺术家id") - @JsonSerialize(using = ToStringSerializer.class) private Long creatorId; @NotBlank(message = "收益人搜索码不能为空!") @@ -28,7 +27,6 @@ public class CreatorProfitAdInsertDto implements Serializable { @NotNull(message = "图片id不能为空!") @ApiModelProperty(value="图片id") - @JsonSerialize(using = ToStringSerializer.class) private Long imgId; @NotBlank(message = "结算平台不能为空!") @@ -41,6 +39,5 @@ public class CreatorProfitAdInsertDto implements Serializable { @NotNull(message = "用户id不能为空!") @ApiModelProperty(value="用户id") - @JsonSerialize(using = ToStringSerializer.class) private Long userId; } diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorProfitInviteInsertDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorProfitInviteInsertDto.java index 1e66e8c..3174e27 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorProfitInviteInsertDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorProfitInviteInsertDto.java @@ -21,7 +21,6 @@ public class CreatorProfitInviteInsertDto implements Serializable { @NotNull(message = "艺术家id不能为空!") @ApiModelProperty(value="艺术家id") - @JsonSerialize(using = ToStringSerializer.class) private Long creatorId; @NotBlank(message = "收益人搜索码不能为空!") @@ -30,7 +29,6 @@ public class CreatorProfitInviteInsertDto implements Serializable { @NotNull(message = "图片id不能为空!") @ApiModelProperty(value="图片id") - @JsonSerialize(using = ToStringSerializer.class) private Long imgId; @NotBlank(message = "结算平台不能为空!") diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorProfitUpdateDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorProfitUpdateDto.java index 4c35b64..1fb6886 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorProfitUpdateDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorProfitUpdateDto.java @@ -21,7 +21,6 @@ import java.math.BigDecimal; public class CreatorProfitUpdateDto implements Serializable { @ApiModelProperty(value="主键id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty(value="结算流水号") @@ -29,7 +28,6 @@ public class CreatorProfitUpdateDto implements Serializable { @NotNull(message = "艺术家id不能为空!") @ApiModelProperty(value="艺术家id") - @JsonSerialize(using = ToStringSerializer.class) private Long creatorId; @NotBlank(message = "收益人/邀请人搜索码不能为空!") @@ -38,7 +36,6 @@ public class CreatorProfitUpdateDto implements Serializable { @NotNull(message = "图片id不能为空!") @ApiModelProperty(value="图片id") - @JsonSerialize(using = ToStringSerializer.class) private Long imgId; @NotNull(message = "结算收益不能为空!") diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorUpdateDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorUpdateDto.java index 620bfa7..56eed7f 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorUpdateDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorUpdateDto.java @@ -18,7 +18,6 @@ import java.io.Serializable; public class CreatorUpdateDto implements Serializable { @ApiModelProperty(value="主键id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty(value="昵称") diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorUploadDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorUploadDto.java index f7b2cff..6268436 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorUploadDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorUploadDto.java @@ -18,7 +18,6 @@ public class CreatorUploadDto implements Serializable { @ApiModelProperty(value="艺术家id") @NotNull(message = "艺术家id不能为空!") - @JsonSerialize(using = ToStringSerializer.class) private Long creatorId; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorWithdrawPageDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorWithdrawPageDto.java index e70d677..9b48d67 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorWithdrawPageDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorWithdrawPageDto.java @@ -17,7 +17,6 @@ public class CreatorWithdrawPageDto extends BasePageDto { @NotNull(message = "艺术家id不能为空!") @ApiModelProperty(value="艺术家id") - @JsonSerialize(using = ToStringSerializer.class) private Long creatorId; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/FeedBackDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/FeedBackDto.java index 1cc03e6..67c3405 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/FeedBackDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/FeedBackDto.java @@ -19,7 +19,6 @@ import java.io.Serializable; public class FeedBackDto implements Serializable { @ApiModelProperty(value="主键Id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @NotBlank(message = "反馈信息不能为空！") diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/FhUserDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/FhUserDto.java index b5ec40d..3de089a 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/FhUserDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/FhUserDto.java @@ -18,7 +18,6 @@ import java.io.Serializable; public class FhUserDto implements Serializable { @ApiModelProperty(value="id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty(value="用户昵称") diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/FollowDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/FollowDto.java index e0c35c9..47eacbd 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/FollowDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/FollowDto.java @@ -18,11 +18,9 @@ public class FollowDto implements Serializable { @NotNull(message = "用户id不能为空！") @ApiModelProperty(value="用户id") - @JsonSerialize(using = ToStringSerializer.class) private Long userId; @NotNull(message = "艺术家id不能为空！") @ApiModelProperty(value="艺术家id") - @JsonSerialize(using = ToStringSerializer.class) private Long creatorId; } diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ImgSignRelationPageDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ImgSignRelationPageDto.java index 236cd05..2668033 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ImgSignRelationPageDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ImgSignRelationPageDto.java @@ -16,10 +16,8 @@ public class ImgSignRelationPageDto extends BasePageDto { private String isShow; @ApiModelProperty(value="图片id") - @JsonSerialize(using = ToStringSerializer.class) private Long imgId; @ApiModelProperty(value="标签id") - @JsonSerialize(using = ToStringSerializer.class) private Long signId; } diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/LevelInfoDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/LevelInfoDto.java index 953e4fa..47b3105 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/LevelInfoDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/LevelInfoDto.java @@ -18,7 +18,6 @@ import java.io.Serializable; public class LevelInfoDto implements Serializable { @ApiModelProperty(value="主键id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty(value="等级头衔名称") diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ModifySignDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ModifySignDto.java index 43a6dd4..65c753a 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ModifySignDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ModifySignDto.java @@ -17,11 +17,9 @@ import java.util.List; public class ModifySignDto implements Serializable { @ApiModelProperty(value="图片id") - @JsonSerialize(using = ToStringSerializer.class) private Long imgId; @ApiModelProperty(value="分类id") - @JsonSerialize(using = ToStringSerializer.class) private Long typeId; @ApiModelProperty(value="标签列表") diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/NoticeDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/NoticeDto.java index f4bf0ae..951d485 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/NoticeDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/NoticeDto.java @@ -19,7 +19,6 @@ import java.io.Serializable; public class NoticeDto implements Serializable { @ApiModelProperty(value="主键id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @NotBlank(message = "标题不能为空!") diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/PaintCdkUseDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/PaintCdkUseDto.java index 6825492..94b966e 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/PaintCdkUseDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/PaintCdkUseDto.java @@ -22,7 +22,6 @@ public class PaintCdkUseDto implements Serializable { @NotNull(message = "用户id不能为空！") @ApiModelProperty(value="用户id") - @JsonSerialize(using = ToStringSerializer.class) private Long userId; @NotNull(message = "平台渠道不能为空！") diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/PaintStyleDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/PaintStyleDto.java index ce3664a..f06e33d 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/PaintStyleDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/PaintStyleDto.java @@ -18,7 +18,6 @@ import java.io.Serializable; public class PaintStyleDto implements Serializable { @ApiModelProperty(value="主键id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty(value="模型风格名称") diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProductDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProductDto.java index acd9f18..7f4645a 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProductDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProductDto.java @@ -20,7 +20,6 @@ import java.math.BigDecimal; public class ProductDto implements Serializable { @ApiModelProperty(value="主键id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @NotBlank(message = "商品名称不能为空!") diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitInOrEndDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitInOrEndDto.java index 991af0f..238e957 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitInOrEndDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitInOrEndDto.java @@ -16,7 +16,6 @@ import java.io.Serializable; public class ProfitInOrEndDto implements Serializable { @ApiModelProperty(value="艺术家id") - @JsonSerialize(using = ToStringSerializer.class) private Long creatorId; @ApiModelProperty(value="收益状态(0->即将到账;1->已到账;2->转入钱包)") diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitStatusDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitStatusDto.java index 31f9d1d..90a415c 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitStatusDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitStatusDto.java @@ -18,7 +18,6 @@ public class ProfitStatusDto extends BasePageDto { @NotNull(message = "艺术家id不能为空!") @ApiModelProperty(value="艺术家id") - @JsonSerialize(using = ToStringSerializer.class) private Long creatorId; @NotBlank(message = "收益类型不能为空!") diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitVerifyOrderDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitVerifyOrderDto.java index d1f8c57..cef89cb 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitVerifyOrderDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitVerifyOrderDto.java @@ -20,7 +20,6 @@ public class ProfitVerifyOrderDto implements Serializable { @NotNull(message = "主键id") @ApiModelProperty(value="主键id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @NotBlank(message = "审核状态不能为空!") @@ -32,7 +31,6 @@ public class ProfitVerifyOrderDto implements Serializable { @NotNull(message = "审核管理员id不能为空!") @ApiModelProperty(value="审核管理员id") - @JsonSerialize(using = ToStringSerializer.class) private Long verifyAdminId; @NotNull(message = "昨日收益不能为空!") diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitVerifyOrderUpdateDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitVerifyOrderUpdateDto.java index d1102b9..43af808 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitVerifyOrderUpdateDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitVerifyOrderUpdateDto.java @@ -19,7 +19,6 @@ public class ProfitVerifyOrderUpdateDto implements Serializable { @NotNull(message = "主键id不能为空!") @ApiModelProperty(value="主键id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @NotNull(message = "昨日收益不能为空!") @@ -28,7 +27,6 @@ public class ProfitVerifyOrderUpdateDto implements Serializable { @NotNull(message = "修改管理员id不能为空!") @ApiModelProperty(value="修改管理员id") - @JsonSerialize(using = ToStringSerializer.class) private Long updateAdminId; @ApiModelProperty(value="平台(0->抖音;1->快手)") diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/PromptDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/PromptDto.java index 5726397..2eae8af 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/PromptDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/PromptDto.java @@ -18,7 +18,6 @@ import java.io.Serializable; public class PromptDto implements Serializable { @ApiModelProperty(value="主键id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty(value="提示词") diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SetCreatorAccountStatusDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SetCreatorAccountStatusDto.java index f95c5c2..f20c106 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SetCreatorAccountStatusDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SetCreatorAccountStatusDto.java @@ -17,7 +17,6 @@ import java.io.Serializable; public class SetCreatorAccountStatusDto implements Serializable { @ApiModelProperty(value="主键Id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @NotNull(message = "状态不能为空！") @@ -26,7 +25,6 @@ public class SetCreatorAccountStatusDto implements Serializable { @NotNull(message = "艺术家id不能为空！") @ApiModelProperty(value="艺术家id") - @JsonSerialize(using = ToStringSerializer.class) private Long creatorId; } diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignDto.java index 12f22b5..5ad2bbb 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignDto.java @@ -18,7 +18,6 @@ import java.io.Serializable; public class SignDto implements Serializable { @ApiModelProperty(value="主键id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty(value="标签名称") @@ -34,7 +33,6 @@ public class SignDto implements Serializable { private String status; @ApiModelProperty(value="父id") - @JsonSerialize(using = ToStringSerializer.class) private Long parentId; public Sign extractParam(){ diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignFrontDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignFrontDto.java index 00c4f82..def79fd 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignFrontDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignFrontDto.java @@ -19,7 +19,6 @@ import java.util.List; public class SignFrontDto implements Serializable { @ApiModelProperty(value="主键id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @NotEmpty(message = "标签名称必填!") @@ -28,6 +27,5 @@ public class SignFrontDto implements Serializable { @NotNull(message = "父id必填!") @ApiModelProperty(value="父id") - @JsonSerialize(using = ToStringSerializer.class) private Long parentId; } diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignImgPageDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignImgPageDto.java index 89c579d..8977592 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignImgPageDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignImgPageDto.java @@ -16,11 +16,9 @@ public class SignImgPageDto extends BasePageDto { @NotNull(message = "分类id不能为空!") @ApiModelProperty(value="分类id") - @JsonSerialize(using = ToStringSerializer.class) private Long typeId; @NotNull(message = "标签id不能为空!") @ApiModelProperty(value="标签id") - @JsonSerialize(using = ToStringSerializer.class) private Long signId; } diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignTypePageDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignTypePageDto.java index e9f2c71..51d6f36 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignTypePageDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignTypePageDto.java @@ -16,6 +16,5 @@ public class SignTypePageDto extends BasePageDto { @NotNull(message = "分类id不能为空!") @ApiModelProperty(value="分类id") - @JsonSerialize(using = ToStringSerializer.class) private Long typeId; } diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/StatusDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/StatusDto.java index 90fb32e..a66e2bb 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/StatusDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/StatusDto.java @@ -17,7 +17,6 @@ import java.io.Serializable; public class StatusDto implements Serializable { @ApiModelProperty(value="主键Id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @NotNull(message = "状态不能为空！") diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokImgDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokImgDto.java index f687e08..cb988aa 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokImgDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokImgDto.java @@ -18,18 +18,15 @@ import java.io.Serializable; public class TiktokImgDto implements Serializable { @ApiModelProperty(value="id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty(value="图片地址") private String imgUrl; @ApiModelProperty(value="艺术家id") - @JsonSerialize(using = ToStringSerializer.class) private Long creatorId; @ApiModelProperty(value="分类id") - @JsonSerialize(using = ToStringSerializer.class) private Long typeId; @ApiModelProperty(value="下载量") diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokImgMiniDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokImgMiniDto.java index 9450227..217575a 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokImgMiniDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokImgMiniDto.java @@ -19,18 +19,15 @@ import java.util.List; public class TiktokImgMiniDto implements Serializable { @ApiModelProperty(value="id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty(value="图片地址") private List imgUrl; @ApiModelProperty(value="艺术家id") - @JsonSerialize(using = ToStringSerializer.class) private Long creatorId; @ApiModelProperty(value="分类id") - @JsonSerialize(using = ToStringSerializer.class) private Long typeId; @ApiModelProperty(value="状态(0->待审核;1->审核拒绝;2->已上架;3->已下架)") diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokImgPageDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokImgPageDto.java index 90b8df5..7c9e74f 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokImgPageDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokImgPageDto.java @@ -14,11 +14,9 @@ import lombok.Setter; public class TiktokImgPageDto extends BasePageDto { @ApiModelProperty(value="艺术家id") - @JsonSerialize(using = ToStringSerializer.class) private Long creatorId; @ApiModelProperty(value="分类id") - @JsonSerialize(using = ToStringSerializer.class) private Long typeId; @ApiModelProperty(value="状态(0->待审核;1->审核拒绝;2->已上架;3->已下架)") diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokImgTypeDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokImgTypeDto.java index c9d43ac..3d9c88f 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokImgTypeDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokImgTypeDto.java @@ -14,6 +14,5 @@ import lombok.Setter; public class TiktokImgTypeDto extends BasePageDto { @ApiModelProperty(value="分类id") - @JsonSerialize(using = ToStringSerializer.class) private Long typeId; } diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokUserDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokUserDto.java index cc2c572..639ff9b 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokUserDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokUserDto.java @@ -18,7 +18,6 @@ import java.io.Serializable; public class TiktokUserDto implements Serializable { @ApiModelProperty(value="id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty(value="用户昵称") diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokUserMiniDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokUserMiniDto.java index 23c8ad3..165edec 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokUserMiniDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokUserMiniDto.java @@ -18,7 +18,6 @@ public class TiktokUserMiniDto implements Serializable { @NotNull(message = "用户id不能为空！") @ApiModelProperty(value="id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty(value="用户昵称") diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TypeDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TypeDto.java index c4a8586..f79a2bd 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TypeDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TypeDto.java @@ -19,7 +19,6 @@ import java.io.Serializable; public class TypeDto implements Serializable { @ApiModelProperty(value="主键") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @NotNull(message = "分类名称不能为空!") diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/UserIdDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/UserIdDto.java index af1763f..0a0591e 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/UserIdDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/UserIdDto.java @@ -17,6 +17,5 @@ public class UserIdDto extends BasePageDto { @NotNull(message = "用户id不能为空！") @ApiModelProperty(value="用户id") - @JsonSerialize(using = ToStringSerializer.class) private Long userId; } diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/UserVipDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/UserVipDto.java index 3b9e03f..c067a5a 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/UserVipDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/UserVipDto.java @@ -19,7 +19,6 @@ import java.math.BigDecimal; public class UserVipDto implements Serializable { @ApiModelProperty(value="主键Id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty(value="vip名称") diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/VerifyCreatorDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/VerifyCreatorDto.java index 89d7786..6e220e3 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/VerifyCreatorDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/VerifyCreatorDto.java @@ -22,12 +22,10 @@ public class VerifyCreatorDto implements Serializable { @NotNull(message = "主键id不能为空!") @ApiModelProperty(value="主键") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @NotNull(message = "管理员id不能为空!") @ApiModelProperty(value="管理员id") - @JsonSerialize(using = ToStringSerializer.class) private Long adminId; @NotBlank(message = "审核原因不能为空!") diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/VerifyDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/VerifyDto.java index 6028c41..6486437 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/VerifyDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/VerifyDto.java @@ -22,12 +22,10 @@ public class VerifyDto implements Serializable { @NotNull(message = "主键id不能为空!") @ApiModelProperty(value="主键") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @NotNull(message = "管理员id不能为空!") @ApiModelProperty(value="管理员id") - @JsonSerialize(using = ToStringSerializer.class) private Long adminId; @NotBlank(message = "审核原因不能为空!") diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/WithdrawDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/WithdrawDto.java index 91f6441..2338a46 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/WithdrawDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/WithdrawDto.java @@ -24,7 +24,6 @@ public class WithdrawDto implements Serializable { @NotNull(message = "艺术家id不能为空!") @ApiModelProperty(value="艺术家id") - @JsonSerialize(using = ToStringSerializer.class) private Long creatorId; @NotNull(message = "提现金额不能为空!") diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/WxUserDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/WxUserDto.java index c2f183c..b7af355 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/WxUserDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/WxUserDto.java @@ -18,7 +18,6 @@ import java.io.Serializable; public class WxUserDto implements Serializable { @ApiModelProperty(value="id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty(value="用户昵称") diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/checkUserCanDownloadDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/checkUserCanDownloadDto.java index da1703d..cd2e320 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/checkUserCanDownloadDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/checkUserCanDownloadDto.java @@ -17,7 +17,6 @@ import java.io.Serializable; public class checkUserCanDownloadDto implements Serializable { @ApiModelProperty(value="用户id") - @JsonSerialize(using = ToStringSerializer.class) private Long userId; @NotNull(message = "平台不能为空！") diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/checkWithdrawDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/checkWithdrawDto.java index 5575cd2..1ea462e 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/checkWithdrawDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/checkWithdrawDto.java @@ -19,7 +19,6 @@ public class checkWithdrawDto implements Serializable { @NotNull(message = "艺术家id不能为空!") @ApiModelProperty(value="艺术家id") - @JsonSerialize(using = ToStringSerializer.class) private Long creatorId; @NotNull(message = "额度不能为空!") diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/ConfirmProfitVo.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/ConfirmProfitVo.java index b13c062..ef1c691 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/ConfirmProfitVo.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/ConfirmProfitVo.java @@ -17,7 +17,6 @@ import java.math.BigDecimal; public class ConfirmProfitVo implements Serializable { @ApiModelProperty(value="艺术家id") - @JsonSerialize(using = ToStringSerializer.class) private Long creatorId; @ApiModelProperty(value="收益") diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/CreatorAccountVo.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/CreatorAccountVo.java index e879f4a..0e4491a 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/CreatorAccountVo.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/CreatorAccountVo.java @@ -17,11 +17,9 @@ import java.io.Serializable; @ApiModel("艺术家账户响应体") public class CreatorAccountVo implements Serializable { @ApiModelProperty(value="主键id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty(value="艺术家id") - @JsonSerialize(using = ToStringSerializer.class) private Long creatorId; @ApiModelProperty(value="姓名(加密)") diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/CreatorLoginVo.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/CreatorLoginVo.java index ca9d9d9..4fdaadb 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/CreatorLoginVo.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/CreatorLoginVo.java @@ -19,7 +19,6 @@ import java.util.Date; public class CreatorLoginVo implements Serializable { @ApiModelProperty(value="主键id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty(value="昵称") diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/CreatorProfitVo.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/CreatorProfitVo.java index 574e098..e48acee 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/CreatorProfitVo.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/CreatorProfitVo.java @@ -18,14 +18,12 @@ import java.util.Date; public class CreatorProfitVo implements Serializable { @ApiModelProperty(value="主键id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty(value="结算流水号") private String orderNo; @ApiModelProperty(value="艺术家id") - @JsonSerialize(using = ToStringSerializer.class) private Long creatorId; @ApiModelProperty(value="收益人/邀请人搜索码") diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/FhUserLoginVo.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/FhUserLoginVo.java index 17bd20e..c35dade 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/FhUserLoginVo.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/FhUserLoginVo.java @@ -18,7 +18,6 @@ import java.util.Date; public class FhUserLoginVo implements Serializable { @ApiModelProperty(value="id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty(value="用户昵称") diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/TiktokUserLoginVo.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/TiktokUserLoginVo.java index a7b5d8b..c13f1d9 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/TiktokUserLoginVo.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/TiktokUserLoginVo.java @@ -18,7 +18,6 @@ import java.util.Date; public class TiktokUserLoginVo implements Serializable { @ApiModelProperty(value="id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty(value="用户昵称") diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/WxUserLoginVo.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/WxUserLoginVo.java index 52e3bf8..c501f49 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/WxUserLoginVo.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/WxUserLoginVo.java @@ -18,7 +18,6 @@ import java.util.Date; public class WxUserLoginVo implements Serializable { @ApiModelProperty(value="id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty(value="用户昵称") diff --git a/bnyer-gateway/pom.xml b/bnyer-gateway/pom.xml index 9b6a19f..57c253d 100644 --- a/bnyer-gateway/pom.xml +++ b/bnyer-gateway/pom.xml @@ -52,12 +52,6 @@ sentinel-datasource-nacos - - - org.springframework.boot - spring-boot-starter-actuator - - com.github.penggle diff --git a/bnyer-services/bnyer-ai/pom.xml b/bnyer-services/bnyer-ai/pom.xml index cb26171..a8ccaf1 100644 --- a/bnyer-services/bnyer-ai/pom.xml +++ b/bnyer-services/bnyer-ai/pom.xml @@ -34,12 +34,6 @@ spring-cloud-starter-alibaba-sentinel - - - org.springframework.boot - spring-boot-starter-actuator - - io.springfox diff --git a/bnyer-services/bnyer-file/pom.xml b/bnyer-services/bnyer-file/pom.xml index 335e638..b6a7a82 100644 --- a/bnyer-services/bnyer-file/pom.xml +++ b/bnyer-services/bnyer-file/pom.xml @@ -35,11 +35,6 @@ spring-cloud-starter-alibaba-sentinel - - - org.springframework.boot - spring-boot-starter-actuator - diff --git a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/dto/FileUploadDto.java b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/dto/FileUploadDto.java index 6f983a0..a28a36e 100644 --- a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/dto/FileUploadDto.java +++ b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/dto/FileUploadDto.java @@ -21,18 +21,15 @@ import java.util.ArrayList; public class FileUploadDto { @ApiModelProperty(value="id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty(value="图片地址") private String imgUrl; @ApiModelProperty(value="艺术家id") - @JsonSerialize(using = ToStringSerializer.class) private Long creatorId; @ApiModelProperty(value="分类id") - @JsonSerialize(using = ToStringSerializer.class) private Long typeId; @ApiModelProperty(value="状态(0->待审核;1->审核拒绝;2->已上架;3->已下架)") diff --git a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/vo/TiktokImgVo.java b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/vo/TiktokImgVo.java index fb44dce..edcc87d 100644 --- a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/vo/TiktokImgVo.java +++ b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/vo/TiktokImgVo.java @@ -16,18 +16,15 @@ import java.io.Serializable; public class TiktokImgVo implements Serializable { @ApiModelProperty(value="id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty(value="图片地址") private String imgUrl; @ApiModelProperty(value="用户id") - @JsonSerialize(using = ToStringSerializer.class) private Long creatorId; @ApiModelProperty(value="分类id") - @JsonSerialize(using = ToStringSerializer.class) private Long typeId; @ApiModelProperty(value="下载量") diff --git a/bnyer-services/bnyer-img/pom.xml b/bnyer-services/bnyer-img/pom.xml index dcb287e..76e544d 100644 --- a/bnyer-services/bnyer-img/pom.xml +++ b/bnyer-services/bnyer-img/pom.xml @@ -34,12 +34,6 @@ spring-cloud-starter-alibaba-sentinel - - - org.springframework.boot - spring-boot-starter-actuator - - io.springfox diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/config/JsonConfig.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/config/JsonConfig.java new file mode 100644 index 0000000..fcb639c --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/config/JsonConfig.java @@ -0,0 +1,36 @@ +package com.bnyer.img.config; + +import com.bnyer.img.serializer.LongToStringSerializer; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.module.SimpleModule; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; +import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; + +/** + * 解决雪花Id长度超过16位前端传入精度丢失的问题 + */ +@Configuration +public class JsonConfig { + @Bean + @Primary + @ConditionalOnMissingBean(ObjectMapper.class) + public ObjectMapper jacksonObjectMapper(Jackson2ObjectMapperBuilder builder) + { + ObjectMapper objectMapper = builder.createXmlMapper(false).build(); + // 全局配置序列化返回 JSON 处理 + SimpleModule simpleModule = new SimpleModule(); + //JSON Long ==> String + //自定义字符串转化规则ToStringSerializer换成自定义的LongToStringSerializer + simpleModule.addSerializer(Long.class, LongToStringSerializer.instance); + simpleModule.addSerializer(Long.TYPE, LongToStringSerializer.instance); + + objectMapper.registerModule(simpleModule); + //参数在bean中没有的情况处理 + objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + return objectMapper; + } +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TiktokImgMapper.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TiktokImgMapper.java index f680e46..fb6d0fd 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TiktokImgMapper.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TiktokImgMapper.java @@ -98,12 +98,12 @@ public interface TiktokImgMapper extends BaseMapper { * @param creatorId 艺术家Id * @return - */ - int queryLikeNum(@Param("creatorId") Long creatorId); + Integer queryLikeNum(@Param("creatorId") Long creatorId); /** * 获取收藏数量 * @param creatorId 艺术家Id * @return - */ - int queryCollectNum(@Param("creatorId") Long creatorId); + Integer queryCollectNum(@Param("creatorId") Long creatorId); } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/serializer/LongToStringSerializer.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/serializer/LongToStringSerializer.java new file mode 100644 index 0000000..3710950 --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/serializer/LongToStringSerializer.java @@ -0,0 +1,24 @@ +package com.bnyer.img.serializer; + +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.JsonSerializer; +import com.fasterxml.jackson.databind.SerializerProvider; + +import java.io.IOException; + +public class LongToStringSerializer extends JsonSerializer { + public static final LongToStringSerializer instance = new LongToStringSerializer(); + + @Override + public void serialize(Long id, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException { + if(id != null){ + //长度小于某个值的，还是保持long类型 + if(id < 10000000000000000L){ + jsonGenerator.writeNumber(id); + }else { + //长度超过某个值的，转化为字符串 + jsonGenerator.writeString(id.toString()); + } + } + } +} \ No newline at end of file diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorServiceImpl.java index b090674..1e0e56d 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorServiceImpl.java @@ -224,13 +224,22 @@ public class CreatorServiceImpl implements CreatorService { String fanKey = RedisKeyConstant.CREATOR_FANS_NUM_KEY; if(redisService.hasHashKey(fanKey,String.valueOf(creatorId))){ Integer fanNum = (Integer) redisService.getCacheMapValue(fanKey, String.valueOf(creatorId)); + if(fanNum == null){ + fanNum = 0; + } result.setFansNum(fanNum); } //从数据库获取喜欢量 - int likeNum = tiktokImgMapper.queryLikeNum(creatorId); + Integer likeNum = tiktokImgMapper.queryLikeNum(creatorId); + if(likeNum == null){ + likeNum = 0; + } result.setLikeNum(likeNum); //从改数据库获取收藏量 - int collectNum = tiktokImgMapper.queryCollectNum(creatorId); + Integer collectNum = tiktokImgMapper.queryCollectNum(creatorId); + if(collectNum == null){ + collectNum = 0; + } result.setCollectNum(collectNum); return result; } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/AiPaintVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/AiPaintVo.java index 5a0c693..0262bff 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/AiPaintVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/AiPaintVo.java @@ -18,7 +18,6 @@ import java.util.Date; public class AiPaintVo implements Serializable { @ApiModelProperty(value="主键Id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty(value="作品编号") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/BannerVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/BannerVo.java index 3669054..3140bb2 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/BannerVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/BannerVo.java @@ -15,7 +15,6 @@ import java.io.Serializable; @ApiModel("banner响应体") public class BannerVo implements Serializable { @ApiModelProperty(value="id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty(value="banner名称") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorDetailsVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorDetailsVo.java index 95d2554..3d5083b 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorDetailsVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorDetailsVo.java @@ -17,7 +17,6 @@ import java.util.List; public class CreatorDetailsVo implements Serializable { @ApiModelProperty(value="id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty(value="搜索码") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorFansLikeVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorFansLikeVo.java index f34d676..14bccb1 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorFansLikeVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorFansLikeVo.java @@ -14,13 +14,13 @@ import java.io.Serializable; public class CreatorFansLikeVo implements Serializable { @ApiModelProperty(value="粉丝量") - private int fansNum; + private Integer fansNum; @ApiModelProperty(value="喜欢量") - private int likeNum; + private Integer likeNum; @ApiModelProperty(value="收藏量") - private int collectNum; + private Integer collectNum; private static final long serialVersionUID = 1L; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorFollowVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorFollowVo.java index 86629d5..167624d 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorFollowVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorFollowVo.java @@ -16,7 +16,6 @@ import java.io.Serializable; public class CreatorFollowVo implements Serializable { @ApiModelProperty(value="id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty(value="搜索码") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorHotVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorHotVo.java index 14de7c4..1a361a5 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorHotVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorHotVo.java @@ -16,7 +16,6 @@ import java.io.Serializable; public class CreatorHotVo implements Serializable { @ApiModelProperty(value="id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty(value="搜索码") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorProfitEndAmtVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorProfitEndAmtVo.java index 3f68b38..3b9ad2a 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorProfitEndAmtVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorProfitEndAmtVo.java @@ -19,21 +19,18 @@ import java.util.Date; public class CreatorProfitEndAmtVo implements Serializable { @ApiModelProperty(value="主键id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty(value="结算流水号") private String orderNo; @ApiModelProperty(value="艺术家id") - @JsonSerialize(using = ToStringSerializer.class) private Long creatorId; @ApiModelProperty(value="收益人/邀请人搜索码") private String scanCode; @ApiModelProperty(value="图片id") - @JsonSerialize(using = ToStringSerializer.class) private Long imgId; @ApiModelProperty(value="图片url") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorProfitInAmtVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorProfitInAmtVo.java index bafe943..81d3ff7 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorProfitInAmtVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorProfitInAmtVo.java @@ -19,21 +19,18 @@ import java.util.Date; public class CreatorProfitInAmtVo implements Serializable { @ApiModelProperty(value="主键id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty(value="结算流水号") private String orderNo; @ApiModelProperty(value="艺术家id") - @JsonSerialize(using = ToStringSerializer.class) private Long creatorId; @ApiModelProperty(value="收益人/邀请人搜索码") private String scanCode; @ApiModelProperty(value="图片id") - @JsonSerialize(using = ToStringSerializer.class) private Long imgId; @ApiModelProperty(value="图片url") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorProfitPreVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorProfitPreVo.java index 430484a..5910059 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorProfitPreVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorProfitPreVo.java @@ -18,18 +18,15 @@ import java.util.Date; public class CreatorProfitPreVo implements Serializable { @ApiModelProperty(value="主键id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty(value="艺术家id") - @JsonSerialize(using = ToStringSerializer.class) private Long creatorId; @ApiModelProperty(value="收益人/邀请人搜索码") private String scanCode; @ApiModelProperty(value="图片id") - @JsonSerialize(using = ToStringSerializer.class) private Long imgId; @ApiModelProperty(value="图片url") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgBackVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgBackVo.java index 853866a..9c2165f 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgBackVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgBackVo.java @@ -19,7 +19,6 @@ public class CreatorTypeImgBackVo implements Serializable { private Integer backNum; @ApiModelProperty(value="分类Id") - @JsonSerialize(using = ToStringSerializer.class) private Long typeId; private static final long serialVersionUID = 1L; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgEmoVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgEmoVo.java index 5b69c0c..21e0ccb 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgEmoVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgEmoVo.java @@ -19,7 +19,6 @@ public class CreatorTypeImgEmoVo implements Serializable { private Integer emoNum; @ApiModelProperty(value="分类Id") - @JsonSerialize(using = ToStringSerializer.class) private Long typeId; private static final long serialVersionUID = 1L; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgFriendVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgFriendVo.java index 65bc0f4..a44461b 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgFriendVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgFriendVo.java @@ -19,7 +19,6 @@ public class CreatorTypeImgFriendVo implements Serializable { private Integer friendNum; @ApiModelProperty(value="分类Id") - @JsonSerialize(using = ToStringSerializer.class) private Long typeId; private static final long serialVersionUID = 1L; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgGifVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgGifVo.java index 48afee5..958b12b 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgGifVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgGifVo.java @@ -19,7 +19,6 @@ public class CreatorTypeImgGifVo implements Serializable { private Integer gifNum; @ApiModelProperty(value="分类Id") - @JsonSerialize(using = ToStringSerializer.class) private Long typeId; private static final long serialVersionUID = 1L; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgHeadVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgHeadVo.java index 623fa30..7a38fb7 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgHeadVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgHeadVo.java @@ -19,7 +19,6 @@ public class CreatorTypeImgHeadVo implements Serializable { private Integer headNum; @ApiModelProperty(value="分类Id") - @JsonSerialize(using = ToStringSerializer.class) private Long typeId; private static final long serialVersionUID = 1L; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgWatchVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgWatchVo.java index 586d8e7..fe1d0d9 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgWatchVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgWatchVo.java @@ -19,7 +19,6 @@ public class CreatorTypeImgWatchVo implements Serializable { private Integer watchNum; @ApiModelProperty(value="分类Id") - @JsonSerialize(using = ToStringSerializer.class) private Long typeId; private static final long serialVersionUID = 1L; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeVo.java index 2ed32c6..5736598 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeVo.java @@ -16,7 +16,6 @@ import java.io.Serializable; public class CreatorTypeVo implements Serializable { @ApiModelProperty(value="typeId") - @JsonSerialize(using = ToStringSerializer.class) private Long typeId; @ApiModelProperty(value="分类类型") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorVo.java index 748e2e5..0bf8546 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorVo.java @@ -17,7 +17,6 @@ import java.util.List; public class CreatorVo implements Serializable { @ApiModelProperty(value="id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty(value="搜索码") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/ImgSignVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/ImgSignVo.java index a45b4e2..c20fc41 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/ImgSignVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/ImgSignVo.java @@ -17,18 +17,15 @@ import java.util.List; public class ImgSignVo implements Serializable { @ApiModelProperty(value="id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty(value="图片地址") private String imgUrl; @ApiModelProperty(value="用户id") - @JsonSerialize(using = ToStringSerializer.class) private Long creatorId; @ApiModelProperty(value="分类id") - @JsonSerialize(using = ToStringSerializer.class) private Long typeId; @ApiModelProperty(value="下载量") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/InviteLogVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/InviteLogVo.java index 216300e..2e77acc 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/InviteLogVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/InviteLogVo.java @@ -16,18 +16,15 @@ import java.io.Serializable; @ApiModel("邀请记录响应体") public class InviteLogVo implements Serializable { @ApiModelProperty(value="id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty(value="邀请者id") - @JsonSerialize(using = ToStringSerializer.class) private Long creatorId; @ApiModelProperty(value="邀请码") private String inviteCode; @ApiModelProperty(value="被邀请者id") - @JsonSerialize(using = ToStringSerializer.class) private Long invitedCreatorId; @ApiModelProperty(value="被邀请者搜索码") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/NoticeVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/NoticeVo.java index 52c4201..35c325c 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/NoticeVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/NoticeVo.java @@ -17,7 +17,6 @@ import java.util.Date; @ApiModel("公告响应体") public class NoticeVo implements Serializable { @ApiModelProperty(value="主键id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty(value="标题") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/PaintStyleVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/PaintStyleVo.java index 42f769f..0583063 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/PaintStyleVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/PaintStyleVo.java @@ -15,7 +15,6 @@ import java.io.Serializable; @ApiModel("绘画风格响应体") public class PaintStyleVo implements Serializable { @ApiModelProperty(value="主键id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty(value="模型风格名称") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/ProductVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/ProductVo.java index a59e1ae..4501a9f 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/ProductVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/ProductVo.java @@ -16,7 +16,6 @@ import java.math.BigDecimal; @ApiModel("banner响应体") public class ProductVo implements Serializable { @ApiModelProperty(value="主键id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty(value="商品名称") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/PromptVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/PromptVo.java index f018ec6..00e385f 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/PromptVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/PromptVo.java @@ -16,7 +16,6 @@ import java.io.Serializable; public class PromptVo implements Serializable { @ApiModelProperty(value="主键id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty(value="提示词") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/SignImgVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/SignImgVo.java index dcf81d9..8a5dacc 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/SignImgVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/SignImgVo.java @@ -15,7 +15,6 @@ import java.io.Serializable; @ApiModel("sign图片响应体") public class SignImgVo implements Serializable { @ApiModelProperty(value="标签id") - @JsonSerialize(using = ToStringSerializer.class) private Long signId; @ApiModelProperty(value="标签名称") @@ -25,7 +24,6 @@ public class SignImgVo implements Serializable { private String img; @ApiModelProperty(value="分类id") - @JsonSerialize(using = ToStringSerializer.class) private Long typeId; private static final long serialVersionUID = 1L; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/SignRelationVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/SignRelationVo.java index 6fac38d..a3d8d6a 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/SignRelationVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/SignRelationVo.java @@ -15,14 +15,12 @@ import java.io.Serializable; @ApiModel("标签关系响应体") public class SignRelationVo implements Serializable { @ApiModelProperty(value="标签id") - @JsonSerialize(using = ToStringSerializer.class) private Long signId; @ApiModelProperty(value="标签名称") private String signName; @ApiModelProperty(value="标签图片主键id") - @JsonSerialize(using = ToStringSerializer.class) private Long signImgRelationId; private static final long serialVersionUID = 1L; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/SignVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/SignVo.java index 43a659a..dd7dc39 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/SignVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/SignVo.java @@ -15,7 +15,6 @@ import java.io.Serializable; @ApiModel("sign响应体") public class SignVo implements Serializable { @ApiModelProperty(value="主键id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty(value="标签名称") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TiktokCollectionVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TiktokCollectionVo.java index d6b69d7..336b87b 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TiktokCollectionVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TiktokCollectionVo.java @@ -16,11 +16,9 @@ import java.io.Serializable; public class TiktokCollectionVo implements Serializable { @ApiModelProperty(value="id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty(value="图片id") - @JsonSerialize(using = ToStringSerializer.class) private Long imgId; @ApiModelProperty(value="平台") @@ -30,11 +28,9 @@ public class TiktokCollectionVo implements Serializable { private String imgUrl; @ApiModelProperty(value="用户id") - @JsonSerialize(using = ToStringSerializer.class) private Long userId; @ApiModelProperty(value="分类id") - @JsonSerialize(using = ToStringSerializer.class) private Long typeId; @ApiModelProperty(value="分类名称") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TiktokImgVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TiktokImgVo.java index 9caa49d..3750d56 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TiktokImgVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TiktokImgVo.java @@ -17,18 +17,15 @@ import java.util.List; public class TiktokImgVo implements Serializable { @ApiModelProperty(value="id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty(value="图片地址") private String imgUrl; @ApiModelProperty(value="用户id") - @JsonSerialize(using = ToStringSerializer.class) private Long creatorId; @ApiModelProperty(value="分类id") - @JsonSerialize(using = ToStringSerializer.class) private Long typeId; @ApiModelProperty(value="下载量") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TiktokUserVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TiktokUserVo.java index 0390740..54cde47 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TiktokUserVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TiktokUserVo.java @@ -17,7 +17,6 @@ import java.util.List; public class TiktokUserVo implements Serializable { @ApiModelProperty(value="id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty(value="用户昵称") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TypeVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TypeVo.java index 50db7fc..c0781ec 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TypeVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TypeVo.java @@ -18,7 +18,6 @@ import java.io.Serializable; public class TypeVo implements Serializable { @ApiModelProperty(value="id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty(value="分类类型") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/UserVipVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/UserVipVo.java index 0acec16..2ca8e07 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/UserVipVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/UserVipVo.java @@ -17,7 +17,6 @@ import java.math.BigDecimal; public class UserVipVo implements Serializable { @ApiModelProperty(value="主键Id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty(value="vip名称") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/VerifyLogVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/VerifyLogVo.java index d881046..735b5b5 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/VerifyLogVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/VerifyLogVo.java @@ -15,7 +15,6 @@ import java.io.Serializable; @ApiModel("审核响应体") public class VerifyLogVo implements Serializable { @ApiModelProperty(value="id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty(value="审核原因") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/WithdrawLogVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/WithdrawLogVo.java index 5ac575d..f237aa4 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/WithdrawLogVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/WithdrawLogVo.java @@ -20,14 +20,12 @@ import java.math.BigDecimal; public class WithdrawLogVo implements Serializable { @ApiModelProperty(value="主键id") - @JsonSerialize(using = ToStringSerializer.class) private Integer id; @ApiModelProperty(value="流水号") private String orderId; @ApiModelProperty(value="艺术家id") - @JsonSerialize(using = ToStringSerializer.class) private Long creatorId; @ApiModelProperty(value="提现金额") diff --git a/bnyer-services/bnyer-order/pom.xml b/bnyer-services/bnyer-order/pom.xml index 8ff58cb..bd5406a 100644 --- a/bnyer-services/bnyer-order/pom.xml +++ b/bnyer-services/bnyer-order/pom.xml @@ -34,11 +34,6 @@ spring-cloud-starter-alibaba-sentinel - - - org.springframework.boot - spring-boot-starter-actuator - diff --git a/bnyer-services/bnyer-pay/pom.xml b/bnyer-services/bnyer-pay/pom.xml index 92ea1c3..d0b2d0b 100644 --- a/bnyer-services/bnyer-pay/pom.xml +++ b/bnyer-services/bnyer-pay/pom.xml @@ -34,12 +34,6 @@ spring-cloud-starter-alibaba-sentinel - - - org.springframework.boot - spring-boot-starter-actuator - - io.springfox diff --git a/bnyer-services/bnyer-system/pom.xml b/bnyer-services/bnyer-system/pom.xml index cc3aaea..a87cc76 100644 --- a/bnyer-services/bnyer-system/pom.xml +++ b/bnyer-services/bnyer-system/pom.xml @@ -35,12 +35,6 @@ spring-cloud-starter-alibaba-sentinel - - - org.springframework.boot - spring-boot-starter-actuator - - io.springfox diff --git a/bnyer-visual/bnyer-monitor/pom.xml b/bnyer-visual/bnyer-monitor/pom.xml deleted file mode 100644 index 68f4d45..0000000 --- a/bnyer-visual/bnyer-monitor/pom.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - com.dimensionalnode - bnyer-visual - 1.0.0 - - 4.0.0 - - bnyer-visual-monitor - - - bnyer-visual-monitor监控中心 - - - - - - - de.codecentric - spring-boot-admin-starter-server - ${spring-boot-admin.version} - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-sentinel - - - - - org.springframework.boot - spring-boot-starter-web - - - - - org.springframework.boot - spring-boot-starter-security - - - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - 2.6.2 - - - - repackage - - - - - - - - \ No newline at end of file diff --git a/bnyer-visual/bnyer-monitor/src/main/java/com/bnyer/modules/monitor/BnyerMonitorApplication.java b/bnyer-visual/bnyer-monitor/src/main/java/com/bnyer/modules/monitor/BnyerMonitorApplication.java deleted file mode 100644 index 01582ad..0000000 --- a/bnyer-visual/bnyer-monitor/src/main/java/com/bnyer/modules/monitor/BnyerMonitorApplication.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.bnyer.modules.monitor; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import de.codecentric.boot.admin.server.config.EnableAdminServer; - -/** - * 监控中心 - * - * @author ruoyi - */ -@EnableAdminServer -@SpringBootApplication -public class BnyerMonitorApplication -{ - public static void main(String[] args) - { - SpringApplication.run(BnyerMonitorApplication.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ bnyer监控服务启动成功 ლ(´ڡ`ლ)ﾞ \n" + - "__________ \n" + - "\\______ \\ ____ ___.__. ___________ \n" + - " | | _// < | |/ __ \\_ __ \\\n" + - " | | \\ | \\___ \\ ___/| | \\/\n" + - " |______ /___| / ____|\\___ >__| \n" + - " \\/ \\/\\/ \\/ \n"); - } -} diff --git a/bnyer-visual/bnyer-monitor/src/main/java/com/bnyer/modules/monitor/config/WebSecurityConfigurer.java b/bnyer-visual/bnyer-monitor/src/main/java/com/bnyer/modules/monitor/config/WebSecurityConfigurer.java deleted file mode 100644 index 7559805..0000000 --- a/bnyer-visual/bnyer-monitor/src/main/java/com/bnyer/modules/monitor/config/WebSecurityConfigurer.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.bnyer.modules.monitor.config; - -import de.codecentric.boot.admin.server.config.AdminServerProperties; -import org.springframework.context.annotation.Configuration; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; -import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler; - -/** - * 监控权限配置 - * - * @author ruoyi - */ -@Configuration -public class WebSecurityConfigurer extends WebSecurityConfigurerAdapter -{ - private final String adminContextPath; - - public WebSecurityConfigurer(AdminServerProperties adminServerProperties) - { - this.adminContextPath = adminServerProperties.getContextPath(); - } - - @Override - protected void configure(HttpSecurity http) throws Exception - { - SavedRequestAwareAuthenticationSuccessHandler successHandler = new SavedRequestAwareAuthenticationSuccessHandler(); - successHandler.setTargetUrlParameter("redirectTo"); - successHandler.setDefaultTargetUrl(adminContextPath + "/"); - - http - .headers().frameOptions().disable() - .and().authorizeRequests() - .antMatchers(adminContextPath + "/assets/**" - , adminContextPath + "/login" - , adminContextPath + "/actuator/**" - , adminContextPath + "/instances/**" - ).permitAll() - .anyRequest().authenticated() - .and() - .formLogin().loginPage(adminContextPath + "/login") - .successHandler(successHandler).and() - .logout().logoutUrl(adminContextPath + "/logout") - .and() - .httpBasic().and() - .csrf() - .disable(); - } -} diff --git a/bnyer-visual/bnyer-monitor/src/main/resources/bootstrap-dev.yml b/bnyer-visual/bnyer-monitor/src/main/resources/bootstrap-dev.yml deleted file mode 100644 index 6d55152..0000000 --- a/bnyer-visual/bnyer-monitor/src/main/resources/bootstrap-dev.yml +++ /dev/null @@ -1,22 +0,0 @@ -spring: - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: http://117.50.61.7:8848 - # 命名空间地址 - namespace: c4f53d8c-0a91-4249-a804-f16f543ec3b0 - # 命名空间分组 - group: dev - config: - # 配置中心地址 - server-addr: http://117.50.61.7:8848 - # 配置文件格式 - file-extension: yml - # 命名空间地址 - namespace: c4f53d8c-0a91-4249-a804-f16f543ec3b0 - # 命名空间分组 - group: dev - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/bnyer-visual/bnyer-monitor/src/main/resources/bootstrap-grey.yml b/bnyer-visual/bnyer-monitor/src/main/resources/bootstrap-grey.yml deleted file mode 100644 index 4ec59f5..0000000 --- a/bnyer-visual/bnyer-monitor/src/main/resources/bootstrap-grey.yml +++ /dev/null @@ -1,22 +0,0 @@ -spring: - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: http://175.24.122.142:6231 - # 命名空间地址 - namespace: abfe8ee6-161b-4f8f-b61f-51663bbfa4f9 - # 命名空间分组 - group: grey - config: - # 配置中心地址 - server-addr: http://175.24.122.142:6231 - # 配置文件格式 - file-extension: yml - # 命名空间地址 - namespace: abfe8ee6-161b-4f8f-b61f-51663bbfa4f9 - # 命名空间分组 - group: grey - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/bnyer-visual/bnyer-monitor/src/main/resources/bootstrap-prod.yml b/bnyer-visual/bnyer-monitor/src/main/resources/bootstrap-prod.yml deleted file mode 100644 index d8c9f80..0000000 --- a/bnyer-visual/bnyer-monitor/src/main/resources/bootstrap-prod.yml +++ /dev/null @@ -1,22 +0,0 @@ -spring: - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: http://175.24.122.142:8848 - # 命名空间地址 - namespace: 604df951-ada5-481f-a0be-9fd9b97a7f4d - # 命名空间分组 - group: prod - config: - # 配置中心地址 - server-addr: http://175.24.122.142:8848 - # 配置文件格式 - file-extension: yml - # 命名空间地址 - namespace: 604df951-ada5-481f-a0be-9fd9b97a7f4d - # 命名空间分组 - group: prod - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/bnyer-visual/bnyer-monitor/src/main/resources/bootstrap-test.yml b/bnyer-visual/bnyer-monitor/src/main/resources/bootstrap-test.yml deleted file mode 100644 index e3d566c..0000000 --- a/bnyer-visual/bnyer-monitor/src/main/resources/bootstrap-test.yml +++ /dev/null @@ -1,22 +0,0 @@ -spring: - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: #http://117.50.61.7:8848 - # 命名空间地址 - namespace: #1bf94455-a046-41e3-b7e4-c12fd11c3690 - # 命名空间分组 - group: test - config: - # 配置中心地址 - server-addr: #http://117.50.61.7:8848 - # 配置文件格式 - file-extension: yml - # 命名空间地址 - namespace: #1bf94455-a046-41e3-b7e4-c12fd11c3690 - # 命名空间分组 - group: test - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/bnyer-visual/bnyer-monitor/src/main/resources/bootstrap.yml b/bnyer-visual/bnyer-monitor/src/main/resources/bootstrap.yml deleted file mode 100644 index e93323c..0000000 --- a/bnyer-visual/bnyer-monitor/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,15 +0,0 @@ -# Tomcat -server: - port: 7012 - -# Spring -spring: - main: - #解决循环依赖问题 - allow-circular-references: true - application: - # 应用名称 - name: bnyer-monitor - profiles: - # 环境配置 - active: dev diff --git a/bnyer-visual/bnyer-monitor/src/main/resources/logback.xml b/bnyer-visual/bnyer-monitor/src/main/resources/logback.xml deleted file mode 100644 index 455be94..0000000 --- a/bnyer-visual/bnyer-monitor/src/main/resources/logback.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - ${log.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 20 - - - ${log.pattern} - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 20 - - - ${log.pattern} - - - - ERROR - - ACCEPT - - DENY - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/bnyer-visual/pom.xml b/bnyer-visual/pom.xml deleted file mode 100644 index c53c8b1..0000000 --- a/bnyer-visual/pom.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - com.dimensionalnode - bnyer - 1.0.0 - - 4.0.0 - - - bnyer-monitor - - - bnyer-visual - pom - - - bnyer-visual图形化管理模块 - - - diff --git a/pom.xml b/pom.xml index ddf9806..b1d967f 100644 --- a/pom.xml +++ b/pom.xml @@ -288,7 +288,6 @@ bnyer-auth bnyer-gateway - bnyer-visual bnyer-services bnyer-api bnyer-common