Merge remote-tracking branch 'origin/feature-1.1' into feature-1.1-bnyer-order

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

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.*;

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;

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

@@ -1,6 +1,8 @@
 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;

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>

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

@@ -3,6 +3,7 @@ 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;
@@ -45,7 +46,8 @@ public class CreatorController
     public R<?> logout(HttpServletRequest request)
     {
         String token = SecurityUtils.getCreatorToken(request);
-        creatorTokenService.delLoginCreator(token);
+        //creatorTokenService.delLoginCreator(token);
+        CreatorAuthUtil.logoutByToken(token);
         return R.ok();
     }
 }

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

@@ -3,6 +3,7 @@ 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;
@@ -43,7 +44,8 @@ public class FhUserController
     {
         String token = SecurityUtils.getFhToken(request);
         //删除快手用户缓存
-        fUserTokenService.delLoginFhUser(token);
+        //fUserTokenService.delLoginFhUser(token);
+        FhAuthUtil.logoutByToken(token);
         return R.ok();
     }
 }

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

@@ -3,6 +3,7 @@ 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;
@@ -42,8 +43,9 @@ public class TiktokUserController
     public R<?> logout(HttpServletRequest request)
     {
         String token = SecurityUtils.getTiktokToken(request);
-        //删除快手用户缓存
+        //删除抖音用户缓存
-        tiktokUserTokenService.delLoginFhUser(token);
+        //tiktokUserTokenService.delLoginTiktokUser(token);
+        TiktokAuthUtil.logoutByToken(token);
         return R.ok();
     }
 }

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

@@ -3,6 +3,7 @@ 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;
@@ -28,13 +29,13 @@ public class WxUserController
     private WxUserLoginService wxUserLoginService;
 
     @Autowired
-    private WxUserTokenService WxUserTokenService;
+    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));
+        return R.ok(wxUserTokenService.createToken(loginWxUser));
     }
 
     @PostMapping("/wxUserLogout")
@@ -43,7 +44,8 @@ public class WxUserController
     {
         String token = SecurityUtils.getWechatToken(request);
         //删除微信用户缓存
-        WxUserTokenService.delLoginFhUser(token);
+        //WxUserTokenService.delLoginFhUser(token);
+        WechatAuthUtil.logoutByToken(token);
         return R.ok();
     }
 }

bnyer-common/bnyer-common-core/pom.xml

@@ -140,6 +140,17 @@
             <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>
     </dependencies>
 
 </project>

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

@@ -97,6 +97,11 @@ public class RedisKeyConstant {
      * 平台用户下载键
      */
     public static final String PLATFORM_USER_DOWNLOAD_KEY = "bnyer.img.user.download:";
+
+    /**
+     * 平台用户ai绘画键
+     */
+    public static final String PLATFORM_USER_AI_PAINT_KEY = "bnyer.img.user.aiPaint:";
     /**
      * 艺术家上传键
      */

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

@@ -7,7 +7,7 @@ package com.bnyer.common.core.constant;
  */
 public class SecurityConstants
 {
-    //***************************艺术家信息开始************************************
+    //***************************PC信息开始************************************
     /**
      * 用户ID字段
      */
@@ -87,6 +87,11 @@ public class SecurityConstants
      * 抖音用户openId
      */
     public static final String DETAILS_TIKTOK_OPENID = "tiktok_user_openid";
+
+    /**
+     * 登录抖音用户
+     */
+    public static final String LOGIN_TIKTOK_USER = "login_tiktok_user";
     //***************************抖音用户信息结束************************************
     //***************************微信用户信息开始************************************
 
@@ -109,6 +114,11 @@ public class SecurityConstants
      * 微信用户openId
      */
     public static final String DETAILS_WECHAT_OPENID = "wechat_user_openid";
+
+    /**
+     * 登录微信用户
+     */
+    public static final String LOGIN_WECHAT_USER = "login_wechat_user";
     //***************************微信用户信息结束************************************
     //***************************快手用户信息开始************************************
 
@@ -132,5 +142,10 @@ public class SecurityConstants
      */
     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/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,6 +81,170 @@ 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()
     {

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

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
@@ -29,8 +31,8 @@ public class AiPaint implements Serializable {
     /**
      * 主键Id
      */
-    @TableId(value = "id", type = IdType.ASSIGN_ID)
     @ApiModelProperty(value="主键Id")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
@@ -43,8 +45,8 @@ public class AiPaint implements Serializable {
     /**
      * 绘图者id
      */
-    @TableField(value = "painter_id")
     @ApiModelProperty(value="绘图者id")
+    @TableField(value = "painter_id")
     private Long painterId;
 
     /**

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

@@ -4,6 +4,8 @@ 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.*;
@@ -22,8 +24,8 @@ public class BaseDomain implements Serializable {
     /**
      * id
      */
-    @TableId(value = "id", type = IdType.ASSIGN_ID)
     @ApiModelProperty(value="id")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private Long id;
 
     /**

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

@@ -4,6 +4,8 @@ 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.*;
@@ -19,8 +21,8 @@ public class BzData {
     /**
      * 主键id
      */
-    @TableId(value = "id", type = IdType.ASSIGN_ID)
     @ApiModelProperty(value="主键id")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private Long id;
 
     /**

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

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

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

@@ -6,6 +6,8 @@ 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.*;
@@ -22,8 +24,8 @@ public class CreatorAccount extends BaseDomain {
     /**
      * 艺术家id
      */
-    @TableField(value = "creator_id")
     @ApiModelProperty(value="艺术家id")
+    @TableField(value = "creator_id")
     private Long creatorId;
 
     /**

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

@@ -4,6 +4,8 @@ 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.*;
@@ -38,8 +40,8 @@ public class CreatorProfit extends BaseDomain {
     /**
      * 艺术家id
      */
-    @TableField(value = "creator_id")
     @ApiModelProperty(value="艺术家id")
+    @TableField(value = "creator_id")
     private Long creatorId;
 
     /**
@@ -52,8 +54,8 @@ public class CreatorProfit extends BaseDomain {
     /**
      * 图片id
      */
-    @TableField(value = "img_id")
     @ApiModelProperty(value="图片id")
+    @TableField(value = "img_id")
     private Long imgId;
 
     /**
@@ -71,10 +73,10 @@ public class CreatorProfit extends BaseDomain {
     private String platform;
 
     /**
-     * 应用类型(0->节点壁纸)
+     * 应用类型(0->次元意境)
      */
     @TableField(value = "app_type")
-    @ApiModelProperty(value="应用类型(0->节点壁纸)")
+    @ApiModelProperty(value="应用类型(0->次元意境)")
     private String appType;
 
     /**

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

@@ -5,6 +5,8 @@ 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.*;
@@ -23,29 +25,29 @@ public class ImgSignRelation implements Serializable {
     /**
      * id
      */
-    @TableId(value = "id", type = IdType.ASSIGN_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-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/InviteLog.java

@@ -4,6 +4,8 @@ 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.*;
@@ -34,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/PaintCdk.java

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

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

@@ -5,6 +5,8 @@ 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.*;
@@ -24,8 +26,8 @@ public class ProductOrder implements Serializable {
     /**
      * id
      */
-    @TableId(value = "id", type = IdType.ASSIGN_ID)
     @ApiModelProperty(value="id")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private Long id;
 
     /**

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

@@ -5,6 +5,8 @@ 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.*;
@@ -32,8 +34,8 @@ public class ProfitVerifyOrder implements Serializable {
     /**
      * id
      */
-    @TableId(value = "id", type = IdType.ASSIGN_ID)
     @ApiModelProperty(value="id")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
@@ -67,8 +69,8 @@ public class ProfitVerifyOrder implements Serializable {
     /**
      * 修改管理员id
      */
-    @TableField(value = "update_admin_id")
     @ApiModelProperty(value="修改管理员id")
+    @TableField(value = "update_admin_id")
     private Long updateAdminId;
 
     /**
@@ -88,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/TiktokCollection.java

@@ -4,6 +4,8 @@ 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.*;
@@ -20,15 +22,15 @@ public class TiktokCollection extends BaseDomain {
     /**
      * 用户id
      */
-    @TableField(value = "user_id")
     @ApiModelProperty(value="用户id")
+    @TableField(value = "user_id")
     private Long userId;
 
     /**
      * 图片id
      */
-    @TableField(value = "img_id")
     @ApiModelProperty(value="图片id")
+    @TableField(value = "img_id")
     private Long imgId;
 
     /**

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

@@ -4,6 +4,8 @@ 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.*;
@@ -27,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;
 
     /**

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

@@ -4,6 +4,8 @@ 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.*;
@@ -28,15 +30,15 @@ public class TiktokLike extends BaseDomain {
     /**
      * 用户id
      */
-    @TableField(value = "user_id")
     @ApiModelProperty(value="用户id")
+    @TableField(value = "user_id")
     private Long userId;
 
     /**
      * 图片id
      */
-    @TableField(value = "img_id")
     @ApiModelProperty(value="图片id")
+    @TableField(value = "img_id")
     private Long imgId;
 
     /**

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

@@ -5,6 +5,8 @@ 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.*;
@@ -31,22 +33,22 @@ public class VerifyLog implements Serializable {
     /**
      * id
      */
-    @TableId(value = "id", type = IdType.ASSIGN_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/WithdrawLog.java

@@ -6,6 +6,8 @@ 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.*;
@@ -31,8 +33,8 @@ public class WithdrawLog extends BaseDomain {
     /**
      * 艺术家id
      */
-    @TableField(value = "creator_id")
     @ApiModelProperty(value="艺术家id")
+    @TableField(value = "creator_id")
     private Long creatorId;
 
     /**

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

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

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

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

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

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

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

@@ -5,6 +5,8 @@ import com.bnyer.common.core.domain.CreatorAccount;
 import com.bnyer.common.core.enums.SensitiveTypeEnum;
 import com.bnyer.common.core.utils.Sm4Util;
 import com.bnyer.common.core.utils.StringUtils;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

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

@@ -2,6 +2,8 @@ package com.bnyer.common.core.dto;
 
 import com.bnyer.common.core.annotation.Desensitized;
 import com.bnyer.common.core.enums.SensitiveTypeEnum;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -2,6 +2,8 @@ package com.bnyer.common.core.dto;
 
 import com.bnyer.common.core.domain.Feedback;
 import com.bnyer.common.core.utils.bean.BeanUtils;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

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

@@ -2,6 +2,8 @@ package com.bnyer.common.core.dto;
 
 import com.bnyer.common.core.domain.FhUser;
 import com.bnyer.common.core.utils.bean.BeanUtils;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

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

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

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

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

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

@@ -2,6 +2,8 @@ package com.bnyer.common.core.dto;
 
 import com.bnyer.common.core.domain.LevelInfo;
 import com.bnyer.common.core.utils.bean.BeanUtils;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

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

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

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

@@ -2,6 +2,8 @@ package com.bnyer.common.core.dto;
 
 import com.bnyer.common.core.domain.Notice;
 import com.bnyer.common.core.utils.bean.BeanUtils;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

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

@@ -0,0 +1,34 @@
+package com.bnyer.common.core.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+
+@Getter
+@Setter
+@ApiModel("使用cdk接收类")
+public class PaintCdkUseDto implements Serializable {
+
+    @NotNull(message = "兑换码不能为空！")
+    @ApiModelProperty(value="兑换码")
+    private String cdk;
+
+    @NotNull(message = "用户id不能为空！")
+    @ApiModelProperty(value="用户id")
+    private Long userId;
+
+    @NotNull(message = "平台渠道不能为空！")
+    @ApiModelProperty(value="平台(0->hub;1->抖音;2->快手;3->微信)")
+    private String source;
+
+    @NotNull(message = "应用不能为空！")
+    @ApiModelProperty(value="应用(0->次元意境)")
+    private String appType;
+}

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

@@ -2,6 +2,8 @@ package com.bnyer.common.core.dto;
 
 import com.bnyer.common.core.domain.PaintStyle;
 import com.bnyer.common.core.utils.bean.BeanUtils;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

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

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

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

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

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

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

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

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

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

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

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

@@ -2,6 +2,8 @@ package com.bnyer.common.core.dto;
 
 import com.bnyer.common.core.domain.Prompt;
 import com.bnyer.common.core.utils.bean.BeanUtils;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

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

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

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

@@ -2,6 +2,8 @@ package com.bnyer.common.core.dto;
 
 import com.bnyer.common.core.domain.Sign;
 import com.bnyer.common.core.utils.bean.BeanUtils;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

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

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

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

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

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

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

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

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

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

@@ -37,4 +37,10 @@ public class TextToImgDto implements Serializable {
     @ApiModelProperty(value="绘图者昵称")
     private String painterName;
 
+    @ApiModelProperty(value="应用")
+    private String appType;
+
+    @ApiModelProperty(value="平台")
+    private String platform;
+
 }

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

@@ -2,6 +2,8 @@ package com.bnyer.common.core.dto;
 
 import com.bnyer.common.core.domain.TiktokImg;
 import com.bnyer.common.core.utils.bean.BeanUtils;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

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

@@ -2,6 +2,8 @@ package com.bnyer.common.core.dto;
 
 import com.bnyer.common.core.domain.TiktokImg;
 import com.bnyer.common.core.utils.bean.BeanUtils;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

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

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

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

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

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

@@ -14,7 +14,7 @@ import java.io.Serializable;
 public class TiktokLoginDto implements Serializable {
 
     @NotNull(message = "code不能为空！")
-    @ApiModelProperty(value = "微信code")
+    @ApiModelProperty(value = "抖音code")
     private String code;
 
     @NotNull(message = "加密数据不能为空！")

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

@@ -2,6 +2,8 @@ package com.bnyer.common.core.dto;
 
 import com.bnyer.common.core.domain.TiktokUser;
 import com.bnyer.common.core.utils.bean.BeanUtils;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

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

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

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

@@ -2,6 +2,8 @@ package com.bnyer.common.core.dto;
 
 import com.bnyer.common.core.domain.Type;
 import com.bnyer.common.core.utils.bean.BeanUtils;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

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

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

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

@@ -2,6 +2,8 @@ package com.bnyer.common.core.dto;
 
 import com.bnyer.common.core.domain.UserVip;
 import com.bnyer.common.core.utils.StringUtils;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

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

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

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

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

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

@@ -4,6 +4,8 @@ import com.bnyer.common.core.annotation.Desensitized;
 import com.bnyer.common.core.domain.WithdrawLog;
 import com.bnyer.common.core.enums.SensitiveTypeEnum;
 import com.bnyer.common.core.utils.bean.BeanUtils;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

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

@@ -2,6 +2,8 @@ package com.bnyer.common.core.dto;
 
 import com.bnyer.common.core.domain.WxUser;
 import com.bnyer.common.core.utils.bean.BeanUtils;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

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

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

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

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

bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/utils/JwtUtils.java

@@ -155,6 +155,18 @@ public class JwtUtils
     {
         return getValue(claims, SecurityConstants.DETAILS_PHONE);
     }
+
+    /**
+     * 根据令牌获取艺术家手机号
+     *
+     * @param token 令牌
+     * @return 艺术家ID
+     */
+    public static String getCreatorPhone(String token)
+    {
+        Claims claims = parseToken(token);
+        return getValue(claims, SecurityConstants.DETAILS_PHONE);
+    }
     //***************************艺术家信息结束************************************
     //***************************抖音用户信息开始************************************
     /**
@@ -213,6 +225,18 @@ public class JwtUtils
         return getValue(claims, SecurityConstants.DETAILS_TIKTOK_OPENID);
     }
 
+    /**
+     * 根据令牌获取抖音用户openid
+     *
+     * @param token 令牌
+     * @return -
+     */
+    public static String getTiktokUserOpenid(String token)
+    {
+        Claims claims = parseToken(token);
+        return getValue(claims, SecurityConstants.DETAILS_TIKTOK_OPENID);
+    }
+
     //***************************抖音用户信息结束************************************
 
     //***************************微信用户信息开始************************************
@@ -271,6 +295,18 @@ public class JwtUtils
     {
         return getValue(claims, SecurityConstants.DETAILS_WECHAT_OPENID);
     }
+
+    /**
+     * 根据令牌获取微信用户openid
+     *
+     * @param token 令牌
+     * @return -
+     */
+    public static String getWechatUserOpenid(String token)
+    {
+        Claims claims = parseToken(token);
+        return getValue(claims, SecurityConstants.DETAILS_WECHAT_OPENID);
+    }
     //***************************微信用户信息结束************************************
 
     //***************************快手用户信息开始************************************
@@ -330,6 +366,18 @@ public class JwtUtils
         return getValue(claims, SecurityConstants.DETAILS_FH_OPENID);
     }
 
+    /**
+     * 根据令牌获取快手用户openId
+     *
+     * @param token 令牌
+     * @return -
+     */
+    public static String getFhUserOpenid(String token)
+    {
+        Claims claims = parseToken(token);
+        return getValue(claims, SecurityConstants.DETAILS_FH_OPENID);
+    }
+
     //***************************快手用户信息结束************************************
 
     /**

bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/utils/Sm4Util.java

@@ -54,4 +54,8 @@ public class Sm4Util {
         kg.init(keySize, new SecureRandom());
         return kg.generateKey().getEncoded();
     }
+
+    public static void main(String[] args) {
+        System.out.println(Sm4Util.sm4Encryption("15196354506"));
+    }
 }

bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/ConfirmProfitVo.java

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

bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/CreatorAccountVo.java

@@ -2,6 +2,8 @@ package com.bnyer.common.core.vo;
 
 import com.bnyer.common.core.annotation.Desensitized;
 import com.bnyer.common.core.enums.SensitiveTypeEnum;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/CreatorLoginVo.java

@@ -1,6 +1,8 @@
 package com.bnyer.common.core.vo;
 
 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.Getter;

bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/CreatorProfitVo.java

@@ -1,5 +1,7 @@
 package com.bnyer.common.core.vo;
 
+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;
@@ -36,7 +38,7 @@ public class CreatorProfitVo implements Serializable {
     @ApiModelProperty(value="结算平台(0->抖音;1->快手;2->微信;3->uniapp)")
     private String platform;
 
-    @ApiModelProperty(value="应用类型(0->节点壁纸)")
+    @ApiModelProperty(value="应用类型(0->次元意境)")
     private String appType;
 
     @ApiModelProperty(value="收益类型(0->广告浏览;1->邀请;2->会员)")

bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/FhUserLoginVo.java

@@ -1,6 +1,8 @@
 package com.bnyer.common.core.vo;
 
 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.Getter;

bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/TiktokUserLoginVo.java

@@ -1,6 +1,8 @@
 package com.bnyer.common.core.vo;
 
 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.Getter;

bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/WxUserLoginVo.java

@@ -1,6 +1,8 @@
 package com.bnyer.common.core.vo;
 
 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.Getter;

bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/auth/AuthLogic.java

@@ -4,6 +4,7 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 
+import com.bnyer.common.core.constant.TokenConstants;
 import com.bnyer.common.security.utils.SecurityUtils;
 import com.bnyer.system.api.model.LoginUser;
 import org.springframework.util.PatternMatchUtils;
@@ -38,6 +39,7 @@ public class AuthLogic
      */
     public void logout()
     {
+//        String token = SecurityUtils.getToken(TokenConstants.AUTHENTICATION);
         String token = SecurityUtils.getToken();
         if (token == null)
         {
@@ -69,6 +71,7 @@ public class AuthLogic
      */
     public LoginUser getLoginUser()
     {
+//        String token = SecurityUtils.getToken(TokenConstants.AUTHENTICATION);
         String token = SecurityUtils.getToken();
         if (token == null)
         {

bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/auth/CreatorAuthLogic.java

@@ -0,0 +1,66 @@
+package com.bnyer.common.security.auth;
+
+import com.bnyer.common.core.utils.SpringUtils;
+import com.bnyer.common.security.service.CreatorTokenService;
+import com.bnyer.common.security.service.TiktokUserTokenService;
+import com.bnyer.img.api.model.LoginCreator;
+import com.bnyer.img.api.model.LoginTiktokUser;
+
+/**
+ * 艺术家Token 权限验证，逻辑实现类
+ * 
+ * @author penny
+ */
+public class CreatorAuthLogic
+{
+
+    public CreatorTokenService tokenService = SpringUtils.getBean(CreatorTokenService.class);
+
+
+    /**
+     * 会话注销，根据指定Token
+     */
+    public void logoutByToken(String token)
+    {
+        tokenService.delLoginCreator(token);
+    }
+
+
+    /**
+     * 获取当前用户缓存信息, 如果未登录，则抛出异常
+     * 
+     * @param token 前端传递的认证信息
+     * @return 用户缓存信息
+     */
+    public LoginCreator getLoginUser(String token)
+    {
+        return tokenService.getLoginUser(token);
+    }
+
+    /**
+     * 验证当前用户有效期, 如果相差不足120分钟，自动刷新缓存
+     * 
+     * @param loginCreator 当前用户信息
+     */
+    public void verifyLoginUserExpire(LoginCreator loginCreator)
+    {
+        tokenService.verifyToken(loginCreator);
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}

bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/auth/CreatorAuthUtil.java

@@ -0,0 +1,45 @@
+package com.bnyer.common.security.auth;
+
+import com.bnyer.img.api.model.LoginCreator;
+
+/**
+ * 抖音Token 权限验证工具类
+ * 
+ * @author penny
+ */
+public class CreatorAuthUtil
+{
+    /**
+     * 底层的 AuthLogic 对象
+     */
+    public static CreatorAuthLogic authLogic = new CreatorAuthLogic();
+
+
+    /**
+     * 会话注销，根据指定Token
+     * 
+     * @param token 指定token
+     */
+    public static void logoutByToken(String token)
+    {
+        authLogic.logoutByToken(token);
+    }
+
+
+    /**
+     * 获取当前登录用户信息
+     */
+    public static LoginCreator getLoginUser(String token)
+    {
+        return authLogic.getLoginUser(token);
+    }
+
+    /**
+     * 验证当前用户有效期
+     */
+    public static void verifyLoginUserExpire(LoginCreator loginCreator)
+    {
+        authLogic.verifyLoginUserExpire(loginCreator);
+    }
+
+}

bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/auth/FhAuthLogic.java

@@ -0,0 +1,64 @@
+package com.bnyer.common.security.auth;
+
+import com.bnyer.common.core.utils.SpringUtils;
+import com.bnyer.common.security.service.FhUserTokenService;
+import com.bnyer.img.api.model.LoginFhUser;
+
+/**
+ * 快手Token 权限验证，逻辑实现类
+ * 
+ * @author penny
+ */
+public class FhAuthLogic
+{
+
+    public FhUserTokenService tokenService = SpringUtils.getBean(FhUserTokenService.class);
+
+
+    /**
+     * 会话注销，根据指定Token
+     */
+    public void logoutByToken(String token)
+    {
+        tokenService.delLoginFhUser(token);
+    }
+
+
+    /**
+     * 获取当前用户缓存信息, 如果未登录，则抛出异常
+     * 
+     * @param token 前端传递的认证信息
+     * @return 用户缓存信息
+     */
+    public LoginFhUser getLoginUser(String token)
+    {
+        return tokenService.getLoginUser(token);
+    }
+
+    /**
+     * 验证当前用户有效期, 如果相差不足120分钟，自动刷新缓存
+     * 
+     * @param loginFhUser 当前用户信息
+     */
+    public void verifyLoginUserExpire(LoginFhUser loginFhUser)
+    {
+        tokenService.verifyToken(loginFhUser);
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}

bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/auth/FhAuthUtil.java

@@ -0,0 +1,45 @@
+package com.bnyer.common.security.auth;
+
+import com.bnyer.img.api.model.LoginFhUser;
+
+/**
+ * 快手Token 权限验证工具类
+ * 
+ * @author penny
+ */
+public class FhAuthUtil
+{
+    /**
+     * 底层的 AuthLogic 对象
+     */
+    public static FhAuthLogic authLogic = new FhAuthLogic();
+
+
+    /**
+     * 会话注销，根据指定Token
+     * 
+     * @param token 指定token
+     */
+    public static void logoutByToken(String token)
+    {
+        authLogic.logoutByToken(token);
+    }
+
+
+    /**
+     * 获取当前登录用户信息
+     */
+    public static LoginFhUser getLoginUser(String token)
+    {
+        return authLogic.getLoginUser(token);
+    }
+
+    /**
+     * 验证当前用户有效期
+     */
+    public static void verifyLoginUserExpire(LoginFhUser loginFhUser)
+    {
+        authLogic.verifyLoginUserExpire(loginFhUser);
+    }
+
+}

bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/auth/TiktokAuthLogic.java

@@ -0,0 +1,64 @@
+package com.bnyer.common.security.auth;
+
+import com.bnyer.common.core.utils.SpringUtils;
+import com.bnyer.common.security.service.TiktokUserTokenService;
+import com.bnyer.img.api.model.LoginTiktokUser;
+
+/**
+ * 抖音Token 权限验证，逻辑实现类
+ * 
+ * @author penny
+ */
+public class TiktokAuthLogic
+{
+
+    public TiktokUserTokenService tokenService = SpringUtils.getBean(TiktokUserTokenService.class);
+
+
+    /**
+     * 会话注销，根据指定Token
+     */
+    public void logoutByToken(String token)
+    {
+        tokenService.delLoginTiktokUser(token);
+    }
+
+
+    /**
+     * 获取当前用户缓存信息, 如果未登录，则抛出异常
+     * 
+     * @param token 前端传递的认证信息
+     * @return 用户缓存信息
+     */
+    public LoginTiktokUser getLoginUser(String token)
+    {
+        return tokenService.getLoginUser(token);
+    }
+
+    /**
+     * 验证当前用户有效期, 如果相差不足120分钟，自动刷新缓存
+     * 
+     * @param loginTiktokUser 当前用户信息
+     */
+    public void verifyLoginUserExpire(LoginTiktokUser loginTiktokUser)
+    {
+        tokenService.verifyToken(loginTiktokUser);
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}

bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/auth/TiktokAuthUtil.java

@@ -0,0 +1,45 @@
+package com.bnyer.common.security.auth;
+
+import com.bnyer.img.api.model.LoginTiktokUser;
+
+/**
+ * 抖音Token 权限验证工具类
+ * 
+ * @author penny
+ */
+public class TiktokAuthUtil
+{
+    /**
+     * 底层的 AuthLogic 对象
+     */
+    public static TiktokAuthLogic authLogic = new TiktokAuthLogic();
+
+
+    /**
+     * 会话注销，根据指定Token
+     * 
+     * @param token 指定token
+     */
+    public static void logoutByToken(String token)
+    {
+        authLogic.logoutByToken(token);
+    }
+
+
+    /**
+     * 获取当前登录用户信息
+     */
+    public static LoginTiktokUser getLoginUser(String token)
+    {
+        return authLogic.getLoginUser(token);
+    }
+
+    /**
+     * 验证当前用户有效期
+     */
+    public static void verifyLoginUserExpire(LoginTiktokUser loginTiktokUser)
+    {
+        authLogic.verifyLoginUserExpire(loginTiktokUser);
+    }
+
+}

bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/auth/WechatAuthLogic.java

@@ -0,0 +1,66 @@
+package com.bnyer.common.security.auth;
+
+import com.bnyer.common.core.utils.SpringUtils;
+import com.bnyer.common.security.service.TiktokUserTokenService;
+import com.bnyer.common.security.service.WxUserTokenService;
+import com.bnyer.img.api.model.LoginTiktokUser;
+import com.bnyer.img.api.model.LoginWechatUser;
+
+/**
+ * 微信Token 权限验证，逻辑实现类
+ * 
+ * @author penny
+ */
+public class WechatAuthLogic
+{
+
+    public WxUserTokenService tokenService = SpringUtils.getBean(WxUserTokenService.class);
+
+
+    /**
+     * 会话注销，根据指定Token
+     */
+    public void logoutByToken(String token)
+    {
+        tokenService.delLoginWechatUser(token);
+    }
+
+
+    /**
+     * 获取当前用户缓存信息, 如果未登录，则抛出异常
+     * 
+     * @param token 前端传递的认证信息
+     * @return 用户缓存信息
+     */
+    public LoginWechatUser getLoginUser(String token)
+    {
+        return tokenService.getLoginUser(token);
+    }
+
+    /**
+     * 验证当前用户有效期, 如果相差不足120分钟，自动刷新缓存
+     * 
+     * @param loginWechatUser 当前用户信息
+     */
+    public void verifyLoginUserExpire(LoginWechatUser loginWechatUser)
+    {
+        tokenService.verifyToken(loginWechatUser);
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}

bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/auth/WechatAuthUtil.java

@@ -0,0 +1,45 @@
+package com.bnyer.common.security.auth;
+
+import com.bnyer.img.api.model.LoginWechatUser;
+
+/**
+ * 微信Token 权限验证工具类
+ * 
+ * @author penny
+ */
+public class WechatAuthUtil
+{
+    /**
+     * 底层的 AuthLogic 对象
+     */
+    public static WechatAuthLogic authLogic = new WechatAuthLogic();
+
+
+    /**
+     * 会话注销，根据指定Token
+     * 
+     * @param token 指定token
+     */
+    public static void logoutByToken(String token)
+    {
+        authLogic.logoutByToken(token);
+    }
+
+
+    /**
+     * 获取当前登录用户信息
+     */
+    public static LoginWechatUser getLoginUser(String token)
+    {
+        return authLogic.getLoginUser(token);
+    }
+
+    /**
+     * 验证当前用户有效期
+     */
+    public static void verifyLoginUserExpire(LoginWechatUser loginWechatUser)
+    {
+        authLogic.verifyLoginUserExpire(loginWechatUser);
+    }
+
+}

bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/interceptor/HeaderInterceptor.java

@@ -3,14 +3,21 @@ package com.bnyer.common.security.interceptor;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.alibaba.fastjson.JSON;
+import com.bnyer.common.core.constant.TokenConstants;
+import com.bnyer.common.security.auth.*;
 import com.bnyer.common.security.utils.SecurityUtils;
+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 lombok.extern.slf4j.Slf4j;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.AsyncHandlerInterceptor;
 import com.bnyer.common.core.constant.SecurityConstants;
 import com.bnyer.common.core.context.SecurityContextHolder;
 import com.bnyer.common.core.utils.ServletUtils;
 import com.bnyer.common.core.utils.StringUtils;
-import com.bnyer.common.security.auth.AuthUtil;
 import com.bnyer.system.api.model.LoginUser;
 
 /**
@@ -19,6 +26,7 @@ import com.bnyer.system.api.model.LoginUser;
  *
  * @author ruoyi
  */
+@Slf4j
 public class HeaderInterceptor implements AsyncHandlerInterceptor
 {
     @Override
@@ -29,20 +37,100 @@ public class HeaderInterceptor implements AsyncHandlerInterceptor
             return true;
         }
 
-        SecurityContextHolder.setUserId(ServletUtils.getHeader(request, SecurityConstants.DETAILS_USER_ID));
+        String pcToken = SecurityUtils.getToken(request);
-        SecurityContextHolder.setUserName(ServletUtils.getHeader(request, SecurityConstants.DETAILS_USERNAME));
+        String creatorToken = SecurityUtils.getCreatorToken(request);
-        SecurityContextHolder.setUserKey(ServletUtils.getHeader(request, SecurityConstants.USER_KEY));
+        String tiktokToken = SecurityUtils.getTiktokToken(request);
+        String fhToken = SecurityUtils.getFhToken(request);
+        String wechatToken = SecurityUtils.getWechatToken(request);
+        if(StringUtils.isNotEmpty(pcToken)){
+            SecurityContextHolder.setUserId(ServletUtils.getHeader(request, SecurityConstants.DETAILS_USER_ID));
+            SecurityContextHolder.setUserName(ServletUtils.getHeader(request, SecurityConstants.DETAILS_USERNAME));
+            SecurityContextHolder.setUserKey(ServletUtils.getHeader(request, SecurityConstants.USER_KEY));
 
-        String token = SecurityUtils.getToken();
+            LoginUser loginUser = AuthUtil.getLoginUser(pcToken);
-        if (StringUtils.isNotEmpty(token))
-        {
-            LoginUser loginUser = AuthUtil.getLoginUser(token);
             if (StringUtils.isNotNull(loginUser))
             {
                 AuthUtil.verifyLoginUserExpire(loginUser);
                 SecurityContextHolder.set(SecurityConstants.LOGIN_USER, loginUser);
             }
+        }else if(StringUtils.isNotEmpty(creatorToken)){
+            SecurityContextHolder.setCreatorId(ServletUtils.getHeader(request, SecurityConstants.DETAILS_CREATOR_ID));
+            SecurityContextHolder.setCreatorPhone(ServletUtils.getHeader(request, SecurityConstants.DETAILS_PHONE));
+            SecurityContextHolder.setCreatorKey(ServletUtils.getHeader(request, SecurityConstants.CREATOR_KEY));
+            log.info("SecurityContextHolderUserId,{}", JSON.toJSONString(SecurityContextHolder.getCreatorId()));
+            log.info("SecurityContextHolderUserKey,{}", JSON.toJSONString(SecurityContextHolder.getCreatorKey()));
+            log.info("SecurityContextHolderPhone,{}", JSON.toJSONString(SecurityContextHolder.getCreatorPhone()));
+
+            LoginCreator loginUser = CreatorAuthUtil.getLoginUser(creatorToken);
+            if (StringUtils.isNotNull(loginUser))
+            {
+                CreatorAuthUtil.verifyLoginUserExpire(loginUser);
+                SecurityContextHolder.set(SecurityConstants.LOGIN_CREATOR, loginUser);
+            }
+        }else if(StringUtils.isNotEmpty(tiktokToken)){
+            SecurityContextHolder.setTikTokUserId(ServletUtils.getHeader(request, SecurityConstants.DETAILS_TIKTOK_USER_ID));
+            SecurityContextHolder.setTikTokUserName(ServletUtils.getHeader(request, SecurityConstants.DETAILS_TIKTOK_USERNAME));
+            SecurityContextHolder.setTikTokUserKey(ServletUtils.getHeader(request, SecurityConstants.TIKTOK_USER_KEY));
+            SecurityContextHolder.setTikTokOpenId(ServletUtils.getHeader(request, SecurityConstants.DETAILS_TIKTOK_OPENID));
+            log.info("SecurityContextHolderUserId,{}", JSON.toJSONString(SecurityContextHolder.getTikTokUserId()));
+            log.info("SecurityContextHolderUserName,{}", JSON.toJSONString(SecurityContextHolder.getTikTokUserName()));
+            log.info("SecurityContextHolderUserKey,{}", JSON.toJSONString(SecurityContextHolder.getTikTokUserKey()));
+            log.info("SecurityContextHolderOpenId,{}", JSON.toJSONString(SecurityContextHolder.getTikTokOpenId()));
+
+            LoginTiktokUser loginUser = TiktokAuthUtil.getLoginUser(tiktokToken);
+            if (StringUtils.isNotNull(loginUser))
+            {
+                TiktokAuthUtil.verifyLoginUserExpire(loginUser);
+                SecurityContextHolder.set(SecurityConstants.LOGIN_TIKTOK_USER, loginUser);
+            }
+        }else if(StringUtils.isNotEmpty(fhToken)){
+            SecurityContextHolder.setFhUserId(ServletUtils.getHeader(request, SecurityConstants.DETAILS_FH_USER_ID));
+            SecurityContextHolder.setFhUserName(ServletUtils.getHeader(request, SecurityConstants.DETAILS_FH_USERNAME));
+            SecurityContextHolder.setFhUserKey(ServletUtils.getHeader(request, SecurityConstants.FH_USER_KEY));
+            SecurityContextHolder.setFhOpenId(ServletUtils.getHeader(request, SecurityConstants.DETAILS_FH_OPENID));
+            log.info("SecurityContextHolderUserId,{}", JSON.toJSONString(SecurityContextHolder.getFhUserId()));
+            log.info("SecurityContextHolderUserName,{}", JSON.toJSONString(SecurityContextHolder.getFhUserName()));
+            log.info("SecurityContextHolderUserKey,{}", JSON.toJSONString(SecurityContextHolder.getFhUserKey()));
+            log.info("SecurityContextHolderOpenId,{}", JSON.toJSONString(SecurityContextHolder.getFhOpenId()));
+
+            LoginFhUser loginUser = FhAuthUtil.getLoginUser(fhToken);
+            if (StringUtils.isNotNull(loginUser))
+            {
+                FhAuthUtil.verifyLoginUserExpire(loginUser);
+                SecurityContextHolder.set(SecurityConstants.LOGIN_FH_USER, loginUser);
+            }
+        }else if(StringUtils.isNotEmpty(wechatToken)){
+            SecurityContextHolder.setWechatUserId(ServletUtils.getHeader(request, SecurityConstants.DETAILS_WECHAT_USER_ID));
+            SecurityContextHolder.setWechatUserName(ServletUtils.getHeader(request, SecurityConstants.DETAILS_WECHAT_USERNAME));
+            SecurityContextHolder.setWechatUserKey(ServletUtils.getHeader(request, SecurityConstants.WECHAT_USER_KEY));
+            SecurityContextHolder.setWechatOpenId(ServletUtils.getHeader(request, SecurityConstants.DETAILS_WECHAT_OPENID));
+            log.info("SecurityContextHolderUserId,{}", JSON.toJSONString(SecurityContextHolder.getWechatUserId()));
+            log.info("SecurityContextHolderUserName,{}", JSON.toJSONString(SecurityContextHolder.getWechatUserName()));
+            log.info("SecurityContextHolderUserKey,{}", JSON.toJSONString(SecurityContextHolder.getWechatUserKey()));
+            log.info("SecurityContextHolderOpenId,{}", JSON.toJSONString(SecurityContextHolder.getWechatOpenId()));
+
+            LoginWechatUser loginUser = WechatAuthUtil.getLoginUser(wechatToken);
+            if (StringUtils.isNotNull(loginUser))
+            {
+                WechatAuthUtil.verifyLoginUserExpire(loginUser);
+                SecurityContextHolder.set(SecurityConstants.LOGIN_WECHAT_USER, loginUser);
+            }
         }
+
+
+
+
+
+//        String token = SecurityUtils.getToken();
+//        if (StringUtils.isNotEmpty(token))
+//        {
+//            LoginUser loginUser = AuthUtil.getLoginUser(token);
+//            if (StringUtils.isNotNull(loginUser))
+//            {
+//                AuthUtil.verifyLoginUserExpire(loginUser);
+//                SecurityContextHolder.set(SecurityConstants.LOGIN_USER, loginUser);
+//            }
+//        }
         return true;
     }