feature-img-1.0:添加微信收款图片、原创图片类型

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

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

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

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

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<Long> signList;
 

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

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

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

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
         # 共享配置

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("获取艺术家信息")

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

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<SignRelationVo> signList;
 

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<SignVo> signList;
 

bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorAccountMapper.xml

@@ -10,6 +10,7 @@
     <result column="id_no" jdbcType="VARCHAR" property="idNo" />
     <result column="phone" jdbcType="VARCHAR" property="phone" />
     <result column="type" jdbcType="CHAR" property="type" />
+    <result column="img_url" jdbcType="VARCHAR" property="imgUrl" />
     <result column="account_no" jdbcType="VARCHAR" property="accountNo" />
     <result column="is_show" jdbcType="CHAR" property="isShow" />
     <result column="is_use" jdbcType="CHAR" property="isUse" />
@@ -19,12 +20,12 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    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
   </sql>
 
   <select id="queryFrontList" resultType="com.bnyer.common.core.vo.CreatorAccountVo">
         select
-          id, creator_id,name,id_no,account_no,type,is_use
+          id, creator_id,name,id_no,account_no,type,is_use,img_url
         from img_creator_account
         where is_show = '1' and creator_id = #{creatorId}
         order by is_use desc

bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/TiktokImgMapper.xml

@@ -13,6 +13,7 @@
     <result column="collection_num" jdbcType="INTEGER" property="collectionNum" />
     <result column="status" jdbcType="CHAR" property="status" />
     <result column="is_hot" jdbcType="CHAR" property="isHot" />
+    <result column="is_original" jdbcType="CHAR" property="isOriginal" />
     <result column="is_show" jdbcType="CHAR" property="isShow" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
@@ -29,6 +30,7 @@
     <result column="collectionNum" jdbcType="INTEGER" property="collectionNum" />
     <result column="status" jdbcType="CHAR" property="status" />
     <result column="isHot" jdbcType="CHAR" property="isHot" />
+    <result column="isOriginal" jdbcType="CHAR" property="isOriginal" />
     <collection property="signList" ofType="com.bnyer.img.vo.SignVo" select="com.bnyer.img.mapper.ImgSignRelationMapper.querySignListByImgId" column="id"/>
   </resultMap>
   <resultMap id="imgSignList" type="com.bnyer.img.vo.ImgSignVo">
@@ -41,6 +43,7 @@
     <result column="collectionNum" jdbcType="INTEGER" property="collectionNum" />
     <result column="status" jdbcType="CHAR" property="status" />
     <result column="isHot" jdbcType="CHAR" property="isHot" />
+    <result column="isOriginal" jdbcType="CHAR" property="isOriginal" />
     <collection property="signList" ofType="com.bnyer.img.vo.SignRelationVo" select="com.bnyer.img.mapper.ImgSignRelationMapper.querySignRelationByImgId" column="id"/>
   </resultMap>
   <resultMap id="imgListBySignName" type="com.bnyer.img.vo.TiktokImgVo">
@@ -53,6 +56,7 @@
     <result column="collectionNum" jdbcType="INTEGER" property="collectionNum" />
     <result column="status" jdbcType="CHAR" property="status" />
     <result column="isHot" jdbcType="CHAR" property="isHot" />
+    <result column="isOriginal" jdbcType="CHAR" property="isOriginal" />
     <collection property="signList" ofType="com.bnyer.img.vo.SignVo">
       <id column="signId" jdbcType="BIGINT" property="id" />
       <result column="signName" jdbcType="VARCHAR" property="name" />
@@ -61,13 +65,13 @@
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
     id, img_url, creator_id, type_id, download_num, great_num, collection_num, `status`,
-    is_hot, is_show, create_time, update_time, sort
+    is_hot, is_show, create_time, update_time, sort,is_original
   </sql>
     <select id="queryInList" resultMap="imgSignList">
       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
       <where>
         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}
   </select>
@@ -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'
     </select>
@@ -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}
   </select>

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