feature-1.0-tx文生图：添加腾讯文生图接口

bnyer-api/bnyer-api-file/pom.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>bnyer-api</artifactId>
+        <groupId>com.dimensionalnode</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>bnyer-api-file</artifactId>
+
+    <description>
+        bnyer-api-file文件服务接口模块
+    </description>
+
+    <dependencies>
+        <!-- bnyer Common Core-->
+        <dependency>
+            <groupId>com.dimensionalnode</groupId>
+            <artifactId>bnyer-common-core</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

bnyer-api/bnyer-api-file/src/main/java/com/bnyer/file/api/RemoteFileService.java

@@ -0,0 +1,40 @@
+package com.bnyer.file.api;
+
+import com.bnyer.common.core.constant.ServiceNameConstants;
+import com.bnyer.common.core.domain.R;
+import com.bnyer.file.api.factory.RemoteFileFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+/**
+ * 文件服务
+ *
+ * @author penny
+ * @date 2023/04/15 11:03
+ */
+@FeignClient(contextId = "remoteFileService", value = ServiceNameConstants.FILE_SERVICE, fallbackFactory = RemoteFileFallbackFactory.class)
+public interface RemoteFileService {
+
+
+    /**
+     * 上传文件到minio
+     * @param file 文件
+     * @return -
+     */
+    @PostMapping(value = "/upload",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    R<String> uploadBanner(@RequestPart(name = "file") MultipartFile file);
+
+    /**
+     * 批量上传文件到七牛云
+     * @param files 文件
+     * @return -
+     */
+    @PostMapping("/uploadBatch")
+    R<List<String>> uploadBatch(MultipartFile[] files);
+
+}

bnyer-api/bnyer-api-file/src/main/java/com/bnyer/file/api/factory/RemoteFileFallbackFactory.java

@@ -0,0 +1,40 @@
+package com.bnyer.file.api.factory;
+
+import com.bnyer.common.core.domain.R;
+import com.bnyer.file.api.RemoteFileService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+/**
+ * 文件服务降级处理
+ *
+ * @author penny
+ */
+@Component
+public class RemoteFileFallbackFactory implements FallbackFactory<RemoteFileService>
+{
+    private static final Logger log = LoggerFactory.getLogger(RemoteFileFallbackFactory.class);
+
+
+    @Override
+    public RemoteFileService create(Throwable throwable) {
+        log.error("api文件服务调用失败:{}", throwable.getMessage());
+        return new RemoteFileService()
+        {
+            @Override
+            public R<String> uploadBanner(MultipartFile file) {
+                return R.fail("远程调用minio文件上传失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<List<String>> uploadBatch(MultipartFile[] files) {
+                return R.fail("远程调用七牛云批量文件上传失败:" + throwable.getMessage());
+            }
+        };
+    }
+}

bnyer-api/bnyer-api-file/src/main/resources/META-INF/spring.factories

@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration =  com.bnyer.file.api.factory.RemoteFileFallbackFactory
+

bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/RemoteImgService.java

@@ -2,13 +2,20 @@ package com.bnyer.img.api;
 
 import com.bnyer.common.core.constant.ServiceNameConstants;
 import com.bnyer.common.core.domain.R;
+import com.bnyer.common.core.dto.CreatorLoginDto;
+import com.bnyer.common.core.dto.FhLoginDto;
+import com.bnyer.common.core.dto.TiktokLoginDto;
+import com.bnyer.common.core.dto.WxLoginDto;
 import com.bnyer.img.api.dto.TiktokImgMiniDto;
 import com.bnyer.img.api.factory.RemoteImgFallbackFactory;
+import com.bnyer.img.api.model.LoginCreator;
+import com.bnyer.img.api.model.LoginFhUser;
+import com.bnyer.img.api.model.LoginTiktokUser;
+import com.bnyer.img.api.model.LoginWechatUser;
 import io.swagger.annotations.ApiParam;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * 图文服务
@@ -26,4 +33,44 @@ public interface RemoteImgService {
      */
     @PostMapping(value = "/img/mini/creator/insertTiktokImg")
     public R<Integer> insertTiktokImg(@Validated @RequestBody @ApiParam("TiktokImg对象") TiktokImgMiniDto dto);
+
+    /**
+     * 获取艺术家信息
+     * @param param 登录数据
+     * @return -
+     */
+    @PostMapping(value = "/img/mini/creator/getCreatorInfo")
+    public R<LoginCreator> getCreatorInfo(@Validated @ApiParam("艺术家登录数据") @RequestBody CreatorLoginDto param);
+
+    /**
+     * 更新艺术家登录时间
+     * @param creatorId 艺术家id
+     * @return -
+     */
+    @GetMapping(value = "/img/mini/creator/updateLoginTime/{creatorId}")
+    public void updateLoginTime(@ApiParam("艺术家id") @PathVariable("creatorId") Long creatorId);
+
+    /**
+     * 获取快手小程序用户信息
+     * @param dto 登录数据
+     * @return -
+     */
+    @PostMapping(value = "/img/mini/fh/getFhUserInfo")
+    public R<LoginFhUser> getFhLoginUserByLoginParam(@Validated @RequestBody @ApiParam("登录对象") FhLoginDto dto);
+
+    /**
+     * 获取抖音小程序用户信息
+     * @param dto 登录数据
+     * @return -
+     */
+    @PostMapping(value = "/img/mini/tiktok/getTiktokUserInfo")
+    public R<LoginTiktokUser> getTiktokLoginUserByLoginParam(@Validated @RequestBody @ApiParam("登录对象") TiktokLoginDto dto);
+
+    /**
+     * 获取微信小程序用户信息
+     * @param dto 登录数据
+     * @return -
+     */
+    @PostMapping(value = "/img/mini/wx/getWechatUserInfo")
+    R<LoginWechatUser> getWxLoginUserByLoginParam(@Validated @RequestBody @ApiParam("登录对象") WxLoginDto dto);
 }

bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/domain/TiktokImg.java

@@ -1,6 +1,8 @@
 package com.bnyer.img.api.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
@@ -58,9 +60,9 @@ public class TiktokImg implements Serializable {
     private Integer collectionNum;
 
     /**
-     * 状态(0->待审核;1->审核通过)
+     * 状态(0->待审核;2->审核拒绝;3->已上架;4->已下架)
      */
-    @ApiModelProperty(value="状态(0->待审核;1->审核通过;2->审核拒绝)")
+    @ApiModelProperty(value="状态(0->待审核;2->审核拒绝;3->已上架;4->已下架)")
     private String status;
 
     /**

bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/dto/TiktokImgMiniDto.java

@@ -2,6 +2,8 @@ package com.bnyer.img.api.dto;
 
 import com.bnyer.common.core.utils.bean.BeanUtils;
 import com.bnyer.img.api.domain.TiktokImg;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -28,7 +30,7 @@ public class TiktokImgMiniDto implements Serializable {
     @ApiModelProperty(value="分类id")
     private Long typeId;
 
-    @ApiModelProperty(value="状态(0->待审核;1->审核通过;2->审核拒绝)")
+    @ApiModelProperty(value="状态(0->待审核;2->审核拒绝;3->已上架;4->已下架)")
     private String status;
 
 

bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/factory/RemoteImgFallbackFactory.java

@@ -1,8 +1,16 @@
 package com.bnyer.img.api.factory;
 
 import com.bnyer.common.core.domain.R;
+import com.bnyer.common.core.dto.CreatorLoginDto;
+import com.bnyer.common.core.dto.FhLoginDto;
+import com.bnyer.common.core.dto.TiktokLoginDto;
+import com.bnyer.common.core.dto.WxLoginDto;
 import com.bnyer.img.api.RemoteImgService;
 import com.bnyer.img.api.dto.TiktokImgMiniDto;
+import com.bnyer.img.api.model.LoginCreator;
+import com.bnyer.img.api.model.LoginFhUser;
+import com.bnyer.img.api.model.LoginTiktokUser;
+import com.bnyer.img.api.model.LoginWechatUser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;
@@ -28,6 +36,31 @@ public class RemoteImgFallbackFactory implements FallbackFactory<RemoteImgServic
             public R<Integer> insertTiktokImg(TiktokImgMiniDto dto) {
                 return R.fail("图片保存失败:" + throwable.getMessage());
             }
+
+            @Override
+            public R<LoginCreator> getCreatorInfo(CreatorLoginDto param) {
+                return R.fail("获取艺术家失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public void updateLoginTime(Long creatorId) {
+
+            }
+
+            @Override
+            public R<LoginFhUser> getFhLoginUserByLoginParam(FhLoginDto dto) {
+                return R.fail("获取快手小程序用户信息失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<LoginTiktokUser> getTiktokLoginUserByLoginParam(TiktokLoginDto dto) {
+                return R.fail("获取抖音小程序用户信息失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<LoginWechatUser> getWxLoginUserByLoginParam(WxLoginDto dto) {
+                return R.fail("获取微信小程序用户信息失败:" + throwable.getMessage());
+            }
         };
     }
 }

bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/model/LoginCreator.java

@@ -0,0 +1,59 @@
+package com.bnyer.img.api.model;
+
+import com.bnyer.common.core.vo.CreatorLoginVo;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author  chengkun
+ * @date  2022/5/30 16:25
+ */
+
+/**
+    * 艺术家信息
+    */
+@Data
+public class LoginCreator implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 艺术家唯一标识
+     */
+    private String token;
+
+    /**
+     * 主键id
+     */
+    private Long creatorId;
+
+    /**
+     * 艺术家手机号
+     */
+    private String creatorPhone;
+
+    /**
+     * 登录时间
+     */
+    private Long loginTime;
+
+    /**
+     * 过期时间
+     */
+    private Long expireTime;
+
+    /**
+     * 登录IP地址
+     */
+    private String ipaddr;
+
+    /**
+     * 艺术家信息
+     */
+    private CreatorLoginVo creator;
+
+
+}

bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/model/LoginFhUser.java

@@ -0,0 +1,60 @@
+package com.bnyer.img.api.model;
+
+import com.bnyer.common.core.vo.FhUserLoginVo;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author  chengkun
+ * @date  2022/5/30 16:25
+ */
+
+/**
+    * 快手小程序用户信息
+    */
+@Data
+public class LoginFhUser implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 快手小程序用户唯一标识
+     */
+    private String token;
+
+    /**
+     * 主键id
+     */
+    private Long fhUserId;
+
+    /**
+     * 快手小程序用户开放Id
+     */
+    private String fhUserOpenId;
+
+    /**
+     * 快手小程序用户昵称
+     */
+    private String fhUserName;
+
+    /**
+     * 登录时间
+     */
+    private Long loginTime;
+
+    /**
+     * 过期时间
+     */
+    private Long expireTime;
+
+    /**
+     * 登录IP地址
+     */
+    private String ipaddr;
+
+    /**
+     * 快手小程序用户信息
+     */
+    private FhUserLoginVo fhUser;
+}

bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/model/LoginTiktokUser.java

@@ -0,0 +1,60 @@
+package com.bnyer.img.api.model;
+
+import com.bnyer.common.core.vo.TiktokUserLoginVo;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author  chengkun
+ * @date  2022/5/30 16:25
+ */
+
+/**
+    * 抖音小程序用户信息
+    */
+@Data
+public class LoginTiktokUser implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 抖音小程序用户唯一标识
+     */
+    private String token;
+
+    /**
+     * 主键id
+     */
+    private Long tiktokUserId;
+
+    /**
+     * 抖音小程序用户开放Id
+     */
+    private String tiktokUserOpenId;
+
+    /**
+     * 抖音小程序用户昵称
+     */
+    private String tiktokUserName;
+
+    /**
+     * 登录时间
+     */
+    private Long loginTime;
+
+    /**
+     * 过期时间
+     */
+    private Long expireTime;
+
+    /**
+     * 登录IP地址
+     */
+    private String ipaddr;
+
+    /**
+     * 抖音小程序用户信息
+     */
+    private TiktokUserLoginVo tiktokUser;
+}

bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/model/LoginWechatUser.java

@@ -0,0 +1,60 @@
+package com.bnyer.img.api.model;
+
+import com.bnyer.common.core.vo.WxUserLoginVo;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author  chengkun
+ * @date  2022/5/30 16:25
+ */
+
+/**
+    * 微信小程序用户信息
+    */
+@Data
+public class LoginWechatUser implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 微信小程序用户唯一标识
+     */
+    private String token;
+
+    /**
+     * 主键id
+     */
+    private Long wxUserId;
+
+    /**
+     * 微信小程序用户开放Id
+     */
+    private String wxUserOpenId;
+
+    /**
+     * 微信小程序用户昵称
+     */
+    private String wxUserName;
+
+    /**
+     * 登录时间
+     */
+    private Long loginTime;
+
+    /**
+     * 过期时间
+     */
+    private Long expireTime;
+
+    /**
+     * 登录IP地址
+     */
+    private String ipaddr;
+
+    /**
+     * 微信小程序用户信息
+     */
+    private WxUserLoginVo wxUser;
+}

bnyer-api/bnyer-api-system/src/main/java/com/bnyer/system/api/RemoteFileService.java → bnyer-api/bnyer-api-system/src/main/java/com/bnyer/system/api/RemoteSystemFileService.java

@@ -12,11 +12,11 @@ import com.bnyer.system.api.domain.SysFile;
 
 /**
  * 文件服务
- * 
+ *
  * @author ruoyi
  */
-@FeignClient(contextId = "remoteFileService", value = ServiceNameConstants.FILE_SERVICE, fallbackFactory = RemoteFileFallbackFactory.class)
-public interface RemoteFileService
+@FeignClient(contextId = "remoteSystemFileService", value = ServiceNameConstants.SYSTEM_FILE_SERVICE, fallbackFactory = RemoteFileFallbackFactory.class)
+public interface RemoteSystemFileService
 {
     /**
      * 上传文件

bnyer-api/bnyer-api-system/src/main/java/com/bnyer/system/api/factory/RemoteFileFallbackFactory.java

@@ -6,24 +6,24 @@ import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
 import com.bnyer.common.core.domain.R;
-import com.bnyer.system.api.RemoteFileService;
+import com.bnyer.system.api.RemoteSystemFileService;
 import com.bnyer.system.api.domain.SysFile;
 
 /**
  * 文件服务降级处理
- * 
+ *
  * @author ruoyi
  */
 @Component
-public class RemoteFileFallbackFactory implements FallbackFactory<RemoteFileService>
+public class RemoteFileFallbackFactory implements FallbackFactory<RemoteSystemFileService>
 {
     private static final Logger log = LoggerFactory.getLogger(RemoteFileFallbackFactory.class);
 
     @Override
-    public RemoteFileService create(Throwable throwable)
+    public RemoteSystemFileService create(Throwable throwable)
     {
         log.error("文件服务调用失败:{}", throwable.getMessage());
-        return new RemoteFileService()
+        return new RemoteSystemFileService()
         {
             @Override
             public R<SysFile> upload(MultipartFile file)

bnyer-api/pom.xml

@@ -11,6 +11,7 @@
     <modules>
         <module>bnyer-api-system</module>
         <module>bnyer-api-img</module>
+        <module>bnyer-api-file</module>
     </modules>
 
     <artifactId>bnyer-api</artifactId>

bnyer-auth/pom.xml

@@ -39,13 +39,7 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-        
-        <!-- SpringBoot Actuator -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-		
+
         <!-- bnyer Common Security-->
         <dependency>
             <groupId>com.dimensionalnode</groupId>
@@ -60,6 +54,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.6.2</version>
                 <executions>
                     <execution>
                         <goals>

bnyer-auth/src/main/java/com/bnyer/auth/controller/CreatorController.java

@@ -0,0 +1,51 @@
+package com.bnyer.auth.controller;
+
+import com.bnyer.auth.service.CreatorLoginService;
+import com.bnyer.common.core.domain.R;
+import com.bnyer.common.core.dto.CreatorLoginDto;
+import com.bnyer.common.security.service.CreatorTokenService;
+import com.bnyer.common.security.utils.SecurityUtils;
+import com.bnyer.img.api.model.LoginCreator;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * 艺术家token 控制
+ * 
+ * @author penny
+ */
+@RestController
+public class CreatorController
+{
+    @Autowired
+    private CreatorTokenService creatorTokenService;
+
+    @Autowired
+    private CreatorLoginService creatorService;
+
+
+    @PostMapping("/creatorLogin")
+    @ApiOperation("小程序艺术家登录")
+    public R<?> login(@Validated @ApiParam("艺术家数据") @RequestBody CreatorLoginDto param)
+    {
+        // 用户登录
+        LoginCreator login = creatorService.login(param);
+        // 获取登录token
+        return R.ok(creatorTokenService.createToken(login));
+    }
+
+    @PostMapping("/creatorLogout")
+    public R<?> logout(HttpServletRequest request)
+    {
+        String token = SecurityUtils.getCreatorToken(request);
+        creatorTokenService.delLoginCreator(token);
+        return R.ok();
+    }
+}

bnyer-auth/src/main/java/com/bnyer/auth/controller/FhUserController.java

@@ -0,0 +1,49 @@
+package com.bnyer.auth.controller;
+
+import com.bnyer.auth.service.FhUserLoginService;
+import com.bnyer.common.core.domain.R;
+import com.bnyer.common.core.dto.FhLoginDto;
+import com.bnyer.common.security.service.FhUserTokenService;
+import com.bnyer.common.security.utils.SecurityUtils;
+import com.bnyer.img.api.model.LoginFhUser;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * 快手小程序token 控制
+ * 
+ * @author penny
+ */
+@RestController
+public class FhUserController
+{
+    @Autowired
+    private FhUserLoginService fhUserLoginService;
+
+    @Autowired
+    private FhUserTokenService fUserTokenService;
+
+    @ApiOperation(value="快手小程序用户登录")
+    @PostMapping(value = "/fhUserLogin")
+    public R<?> loginFh(@Validated @RequestBody @ApiParam("登录对象") FhLoginDto dto){
+        LoginFhUser loginFhUser = fhUserLoginService.login(dto);
+        return R.ok(fUserTokenService.createToken(loginFhUser));
+    }
+
+    @PostMapping("/fhUserLogout")
+    @ApiOperation("快手小程序用户注销")
+    public R<?> logout(HttpServletRequest request)
+    {
+        String token = SecurityUtils.getFhToken(request);
+        //删除快手用户缓存
+        fUserTokenService.delLoginFhUser(token);
+        return R.ok();
+    }
+}

bnyer-auth/src/main/java/com/bnyer/auth/controller/TiktokUserController.java

@@ -0,0 +1,49 @@
+package com.bnyer.auth.controller;
+
+import com.bnyer.auth.service.TiktokUserLoginService;
+import com.bnyer.common.core.domain.R;
+import com.bnyer.common.core.dto.TiktokLoginDto;
+import com.bnyer.common.security.service.TiktokUserTokenService;
+import com.bnyer.common.security.utils.SecurityUtils;
+import com.bnyer.img.api.model.LoginTiktokUser;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * 抖音小程序token 控制
+ * 
+ * @author penny
+ */
+@RestController
+public class TiktokUserController
+{
+    @Autowired
+    private TiktokUserLoginService tiktokUserLoginService;
+
+    @Autowired
+    private TiktokUserTokenService tiktokUserTokenService;
+
+    @ApiOperation(value="抖音小程序用户登录")
+    @PostMapping(value = "/tiktokUserLogin")
+    public R<?> loginFh(@Validated @RequestBody @ApiParam("登录对象") TiktokLoginDto dto){
+        LoginTiktokUser loginTiktokUser = tiktokUserLoginService.login(dto);
+        return R.ok(tiktokUserTokenService.createToken(loginTiktokUser));
+    }
+
+    @PostMapping("/tiktokUserLogout")
+    @ApiOperation("抖音小程序用户注销")
+    public R<?> logout(HttpServletRequest request)
+    {
+        String token = SecurityUtils.getTiktokToken(request);
+        //删除抖音用户缓存
+        tiktokUserTokenService.delLoginFhUser(token);
+        return R.ok();
+    }
+}

bnyer-auth/src/main/java/com/bnyer/auth/controller/WxUserController.java

@@ -0,0 +1,49 @@
+package com.bnyer.auth.controller;
+
+import com.bnyer.auth.service.WxUserLoginService;
+import com.bnyer.common.core.domain.R;
+import com.bnyer.common.core.dto.WxLoginDto;
+import com.bnyer.common.security.service.WxUserTokenService;
+import com.bnyer.common.security.utils.SecurityUtils;
+import com.bnyer.img.api.model.LoginWechatUser;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * 微信小程序token 控制
+ * 
+ * @author penny
+ */
+@RestController
+public class WxUserController
+{
+    @Autowired
+    private WxUserLoginService wxUserLoginService;
+
+    @Autowired
+    private WxUserTokenService WxUserTokenService;
+
+    @ApiOperation(value="微信小程序用户登录")
+    @PostMapping(value = "/wxUserLogin")
+    public R<?> loginWx(@Validated @RequestBody @ApiParam("登录对象") WxLoginDto dto){
+        LoginWechatUser loginWxUser = wxUserLoginService.login(dto);
+        return R.ok(WxUserTokenService.createToken(loginWxUser));
+    }
+
+    @PostMapping("/wxUserLogout")
+    @ApiOperation("微信小程序用户注销")
+    public R<?> logout(HttpServletRequest request)
+    {
+        String token = SecurityUtils.getWechatToken(request);
+        //删除微信用户缓存
+        WxUserTokenService.delLoginFhUser(token);
+        return R.ok();
+    }
+}

bnyer-auth/src/main/java/com/bnyer/auth/service/CreatorLoginService.java

@@ -0,0 +1,39 @@
+package com.bnyer.auth.service;
+
+import com.bnyer.common.core.constant.TiktokConstant;
+import com.bnyer.common.core.domain.R;
+import com.bnyer.common.core.dto.CreatorLoginDto;
+import com.bnyer.common.core.exception.ServiceException;
+import com.bnyer.img.api.RemoteImgService;
+import com.bnyer.img.api.model.LoginCreator;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 艺术家端登录校验方法
+ *
+ * @author penny
+ */
+@Component
+public class CreatorLoginService {
+
+    @Autowired
+    private RemoteImgService remoteImgService;
+
+    public LoginCreator login(CreatorLoginDto dto) {
+        R<LoginCreator> creatorInfo = remoteImgService.getCreatorInfo(dto);
+        if(creatorInfo.getData() == null){
+            throw new ServiceException("手机号或密码不正确!", TiktokConstant.TIKTOK_CREATOR_PWD_ERROR);
+        }
+        if(creatorInfo.getData().getCreator().getStatus().equals("0")){
+            throw new ServiceException("当前艺术家暂未审核,请耐心等待或联系客服!",TiktokConstant.TIKTOK_CREATOR_NOT_PASS_ERROR);
+        }
+        if(creatorInfo.getData().getCreator().getStatus().equals("2")){
+            throw new ServiceException("当前艺术家被封禁,请联系客服处理!",TiktokConstant.TIKTOK_CREATOR_BANED_ERROR);
+        }
+        //更新登录时间
+        remoteImgService.updateLoginTime(creatorInfo.getData().getCreator().getId());
+        return creatorInfo.getData();
+    }
+
+}

bnyer-auth/src/main/java/com/bnyer/auth/service/FhUserLoginService.java

@@ -0,0 +1,24 @@
+package com.bnyer.auth.service;
+
+import com.bnyer.common.core.dto.FhLoginDto;
+import com.bnyer.img.api.RemoteImgService;
+import com.bnyer.img.api.model.LoginFhUser;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 快手小程序端用户登录校验方法
+ *
+ * @author penny
+ */
+@Component
+public class FhUserLoginService {
+
+    @Autowired
+    private RemoteImgService remoteImgService;
+
+    public LoginFhUser login(FhLoginDto dto) {
+        return remoteImgService.getFhLoginUserByLoginParam(dto).getData();
+    }
+
+}

bnyer-auth/src/main/java/com/bnyer/auth/service/TiktokUserLoginService.java

@@ -0,0 +1,24 @@
+package com.bnyer.auth.service;
+
+import com.bnyer.common.core.dto.TiktokLoginDto;
+import com.bnyer.img.api.RemoteImgService;
+import com.bnyer.img.api.model.LoginTiktokUser;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 抖音小程序端用户登录校验方法
+ * 
+ * @author penny
+ */
+@Component
+public class TiktokUserLoginService {
+
+    @Autowired
+    private RemoteImgService remoteImgService;
+
+    public LoginTiktokUser login(TiktokLoginDto dto) {
+        return remoteImgService.getTiktokLoginUserByLoginParam(dto).getData();
+    }
+
+}

bnyer-auth/src/main/java/com/bnyer/auth/service/WxUserLoginService.java

@@ -0,0 +1,26 @@
+package com.bnyer.auth.service;
+
+import com.bnyer.common.core.dto.FhLoginDto;
+import com.bnyer.common.core.dto.WxLoginDto;
+import com.bnyer.img.api.RemoteImgService;
+import com.bnyer.img.api.model.LoginFhUser;
+import com.bnyer.img.api.model.LoginWechatUser;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 微信小程序端用户登录校验方法
+ *
+ * @author penny
+ */
+@Component
+public class WxUserLoginService {
+
+    @Autowired
+    private RemoteImgService remoteImgService;
+
+    public LoginWechatUser login(WxLoginDto dto) {
+        return remoteImgService.getWxLoginUserByLoginParam(dto).getData();
+    }
+
+}

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

@@ -2,23 +2,19 @@ spring:
   cloud:
     nacos:
       discovery:
-        # 解决部署在不同服务器访问不到的问题，需暴露外网ip
-        ip: 81.69.47.31
-        # 部署在不同服务器上的指定端口
-        port: 8010
         # 服务注册地址
-        server-addr: http://175.24.122.142:8848
+        server-addr: http://192.168.3.100: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://192.168.3.100:6001
         # 配置文件格式
         file-extension: yml
         # 命名空间地址
-        namespace: 604df951-ada5-481f-a0be-9fd9b97a7f4d
+        namespace: b133c9e5-9f8d-4ed4-9ebd-95557802889f
         # 命名空间分组
         group: prod
         # 共享配置

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/pom.xml

@@ -89,6 +89,12 @@
             <artifactId>commons-lang3</artifactId>
         </dependency>
 
+        <!-- mybatis-plus -->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+        </dependency>
+
         <!-- Commons Io -->
         <dependency>
             <groupId>commons-io</groupId>
@@ -129,6 +135,23 @@
             <artifactId>hutool-all</artifactId>
         </dependency>
 
+        <!--腾讯翻译-->
+        <dependency>
+            <groupId>com.tencentcloudapi</groupId>
+            <artifactId>tencentcloud-sdk-java-common</artifactId>
+            <version>3.1.715</version>
+        </dependency>
+        <dependency>
+            <groupId>com.tencentcloudapi</groupId>
+            <artifactId>tencentcloud-sdk-java-tmt</artifactId>
+            <version>3.1.715</version>
+        </dependency>
+        <!--腾讯文生图-->
+        <dependency>
+            <groupId>com.tencentcloudapi</groupId>
+            <artifactId>tencentcloud-sdk-java-aiart</artifactId>
+            <version>3.1.715</version>
+        </dependency>
     </dependencies>
 
 </project>

bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/annotation/TokenCheck.java

@@ -1,18 +0,0 @@
-package com.bnyer.common.core.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * 小程序用户token检测注解
- * 
- * @author chengkun
- */
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface TokenCheck
-{
-
-}

bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/constant/CacheConstants.java

@@ -5,8 +5,7 @@ package com.bnyer.common.core.constant;
  * 
  * @author ruoyi
  */
-public class CacheConstants
-{
+public class CacheConstants {
     /**
      * 缓存有效期，默认720（分钟）
      */
@@ -18,7 +17,28 @@ public class CacheConstants
     public final static long REFRESH_TIME = 120;
 
     /**
-     * 权限缓存前缀
+     * PC端权限缓存前缀
      */
-    public final static String LOGIN_TOKEN_KEY = "login_tokens:";
-}
+    public final static String LOGIN_TOKEN_KEY = "login_pc_tokens:";
+
+    /**
+     * 微信艺术家端权限缓存前缀
+     */
+    public final static String LOGIN_CREATOR_TOKEN_KEY = "bnyer.img.wechat.login.creator:";
+
+    /**
+     * 微信用户端权限缓存前缀
+     */
+    public final static String LOGIN_WECHAT_TOKEN_KEY = "bnyer.img.wx.login.user:";
+
+    /**
+     * 抖音用户端权限缓存前缀
+     */
+    public final static String LOGIN_TIKTOK_TOKEN_KEY = "bnyer.img.tiktok.login.user:";
+
+    /**
+     * 快手用户端权限缓存前缀
+     */
+    public final static String LOGIN_FASTHAND_TOKEN_KEY = "bnyer.img.fh.login.user:";
+
+}

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/constants/ProfitOrderConstant.java → bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/constant/ProfitOrderConstant.java

@@ -1,4 +1,4 @@
-package com.bnyer.img.constants;
+package com.bnyer.common.core.constant;
 
 /**
  * @author chengkun

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/constants/RedisKeyConstant.java → bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/constant/RedisKeyConstant.java

@@ -1,4 +1,4 @@
-package com.bnyer.img.constants;
+package com.bnyer.common.core.constant;
 
 public class RedisKeyConstant {
 
@@ -66,22 +66,22 @@ public class RedisKeyConstant {
     /**
      * 抖音小程序用户登录键
      */
-    public static final String TIKTOK_USER_LOGIN_KEY = "bnyer.img.tiktok.user:";
+    public static final String TIKTOK_USER_LOGIN_KEY = "bnyer.img.tiktok.login.user:";
 
     /**
      * 快手小程序用户登录键
      */
-    public static final String FH_USER_LOGIN_KEY = "bnyer.img.fh.user:";
+    public static final String FH_USER_LOGIN_KEY = "bnyer.img.fh.login.user:";
 
     /**
      * 微信小程序用户登录键
      */
-    public static final String WECHAT_USER_LOGIN_KEY = "bnyer.img.wx.user:";
+    public static final String WECHAT_USER_LOGIN_KEY = "bnyer.img.wx.login.user:";
 
     /**
      * 微信小程序艺术家登录键
      */
-    public static final String WECHAT_CREATOR_LOGIN_KEY = "bnyer.img.wechat.creator:";
+    public static final String WECHAT_CREATOR_LOGIN_KEY = "bnyer.img.wechat.login.creator:";
 
     /**
      * 微信小程序艺术家邀请键
@@ -97,8 +97,58 @@ public class RedisKeyConstant {
      * 平台用户下载键
      */
     public static final String PLATFORM_USER_DOWNLOAD_KEY = "bnyer.img.user.download:";
+
+    /**
+     * 平台用户ai绘画键
+     */
+    public static final String PLATFORM_USER_AI_PAINT_KEY = "bnyer.img.user.aiPaint:";
+
+    /**
+     * ai绘画采用sd或tx文生图开关
+     */
+    public static final String AI_PAINT_BUTTON = "bnyer.img.paint.button";
     /**
      * 艺术家上传键
      */
     public static final String CREATOR_UPLOAD_KEY="bnyer.img.creator.upload:";
+
+    /**
+     * 用户会员vip锁键
+     */
+    public static final String PAY_USER_VIP_LOCK_KEY = "bnyer.img.userVip.lock:";
+
+    /**
+     * 抖音用户关注艺术家键
+     */
+    public static final String TIKTOK_USER_FOLLOW_KEY = "bnyer.img.tiktok.follow:";
+
+    /**
+     * 微信用户关注艺术家键
+     */
+    public static final String WECHAT_USER_FOLLOW_KEY = "bnyer.img.wechat.follow:";
+
+    /**
+     * 快手用户关注艺术家键
+     */
+    public static final String FH_USER_FOLLOW_KEY = "bnyer.img.fh.follow:";
+
+    /**
+     * 艺术家粉丝数量键
+     */
+    public static final String CREATOR_FANS_NUM_KEY = "bnyer.img.fans.num";
+
+    /**
+     * 特约邀请码键
+     */
+    public static final String SPECIAL_INVITE_CODE_KEY = "bnyer.img.invite.status";
+
+    /**
+     * 热搜词
+     */
+    public static final String HOT_KEY_WORD_KEY = "bnyer.hotkeyword";
+
+    /**
+     * 热搜词存入时间
+     */
+    public static final String HOT_KEY_WORD_TIME_KEY = "bnyer.hotkeywordtime";
 }

bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/constant/SecurityConstants.java

@@ -7,6 +7,7 @@ package com.bnyer.common.core.constant;
  */
 public class SecurityConstants
 {
+    //***************************艺术家信息开始************************************
     /**
      * 用户ID字段
      */
@@ -41,4 +42,95 @@ public class SecurityConstants
      * 登录用户
      */
     public static final String LOGIN_USER = "login_user";
+    //***************************PC信息结束************************************
+
+    //***************************艺术家信息开始************************************
+
+    /**
+     * 艺术家ID字段
+     */
+    public static final String DETAILS_CREATOR_ID = "creator_id";
+
+    /**
+     * 艺术家标识
+     */
+    public static final String CREATOR_KEY = "creator_key";
+
+    /**
+     * 登录艺术家
+     */
+    public static final String LOGIN_CREATOR = "login_creator";
+
+    /**
+     * 艺术家手机号字段
+     */
+    public static final String DETAILS_PHONE = "creator_phone";
+
+    //***************************艺术家信息结束************************************
+    //***************************抖音用户信息开始************************************
+    /**
+     * 抖音用户ID字段
+     */
+    public static final String DETAILS_TIKTOK_USER_ID = "tiktok_user_id";
+
+    /**
+     * 抖音用户标识
+     */
+    public static final String TIKTOK_USER_KEY = "tiktok_user_key";
+
+    /**
+     * 抖音用户名字段
+     */
+    public static final String DETAILS_TIKTOK_USERNAME = "tiktok_user_username";
+
+    /**
+     * 抖音用户openId
+     */
+    public static final String DETAILS_TIKTOK_OPENID = "tiktok_user_openid";
+    //***************************抖音用户信息结束************************************
+    //***************************微信用户信息开始************************************
+
+    /**
+     * 微信用户ID字段
+     */
+    public static final String DETAILS_WECHAT_USER_ID = "wechat_user_id";
+
+    /**
+     * 微信用户标识
+     */
+    public static final String WECHAT_USER_KEY = "wechat_user_key";
+
+    /**
+     * 微信用户名字段
+     */
+    public static final String DETAILS_WECHAT_USERNAME = "wechat_user_username";
+
+    /**
+     * 微信用户openId
+     */
+    public static final String DETAILS_WECHAT_OPENID = "wechat_user_openid";
+    //***************************微信用户信息结束************************************
+    //***************************快手用户信息开始************************************
+
+    /**
+     * 快手用户ID字段
+     */
+    public static final String DETAILS_FH_USER_ID = "fh_user_id";
+
+    /**
+     * 快手用户标识
+     */
+    public static final String FH_USER_KEY = "fh_user_key";
+
+    /**
+     * 快手用户名字段
+     */
+    public static final String DETAILS_FH_USERNAME = "fh_user_username";
+
+    /**
+     * 快手用户openId
+     */
+    public static final String DETAILS_FH_OPENID = "fh_user_openid";
+
+    //***************************快手用户信息结束************************************
 }

bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/constant/ServiceNameConstants.java

@@ -18,12 +18,17 @@ public class ServiceNameConstants
     public static final String SYSTEM_SERVICE = "bnyer-system";
 
     /**
-     * 文件服务的serviceid
+     * 系统文件服务的serviceid
      */
-    public static final String FILE_SERVICE = "bnyer-file";
+    public static final String SYSTEM_FILE_SERVICE = "bnyer-system-file";
 
     /**
      * 图文服务的serviceid
      */
     public static final String IMG_SERVICE = "bnyer-img";
+
+    /**
+     * 文件服务的serviceid
+     */
+    public static final String FILE_SERVICE = "bnyer-file";
 }

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/constants/TiktokConstant.java → bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/constant/TiktokConstant.java

@@ -1,4 +1,4 @@
-package com.bnyer.img.constants;
+package com.bnyer.common.core.constant;
 
 /**
  * @author chengkun
@@ -52,7 +52,7 @@ public class TiktokConstant {
     public static final Integer CREATOR_AMT_NOT_ENOUGH = 105007;
 
     /**
-     * 微信获取session调用失败
+     * 微信获取授权调用失败
      */
     public static final Integer WECHAT_AUTH_ERROR = 105008;
 
@@ -75,4 +75,19 @@ public class TiktokConstant {
      *  艺术家尚未审核
      */
     public static final Integer TIKTOK_CREATOR_BANED_ERROR = 105012;
+
+    /**
+     *  调用抖音获取广告收入信息失败
+     */
+    public static final Integer TIKTOK_INCOME_ERROR = 105013;
+
+    /**
+     *  调用微信获取广告收入信息失败
+     */
+    public static final Integer WECHAT_INCOME_ERROR = 105014;
+
+    /**
+     *  邮箱已被注册使用
+     */
+    public static final Integer EMAIL_EXIST_ERROR = 105015;
 }

bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/constant/TokenConstants.java

@@ -8,10 +8,30 @@ package com.bnyer.common.core.constant;
 public class TokenConstants
 {
     /**
-     * 令牌自定义标识
+     * Pc端标识
      */
     public static final String AUTHENTICATION = "Authorization";
 
+    /**
+     * 微信小程序艺术家端授权标识
+     */
+    public static final String CREATOR_APP_AUTH = "CreatorAuthorization";
+
+    /**
+     * 微信小程序用户端授权标识
+     */
+    public static final String WECHAT_APP_AUTH = "WechatAuthorization";
+
+    /**
+     * 抖音小程序用户端授权标识
+     */
+    public static final String TIKTOK_APP_AUTH = "TiktokAuthorization";
+
+    /**
+     * 快手小程序用户端授权标识
+     */
+    public static final String FASTHAND_APP_AUTH = "FhAuthorization";
+
     /**
      * 令牌前缀
      */
@@ -20,6 +40,6 @@ public class TokenConstants
     /**
      * 令牌秘钥
      */
-    public final static String SECRET = "abcdefghijklmnopqrstuvwxyz";
+    public final static String SECRET = "abcdefghijklmnopqrstuvwxyzciyuanjiedianbnyer";
 
 }

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/constants/WithdrawConstant.java → bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/constant/WithdrawConstant.java

@@ -1,4 +1,4 @@
-package com.bnyer.img.constants;
+package com.bnyer.common.core.constant;
 
 /**
  * @author chengkun

bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/context/SecurityContextHolder.java

@@ -85,4 +85,5 @@ public class SecurityContextHolder
     {
         THREAD_LOCAL.remove();
     }
+
 }

bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/AiPaint.java

@@ -0,0 +1,124 @@
+package com.bnyer.common.core.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+    * ai绘画内容表
+    */
+@ApiModel(value="com-bnyer-common-core-domain-AiPaint")
+@Getter
+@Setter
+@ToString
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "img_ai_paint")
+public class AiPaint implements Serializable {
+    /**
+     * 主键Id
+     */
+    @ApiModelProperty(value="主键Id")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 作品编号
+     */
+    @TableField(value = "paint_id")
+    @ApiModelProperty(value="作品编号")
+    private String paintId;
+
+    /**
+     * 绘图者id
+     */
+    @ApiModelProperty(value="绘图者id")
+    @TableField(value = "painter_id")
+    private Long painterId;
+
+    /**
+     * 绘图者昵称
+     */
+    @TableField(value = "painter_name")
+    @ApiModelProperty(value="绘图者昵称")
+    private String painterName;
+
+    /**
+     * 图片
+     */
+    @TableField(value = "img_url")
+    @ApiModelProperty(value="图片")
+    private String imgUrl;
+
+    /**
+     * 关键词
+     */
+    @TableField(value = "prompt")
+    @ApiModelProperty(value="关键词")
+    private String prompt;
+
+    /**
+     * 模型名称
+     */
+    @TableField(value = "model")
+    @ApiModelProperty(value="模型风格名称")
+    private String model;
+
+    /**
+     * 风格名称
+     */
+    @TableField(value = "style_name")
+    @ApiModelProperty(value="风格名称")
+    private String styleName;
+
+    /**
+     * 图片高度
+     */
+    @TableField(value = "height")
+    @ApiModelProperty(value="图片高度")
+    private String height;
+
+    /**
+     * 图片宽度
+     */
+    @TableField(value = "width")
+    @ApiModelProperty(value="图片宽度")
+    private String width;
+
+    /**
+     * 是否显示 (0->隐藏；1->显示)
+     */
+    @TableField(value = "is_show")
+    @ApiModelProperty(value="是否显示 (0->隐藏；1->显示)")
+    private String isShow;
+
+    /**
+     * 平台(0->Hub;1->抖音;2->快手;3->微信)
+     */
+    @TableField(value = "`source`")
+    @ApiModelProperty(value="平台(0->Hub;1->抖音;2->快手;3->微信)")
+    private String source;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value="创建时间")
+    private Date createTime;
+
+    private static final long serialVersionUID = 1L;
+}

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/Banner.java → bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/Banner.java

@@ -1,4 +1,4 @@
-package com.bnyer.img.domain;
+package com.bnyer.common.core.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
-@ApiModel(value="com-bnyer-img-domain-Banner")
+@ApiModel(value="com-bnyer-common-core-domain-Banner")
 @Getter
 @Setter
 @ToString
@@ -16,12 +16,6 @@ import lombok.*;
 @NoArgsConstructor
 @TableName(value = "img_banner")
 public class Banner extends BaseDomain {
-    /**
-     * id
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    @ApiModelProperty(value="id")
-    private Long id;
 
     /**
      * banner名称

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/BaseDomain.java → bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/BaseDomain.java

@@ -1,7 +1,11 @@
-package com.bnyer.img.domain;
+package com.bnyer.common.core.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
@@ -17,6 +21,13 @@ import java.util.Date;
 @ApiModel("公共实体类")
 public class BaseDomain implements Serializable {
 
+    /**
+     * id
+     */
+    @ApiModelProperty(value="id")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private Long id;
+
     /**
      * 是否显示 (0->隐藏；1->显示)
      */

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/BzData.java → bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/BzData.java

@@ -1,14 +1,16 @@
-package com.bnyer.img.domain;
+package com.bnyer.common.core.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
-@ApiModel(value="com-bnyer-img-domain-BzData")
+@ApiModel(value="com-bnyer-common-core-domain-BzData")
 @Getter
 @Setter
 @ToString
@@ -19,8 +21,8 @@ public class BzData {
     /**
      * 主键id
      */
-    @TableId(value = "id", type = IdType.INPUT)
     @ApiModelProperty(value="主键id")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private Long id;
 
     /**

bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/CdkLog.java

@@ -0,0 +1,77 @@
+package com.bnyer.common.core.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@ApiModel(value="com-bnyer-common-core-domain-CdkLog")
+@Getter
+@Setter
+@ToString
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "img_cdk_log")
+public class CdkLog implements Serializable {
+    /**
+     * 主键id
+     */
+    @ApiModelProperty(value="主键id")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 兑换码
+     */
+    @TableField(value = "cdk")
+    @ApiModelProperty(value="兑换码")
+    private String cdk;
+
+    /**
+     * 兑换次数
+     */
+    @TableField(value = "paint_num")
+    @ApiModelProperty(value="兑换次数")
+    private int paintNum;
+
+    /**
+     * 用户id
+     */
+    @ApiModelProperty(value="用户id")
+    @TableField(value = "user_id")
+    private Long userId;
+
+    /**
+     * 平台(0->Hub;1->抖音;2->快手;3->微信)
+     */
+    @TableField(value = "`source`")
+    @ApiModelProperty(value="平台(0->Hub;1->抖音;2->快手;3->微信)")
+    private String source;
+
+    /**
+     * 是否显示 (0->隐藏；1->显示)
+     */
+    @TableField(value = "is_show")
+    @ApiModelProperty(value="是否显示 (0->隐藏；1->显示)")
+    private String isShow;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time")
+    @ApiModelProperty(value="创建时间")
+    private Date createTime;
+
+    private static final long serialVersionUID = 1L;
+}

bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/CommonImgs.java

@@ -0,0 +1,35 @@
+package com.bnyer.common.core.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+@ApiModel(value="com-bnyer-common-core-domain-CommonImgs")
+@Getter
+@Setter
+@ToString
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "img_common_imgs")
+public class CommonImgs extends BaseDomain {
+
+    /**
+     * 图片地址
+     */
+    @TableField(value = "img_url")
+    @ApiModelProperty(value="图片地址")
+    private String imgUrl;
+
+    /**
+     * 图片类型(0->头像;1->壁纸;2->插画)
+     */
+    @TableField(value = "type")
+    @ApiModelProperty(value="图片类型(0->头像;1->壁纸;2->插画)")
+    private String type;
+
+    private static final long serialVersionUID = 1L;
+}

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/Creator.java → bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/Creator.java

@@ -1,4 +1,4 @@
-package com.bnyer.img.domain;
+package com.bnyer.common.core.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -16,23 +16,18 @@ import java.util.Date;
  * @author  chengkun
  * @date  2022/5/30 16:25
  */
+
 /**
     * 图文平台艺术家表
     */
-@ApiModel(value="com-bnyer-img-domain-Creator")
+@ApiModel(value="com-bnyer-common-core-domain-Creator")
 @Getter
 @Setter
 @ToString
 @AllArgsConstructor
 @NoArgsConstructor
 @TableName(value = "img_creator")
-public class  Creator extends BaseDomain {
-    /**
-     * 主键id
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    @ApiModelProperty(value="主键id")
-    private Long id;
+public class Creator extends BaseDomain {
 
     /**
      * 姓名
@@ -62,6 +57,13 @@ public class  Creator extends BaseDomain {
     @ApiModelProperty(value="手机号")
     private String phone;
 
+    /**
+     * 邮箱
+     */
+    @TableField(value = "email")
+    @ApiModelProperty(value="邮箱")
+    private String email;
+
     /**
      * 头像img地址
      */
@@ -111,6 +113,13 @@ public class  Creator extends BaseDomain {
     @ApiModelProperty(value="是否活跃(0->不活跃;1->活跃 连续10天以上更新内容)")
     private String isHot;
 
+    /**
+     * 是否为机器人 (0->否；1->是)
+     */
+    @TableField(value = "is_robot")
+    @ApiModelProperty(value="是否为机器人 (0->否；1->是)")
+    private String isRobot;
+
     /**
      * 最后登录时间
      */
@@ -119,5 +128,19 @@ public class  Creator extends BaseDomain {
     @ApiModelProperty(value="最后登录时间")
     private Date lastLoginTime;
 
+    /**
+     * 等级id
+     */
+    @TableField(value = "level_id")
+    @ApiModelProperty(value="等级id")
+    private Long levelId;
+
+    /**
+     * 经验值
+     */
+    @TableField(value = "exp")
+    @ApiModelProperty(value="经验值")
+    private Integer exp;
+
     private static final long serialVersionUID = 1L;
 }

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/CreatorAccount.java → bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/CreatorAccount.java

@@ -1,4 +1,4 @@
-package com.bnyer.img.domain;
+package com.bnyer.common.core.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -6,11 +6,13 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.bnyer.common.core.annotation.Desensitized;
 import com.bnyer.common.core.enums.SensitiveTypeEnum;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
-@ApiModel(value="com-bnyer-img-domain-CreatorAccount")
+@ApiModel(value="com-bnyer-common-core-domain-CreatorAccount")
 @Getter
 @Setter
 @ToString
@@ -18,18 +20,12 @@ import lombok.*;
 @NoArgsConstructor
 @TableName(value = "img_creator_account")
 public class CreatorAccount extends BaseDomain {
-    /**
-     * 主键id
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    @ApiModelProperty(value="主键id")
-    private Long id;
 
     /**
      * 艺术家id
      */
-    @TableField(value = "creator_id")
     @ApiModelProperty(value="艺术家id")
+    @TableField(value = "creator_id")
     private Long creatorId;
 
     /**
@@ -47,14 +43,6 @@ public class CreatorAccount extends BaseDomain {
     @Desensitized(type = SensitiveTypeEnum.ID_CARD)
     private String idNo;
 
-    /**
-     * 银行卡(加密)
-     */
-    @TableField(value = "bank_no")
-    @ApiModelProperty(value="银行卡(加密)")
-    @Desensitized(type = SensitiveTypeEnum.BANK_CARD)
-    private String bankNo;
-
     /**
      * 联系电话
      */
@@ -64,12 +52,19 @@ public class CreatorAccount extends BaseDomain {
     private String phone;
 
     /**
-     * 支付宝账号
+     * 账户账号
      */
-    @TableField(value = "alipay_no")
-    @ApiModelProperty(value="支付宝账号")
+    @TableField(value = "account_no")
+    @ApiModelProperty(value="账户账号")
     @Desensitized(type = SensitiveTypeEnum.MOBILE_PHONE)
-    private String aliPayNo;
+    private String accountNo;
+
+    /**
+     * 默认使用(0->未使用;1->使用中)
+     */
+    @TableField(value = "is_use")
+    @ApiModelProperty(value="默认使用(0->未使用;1->使用中)")
+    private String isUse;
 
     /**
      * 类型(0->银行卡;1->支付宝)
@@ -78,5 +73,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-services/bnyer-img/src/main/java/com/bnyer/img/domain/CreatorProfit.java → bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/CreatorProfit.java

@@ -1,9 +1,11 @@
-package com.bnyer.img.domain;
+package com.bnyer.common.core.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
@@ -15,10 +17,11 @@ import java.util.Date;
  * @author  chengkun
  * @date  2022/6/8 10:51
  */
+
 /**
     * 图文平台-艺术家收益表
     */
-@ApiModel(value="com-bnyer-img-domain-CreatorProfit")
+@ApiModel(value="com-bnyer-common-core-domain-CreatorProfit")
 @Getter
 @Setter
 @ToString
@@ -26,12 +29,6 @@ import java.util.Date;
 @NoArgsConstructor
 @TableName(value = "img_creator_profit")
 public class CreatorProfit extends BaseDomain {
-    /**
-     * 主键id
-     */
-    @TableId(value = "id", type = IdType.INPUT)
-    @ApiModelProperty(value="主键id")
-    private Long id;
 
     /**
      * 结算流水号
@@ -43,8 +40,8 @@ public class CreatorProfit extends BaseDomain {
     /**
      * 艺术家id
      */
-    @TableField(value = "creator_id")
     @ApiModelProperty(value="艺术家id")
+    @TableField(value = "creator_id")
     private Long creatorId;
 
     /**
@@ -57,8 +54,8 @@ public class CreatorProfit extends BaseDomain {
     /**
      * 图片id
      */
-    @TableField(value = "img_id")
     @ApiModelProperty(value="图片id")
+    @TableField(value = "img_id")
     private Long imgId;
 
     /**
@@ -76,10 +73,10 @@ public class CreatorProfit extends BaseDomain {
     private String platform;
 
     /**
-     * 应用类型(0->节点壁纸)
+     * 应用类型(0->次元意境)
      */
     @TableField(value = "app_type")
-    @ApiModelProperty(value="应用类型(0->节点壁纸)")
+    @ApiModelProperty(value="应用类型(0->次元意境)")
     private String appType;
 
     /**

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/Feedback.java → bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/Feedback.java

@@ -1,4 +1,4 @@
-package com.bnyer.img.domain;
+package com.bnyer.common.core.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -6,13 +6,9 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
+import lombok.*;
 
-@ApiModel(value="com-bnyer-img-domain-Feedback")
+@ApiModel(value="com-bnyer-common-core-domain-Feedback")
 @Getter
 @Setter
 @ToString
@@ -20,12 +16,6 @@ import lombok.ToString;
 @NoArgsConstructor
 @TableName(value = "img_feedback")
 public class Feedback extends BaseDomain {
-    /**
-     * 主键Id
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    @ApiModelProperty(value="主键Id")
-    private Long id;
 
     /**
      * 反馈信息

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/FhUser.java → bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/FhUser.java

@@ -1,4 +1,4 @@
-package com.bnyer.img.domain;
+package com.bnyer.common.core.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -6,22 +6,17 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.io.Serializable;
-import java.util.Date;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
+import lombok.*;
 
 /**
  * @author  chengkun
  * @date  2022/7/4 13:58
  */
+
 /**
     * img快手平台用户表
     */
-@ApiModel(value="com-bnyer-img-domain-FhUser")
+@ApiModel(value="com-bnyer-common-core-domain-FhUser")
 @Getter
 @Setter
 @ToString
@@ -29,12 +24,6 @@ import lombok.ToString;
 @NoArgsConstructor
 @TableName(value = "img_fh_user")
 public class FhUser extends BaseDomain {
-    /**
-     * id
-     */
-    @TableId(value = "id", type = IdType.INPUT)
-    @ApiModelProperty(value="id")
-    private Long id;
 
     /**
      * 用户昵称
@@ -50,6 +39,20 @@ public class FhUser extends BaseDomain {
     @ApiModelProperty(value="快手id")
     private String fhCode;
 
+    /**
+     * 手机号
+     */
+    @TableField(value = "phone")
+    @ApiModelProperty(value="手机号")
+    private String phone;
+
+    /**
+     * 是否为vip(0->否;1->是)
+     */
+    @TableField(value = "is_vip")
+    @ApiModelProperty(value="是否为vip(0->否;1->是)")
+    private String isVip;
+
     /**
      * 头像img地址
      */

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/ImgSignRelation.java → bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/ImgSignRelation.java

@@ -1,10 +1,12 @@
-package com.bnyer.img.domain;
+package com.bnyer.common.core.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
@@ -12,7 +14,7 @@ import lombok.*;
 import java.io.Serializable;
 import java.util.Date;
 
-@ApiModel(value="com-bnyer-img-domain-ImgSignRelation")
+@ApiModel(value="com-bnyer-common-core-domain-ImgSignRelation")
 @Getter
 @Setter
 @ToString
@@ -21,31 +23,31 @@ import java.util.Date;
 @TableName(value = "img_img_sign_relation")
 public class ImgSignRelation implements Serializable {
     /**
-     * 主键id
+     * id
      */
-    @TableId(value = "id", type = IdType.AUTO)
-    @ApiModelProperty(value="主键id")
+    @ApiModelProperty(value="id")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
      * 图片id
      */
-    @TableField(value = "img_id")
     @ApiModelProperty(value="图片id")
+    @TableField(value = "img_id")
     private Long imgId;
 
     /**
      * 分类id
      */
-    @TableField(value = "type_id")
     @ApiModelProperty(value="分类id")
+    @TableField(value = "type_id")
     private Long typeId;
 
     /**
      * 标签id
      */
-    @TableField(value = "sign_id")
     @ApiModelProperty(value="标签id")
+    @TableField(value = "sign_id")
     private Long signId;
 
     /**

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/InviteLog.java → bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/InviteLog.java

@@ -1,20 +1,16 @@
-package com.bnyer.img.domain;
+package com.bnyer.common.core.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.io.Serializable;
-import java.util.Date;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
+import lombok.*;
 
-@ApiModel(value="com-bnyer-img-domain-InviteLog")
+@ApiModel(value="com-bnyer-common-core-domain-InviteLog")
 @Getter
 @Setter
 @ToString
@@ -22,12 +18,6 @@ import lombok.ToString;
 @NoArgsConstructor
 @TableName(value = "img_invite_log")
 public class InviteLog extends BaseDomain {
-    /**
-     * 主键id
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    @ApiModelProperty(value="主键id")
-    private Long id;
 
     /**
      * 邀请码
@@ -46,8 +36,8 @@ public class InviteLog extends BaseDomain {
     /**
      * 被邀请者id
      */
-    @TableField(value = "invited_creator_id")
     @ApiModelProperty(value="被邀请者id")
+    @TableField(value = "invited_creator_id")
     private Long invitedCreatorId;
 
     private static final long serialVersionUID = 1L;

bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/LevelInfo.java

@@ -0,0 +1,56 @@
+package com.bnyer.common.core.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+@ApiModel(value="com-bnyer-common-core-domain-LevelInfo")
+@Getter
+@Setter
+@ToString
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "img_level_info")
+public class LevelInfo extends BaseDomain {
+
+    /**
+     * 等级头衔名称
+     */
+    @TableField(value = "title")
+    @ApiModelProperty(value="等级头衔名称")
+    private String title;
+
+    /**
+     * 头衔图标
+     */
+    @TableField(value = "title_icon")
+    @ApiModelProperty(value="头衔图标")
+    private String titleIcon;
+
+    /**
+     * 最小经验值
+     */
+    @TableField(value = "min_exp")
+    @ApiModelProperty(value="最小经验值")
+    private Integer minExp;
+
+    /**
+     * 最大经验值
+     */
+    @TableField(value = "max_exp")
+    @ApiModelProperty(value="最大经验值")
+    private Integer maxExp;
+
+    /**
+     * 等级类型(0->用户;1->创作者)
+     */
+    @TableField(value = "type")
+    @ApiModelProperty(value="等级类型(0->用户;1->创作者)")
+    private String type;
+
+    private static final long serialVersionUID = 1L;
+}

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/Notice.java → bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/Notice.java

@@ -1,4 +1,4 @@
-package com.bnyer.img.domain;
+package com.bnyer.common.core.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
-@ApiModel(value="com-bnyer-img-domain-Notice")
+@ApiModel(value="com-bnyer-common-core-domain-Notice")
 @Getter
 @Setter
 @ToString
@@ -16,12 +16,6 @@ import lombok.*;
 @NoArgsConstructor
 @TableName(value = "img_notice")
 public class Notice extends BaseDomain {
-    /**
-     * 主键id
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    @ApiModelProperty(value="主键id")
-    private Long id;
 
     /**
      * 标题

bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/PaintCdk.java

@@ -0,0 +1,91 @@
+package com.bnyer.common.core.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@ApiModel(value="com-bnyer-common-core-domain-PaintCdk")
+@Getter
+@Setter
+@ToString
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "img_paint_cdk")
+public class PaintCdk implements Serializable {
+    /**
+     * 主键Id
+     */
+    @ApiModelProperty(value="主键Id")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 兑换码
+     */
+    @TableField(value = "cdk")
+    @ApiModelProperty(value="兑换码")
+    private String cdk;
+
+    /**
+     * 兑换次数
+     */
+    @TableField(value = "paint_num")
+    @ApiModelProperty(value="兑换次数")
+    private int paintNum;
+
+    /**
+     * 是否显示 (0->隐藏；1->显示)
+     */
+    @TableField(value = "is_show")
+    @ApiModelProperty(value="是否显示 (0->隐藏；1->显示)")
+    private String isShow;
+
+    /**
+     * 是否使用 (0->未使用；1->已使用)
+     */
+    @TableField(value = "is_use")
+    @ApiModelProperty(value="是否使用 (0->未使用；1->已使用)")
+    private String isUse;
+
+    /**
+     * 平台(0->Hub;1->抖音;2->快手;3->微信)
+     */
+    @TableField(value = "`source`")
+    @ApiModelProperty(value="平台(0->Hub;1->抖音;2->快手;3->微信)")
+    private String source;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time")
+    @ApiModelProperty(value="创建时间")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "update_time")
+    @ApiModelProperty(value="更新时间")
+    private Date updateTime;
+
+    /**
+     * 序号
+     */
+    @TableField(value = "sort")
+    @ApiModelProperty(value="序号")
+    private Integer sort;
+
+    private static final long serialVersionUID = 1L;
+}

bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/PaintStyle.java

@@ -0,0 +1,52 @@
+package com.bnyer.common.core.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+/**
+    * 绘画-模型风格表
+    */
+@ApiModel(value="com-bnyer-common-core-domain-PaintStyle")
+@Getter
+@Setter
+@ToString
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "img_paint_style")
+public class PaintStyle extends BaseDomain {
+
+    /**
+     * 模型风格名称
+     */
+    @TableField(value = "`name`")
+    @ApiModelProperty(value="模型风格名称")
+    private String name;
+
+    /**
+     * 模型名称
+     */
+    @TableField(value = "model_name")
+    @ApiModelProperty(value="模型名称")
+    private String modelName;
+
+    /**
+     * 模型风格图片
+     */
+    @TableField(value = "img_url")
+    @ApiModelProperty(value="模型风格图片")
+    private String imgUrl;
+
+    /**
+     * 是否热门(0->正常;1->热门)
+     */
+    @TableField(value = "is_hot")
+    @ApiModelProperty(value="是否热门(0->正常;1->热门)")
+    private String isHot;
+
+    private static final long serialVersionUID = 1L;
+}

bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/Product.java

@@ -0,0 +1,93 @@
+package com.bnyer.common.core.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import java.math.BigDecimal;
+
+@ApiModel(value="com-bnyer-common-core-domain-Product")
+@Getter
+@Setter
+@ToString
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "img_product")
+public class Product extends BaseDomain {
+
+    /**
+     * 商品名称
+     */
+    @TableField(value = "product_name")
+    @ApiModelProperty(value="商品名称")
+    private String productName;
+
+    /**
+     * 商品原价
+     */
+    @TableField(value = "product_origin_price")
+    @ApiModelProperty(value="商品原价")
+    private BigDecimal productOriginPrice;
+
+    /**
+     * 商品售价
+     */
+    @TableField(value = "product_sale_price")
+    @ApiModelProperty(value="商品售价")
+    private BigDecimal productSalePrice;
+
+    /**
+     * 折扣
+     */
+    @TableField(value = "product_discount")
+    @ApiModelProperty(value="折扣")
+    private String productDiscount;
+
+    /**
+     * 节省钱数
+     */
+    @TableField(value = "product_saved_money")
+    @ApiModelProperty(value="节省钱数")
+    private String productSavedMoney;
+
+    /**
+     * 库存量
+     */
+    @TableField(value = "product_num")
+    @ApiModelProperty(value="库存量")
+    private Integer productNum;
+
+    /**
+     * 商品描述
+     */
+    @TableField(value = "product_desc")
+    @ApiModelProperty(value="商品描述")
+    private String productDesc;
+
+    /**
+     * 商品图片
+     */
+    @TableField(value = "product_img")
+    @ApiModelProperty(value="商品图片")
+    private String productImg;
+
+    /**
+     * 商品类型(0->直充;1->卡密)
+     */
+    @TableField(value = "product_type")
+    @ApiModelProperty(value="商品类型(0->直充;1->卡密)")
+    private String productType;
+
+    /**
+     * 商品使用说明
+     */
+    @TableField(value = "product_use_desc")
+    @ApiModelProperty(value="商品使用说明")
+    private String productUseDesc;
+
+    private static final long serialVersionUID = 1L;
+}

bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/ProductOrder.java

@@ -0,0 +1,127 @@
+package com.bnyer.common.core.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@ApiModel(value="com-bnyer-common-core-domain-ProductOrder")
+@Getter
+@Setter
+@ToString
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "img_product_order")
+public class ProductOrder implements Serializable {
+    /**
+     * id
+     */
+    @ApiModelProperty(value="id")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 订单流水号
+     */
+    @TableField(value = "order_id")
+    @ApiModelProperty(value="订单流水号")
+    private String orderId;
+
+    /**
+     * 平台用户唯一id
+     */
+    @TableField(value = "user_code")
+    @ApiModelProperty(value="平台用户唯一id")
+    private String userCode;
+
+    /**
+     * 商品价格
+     */
+    @TableField(value = "product_price")
+    @ApiModelProperty(value="商品价格")
+    private BigDecimal productPrice;
+
+    /**
+     * 支付价格
+     */
+    @TableField(value = "pay_price")
+    @ApiModelProperty(value="支付价格")
+    private BigDecimal payPrice;
+
+    /**
+     * 充值账号
+     */
+    @TableField(value = "account_num")
+    @ApiModelProperty(value="充值账号")
+    private String accountNum;
+
+    /**
+     * 订单类型(0->直充;1->卡密)
+     */
+    @TableField(value = "order_type")
+    @ApiModelProperty(value="订单类型(0->直充;1->卡密)")
+    private String orderType;
+
+    /**
+     * 订单状态(0->待支付;1->支付中;2->已完成;3->已失效;4->支付失败)
+     */
+    @TableField(value = "order_status")
+    @ApiModelProperty(value="订单状态(0->待支付;1->支付中;2->已完成;3->已失效;4->支付失败)")
+    private String orderStatus;
+
+    /**
+     * 账号类型(0->手机号;1->QQ号)
+     */
+    @TableField(value = "account_type")
+    @ApiModelProperty(value="账号类型(0->手机号;1->QQ号)")
+    private String accountType;
+
+    /**
+     * 来源平台(0->抖音;1->快手;2->微信)
+     */
+    @TableField(value = "platform")
+    @ApiModelProperty(value="来源平台(0->抖音;1->快手;2->微信)")
+    private String platform;
+
+    /**
+     * 支付方式(0->支付宝;1->微信支付)
+     */
+    @TableField(value = "pay_type")
+    @ApiModelProperty(value="支付方式(0->支付宝;1->微信支付)")
+    private String payType;
+
+    /**
+     * 是否展示(0->否;1->是)
+     */
+    @TableField(value = "is_show")
+    @ApiModelProperty(value="是否展示(0->否;1->是)")
+    private String isShow;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty(value="创建时间")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "update_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty(value="更新时间")
+    private Date updateTime;
+
+    private static final long serialVersionUID = 1L;
+}

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/ProfitVerifyOrder.java → bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/ProfitVerifyOrder.java

@@ -1,29 +1,29 @@
-package com.bnyer.img.domain;
+package com.bnyer.common.core.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
 
 /**
  * @author  chengkun
  * @date  2022/6/10 14:42
  */
+
 /**
     * 图文平台-收益结算审核单表
     */
-@ApiModel(value="com-bnyer-img-domain-ProfitVerifyOrder")
+@ApiModel(value="com-bnyer-common-core-domain-ProfitVerifyOrder")
 @Getter
 @Setter
 @ToString
@@ -32,10 +32,10 @@ import lombok.ToString;
 @TableName(value = "img_profit_verify_order")
 public class ProfitVerifyOrder implements Serializable {
     /**
-     * 主键id
+     * id
      */
-    @TableId(value = "id", type = IdType.INPUT)
-    @ApiModelProperty(value="主键id")
+    @ApiModelProperty(value="id")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
@@ -69,8 +69,8 @@ public class ProfitVerifyOrder implements Serializable {
     /**
      * 修改管理员id
      */
-    @TableField(value = "update_admin_id")
     @ApiModelProperty(value="修改管理员id")
+    @TableField(value = "update_admin_id")
     private Long updateAdminId;
 
     /**
@@ -90,8 +90,8 @@ public class ProfitVerifyOrder implements Serializable {
     /**
      * 审核管理员id
      */
-    @TableField(value = "verify_admin_id")
     @ApiModelProperty(value="审核管理员id")
+    @TableField(value = "verify_admin_id")
     private Long verifyAdminId;
 
     /**

bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/Prompt.java

@@ -0,0 +1,38 @@
+package com.bnyer.common.core.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+/**
+    * 绘画-提示词表
+    */
+@ApiModel(value="com-bnyer-common-core-domain-Prompt")
+@Getter
+@Setter
+@ToString
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "img_prompt")
+public class Prompt extends BaseDomain {
+
+    /**
+     * 提示词
+     */
+    @TableField(value = "`text`")
+    @ApiModelProperty(value="提示词")
+    private String text;
+
+    /**
+     * 类型(0->绘画;1->gpt)
+     */
+    @TableField(value = "`type`")
+    @ApiModelProperty(value="类型(0->绘画;1->gpt)")
+    private String type;
+
+    private static final long serialVersionUID = 1L;
+}

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/Sign.java → bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/Sign.java

@@ -1,4 +1,4 @@
-package com.bnyer.img.domain;
+package com.bnyer.common.core.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -8,20 +8,14 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
-@ApiModel(value="com-bnyer-img-domain-Sign")
+@ApiModel(value="com-bnyer-common-core-domain-Sign")
 @Getter
 @Setter
 @ToString
 @AllArgsConstructor
 @NoArgsConstructor
 @TableName(value = "img_sign")
-public class Sign extends BaseDomain{
-    /**
-     * 主键id
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    @ApiModelProperty(value="主键id")
-    private Long id;
+public class Sign extends BaseDomain {
 
     /**
      * 标签名称
@@ -37,5 +31,26 @@ public class Sign extends BaseDomain{
     @ApiModelProperty(value="背景图")
     private String img;
 
+    /**
+     * 标签类型(0->系统标签;1->自定义标签)
+     */
+    @TableField(value = "type")
+    @ApiModelProperty(value="标签类型(0->系统标签;1->自定义标签)")
+    private String type;
+
+    /**
+     * 状态(0->待审核;1->审核通过;2->审核拒绝)
+     */
+    @TableField(value = "status")
+    @ApiModelProperty(value="状态(0->待审核;1->审核通过;2->审核拒绝)")
+    private String status;
+
+    /**
+     * 父id
+     */
+    @TableField(value = "parent_id")
+    @ApiModelProperty(value="父id")
+    private Long parentId;
+
     private static final long serialVersionUID = 1L;
 }

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/TiktokCollection.java → bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/TiktokCollection.java

@@ -1,14 +1,16 @@
-package com.bnyer.img.domain;
+package com.bnyer.common.core.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
-@ApiModel(value="com-bnyer-img-domain-TiktokCollection")
+@ApiModel(value="com-bnyer-common-core-domain-TiktokCollection")
 @Getter
 @Setter
 @ToString
@@ -16,25 +18,19 @@ import lombok.*;
 @NoArgsConstructor
 @TableName(value = "img_collection")
 public class TiktokCollection extends BaseDomain {
-    /**
-     * id
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    @ApiModelProperty(value="id")
-    private Long id;
 
     /**
      * 用户id
      */
-    @TableField(value = "user_id")
     @ApiModelProperty(value="用户id")
+    @TableField(value = "user_id")
     private Long userId;
 
     /**
      * 图片id
      */
-    @TableField(value = "img_id")
     @ApiModelProperty(value="图片id")
+    @TableField(value = "img_id")
     private Long imgId;
 
     /**

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/TiktokImg.java → bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/TiktokImg.java

@@ -1,14 +1,16 @@
-package com.bnyer.img.domain;
+package com.bnyer.common.core.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
-@ApiModel(value="com-bnyer-img-domain-TiktokImg")
+@ApiModel(value="com-bnyer-common-core-domain-TiktokImg")
 @Getter
 @Setter
 @ToString
@@ -16,12 +18,6 @@ import lombok.*;
 @NoArgsConstructor
 @TableName(value = "img_tiktok_img")
 public class TiktokImg extends BaseDomain {
-    /**
-     * id
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    @ApiModelProperty(value="id")
-    private Long id;
 
     /**
      * 图片地址
@@ -33,15 +29,15 @@ public class TiktokImg extends BaseDomain {
     /**
      * 艺术家id
      */
-    @TableField(value = "creator_id")
     @ApiModelProperty(value="艺术家id")
+    @TableField(value = "creator_id")
     private Long creatorId;
 
     /**
      * 分类id
      */
-    @TableField(value = "type_id")
     @ApiModelProperty(value="分类id")
+    @TableField(value = "type_id")
     private Long typeId;
 
     /**
@@ -66,10 +62,10 @@ public class TiktokImg extends BaseDomain {
     private Integer collectionNum;
 
     /**
-     * 状态(0->待审核;1->审核通过)
+     * 状态(0->待审核;1->审核拒绝;2->已上架;3->已下架)
      */
     @TableField(value = "status")
-    @ApiModelProperty(value="状态(0->待审核;1->审核通过;2->审核拒绝)")
+    @ApiModelProperty(value="状态(0->待审核;1->审核拒绝;2->已上架;3->已下架)")
     private String status;
 
     /**
@@ -79,5 +75,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-services/bnyer-img/src/main/java/com/bnyer/img/domain/TiktokLike.java → bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/TiktokLike.java

@@ -1,23 +1,24 @@
-package com.bnyer.img.domain;
+package com.bnyer.common.core.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
-import java.io.Serializable;
-
 /**
  * @author  chengkun
  * @date  2022/4/21 9:50
  */
+
 /**
     * img平台点赞表
     */
-@ApiModel(value="com-bnyer-img-domain-TiktokLike")
+@ApiModel(value="com-bnyer-common-core-domain-TiktokLike")
 @Getter
 @Setter
 @ToString
@@ -25,25 +26,19 @@ import java.io.Serializable;
 @NoArgsConstructor
 @TableName(value = "img_like")
 public class TiktokLike extends BaseDomain {
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    @ApiModelProperty(value="主键")
-    private Long id;
 
     /**
      * 用户id
      */
-    @TableField(value = "user_id")
     @ApiModelProperty(value="用户id")
+    @TableField(value = "user_id")
     private Long userId;
 
     /**
      * 图片id
      */
-    @TableField(value = "img_id")
     @ApiModelProperty(value="图片id")
+    @TableField(value = "img_id")
     private Long imgId;
 
     /**

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/TiktokUser.java → bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/TiktokUser.java

@@ -1,4 +1,4 @@
-package com.bnyer.img.domain;
+package com.bnyer.common.core.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
-@ApiModel(value="com-bnyer-img-domain-TiktokUser")
+@ApiModel(value="com-bnyer-common-core-domain-TiktokUser")
 @Getter
 @Setter
 @ToString
@@ -16,12 +16,6 @@ import lombok.*;
 @NoArgsConstructor
 @TableName(value = "img_tiktok_user")
 public class TiktokUser extends BaseDomain {
-    /**
-     * id
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    @ApiModelProperty(value="id")
-    private Long id;
 
     /**
      * 用户昵称
@@ -37,6 +31,20 @@ public class TiktokUser extends BaseDomain {
     @ApiModelProperty(value="抖音id")
     private String tiktokCode;
 
+    /**
+     * 手机号
+     */
+    @TableField(value = "phone")
+    @ApiModelProperty(value="手机号")
+    private String phone;
+
+    /**
+     * 是否为vip(0->否;1->是)
+     */
+    @TableField(value = "is_vip")
+    @ApiModelProperty(value="是否为vip(0->否;1->是)")
+    private String isVip;
+
     /**
      * 头像img地址
      */

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/Type.java → bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/Type.java

@@ -1,4 +1,4 @@
-package com.bnyer.img.domain;
+package com.bnyer.common.core.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
-@ApiModel(value="com-bnyer-img-domain-Type")
+@ApiModel(value="com-bnyer-common-core-domain-Type")
 @Getter
 @Setter
 @ToString
@@ -16,12 +16,6 @@ import lombok.*;
 @NoArgsConstructor
 @TableName(value = "img_type")
 public class Type extends BaseDomain {
-    /**
-     * id
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    @ApiModelProperty(value="id")
-    private Long id;
 
     /**
      * 分类类型

bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/UserVip.java

@@ -0,0 +1,79 @@
+package com.bnyer.common.core.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import java.math.BigDecimal;
+
+@ApiModel(value="com-bnyer-common-core-domain-UserVip")
+@Getter
+@Setter
+@ToString
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "img_user_vip")
+public class UserVip extends BaseDomain {
+
+    /**
+     * vip名称
+     */
+    @TableField(value = "vip_name")
+    @ApiModelProperty(value="vip名称")
+    private String vipName;
+
+    /**
+     * vip编码
+     */
+    @TableField(value = "vip_code")
+    @ApiModelProperty(value="vip编码")
+    private String vipCode;
+
+    /**
+     * 原价
+     */
+    @TableField(value = "origin_price")
+    @ApiModelProperty(value="原价")
+    private BigDecimal originPrice;
+
+    /**
+     * 售价
+     */
+    @TableField(value = "price")
+    @ApiModelProperty(value="售价")
+    private BigDecimal price;
+
+    /**
+     * 描述
+     */
+    @TableField(value = "description")
+    @ApiModelProperty(value="描述")
+    private String description;
+
+    /**
+     * 热门描述
+     */
+    @TableField(value = "hot_sign_desc")
+    @ApiModelProperty(value="热门描述")
+    private String hotSignDesc;
+
+    /**
+     * 时长天数
+     */
+    @TableField(value = "days")
+    @ApiModelProperty(value="时长天数")
+    private Integer days;
+
+    /**
+     * 是否到期自动续费(0>否;1->是)
+     */
+    @TableField(value = "is_delay")
+    @ApiModelProperty(value="是否到期自动续费(0>否;1->是)")
+    private String isDelay;
+
+    private static final long serialVersionUID = 1L;
+}

bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/UserVipRecord.java

@@ -0,0 +1,83 @@
+package com.bnyer.common.core.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@ApiModel(value="com-bnyer-common-core-domain-UserVipRecord")
+@Getter
+@Setter
+@ToString
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "img_user_vip_record")
+public class UserVipRecord extends BaseDomain {
+
+    /**
+     * 订单id
+     */
+    @TableField(value = "order_id")
+    @ApiModelProperty(value="订单id")
+    private String orderId;
+
+    /**
+     * 用户手机号
+     */
+    @TableField(value = "phone")
+    @ApiModelProperty(value="用户手机号")
+    private String phone;
+
+    /**
+     * 用户vip表id
+     */
+    @TableField(value = "user_vip_id")
+    @ApiModelProperty(value="用户vip表id")
+    private Long userVipId;
+
+    /**
+     * 开始时间
+     */
+    @TableField(value = "start_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value="开始时间")
+    private Date startTime;
+
+    /**
+     * 到期时间
+     */
+    @TableField(value = "end_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value="到期时间")
+    private Date endTime;
+
+    /**
+     * 支付金额
+     */
+    @TableField(value = "price")
+    @ApiModelProperty(value="支付金额")
+    private BigDecimal price;
+
+    /**
+     * vip类型状态(0->月卡;1->季卡;2->年卡)
+     */
+    @TableField(value = "type")
+    @ApiModelProperty(value="vip类型状态(0->月卡;1->季卡;2->年卡)")
+    private String type;
+
+    /**
+     * 支付状态(0->待支付;1->已支付;2->支付失败;3->支付异常)
+     */
+    @TableField(value = "status")
+    @ApiModelProperty(value="支付状态(0->待支付;1->已支付;2->支付失败;3->支付异常)")
+    private String status;
+
+    private static final long serialVersionUID = 1L;
+}

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/VerifyLog.java → bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/VerifyLog.java

@@ -1,10 +1,12 @@
-package com.bnyer.img.domain;
+package com.bnyer.common.core.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
@@ -16,10 +18,11 @@ import java.util.Date;
  * @author  chengkun
  * @date  2022/5/31 9:38
  */
+
 /**
     * 图文平台审核记录表
     */
-@ApiModel(value="com-bnyer-img-domain-VerifyLog")
+@ApiModel(value="com-bnyer-common-core-domain-VerifyLog")
 @Getter
 @Setter
 @ToString
@@ -28,24 +31,24 @@ import java.util.Date;
 @TableName(value = "img_verify_log")
 public class VerifyLog implements Serializable {
     /**
-     * 主键id
+     * id
      */
-    @TableId(value = "id", type = IdType.INPUT)
-    @ApiModelProperty(value="主键id")
+    @ApiModelProperty(value="id")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
      * 艺术家id
      */
-    @TableField(value = "creator_id")
     @ApiModelProperty(value="艺术家id")
+    @TableField(value = "creator_id")
     private Long creatorId;
 
     /**
      * 管理员id
      */
-    @TableField(value = "admin_id")
     @ApiModelProperty(value="管理员id")
+    @TableField(value = "admin_id")
     private Long adminId;
 
     /**

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/WithdrawLog.java → bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/WithdrawLog.java

@@ -1,4 +1,4 @@
-package com.bnyer.img.domain;
+package com.bnyer.common.core.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -6,13 +6,15 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.bnyer.common.core.annotation.Desensitized;
 import com.bnyer.common.core.enums.SensitiveTypeEnum;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
 import java.math.BigDecimal;
 
-@ApiModel(value="com-bnyer-img-domain-WithdrawLog")
+@ApiModel(value="com-bnyer-common-core-domain-WithdrawLog")
 @Getter
 @Setter
 @ToString
@@ -20,12 +22,6 @@ import java.math.BigDecimal;
 @NoArgsConstructor
 @TableName(value = "img_withdraw_log")
 public class WithdrawLog extends BaseDomain {
-    /**
-     * 主键id
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    @ApiModelProperty(value="主键id")
-    private Integer id;
 
     /**
      * 流水号
@@ -37,8 +33,8 @@ public class WithdrawLog extends BaseDomain {
     /**
      * 艺术家id
      */
-    @TableField(value = "creator_id")
     @ApiModelProperty(value="艺术家id")
+    @TableField(value = "creator_id")
     private Long creatorId;
 
     /**
@@ -48,21 +44,13 @@ public class WithdrawLog extends BaseDomain {
     @ApiModelProperty(value="提现金额")
     private BigDecimal amt;
 
-    /**
-     * 银行卡(加密)
-     */
-    @TableField(value = "bank_no")
-    @ApiModelProperty(value="银行卡(加密)")
-    @Desensitized(type = SensitiveTypeEnum.BANK_CARD)
-    private String bankNo;
-
     /**
      * 支付宝手机号(加密)
      */
-    @TableField(value = "phone")
-    @ApiModelProperty(value="支付宝手机号(加密)")
+    @TableField(value = "account_no")
+    @ApiModelProperty(value="收款账号(加密)")
     @Desensitized(type = SensitiveTypeEnum.MOBILE_PHONE)
-    private String phone;
+    private String accountNo;
 
     /**
      * 渠道(0->微信;1->银行卡)

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/WxUser.java → bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/WxUser.java

@@ -1,4 +1,4 @@
-package com.bnyer.img.domain;
+package com.bnyer.common.core.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -6,22 +6,17 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.io.Serializable;
-import java.util.Date;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
+import lombok.*;
 
 /**
  * @author  chengkun
  * @date  2022/7/4 13:58
  */
+
 /**
     * img微信平台用户表
     */
-@ApiModel(value="com-bnyer-img-domain-WxUser")
+@ApiModel(value="com-bnyer-common-core-domain-WxUser")
 @Getter
 @Setter
 @ToString
@@ -29,12 +24,6 @@ import lombok.ToString;
 @NoArgsConstructor
 @TableName(value = "img_wx_user")
 public class WxUser extends BaseDomain {
-    /**
-     * id
-     */
-    @TableId(value = "id", type = IdType.INPUT)
-    @ApiModelProperty(value="id")
-    private Long id;
 
     /**
      * 用户昵称
@@ -50,6 +39,20 @@ public class WxUser extends BaseDomain {
     @ApiModelProperty(value="微信id")
     private String wxCode;
 
+    /**
+     * 手机号
+     */
+    @TableField(value = "phone")
+    @ApiModelProperty(value="手机号")
+    private String phone;
+
+    /**
+     * 是否为vip(0->否;1->是)
+     */
+    @TableField(value = "is_vip")
+    @ApiModelProperty(value="是否为vip(0->否;1->是)")
+    private String isVip;
+
     /**
      * 头像img地址
      */

bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/AiPaintPageDto.java

@@ -0,0 +1,23 @@
+package com.bnyer.common.core.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+@ApiModel("ai绘画前端分页接收类")
+public class AiPaintPageDto extends BasePageDto {
+
+    @NotEmpty(message = "平台渠道不能为空!")
+    @ApiModelProperty(value="平台渠道")
+    private String source;
+
+    @NotNull(message = "绘图者id不能为空！")
+    @ApiModelProperty(value="绘图者id")
+    private Long painterId;
+}

bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/AlipayParamDto.java

@@ -0,0 +1,31 @@
+package com.bnyer.common.core.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel("支付宝支付参数接收类")
+public class AlipayParamDto implements Serializable {
+
+    @ApiModelProperty(value="商户订单号")
+    private String outTradeNo;
+
+    @ApiModelProperty(value="订单名称")
+    private String subject;
+
+    @ApiModelProperty(value="付款金额")
+    private String totalAmount;
+
+    @ApiModelProperty(value="备注")
+    private String body;
+}

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/BannerDto.java → bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/BannerDto.java

@@ -1,7 +1,9 @@
-package com.bnyer.img.dto;
+package com.bnyer.common.core.dto;
 
+import com.bnyer.common.core.domain.Banner;
 import com.bnyer.common.core.utils.bean.BeanUtils;
-import com.bnyer.img.domain.Banner;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/BannerPageDto.java → bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/BannerPageDto.java

@@ -1,4 +1,4 @@
-package com.bnyer.img.dto;
+package com.bnyer.common.core.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/BasePageDto.java → bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/BasePageDto.java

@@ -1,4 +1,4 @@
-package com.bnyer.img.dto;
+package com.bnyer.common.core.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/BatchStatusDto.java

@@ -0,0 +1,26 @@
+package com.bnyer.common.core.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+
+@Getter
+@Setter
+@ApiModel("批量状态接收类")
+public class BatchStatusDto implements Serializable {
+
+    @ApiModelProperty(value="主键Ids")
+    private List<Long> ids;
+
+    @NotNull(message = "状态不能为空！")
+    @ApiModelProperty(value="状态")
+    private String status;
+
+
+}

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/BzDto.java → bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/BzDto.java

@@ -1,4 +1,4 @@
-package com.bnyer.img.dto;
+package com.bnyer.common.core.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CardBuyOrderDto.java

@@ -0,0 +1,26 @@
+package com.bnyer.common.core.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+
+@Getter
+@Setter
+@ApiModel("卡密下单接收类")
+public class CardBuyOrderDto implements Serializable {
+
+    @NotNull(message = "商品id不能为空！")
+    @ApiModelProperty(value="商品id")
+    private Integer skuId;
+
+    @NotNull(message = "购买数量不能为空！")
+    @ApiModelProperty(value="购买数量")
+    private Integer buyQuantity;
+
+
+}

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CheckInviteCodeDto.java → bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CheckInviteCodeDto.java

@@ -1,4 +1,4 @@
-package com.bnyer.img.dto;
+package com.bnyer.common.core.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CheckPhoneDto.java → bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CheckPhoneDto.java

@@ -1,4 +1,4 @@
-package com.bnyer.img.dto;
+package com.bnyer.common.core.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CheckScanCodeDto.java → bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CheckScanCodeDto.java

@@ -1,4 +1,4 @@
-package com.bnyer.img.dto;
+package com.bnyer.common.core.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -6,7 +6,6 @@ import lombok.Getter;
 import lombok.Setter;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CollectionDto.java → bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CollectionDto.java

@@ -1,5 +1,7 @@
-package com.bnyer.img.dto;
+package com.bnyer.common.core.dto;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CollectionUserDto.java → bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CollectionUserDto.java

@@ -1,5 +1,7 @@
-package com.bnyer.img.dto;
+package com.bnyer.common.core.dto;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -8,7 +10,6 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 import javax.validation.constraints.NotNull;
-import java.io.Serializable;
 
 
 @Getter

bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CommonImgsDto.java

@@ -0,0 +1,25 @@
+package com.bnyer.common.core.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+import java.util.List;
+
+
+@Getter
+@Setter
+@ApiModel("公共素材库接收类")
+public class CommonImgsDto implements Serializable {
+
+    @NotEmpty(message = "类型不能为空!")
+    @ApiModelProperty(value="类型")
+    private String type;
+
+    @NotEmpty(message = "图片地址不能为空!")
+    @ApiModelProperty(value="图片地址")
+    private List<String> imgUrls;
+}

bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CommonImgsPageDto.java

@@ -0,0 +1,19 @@
+package com.bnyer.common.core.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+
+@Getter
+@Setter
+@ApiModel("公共素材库图片分页接收类")
+public class CommonImgsPageDto extends BasePageDto {
+
+    @ApiModelProperty(value="图片类型(0->头像;1->壁纸;2->插画)")
+    private String type;
+
+    @ApiModelProperty(value="是否显示 (0->隐藏；1->显示)")
+    private String isShow;
+}

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorAccountDto.java → bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorAccountDto.java

@@ -1,10 +1,12 @@
-package com.bnyer.img.dto;
+package com.bnyer.common.core.dto;
 
 import com.bnyer.common.core.annotation.Desensitized;
+import com.bnyer.common.core.domain.CreatorAccount;
 import com.bnyer.common.core.enums.SensitiveTypeEnum;
 import com.bnyer.common.core.utils.Sm4Util;
 import com.bnyer.common.core.utils.StringUtils;
-import com.bnyer.img.domain.CreatorAccount;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -35,22 +37,21 @@ public class CreatorAccountDto implements Serializable {
     @ApiModelProperty(value="身份证(加密)")
     private String idNo;
 
-    @Desensitized(type = SensitiveTypeEnum.BANK_CARD)
-    @ApiModelProperty(value="银行卡(加密)")
-    private String bankNo;
-
     @NotBlank(message = "联系电话不能为空!")
     @Desensitized(type = SensitiveTypeEnum.MOBILE_PHONE)
     @ApiModelProperty(value="联系电话")
     private String phone;
 
     @Desensitized(type = SensitiveTypeEnum.MOBILE_PHONE)
-    @ApiModelProperty(value="支付宝账号(加密)")
-    private String aliPayNo;
+    @ApiModelProperty(value="账户账号(加密)")
+    private String accountNo;
 
     @ApiModelProperty(value="类型")
     private String type;
 
+    @ApiModelProperty(value="艺术家微信收款码截图")
+    private String imgUrl;
+
     public CreatorAccount extractParam(){
         CreatorAccount creatorAccount = new CreatorAccount();
         creatorAccount.setId(this.getId());
@@ -59,11 +60,11 @@ public class CreatorAccountDto implements Serializable {
         creatorAccount.setPhone(Sm4Util.sm4Encryption(this.getPhone()));
         creatorAccount.setIdNo(Sm4Util.sm4Encryption(this.getIdNo()));
         creatorAccount.setType(this.getType());
-        if(StringUtils.isNotBlank(this.getBankNo())){
-            creatorAccount.setBankNo(Sm4Util.sm4Encryption(this.getBankNo()));
+        if(StringUtils.isNotBlank(this.getAccountNo())){
+            creatorAccount.setAccountNo(Sm4Util.sm4Encryption(this.getAccountNo()));
         }
-        if(StringUtils.isNotBlank(this.getAliPayNo())){
-            creatorAccount.setAliPayNo(Sm4Util.sm4Encryption(this.getAliPayNo()));
+        if(StringUtils.isNotBlank(this.getImgUrl())){
+            creatorAccount.setImgUrl(this.getImgUrl());
         }
         return creatorAccount;
     }

bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorAccountExistDto.java

@@ -0,0 +1,26 @@
+package com.bnyer.common.core.dto;
+
+import com.bnyer.common.core.annotation.Desensitized;
+import com.bnyer.common.core.enums.SensitiveTypeEnum;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+
+@Getter
+@Setter
+@ApiModel("艺术家账户存在接收类")
+public class CreatorAccountExistDto implements Serializable {
+
+    @ApiModelProperty(value="艺术家id")
+    private Long creatorId;
+
+    @Desensitized(type = SensitiveTypeEnum.MOBILE_PHONE)
+    @ApiModelProperty(value="账户账号(加密)")
+    private String accountNo;
+}

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorAccountPageDto.java → bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorAccountPageDto.java

@@ -1,4 +1,4 @@
-package com.bnyer.img.dto;
+package com.bnyer.common.core.dto;
 
 import com.bnyer.common.core.annotation.Desensitized;
 import com.bnyer.common.core.enums.SensitiveTypeEnum;
@@ -16,18 +16,14 @@ public class CreatorAccountPageDto extends BasePageDto {
     @ApiModelProperty(value="身份证(加密)")
     private String idNo;
 
-    @Desensitized(type = SensitiveTypeEnum.BANK_CARD)
-    @ApiModelProperty(value="银行卡(加密)")
-    private String bankNo;
+    @Desensitized(type = SensitiveTypeEnum.MOBILE_PHONE)
+    @ApiModelProperty(value="账号号码(加密)")
+    private String accountNo;
 
     @Desensitized(type = SensitiveTypeEnum.MOBILE_PHONE)
     @ApiModelProperty(value="联系电话")
     private String phone;
 
-    @Desensitized(type = SensitiveTypeEnum.MOBILE_PHONE)
-    @ApiModelProperty(value="支付宝账号(加密)")
-    private String aliPayNo;
-
     @Desensitized(type = SensitiveTypeEnum.CHINESE_NAME)
     @ApiModelProperty(value="姓名(加密)")
     private String name;

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorDetailsDto.java → bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorDetailsDto.java

@@ -1,4 +1,4 @@
-package com.bnyer.img.dto;
+package com.bnyer.common.core.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorDto.java → bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorDto.java

@@ -1,4 +1,4 @@
-package com.bnyer.img.dto;
+package com.bnyer.common.core.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -26,6 +26,10 @@ public class CreatorDto implements Serializable {
     @ApiModelProperty(value="手机号")
     private String phone;
 
+    @NotBlank(message = "邮箱不能为空!")
+    @ApiModelProperty(value="邮箱")
+    private String email;
+
     @NotBlank(message = "密码不能为空!")
     @ApiModelProperty(value="密码")
     private String password;

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorHandleConfirmProfitDto.java → bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorHandleConfirmProfitDto.java

@@ -1,5 +1,7 @@
-package com.bnyer.img.dto;
+package com.bnyer.common.core.dto;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorImgsDetailsDto.java → bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorImgsDetailsDto.java

@@ -1,5 +1,7 @@
-package com.bnyer.img.dto;
+package com.bnyer.common.core.dto;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorInviteLogPageDto.java → bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorInviteLogPageDto.java

@@ -1,5 +1,7 @@
-package com.bnyer.img.dto;
+package com.bnyer.common.core.dto;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorLoginDto.java → bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorLoginDto.java

@@ -1,4 +1,4 @@
-package com.bnyer.img.dto;
+package com.bnyer.common.core.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorLogoutDto.java

@@ -0,0 +1,19 @@
+package com.bnyer.common.core.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+@Getter
+@Setter
+@ApiModel("艺术家登出入参")
+public class CreatorLogoutDto implements Serializable {
+
+    @NotBlank(message = "手机号不能为空！")
+    @ApiModelProperty(value = "手机号")
+    private String phone;
+}

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorPageDto.java → bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorPageDto.java

@@ -1,12 +1,10 @@
-package com.bnyer.img.dto;
+package com.bnyer.common.core.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.io.Serializable;
-
 
 @Getter
 @Setter
@@ -33,4 +31,7 @@ public class CreatorPageDto extends BasePageDto {
 
     @ApiModelProperty(value="是否展示")
     private String isShow;
+
+    @ApiModelProperty(value="是否为机器人")
+    private String isRobot;
 }

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorProfitAdInsertDto.java → bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorProfitAdInsertDto.java

@@ -1,5 +1,7 @@
-package com.bnyer.img.dto;
+package com.bnyer.common.core.dto;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -32,7 +34,7 @@ public class CreatorProfitAdInsertDto implements Serializable {
     private String platform;
 
     @NotBlank(message = "应用类型不能为空!")
-    @ApiModelProperty(value="应用类型(0->节点壁纸)")
+    @ApiModelProperty(value="应用类型(0->次元意境)")
     private String appType;
 
     @NotNull(message = "用户id不能为空!")

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorProfitInviteInsertDto.java → bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorProfitInviteInsertDto.java

@@ -1,7 +1,9 @@
-package com.bnyer.img.dto;
+package com.bnyer.common.core.dto;
 
+import com.bnyer.common.core.domain.CreatorProfit;
 import com.bnyer.common.core.utils.bean.BeanUtils;
-import com.bnyer.img.domain.CreatorProfit;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -34,7 +36,7 @@ public class CreatorProfitInviteInsertDto implements Serializable {
     private String platform;
 
     @NotBlank(message = "应用类型不能为空!")
-    @ApiModelProperty(value="应用类型(0->节点壁纸)")
+    @ApiModelProperty(value="应用类型(0->次元意境)")
     private String appType;
 
     public CreatorProfit extractParam(){

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorProfitPageDto.java → bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorProfitPageDto.java

@@ -1,4 +1,4 @@
-package com.bnyer.img.dto;
+package com.bnyer.common.core.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -19,7 +19,7 @@ public class CreatorProfitPageDto extends BasePageDto {
     @ApiModelProperty(value="结算平台(0->抖音;1->快手;2->微信;3->uniapp)")
     private String platform;
 
-    @ApiModelProperty(value="应用类型(0->节点壁纸)")
+    @ApiModelProperty(value="应用类型(0->次元意境)")
     private String appType;
 
     @ApiModelProperty(value="收益类型(0->广告浏览;1->邀请;2->会员)")

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorProfitUpdateDto.java → bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorProfitUpdateDto.java

@@ -1,7 +1,9 @@
-package com.bnyer.img.dto;
+package com.bnyer.common.core.dto;
 
+import com.bnyer.common.core.domain.CreatorProfit;
 import com.bnyer.common.core.utils.bean.BeanUtils;
-import com.bnyer.img.domain.CreatorProfit;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -45,7 +47,7 @@ public class CreatorProfitUpdateDto implements Serializable {
     private String platform;
 
     @NotBlank(message = "应用类型不能为空!")
-    @ApiModelProperty(value="应用类型(0->节点壁纸)")
+    @ApiModelProperty(value="应用类型(0->次元意境)")
     private String appType;
 
     @NotBlank(message = "收益类型不能为空!")

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorUpdateDto.java → bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorUpdateDto.java

@@ -1,7 +1,9 @@
-package com.bnyer.img.dto;
+package com.bnyer.common.core.dto;
 
+import com.bnyer.common.core.domain.Creator;
 import com.bnyer.common.core.utils.bean.BeanUtils;
-import com.bnyer.img.domain.Creator;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;