diff --git a/bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/domain/TiktokImg.java b/bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/domain/TiktokImg.java index fa287c7..6446180 100644 --- a/bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/domain/TiktokImg.java +++ b/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.*; diff --git a/bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/dto/TiktokImgMiniDto.java b/bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/dto/TiktokImgMiniDto.java index 1bceaa2..569f7c9 100644 --- a/bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/dto/TiktokImgMiniDto.java +++ b/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; diff --git a/bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/model/LoginCreator.java b/bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/model/LoginCreator.java index 014a007..d2cf2be 100644 --- a/bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/model/LoginCreator.java +++ b/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; diff --git a/bnyer-auth/pom.xml b/bnyer-auth/pom.xml index d9b1957..197b2d0 100644 --- a/bnyer-auth/pom.xml +++ b/bnyer-auth/pom.xml @@ -39,13 +39,7 @@ org.springframework.boot spring-boot-starter-web - - - - org.springframework.boot - spring-boot-starter-actuator - - + com.dimensionalnode diff --git a/bnyer-auth/src/main/java/com/bnyer/auth/controller/CreatorController.java b/bnyer-auth/src/main/java/com/bnyer/auth/controller/CreatorController.java index 0ae54c7..963296e 100644 --- a/bnyer-auth/src/main/java/com/bnyer/auth/controller/CreatorController.java +++ b/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(); } } diff --git a/bnyer-auth/src/main/java/com/bnyer/auth/controller/FhUserController.java b/bnyer-auth/src/main/java/com/bnyer/auth/controller/FhUserController.java index bee0b77..de4b691 100644 --- a/bnyer-auth/src/main/java/com/bnyer/auth/controller/FhUserController.java +++ b/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(); } } diff --git a/bnyer-auth/src/main/java/com/bnyer/auth/controller/TiktokUserController.java b/bnyer-auth/src/main/java/com/bnyer/auth/controller/TiktokUserController.java index 5e05901..f3e126a 100644 --- a/bnyer-auth/src/main/java/com/bnyer/auth/controller/TiktokUserController.java +++ b/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(); } } diff --git a/bnyer-auth/src/main/java/com/bnyer/auth/controller/WxUserController.java b/bnyer-auth/src/main/java/com/bnyer/auth/controller/WxUserController.java index 96dfecb..78e50b8 100644 --- a/bnyer-auth/src/main/java/com/bnyer/auth/controller/WxUserController.java +++ b/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(); } } diff --git a/bnyer-common/bnyer-common-core/pom.xml b/bnyer-common/bnyer-common-core/pom.xml index f475dbf..9627846 100644 --- a/bnyer-common/bnyer-common-core/pom.xml +++ b/bnyer-common/bnyer-common-core/pom.xml @@ -140,6 +140,17 @@ hutool-all + + + com.tencentcloudapi + tencentcloud-sdk-java-common + 3.1.715 + + + com.tencentcloudapi + tencentcloud-sdk-java-tmt + 3.1.715 + diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/constant/RedisKeyConstant.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/constant/RedisKeyConstant.java index e92f167..5a82994 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/constant/RedisKeyConstant.java +++ b/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:"; /** * 艺术家上传键 */ diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/constant/SecurityConstants.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/constant/SecurityConstants.java index b8e855e..0f6a84b 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/constant/SecurityConstants.java +++ b/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"; + //***************************快手用户信息结束************************************ } diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/context/SecurityContextHolder.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/context/SecurityContextHolder.java index e123cb5..609cfa7 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/context/SecurityContextHolder.java +++ b/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() { diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/AiPaint.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/AiPaint.java index c1cd4e5..9c1f801 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/AiPaint.java +++ b/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; /** diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/BaseDomain.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/BaseDomain.java index 8d16ea2..07d92c3 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/BaseDomain.java +++ b/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; /** diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/BzData.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/BzData.java index 2f50f7b..de0cba9 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/BzData.java +++ b/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; /** diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/CdkLog.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/CdkLog.java new file mode 100644 index 0000000..519fe93 --- /dev/null +++ b/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; +} \ No newline at end of file diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/CreatorAccount.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/CreatorAccount.java index b8ae073..a6fdf88 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/CreatorAccount.java +++ b/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; /** diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/CreatorProfit.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/CreatorProfit.java index 3f3b496..73f887e 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/CreatorProfit.java +++ b/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; /** diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/ImgSignRelation.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/ImgSignRelation.java index 5ee9529..e1ea0bc 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/ImgSignRelation.java +++ b/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; /** diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/InviteLog.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/InviteLog.java index c1cad45..be53037 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/InviteLog.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/PaintCdk.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/PaintCdk.java new file mode 100644 index 0000000..f5eb15f --- /dev/null +++ b/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; +} \ No newline at end of file diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/ProductOrder.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/ProductOrder.java index bbce27f..aca3379 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/ProductOrder.java +++ b/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; /** diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/ProfitVerifyOrder.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/ProfitVerifyOrder.java index 4432950..e602b7e 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/ProfitVerifyOrder.java +++ b/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; /** diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/TiktokCollection.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/TiktokCollection.java index 2bbc1a3..2f7169e 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/TiktokCollection.java +++ b/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; /** diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/TiktokImg.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/TiktokImg.java index c6fb1d8..87f9eeb 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/TiktokImg.java +++ b/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; /** diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/TiktokLike.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/TiktokLike.java index 7699ca5..19f3a65 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/TiktokLike.java +++ b/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; /** diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/VerifyLog.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/VerifyLog.java index bcca17e..e868c3c 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/VerifyLog.java +++ b/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; /** diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/WithdrawLog.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/WithdrawLog.java index 7999a55..39c0a8c 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/WithdrawLog.java +++ b/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; /** diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/BannerDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/BannerDto.java index e9caabf..6770c26 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/BannerDto.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CollectionDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CollectionDto.java index 519ef8d..f302c85 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CollectionDto.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CollectionUserDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CollectionUserDto.java index 748c84b..73c22ac 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CollectionUserDto.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorAccountDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorAccountDto.java index af11ee3..5f84bb2 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorAccountDto.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorAccountExistDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorAccountExistDto.java index 2d94453..d0bd160 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorAccountExistDto.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorHandleConfirmProfitDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorHandleConfirmProfitDto.java index 0c7dfe5..cf963f4 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorHandleConfirmProfitDto.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorImgsDetailsDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorImgsDetailsDto.java index 80ca626..3662e0b 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorImgsDetailsDto.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorInviteLogPageDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorInviteLogPageDto.java index e4b6c06..066eb65 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorInviteLogPageDto.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorProfitAdInsertDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorProfitAdInsertDto.java index 7533d12..09c3c46 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorProfitAdInsertDto.java +++ b/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不能为空!") diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorProfitInviteInsertDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorProfitInviteInsertDto.java index 47fd4a0..3174e27 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorProfitInviteInsertDto.java +++ b/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(){ diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorProfitPageDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorProfitPageDto.java index ea6459a..f38f983 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorProfitPageDto.java +++ b/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->会员)") diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorProfitUpdateDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorProfitUpdateDto.java index c69d3a8..1fb6886 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorProfitUpdateDto.java +++ b/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 = "收益类型不能为空!") diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorUpdateDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorUpdateDto.java index 6d34b69..56eed7f 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorUpdateDto.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorUploadDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorUploadDto.java index d14a351..6268436 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorUploadDto.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorWithdrawPageDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorWithdrawPageDto.java index 7288eef..9b48d67 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorWithdrawPageDto.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/FeedBackDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/FeedBackDto.java index 8c2f50d..67c3405 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/FeedBackDto.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/FhUserDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/FhUserDto.java index 025fa59..3de089a 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/FhUserDto.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/FollowDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/FollowDto.java index bf1e841..47eacbd 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/FollowDto.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ImgSignRelationPageDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ImgSignRelationPageDto.java index 5439998..2668033 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ImgSignRelationPageDto.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/LevelInfoDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/LevelInfoDto.java index c5a782e..47b3105 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/LevelInfoDto.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ModifySignDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ModifySignDto.java index 78e2b8e..65c753a 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ModifySignDto.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/NoticeDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/NoticeDto.java index 1098b3e..951d485 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/NoticeDto.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/PaintCdkUseDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/PaintCdkUseDto.java new file mode 100644 index 0000000..94b966e --- /dev/null +++ b/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; +} diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/PaintStyleDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/PaintStyleDto.java index 4cce2ae..f06e33d 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/PaintStyleDto.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProductDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProductDto.java index 9a23d87..7f4645a 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProductDto.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitInOrEndDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitInOrEndDto.java index 0e450e8..238e957 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitInOrEndDto.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitStatusDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitStatusDto.java index b2a0ef0..90a415c 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitStatusDto.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitVerifyOrderDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitVerifyOrderDto.java index c72bbac..cef89cb 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitVerifyOrderDto.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitVerifyOrderUpdateDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitVerifyOrderUpdateDto.java index d33192f..43af808 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitVerifyOrderUpdateDto.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/PromptDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/PromptDto.java index 5f98f8d..2eae8af 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/PromptDto.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SetCreatorAccountStatusDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SetCreatorAccountStatusDto.java index 13a0d59..f20c106 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SetCreatorAccountStatusDto.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignDto.java index 02548cd..5ad2bbb 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignDto.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignFrontDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignFrontDto.java index a5f8c5f..def79fd 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignFrontDto.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignImgPageDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignImgPageDto.java index 939390c..8977592 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignImgPageDto.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignTypePageDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignTypePageDto.java index b0701cf..51d6f36 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignTypePageDto.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/StatusDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/StatusDto.java index a33d010..a66e2bb 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/StatusDto.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TextToImgDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TextToImgDto.java index 1a98f7a..511c6cc 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TextToImgDto.java +++ b/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; + } diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokImgDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokImgDto.java index ade3909..cb988aa 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokImgDto.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokImgMiniDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokImgMiniDto.java index 182bcf3..217575a 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokImgMiniDto.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokImgPageDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokImgPageDto.java index 48bd4b4..7c9e74f 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokImgPageDto.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokImgTypeDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokImgTypeDto.java index 0436741..3d9c88f 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokImgTypeDto.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokLoginDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokLoginDto.java index 24cd22c..583b412 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokLoginDto.java +++ b/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 = "加密数据不能为空！") diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokUserDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokUserDto.java index dc8a683..639ff9b 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokUserDto.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokUserMiniDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokUserMiniDto.java index 96cde76..165edec 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokUserMiniDto.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TypeDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TypeDto.java index 4e499ba..f79a2bd 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TypeDto.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/UserIdDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/UserIdDto.java index 7d40a70..0a0591e 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/UserIdDto.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/UserVipDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/UserVipDto.java index 824ccf9..0e51540 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/UserVipDto.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/VerifyCreatorDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/VerifyCreatorDto.java index ec066c9..6e220e3 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/VerifyCreatorDto.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/VerifyDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/VerifyDto.java index 909f18b..6486437 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/VerifyDto.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/WithdrawDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/WithdrawDto.java index 52c3923..2338a46 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/WithdrawDto.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/WxUserDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/WxUserDto.java index 94daf0d..b7af355 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/WxUserDto.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/checkUserCanDownloadDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/checkUserCanDownloadDto.java index 612d71f..cd2e320 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/checkUserCanDownloadDto.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/checkWithdrawDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/checkWithdrawDto.java index efe0679..1ea462e 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/checkWithdrawDto.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/utils/JwtUtils.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/utils/JwtUtils.java index 5831c0b..d2122a8 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/utils/JwtUtils.java +++ b/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); + } + //***************************快手用户信息结束************************************ /** diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/utils/Sm4Util.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/utils/Sm4Util.java index baeed91..1dcf29e 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/utils/Sm4Util.java +++ b/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")); + } } diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/ConfirmProfitVo.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/ConfirmProfitVo.java index bfa8185..ef1c691 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/ConfirmProfitVo.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/CreatorAccountVo.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/CreatorAccountVo.java index 7734ebc..0e4491a 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/CreatorAccountVo.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/CreatorLoginVo.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/CreatorLoginVo.java index 1eeb3ed..4fdaadb 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/CreatorLoginVo.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/CreatorProfitVo.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/CreatorProfitVo.java index 45407b1..e48acee 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/CreatorProfitVo.java +++ b/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->会员)") diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/FhUserLoginVo.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/FhUserLoginVo.java index 3fa811b..c35dade 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/FhUserLoginVo.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/TiktokUserLoginVo.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/TiktokUserLoginVo.java index d97d940..c13f1d9 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/TiktokUserLoginVo.java +++ b/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; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/WxUserLoginVo.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/WxUserLoginVo.java index 0a5709a..c501f49 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/WxUserLoginVo.java +++ b/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; diff --git a/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/auth/AuthLogic.java b/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/auth/AuthLogic.java index c298824..1875f1e 100644 --- a/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/auth/AuthLogic.java +++ b/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) { diff --git a/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/auth/CreatorAuthLogic.java b/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/auth/CreatorAuthLogic.java new file mode 100644 index 0000000..44f50d0 --- /dev/null +++ b/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); + } + + + + + + + + + + + + + + + + + +} diff --git a/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/auth/CreatorAuthUtil.java b/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/auth/CreatorAuthUtil.java new file mode 100644 index 0000000..aa98987 --- /dev/null +++ b/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); + } + +} diff --git a/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/auth/FhAuthLogic.java b/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/auth/FhAuthLogic.java new file mode 100644 index 0000000..628ef5d --- /dev/null +++ b/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); + } + + + + + + + + + + + + + + + + + +} diff --git a/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/auth/FhAuthUtil.java b/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/auth/FhAuthUtil.java new file mode 100644 index 0000000..64490fc --- /dev/null +++ b/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); + } + +} diff --git a/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/auth/TiktokAuthLogic.java b/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/auth/TiktokAuthLogic.java new file mode 100644 index 0000000..8802d59 --- /dev/null +++ b/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); + } + + + + + + + + + + + + + + + + + +} diff --git a/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/auth/TiktokAuthUtil.java b/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/auth/TiktokAuthUtil.java new file mode 100644 index 0000000..fbfacb4 --- /dev/null +++ b/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); + } + +} diff --git a/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/auth/WechatAuthLogic.java b/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/auth/WechatAuthLogic.java new file mode 100644 index 0000000..351a475 --- /dev/null +++ b/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); + } + + + + + + + + + + + + + + + + + +} diff --git a/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/auth/WechatAuthUtil.java b/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/auth/WechatAuthUtil.java new file mode 100644 index 0000000..239cdbb --- /dev/null +++ b/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); + } + +} diff --git a/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/interceptor/HeaderInterceptor.java b/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/interceptor/HeaderInterceptor.java index 81d6a69..0711b83 100644 --- a/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/interceptor/HeaderInterceptor.java +++ b/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)); - SecurityContextHolder.setUserName(ServletUtils.getHeader(request, SecurityConstants.DETAILS_USERNAME)); - SecurityContextHolder.setUserKey(ServletUtils.getHeader(request, SecurityConstants.USER_KEY)); + String pcToken = SecurityUtils.getToken(request); + String creatorToken = SecurityUtils.getCreatorToken(request); + 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(); - if (StringUtils.isNotEmpty(token)) - { - LoginUser loginUser = AuthUtil.getLoginUser(token); + LoginUser loginUser = AuthUtil.getLoginUser(pcToken); 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; } diff --git a/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/service/CreatorTokenService.java b/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/service/CreatorTokenService.java index a24481c..0d551a2 100644 --- a/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/service/CreatorTokenService.java +++ b/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/service/CreatorTokenService.java @@ -36,6 +36,8 @@ public class CreatorTokenService private final static String ACCESS_TOKEN = RedisKeyConstant.WECHAT_CREATOR_LOGIN_KEY; + private final static Long MILLIS_MINUTE_TEN = CacheConstants.REFRESH_TIME * MILLIS_MINUTE; + /** * 创建令牌 */ @@ -71,11 +73,50 @@ public class CreatorTokenService { if (StringUtils.isNotEmpty(token)) { - String creatorKey = JwtUtils.getCreatorKey(token); + String creatorKey = JwtUtils.getCreatorPhone(token); redisService.deleteObject(getTokenKey(creatorKey)); } } + /** + * 获取用户身份信息 + * + * @return 用户信息 + */ + public LoginCreator getLoginUser(String token) + { + LoginCreator user = null; + try + { + if (StringUtils.isNotEmpty(token)) + { + // + String phone = JwtUtils.getCreatorPhone(token); + user = redisService.getCacheObject(getTokenKey(phone)); + return user; + } + } + catch (Exception e) + { + } + return user; + } + + /** + * 验证令牌有效期，相差不足120分钟，自动刷新缓存 + * + * @param loginCreator 艺术家用户 + */ + public void verifyToken(LoginCreator loginCreator) + { + long expireTime = loginCreator.getExpireTime(); + long currentTime = System.currentTimeMillis(); + if (expireTime - currentTime <= MILLIS_MINUTE_TEN) + { + refreshToken(loginCreator); + } + } + /** * 刷新令牌有效期 * @@ -86,7 +127,7 @@ public class CreatorTokenService loginCreator.setLoginTime(System.currentTimeMillis()); loginCreator.setExpireTime(loginCreator.getLoginTime() + expireTime * MILLIS_MINUTE); // 根据uuid将loginCreator缓存 - String creatorKey = getTokenKey(loginCreator.getToken()); + String creatorKey = getTokenKey(loginCreator.getCreator().getPhone()); redisService.setCacheObject(creatorKey, loginCreator, expireTime, TimeUnit.MINUTES); } diff --git a/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/service/FhUserTokenService.java b/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/service/FhUserTokenService.java index 43b4bba..e4675d6 100644 --- a/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/service/FhUserTokenService.java +++ b/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/service/FhUserTokenService.java @@ -36,6 +36,8 @@ public class FhUserTokenService private final static String ACCESS_TOKEN = RedisKeyConstant.FH_USER_LOGIN_KEY; + private final static Long MILLIS_MINUTE_TEN = CacheConstants.REFRESH_TIME * MILLIS_MINUTE; + /** * 创建令牌 */ @@ -74,11 +76,50 @@ public class FhUserTokenService { if (StringUtils.isNotEmpty(token)) { - String fhUserKey = JwtUtils.getFhUserKey(token); + String fhUserKey = JwtUtils.getFhUserOpenid(token); redisService.deleteObject(getTokenKey(fhUserKey)); } } + /** + * 获取用户身份信息 + * + * @return 用户信息 + */ + public LoginFhUser getLoginUser(String token) + { + LoginFhUser user = null; + try + { + if (StringUtils.isNotEmpty(token)) + { + // + String openId = JwtUtils.getFhUserOpenid(token); + user = redisService.getCacheObject(getTokenKey(openId)); + return user; + } + } + catch (Exception e) + { + } + return user; + } + + /** + * 验证令牌有效期，相差不足120分钟，自动刷新缓存 + * + * @param loginFhUser 快手用户 + */ + public void verifyToken(LoginFhUser loginFhUser) + { + long expireTime = loginFhUser.getExpireTime(); + long currentTime = System.currentTimeMillis(); + if (expireTime - currentTime <= MILLIS_MINUTE_TEN) + { + refreshToken(loginFhUser); + } + } + /** * 刷新令牌有效期 * @@ -89,7 +130,7 @@ public class FhUserTokenService loginFhUser.setLoginTime(System.currentTimeMillis()); loginFhUser.setExpireTime(loginFhUser.getLoginTime() + expireTime * MILLIS_MINUTE); // 根据uuid将loginFhUser缓存 - String fhUserKey = getTokenKey(loginFhUser.getToken()); + String fhUserKey = getTokenKey(loginFhUser.getFhUser().getFhCode()); redisService.setCacheObject(fhUserKey, loginFhUser, expireTime, TimeUnit.MINUTES); } diff --git a/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/service/TiktokUserTokenService.java b/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/service/TiktokUserTokenService.java index 29f2a5f..d8c6984 100644 --- a/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/service/TiktokUserTokenService.java +++ b/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/service/TiktokUserTokenService.java @@ -10,6 +10,7 @@ import com.bnyer.common.core.utils.ip.IpUtils; import com.bnyer.common.core.utils.uuid.IdUtils; import com.bnyer.common.redis.service.RedisService; import com.bnyer.img.api.model.LoginTiktokUser; +import com.bnyer.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -36,6 +37,8 @@ public class TiktokUserTokenService private final static String ACCESS_TOKEN = RedisKeyConstant.TIKTOK_USER_LOGIN_KEY; + private final static Long MILLIS_MINUTE_TEN = CacheConstants.REFRESH_TIME * MILLIS_MINUTE; + /** * 创建令牌 */ @@ -70,12 +73,51 @@ public class TiktokUserTokenService /** * 删除抖音小程序用户缓存信息 */ - public void delLoginFhUser(String token) + public void delLoginTiktokUser(String token) { if (StringUtils.isNotEmpty(token)) { - String tiktokUserKey = JwtUtils.getTiktokUserKey(token); - redisService.deleteObject(getTokenKey(tiktokUserKey)); + String tiktokUserOpenid = JwtUtils.getTiktokUserOpenid(token); + redisService.deleteObject(getTokenKey(tiktokUserOpenid)); + } + } + + /** + * 获取用户身份信息 + * + * @return 用户信息 + */ + public LoginTiktokUser getLoginUser(String token) + { + LoginTiktokUser user = null; + try + { + if (StringUtils.isNotEmpty(token)) + { + // + String openId = JwtUtils.getTiktokUserOpenid(token); + user = redisService.getCacheObject(getTokenKey(openId)); + return user; + } + } + catch (Exception e) + { + } + return user; + } + + /** + * 验证令牌有效期，相差不足120分钟，自动刷新缓存 + * + * @param loginTiktokUser 抖音用户 + */ + public void verifyToken(LoginTiktokUser loginTiktokUser) + { + long expireTime = loginTiktokUser.getExpireTime(); + long currentTime = System.currentTimeMillis(); + if (expireTime - currentTime <= MILLIS_MINUTE_TEN) + { + refreshToken(loginTiktokUser); } } @@ -89,7 +131,7 @@ public class TiktokUserTokenService loginTiktokUser.setLoginTime(System.currentTimeMillis()); loginTiktokUser.setExpireTime(loginTiktokUser.getLoginTime() + expireTime * MILLIS_MINUTE); // 根据uuid将loginTiktokUser缓存 - String tiktokUserKey = getTokenKey(loginTiktokUser.getToken()); + String tiktokUserKey = getTokenKey(loginTiktokUser.getTiktokUser().getTiktokCode()); redisService.setCacheObject(tiktokUserKey, loginTiktokUser, expireTime, TimeUnit.MINUTES); } diff --git a/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/service/WxUserTokenService.java b/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/service/WxUserTokenService.java index 8be3a60..55c270d 100644 --- a/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/service/WxUserTokenService.java +++ b/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/service/WxUserTokenService.java @@ -9,7 +9,6 @@ import com.bnyer.common.core.utils.StringUtils; import com.bnyer.common.core.utils.ip.IpUtils; import com.bnyer.common.core.utils.uuid.IdUtils; import com.bnyer.common.redis.service.RedisService; -import com.bnyer.img.api.model.LoginFhUser; import com.bnyer.img.api.model.LoginWechatUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -37,6 +36,8 @@ public class WxUserTokenService private final static String ACCESS_TOKEN = RedisKeyConstant.WECHAT_USER_LOGIN_KEY; + private final static Long MILLIS_MINUTE_TEN = CacheConstants.REFRESH_TIME * MILLIS_MINUTE; + /** * 创建令牌 */ @@ -71,12 +72,51 @@ public class WxUserTokenService /** * 删除微信小程序用户缓存信息 */ - public void delLoginFhUser(String token) + public void delLoginWechatUser(String token) { if (StringUtils.isNotEmpty(token)) { - String wxUserKey = JwtUtils.getWechatUserKey(token); - redisService.deleteObject(getTokenKey(wxUserKey)); + String openId = JwtUtils.getWechatUserOpenid(token); + redisService.deleteObject(getTokenKey(openId)); + } + } + + /** + * 获取用户身份信息 + * + * @return 用户信息 + */ + public LoginWechatUser getLoginUser(String token) + { + LoginWechatUser user = null; + try + { + if (StringUtils.isNotEmpty(token)) + { + // + String openId = JwtUtils.getWechatUserOpenid(token); + user = redisService.getCacheObject(getTokenKey(openId)); + return user; + } + } + catch (Exception e) + { + } + return user; + } + + /** + * 验证令牌有效期，相差不足120分钟，自动刷新缓存 + * + * @param loginWechatUser 微信用户 + */ + public void verifyToken(LoginWechatUser loginWechatUser) + { + long expireTime = loginWechatUser.getExpireTime(); + long currentTime = System.currentTimeMillis(); + if (expireTime - currentTime <= MILLIS_MINUTE_TEN) + { + refreshToken(loginWechatUser); } } @@ -90,8 +130,8 @@ public class WxUserTokenService loginWechatUser.setLoginTime(System.currentTimeMillis()); loginWechatUser.setExpireTime(loginWechatUser.getLoginTime() + expireTime * MILLIS_MINUTE); // 根据uuid将loginWechatUser缓存 - String fhUserKey = getTokenKey(loginWechatUser.getToken()); - redisService.setCacheObject(fhUserKey, loginWechatUser, expireTime, TimeUnit.MINUTES); + String wxUserKey = getTokenKey(loginWechatUser.getWxUser().getWxCode()); + redisService.setCacheObject(wxUserKey, loginWechatUser, expireTime, TimeUnit.MINUTES); } private String getTokenKey(String token) diff --git a/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/utils/SecurityUtils.java b/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/utils/SecurityUtils.java index 59d0686..dba38f6 100644 --- a/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/utils/SecurityUtils.java +++ b/bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/utils/SecurityUtils.java @@ -2,6 +2,10 @@ package com.bnyer.common.security.utils; import javax.servlet.http.HttpServletRequest; +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 com.bnyer.system.api.model.LoginUser; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import com.bnyer.common.core.constant.SecurityConstants; @@ -10,6 +14,8 @@ import com.bnyer.common.core.context.SecurityContextHolder; import com.bnyer.common.core.utils.ServletUtils; import com.bnyer.common.core.utils.StringUtils; +import java.util.Objects; + /** * 权限获取工具类 * @@ -17,6 +23,8 @@ import com.bnyer.common.core.utils.StringUtils; */ public class SecurityUtils { + + //***************************PC信息开始********************************************* /** * 获取用户ID */ @@ -54,7 +62,8 @@ public class SecurityUtils */ public static String getToken() { - return getToken(ServletUtils.getRequest()); + //PC + return getToken(Objects.requireNonNull(ServletUtils.getRequest())); } /** @@ -67,6 +76,41 @@ public class SecurityUtils return replaceTokenPrefix(token); } + //***************************PC信息结束************************************ + + //***************************艺术家信息开始************************************ + /** + * 获取艺术家ID + */ + public static Long getCreatorId() + { + return SecurityContextHolder.getCreatorId(); + } + + /** + * 获取艺术家手机号 + */ + public static String getCreatorPhone() + { + return SecurityContextHolder.getCreatorPhone(); + } + + /** + * 获取艺术家key + */ + public static String getCreatorKey() + { + return SecurityContextHolder.getCreatorKey(); + } + + /** + * 获取登录艺术家信息 + */ + public static LoginCreator getLoginCreator() + { + return SecurityContextHolder.get(SecurityConstants.LOGIN_CREATOR, LoginCreator.class); + } + /** * 根据request获取请求艺术家请求token */ @@ -77,14 +121,47 @@ public class SecurityUtils return replaceTokenPrefix(token); } + //***************************艺术家信息结束************************************ + + //***************************抖音用户信息开始************************************ /** - * 根据request获取微信小程序用户请求token + * 获取抖音用户ID */ - public static String getWechatToken(HttpServletRequest request) + public static Long getTikTokUserId() { - // 从header获取token标识 - String token = request.getHeader(TokenConstants.WECHAT_APP_AUTH); - return replaceTokenPrefix(token); + return SecurityContextHolder.getTikTokUserId(); + } + + /** + * 获取抖音用户名称 + */ + public static String getTikTokUserName() + { + return SecurityContextHolder.getTikTokUserName(); + } + + /** + * 获取抖音用户key + */ + public static String getTikTokUserKey() + { + return SecurityContextHolder.getTikTokUserKey(); + } + + /** + * 获取抖音用户openId + */ + public static String getTikTokOpenId() + { + return SecurityContextHolder.getTikTokOpenId(); + } + + /** + * 获取抖音登录用户信息 + */ + public static LoginTiktokUser getLoginTikTokUser() + { + return SecurityContextHolder.get(SecurityConstants.LOGIN_TIKTOK_USER, LoginTiktokUser.class); } /** @@ -97,6 +174,103 @@ public class SecurityUtils return replaceTokenPrefix(token); } + //***************************抖音用户信息结束************************************ + + + //***************************微信用户信息开始************************************ + /** + * 获取微信用户ID + */ + public static Long getWechatUserId() + { + return SecurityContextHolder.getWechatUserId(); + } + + /** + * 获取微信用户名称 + */ + public static String getWechatUserName() + { + return SecurityContextHolder.getWechatUserName(); + } + + /** + * 获取微信用户key + */ + public static String getWechatUserKey() + { + return SecurityContextHolder.getWechatUserKey(); + } + + /** + * 获取微信用户openId + */ + public static String getWechatOpenId() + { + return SecurityContextHolder.getWechatOpenId(); + } + + /** + * 获取微信登录用户信息 + */ + public static LoginWechatUser getLoginWechatUser() + { + return SecurityContextHolder.get(SecurityConstants.LOGIN_WECHAT_USER, LoginWechatUser.class); + } + + /** + * 根据request获取微信小程序用户请求token + */ + public static String getWechatToken(HttpServletRequest request) + { + // 从header获取token标识 + String token = request.getHeader(TokenConstants.WECHAT_APP_AUTH); + return replaceTokenPrefix(token); + } + + //***************************微信用户信息结束************************************ + + //***************************快手用户信息开始************************************ + /** + * 获取快手用户ID + */ + public static Long getFhUserId() + { + return SecurityContextHolder.getFhUserId(); + } + + /** + * 获取快手用户名称 + */ + public static String getFhUserName() + { + return SecurityContextHolder.getFhUserName(); + } + + /** + * 获取快手用户key + */ + public static String getFhUserKey() + { + return SecurityContextHolder.getFhUserKey(); + } + + /** + * 获取快手用户openId + */ + public static String getFhOpenId() + { + return SecurityContextHolder.getFhOpenId(); + } + + /** + * 获取快手登录用户信息 + */ + public static LoginFhUser getLoginFhUser() + { + return SecurityContextHolder.get(SecurityConstants.LOGIN_FH_USER, LoginFhUser.class); + } + /** * 根据request获取快手小程序用户请求token */ @@ -107,6 +281,8 @@ public class SecurityUtils return replaceTokenPrefix(token); } + //***************************快手用户信息结束************************************ + /** * 裁剪token前缀 */ diff --git a/bnyer-gateway/pom.xml b/bnyer-gateway/pom.xml index 9b6a19f..57c253d 100644 --- a/bnyer-gateway/pom.xml +++ b/bnyer-gateway/pom.xml @@ -52,12 +52,6 @@ sentinel-datasource-nacos - - - org.springframework.boot - spring-boot-starter-actuator - - com.github.penggle diff --git a/bnyer-gateway/src/main/java/com/bnyer/gateway/filter/AuthFilter.java b/bnyer-gateway/src/main/java/com/bnyer/gateway/filter/AuthFilter.java index b7681d9..9ae11be 100644 --- a/bnyer-gateway/src/main/java/com/bnyer/gateway/filter/AuthFilter.java +++ b/bnyer-gateway/src/main/java/com/bnyer/gateway/filter/AuthFilter.java @@ -90,20 +90,20 @@ public class AuthFilter implements GlobalFilter, Ordered { return unauthorizedResponse(exchange, "令牌已过期或验证不正确！"); } - String creatorkey = JwtUtils.getCreatorKey(claims); - boolean islogin = redisService.hasKey(getCreatorTokenKey(creatorkey)); + String creatorPhone = JwtUtils.getCreatorPhone(claims); + boolean islogin = redisService.hasKey(getCreatorTokenKey(creatorPhone)); if (!islogin) { return unauthorizedResponse(exchange, "登录状态已过期"); } String creatorId = JwtUtils.getCreatorId(claims); - String creatorPhone = JwtUtils.getCreatorPhone(claims); - if (StringUtils.isEmpty(creatorId) || StringUtils.isEmpty(creatorPhone)) + String creatorKey = JwtUtils.getCreatorKey(claims); + if (StringUtils.isEmpty(creatorId) || StringUtils.isEmpty(creatorKey)) { return unauthorizedResponse(exchange, "令牌验证失败"); } // 设置用户信息到请求 - addHeader(mutate, SecurityConstants.CREATOR_KEY, creatorkey); + addHeader(mutate, SecurityConstants.CREATOR_KEY, creatorKey); addHeader(mutate, SecurityConstants.DETAILS_CREATOR_ID, creatorId); addHeader(mutate, SecurityConstants.DETAILS_PHONE, creatorPhone); // 内部请求来源参数清除 @@ -116,21 +116,22 @@ public class AuthFilter implements GlobalFilter, Ordered { return unauthorizedResponse(exchange, "令牌已过期或验证不正确！"); } - String tikTokUserkey = JwtUtils.getTiktokUserKey(claims); - boolean islogin = redisService.hasKey(getTiktokUserTokenKey(tikTokUserkey)); - if (!islogin) + + String openId = JwtUtils.getTiktokUserOpenid(claims); + boolean isLogin = redisService.hasKey(getTiktokUserTokenKey(openId)); + if (!isLogin) { return unauthorizedResponse(exchange, "登录状态已过期"); } String tikTokUserId = JwtUtils.getTikTokUserId(claims); String tikTokUserName = JwtUtils.getTikTokUserName(claims); - String openId = JwtUtils.getTiktokUserOpenid(claims); - if (StringUtils.isEmpty(tikTokUserId) || StringUtils.isEmpty(tikTokUserName) || StringUtils.isEmpty(openId)) + String tikTokUserKey = JwtUtils.getTiktokUserKey(claims); + if (StringUtils.isEmpty(tikTokUserId) || StringUtils.isEmpty(tikTokUserName) || StringUtils.isEmpty(tikTokUserKey)) { return unauthorizedResponse(exchange, "令牌验证失败"); } // 设置用户信息到请求 - addHeader(mutate, SecurityConstants.TIKTOK_USER_KEY, tikTokUserkey); + addHeader(mutate, SecurityConstants.TIKTOK_USER_KEY, tikTokUserKey); addHeader(mutate, SecurityConstants.DETAILS_TIKTOK_USER_ID, tikTokUserId); addHeader(mutate, SecurityConstants.DETAILS_TIKTOK_USERNAME, tikTokUserName); addHeader(mutate, SecurityConstants.DETAILS_TIKTOK_OPENID, openId); @@ -144,16 +145,16 @@ public class AuthFilter implements GlobalFilter, Ordered { return unauthorizedResponse(exchange, "令牌已过期或验证不正确！"); } - String wechatUserKey = JwtUtils.getWechatUserKey(claims); - boolean isLogin = redisService.hasKey(getWechatUserTokenKey(wechatUserKey)); + String openId = JwtUtils.getWechatUserOpenid(claims); + boolean isLogin = redisService.hasKey(getWechatUserTokenKey(openId)); if (!isLogin) { return unauthorizedResponse(exchange, "登录状态已过期"); } String wechatUserId = JwtUtils.getWechatUserId(claims); String wechatUserName = JwtUtils.getWechatUserName(claims); - String openId = JwtUtils.getWechatUserOpenid(claims); - if (StringUtils.isEmpty(wechatUserId) || StringUtils.isEmpty(wechatUserName) || StringUtils.isEmpty(openId)) + String wechatUserKey = JwtUtils.getWechatUserKey(claims); + if (StringUtils.isEmpty(wechatUserId) || StringUtils.isEmpty(wechatUserName) || StringUtils.isEmpty(wechatUserKey)) { return unauthorizedResponse(exchange, "令牌验证失败"); } @@ -172,16 +173,16 @@ public class AuthFilter implements GlobalFilter, Ordered { return unauthorizedResponse(exchange, "令牌已过期或验证不正确！"); } - String fhUserKey = JwtUtils.getFhUserKey(claims); - boolean isLogin = redisService.hasKey(getFhUserTokenKey(fhUserKey)); + String openId = JwtUtils.getFhUserOpenid(claims); + boolean isLogin = redisService.hasKey(getFhUserTokenKey(openId)); if (!isLogin) { return unauthorizedResponse(exchange, "登录状态已过期"); } String fhUserId = JwtUtils.getFhUserId(claims); String fhUserName = JwtUtils.getFhUserName(claims); - String openId = JwtUtils.getFhUserOpenid(claims); - if (StringUtils.isEmpty(fhUserId) || StringUtils.isEmpty(fhUserName) || StringUtils.isEmpty(openId)) + String fhUserKey = JwtUtils.getFhUserKey(claims); + if (StringUtils.isEmpty(fhUserId) || StringUtils.isEmpty(fhUserName) || StringUtils.isEmpty(fhUserKey)) { return unauthorizedResponse(exchange, "令牌验证失败"); } diff --git a/bnyer-services/bnyer-ai/pom.xml b/bnyer-services/bnyer-ai/pom.xml index cb26171..a8ccaf1 100644 --- a/bnyer-services/bnyer-ai/pom.xml +++ b/bnyer-services/bnyer-ai/pom.xml @@ -34,12 +34,6 @@ spring-cloud-starter-alibaba-sentinel - - - org.springframework.boot - spring-boot-starter-actuator - - io.springfox diff --git a/bnyer-services/bnyer-file/pom.xml b/bnyer-services/bnyer-file/pom.xml index 335e638..b6a7a82 100644 --- a/bnyer-services/bnyer-file/pom.xml +++ b/bnyer-services/bnyer-file/pom.xml @@ -35,11 +35,6 @@ spring-cloud-starter-alibaba-sentinel - - - org.springframework.boot - spring-boot-starter-actuator - diff --git a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/config/QiniuConfig.java b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/config/QiniuConfig.java index f7104fa..77cd0d5 100644 --- a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/config/QiniuConfig.java +++ b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/config/QiniuConfig.java @@ -3,6 +3,7 @@ package com.bnyer.file.config; import lombok.Getter; import lombok.Setter; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.context.annotation.Configuration; @@ -10,6 +11,7 @@ import org.springframework.context.annotation.Configuration; @RefreshScope @Getter @Setter +@ConfigurationProperties(prefix = "qiniu") public class QiniuConfig { @Value("${qiniu.accessKey}") diff --git a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/controller/SysFileController.java b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/controller/SysFileController.java index 9fc7636..120b940 100644 --- a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/controller/SysFileController.java +++ b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/controller/SysFileController.java @@ -47,11 +47,11 @@ public class SysFileController { */ @ApiOperation(value="批量上传到七牛云") @PostMapping("/uploadBatch") - public R> uploadBatch(MultipartFile[] files) { + public R> uploadBatch(@RequestParam MultipartFile[] files,@RequestParam Integer fileType) { try { List list = new ArrayList<>(); for (MultipartFile file : files) { - String url = qiniuService.userUpload(file); + String url = qiniuService.userUpload(file,fileType); list.add(url); } // 上传并返回访问地址 @@ -70,11 +70,11 @@ public class SysFileController { */ @ApiOperation(value="批量压缩上传到七牛云") @PostMapping("/uploadBatchCompImg") - public R> compression(@RequestParam MultipartFile[] files) throws IOException { + public R> compression(@RequestParam MultipartFile[] files,@RequestParam Integer fileType) throws IOException { List list = new ArrayList<>(); for (MultipartFile file : files) { MultipartFile file1 = ImgUtil.commpressPicCycle(Long.parseLong(imgConfig.getFileSize()), Double.parseDouble(imgConfig.getAccuracy()), file); - String url = qiniuService.userUpload(file1); + String url = qiniuService.userUpload(file1,fileType); list.add(url); } diff --git a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/dto/FileUploadDto.java b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/dto/FileUploadDto.java index 746e92c..a28a36e 100644 --- a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/dto/FileUploadDto.java +++ b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/dto/FileUploadDto.java @@ -1,5 +1,7 @@ package com.bnyer.file.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; diff --git a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/enumeration/AddressEnum.java b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/enumeration/AddressEnum.java new file mode 100644 index 0000000..d8873ef --- /dev/null +++ b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/enumeration/AddressEnum.java @@ -0,0 +1,47 @@ +package com.bnyer.file.enumeration; + +import java.util.Arrays; + +/** + * @Author qyh + * @Date 2023/4/29 18:58 + * @Description + */ +public enum AddressEnum { + ICON(0,"icon/"), + HEAD(1,"head/"), + GIF(2,"gif/"), + PHONEBACK(3,"phoneBack/"), + FRIEND(4,"friend/"), + EMOJI(5,"emoji/"), + WATCH(6,"iwatch/"); + + + private Integer businessType; + private String fileAddress; + + AddressEnum(Integer businessType, String fileAddress) { + this.businessType = businessType; + this.fileAddress = fileAddress; + } + + public Integer getBusinessType() { + return businessType; + } + + public void setBusinessType(Integer businessType) { + this.businessType = businessType; + } + + public String getFileAddress() { + return fileAddress; + } + + public void setFileAddress(String fileAddress) { + this.fileAddress = fileAddress; + } + + public static AddressEnum getMessageEnum(Integer businessType) { + return Arrays.stream(AddressEnum.values()).filter(x -> x.businessType.equals(businessType)).findFirst().orElse(null); + } +} diff --git a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/IQiniuService.java b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/IQiniuService.java index 9c2e9fc..ec878de 100644 --- a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/IQiniuService.java +++ b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/IQiniuService.java @@ -5,7 +5,7 @@ import org.springframework.web.multipart.MultipartFile; import java.util.ArrayList; public interface IQiniuService { - String userUpload(MultipartFile file); + String userUpload(MultipartFile file,Integer fileType); /** * 检查图片内容是否符合规定 diff --git a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/impl/QiniuServiceImpl.java b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/impl/QiniuServiceImpl.java index 337a614..7c61323 100644 --- a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/impl/QiniuServiceImpl.java +++ b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/impl/QiniuServiceImpl.java @@ -3,6 +3,7 @@ package com.bnyer.file.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.bnyer.file.config.QiniuConfig; +import com.bnyer.file.enumeration.AddressEnum; import com.bnyer.file.service.IQiniuService; import com.bnyer.file.utils.ImgUtil; import com.bnyer.file.utils.StringUtil; @@ -22,6 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; +import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; @@ -36,20 +38,13 @@ public class QiniuServiceImpl implements IQiniuService { @Autowired private QiniuConfig qiniuConfig; - private Zone zone = new Zone.Builder(Zone.autoZone()) - .upHttp("http://upload.qiniup.com") - .upHttps("http://upload.qiniup.com") - .upBackupHttp("http://upload.qiniup.com") - .upBackupHttps("http://upload.qiniup.com") - .rsHttp("http://rs.qiniu.com") - .rsfHttp("http://rsf.qiniu.com") - .apiHttp("http://api.qiniu.com") - .iovipHttp("http://iovip.qbox.me").build(); + private Zone zone = Zone.autoZone(); + @Override - public String userUpload(MultipartFile file) { - return this.updloadFile(file); + public String userUpload(MultipartFile file,Integer fileType) { + return this.updloadFile(file,fileType); } - public String updloadFile(MultipartFile file){ + public String updloadFile(MultipartFile file,Integer fileType){ String url = null; // 获取文件的名称 String fileName = file.getOriginalFilename(); @@ -57,17 +52,19 @@ public class QiniuServiceImpl implements IQiniuService { Configuration cfg = new Configuration(zone); cfg.useHttpsDomains=false; UploadManager uploadManager = new UploadManager(cfg); - Auth auth = Auth.create(qiniuConfig.getAccessKey(), qiniuConfig.getSecretKey()); - String token = auth.uploadToken(qiniuConfig.getBucketName()); + String token = Auth.create(qiniuConfig.getAccessKey(), qiniuConfig.getSecretKey()).uploadToken(qiniuConfig.getBucketName()); // 使用工具类根据上传文件生成唯一图片名称 String imgName = StringUtil.getRandomImgName(fileName); + //根据前端传值获取上传地址 + AddressEnum addressEnum = AddressEnum.getMessageEnum(fileType); + imgName=addressEnum.getFileAddress()+imgName; if (!file.isEmpty()) { InputStream inputStream =null; try { inputStream=(InputStream) file.getInputStream(); Response response = uploadManager.put(inputStream, imgName, token,null,null); DefaultPutRet putRet = new Gson().fromJson(response.bodyString(), DefaultPutRet.class); - url=qiniuConfig.getUrl()+"/"+putRet.key; + url=qiniuConfig.getUrl()+putRet.key; //System.out.println(putRet.hash); inputStream.close(); } catch (QiniuException ex) { diff --git a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/utils/StringUtil.java b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/utils/StringUtil.java index 2ffe9bb..9db8dd7 100644 --- a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/utils/StringUtil.java +++ b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/utils/StringUtil.java @@ -156,7 +156,7 @@ public class StringUtil { // 生成UUID String uuid = UUID.randomUUID().toString().replaceAll("-", ""); // 生成上传至云服务器的路径 - String path = "code/duck/" + DateUtil.today() + "-" + uuid + suffix; + String path = DateUtil.today() + "-" + uuid + suffix; return path; } } diff --git a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/vo/TiktokImgVo.java b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/vo/TiktokImgVo.java index 9891d01..edcc87d 100644 --- a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/vo/TiktokImgVo.java +++ b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/vo/TiktokImgVo.java @@ -1,5 +1,7 @@ package com.bnyer.file.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; diff --git a/bnyer-services/bnyer-img/pom.xml b/bnyer-services/bnyer-img/pom.xml index b475382..a7ee76b 100644 --- a/bnyer-services/bnyer-img/pom.xml +++ b/bnyer-services/bnyer-img/pom.xml @@ -34,12 +34,6 @@ spring-cloud-starter-alibaba-sentinel - - - org.springframework.boot - spring-boot-starter-actuator - - io.springfox @@ -134,6 +128,7 @@ com.alipay.sdk alipay-sdk-java + diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/config/JsonConfig.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/config/JsonConfig.java new file mode 100644 index 0000000..fcb639c --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/config/JsonConfig.java @@ -0,0 +1,36 @@ +package com.bnyer.img.config; + +import com.bnyer.img.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; + } +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/config/StableDiffusionConfig.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/config/StableDiffusionConfig.java new file mode 100644 index 0000000..29f053e --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/config/StableDiffusionConfig.java @@ -0,0 +1,24 @@ +package com.bnyer.img.config; + +import lombok.Getter; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.cloud.context.config.annotation.RefreshScope; +import org.springframework.context.annotation.Configuration; + + +/** + * stable-diffusion配置类 + * @author chengkun + * @date 2022/04/27 16:40 + */ +@Configuration +@ConfigurationProperties(prefix = "sd") +@Getter +@RefreshScope +public class StableDiffusionConfig { + + @Value("${sd.txt2ImgUrl}") + public String txt2ImgUrl; + +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/config/TencentTranslateConfig.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/config/TencentTranslateConfig.java new file mode 100644 index 0000000..72f05b3 --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/config/TencentTranslateConfig.java @@ -0,0 +1,40 @@ +package com.bnyer.img.config; + +//import com.bnyer.img.handler.TokenCheckHandler; + +import lombok.Getter; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.cloud.context.config.annotation.RefreshScope; +import org.springframework.context.annotation.Configuration; + +/** + * 腾讯翻译api配置类 + * @author chengkun + * @date 2023/4/21 17:43 + */ +@Configuration +@ConfigurationProperties(prefix = "translate") +@Getter +@RefreshScope +public class TencentTranslateConfig { + + @Value("${translate.url}") + private String url; + + @Value("${translate.secretId}") + private String secretId; + + @Value("${translate.secretKey}") + private String secretKey; + + @Value("${translate.region}") + private String region; + + @Value("${translate.projectId}") + private String projectId; + + + + +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FhMiniController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FhMiniController.java index da5472c..378c584 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FhMiniController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FhMiniController.java @@ -85,6 +85,15 @@ public class FhMiniController extends BaseController { @Autowired private PromptService promptService; + @Autowired + private StableDiffusionService stableDiffusionService; + + @Autowired + private AiPaintService aiPaintService; + + @Autowired + private PaintCdkService paintCdkService; + @ApiOperation(value="查询banner列表") @GetMapping(value = "/listBanner") public AjaxResult listBanner(){ @@ -389,4 +398,32 @@ public class FhMiniController extends BaseController { public AjaxResult getPrompt(){ return AjaxResult.success(promptService.queryPromptList()); } + + @ApiOperation(value="文生图") + @PostMapping(value = "/textToImg") + public AjaxResult textToImg(@Validated @RequestBody @ApiParam("文生图对象") TextToImgDto param){ + return AjaxResult.success(stableDiffusionService.textToImg(param)); + } + + @ApiOperation(value="获取绘画者ai绘画分页") + @PostMapping(value = "/getAiPaintPage") + public TableDataInfo getAiPaintPage(@Validated @RequestBody @ApiParam("ai绘画对象") AiPaintPageDto dto){ + PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); + List aiPaintList = aiPaintService.queryPage(dto); + return getDataTable(aiPaintList); + } + + @ApiOperation(value="生成cdk") + @PostMapping(value = "/generatorCdk/{paintNum}") + public AjaxResult generatorCdk(@PathVariable int paintNum){ + paintCdkService.generatorCdk("2",paintNum); + return AjaxResult.success(); + } + + @ApiOperation(value="使用cdk") + @PostMapping(value = "/useCdk") + public AjaxResult useCdk(@Validated @RequestBody @ApiParam("ai绘画对象") PaintCdkUseDto dto){ + paintCdkService.useCdk(dto.getCdk(),dto.getSource(),dto.getUserId(),dto.getAppType()); + return AjaxResult.success(); + } } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokMiniController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokMiniController.java index a8aa41d..5bf8422 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokMiniController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokMiniController.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.bnyer.common.core.constant.TiktokConstant; import com.bnyer.common.core.domain.Feedback; +import com.bnyer.common.core.domain.PaintCdk; import com.bnyer.common.core.domain.R; import com.bnyer.common.core.dto.*; import com.bnyer.common.core.web.controller.BaseController; @@ -92,6 +93,9 @@ public class TiktokMiniController extends BaseController { @Autowired private AiPaintService aiPaintService; + @Autowired + private PaintCdkService paintCdkService; + @ApiOperation(value="查询banner列表") @GetMapping(value = "/listBanner") public AjaxResult listBanner(){ @@ -242,6 +246,13 @@ public class TiktokMiniController extends BaseController { return AjaxResult.success(tiktokUserService.checkUserCanDownload(dto.getUserId(),dto.getPlatform(),dto.getAppType())); } + @ApiOperation(value="检查某平台用户当日ai绘画次数是否超标") + @PostMapping(value = "/checkUserCanAiPaint") + public AjaxResult checkUserCanAiPaint(@Validated @RequestBody @ApiParam("检查超标对象") checkUserCanDownloadDto dto){ + log.debug("【抖音图文小程序】检查某平台用户当日ai绘画次数是否超标参数为:{}", JSON.toJSONString(dto)); + return AjaxResult.success(tiktokUserService.checkUserCanAiPaint(dto.getUserId(),dto.getPlatform(),dto.getAppType())); + } + @ApiOperation(value="新增/更新艺术家即将入账广告收益") @PostMapping(value = "/insertOrUpdatePreAdProfit") @@ -434,4 +445,18 @@ public class TiktokMiniController extends BaseController { List aiPaintList = aiPaintService.queryPage(dto); return getDataTable(aiPaintList); } + + @ApiOperation(value="生成cdk") + @PostMapping(value = "/generatorCdk/{paintNum}") + public AjaxResult generatorCdk(@PathVariable int paintNum){ + paintCdkService.generatorCdk("1",paintNum); + return AjaxResult.success(); + } + + @ApiOperation(value="使用cdk") + @PostMapping(value = "/useCdk") + public AjaxResult useCdk(@Validated @RequestBody @ApiParam("ai绘画对象") PaintCdkUseDto dto){ + paintCdkService.useCdk(dto.getCdk(),dto.getSource(),dto.getUserId(),dto.getAppType()); + return AjaxResult.success(); + } } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/CdkLogMapper.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/CdkLogMapper.java new file mode 100644 index 0000000..bf8da0a --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/CdkLogMapper.java @@ -0,0 +1,9 @@ +package com.bnyer.img.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.bnyer.common.core.domain.CdkLog; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CdkLogMapper extends BaseMapper { +} \ No newline at end of file diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/PaintCdkMapper.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/PaintCdkMapper.java new file mode 100644 index 0000000..16ca7d4 --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/PaintCdkMapper.java @@ -0,0 +1,9 @@ +package com.bnyer.img.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.bnyer.common.core.domain.PaintCdk; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface PaintCdkMapper extends BaseMapper { +} \ No newline at end of file diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TiktokImgMapper.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TiktokImgMapper.java index f680e46..fb6d0fd 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TiktokImgMapper.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TiktokImgMapper.java @@ -98,12 +98,12 @@ public interface TiktokImgMapper extends BaseMapper { * @param creatorId 艺术家Id * @return - */ - int queryLikeNum(@Param("creatorId") Long creatorId); + Integer queryLikeNum(@Param("creatorId") Long creatorId); /** * 获取收藏数量 * @param creatorId 艺术家Id * @return - */ - int queryCollectNum(@Param("creatorId") Long creatorId); + Integer queryCollectNum(@Param("creatorId") Long creatorId); } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/serializer/LongToStringSerializer.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/serializer/LongToStringSerializer.java new file mode 100644 index 0000000..3710950 --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/serializer/LongToStringSerializer.java @@ -0,0 +1,24 @@ +package com.bnyer.img.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 { + 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()); + } + } + } +} \ No newline at end of file diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/PaintCdkService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/PaintCdkService.java new file mode 100644 index 0000000..18c9e97 --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/PaintCdkService.java @@ -0,0 +1,30 @@ +package com.bnyer.img.service; + +import com.bnyer.common.core.domain.PaintCdk; + +public interface PaintCdkService { + + /** + * 生成不同平台的cdk + * @param source 平台 + * @param paintNum 兑换次数 + */ + void generatorCdk(String source,int paintNum); + + /** + * 根据平台检查cdk是否使用 + * @param cdk 兑换码 + * @param source 平台 + * @return - + */ + PaintCdk checkCdk(String cdk, String source); + + /** + * 兑换cdk + * @param cdk 兑换码 + * @param source 平台 + * @param userId 用户id + * @param appType 应用 + */ + void useCdk(String cdk,String source,Long userId,String appType); +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/StableDiffusionService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/StableDiffusionService.java index 6b386b6..5b9cec4 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/StableDiffusionService.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/StableDiffusionService.java @@ -6,7 +6,21 @@ import com.bnyer.common.core.vo.TextToImgVo; public interface StableDiffusionService { + /** + * 文生图 + * @param param + * @return + */ TextToImgVo textToImg(TextToImgDto param); void imgToImg(); + + /** + * 增加ai绘画次数 + * @param appType 应用 + * @param platform 平台 + * @param userId 用户id + * @param paintNUm 绘画次数 + */ + void addPlatformUserAiPaintNum(String appType,String platform,Long userId,int paintNUm); } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TiktokUserService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TiktokUserService.java index 3cd9d52..4fa054a 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TiktokUserService.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TiktokUserService.java @@ -22,6 +22,15 @@ public interface TiktokUserService { */ boolean checkUserCanDownload(Long userId,String platform,String appType); + /** + * 检查某平台用户当日ai绘画次数是否超标 + * @param userId 用户id + * @param platform 平台 + * @param appType 应用 + * @return - + */ + boolean checkUserCanAiPaint(Long userId,String platform,String appType); + /** * 获取抖音小程序用户 * @param dto 登录参数 diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorServiceImpl.java index b090674..1e0e56d 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorServiceImpl.java @@ -224,13 +224,22 @@ public class CreatorServiceImpl implements CreatorService { String fanKey = RedisKeyConstant.CREATOR_FANS_NUM_KEY; if(redisService.hasHashKey(fanKey,String.valueOf(creatorId))){ Integer fanNum = (Integer) redisService.getCacheMapValue(fanKey, String.valueOf(creatorId)); + if(fanNum == null){ + fanNum = 0; + } result.setFansNum(fanNum); } //从数据库获取喜欢量 - int likeNum = tiktokImgMapper.queryLikeNum(creatorId); + Integer likeNum = tiktokImgMapper.queryLikeNum(creatorId); + if(likeNum == null){ + likeNum = 0; + } result.setLikeNum(likeNum); //从改数据库获取收藏量 - int collectNum = tiktokImgMapper.queryCollectNum(creatorId); + Integer collectNum = tiktokImgMapper.queryCollectNum(creatorId); + if(collectNum == null){ + collectNum = 0; + } result.setCollectNum(collectNum); return result; } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/PaintCdkServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/PaintCdkServiceImpl.java new file mode 100644 index 0000000..920b61f --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/PaintCdkServiceImpl.java @@ -0,0 +1,83 @@ +package com.bnyer.img.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.bnyer.common.core.domain.CdkLog; +import com.bnyer.common.core.domain.PaintCdk; +import com.bnyer.common.core.exception.ServiceException; +import com.bnyer.common.core.utils.uuid.IdUtils; +import com.bnyer.img.mapper.CdkLogMapper; +import com.bnyer.img.mapper.PaintCdkMapper; +import com.bnyer.img.service.PaintCdkService; +import com.bnyer.img.service.StableDiffusionService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; + +@Service +@Slf4j +public class PaintCdkServiceImpl implements PaintCdkService { + + @Autowired + private PaintCdkMapper paintCdkMapper; + + @Autowired + private CdkLogMapper cdkLogMapper; + + @Autowired + private StableDiffusionService stableDiffusionService; + + @Override + @Transactional(rollbackFor = Exception.class) + public void generatorCdk(String source,int paintNum) { + for (int i = 0; i < 50; i++) { + String cdk = IdUtils.fastSimpleUUID().toUpperCase(); + PaintCdk paintCdk = new PaintCdk(); + paintCdk.setCreateTime(new Date()); + paintCdk.setPaintNum(paintNum); + paintCdk.setIsShow("1"); + paintCdk.setIsUse("0"); + paintCdk.setSort(0); + paintCdk.setUpdateTime(new Date()); + paintCdk.setSource(source); + paintCdk.setCdk(cdk); + paintCdkMapper.insert(paintCdk); + } + } + + @Override + public PaintCdk checkCdk(String cdk, String source) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PaintCdk::getSource, source); + wrapper.eq(PaintCdk::getCdk, cdk); + wrapper.eq(PaintCdk::getIsUse, "0"); + return paintCdkMapper.selectOne(wrapper); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void useCdk(String cdk, String source,Long userId,String appType) { + //检查cdk是否被使用过 + PaintCdk paintCdk = checkCdk(cdk, source); + if(paintCdk == null){ + throw new ServiceException("该兑换码不存在或已被使用!"); + }else{ + //增加用户绘画次数 + stableDiffusionService.addPlatformUserAiPaintNum(appType,source,userId,paintCdk.getPaintNum()); + //修改cdk状态 + paintCdk.setIsUse("1"); + paintCdkMapper.updateById(paintCdk); + //写入使用记录 + CdkLog cdkLog = new CdkLog(); + cdkLog.setCreateTime(new Date()); + cdkLog.setPaintNum(paintCdk.getPaintNum()); + cdkLog.setSource(source); + cdkLog.setIsShow("1"); + cdkLog.setCdk(cdk); + cdkLog.setUserId(userId); + cdkLogMapper.insert(cdkLog); + } + } +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/StableDiffusionServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/StableDiffusionServiceImpl.java index a69129d..fc2fbb3 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/StableDiffusionServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/StableDiffusionServiceImpl.java @@ -3,23 +3,32 @@ package com.bnyer.img.service.impl; import cn.hutool.core.util.IdUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.bnyer.common.core.constant.RedisKeyConstant; import com.bnyer.common.core.domain.AiPaint; -import com.bnyer.common.core.domain.R; import com.bnyer.common.core.dto.TextToImgDto; import com.bnyer.common.core.utils.TranslateUtils; import com.bnyer.common.core.utils.file.Base64ToMultipartFileUtils; -import com.bnyer.common.core.utils.file.ImageUtils; import com.bnyer.common.core.vo.TextToImgVo; +import com.bnyer.common.redis.service.RedisService; import com.bnyer.file.api.RemoteFileService; +import com.bnyer.img.config.StableDiffusionConfig; +import com.bnyer.img.config.TencentTranslateConfig; import com.bnyer.img.service.AiPaintService; import com.bnyer.img.service.StableDiffusionService; -import com.bnyer.system.api.RemoteSystemFileService; +import com.tencentcloudapi.common.Credential; +import com.tencentcloudapi.common.exception.TencentCloudSDKException; +import com.tencentcloudapi.common.profile.ClientProfile; +import com.tencentcloudapi.common.profile.HttpProfile; +import com.tencentcloudapi.tmt.v20180321.TmtClient; +import com.tencentcloudapi.tmt.v20180321.models.TextTranslateRequest; +import com.tencentcloudapi.tmt.v20180321.models.TextTranslateResponse; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.client.RestTemplate; import org.springframework.web.multipart.MultipartFile; +import java.text.SimpleDateFormat; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -38,25 +47,61 @@ public class StableDiffusionServiceImpl implements StableDiffusionService { @Autowired private RemoteFileService remoteFileService; + @Autowired + private RedisService redisService; + + @Autowired + private TencentTranslateConfig tencentTranslateConfig; + + @Autowired + private StableDiffusionConfig stableDiffusionConfig; + + private String translate(String text){ + try{ + Credential cred = new Credential(tencentTranslateConfig.getSecretId(), tencentTranslateConfig.getSecretKey()); + // 实例化一个http选项，可选的，没有特殊需求可以跳过 + HttpProfile httpProfile = new HttpProfile(); + httpProfile.setEndpoint(tencentTranslateConfig.getUrl()); + // 实例化一个client选项，可选的，没有特殊需求可以跳过 + ClientProfile clientProfile = new ClientProfile(); + clientProfile.setHttpProfile(httpProfile); + // 实例化要请求产品的client对象,clientProfile是可选的 + TmtClient client = new TmtClient(cred, tencentTranslateConfig.getRegion(), clientProfile); + // 实例化一个请求对象,每个接口都会对应一个request对象 + TextTranslateRequest req = new TextTranslateRequest(); + req.setSourceText(text); + req.setSource("zh"); + req.setTarget("en"); + req.setProjectId(Long.parseLong(tencentTranslateConfig.getProjectId())); + // 返回的resp是一个TextTranslateResponse的实例，与请求对象对应 + TextTranslateResponse resp = client.TextTranslate(req); + log.info("翻译后的文本为：【{}】",JSON.toJSONString(resp.getTargetText())); + return resp.getTargetText(); + } catch (TencentCloudSDKException e) { + log.error("调用腾讯api失败"+e.toString()); + } + return ""; + } + @Override public TextToImgVo textToImg(TextToImgDto param) { try{ - //String prompt = ""; + String prompt = ""; //判断prompt是否包含中文,中文则翻译，否则跳过 -// if(TranslateUtils.isContainChinese(param.getPrompt())){ -// //调用翻译api -// //prompt = -// prompt = param.getPrompt(); -// }else{ -// prompt = param.getPrompt(); -// } + if(TranslateUtils.isContainChinese(param.getPrompt())){ + //调用翻译api + prompt = translate(param.getPrompt()); + }else{ + prompt = param.getPrompt(); + } + System.out.println(prompt); //TODO 根据选择的风格来选择模型 Map map = new HashMap<>(); map.put("width",param.getWidth() == null ? 512 : param.getWidth()); map.put("height",param.getHeight() == null ? 512 : param.getHeight()); - //map.put("prompt", prompt); - map.put("prompt", param.getPrompt()); + map.put("prompt", prompt); + //map.put("prompt", param.getPrompt()); map.put("seed",-1); map.put("batch_size",1); map.put("cfg_scale",7); @@ -66,10 +111,10 @@ public class StableDiffusionServiceImpl implements StableDiffusionService { map.put("sampler_index","DPM++ 2S a Karras"); //map.put("sampler_index",param.getSamplerIndex()); map.put("steps",25); - map.put("negative_prompt","nsfw"); - log.info("请求stable_diffusion请求体为:【{}】", JSON.toJSONString(map)); - JSONObject jsonObject = restTemplate.postForObject("http://localhost:7860/sdapi/v1/txt2img", map, JSONObject.class); - log.info("请求stable_diffusion响应体的为:【{}】", JSON.toJSONString(jsonObject)); + map.put("negative_prompt","easynegative"); + //log.info("请求stable_diffusion请求体为:【{}】", JSON.toJSONString(map)); + JSONObject jsonObject = restTemplate.postForObject(stableDiffusionConfig.getTxt2ImgUrl(), map, JSONObject.class); + //log.info("请求stable_diffusion响应体的为:【{}】", JSON.toJSONString(jsonObject)); TextToImgVo img = new TextToImgVo(); if(jsonObject != null && jsonObject.getJSONArray("images").size() > 0){ List images = jsonObject.getJSONArray("images").toJavaList(String.class); @@ -95,10 +140,12 @@ public class StableDiffusionServiceImpl implements StableDiffusionService { paint.setHeight(param.getHeight() == null ? "512" : String.valueOf(param.getHeight())); paint.setWidth(param.getWidth() == null ? "512" : String.valueOf(param.getWidth())); paint.setIsShow("1"); - paint.setSource("1"); + paint.setSource(param.getPlatform()); paint.setPainterId(param.getPainterId()); paint.setPainterName(param.getPainterName()); aiPaintService.insert(paint); + //写入ai绘画次数 + writePlatformUserAiPaintNum(param.getAppType(),param.getPlatform(),param.getPainterId()); } img.setPaintId(paintId); img.setPaintTime(paintTime); @@ -110,8 +157,33 @@ public class StableDiffusionServiceImpl implements StableDiffusionService { return null; } + /** + * 写入ai绘画次数 + * @param appType 应用 + * @param platform 平台 + * @param userId 用户id + */ + private void writePlatformUserAiPaintNum(String appType,String platform,Long userId){ + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); + String date = df.format(new Date()); + String hashKey = appType+":"+platform+":"+userId; + log.info("日期【{}】应用【{}】平台【{}】用户【{}】ai绘画数+1",date,appType,platform,userId); + String redisKey = RedisKeyConstant.PLATFORM_USER_AI_PAINT_KEY + date; + redisService.hashIncr(redisKey, hashKey, 1); + } + @Override public void imgToImg() { } + + @Override + public void addPlatformUserAiPaintNum(String appType, String platform, Long userId, int patinNum) { + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); + String date = df.format(new Date()); + String hashKey = appType+":"+platform+":"+userId; + log.info("日期【{}】应用【{}】平台【{}】用户【{}】ai绘画次数+【{}】",date,appType,platform,userId,patinNum); + String redisKey = RedisKeyConstant.PLATFORM_USER_AI_PAINT_KEY + date; + redisService.hashIncr(redisKey, hashKey, -patinNum); + } } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokUserServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokUserServiceImpl.java index 972bce9..818ea16 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokUserServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokUserServiceImpl.java @@ -177,6 +177,26 @@ public class TiktokUserServiceImpl implements TiktokUserService { } } + @Override + public boolean checkUserCanAiPaint(Long userId, String platform, String appType) { + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); + String date = df.format(new Date()); + String hashKey = appType+":"+platform+":"+userId; + String redisKey = RedisKeyConstant.PLATFORM_USER_AI_PAINT_KEY + date; + if(redisService.hasHashKey(redisKey,hashKey)){ + //存在键，判断次数，次数达标则不可ai绘画 + Integer aiPaintNum = redisService.getCacheMapValue(redisKey, hashKey); + if(aiPaintNum >= 3){ + return true; + }else{ + return false; + } + }else{ + //不存在键则可绘画 + return false; + } + } + @Override public R getTiktokLoginUserByLoginParam(TiktokLoginDto dto) { TiktokSessionInfoVo sessionInfo = this.getSessionInfo(dto.getCode()); diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/AiPaintVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/AiPaintVo.java index fe21d96..0262bff 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/AiPaintVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/AiPaintVo.java @@ -1,6 +1,8 @@ package com.bnyer.img.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; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/BannerVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/BannerVo.java index 2b65260..3140bb2 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/BannerVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/BannerVo.java @@ -1,5 +1,7 @@ package com.bnyer.img.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; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorDetailsVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorDetailsVo.java index 54f4972..3d5083b 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorDetailsVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorDetailsVo.java @@ -1,5 +1,7 @@ package com.bnyer.img.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; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorFansLikeVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorFansLikeVo.java index f34d676..14bccb1 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorFansLikeVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorFansLikeVo.java @@ -14,13 +14,13 @@ import java.io.Serializable; public class CreatorFansLikeVo implements Serializable { @ApiModelProperty(value="粉丝量") - private int fansNum; + private Integer fansNum; @ApiModelProperty(value="喜欢量") - private int likeNum; + private Integer likeNum; @ApiModelProperty(value="收藏量") - private int collectNum; + private Integer collectNum; private static final long serialVersionUID = 1L; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorFollowVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorFollowVo.java index d7e563b..167624d 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorFollowVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorFollowVo.java @@ -1,5 +1,7 @@ package com.bnyer.img.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; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorHotVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorHotVo.java index ecadd9e..1a361a5 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorHotVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorHotVo.java @@ -1,5 +1,7 @@ package com.bnyer.img.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; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorProfitEndAmtVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorProfitEndAmtVo.java index 78b9937..3b9ad2a 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorProfitEndAmtVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorProfitEndAmtVo.java @@ -1,6 +1,8 @@ package com.bnyer.img.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; @@ -40,7 +42,7 @@ public class CreatorProfitEndAmtVo 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->会员)") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorProfitInAmtVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorProfitInAmtVo.java index fede08b..81d3ff7 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorProfitInAmtVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorProfitInAmtVo.java @@ -1,6 +1,8 @@ package com.bnyer.img.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; @@ -40,7 +42,7 @@ public class CreatorProfitInAmtVo 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->会员)") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorProfitPreVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorProfitPreVo.java index 5878ed0..5910059 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorProfitPreVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorProfitPreVo.java @@ -1,6 +1,8 @@ package com.bnyer.img.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; @@ -33,7 +35,7 @@ public class CreatorProfitPreVo 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->会员)") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgBackVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgBackVo.java index eac3108..9c2165f 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgBackVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgBackVo.java @@ -1,5 +1,7 @@ package com.bnyer.img.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; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgEmoVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgEmoVo.java index 8f44739..21e0ccb 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgEmoVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgEmoVo.java @@ -1,5 +1,7 @@ package com.bnyer.img.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; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgFriendVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgFriendVo.java index e0c317c..a44461b 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgFriendVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgFriendVo.java @@ -1,5 +1,7 @@ package com.bnyer.img.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; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgGifVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgGifVo.java index ae01b20..958b12b 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgGifVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgGifVo.java @@ -1,5 +1,7 @@ package com.bnyer.img.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; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgHeadVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgHeadVo.java index ba6d96e..7a38fb7 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgHeadVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgHeadVo.java @@ -1,5 +1,7 @@ package com.bnyer.img.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; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgWatchVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgWatchVo.java index 7659a90..fe1d0d9 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgWatchVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgWatchVo.java @@ -1,5 +1,7 @@ package com.bnyer.img.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; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeVo.java index 3d5e103..5736598 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeVo.java @@ -1,5 +1,7 @@ package com.bnyer.img.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; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorVo.java index f7d172f..0bf8546 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorVo.java @@ -1,5 +1,7 @@ package com.bnyer.img.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; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/ImgSignVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/ImgSignVo.java index 0a510da..c20fc41 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/ImgSignVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/ImgSignVo.java @@ -1,5 +1,7 @@ package com.bnyer.img.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; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/InviteLogVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/InviteLogVo.java index b7331df..2e77acc 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/InviteLogVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/InviteLogVo.java @@ -1,6 +1,8 @@ package com.bnyer.img.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; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/NoticeVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/NoticeVo.java index 557be5d..35c325c 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/NoticeVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/NoticeVo.java @@ -1,6 +1,8 @@ package com.bnyer.img.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; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/PaintStyleVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/PaintStyleVo.java index 2a6612e..0583063 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/PaintStyleVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/PaintStyleVo.java @@ -1,5 +1,7 @@ package com.bnyer.img.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; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/ProductVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/ProductVo.java index 42e93f9..4501a9f 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/ProductVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/ProductVo.java @@ -1,5 +1,7 @@ package com.bnyer.img.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; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/PromptVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/PromptVo.java index b738fd8..00e385f 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/PromptVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/PromptVo.java @@ -1,5 +1,7 @@ package com.bnyer.img.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; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/SignImgVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/SignImgVo.java index de8f0bf..8a5dacc 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/SignImgVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/SignImgVo.java @@ -1,5 +1,7 @@ package com.bnyer.img.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; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/SignRelationVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/SignRelationVo.java index 62635b4..a3d8d6a 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/SignRelationVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/SignRelationVo.java @@ -1,5 +1,7 @@ package com.bnyer.img.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; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/SignVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/SignVo.java index 36205ff..dd7dc39 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/SignVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/SignVo.java @@ -1,5 +1,7 @@ package com.bnyer.img.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; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TiktokCollectionVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TiktokCollectionVo.java index fa04176..336b87b 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TiktokCollectionVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TiktokCollectionVo.java @@ -1,5 +1,7 @@ package com.bnyer.img.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; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TiktokImgVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TiktokImgVo.java index 8595e99..3750d56 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TiktokImgVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TiktokImgVo.java @@ -1,5 +1,7 @@ package com.bnyer.img.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; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TiktokUserVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TiktokUserVo.java index bbb721a..54cde47 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TiktokUserVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TiktokUserVo.java @@ -1,5 +1,7 @@ package com.bnyer.img.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; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TypeVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TypeVo.java index 9c84389..c0781ec 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TypeVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TypeVo.java @@ -1,5 +1,9 @@ package com.bnyer.img.vo; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +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; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/UserVipVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/UserVipVo.java index 638b2d4..b247082 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/UserVipVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/UserVipVo.java @@ -1,6 +1,5 @@ package com.bnyer.img.vo; -import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/VerifyLogVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/VerifyLogVo.java index 59b0f3e..735b5b5 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/VerifyLogVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/VerifyLogVo.java @@ -1,5 +1,7 @@ package com.bnyer.img.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; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/WithdrawLogVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/WithdrawLogVo.java index 9298250..0a02f95 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/WithdrawLogVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/WithdrawLogVo.java @@ -3,6 +3,8 @@ package com.bnyer.img.vo; import com.bnyer.common.core.annotation.Desensitized; import com.bnyer.common.core.enums.SensitiveTypeEnum; 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; @@ -18,7 +20,7 @@ import java.math.BigDecimal; public class WithdrawLogVo implements Serializable { @ApiModelProperty(value="主键id") - private Integer id; + private Long id; @ApiModelProperty(value="流水号") private String orderId; diff --git a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CdkLogMapper.xml b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CdkLogMapper.xml new file mode 100644 index 0000000..5685480 --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CdkLogMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + id, cdk, user_id, `source`, is_show, create_time,paint_num + + \ No newline at end of file diff --git a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorProfitMapper.xml b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorProfitMapper.xml index c4d5722..4ba4479 100644 --- a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorProfitMapper.xml +++ b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorProfitMapper.xml @@ -62,6 +62,7 @@ from img_creator_profit icp left join img_tiktok_img iti on iti.id = icp.img_id where icp.is_show = '1' and icp.creator_id = #{creatorId} and icp.status = '0' and icp.type = #{type} + order by icp.create_time desc - + update img_creator diff --git a/bnyer-visual/bnyer-monitor/pom.xml b/bnyer-visual/bnyer-monitor/pom.xml deleted file mode 100644 index 68f4d45..0000000 --- a/bnyer-visual/bnyer-monitor/pom.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - com.dimensionalnode - bnyer-visual - 1.0.0 - - 4.0.0 - - bnyer-visual-monitor - - - bnyer-visual-monitor监控中心 - - - - - - - de.codecentric - spring-boot-admin-starter-server - ${spring-boot-admin.version} - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-sentinel - - - - - org.springframework.boot - spring-boot-starter-web - - - - - org.springframework.boot - spring-boot-starter-security - - - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - 2.6.2 - - - - repackage - - - - - - - - \ No newline at end of file diff --git a/bnyer-visual/bnyer-monitor/src/main/java/com/bnyer/modules/monitor/BnyerMonitorApplication.java b/bnyer-visual/bnyer-monitor/src/main/java/com/bnyer/modules/monitor/BnyerMonitorApplication.java deleted file mode 100644 index 01582ad..0000000 --- a/bnyer-visual/bnyer-monitor/src/main/java/com/bnyer/modules/monitor/BnyerMonitorApplication.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.bnyer.modules.monitor; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import de.codecentric.boot.admin.server.config.EnableAdminServer; - -/** - * 监控中心 - * - * @author ruoyi - */ -@EnableAdminServer -@SpringBootApplication -public class BnyerMonitorApplication -{ - public static void main(String[] args) - { - SpringApplication.run(BnyerMonitorApplication.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ bnyer监控服务启动成功 ლ(´ڡ`ლ)ﾞ \n" + - "__________ \n" + - "\\______ \\ ____ ___.__. ___________ \n" + - " | | _// < | |/ __ \\_ __ \\\n" + - " | | \\ | \\___ \\ ___/| | \\/\n" + - " |______ /___| / ____|\\___ >__| \n" + - " \\/ \\/\\/ \\/ \n"); - } -} diff --git a/bnyer-visual/bnyer-monitor/src/main/java/com/bnyer/modules/monitor/config/WebSecurityConfigurer.java b/bnyer-visual/bnyer-monitor/src/main/java/com/bnyer/modules/monitor/config/WebSecurityConfigurer.java deleted file mode 100644 index 7559805..0000000 --- a/bnyer-visual/bnyer-monitor/src/main/java/com/bnyer/modules/monitor/config/WebSecurityConfigurer.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.bnyer.modules.monitor.config; - -import de.codecentric.boot.admin.server.config.AdminServerProperties; -import org.springframework.context.annotation.Configuration; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; -import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler; - -/** - * 监控权限配置 - * - * @author ruoyi - */ -@Configuration -public class WebSecurityConfigurer extends WebSecurityConfigurerAdapter -{ - private final String adminContextPath; - - public WebSecurityConfigurer(AdminServerProperties adminServerProperties) - { - this.adminContextPath = adminServerProperties.getContextPath(); - } - - @Override - protected void configure(HttpSecurity http) throws Exception - { - SavedRequestAwareAuthenticationSuccessHandler successHandler = new SavedRequestAwareAuthenticationSuccessHandler(); - successHandler.setTargetUrlParameter("redirectTo"); - successHandler.setDefaultTargetUrl(adminContextPath + "/"); - - http - .headers().frameOptions().disable() - .and().authorizeRequests() - .antMatchers(adminContextPath + "/assets/**" - , adminContextPath + "/login" - , adminContextPath + "/actuator/**" - , adminContextPath + "/instances/**" - ).permitAll() - .anyRequest().authenticated() - .and() - .formLogin().loginPage(adminContextPath + "/login") - .successHandler(successHandler).and() - .logout().logoutUrl(adminContextPath + "/logout") - .and() - .httpBasic().and() - .csrf() - .disable(); - } -} diff --git a/bnyer-visual/bnyer-monitor/src/main/resources/bootstrap-dev.yml b/bnyer-visual/bnyer-monitor/src/main/resources/bootstrap-dev.yml deleted file mode 100644 index 6d55152..0000000 --- a/bnyer-visual/bnyer-monitor/src/main/resources/bootstrap-dev.yml +++ /dev/null @@ -1,22 +0,0 @@ -spring: - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: http://117.50.61.7:8848 - # 命名空间地址 - namespace: c4f53d8c-0a91-4249-a804-f16f543ec3b0 - # 命名空间分组 - group: dev - config: - # 配置中心地址 - server-addr: http://117.50.61.7:8848 - # 配置文件格式 - file-extension: yml - # 命名空间地址 - namespace: c4f53d8c-0a91-4249-a804-f16f543ec3b0 - # 命名空间分组 - group: dev - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/bnyer-visual/bnyer-monitor/src/main/resources/bootstrap-grey.yml b/bnyer-visual/bnyer-monitor/src/main/resources/bootstrap-grey.yml deleted file mode 100644 index 4ec59f5..0000000 --- a/bnyer-visual/bnyer-monitor/src/main/resources/bootstrap-grey.yml +++ /dev/null @@ -1,22 +0,0 @@ -spring: - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: http://175.24.122.142:6231 - # 命名空间地址 - namespace: abfe8ee6-161b-4f8f-b61f-51663bbfa4f9 - # 命名空间分组 - group: grey - config: - # 配置中心地址 - server-addr: http://175.24.122.142:6231 - # 配置文件格式 - file-extension: yml - # 命名空间地址 - namespace: abfe8ee6-161b-4f8f-b61f-51663bbfa4f9 - # 命名空间分组 - group: grey - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/bnyer-visual/bnyer-monitor/src/main/resources/bootstrap-prod.yml b/bnyer-visual/bnyer-monitor/src/main/resources/bootstrap-prod.yml deleted file mode 100644 index d8c9f80..0000000 --- a/bnyer-visual/bnyer-monitor/src/main/resources/bootstrap-prod.yml +++ /dev/null @@ -1,22 +0,0 @@ -spring: - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: http://175.24.122.142:8848 - # 命名空间地址 - namespace: 604df951-ada5-481f-a0be-9fd9b97a7f4d - # 命名空间分组 - group: prod - config: - # 配置中心地址 - server-addr: http://175.24.122.142:8848 - # 配置文件格式 - file-extension: yml - # 命名空间地址 - namespace: 604df951-ada5-481f-a0be-9fd9b97a7f4d - # 命名空间分组 - group: prod - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/bnyer-visual/bnyer-monitor/src/main/resources/bootstrap-test.yml b/bnyer-visual/bnyer-monitor/src/main/resources/bootstrap-test.yml deleted file mode 100644 index e3d566c..0000000 --- a/bnyer-visual/bnyer-monitor/src/main/resources/bootstrap-test.yml +++ /dev/null @@ -1,22 +0,0 @@ -spring: - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: #http://117.50.61.7:8848 - # 命名空间地址 - namespace: #1bf94455-a046-41e3-b7e4-c12fd11c3690 - # 命名空间分组 - group: test - config: - # 配置中心地址 - server-addr: #http://117.50.61.7:8848 - # 配置文件格式 - file-extension: yml - # 命名空间地址 - namespace: #1bf94455-a046-41e3-b7e4-c12fd11c3690 - # 命名空间分组 - group: test - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/bnyer-visual/bnyer-monitor/src/main/resources/bootstrap.yml b/bnyer-visual/bnyer-monitor/src/main/resources/bootstrap.yml deleted file mode 100644 index e93323c..0000000 --- a/bnyer-visual/bnyer-monitor/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,15 +0,0 @@ -# Tomcat -server: - port: 7012 - -# Spring -spring: - main: - #解决循环依赖问题 - allow-circular-references: true - application: - # 应用名称 - name: bnyer-monitor - profiles: - # 环境配置 - active: dev diff --git a/bnyer-visual/bnyer-monitor/src/main/resources/logback.xml b/bnyer-visual/bnyer-monitor/src/main/resources/logback.xml deleted file mode 100644 index 455be94..0000000 --- a/bnyer-visual/bnyer-monitor/src/main/resources/logback.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - ${log.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 20 - - - ${log.pattern} - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 20 - - - ${log.pattern} - - - - ERROR - - ACCEPT - - DENY - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/bnyer-visual/pom.xml b/bnyer-visual/pom.xml deleted file mode 100644 index c53c8b1..0000000 --- a/bnyer-visual/pom.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - com.dimensionalnode - bnyer - 1.0.0 - - 4.0.0 - - - bnyer-monitor - - - bnyer-visual - pom - - - bnyer-visual图形化管理模块 - - - diff --git a/pom.xml b/pom.xml index ffd0524..7b9dce0 100644 --- a/pom.xml +++ b/pom.xml @@ -301,7 +301,6 @@ bnyer-auth bnyer-gateway - bnyer-visual bnyer-services bnyer-api bnyer-common