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 c17e7c2..63623d4 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 @@ -77,5 +77,12 @@ public class CreatorAccount extends BaseDomain { @ApiModelProperty(value="类型(0->银行卡;1->支付宝)") private String type; + /** + * 艺术家微信收款码截图(临时用) + */ + @TableField(value = "img_url") + @ApiModelProperty(value="艺术家微信收款码截图(临时用)") + private String imgUrl; + private static final long serialVersionUID = 1L; } 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 a39caef..003f472 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 @@ -79,5 +79,12 @@ public class TiktokImg extends BaseDomain { @ApiModelProperty(value="是否热门(0->冷门;1->热门)") private String isHot; + /** + * 是否原创(0->网络图片;1->原创图片) + */ + @TableField(value = "is_original") + @ApiModelProperty(value="是否原创(0->网络图片;1->原创图片)") + private String isOriginal; + private static final long serialVersionUID = 1L; } \ No newline at end of file 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 20cd40e..af11ee3 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 @@ -47,6 +47,9 @@ public class CreatorAccountDto implements Serializable { @ApiModelProperty(value="类型") private String type; + @ApiModelProperty(value="艺术家微信收款码截图") + private String imgUrl; + public CreatorAccount extractParam(){ CreatorAccount creatorAccount = new CreatorAccount(); creatorAccount.setId(this.getId()); @@ -58,6 +61,9 @@ public class CreatorAccountDto implements Serializable { if(StringUtils.isNotBlank(this.getAccountNo())){ creatorAccount.setAccountNo(Sm4Util.sm4Encryption(this.getAccountNo())); } + if(StringUtils.isNotBlank(this.getImgUrl())){ + creatorAccount.setImgUrl(this.getImgUrl()); + } return creatorAccount; } } 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 adc83f5..ade3909 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 @@ -42,6 +42,9 @@ public class TiktokImgDto implements Serializable { @ApiModelProperty(value="是否热门(0->冷门;1->热门)") private String isHot; + @ApiModelProperty(value="是否原创(0->网络图片;1->原创图片)") + private String isOriginal; + public TiktokImg extractParam(){ TiktokImg tiktokImg = new TiktokImg(); BeanUtils.copyProperties(this,tiktokImg); 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 dab55f1..182bcf3 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 @@ -31,6 +31,9 @@ public class TiktokImgMiniDto implements Serializable { @ApiModelProperty(value="状态(0->待审核;1->审核拒绝;2->已上架;3->已下架)") private String status; + @ApiModelProperty(value="是否原创(0->网络图片;1->原创图片)") + private String isOriginal; + @ApiModelProperty(value="标签id列表") private List signList; 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 c990661..48bd4b4 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 @@ -25,4 +25,7 @@ public class TiktokImgPageDto extends BasePageDto { @ApiModelProperty(value="是否显示(0->否;1->是)") private String isShow; + + @ApiModelProperty(value="是否原创(0->网络图片;1->原创图片)") + private String isOriginal; } 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 9ba392c..d0f8286 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 @@ -38,5 +38,8 @@ public class CreatorAccountVo implements Serializable { @ApiModelProperty(value="默认使用(0->未使用;1->使用中)") private String isUse; + @ApiModelProperty(value="艺术家微信收款码截图") + private String imgUrl; + private static final long serialVersionUID = 1L; } diff --git a/bnyer-gateway/src/main/resources/bootstrap-prod.yml b/bnyer-gateway/src/main/resources/bootstrap-prod.yml index b5bd9cf..fd252b6 100644 --- a/bnyer-gateway/src/main/resources/bootstrap-prod.yml +++ b/bnyer-gateway/src/main/resources/bootstrap-prod.yml @@ -3,22 +3,22 @@ spring: nacos: discovery: # 解决部署在不同服务器访问不到的问题，需暴露外网ip - ip: 81.69.47.31 + ip: 203.104.38.186 # 部署在不同服务器上的指定端口 port: 7010 # 服务注册地址 - server-addr: http://175.24.122.142:8848 + server-addr: http://203.104.38.186:6001 # 命名空间地址 - namespace: 604df951-ada5-481f-a0be-9fd9b97a7f4d + namespace: b133c9e5-9f8d-4ed4-9ebd-95557802889f # 命名空间分组 group: prod config: # 配置中心地址 - server-addr: http://175.24.122.142:8848 + server-addr: http://203.104.38.186:6001 # 配置文件格式 file-extension: yml # 命名空间地址 - namespace: 604df951-ada5-481f-a0be-9fd9b97a7f4d + namespace: b133c9e5-9f8d-4ed4-9ebd-95557802889f # 命名空间分组 group: prod # 共享配置 @@ -34,7 +34,7 @@ spring: datasource: ds1: nacos: - server-addr: http://175.24.122.142:8848 + server-addr: http://203.104.38.186:6001 dataId: sentinel-bnyer-gateway groupId: prod data-type: json diff --git a/bnyer-services/bnyer-file/src/main/resources/bootstrap-prod.yml b/bnyer-services/bnyer-file/src/main/resources/bootstrap-prod.yml index 8000f86..7a31df2 100644 --- a/bnyer-services/bnyer-file/src/main/resources/bootstrap-prod.yml +++ b/bnyer-services/bnyer-file/src/main/resources/bootstrap-prod.yml @@ -3,22 +3,22 @@ spring: nacos: discovery: # 解决部署在不同服务器访问不到的问题，需暴露外网ip - ip: 175.24.122.142 + ip: 203.104.38.186 # 部署在不同服务器上的指定端口 port: 8011 # 服务注册地址 - server-addr: http://175.24.122.142:8848 + server-addr: http://203.104.38.186:6001 # 命名空间地址 - namespace: 604df951-ada5-481f-a0be-9fd9b97a7f4d + namespace: b133c9e5-9f8d-4ed4-9ebd-95557802889f # 命名空间分组 group: prod config: # 配置中心地址 - server-addr: http://175.24.122.142:8848 + server-addr: http://203.104.38.186:6001 # 配置文件格式 file-extension: yml # 命名空间地址 - namespace: 604df951-ada5-481f-a0be-9fd9b97a7f4d + namespace: b133c9e5-9f8d-4ed4-9ebd-95557802889f # 命名空间分组 group: prod # 共享配置 diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorMiniController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorMiniController.java index bd47b35..6670061 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorMiniController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorMiniController.java @@ -347,23 +347,6 @@ public class CreatorMiniController extends BaseController { return AjaxResult.success(creatorProfitService.queryFrontProfitInfo(creatorId)); } - //@TokenCheck -// @PostMapping("/login") -// @ApiOperation("小程序艺术家登录") -// public AjaxResult login(@Validated @ApiParam("艺术家数据") @RequestBody CreatorLoginDto param) -// { -// log.info("小程序艺术家数据参数为:{}", JSON.toJSON(param)); -// return AjaxResult.success(creatorService.login(param)); -// } - - //@TokenCheck -// @PostMapping("/logout") -// @ApiOperation("小程序艺术家登出") -// public AjaxResult logout(@Validated @ApiParam("艺术家数据") @RequestBody CreatorLogoutDto param) -// { -// return AjaxResult.success(creatorService.logout(param.getPhone())); -// } - //@TokenCheck @GetMapping("/getCreatorInfo/{creatorId}") @ApiOperation("获取艺术家信息") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokImgServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokImgServiceImpl.java index 95fdbe6..40185a5 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokImgServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokImgServiceImpl.java @@ -54,6 +54,7 @@ public class TiktokImgServiceImpl implements TiktokImgService { tiktokImg.setCreatorId(dto.getCreatorId()); tiktokImg.setTypeId(dto.getTypeId()); tiktokImg.setStatus(dto.getStatus()); + tiktokImg.setIsOriginal(dto.getIsOriginal()); tiktokImg.setCreateTime(new Date()); tiktokImg.setUpdateTime(new Date()); tiktokImgMapper.insert(tiktokImg); 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 e2b6d5a..0a510da 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 @@ -41,6 +41,9 @@ public class ImgSignVo implements Serializable { @ApiModelProperty(value="是否热门(0->冷门;1->热门)") private String isHot; + @ApiModelProperty(value="是否原创(0->网络图片;1->原创图片)") + private String isOriginal; + @ApiModelProperty(value="标签列表") private List signList; 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 c2c459f..8595e99 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 @@ -41,6 +41,9 @@ public class TiktokImgVo implements Serializable { @ApiModelProperty(value="是否热门(0->冷门;1->热门)") private String isHot; + @ApiModelProperty(value="是否原创(0->网络图片;1->原创图片)") + private String isOriginal; + @ApiModelProperty(value="标签列表") private List signList; diff --git a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorAccountMapper.xml b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorAccountMapper.xml index dfc0554..73e431a 100644 --- a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorAccountMapper.xml +++ b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorAccountMapper.xml @@ -10,6 +10,7 @@ + @@ -19,12 +20,12 @@ - id, creator_id, `name`, id_no, phone,account_no,type,is_use, create_time, update_time, sort,is_show + id, creator_id, `name`, id_no, phone,account_no,type,is_use, create_time, update_time, sort,is_show,img_url select iti.id as id,iti.img_url as imgUrl,iti.creator_id as creatorId,iti.type_id as typeId, iti.download_num as downloadNum, iti.great_num as greatNum, iti.collection_num as collectionNum, - iti.status as status, iti.is_hot as isHot + iti.status as status, iti.is_hot as isHot,iti.is_original as isOriginal from img_tiktok_img iti iti.is_show = '1' @@ -102,7 +106,7 @@ select iti.id as id,iti.img_url as imgUrl,iti.creator_id as creatorId,iti.type_id as typeId, iti.download_num as downloadNum, iti.great_num greatNum, iti.collection_num as collectionNum, - iti.status as status,iti.is_hot as isHot + iti.status as status,iti.is_hot as isHot,iti.is_original as isOriginal from img_tiktok_img iti where iti.creator_id = #{creatorId} and iti.is_show = '1' and iti.status = '2' order by iti.create_time desc @@ -113,7 +117,7 @@ select iti.id as id,iti.img_url as imgUrl,iti.creator_id as creatorId, iti.type_id as typeId,iti.download_num as downloadNum, iti.great_num as greatNum, - iti.collection_num as collectionNum,iti.status as status,iti.is_hot as isHot + iti.collection_num as collectionNum,iti.status as status,iti.is_hot as isHot,iti.is_original as isOriginal from img_tiktok_img iti where iti.creator_id = #{creatorId} and iti.is_show = '1' and iti.status = '2' order by iti.create_time desc @@ -123,7 +127,7 @@ select iti.id as id,iti.img_url as imgUrl,iti.creator_id as creatorId, iti.type_id as typeId,iti.download_num as downloadNum, iti.great_num as greatNum, - iti.collection_num as collectionNum,iti.status as status,iti.is_hot as isHot + iti.collection_num as collectionNum,iti.status as status,iti.is_hot as isHot,iti.is_original as isOriginal from img_tiktok_img iti where iti.is_show = '1' and iti.status = '2' and iti.id = #{imgId} @@ -131,7 +135,7 @@ select iti.id as id,iti.img_url as imgUrl,iti.creator_id as creatorId, iti.type_id as typeId,iti.download_num downloadNum, iti.great_num as greatNum, - iti.collection_num as collectionNum,iti.status as status,iti.is_hot as isHot + iti.collection_num as collectionNum,iti.status as status,iti.is_hot as isHot,iti.is_original as isOriginal from img_tiktok_img iti where iti.is_show = '1' and iti.status = '2' @@ -140,7 +144,7 @@ select iti.id as id,iti.img_url as imgUrl,iti.creator_id as creatorId,iti.type_id as TypeId, iti.download_num as downloadNum,iti.great_num as greatNum,iti.collection_num as collectionNum, - iti.status as status,iti.is_hot as isHot + iti.status as status,iti.is_hot as isHot,iti.is_original as isOriginal from img_tiktok_img iti join img_creator ic on iti.creator_id = ic.id where iti.is_show = '1' and iti.status = '2' @@ -158,7 +162,7 @@ select iti.id as id,iti.img_url as imgUrl,iti.creator_id as creatorId, iti.type_id as typeId,iti.download_num as downloadNum, iti.great_num as greatNum, - iti.collection_num as collectionNum,iti.status as status,iti.is_hot as isHot + iti.collection_num as collectionNum,iti.status as status,iti.is_hot as isHot,iti.is_original as isOriginal from img_tiktok_img iti where iti.id in (select img_id from img_img_sign_relation where sign_id = #{signId} and type_id = #{typeId}) @@ -167,7 +171,7 @@ select iti.id as id,iti.img_url as imgUrl,iti.creator_id as creatorId, iti.type_id as typeId,iti.download_num as downloadNum, iti.great_num as greatNum, - iti.collection_num as collectionNum,iti.status as status,iti.is_hot as isHot, + iti.collection_num as collectionNum,iti.status as status,iti.is_hot as isHot,iti.is_original as isOriginal, iis.id as signId,iis.name as signName from img_tiktok_img iti join img_img_sign_relation iisr on iisr.img_id = iti.id @@ -185,7 +189,7 @@ select iti.id as id,iti.img_url as imgUrl,iti.creator_id as creatorId, iti.type_id as typeId,iti.download_num as downloadNum, iti.great_num as greatNum, - iti.collection_num as collectionNum,iti.status as status,iti.is_hot as isHot + iti.collection_num as collectionNum,iti.status as status,iti.is_hot as isHot,iti.is_original as isOriginal from img_tiktok_img iti where iti.is_show = '1' and iti.id = #{imgId} diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/TiktokImgServiceImpl.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/TiktokImgServiceImpl.java index 0d2ec98..1d59562 100644 --- a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/TiktokImgServiceImpl.java +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/TiktokImgServiceImpl.java @@ -74,6 +74,9 @@ public class TiktokImgServiceImpl implements ITiktokImgService { if(StringUtils.isNotBlank(dto.getIsShow())){ wrapper.eq(TiktokImg::getIsShow, dto.getIsShow()); } + if(StringUtils.isNotBlank(dto.getIsOriginal())){ + wrapper.eq(TiktokImg::getIsOriginal, dto.getIsOriginal()); + } wrapper.orderByDesc(TiktokImg::getCreateTime); return tiktokImgMapper.selectList(wrapper); }