feature-1.0-img: 添加获取公共素材库方法

bnyer-auth/src/main/resources/bootstrap-test.yml

@@ -3,18 +3,18 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: #http://117.50.61.7:8848
+        server-addr: http://117.50.61.7:8848
         # 命名空间地址
-        namespace: #1bf94455-a046-41e3-b7e4-c12fd11c3690
+        namespace: 1bf94455-a046-41e3-b7e4-c12fd11c3690
         # 命名空间分组
         group: test
       config:
         # 配置中心地址
-        server-addr: #http://117.50.61.7:8848
+        server-addr: http://117.50.61.7:8848
         # 配置文件格式
         file-extension: yml
         # 命名空间地址
-        namespace: #1bf94455-a046-41e3-b7e4-c12fd11c3690
+        namespace: 1bf94455-a046-41e3-b7e4-c12fd11c3690
         # 命名空间分组
         group: test
         # 共享配置

bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/enums/CommonImgsTypeEnum.java

@@ -11,11 +11,13 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum CommonImgsTypeEnum {
 
-    HEAD("0","头像"),
+    HEAD("all","头像","0"),
-    BACK("1","壁纸"),
+    BACK("photo","壁纸","1"),
-    ILLUSTRATION("2","插画");
+    ILLUSTRATION("illustration","插画","2");
 
     private String type;
 
-    private String msg;
+    private String name;
+
+    private String code;
 }

bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/utils/uuid/IdUtils.java

@@ -97,6 +97,14 @@ public class IdUtils
         return String.valueOf((int)(Math.random() * 9 + 1) * 100000);
     }
 
+    /**
+     * 随机生成1-100的整数
+     * @return
+     */
+    public static int numberGen(){
+       return (int) (Math.random() * 100 - 1);
+    }
+
     public static void main(String[] args) {
         long timeSeed = System.nanoTime();
         double randSeed = Math.random() * 1000;

bnyer-gateway/src/main/resources/bootstrap-test.yml

@@ -3,18 +3,18 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: #http://117.50.61.7:8848
+        server-addr: http://117.50.61.7:8848
         # 命名空间地址
-        namespace: #1bf94455-a046-41e3-b7e4-c12fd11c3690
+        namespace: 1bf94455-a046-41e3-b7e4-c12fd11c3690
         # 命名空间分组
         group: test
       config:
         # 配置中心地址
-        server-addr: #http://117.50.61.7:8848
+        server-addr: http://117.50.61.7:8848
         # 配置文件格式
         file-extension: yml
         # 命名空间地址
-        namespace: #1bf94455-a046-41e3-b7e4-c12fd11c3690
+        namespace: 1bf94455-a046-41e3-b7e4-c12fd11c3690
         # 命名空间分组
         group: test
         # 共享配置
@@ -25,12 +25,12 @@ spring:
       eager: true
       transport:
         # 控制台地址
-        dashboard: #127.0.0.1:7011
+        dashboard: http://175.24.122.142:8858
       # nacos配置持久化
       datasource:
         ds1:
           nacos:
-            server-addr: #http://117.50.61.7:8848
+            server-addr: http://117.50.61.7:8848
             dataId: sentinel-bnyer-gateway
             groupId: DEFAULT_GROUP
             data-type: json

bnyer-services/bnyer-img/src/main/resources/bootstrap-test.yml

@@ -3,18 +3,18 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: #http://117.50.61.7:8848
+        server-addr: http://117.50.61.7:8848
         # 命名空间地址
-        namespace: #1bf94455-a046-41e3-b7e4-c12fd11c3690
+        namespace: 1bf94455-a046-41e3-b7e4-c12fd11c3690
         # 命名空间分组
         group: test
       config:
         # 配置中心地址
-        server-addr: #http://117.50.61.7:8848
+        server-addr: http://117.50.61.7:8848
         # 配置文件格式
         file-extension: yml
         # 命名空间地址
-        namespace: #1bf94455-a046-41e3-b7e4-c12fd11c3690
+        namespace: 1bf94455-a046-41e3-b7e4-c12fd11c3690
         # 命名空间分组
         group: test
         # 共享配置

bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/SysNoticeController.java

@@ -2,6 +2,7 @@ package com.bnyer.system.controller;
 
 import java.util.List;
 
+import com.bnyer.common.security.utils.SecurityUtils;
 import com.bnyer.system.domain.SysNotice;
 import com.bnyer.system.service.ISysNoticeService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,7 +21,6 @@ import com.bnyer.common.core.web.page.TableDataInfo;
 import com.bnyer.common.log.annotation.Log;
 import com.bnyer.common.log.enums.BusinessType;
 import com.bnyer.common.security.annotation.RequiresPermissions;
-import com.bnyer.common.security.utils.SecurityUtils;
 
 /**
  * 公告 信息操作处理

bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/CommonImgsServiceImpl.java

@@ -59,13 +59,13 @@ public class CommonImgsServiceImpl implements ICommonImgsService {
         }
         if(type.equals(CommonImgsTypeEnum.HEAD.getType())){
             //批量入库头像
-          return commonImgsMapper.insertBatch(headUrlList,CommonImgsTypeEnum.HEAD.getType());
+          return commonImgsMapper.insertBatch(headUrlList,CommonImgsTypeEnum.HEAD.getCode());
         }else if(type.equals(CommonImgsTypeEnum.BACK.getType())){
             //批量入库头像
-          return commonImgsMapper.insertBatch(headUrlList,CommonImgsTypeEnum.BACK.getType());
+          return commonImgsMapper.insertBatch(backUrlList,CommonImgsTypeEnum.BACK.getCode());
         }else if(type.equals(CommonImgsTypeEnum.ILLUSTRATION.getType())){
             //批量入库头像
-          return commonImgsMapper.insertBatch(headUrlList,CommonImgsTypeEnum.ILLUSTRATION.getType());
+          return commonImgsMapper.insertBatch(backUrlList,CommonImgsTypeEnum.ILLUSTRATION.getCode());
         }else{
             return 0;
         }

bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/CreatorServiceImpl.java

@@ -5,10 +5,7 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.bnyer.common.core.constant.TiktokConstant;
-import com.bnyer.common.core.domain.Creator;
+import com.bnyer.common.core.domain.*;
-import com.bnyer.common.core.domain.InviteLog;
-import com.bnyer.common.core.domain.TiktokImg;
-import com.bnyer.common.core.domain.VerifyLog;
 import com.bnyer.common.core.dto.CreatorDto;
 import com.bnyer.common.core.dto.CreatorPageDto;
 import com.bnyer.common.core.dto.VerifyCreatorDto;
@@ -16,10 +13,7 @@ import com.bnyer.common.core.exception.ServiceException;
 import com.bnyer.common.core.utils.Sm4Util;
 import com.bnyer.common.core.utils.StringUtils;
 import com.bnyer.common.core.utils.uuid.IdUtils;
-import com.bnyer.system.mapper.CreatorMapper;
+import com.bnyer.system.mapper.*;
-import com.bnyer.system.mapper.InviteLogMapper;
-import com.bnyer.system.mapper.TiktokImgMapper;
-import com.bnyer.system.mapper.VerifyLogMapper;
 import com.bnyer.system.service.ICreatorService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.digest.Md5Crypt;
@@ -53,11 +47,14 @@ public class CreatorServiceImpl implements ICreatorService {
     @Autowired
     private InviteLogMapper inviteLogMapper;
 
+    @Autowired
+    private CommonImgsMapper commonImgsMapper;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void insertRobot() {
         //批量生成3个机器人
-        for (int i = 0; i < 3; i++) {
+        for (int i = 0; i < 4; i++) {
             Creator creator = new Creator();
             creator.setIsRobot("1");
             creator.setCreateTime(new Date());
@@ -112,6 +109,31 @@ public class CreatorServiceImpl implements ICreatorService {
             }while (creatorByPhone != null);
             creator.setPhone(robotPhone);
             creatorMapper.insert(creator);
+
+            //获取公共素材库图片
+            LambdaQueryWrapper<CommonImgs> commonImgsWrapper = new LambdaQueryWrapper();
+            commonImgsWrapper.eq(CommonImgs::getType,"0");
+            commonImgsWrapper.eq(CommonImgs::getIsShow,"1");
+            List<String> commonImgs = commonImgsMapper.selectList(commonImgsWrapper).stream().map(CommonImgs::getImgUrl).collect(Collectors.toList());
+            //设置12张发布图片数据
+            for (int j = 0; j < 12; j++) {
+                TiktokImg robotImg = new TiktokImg();
+                robotImg.setCreatorId(creator.getId());
+                robotImg.setStatus("2");
+                robotImg.setIsOriginal("0");
+                robotImg.setCreateTime(new Date());
+                robotImg.setUpdateTime(new Date());
+                robotImg.setSort(0);
+                robotImg.setIsShow("1");
+                robotImg.setGreatNum(IdUtils.numberGen());
+                robotImg.setCollectionNum(IdUtils.numberGen());
+                robotImg.setDownloadNum(IdUtils.numberGen());
+                robotImg.setTypeId(1L);
+                //随机获取一张头像图片
+                Collections.shuffle(commonImgs);
+                robotImg.setImgUrl(commonImgs.get(0));
+                tiktokImgMapper.insert(robotImg);
+            }
             log.debug("【图文平台后台】生成了机器人艺术家:{}", JSON.toJSONString(creator.getPhone()));
         }
     }

bnyer-services/bnyer-system/src/main/resources/bootstrap-test.yml

@@ -3,18 +3,18 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: #http://117.50.61.7:8848
+        server-addr: http://117.50.61.7:8848
         # 命名空间地址
-        namespace: #1bf94455-a046-41e3-b7e4-c12fd11c3690
+        namespace: 1bf94455-a046-41e3-b7e4-c12fd11c3690
         # 命名空间分组
         group: test
       config:
         # 配置中心地址
-        server-addr: #http://117.50.61.7:8848
+        server-addr: http://117.50.61.7:8848
         # 配置文件格式
         file-extension: yml
         # 命名空间地址
-        namespace: #1bf94455-a046-41e3-b7e4-c12fd11c3690
+        namespace: 1bf94455-a046-41e3-b7e4-c12fd11c3690
         # 命名空间分组
         group: test
         # 共享配置

bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/CommonImgsMapper.xml

@@ -17,9 +17,9 @@
     id, img_url, is_show, `type`, create_time, update_time, sort
   </sql>
   <insert id="insertBatch">
-    insert into img_common_imgs(img_url,type)
+    insert into img_common_imgs(img_url,type,create_time,update_time) values
     <foreach collection="imgList" item="item" index="index" separator=",">
-      (#{item}, #{type})
+      (#{item}, #{type},NOW(),NOW())
     </foreach>
   </insert>
 </mapper>