hotfix：处理PC端登录不了的BUG

# Conflicts:
#	bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/UserVipVo.java

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,48 @@
+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(value = "/uploadBatch",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    R<List<String>> uploadBatch(@RequestPart(name = "files") MultipartFile[] files,@RequestPart(name = "fileType") Integer fileType);
+
+    /**
+     * 上传文件到七牛云
+     * @param file 文件
+     * @return -
+     */
+    @PostMapping(value = "/uploadQiNiu",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    R<String> uploadQiNiu(@RequestPart(name = "file") MultipartFile file, @RequestPart(name = "fileType") Integer fileType);
+
+}

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

@@ -0,0 +1,45 @@
+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,Integer fileType) {
+                return R.fail("远程调用七牛云批量文件上传失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<String> uploadQiNiu(MultipartFile file, Integer fileType) {
+                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

@@ -1,29 +0,0 @@
-package com.bnyer.img.api;
-
-import com.bnyer.common.core.constant.ServiceNameConstants;
-import com.bnyer.common.core.domain.R;
-import com.bnyer.img.api.dto.TiktokImgMiniDto;
-import com.bnyer.img.api.factory.RemoteImgFallbackFactory;
-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;
-
-/**
- * 图文服务
- *
- * @author chengkun
- * @date 2022/7/8 11:03
- */
-@FeignClient(contextId = "remoteImgService", value = ServiceNameConstants.IMG_SERVICE, fallbackFactory = RemoteImgFallbackFactory.class)
-public interface RemoteImgService {
-
-    /**
-     * 保存图片
-     * @param dto 图片接收类
-     * @return -
-     */
-    @PostMapping(value = "/img/mini/creator/insertTiktokImg")
-    public R<Integer> insertTiktokImg(@Validated @RequestBody @ApiParam("TiktokImg对象") TiktokImgMiniDto 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.img.api.RemoteImgService;
+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.remote.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/factory/RemoteWxMiniFallbackFactory.java

@@ -0,0 +1,33 @@
+package com.bnyer.img.api.factory;
+
+import com.bnyer.common.core.domain.R;
+import com.bnyer.img.api.remote.RemoteUserVipService;
+import com.bnyer.img.api.vo.UserVipVo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * 图文服务降级处理
+ *
+ * @author penny
+ */
+@Component
+public class RemoteWxMiniFallbackFactory implements FallbackFactory<RemoteUserVipService>
+{
+    private static final Logger log = LoggerFactory.getLogger(RemoteWxMiniFallbackFactory.class);
+
+
+    @Override
+    public RemoteUserVipService create(Throwable throwable) {
+        log.error("api图文服务调用失败:{}", throwable.getMessage());
+        return new RemoteUserVipService() {
+            @Override
+            public R<UserVipVo> queryUserVip(Long id) {
+                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-img/src/main/java/com/bnyer/img/api/remote/RemoteImgService.java

@@ -0,0 +1,76 @@
+package com.bnyer.img.api.remote;
+
+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.*;
+
+/**
+ * 图文服务
+ *
+ * @author chengkun
+ * @date 2022/7/8 11:03
+ */
+@FeignClient(contextId = "remoteImgService", value = ServiceNameConstants.IMG_SERVICE, fallbackFactory = RemoteImgFallbackFactory.class)
+public interface RemoteImgService {
+
+    /**
+     * 保存图片
+     * @param dto 图片接收类
+     * @return -
+     */
+    @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/remote/RemoteUserVipService.java

@@ -0,0 +1,24 @@
+package com.bnyer.img.api.remote;
+
+import com.bnyer.common.core.constant.ServiceNameConstants;
+import com.bnyer.common.core.domain.R;
+import com.bnyer.img.api.factory.RemoteWxMiniFallbackFactory;
+import com.bnyer.img.api.vo.UserVipVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+
+/**
+ * @author :WXC
+ * @description :
+ */
+@FeignClient(path = "/img/mini/vip",contextId = "remoteWxMiniService", value = ServiceNameConstants.IMG_SERVICE, fallbackFactory = RemoteWxMiniFallbackFactory.class)
+public interface RemoteUserVipService {
+
+    /**
+     * 获取会员信息
+     * @return
+     */
+    @GetMapping(value = "/queryUserVip/{id}")
+    R<UserVipVo> queryUserVip(@PathVariable(value = "id") Long id);
+}

bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/vo/UserVipVo.java

@@ -0,0 +1,63 @@
+package com.bnyer.img.api.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+
+@Getter
+@Setter
+@ApiModel("会员vip响应类")
+public class UserVipVo implements Serializable {
+
+    @ApiModelProperty(value="主键Id")
+    private Long id;
+
+    @ApiModelProperty(value="vip类型id")
+    private Long vipTypeId;
+
+    @ApiModelProperty(value = "会员类型名称")
+    private String vipTypeName;
+
+    @ApiModelProperty(value="vip编码")
+    private String vipCode;
+
+    @ApiModelProperty(value="vip名称")
+    private String vipName;
+
+    @ApiModelProperty(value="原价")
+    private BigDecimal originPrice;
+
+    @ApiModelProperty(value="售价")
+    private BigDecimal price;
+
+    @ApiModelProperty(value="描述")
+    private String description;
+
+    @ApiModelProperty(value="热门描述")
+    private String hotSignDesc;
+
+    @ApiModelProperty(value="排序")
+    private Integer sort;
+
+    @ApiModelProperty(value="是否到期自动续费(0>否;1->是)")
+    private String isDelay;
+
+    @ApiModelProperty(value = "用户客户端类型：10用户-抖音 20用户-快手 30用户-微信 40艺术家-微信")
+    private Integer userClientType;
+
+    @ApiModelProperty(value = "有效时长单位：0天，1周，2月，3季，4年")
+    private Integer validTimeUnit;
+
+    @ApiModelProperty(value = "有效时长：表示几天、几周、几月、几年")
+    private Integer validTimeNum;
+
+    @ApiModelProperty(value = "会员类型编码")
+    private String vipTypeCode;
+
+    private static final long serialVersionUID = 1L;
+}

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

@@ -1,2 +1,4 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration =  com.bnyer.img.api.factory.RemoteImgFallbackFactory
+org.springframework.boot.autoconfigure.EnableAutoConfiguration =\
+  com.bnyer.img.api.factory.RemoteImgFallbackFactory,\
+  com.bnyer.img.api.factory.RemoteWxMiniFallbackFactory
 

bnyer-api/bnyer-api-order/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>
+        <groupId>com.dimensionalnode</groupId>
+        <artifactId>bnyer-api</artifactId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>bnyer-api-order</artifactId>
+
+    <description>
+        bnyer-api-order订单服务接口模块
+    </description>
+
+    <dependencies>
+        <!-- bnyer Common Core-->
+        <dependency>
+            <groupId>com.dimensionalnode</groupId>
+            <artifactId>bnyer-common-core</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

bnyer-api/bnyer-api-order/src/main/java/com/bnyer/order/api/bean/query/VipOrderExtQuery.java

@@ -0,0 +1,26 @@
+package com.bnyer.order.api.bean.query;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * @author :WXC
+ * @Date :2023/03/27
+ * @description :
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+public class VipOrderExtQuery implements Serializable {
+
+    @ApiModelProperty(value = "id")
+    private Long id;
+
+    @ApiModelProperty(value="订单号")
+    private String orderNo;
+
+}

bnyer-api/bnyer-api-order/src/main/java/com/bnyer/order/api/bean/query/VipOrderQuery.java

@@ -0,0 +1,23 @@
+package com.bnyer.order.api.bean.query;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * @author :WXC
+ * @Date :2023/03/27
+ * @description :
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+public class VipOrderQuery implements Serializable {
+
+    @ApiModelProperty(value="订单号")
+    private String orderNo;
+
+}

bnyer-api/bnyer-api-order/src/main/java/com/bnyer/order/api/bean/vo/VipOrderVo.java

@@ -0,0 +1,61 @@
+package com.bnyer.order.api.bean.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author :WXC
+ * @Date :2023/03/27
+ * @description :
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+public class VipOrderVo {
+
+    @ApiModelProperty(value="主键")
+    private Long id;
+
+    @ApiModelProperty(value="订单号")
+    private String orderNo;
+
+    @ApiModelProperty(value="手机号")
+    private String phone;
+
+    @ApiModelProperty(value="用户id")
+    private Long userId;
+
+    @ApiModelProperty(value="vip表id")
+    private Long vipId;
+
+    @ApiModelProperty(value = "vip编码")
+    private String vipCode;
+
+    @ApiModelProperty(value = "vip名称")
+    private String vipName;
+
+    @ApiModelProperty(value = "用户客户端类型：10用户-抖音 20用户-快手 30用户-微信 40艺术家-微信")
+    private Integer userClientType;
+
+    @ApiModelProperty(value="是否到期自动续费(0>否;1->是)")
+    private String isDelay;
+
+    @ApiModelProperty(value="时长天数")
+    private Integer days;
+
+    @ApiModelProperty(value="支付金额")
+    private BigDecimal payAmount;
+
+    @ApiModelProperty(value = "vip类型名称")
+    private String vipTypeName;
+
+    @ApiModelProperty(value="订单状态：0待付款；1已付款；2已退款；3支付超时取消；4买家取消")
+    private Integer orderStatus;
+
+}

bnyer-api/bnyer-api-order/src/main/java/com/bnyer/order/api/factory/RemoteVipOrderFallbackFactory.java

@@ -0,0 +1,42 @@
+package com.bnyer.order.api.factory;
+
+import com.bnyer.common.core.domain.R;
+import com.bnyer.order.api.bean.query.VipOrderQuery;
+import com.bnyer.order.api.bean.query.VipOrderExtQuery;
+import com.bnyer.order.api.remote.RemoteVipOrderService;
+import com.bnyer.order.api.bean.vo.VipOrderVo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author :WXC
+ * @Date :2023/04/03
+ * @description :订单服务：vip订单接口熔断降级
+ */
+@Component
+public class RemoteVipOrderFallbackFactory implements FallbackFactory<RemoteVipOrderService>
+{
+    private static final Logger log = LoggerFactory.getLogger(RemoteVipOrderFallbackFactory.class);
+
+
+    @Override
+    public RemoteVipOrderService create(Throwable throwable) {
+        log.error("api订单服务调用失败:{}", throwable.getMessage());
+        return new RemoteVipOrderService() {
+
+            @Override
+            public R<List<VipOrderVo>> queryVipOrderList(VipOrderQuery query) {
+                return R.fail("获取会员订单信息失败:+"+throwable.getMessage());
+            }
+
+            @Override
+            public R<VipOrderVo> queryVipOrder(VipOrderExtQuery query) {
+                return R.fail("获取会员订单信息失败:+"+throwable.getMessage());
+            }
+        };
+    }
+}

bnyer-api/bnyer-api-order/src/main/java/com/bnyer/order/api/remote/RemoteVipOrderService.java

@@ -0,0 +1,36 @@
+package com.bnyer.order.api.remote;
+
+import com.bnyer.common.core.constant.ServiceNameConstants;
+import com.bnyer.common.core.domain.R;
+import com.bnyer.order.api.factory.RemoteVipOrderFallbackFactory;
+import com.bnyer.order.api.bean.query.VipOrderQuery;
+import com.bnyer.order.api.bean.query.VipOrderExtQuery;
+import com.bnyer.order.api.bean.vo.VipOrderVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * @author :WXC
+ * @Date :2023/04/03
+ * @description :订单服务：vip订单接口远程调用
+ */
+@FeignClient(path = "/vip",contextId = "remoteVipOrderService", value = ServiceNameConstants.ORDER_SERVICE, fallbackFactory = RemoteVipOrderFallbackFactory.class)
+public interface RemoteVipOrderService {
+
+    /**
+     * 获取会员订单信息
+     * @param query
+     * @return
+     */
+    @PostMapping("/queryVipOrderList")
+    R<List<VipOrderVo>> queryVipOrderList(@RequestBody VipOrderQuery query);
+
+    /**
+     * 查询会员订单信息(单表查询)
+     */
+    @PostMapping("/queryVipOrder")
+    R<VipOrderVo> queryVipOrder(@RequestBody VipOrderExtQuery query);
+}

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

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

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

@@ -1,6 +1,6 @@
 package com.bnyer.system.api;
 
-import com.bnyer.system.api.factory.RemoteFileFallbackFactory;
+import com.bnyer.system.api.factory.RemoteSystemFileFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -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 = RemoteSystemFileFallbackFactory.class)
+public interface RemoteSystemFileService
 {
     /**
      * 上传文件

bnyer-api/bnyer-api-system/src/main/java/com/bnyer/system/api/factory/RemoteFileFallbackFactory.java → bnyer-api/bnyer-api-system/src/main/java/com/bnyer/system/api/factory/RemoteSystemFileFallbackFactory.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 RemoteSystemFileFallbackFactory implements FallbackFactory<RemoteSystemFileService>
 {
-    private static final Logger log = LoggerFactory.getLogger(RemoteFileFallbackFactory.class);
+    private static final Logger log = LoggerFactory.getLogger(RemoteSystemFileFallbackFactory.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/bnyer-api-system/src/main/resources/META-INF/spring.factories

@@ -1,4 +1,4 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
   com.bnyer.system.api.factory.RemoteUserFallbackFactory,\
   com.bnyer.system.api.factory.RemoteLogFallbackFactory, \
-  com.bnyer.system.api.factory.RemoteFileFallbackFactory
+  com.bnyer.system.api.factory.RemoteSystemFileFallbackFactory

bnyer-api/pom.xml

@@ -11,6 +11,8 @@
     <modules>
         <module>bnyer-api-system</module>
         <module>bnyer-api-img</module>
+        <module>bnyer-api-file</module>
+        <module>bnyer-api-order</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/config/JsonConfig.java

@@ -0,0 +1,36 @@
+package com.bnyer.auth.config;
+
+import com.bnyer.auth.serializer.LongToStringSerializer;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
+
+/**
+ * 解决雪花Id长度超过16位前端传入精度丢失的问题
+ */
+@Configuration
+public class JsonConfig {
+    @Bean
+    @Primary
+    @ConditionalOnMissingBean(ObjectMapper.class)
+    public ObjectMapper jacksonObjectMapper(Jackson2ObjectMapperBuilder builder)
+    {
+        ObjectMapper objectMapper = builder.createXmlMapper(false).build();
+        // 全局配置序列化返回 JSON 处理
+        SimpleModule simpleModule = new SimpleModule();
+        //JSON Long ==> String
+        //自定义字符串转化规则ToStringSerializer换成自定义的LongToStringSerializer
+        simpleModule.addSerializer(Long.class, LongToStringSerializer.instance);
+        simpleModule.addSerializer(Long.TYPE, LongToStringSerializer.instance);
+
+        objectMapper.registerModule(simpleModule);
+        //参数在bean中没有的情况处理
+        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        return objectMapper;
+    }
+}

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

@@ -0,0 +1,53 @@
+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.auth.CreatorAuthUtil;
+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);
+        CreatorAuthUtil.logoutByToken(token);
+        return R.ok();
+    }
+}

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

@@ -0,0 +1,51 @@
+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.auth.FhAuthUtil;
+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);
+        FhAuthUtil.logoutByToken(token);
+        return R.ok();
+    }
+}

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

@@ -0,0 +1,51 @@
+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.auth.TiktokAuthUtil;
+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.delLoginTiktokUser(token);
+        TiktokAuthUtil.logoutByToken(token);
+        return R.ok();
+    }
+}

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

@@ -0,0 +1,51 @@
+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.auth.WechatAuthUtil;
+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);
+        WechatAuthUtil.logoutByToken(token);
+        return R.ok();
+    }
+}

bnyer-auth/src/main/java/com/bnyer/auth/serializer/LongToStringSerializer.java

@@ -0,0 +1,24 @@
+package com.bnyer.auth.serializer;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+
+import java.io.IOException;
+
+public class LongToStringSerializer extends JsonSerializer<Long> {
+    public static final LongToStringSerializer instance = new LongToStringSerializer();
+
+    @Override
+    public void serialize(Long id, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException {
+        if(id != null){
+            //长度小于某个值的，还是保持long类型
+            if(id <  10000000000000000L){
+                jsonGenerator.writeNumber(id);
+            }else {
+                //长度超过某个值的，转化为字符串
+                jsonGenerator.writeString(id.toString());
+            }
+        }
+    }
+}

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.remote.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.remote.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.remote.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,24 @@
+package com.bnyer.auth.service;
+
+import com.bnyer.common.core.dto.WxLoginDto;
+import com.bnyer.img.api.remote.RemoteImgService;
+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

@@ -65,6 +65,11 @@
             <artifactId>jackson-databind</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+        </dependency>
+
         <!-- Alibaba Fastjson -->
         <dependency>
             <groupId>com.alibaba</groupId>
@@ -89,6 +94,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 +140,29 @@
             <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>
+
+        <!--Spring-Retry重试框架-->
+        <dependency>
+            <groupId>org.springframework.retry</groupId>
+            <artifactId>spring-retry</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

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

@@ -0,0 +1,351 @@
+package com.bnyer.common.core.annotation;
+
+
+import org.apache.commons.lang3.StringUtils;
+
+import javax.validation.Constraint;
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+import javax.validation.Payload;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static java.lang.annotation.ElementType.*;
+
+/**
+ * @author :WXC
+ * @Date :2023/04/11
+ * @description :
+ */
+@Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Constraint(validatedBy = { CustomParamsValidation.CustomParamsValidationImpl.class })
+public @interface CustomParamsValidation {
+
+    /**
+     * 预定义的正则表达式
+     */
+    class Regexp{
+        /**
+         * 常规输入框：匹配中文,字母，数字
+         */
+        private final static String  INPUTTXT="^[A-Za-z0-9\u4e00-\u9fa5]*$";
+
+        /**
+         * 昵称匹配：匹配中文,字母，数字 下划线
+         */
+        private final static String  NICKNAME="^[A-Za-z0-9_\u4e00-\u9fa5]*$";
+
+        /**********以上public 的正则提供 regexp 属性使用**********/
+
+        /**********以下private 的正则提供 paramType 计算**********/
+        /**
+         * 匹配邮箱
+         */
+        private final static String  EMAIL="^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\\.[a-zA-Z0-9_-]+)+$";
+        /**
+         * uuid
+         * 格式
+         * {8}-{4}-{4}-{4}-{12}
+         * 如
+         * 4cbd6c8b-1111-45f4-b477-a524707aedfd
+         */
+        private static final String UUID="^[a-z0-9]{8}(-[a-z0-9]{4}){3}-[a-z0-9]{12}$";
+        /**
+         * yyyy-MM-dd
+         */
+        private static final String DATE = "^[1-9][0-9]{3}-((01|03|05|07|08|10|12)-(0[1-9]|[1-2][0-9]|30|31)|(04|06|09|11)-(0[1-9]|[1-2][0-9]|30)|(02)-(0[1-9]|1[0-9]|2[0-9]))$";
+        /**
+         * yyyyMMdd
+         */
+        private static final String DATE2 = "^[1-9][0-9]{3}((01|03|05|07|08|10|12)(0[1-9]|[1-2][0-9]|30|31)|(04|06|09|11)(0[1-9]|[1-2][0-9]|30)|(02)(0[1-9]|1[0-9]|2[0-9]))$";
+        /**
+         * yyyy-MM-dd HH:mm:ss
+         */
+        private static final String DATETIME = "^[1-9][0-9]{3}-((01|03|05|07|08|10|12)-(0[1-9]|[1-2][0-9]|30|31)|(04|06|09|11)-(0[1-9]|[1-2][0-9]|30)|(02)-(0[1-9]|1[0-9]|2[0-9])) ([01][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9])$";
+        /**
+         * yyyyMMddHHmmss
+         */
+        private static final String DATETIME2 = "^[1-9][0-9]{3}((01|03|05|07|08|10|12)(0[1-9]|[1-2][0-9]|30|31)|(04|06|09|11)(0[1-9]|[1-2][0-9]|30)|(02)(0[1-9]|1[0-9]|2[0-9]))([01][0-9]|2[0-3])([0-5][0-9])([0-5][0-9])$";
+        /**
+         * yyyy-MM-dd HH:mm
+         */
+        private static final String DATETIME3 = "^[1-9][0-9]{3}-((01|03|05|07|08|10|12)-(0[1-9]|[1-2][0-9]|30|31)|(04|06|09|11)-(0[1-9]|[1-2][0-9]|30)|(02)-(0[1-9]|1[0-9]|2[0-9])) ([01][0-9]|2[0-3]):([0-5][0-9])$";
+
+        /**
+         * HH:mm:ss
+         */
+        private static final String TIME = "^([01][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9])$";
+        /**
+         * HHmmss
+         */
+        private static final String TIME2 = "^([01][0-9]|2[0-3])([0-5][0-9])([0-5][0-9])$";
+
+        /**
+         * 手机号码
+         */
+        private static final String MOBILEPHONE="^1\\d{10}$";
+
+        /**
+         * 匹配IPV4地址
+         */
+        private final static String IPV4="((25[0-5]|2[0-4]\\d|((1\\d{2})|([1-9]?\\d)))\\.){3}(25[0-5]|2[0-4]\\d|((1\\d{2})|([1-9]?\\d)))";
+        //=============可以在此扩展正则=============
+
+
+        /**
+         * 校验正则
+         * @param regexp
+         * @param value
+         * @return
+         */
+        public static boolean validateRegexp(String regexp,String value){
+            Pattern pattern = Pattern.compile(regexp);
+            Matcher matcher = pattern.matcher(value);
+            return matcher.matches();
+        }
+    }
+
+
+    /**
+     * 预定义的参数类型
+     */
+    class ParamType {
+        //匹配IPV4地址
+        public static final String IPV4 = "ipv4";
+        /**
+         * uuid
+         */
+        public static final String UUID="uuid";
+        /**
+         * 匹配中文
+         */
+        public static final String INPUTTXT="inputtxt";
+        /**
+         * 匹配中文英文数字下划线
+         */
+        public static final String NICKNAME="nickname";
+
+        /**
+         * 匹配邮箱
+         */
+        public static final String EMAIL="email";
+
+        /**
+         * 手机号码
+         */
+        public static final String MOBILEPHONE="mobilephone";
+
+        /**
+         * yyyy-MM-dd
+         */
+        public static final String DATE = "yyyy-MM-dd";
+        /**
+         * yyyyMMdd
+         */
+        public static final String DATE2 = "yyyyMMdd";
+        /**
+         * yyyy-MM-dd HH:mm:ss
+         */
+        public static final String DATETIME = "yyyy-MM-dd HH:mm:ss";
+        /**
+         * yyyyMMddHHmmss
+         */
+        public static final String DATETIME2 = "yyyyMMddHHmmss";
+        /**
+         * yyyy-MM-dd HH:mm
+         */
+        public static final String DATETIME3 = "yyyy-MM-dd HH:mm";
+
+        /**
+         * HH:mm:ss
+         */
+        public static final String TIME = "HH:mm:ss";
+        /**
+         * HHmmss
+         */
+        public static final String TIME2 = "HHmmss";
+        /**
+         * 参数类型校验
+         *
+         * @param paramType
+         * @param value
+         * @return
+         */
+        public static boolean validateParamType(String paramType, String value) {
+            boolean flag = false;
+
+            switch (paramType) {
+                case ParamType.IPV4:
+                    value = value.replaceAll(" ","");
+                    flag = Regexp.validateRegexp(Regexp.IPV4, value);
+                    break;
+                case ParamType.MOBILEPHONE: flag = Regexp.validateRegexp(Regexp.MOBILEPHONE, value);break;
+                case ParamType.NICKNAME: flag = Regexp.validateRegexp(Regexp.NICKNAME, value);break;
+                case ParamType.EMAIL: flag = Regexp.validateRegexp(Regexp.EMAIL, value);break;
+                case ParamType.UUID : flag = Regexp.validateRegexp(Regexp.UUID, value);break;
+                case ParamType.INPUTTXT : flag = Regexp.validateRegexp(Regexp.INPUTTXT, value);break;
+                case ParamType.DATE : flag = validateDateParamType(ParamType.DATE, value);break;
+                case ParamType.DATE2 : flag = validateDateParamType(ParamType.DATE2, value);break;
+                case ParamType.DATETIME : flag = validateDateParamType(ParamType.DATETIME, value);break;
+                case ParamType.DATETIME2 : flag = validateDateParamType(ParamType.DATETIME2, value);break;
+                case ParamType.DATETIME3 : flag = validateDateParamType(ParamType.DATETIME3, value);break;
+                case ParamType.TIME : flag = validateDateParamType(ParamType.TIME, value);break;
+                case ParamType.TIME2 : flag = validateDateParamType(ParamType.TIME2, value);break;
+            }
+            return flag;
+        }
+
+        /**
+         * dateFormat 属性配置，配置的值 不是内置值，验证无法通过
+         * @param dateFormat
+         * @param value
+         * @return
+         */
+        private static boolean validateDateParamType(String dateFormat,String value){
+            String regexp = null;
+
+            if(DATE.equals(dateFormat)){
+                regexp = Regexp.DATE;
+            }else if(DATE2.equals(dateFormat)){
+                regexp = Regexp.DATE2;
+            }else if(DATETIME.equals(dateFormat)){
+                regexp = Regexp.DATETIME;
+            }else if(DATETIME2.equals(dateFormat)){
+                regexp = Regexp.DATETIME2;
+            }else if(DATETIME3.equals(dateFormat)){
+                regexp = Regexp.DATETIME3;
+            }else if(TIME.equals(dateFormat)){
+                regexp = Regexp.TIME;
+            }else if(TIME2.equals(dateFormat)){
+                regexp = Regexp.TIME2;
+            }
+
+            if(regexp!=null){
+                boolean flag = Regexp.validateRegexp(regexp, value);
+                //时间不用做2月29日瑞年判断
+                if(TIME.equals(dateFormat) || TIME2.equals(dateFormat)){
+                    return flag;
+                }
+                if(flag){
+                    //月份和日期部分
+                    String monthAndDay = "";
+                    //2月29日常量
+                    String monthAndDayConstant = "";
+                    Integer year = null;
+                    switch (dateFormat) {
+                        case DATE:
+                        case DATETIME:
+                        case DATETIME3:
+                            monthAndDay = StringUtils.substring(value, 5, 10);
+                            monthAndDayConstant = "02-29";
+                            year = Integer.valueOf(StringUtils.substring(value, 0, 4));
+                            break;
+                        case DATE2:
+                        case DATETIME2:
+                            monthAndDay = StringUtils.substring(value, 4, 8);
+                            monthAndDayConstant = "0229";
+                            year = Integer.valueOf(StringUtils.substring(value, 0, 4));
+                            break;
+                    }
+                    //2月29日判断是否是润年，非润年没有2月29日
+                    if(monthAndDay.equals(monthAndDayConstant)){
+                        if(!isLeapYear(year)){
+                            flag = false;
+                        }
+                    }
+                }
+                return flag;
+            }
+
+            return false;
+        }
+
+        /**
+         * 判断是否是润年
+         * @param year
+         * @return
+         */
+        private static boolean isLeapYear(int year){
+            return year % 400 == 0 || (year % 4 == 0 && year % 100 != 0);
+        }
+    }
+
+
+    /**
+     * 预定义Range
+     *
+     */
+    class Range{
+        private static boolean contains(String range,String value){
+            boolean flag = false;
+            if(StringUtils.isEmpty(value)){
+                return false;
+            }
+            if(StringUtils.isNotEmpty(range)){
+                String[] arr = range.split("\\|");
+                for (String string : arr) {
+                    if(value.equals(string)){
+                        flag = true;
+                        break;
+                    }
+                }
+            }
+            return flag;
+        }
+    }
+
+
+    /**
+     * 参数类型，最优先推荐使用的属性
+     * @return
+     */
+    String paramType() default "";
+
+    /**
+     * 限制字符串或者数字 可选项,用 | 分割 ，如  00|10|20
+     * @return
+     */
+    String range() default "";
+
+    String message() default "参数基本校验不通过错误:注意格式及长度";
+
+    Class<?>[]groups() default {};
+
+    Class<? extends Payload>[]payload() default {};
+
+    class CustomParamsValidationImpl implements ConstraintValidator<CustomParamsValidation,String> {
+
+        String paramType;
+
+        String range;
+
+
+        @Override
+        public void initialize(CustomParamsValidation constraintAnnotation) {
+            paramType = constraintAnnotation.paramType();
+            range = constraintAnnotation.range();
+        }
+
+        @Override
+        public boolean isValid(String value, ConstraintValidatorContext context) {
+            if(StringUtils.isNotEmpty(value)){
+                //根据参数类型校验正则
+                if(StringUtils.isNotEmpty(paramType)){
+                    return ParamType.validateParamType(paramType, value);
+                }
+                //校验参数范围
+                if (StringUtils.isNotEmpty(range)){
+                    return Range.contains(range, value);
+                }
+            }
+            return true;
+        }
+    }
+
+}

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

@@ -0,0 +1,63 @@
+package com.bnyer.common.core.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.METHOD;
+
+/**
+ * @author :WXC
+ * @Date :2023/05/12
+ * @description : 防重复提交
+ */
+@Target({ METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface LimitRepeatRequest {
+
+    /**
+     * 限制当前用户同一个api 不能重复提交
+     */
+    String SELF="self";
+
+    /**
+     * 限制所有用户同一个参数不能重复提交，如我新增了用户 张三， 那么其他人不能再并发情况下重复添加张三
+     */
+    String ALL_USER="all";
+
+    /**
+     * 当前时间内 api 只能请求一次，单位秒
+     * @return
+     */
+    long time() default 5;
+
+    /**
+     * 对部分参数做重复请求限制
+     * @return
+     */
+    String[]  bodyParam() default {};
+
+    /**
+     * 是否对全部参数做重复请求限制
+     * @return
+     */
+    boolean bodyAllParam() default false;
+
+    /**
+     * 重复请求限制的用户范围
+     * LimitRepeatRequest.SELF：针对当前登录用户
+     * LimitRepeatRequest.ALL_USER：针对所有用户
+     *
+     * @return
+     */
+    String userRange() default SELF;
+
+    /**
+     * 错误提示信息
+     * @return
+     */
+    String message() default "";
+
+}

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:";
 
     /**
      * 微信小程序艺术家邀请键
@@ -94,11 +94,87 @@ public class RedisKeyConstant {
     public static final String VERIFY_PROFIT_LOCK_KEY = "bnyer.img.profit.lock:";
 
     /**
-     * 平台用户下载键
+     * 平台用户下载图片广告键
      */
     public static final String PLATFORM_USER_DOWNLOAD_KEY = "bnyer.img.user.download:";
+
+    /**
+     * 平台用户绘画奖励广告键
+     */
+    public static final String PLATFORM_USER_PAINT_REWARD_KEY = "bnyer.img.user.paint.reward:";
+
+    /**
+     * 平台用户签到奖励键
+     */
+    public static final String PLATFORM_USER_SIGN_REWARD_KEY = "bnyer.img.user.sign.reward:";
+
+    /**
+     * 平台用户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";
+
+    /**
+     * 支付回调rediskey
+     */
+    public static final String PAY_NOTIFY_LOCK_KEY = "bnyer.pay.notify.lock:";
+
+    /**
+     * 抖音ACCESS_TOKEN
+     */
+    public static final String DY_ACCESS_TOKEN_KEY = "bnyer.pay.dy.access.token";
+
+    /**
+     * 快手ACCESS_TOKEN
+     */
+    public static final String KS_ACCESS_TOKEN_KEY = "bnyer.pay.ks.access.token";
+
 }

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

@@ -7,6 +7,12 @@ package com.bnyer.common.core.constant;
  */
 public class SecurityConstants
 {
+    /**
+     * 平台 抖音->10;快手->20;微信->30;微信艺术家->40;pc管理员->50
+     */
+    public static final String PLATFORM = "platform";
+
+    //***************************PC信息开始************************************
     /**
      * 用户ID字段
      */
@@ -41,4 +47,110 @@ 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";
+
+    /**
+     * 登录抖音用户
+     */
+    public static final String LOGIN_TIKTOK_USER = "login_tiktok_user";
+    //***************************抖音用户信息结束************************************
+    //***************************微信用户信息开始************************************
+
+    /**
+     * 微信用户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";
+
+    /**
+     * 登录微信用户
+     */
+    public static final String LOGIN_WECHAT_USER = "login_wechat_user";
+    //***************************微信用户信息结束************************************
+    //***************************快手用户信息开始************************************
+
+    /**
+     * 快手用户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";
+
+    /**
+     * 登录快手用户
+     */
+    public static final String LOGIN_FH_USER = "login_fh_user";
+
+    //***************************快手用户信息结束************************************
 }

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

@@ -18,12 +18,27 @@ 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 ORDER_SERVICE = "bnyer-order";
+
+    /**
+     * 文件服务的serviceid
+     */
+    public static final String FILE_SERVICE = "bnyer-file";
+
+    /**
+     * pay服务的serviceid
+     */
+    public static final String PAY_SERVICE = "bnyer-pay";
 }

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,29 @@ 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;
+
+    /**
+     * 画意值不足
+     */
+    public static final Integer GOLD_NUM_IS_NOT_ENOUGH = 105016;
+
+    /**
+     * 用户类型错误
+     */
+    public static final Integer USER_TYPE_ERROR = 105017;
 }

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

@@ -51,6 +51,7 @@ public class SecurityContextHolder
         THREAD_LOCAL.set(threadLocalMap);
     }
 
+    //***************************PC信息开始************************************
     public static Long getUserId()
     {
         return Convert.toLong(get(SecurityConstants.DETAILS_USER_ID), 0L);
@@ -80,9 +81,174 @@ public class SecurityContextHolder
     {
         set(SecurityConstants.USER_KEY, userKey);
     }
+    //***************************PC信息结束************************************
+
+    //***************************艺术家信息开始************************************
+
+    public static Long getCreatorId()
+    {
+        return Convert.toLong(get(SecurityConstants.DETAILS_CREATOR_ID), 0L);
+    }
+
+    public static void setCreatorId(String creator)
+    {
+        set(SecurityConstants.DETAILS_CREATOR_ID, creator);
+    }
+
+    public static String getCreatorKey()
+    {
+        return get(SecurityConstants.CREATOR_KEY);
+    }
+
+    public static void setCreatorKey(String creatorKey)
+    {
+        set(SecurityConstants.CREATOR_KEY, creatorKey);
+    }
+
+    public static String getCreatorPhone()
+    {
+        return get(SecurityConstants.DETAILS_PHONE);
+    }
+
+    public static void setCreatorPhone(String creatorPhone)
+    {
+        set(SecurityConstants.DETAILS_PHONE, creatorPhone);
+    }
+
+    //***************************艺术家信息结束************************************
+
+    //***************************抖音用户信息开始************************************
+
+    public static String getTikTokOpenId()
+    {
+        return get(SecurityConstants.DETAILS_TIKTOK_OPENID);
+    }
+
+    public static void setTikTokOpenId(String tikTokOpenId)
+    {
+        set(SecurityConstants.DETAILS_TIKTOK_OPENID, tikTokOpenId);
+    }
+
+    public static String getTikTokUserName()
+    {
+        return get(SecurityConstants.DETAILS_TIKTOK_USERNAME);
+    }
+
+    public static void setTikTokUserName(String tikTokUserName)
+    {
+        set(SecurityConstants.DETAILS_TIKTOK_USERNAME, tikTokUserName);
+    }
+
+    public static String getTikTokUserKey()
+    {
+        return get(SecurityConstants.TIKTOK_USER_KEY);
+    }
+
+    public static void setTikTokUserKey(String tikTokUserKey)
+    {
+        set(SecurityConstants.TIKTOK_USER_KEY, tikTokUserKey);
+    }
+
+    public static Long getTikTokUserId()
+    {
+        return Convert.toLong(get(SecurityConstants.DETAILS_TIKTOK_USER_ID), 0L);
+    }
+
+    public static void setTikTokUserId(String tiktokUser)
+    {
+        set(SecurityConstants.DETAILS_TIKTOK_USER_ID, tiktokUser);
+    }
+    //***************************抖音用户信息结束************************************
+
+    //***************************微信用户信息开始************************************
+    public static String getWechatOpenId()
+    {
+        return get(SecurityConstants.DETAILS_WECHAT_OPENID);
+    }
+
+    public static void setWechatOpenId(String wechatOpenId)
+    {
+        set(SecurityConstants.DETAILS_WECHAT_OPENID, wechatOpenId);
+    }
+
+    public static String getWechatUserName()
+    {
+        return get(SecurityConstants.DETAILS_WECHAT_USERNAME);
+    }
+
+    public static void setWechatUserName(String wechatUserName)
+    {
+        set(SecurityConstants.DETAILS_WECHAT_USERNAME, wechatUserName);
+    }
+
+    public static String getWechatUserKey()
+    {
+        return get(SecurityConstants.WECHAT_USER_KEY);
+    }
+
+    public static void setWechatUserKey(String WechatUserKey)
+    {
+        set(SecurityConstants.WECHAT_USER_KEY, WechatUserKey);
+    }
+
+    public static Long getWechatUserId()
+    {
+        return Convert.toLong(get(SecurityConstants.DETAILS_WECHAT_USER_ID), 0L);
+    }
+
+    public static void setWechatUserId(String WechatUser)
+    {
+        set(SecurityConstants.DETAILS_WECHAT_USER_ID, WechatUser);
+    }
+
+    //***************************微信用户信息结束************************************
+
+    //***************************快手用户信息开始************************************
+    public static String getFhOpenId()
+    {
+        return get(SecurityConstants.DETAILS_FH_OPENID);
+    }
+
+    public static void setFhOpenId(String FhOpenId)
+    {
+        set(SecurityConstants.DETAILS_FH_OPENID, FhOpenId);
+    }
+
+    public static String getFhUserName()
+    {
+        return get(SecurityConstants.DETAILS_FH_USERNAME);
+    }
+
+    public static void setFhUserName(String FhUserName)
+    {
+        set(SecurityConstants.DETAILS_FH_USERNAME, FhUserName);
+    }
+
+    public static String getFhUserKey()
+    {
+        return get(SecurityConstants.FH_USER_KEY);
+    }
+
+    public static void setFhUserKey(String FhUserKey)
+    {
+        set(SecurityConstants.FH_USER_KEY, FhUserKey);
+    }
+
+    public static Long getFhUserId()
+    {
+        return Convert.toLong(get(SecurityConstants.DETAILS_FH_USER_ID), 0L);
+    }
+
+    public static void setFhUserId(String FhUser)
+    {
+        set(SecurityConstants.DETAILS_FH_USER_ID, FhUser);
+    }
+
+    //***************************快手用户信息结束************************************
 
     public static void remove()
     {
         THREAD_LOCAL.remove();
     }
+
 }

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

@@ -0,0 +1,176 @@
+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.io.Serializable;
+import java.util.Date;
+
+/**
+    * 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 = "negative_prompt")
+    @ApiModelProperty(value="反向关键词")
+    private String negativePrompt;
+
+    /**
+     * 采样步数
+     */
+    @TableField(value = "steps")
+    @ApiModelProperty(value="采样步数")
+    private Integer steps;
+
+    /**
+     * 种子值
+     */
+    @TableField(value = "seed")
+    @ApiModelProperty(value="种子值")
+    private Integer seed;
+
+    /**
+     * 批量数量
+     */
+    @TableField(value = "batch_size")
+    @ApiModelProperty(value="批量数量")
+    private Integer batchSize;
+
+    /**
+     * 精细度
+     */
+    @TableField(value = "cfg_scale")
+    @ApiModelProperty(value="精细度")
+    private Double cfgScale;
+
+    /**
+     * eta值
+     */
+    @TableField(value = "eta")
+    @ApiModelProperty(value="eta值")
+    private Double eta;
+
+    /**
+     * 采样器
+     */
+    @TableField(value = "sampler_index")
+    @ApiModelProperty(value="采样器")
+    private String samplerIndex;
+
+    /**
+     * 模型名称
+     */
+    @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="平台(1->抖音;2->快手;3->微信)")
+    private String source;
+
+    /**
+     * app类型(0->次元意境;1->妙鸭壁纸)
+     */
+    @TableField(value = "app_type")
+    @ApiModelProperty(value="app类型(0->次元意境;1->妙鸭壁纸)")
+    private String appType;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value="创建时间")
+    private Date createTime;
+
+    private static final long serialVersionUID = 1L;
+}

bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/AlipayConfig.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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * @author :WXC
+ * @description :
+ */
+/**
+    * 支付宝支付配置表
+    */
+@ApiModel(value="com-bnyer-common-core-domain-PayAlipayConfig")
+@Getter
+@Setter
+@ToString
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "pay_alipay_config")
+public class AlipayConfig extends BaseDomain {
+
+    /**
+     * appid
+     */
+    @TableField(value = "appid")
+    @ApiModelProperty(value="appid")
+    private String appid;
+
+    /**
+     * app私钥
+     */
+    @TableField(value = "app_private_key")
+    @ApiModelProperty(value="app私钥")
+    private String appPrivateKey;
+
+    /**
+     * 阿里公钥
+     */
+    @TableField(value = "alipay_public_key")
+    @ApiModelProperty(value="阿里公钥")
+    private String alipayPublicKey;
+
+    /**
+     * RSA/RSA2
+     */
+    @TableField(value = "key_type")
+    @ApiModelProperty(value="RSA/RSA2")
+    private String keyType;
+
+    /**
+     * 回调地址url
+     */
+    @TableField(value = "backurl")
+    @ApiModelProperty(value="回调地址url")
+    private String backurl;
+
+    /**
+     * 帐号状态（0正常 1停用）
+     */
+    @TableField(value = "status")
+    @ApiModelProperty(value="帐号状态（0正常 1停用）")
+    private String status;
+
+    @TableField(value = "remark")
+    @ApiModelProperty(value="")
+    private String remark;
+}

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名称
@@ -48,7 +42,7 @@ public class Banner extends BaseDomain {
      * 平台(0->通用;1->抖音;2->快手;3->微信)
      */
     @TableField(value = "source")
-    @ApiModelProperty(value="平台(0->通用;1->抖音;2->快手;3->微信)")
+    @ApiModelProperty(value="平台(1->抖音;2->快手;3->微信)")
     private String source;
 
     private static final long serialVersionUID = 1L;

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-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/BaseMqMessage.java

@@ -0,0 +1,80 @@
+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.bnyer.common.core.enums.EnumMessageStatus;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author :WXC
+ * @Date :2023/05/18
+ * @description :消息记录公共实体
+ */
+@Data
+public class BaseMqMessage {
+
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 消息key，作为redis的key，消费的时候判断是否存在，
+     * 存在就判断状态是否是已消费，如果不是就进行消费，如果是就过滤该消息
+     */
+    @TableField(value = "message_key")
+    private String messageKey;
+
+    /**
+     * 消息主题
+     */
+    @TableField(value = "topic")
+    private String topic;
+
+    /**
+     * 消息tag
+     */
+    @TableField(value = "tag")
+    private String tag;
+
+    /**
+     * 消费组名称
+     */
+    @TableField(value = "consumer_group_name")
+    private String consumerGroupName;
+
+    /**
+     * 返回主题
+     */
+    @TableField(value = "return_topic")
+    private String returnTopic;
+
+    /**
+     * 消息状态
+     */
+    @TableField(value = "status")
+    private EnumMessageStatus status;
+
+    /**
+     * 消息内容
+     */
+    @TableField(value = "content")
+    private String content;
+
+    /**
+     * 错误信息
+     */
+    @TableField(value = "err_msg")
+    private String errMsg;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+
+}

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;
 
     /**
@@ -45,7 +47,7 @@ public class BzData {
     private Long uv;
 
     /**
-     * 平台(0->Hub;1->抖音;2->快手;3->微信)
+     * 平台(1->抖音;2->快手;3->微信)
      */
     @TableField(value = "source")
     @ApiModelProperty(value="source")

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

@@ -0,0 +1,84 @@
+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;
+
+    /**
+     * 平台(1->抖音;2->快手;3->微信)
+     */
+    @TableField(value = "`source`")
+    @ApiModelProperty(value="平台(1->抖音;2->快手;3->微信)")
+    private String source;
+
+    /**
+     * app类型(0->次元意境;1->妙鸭壁纸)
+     */
+    @TableField(value = "app_type")
+    @ApiModelProperty(value="app类型(0->次元意境;1->妙鸭壁纸)")
+    private String appType;
+
+    /**
+     * 是否显示 (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;
 
     /**
@@ -72,14 +69,14 @@ public class CreatorProfit extends BaseDomain {
      * 结算平台(0->抖音;1->快手;2->微信;3->uniapp)
      */
     @TableField(value = "platform")
-    @ApiModelProperty(value="结算平台(0->抖音;1->快手;2->微信;3->uniapp)")
+    @ApiModelProperty(value="结算平台(1->抖音;2->快手;3->微信)")
     private String platform;
 
     /**
-     * 应用类型(0->节点壁纸)
+     * 应用类型(0->次元意境)
      */
     @TableField(value = "app_type")
-    @ApiModelProperty(value="应用类型(0->节点壁纸)")
+    @ApiModelProperty(value="app类型(0->次元意境;1->妙鸭壁纸)")
     private String appType;
 
     /**

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

@@ -0,0 +1,58 @@
+package com.bnyer.common.core.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+/**
+    * 意心记录表
+    */
+@ApiModel(value="com-bnyer-common-core-DiamondLog")
+@Getter
+@Setter
+@ToString
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "img_diamond_log")
+public class DiamondLog extends BaseDomain {
+
+    /**
+     * 用户id
+     */
+    @TableField(value = "user_id")
+    @ApiModelProperty(value="用户id")
+    private Long userId;
+
+    /**
+     * 意心获取/消耗点数
+     */
+    @TableField(value = "diamond_num")
+    @ApiModelProperty(value="意心获取/消耗点数")
+    private Integer diamondNum;
+
+    /**
+     * 获取/消耗原因
+     */
+    @TableField(value = "reason")
+    @ApiModelProperty(value="获取/消耗原因")
+    private String reason;
+
+    /**
+     * 平台(0->Hub;1->抖音;2->快手;3->微信)
+     */
+    @TableField(value = "`source`")
+    @ApiModelProperty(value="平台(0->Hub;1->抖音;2->快手;3->微信)")
+    private String source;
+
+    /**
+     * app类型(0->次元意境;1->妙鸭壁纸)
+     */
+    @TableField(value = "app_type")
+    @ApiModelProperty(value="app类型(0->次元意境;1->妙鸭壁纸)")
+    private String appType;
+
+
+    private static final long serialVersionUID = 1L;
+}

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

@@ -0,0 +1,69 @@
+package com.bnyer.common.core.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+/**
+ * @author :WXC
+ * @description :
+ */
+/**
+    * 抖音支付配置表
+    */
+@ApiModel(value="com-bnyer-common-core-domain-PayDypayConfig")
+@Getter
+@Setter
+@ToString
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "pay_dypay_config")
+public class DypayConfig extends BaseDomain {
+    /**
+     * appid
+     */
+    @TableField(value = "appid")
+    @ApiModelProperty(value="appid")
+    private String appid;
+
+    /**
+     * 应用秘钥
+     */
+    @TableField(value = "appSecret")
+    @ApiModelProperty(value="应用秘钥")
+    private String appSecret;
+
+    /**
+     * 支付秘钥
+     */
+    @TableField(value = "salt")
+    @ApiModelProperty(value="支付秘钥")
+    private String salt;
+
+    /**
+     * 令牌
+     */
+    @TableField(value = "token")
+    @ApiModelProperty(value="支付令牌")
+    private String token;
+
+    /**
+     * 回调地址url
+     */
+    @TableField(value = "backurl")
+    @ApiModelProperty(value="回调地址url")
+    private String backurl;
+
+    /**
+     * 帐号状态（0正常 1停用）
+     */
+    @TableField(value = "status")
+    @ApiModelProperty(value="帐号状态（0正常 1停用）")
+    private String status;
+
+    @TableField(value = "remark")
+    @ApiModelProperty(value="")
+    private String remark;
+}

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;
 
     /**
      * 反馈信息
@@ -35,10 +25,10 @@ public class Feedback extends BaseDomain {
     private String info;
 
     /**
-     * 来源平台(0->抖音;1->快手;2->微信)
+     * 来源平台(1->抖音;2->快手;3->微信)
      */
     @TableField(value = "source")
-    @ApiModelProperty(value="来源平台(0->抖音;1->快手;2->微信)")
+    @ApiModelProperty(value="来源平台(1->抖音;2->快手;3->微信)")
     private String source;
 
     private static final long serialVersionUID = 1L;

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,27 +1,20 @@
-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 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 +22,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 +37,34 @@ 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;
+
+    /**
+     * 画意值
+     */
+    @TableField(value = "gold_num")
+    @ApiModelProperty(value="画意值")
+    private Integer goldNum;
+
+    /**
+     * 意心
+     */
+    @TableField(value = "diamond_num")
+    @ApiModelProperty(value="意心")
+    private Integer diamondNum;
+
     /**
      * 头像img地址
      */
@@ -57,5 +72,12 @@ public class FhUser extends BaseDomain {
     @ApiModelProperty(value="头像img地址")
     private String img;
 
+    /**
+     * app类型(0->次元意境;1->妙鸭壁纸)
+     */
+    @TableField(value = "app_type")
+    @ApiModelProperty(value="app类型(0->次元意境;1->妙鸭壁纸)")
+    private String appType;
+
     private static final long serialVersionUID = 1L;
 }

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

@@ -0,0 +1,57 @@
+package com.bnyer.common.core.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+/**
+    * 画意值记录
+    */
+@ApiModel(value="com-bnyer-common-core-GoldLog")
+@Getter
+@Setter
+@ToString
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "img_gold_log")
+public class GoldLog extends BaseDomain {
+
+    /**
+     * 用户id
+     */
+    @TableField(value = "user_id")
+    @ApiModelProperty(value="用户id")
+    private Long userId;
+
+    /**
+     * 画意值获取/消耗点数
+     */
+    @TableField(value = "gold_num")
+    @ApiModelProperty(value="画意值获取/消耗点数")
+    private Integer goldNum;
+
+    /**
+     * 获取/消耗原因
+     */
+    @TableField(value = "reason")
+    @ApiModelProperty(value="获取/消耗原因")
+    private String reason;
+
+    /**
+     * 平台(1->抖音;2->快手;3->微信)
+     */
+    @TableField(value = "`source`")
+    @ApiModelProperty(value="平台(1->抖音;2->快手;3->微信)")
+    private String source;
+
+    /**
+     * app类型(0->次元意境;1->妙鸭壁纸)
+     */
+    @TableField(value = "app_type")
+    @ApiModelProperty(value="app类型(0->次元意境;1->妙鸭壁纸)")
+    private String appType;
+
+    private static final long serialVersionUID = 1L;
+}

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

@@ -0,0 +1,19 @@
+package com.bnyer.common.core.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+/**
+ * @author :WXC
+ * @Date :2023/05/18
+ * @description :图片服务本地消息表
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+@TableName(value = "img_mq_message_record")
+public class ImgMqMessageRecord extends BaseMqMessage{
+
+}

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/KspayConfig.java

@@ -0,0 +1,62 @@
+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 java.util.Date;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * @author :WXC
+ * @description :
+ */
+/**
+    * 快手支付配置表
+    */
+@ApiModel(value="com-bnyer-common-core-domain-PayKspayConfig")
+@Getter
+@Setter
+@ToString
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "pay_kspay_config")
+public class KspayConfig extends BaseDomain {
+    /**
+     * appid
+     */
+    @TableField(value = "appid")
+    @ApiModelProperty(value="appid")
+    private String appid;
+
+    /**
+     * 秘钥
+     */
+    @TableField(value = "secret")
+    @ApiModelProperty(value="秘钥")
+    private String secret;
+
+    /**
+     * 回调地址url
+     */
+    @TableField(value = "backurl")
+    @ApiModelProperty(value="回调地址url")
+    private String backurl;
+
+    /**
+     * 帐号状态（0正常 1停用）
+     */
+    @TableField(value = "status")
+    @ApiModelProperty(value="帐号状态（0正常 1停用）")
+    private String status;
+
+    @TableField(value = "remark")
+    @ApiModelProperty(value="")
+    private String remark;
+}

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/OrderMqMessageRecord.java

@@ -0,0 +1,19 @@
+package com.bnyer.common.core.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+/**
+ * @author :WXC
+ * @Date :2023/05/18
+ * @description :订单服务本地消息表
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+@TableName(value = "order_mq_message_record")
+public class OrderMqMessageRecord extends BaseMqMessage{
+
+}

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

@@ -0,0 +1,98 @@
+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;
+
+    /**
+     * 平台(1->抖音;2->快手;3->微信)
+     */
+    @TableField(value = "`source`")
+    @ApiModelProperty(value="平台(1->抖音;2->快手;3->微信)")
+    private String source;
+
+    /**
+     * app类型(0->次元意境;1->妙鸭壁纸)
+     */
+    @TableField(value = "app_type")
+    @ApiModelProperty(value="app类型(0->次元意境;1->妙鸭壁纸)")
+    private String appType;
+
+    /**
+     * 创建时间
+     */
+    @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/PayInfo.java

@@ -0,0 +1,222 @@
+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 java.math.BigDecimal;
+import java.util.Date;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * @author :WXC
+ * @description :
+ */
+/**
+    * 付款信息表
+    */
+@ApiModel(value="com-bnyer-common-core-domain-PayPayInfo")
+@Getter
+@Setter
+@ToString
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "pay_pay_info")
+public class PayInfo extends BaseDomain {
+
+    /**
+     * 支付单号(内部生成)
+     */
+    @TableField(value = "pay_id")
+    @ApiModelProperty(value="支付单号(内部生成)")
+    private String payId;
+
+    /**
+     * 业务主订单号：关联内部业务订单表
+     */
+    @TableField(value = "order_no")
+    @ApiModelProperty(value="业务主订单号：关联内部业务订单表")
+    private String orderNo;
+
+    /**
+     * 支付状态：1000未支付;1001支付成功 ;1002支付失败
+     */
+    @TableField(value = "pay_status")
+    @ApiModelProperty(value="支付状态：1000未支付;1001支付成功 ;1002支付失败")
+    private Integer payStatus;
+
+    /**
+     * 单笔对账状态：1001 对账成功
+     */
+    @TableField(value = "single_status")
+    @ApiModelProperty(value="单笔对账状态：1001 对账成功")
+    private Integer singleStatus;
+
+    /**
+     * 单笔对账时间
+     */
+    @TableField(value = "single_time")
+    @ApiModelProperty(value="单笔对账时间")
+    private Date singleTime;
+
+
+    /**
+     * 支付类型：wxpay/alipay/kspay/dypay
+     */
+    @TableField(value = "pay_type")
+    @ApiModelProperty(value="支付类型：wxpay/alipay/kspay/dypay")
+    private String payType;
+
+    /**
+     * 支付渠道
+     */
+    @TableField(value = "pay_channel")
+    @ApiModelProperty(value="支付渠道:wxpay/alipay")
+    private String payChannel;
+
+    /**
+     * 交易类型：1--JSAPI支付（小程序appId支付）、2--Native支付、3--app支付，4--JSAPI支付（公众号appId支付）5--H5支付
+     */
+    @TableField(value = "trade_type")
+    @ApiModelProperty(value = "交易类型：1--JSAPI支付（小程序appId支付）、2--Native支付、3--app支付，4--JSAPI支付（公众号appId支付）5--H5支付")
+    private String tradeType;
+
+    /**
+     * 支付单号(第三方返回)
+     */
+    @TableField(value = "pay_no")
+    @ApiModelProperty(value="支付单号(第三方返回)")
+    private String payNo;
+
+    /**
+     * 用户侧订单号(第三方返回)
+     */
+    @TableField(value = "trade_no")
+    @ApiModelProperty(value="用户侧订单号(第三方返回)")
+    private String tradeNo;
+
+    /**
+     * appid
+     */
+    @TableField(value = "appid")
+    @ApiModelProperty(value="appid")
+    private String appid;
+
+    /**
+     * 商品标题
+     */
+    @TableField(value = "goods_subject")
+    @ApiModelProperty(value="商品标题")
+    private String goodsSubject;
+
+    /**
+     * 商品描述
+     */
+    @TableField(value = "goods_desc")
+    @ApiModelProperty(value="商品描述")
+    private String goodsDesc;
+
+    /**
+     * 支付金额，单位元
+     */
+    @TableField(value = "pay_amount")
+    @ApiModelProperty(value="支付金额，单位元")
+    private BigDecimal payAmount;
+
+    /**
+     * 支付时间
+     */
+    @TableField(value = "pay_time")
+    @ApiModelProperty(value="支付时间")
+    private Date payTime;
+
+    /**
+     * 支付场景：1.会员充值
+     */
+    @TableField(value = "scene_code")
+    @ApiModelProperty(value="支付场景：1.会员充值")
+    private Integer sceneCode;
+
+    /**
+     * 用户ip
+     */
+    @TableField(value = "ip")
+    @ApiModelProperty(value="用户ip")
+    private String ip;
+
+    /**
+     * 调用第三方下单返回
+     */
+    @TableField(value = "third_code")
+    @ApiModelProperty(value="调用第三方下单返回")
+    private String thirdCode;
+
+    /**
+     * 调用第三方下单返回
+     */
+    @TableField(value = "third_msg")
+    @ApiModelProperty(value="调用第三方下单返回")
+    private String thirdMsg;
+
+    /**
+     * 调用第三方下单返回
+     */
+    @TableField(value = "third_no")
+    @ApiModelProperty(value="调用第三方下单返回")
+    private String thirdNo;
+
+    /**
+     * 退款状态 1000 未退款  1001退款失败  1002 退款成功  1003 退款中
+     */
+    @TableField(value = "refund_status")
+    @ApiModelProperty(value="退款状态 1000 未退款  1001退款失败  1002 退款成功  1003 退款中")
+    private Integer refundStatus;
+
+    /**
+     * 退款时间
+     */
+    @TableField(value = "refund_time")
+    @ApiModelProperty(value="退款时间")
+    private Date refundTime;
+
+    /**
+     * 退款金额
+     */
+    @TableField(value = "refund_amount")
+    @ApiModelProperty(value="退款金额")
+    private BigDecimal refundAmount;
+
+    /**
+     * 退款流水号(第三方返回)
+     */
+    @TableField(value = "refund_no")
+    @ApiModelProperty(value="退款流水号(第三方返回)")
+    private String refundNo;
+
+    /**
+     * 退款接口调用code(第三方返回)
+     */
+    @TableField(value = "refund_code")
+    @ApiModelProperty(value="退款接口调用code(第三方返回)")
+    private String refundCode;
+
+    /**
+     * 退款接口调用msg(第三方返回)
+     */
+    @TableField(value = "refund_msg")
+    @ApiModelProperty(value="退款接口调用msg(第三方返回)")
+    private String refundMsg;
+
+    /**
+     * 备注
+     */
+    @TableField(value = "remark")
+    @ApiModelProperty(value="备注")
+    private String remark;
+}

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

@@ -0,0 +1,19 @@
+package com.bnyer.common.core.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+/**
+ * @author :WXC
+ * @Date :2023/05/18
+ * @description :支付服务本地消息表
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+@TableName(value = "pay_mq_message_record")
+public class PayMqMessageRecord extends BaseMqMessage{
+
+}

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="来源平台(1->抖音;2->快手;3->微信)")
+    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;
 
     /**
@@ -56,21 +56,21 @@ public class ProfitVerifyOrder implements Serializable {
      * 平台(0->抖音;1->快手)
      */
     @TableField(value = "platform")
-    @ApiModelProperty(value="平台(0->抖音;1->快手;2->微信)")
+    @ApiModelProperty(value="平台(1->抖音;2->快手;3->微信)")
     private String platform;
 
     /**
      * 应用(0->bnyer)
      */
     @TableField(value = "app_type")
-    @ApiModelProperty(value="应用(0->bnyer)")
+    @ApiModelProperty(value="app类型(0->次元意境;1->妙鸭壁纸)")
     private String appType;
 
     /**
      * 修改管理员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-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/R.java

@@ -3,6 +3,8 @@ package com.bnyer.common.core.domain;
 import java.io.Serializable;
 
 import com.bnyer.common.core.constant.Constants;
+import com.bnyer.common.core.enums.ResponseEnum;
+import com.bnyer.common.core.web.domain.AjaxResult;
 
 /**
  * 响应信息主体
@@ -65,6 +67,25 @@ public class R<T> implements Serializable
         return restResult(null, code, msg);
     }
 
+    /**
+     * 返回错误消息
+     * @param responseEnum
+     * @return
+     */
+    public static <T> R<T> fail(ResponseEnum responseEnum)
+    {
+        return restResult(null,responseEnum.getCode(), responseEnum.getMsg());
+    }
+
+    /**
+     * 构建重复提交错误消息
+     * @param time
+     * @return
+     */
+    public R<T> buildRepeatRequest(int time){
+        return restResult(null,ResponseEnum.REPEAT_REQUEST_ERROR.getCode(),time+"秒内"+ResponseEnum.REPEAT_REQUEST_ERROR.getMsg());
+    }
+
     private static <T> R<T> restResult(T data, int code, String msg)
     {
         R<T> apiResult = new R<>();
@@ -103,4 +124,9 @@ public class R<T> implements Serializable
     {
         this.data = data;
     }
+
+    public boolean isSuccess(){
+        return this.code == SUCCESS;
+    }
+
 }

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,32 +18,26 @@ 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;
 
     /**
      * 平台(0->抖音;1->快手;2->微信)
      */
     @TableField(value = "platform")
-    @ApiModelProperty(value="平台(0->抖音;1->快手;2->微信)")
+    @ApiModelProperty(value="平台(1->抖音;2->快手;3->微信)")
     private String platform;
 
     private static final long serialVersionUID = 1L;

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,32 +26,26 @@ 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;
 
     /**
      * 平台(0->抖音;1->快手;2->微信)
      */
     @TableField(value = "platform")
-    @ApiModelProperty(value="平台(0->抖音;1->快手;2->微信)")
+    @ApiModelProperty(value="平台(1->抖音;2->快手;3->微信)")
     private String platform;
 
     private static final long serialVersionUID = 1L;

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,34 @@ 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;
+
+    /**
+     * 画意值
+     */
+    @TableField(value = "gold_num")
+    @ApiModelProperty(value="画意值")
+    private Integer goldNum;
+
+    /**
+     * 意心
+     */
+    @TableField(value = "diamond_num")
+    @ApiModelProperty(value="意心")
+    private Integer diamondNum;
+
     /**
      * 头像img地址
      */
@@ -44,5 +66,12 @@ public class TiktokUser extends BaseDomain {
     @ApiModelProperty(value="头像img地址")
     private String img;
 
+    /**
+     * app类型(0->次元意境;1->妙鸭壁纸)
+     */
+    @TableField(value = "app_type")
+    @ApiModelProperty(value="app类型(0->次元意境;1->妙鸭壁纸)")
+    private String appType;
+
     private static final long serialVersionUID = 1L;
 }

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,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-UserVip")
+@Getter
+@Setter
+@ToString
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "img_user_vip")
+public class UserVip extends BaseDomain {
+
+    /**
+     * vip类型id
+     */
+    @TableField(value = "vip_type_id")
+    @ApiModelProperty(value="vip类型id")
+    private Long vipTypeId;
+
+    /**
+     * 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;
+
+    /**
+     * 是否到期自动续费(0>否;1->是)
+     */
+    @TableField(value = "is_delay")
+    @ApiModelProperty(value="是否到期自动续费(0>否;1->是)")
+    private String isDelay;
+
+    /**
+     * 有效时长单位：0天，1周，2月，3季，4年
+     */
+    @TableField(value = "valid_time_unit")
+    @ApiModelProperty(value = "有效时长单位：0天，1周，2月，3季，4年")
+    private Integer validTimeUnit;
+
+    /**
+     * 有效时长：表示几天、几周、几月、几年
+     */
+    @TableField(value = "valid_time_num")
+    @ApiModelProperty(value = "有效时长：表示几天、几周、几月、几年")
+    private Integer validTimeNum;
+
+    private static final long serialVersionUID = 1L;
+}

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

@@ -0,0 +1,87 @@
+package com.bnyer.common.core.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+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.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 = "user_id")
+    @ApiModelProperty(value="用户id")
+    private Long userId;
+
+    /**
+     * 用户手机号
+     */
+    @TableField(value = "phone")
+    @ApiModelProperty(value="用户手机号")
+    private String phone;
+
+    /**
+     * vip表id
+     */
+    @TableField(value = "vip_id")
+    @ApiModelProperty(value="vip表id")
+    private Long vipId;
+
+    /**
+     * 开始时间
+     */
+    @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;
+
+    /**
+     * 状态(0->已到期;1->已生效)
+     */
+    @TableField(value = "status")
+    @ApiModelProperty(value="状态(0->已到期;1->已生效;)")
+    private Integer status;
+
+    /**
+     * vip名称
+     */
+    @TableField(value = "vip_name")
+    @ApiModelProperty(value="vip名称")
+    private String vipName;
+
+    /**
+     * vip类型名称
+     */
+    @TableField(value = "vip_type_name")
+    @ApiModelProperty(value = "vip类型名称")
+    private String vipTypeName;
+
+    /**
+     * 用户客户端类型：10用户-抖音 20用户-快手 30用户-微信 40艺术家-微信
+     */
+    @TableField(value = "user_client_type")
+    @ApiModelProperty(value = "用户客户端类型：10用户-抖音 20用户-快手 30用户-微信 40艺术家-微信")
+    private Integer userClientType;
+
+    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-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/VipOrder.java

@@ -0,0 +1,134 @@
+package com.bnyer.common.core.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+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;
+
+/**
+ * @author :WXC
+ * @description :
+ */
+/**
+    * 会员订单表
+    */
+@ApiModel(value="com-bnyer-common-core-domain-OrderVipOrder")
+@Getter
+@Setter
+@ToString
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "order_vip_order")
+public class VipOrder extends BaseDomain {
+
+    /**
+     * 订单号
+     */
+    @TableField(value = "order_no")
+    @ApiModelProperty(value="订单号")
+    private String orderNo;
+
+    /**
+     * 用户手机号
+     */
+    @TableField(value = "phone")
+    @ApiModelProperty(value="用户手机号")
+    private String phone;
+
+    /**
+     * 用户id
+     */
+    @TableField(value = "user_id")
+    @ApiModelProperty(value="用户id")
+    private Long userId;
+
+    /**
+     * vip主键Id
+     */
+    @TableField(value = "vip_id")
+    @ApiModelProperty(value="vip主键Id")
+    private Long vipId;
+
+    /**
+     * vip编码
+     */
+    @TableField(value = "vip_code")
+    @ApiModelProperty(value="vip编码")
+    private String vipCode;
+
+    /**
+     * vip名称
+     */
+    @TableField(value = "vip_name")
+    @ApiModelProperty(value="vip名称")
+    private String vipName;
+
+    /**
+     * 支付金额，单位元
+     */
+    @TableField(value = "pay_amount")
+    @ApiModelProperty(value="支付金额，单位元")
+    private BigDecimal payAmount;
+
+    /**
+     * 是否到期自动续费(0>否;1->是)
+     */
+    @TableField(value = "is_delay")
+    @ApiModelProperty(value="是否到期自动续费(0>否;1->是)")
+    private String isDelay;
+
+    /**
+     * 时长天数
+     */
+    @TableField(value = "days")
+    @ApiModelProperty(value="时长天数")
+    private Integer days;
+
+    /**
+     * 订单状态：0未处理；1成功；2失败
+     */
+    @TableField(value = "order_status")
+    @ApiModelProperty(value="订单状态：0待付款；1已付款；2已退款；3支付超时取消；4买家取消")
+    private Integer orderStatus;
+
+    /**
+     * 支付时间
+     */
+    @TableField(value = "pay_time")
+    @ApiModelProperty(value="支付时间")
+    private Date payTime;
+
+    /**
+     * 取消时间
+     */
+    @TableField(value = "cancel_time")
+    @ApiModelProperty(value="取消时间")
+    private Date cancelTime;
+
+    /**
+     * 用户客户端类型：10用户-抖音 20用户-快手 30用户-微信 40艺术家-微信
+     */
+    @TableField(value = "user_client_type")
+    @ApiModelProperty(value = "用户客户端类型：10用户-抖音 20用户-快手 30用户-微信 40艺术家-微信")
+    private Integer userClientType;
+
+    /**
+     * vip类型名称
+     */
+    @TableField(value = "vip_type_name")
+    @ApiModelProperty(value = "vip类型名称")
+    private String vipTypeName;
+
+    /**
+     * 备注
+     */
+    @TableField(value = "remark")
+    @ApiModelProperty(value="备注")
+    private String remark;
+
+}

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

@@ -0,0 +1,30 @@
+package com.bnyer.common.core.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+@Getter
+@Setter
+@ToString
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "img_vip_type")
+public class VipType extends BaseDomain {
+
+    /**
+     * 类型编码
+     */
+    @TableField(value = "type_code")
+    @ApiModelProperty(value="类型编码")
+    private String typeCode;
+
+    /**
+     * 类型名称
+     */
+    @TableField(value = "type_name")
+    @ApiModelProperty(value="类型名称")
+    private String typeName;
+
+}

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,8 +1,6 @@
-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.bnyer.common.core.annotation.Desensitized;
 import com.bnyer.common.core.enums.SensitiveTypeEnum;
@@ -12,7 +10,7 @@ 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 +18,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,32 +29,31 @@ public class WithdrawLog extends BaseDomain {
     /**
      * 艺术家id
      */
-    @TableField(value = "creator_id")
     @ApiModelProperty(value="艺术家id")
+    @TableField(value = "creator_id")
     private Long creatorId;
 
     /**
-     * 提现金额
+     * 可提现金额
      */
     @TableField(value = "amt")
-    @ApiModelProperty(value="提现金额")
+    @ApiModelProperty(value="可提现金额")
     private BigDecimal amt;
 
     /**
-     * 银行卡(加密)
+     * 手续费
      */
-    @TableField(value = "bank_no")
-    @ApiModelProperty(value="银行卡(加密)")
-    @Desensitized(type = SensitiveTypeEnum.BANK_CARD)
-    private String bankNo;
+    @TableField(value = "fee")
+    @ApiModelProperty(value="手续费")
+    private BigDecimal fee;
 
     /**
      * 支付宝手机号(加密)
      */
-    @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,27 +1,20 @@
-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 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 +22,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 +37,34 @@ 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;
+
+    /**
+     * 画意值
+     */
+    @TableField(value = "gold_num")
+    @ApiModelProperty(value="画意值")
+    private Integer goldNum;
+
+    /**
+     * 意心
+     */
+    @TableField(value = "diamond_num")
+    @ApiModelProperty(value="意心")
+    private Integer diamondNum;
+
     /**
      * 头像img地址
      */
@@ -57,5 +72,12 @@ public class WxUser extends BaseDomain {
     @ApiModelProperty(value="头像img地址")
     private String img;
 
+    /**
+     * app类型(0->次元意境;1->妙鸭壁纸)
+     */
+    @TableField(value = "app_type")
+    @ApiModelProperty(value="app类型(0->次元意境;1->妙鸭壁纸)")
+    private String appType;
+
     private static final long serialVersionUID = 1L;
 }

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

@@ -0,0 +1,105 @@
+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 java.util.Date;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * @author :WXC
+ * @description :
+ */
+/**
+    * 微信支付配置表
+    */
+@ApiModel(value="com-bnyer-common-core-domain-PayWxpayConfig")
+@Getter
+@Setter
+@ToString
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "pay_wxpay_config")
+public class WxpayConfig extends BaseDomain {
+
+    /**
+     * 1--JSAPI支付（小程序appId支付）、2--Native支付、3--app支付，4--JSAPI支付（公众号appId支付）5--H5支付
+     */
+    @TableField(value = "trade_type")
+    @ApiModelProperty(value="1--JSAPI支付（小程序appId支付）、2--Native支付、3--app支付，4--JSAPI支付（公众号appId支付）5--H5支付")
+    private String tradeType;
+
+    /**
+     * appid
+     */
+    @TableField(value = "appid")
+    @ApiModelProperty(value="appid")
+    private String appid;
+
+    /**
+     * 商户号
+     */
+    @TableField(value = "mchid")
+    @ApiModelProperty(value="商户号")
+    private String mchid;
+
+    /**
+     * 回调地址url
+     */
+    @TableField(value = "backurl")
+    @ApiModelProperty(value="回调地址url")
+    private String backurl;
+
+    /**
+     * 密钥
+     */
+    @TableField(value = "`key`")
+    @ApiModelProperty(value="密钥")
+    private String key;
+
+    /**
+     * 接口密钥
+     */
+    @TableField(value = "api_key")
+    @ApiModelProperty(value="接口密钥")
+    private String apiKey;
+
+    /**
+     * 证书序列号值
+     */
+    @TableField(value = "cert_serial_no")
+    @ApiModelProperty(value="证书序列号值")
+    private String certSerialNo;
+
+    /**
+     * apiclient_key.pem证书文件的绝对路径或者以classpath:开头的类路径.
+     */
+    @TableField(value = "key_path")
+    @ApiModelProperty(value="apiclient_key.pem证书文件的绝对路径或者以classpath:开头的类路径.")
+    private String keyPath;
+
+    /**
+     * apiclient_cert.pem证书文件的绝对路径或者以classpath:开头的类路径.
+     */
+    @TableField(value = "cert_path")
+    @ApiModelProperty(value="apiclient_cert.pem证书文件的绝对路径或者以classpath:开头的类路径.")
+    private String certPath;
+
+    /**
+     * 帐号状态（0正常 1停用）
+     */
+    @TableField(value = "`status`")
+    @ApiModelProperty(value="帐号状态（0正常 1停用）")
+    private String status;
+
+    @TableField(value = "remark")
+    @ApiModelProperty(value="")
+    private String remark;
+}