From 707450ee21ce9ddcbdfe6efa42c78881276283c1 Mon Sep 17 00:00:00 2001 From: bigsun <407919070@qq.com> Date: Fri, 19 Apr 2024 17:13:03 +0800 Subject: [PATCH 1/6] =?UTF-8?q?1.=E8=A7=A3=E5=86=B3=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8Ftoken=E6=8B=A6=E6=88=AA=E5=99=A8=E4=B8=ADAuthClient?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98=202.=E8=A7=A3?= =?UTF-8?q?=E5=86=B3=E7=94=9F=E6=88=90=E4=BA=8C=E7=BB=B4=E7=A0=81=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98=203.=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E7=94=9F=E6=88=90=E4=BA=8C=E7=BB=B4=E7=A0=81=E7=BC=BA=E5=B0=91?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/query/CreateQrCodeQuery.java | 43 +++++++++++++++---- .../dyj/common/config/DyConfiguration.java | 12 ++++++ .../interceptor/ClientTokenInterceptor.java | 4 +- .../com/dyj/common/utils/DyConfigUtils.java | 5 ++- .../dyj/spring/DyConfigurationRegister.java | 6 +++ .../properties/DyConfigurationProperties.java | 14 ++++++ 6 files changed, 72 insertions(+), 12 deletions(-) diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/query/CreateQrCodeQuery.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/query/CreateQrCodeQuery.java index c5d1751..f24b636 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/query/CreateQrCodeQuery.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/query/CreateQrCodeQuery.java @@ -9,7 +9,15 @@ import com.dyj.common.domain.query.BaseQuery; **/ public class CreateQrCodeQuery extends BaseQuery { - private String app_id; + public String getAppid() { + return appid; + } + + public void setAppid(String appid) { + this.appid = appid; + } + + private String appid; private String app_name; @@ -22,13 +30,11 @@ public class CreateQrCodeQuery extends BaseQuery { private ColorRGB line_color; private ColorRGB background; - public String getApp_id() { - return app_id; - } - public void setApp_id(String app_id) { - this.app_id = app_id; - } + /** + * 是否是圆形二维码 + */ + private Boolean is_circle_code; public String getApp_name() { return app_name; @@ -78,6 +84,15 @@ public class CreateQrCodeQuery extends BaseQuery { this.background = background; } + + public Boolean getIs_circle_code() { + return is_circle_code; + } + + public void setIs_circle_code(Boolean is_circle_code) { + this.is_circle_code = is_circle_code; + } + public static CreateQrCodeQueryBuilder builder() { return new CreateQrCodeQueryBuilder(); } @@ -94,6 +109,11 @@ public class CreateQrCodeQuery extends BaseQuery { private Integer tenantId; private String clientKey; + /** + * 是否是圆形二维码 + */ + private Boolean is_circle_code; + public CreateQrCodeQueryBuilder appId(String appId) { this.appId = appId; return this; @@ -139,9 +159,15 @@ public class CreateQrCodeQuery extends BaseQuery { return this; } + public CreateQrCodeQueryBuilder is_circle_code(Boolean isCircleCode) { + this.is_circle_code = isCircleCode; + return this; + } + + public CreateQrCodeQuery build() { CreateQrCodeQuery createQrCodeQuery = new CreateQrCodeQuery(); - createQrCodeQuery.setApp_id(appId); + createQrCodeQuery.setAppid(appId); createQrCodeQuery.setApp_name(appName); createQrCodeQuery.setPath(path); createQrCodeQuery.setWidth(width); @@ -150,6 +176,7 @@ public class CreateQrCodeQuery extends BaseQuery { createQrCodeQuery.setBackground(background); createQrCodeQuery.setTenantId(tenantId); createQrCodeQuery.setClientKey(clientKey); + createQrCodeQuery.setIs_circle_code(is_circle_code); return createQrCodeQuery; } } diff --git a/dy-java-common/src/main/java/com/dyj/common/config/DyConfiguration.java b/dy-java-common/src/main/java/com/dyj/common/config/DyConfiguration.java index 6422603..e626208 100644 --- a/dy-java-common/src/main/java/com/dyj/common/config/DyConfiguration.java +++ b/dy-java-common/src/main/java/com/dyj/common/config/DyConfiguration.java @@ -1,5 +1,6 @@ package com.dyj.common.config; +import com.dyj.common.client.AuthClient; import com.dyj.common.service.IAgentConfigService; import com.dyj.common.service.IAgentTokenService; import com.dyj.common.service.impl.PropertiesAgentConfigServiceImpl; @@ -34,6 +35,17 @@ public class DyConfiguration implements Serializable { private IAgentTokenService agentTokenService; + public AuthClient getAuthClient() { + return authClient; + } + + public void setAuthClient(AuthClient authClient) { + this.authClient = authClient; + } + + private AuthClient authClient; + + public DyConfiguration() { } diff --git a/dy-java-common/src/main/java/com/dyj/common/interceptor/ClientTokenInterceptor.java b/dy-java-common/src/main/java/com/dyj/common/interceptor/ClientTokenInterceptor.java index cc4ade2..6a2dedc 100644 --- a/dy-java-common/src/main/java/com/dyj/common/interceptor/ClientTokenInterceptor.java +++ b/dy-java-common/src/main/java/com/dyj/common/interceptor/ClientTokenInterceptor.java @@ -23,8 +23,6 @@ import java.util.Objects; public class ClientTokenInterceptor implements Interceptor { private final Log log = LogFactory.getLog(ClientTokenInterceptor.class); - @Resource - private AuthClient authClient; @Override public boolean beforeExecute(ForestRequest request) { @@ -46,7 +44,7 @@ public class ClientTokenInterceptor implements Interceptor { ClientTokenQuery clientTokenQuery = new ClientTokenQuery(); clientTokenQuery.setClient_key(agent.getClientKey()); clientTokenQuery.setClient_secret(agent.getClientSecret()); - ClientTokenVo clientToken = authClient.getClientToken(clientTokenQuery).getData(); + ClientTokenVo clientToken = DyConfigUtils.getAuthClient().getClientToken(clientTokenQuery).getData(); if (Objects.nonNull(clientToken) && clientToken.getError_code() == 0) { clientTokenInfo = agentTokenService.setClientTokenInfo(tenantId, clientKey, clientToken.getAccess_token(), clientToken.getExpires_in()); } diff --git a/dy-java-common/src/main/java/com/dyj/common/utils/DyConfigUtils.java b/dy-java-common/src/main/java/com/dyj/common/utils/DyConfigUtils.java index e1e704c..67d6ec6 100644 --- a/dy-java-common/src/main/java/com/dyj/common/utils/DyConfigUtils.java +++ b/dy-java-common/src/main/java/com/dyj/common/utils/DyConfigUtils.java @@ -1,5 +1,6 @@ package com.dyj.common.utils; +import com.dyj.common.client.AuthClient; import com.dyj.common.config.AgentConfiguration; import com.dyj.common.config.DyConfiguration; import com.dyj.common.handler.RequestHandler; @@ -41,5 +42,7 @@ public class DyConfigUtils { public static Integer getDefaultTenantId() { return RequestHandler.getInstance().getDyConfiguration().getDefaultId(); } - + public static AuthClient getAuthClient() { + return RequestHandler.getInstance().getDyConfiguration().getAuthClient(); + } } diff --git a/dy-java-spring/src/main/java/com/dyj/spring/DyConfigurationRegister.java b/dy-java-spring/src/main/java/com/dyj/spring/DyConfigurationRegister.java index 8a17457..3918812 100644 --- a/dy-java-spring/src/main/java/com/dyj/spring/DyConfigurationRegister.java +++ b/dy-java-spring/src/main/java/com/dyj/spring/DyConfigurationRegister.java @@ -1,6 +1,7 @@ package com.dyj.spring; import com.dtflys.forest.config.ForestConfiguration; +import com.dyj.common.client.AuthClient; import com.dyj.common.config.DyConfiguration; import com.dyj.common.enums.DyAppletUrlPathEnum; import com.dyj.common.enums.DyWebUrlPathEnum; @@ -71,6 +72,11 @@ public class DyConfigurationRegister implements ResourceLoaderAware, BeanPostPro IAgentTokenService agentTokenService = applicationContext.getBean("dyTokenService", IAgentTokenService.class); configuration.setAgentTokenService(agentTokenService); } + String authClientClass = dyConfigurationProperties.getAuthClientClass(); + if (StringUtils.hasLength(authClientClass)) { + AuthClient authClient = applicationContext.getBean("authClient", AuthClient.class); + configuration.setAuthClient(authClient); + } //configuration.setInterceptorFactory(DyInterceptorFactory); RequestHandler.getInstance().setDyConfiguration(configuration); } diff --git a/dy-java-spring/src/main/java/com/dyj/spring/properties/DyConfigurationProperties.java b/dy-java-spring/src/main/java/com/dyj/spring/properties/DyConfigurationProperties.java index 90b04cd..cfd9ffb 100644 --- a/dy-java-spring/src/main/java/com/dyj/spring/properties/DyConfigurationProperties.java +++ b/dy-java-spring/src/main/java/com/dyj/spring/properties/DyConfigurationProperties.java @@ -58,6 +58,20 @@ public class DyConfigurationProperties { */ private String tokenSourceClass = "com.dyj.common.service.impl.CacheAgentTokenServiceImpl"; + + public String getAuthClientClass() { + return authClientClass; + } + + public void setAuthClientClass(String authClientClass) { + this.authClientClass = authClientClass; + } + + /** + * token配置类 + */ + private String authClientClass = "com.dyj.common.client.AuthClient"; + public String getBeanId() { return beanId; } -- Gitee From fc5cf616d2aafc660a28761d45726509cd42813e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9D=99=E6=B0=B4=E6=B7=B1=E6=B5=81?= <409467+LinkWeChat_admin@user.noreply.gitee.com> Date: Tue, 23 Apr 2024 06:11:22 +0000 Subject: [PATCH 2/6] update README.md. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 静水深流 <409467+LinkWeChat_admin@user.noreply.gitee.com> --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index a1a9ca8..4fb968a 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ ![输入图片说明](Logo.png) +【📣最近通知】还有什么想要产品/技术上友好的建议或意见，欢迎大家提issues~一经采纳，将纳入开源贡献者名单。 + #### 一、介绍 DyJava是一款功能强大的抖音Java开发工具包，支持多种抖音开发功能模块的后端开发，包括但不限于移动/网站应用、开放平台、抖店和小程序等。DyJava致力于简化开发流程，提高开发效率，让开发者能够更专注于创新和业务逻辑的实现。 -- Gitee From 024c1659eeeb3403f9ba2645913264f152669609 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9D=99=E6=B0=B4=E6=B7=B1=E6=B5=81?= <409467+LinkWeChat_admin@user.noreply.gitee.com> Date: Tue, 23 Apr 2024 06:14:48 +0000 Subject: [PATCH 3/6] update README.md. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 静水深流 <409467+LinkWeChat_admin@user.noreply.gitee.com> --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4fb968a..66fa6a0 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ![输入图片说明](Logo.png) -【📣最近通知】还有什么想要产品/技术上友好的建议或意见，欢迎大家提issues~一经采纳，将纳入开源贡献者名单。 +【📣最近通知】征集抖音开放接口测试（最好是可以带“代用户发布”接口），欢迎大家提issues~一经采纳，将纳入开源贡献者名单。 #### 一、介绍 DyJava是一款功能强大的抖音Java开发工具包，支持多种抖音开发功能模块的后端开发，包括但不限于移动/网站应用、开放平台、抖店和小程序等。DyJava致力于简化开发流程，提高开发效率，让开发者能够更专注于创新和业务逻辑的实现。 -- Gitee From 27fdef5dfe0d74760fe9f920d5499ebfad5dc358 Mon Sep 17 00:00:00 2001 From: bigsun <407919070@qq.com> Date: Tue, 23 Apr 2024 17:50:26 +0800 Subject: [PATCH 4/6] =?UTF-8?q?1.=E8=A7=A3=E5=86=B3=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E4=BD=BF=E7=94=A8forest=E9=85=8D=E7=BD=AE=E6=97=B6=E9=83=A8?= =?UTF-8?q?=E5=88=86=E5=8F=82=E6=95=B0=E6=9C=AA=E6=B3=A8=E5=86=8C=E6=88=90?= =?UTF-8?q?=E5=8A=9F=E7=9A=84=E9=97=AE=E9=A2=98=202.=E4=BF=AE=E6=94=B9clie?= =?UTF-8?q?ntToken=E6=8B=A6=E6=88=AA=E5=99=A8=E7=9A=84=E6=B3=9B=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../interceptor/ClientTokenInterceptor.java | 3 +- .../dyj/spring/DyConfigurationRegister.java | 32 +++++++++++-------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/dy-java-common/src/main/java/com/dyj/common/interceptor/ClientTokenInterceptor.java b/dy-java-common/src/main/java/com/dyj/common/interceptor/ClientTokenInterceptor.java index 0b6ec9e..ea788a2 100644 --- a/dy-java-common/src/main/java/com/dyj/common/interceptor/ClientTokenInterceptor.java +++ b/dy-java-common/src/main/java/com/dyj/common/interceptor/ClientTokenInterceptor.java @@ -9,6 +9,7 @@ import com.dyj.common.client.AuthClient; import com.dyj.common.config.AgentConfiguration; import com.dyj.common.domain.ClientTokenInfo; import com.dyj.common.domain.DyResult; +import com.dyj.common.domain.DySimpleResult; import com.dyj.common.domain.query.BaseQuery; import com.dyj.common.domain.query.ClientTokenQuery; import com.dyj.common.domain.vo.ClientTokenVo; @@ -30,7 +31,7 @@ import javax.annotation.Resource; import java.util.Objects; @Component -public class ClientTokenInterceptor implements Interceptor { +public class ClientTokenInterceptor implements Interceptor { private final Log log = LogFactory.getLog(ClientTokenInterceptor.class); @Resource private AuthClient authClient; diff --git a/dy-java-spring/src/main/java/com/dyj/spring/DyConfigurationRegister.java b/dy-java-spring/src/main/java/com/dyj/spring/DyConfigurationRegister.java index 3918812..ca8e05b 100644 --- a/dy-java-spring/src/main/java/com/dyj/spring/DyConfigurationRegister.java +++ b/dy-java-spring/src/main/java/com/dyj/spring/DyConfigurationRegister.java @@ -83,8 +83,8 @@ public class DyConfigurationRegister implements ResourceLoaderAware, BeanPostPro public void setForestProperties() { DyForestConfigurationProperties forestProperties = dyConfigurationProperties.getForest(); + ForestConfiguration forestConfiguration = applicationContext.getBean(ForestConfiguration.class); if (Objects.nonNull(forestProperties)) { - ForestConfiguration forestConfiguration = applicationContext.getBean(ForestConfiguration.class); forestConfiguration.setBackendName(forestProperties.getBackend()); forestConfiguration.setMaxConnections(forestProperties.getMaxConnections()); forestConfiguration.setMaxRouteConnections(forestProperties.getMaxRouteConnections()); @@ -100,20 +100,24 @@ public class DyConfigurationRegister implements ResourceLoaderAware, BeanPostPro forestConfiguration.setLogResponseStatus(forestProperties.isLogResponseStatus()); forestConfiguration.setLogResponseContent(forestProperties.isLogResponseContent()); forestConfiguration.setAsyncMode(forestProperties.getAsyncMode()); - for (DyWebUrlPathEnum value : DyWebUrlPathEnum.values()) { - forestProperties.getVariables().put(value.getKey(), value.getValue()); - } - for (DyAppletUrlPathEnum value : DyAppletUrlPathEnum.values()){ - forestProperties.getVariables().put(value.getKey(), value.getValue()); - } - if(StringUtils.hasLength(dyConfigurationProperties.getDomain())){ - forestProperties.getVariables().put("domain", dyConfigurationProperties.getDomain()); - } - if (StringUtils.hasLength(dyConfigurationProperties.getTtDomain())){ - forestProperties.getVariables().put("ttDomain", dyConfigurationProperties.getTtDomain()); - } - forestConfiguration.setVariables(forestProperties.getVariables()); } + if (forestProperties == null) { + forestProperties = new DyForestConfigurationProperties(); + } + for (DyWebUrlPathEnum value : DyWebUrlPathEnum.values()) { + forestProperties.getVariables().put(value.getKey(), value.getValue()); + } + for (DyAppletUrlPathEnum value : DyAppletUrlPathEnum.values()) { + forestProperties.getVariables().put(value.getKey(), value.getValue()); + } + if (StringUtils.hasLength(dyConfigurationProperties.getDomain())) { + forestProperties.getVariables().put("domain", dyConfigurationProperties.getDomain()); + } + if (StringUtils.hasLength(dyConfigurationProperties.getTtDomain())) { + forestProperties.getVariables().put("ttDomain", dyConfigurationProperties.getTtDomain()); + } + + forestConfiguration.setVariables(forestProperties.getVariables()); } -- Gitee From 13e38b3d96b02ea42ebaaacf5c13a0211daa3e09 Mon Sep 17 00:00:00 2001 From: bigsun <407919070@qq.com> Date: Tue, 23 Apr 2024 18:00:17 +0800 Subject: [PATCH 5/6] =?UTF-8?q?1.=E8=A7=A3=E5=86=B3=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E4=BD=BF=E7=94=A8forest=E9=85=8D=E7=BD=AE=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E9=83=A8=E5=88=86=E5=8F=82=E6=95=B0=E6=9C=AA=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=202.=E4=BF=AE=E6=94=B9=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E7=AB=AFtoken=E6=8B=A6=E6=88=AA=E5=99=A8=E7=9A=84?= =?UTF-8?q?=E6=B3=9B=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../interceptor/ClientTokenInterceptor.java | 3 +- .../dyj/spring/DyConfigurationRegister.java | 32 +++++++++++-------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/dy-java-common/src/main/java/com/dyj/common/interceptor/ClientTokenInterceptor.java b/dy-java-common/src/main/java/com/dyj/common/interceptor/ClientTokenInterceptor.java index 0b6ec9e..ea788a2 100644 --- a/dy-java-common/src/main/java/com/dyj/common/interceptor/ClientTokenInterceptor.java +++ b/dy-java-common/src/main/java/com/dyj/common/interceptor/ClientTokenInterceptor.java @@ -9,6 +9,7 @@ import com.dyj.common.client.AuthClient; import com.dyj.common.config.AgentConfiguration; import com.dyj.common.domain.ClientTokenInfo; import com.dyj.common.domain.DyResult; +import com.dyj.common.domain.DySimpleResult; import com.dyj.common.domain.query.BaseQuery; import com.dyj.common.domain.query.ClientTokenQuery; import com.dyj.common.domain.vo.ClientTokenVo; @@ -30,7 +31,7 @@ import javax.annotation.Resource; import java.util.Objects; @Component -public class ClientTokenInterceptor implements Interceptor { +public class ClientTokenInterceptor implements Interceptor { private final Log log = LogFactory.getLog(ClientTokenInterceptor.class); @Resource private AuthClient authClient; diff --git a/dy-java-spring/src/main/java/com/dyj/spring/DyConfigurationRegister.java b/dy-java-spring/src/main/java/com/dyj/spring/DyConfigurationRegister.java index 3918812..ca8e05b 100644 --- a/dy-java-spring/src/main/java/com/dyj/spring/DyConfigurationRegister.java +++ b/dy-java-spring/src/main/java/com/dyj/spring/DyConfigurationRegister.java @@ -83,8 +83,8 @@ public class DyConfigurationRegister implements ResourceLoaderAware, BeanPostPro public void setForestProperties() { DyForestConfigurationProperties forestProperties = dyConfigurationProperties.getForest(); + ForestConfiguration forestConfiguration = applicationContext.getBean(ForestConfiguration.class); if (Objects.nonNull(forestProperties)) { - ForestConfiguration forestConfiguration = applicationContext.getBean(ForestConfiguration.class); forestConfiguration.setBackendName(forestProperties.getBackend()); forestConfiguration.setMaxConnections(forestProperties.getMaxConnections()); forestConfiguration.setMaxRouteConnections(forestProperties.getMaxRouteConnections()); @@ -100,20 +100,24 @@ public class DyConfigurationRegister implements ResourceLoaderAware, BeanPostPro forestConfiguration.setLogResponseStatus(forestProperties.isLogResponseStatus()); forestConfiguration.setLogResponseContent(forestProperties.isLogResponseContent()); forestConfiguration.setAsyncMode(forestProperties.getAsyncMode()); - for (DyWebUrlPathEnum value : DyWebUrlPathEnum.values()) { - forestProperties.getVariables().put(value.getKey(), value.getValue()); - } - for (DyAppletUrlPathEnum value : DyAppletUrlPathEnum.values()){ - forestProperties.getVariables().put(value.getKey(), value.getValue()); - } - if(StringUtils.hasLength(dyConfigurationProperties.getDomain())){ - forestProperties.getVariables().put("domain", dyConfigurationProperties.getDomain()); - } - if (StringUtils.hasLength(dyConfigurationProperties.getTtDomain())){ - forestProperties.getVariables().put("ttDomain", dyConfigurationProperties.getTtDomain()); - } - forestConfiguration.setVariables(forestProperties.getVariables()); } + if (forestProperties == null) { + forestProperties = new DyForestConfigurationProperties(); + } + for (DyWebUrlPathEnum value : DyWebUrlPathEnum.values()) { + forestProperties.getVariables().put(value.getKey(), value.getValue()); + } + for (DyAppletUrlPathEnum value : DyAppletUrlPathEnum.values()) { + forestProperties.getVariables().put(value.getKey(), value.getValue()); + } + if (StringUtils.hasLength(dyConfigurationProperties.getDomain())) { + forestProperties.getVariables().put("domain", dyConfigurationProperties.getDomain()); + } + if (StringUtils.hasLength(dyConfigurationProperties.getTtDomain())) { + forestProperties.getVariables().put("ttDomain", dyConfigurationProperties.getTtDomain()); + } + + forestConfiguration.setVariables(forestProperties.getVariables()); } -- Gitee From 08c860c674a39755079e3c8967edbf3dce57b283 Mon Sep 17 00:00:00 2001 From: bigsun <407919070@qq.com> Date: Tue, 23 Apr 2024 18:13:10 +0800 Subject: [PATCH 6/6] =?UTF-8?q?1.lombok=E4=BC=98=E5=8C=96=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dyj/applet/domain/AptAccountVideo.java | 95 +---------- .../dyj/applet/domain/AuthAttribution.java | 64 +------ .../com/dyj/applet/domain/ClueComponent.java | 72 +------- .../dyj/applet/domain/ClueComponentRegin.java | 63 +------ .../java/com/dyj/applet/domain/ColorRGB.java | 66 +------- .../java/com/dyj/applet/domain/Comment.java | 87 +--------- .../com/dyj/applet/domain/ImAuthUser.java | 63 +------ .../com/dyj/applet/domain/ItemBaseInfo.java | 46 +---- .../dyj/applet/domain/ItemCommentInfo.java | 23 +-- .../com/dyj/applet/domain/ItemLikeInfo.java | 24 +-- .../com/dyj/applet/domain/ItemPlayInfo.java | 23 +-- .../com/dyj/applet/domain/ItemShareInfo.java | 23 +-- .../com/dyj/applet/domain/SchemaQuota.java | 23 +-- .../applet/domain/SearchSubServiceInfo.java | 79 +-------- .../applet/domain/SearchSubServiceReason.java | 23 +-- .../applet/domain/query/AptVideoQuery.java | 67 ++------ .../domain/query/Code2SessionQuery.java | 101 ++--------- .../dyj/applet/domain/query/CommentQuery.java | 106 ++---------- .../query/CreateClueComponentQuery.java | 91 ++-------- .../domain/query/CreateQrCodeQuery.java | 159 ++---------------- .../domain/query/CreateSearchSubQuery.java | 84 ++------- .../domain/query/GenerateSchemaQuery.java | 92 ---------- .../domain/query/GenerateUrlLinkQuery.java | 94 ----------- .../domain/query/ImAuthStatusQuery.java | 72 ++------ .../query/ImAuthorizeUserListQuery.java | 70 -------- .../domain/query/ItemId2EncryptIdQuery.java | 68 ++------ .../applet/domain/query/RevokeMsgQuery.java | 74 -------- .../dyj/applet/domain/query/SendMsgQuery.java | 141 ++-------------- .../query/UpdateClueComponentQuery.java | 104 ++---------- .../domain/query/VideoId2ItemIdQuery.java | 81 ++------- .../dyj/applet/domain/vo/AptVideoListVo.java | 34 ++-- .../dyj/applet/domain/vo/AuthSendMsgVo.java | 14 +- .../applet/domain/vo/CheckSearchSubVo.java | 16 +- .../dyj/applet/domain/vo/ClueComponentVo.java | 28 +-- .../dyj/applet/domain/vo/Code2SessionVo.java | 39 +---- .../dyj/applet/domain/vo/CommentListVo.java | 31 +--- .../dyj/applet/domain/vo/CommentReplyVo.java | 36 ++-- .../dyj/applet/domain/vo/ConvertResultVo.java | 12 +- .../domain/vo/CreateClueComponentVo.java | 15 +- .../applet/domain/vo/GenerateSchemaVo.java | 14 +- .../applet/domain/vo/GenerateUrlLinkVo.java | 15 +- .../dyj/applet/domain/vo/ImAuthStatusVo.java | 53 +----- .../applet/domain/vo/ImAuthUserListVo.java | 10 ++ .../dyj/applet/domain/vo/ItemBaseInfoVo.java | 18 +- .../applet/domain/vo/ItemCommentInfoVo.java | 18 +- .../dyj/applet/domain/vo/ItemLikeInfoVo.java | 18 +- .../dyj/applet/domain/vo/ItemPlayInfoVo.java | 10 ++ .../dyj/applet/domain/vo/ItemShareInfoVo.java | 18 +- .../com/dyj/applet/domain/vo/QrCodeVo.java | 14 +- .../applet/domain/vo/QuerySchemaQuotaVo.java | 21 +-- .../dyj/applet/domain/vo/QuerySchemaVo.java | 46 +---- .../applet/domain/vo/QueryUrlLinkQuotaVo.java | 23 +-- .../dyj/applet/domain/vo/QueryUrlLinkVo.java | 55 +----- .../dyj/applet/domain/vo/SearchSubListVo.java | 31 +--- .../applet/domain/vo/SendMsgResponseVo.java | 28 ++- .../dyj/applet/domain/vo/TopCommentVo.java | 26 ++- dy-java-common/pom.xml | 6 +- .../com/dyj/common/domain/AppletCardMsg.java | 91 ++-------- .../dyj/common/domain/AppletCouponMsg.java | 58 ++----- .../domain/AuthPrivateMessageCardMsg.java | 131 ++------------- .../java/com/dyj/common/domain/CardMsg.java | 48 ++---- .../dyj/common/domain/ClientTokenInfo.java | 25 ++- .../com/dyj/common/domain/DyAppletResult.java | 32 +--- .../java/com/dyj/common/domain/DyExtra.java | 68 +------- .../java/com/dyj/common/domain/DyResult.java | 43 +---- .../com/dyj/common/domain/DySimpleResult.java | 60 +------ .../java/com/dyj/common/domain/ImageMsg.java | 46 ++--- .../com/dyj/common/domain/InvitationMsg.java | 58 ++----- .../com/dyj/common/domain/MsgContent.java | 17 +- .../java/com/dyj/common/domain/TextMsg.java | 50 ++---- .../com/dyj/common/domain/UserTokenInfo.java | 49 +----- .../java/com/dyj/common/domain/VideoMsg.java | 47 ++---- .../dyj/common/domain/VideoStatistics.java | 9 + .../common/domain/query/AccessTokenQuery.java | 77 ++------- .../common/domain/query/AppsV2TokenQuery.java | 54 +----- .../dyj/common/domain/query/BaseQuery.java | 25 ++- .../domain/query/BizRefreshTokenQuery.java | 64 +------ .../common/domain/query/BizTokenQuery.java | 76 +-------- .../common/domain/query/ClientTokenQuery.java | 29 +--- .../common/domain/query/QuerySchemaQuery.java | 65 ++----- .../domain/query/RefreshAccessTokenQuery.java | 34 +--- .../domain/query/RefreshTokenQuery.java | 25 +-- .../common/domain/query/UserInfoQuery.java | 15 +- .../dyj/common/domain/vo/AccessTokenVo.java | 76 ++------- .../dyj/common/domain/vo/AppsV2TokenVo.java | 25 +-- .../java/com/dyj/common/domain/vo/BaseVo.java | 25 +-- .../com/dyj/common/domain/vo/BizTokenVo.java | 40 +---- .../dyj/common/domain/vo/ClientTokenVo.java | 29 ++-- .../common/domain/vo/DataAndExtraBodyVo.java | 31 +--- .../domain/vo/RefreshAccessTokenVo.java | 68 ++------ .../dyj/common/domain/vo/RefreshTokenVo.java | 30 ++-- pom.xml | 1 + 92 files changed, 760 insertions(+), 3688 deletions(-) diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/AptAccountVideo.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/AptAccountVideo.java index 7f5e115..36c9c8c 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/AptAccountVideo.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/AptAccountVideo.java @@ -1,11 +1,18 @@ package com.dyj.applet.domain; import com.dyj.common.domain.VideoStatistics; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; /** * @author danmo * @date 2024/04/07 22:40 */ + +@AllArgsConstructor +@NoArgsConstructor +@Data public class AptAccountVideo { /** @@ -62,92 +69,4 @@ public class AptAccountVideo { * 视频真实id */ private String video_id; - - public String getCover() { - return cover; - } - - public void setCover(String cover) { - this.cover = cover; - } - - public Long getCreate_time() { - return create_time; - } - - public void setCreate_time(Long create_time) { - this.create_time = create_time; - } - - public Boolean getIs_reviewed() { - return is_reviewed; - } - - public void setIs_reviewed(Boolean is_reviewed) { - this.is_reviewed = is_reviewed; - } - - public Boolean getIs_top() { - return is_top; - } - - public void setIs_top(Boolean is_top) { - this.is_top = is_top; - } - - public String getItem_id() { - return item_id; - } - - public void setItem_id(String item_id) { - this.item_id = item_id; - } - - public String getShare_url() { - return share_url; - } - - public void setShare_url(String share_url) { - this.share_url = share_url; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public Integer getVideo_status() { - return video_status; - } - - public void setVideo_status(Integer video_status) { - this.video_status = video_status; - } - - public Integer getMedia_type() { - return media_type; - } - - public void setMedia_type(Integer media_type) { - this.media_type = media_type; - } - - public VideoStatistics getStatistics() { - return statistics; - } - - public void setStatistics(VideoStatistics statistics) { - this.statistics = statistics; - } - - public String getVideo_id() { - return video_id; - } - - public void setVideo_id(String video_id) { - this.video_id = video_id; - } } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/AuthAttribution.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/AuthAttribution.java index 81b9c52..b62da7c 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/AuthAttribution.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/AuthAttribution.java @@ -1,10 +1,17 @@ package com.dyj.applet.domain; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + /** * 授权归因，不同的授权来源对应不同的归因字段 * @author danmo * @date 2024-04-08 17:23 **/ +@AllArgsConstructor +@NoArgsConstructor +@Data public class AuthAttribution { /** @@ -35,61 +42,4 @@ public class AuthAttribution { * 直播房间id */ private String room_id; - - - public String getAnchor_id() { - return anchor_id; - } - - public void setAnchor_id(String anchor_id) { - this.anchor_id = anchor_id; - } - - public String getAuthor_id() { - return author_id; - } - - public void setAuthor_id(String author_id) { - this.author_id = author_id; - } - - public String getConversation_id() { - return conversation_id; - } - - public void setConversation_id(String conversation_id) { - this.conversation_id = conversation_id; - } - - public String getFrom_att_uid() { - return from_att_uid; - } - - public void setFrom_att_uid(String from_att_uid) { - this.from_att_uid = from_att_uid; - } - - public String getGroup_id() { - return group_id; - } - - public void setGroup_id(String group_id) { - this.group_id = group_id; - } - - public String getMessage_id() { - return message_id; - } - - public void setMessage_id(String message_id) { - this.message_id = message_id; - } - - public String getRoom_id() { - return room_id; - } - - public void setRoom_id(String room_id) { - this.room_id = room_id; - } } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/ClueComponent.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/ClueComponent.java index 1c21c8c..b76c95f 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/ClueComponent.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/ClueComponent.java @@ -1,11 +1,18 @@ package com.dyj.applet.domain; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + import java.util.List; /** * @author danmo * @date 2024-04-18 15:28 **/ +@AllArgsConstructor +@NoArgsConstructor +@Data public class ClueComponent { /** @@ -44,69 +51,4 @@ public class ClueComponent { * 地区列表 */ private List region_list; - - - public String getConfig_id() { - return config_id; - } - - public void setConfig_id(String config_id) { - this.config_id = config_id; - } - - public String getConfig_name() { - return config_name; - } - - public void setConfig_name(String config_name) { - this.config_name = config_name; - } - - public String getRegion() { - return region; - } - - public void setRegion(String region) { - this.region = region; - } - - public String getCategory_id() { - return category_id; - } - - public void setCategory_id(String category_id) { - this.category_id = category_id; - } - - public String getState() { - return state; - } - - public void setState(String state) { - this.state = state; - } - - public String getCategory_name() { - return category_name; - } - - public void setCategory_name(String category_name) { - this.category_name = category_name; - } - - public String getRegion_name() { - return region_name; - } - - public void setRegion_name(String region_name) { - this.region_name = region_name; - } - - public List getRegion_list() { - return region_list; - } - - public void setRegion_list(List region_list) { - this.region_list = region_list; - } } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/ClueComponentRegin.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/ClueComponentRegin.java index 497f894..21be8ea 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/ClueComponentRegin.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/ClueComponentRegin.java @@ -1,9 +1,16 @@ package com.dyj.applet.domain; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + /** * @author danmo * @date 2024-04-18 15:30 **/ +@AllArgsConstructor +@NoArgsConstructor +@Data public class ClueComponentRegin { /** @@ -35,60 +42,4 @@ public class ClueComponentRegin { * 地区名称 */ private String district_name; - - public String getRegion() { - return region; - } - - public void setRegion(String region) { - this.region = region; - } - - public String getProvince_code() { - return province_code; - } - - public void setProvince_code(String province_code) { - this.province_code = province_code; - } - - public String getProvince_name() { - return province_name; - } - - public void setProvince_name(String province_name) { - this.province_name = province_name; - } - - public String getCity_code() { - return city_code; - } - - public void setCity_code(String city_code) { - this.city_code = city_code; - } - - public String getCity_name() { - return city_name; - } - - public void setCity_name(String city_name) { - this.city_name = city_name; - } - - public String getDistrict_code() { - return district_code; - } - - public void setDistrict_code(String district_code) { - this.district_code = district_code; - } - - public String getDistrict_name() { - return district_name; - } - - public void setDistrict_name(String district_name) { - this.district_name = district_name; - } } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/ColorRGB.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/ColorRGB.java index 9d2d922..abcb3c8 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/ColorRGB.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/ColorRGB.java @@ -1,9 +1,16 @@ package com.dyj.applet.domain; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + /** * @author danmo * @date 2024-04-17 14:22 **/ +@AllArgsConstructor +@NoArgsConstructor +@Data public class ColorRGB { private Integer r; @@ -12,63 +19,4 @@ public class ColorRGB { private Integer b; - public Integer getR() { - return r; - } - - public void setR(Integer r) { - this.r = r; - } - - public Integer getG() { - return g; - } - - public void setG(Integer g) { - this.g = g; - } - - public Integer getB() { - return b; - } - - public void setB(Integer b) { - this.b = b; - } - - public static ColorRGBBuilder builder() { - return new ColorRGBBuilder(); - } - - public static class ColorRGBBuilder { - private Integer r; - private Integer g; - private Integer b; - - public ColorRGBBuilder r - (Integer r) { - this.r = r; - return this; - } - - public ColorRGBBuilder g - (Integer g) { - this.g = g; - return this; - } - - public ColorRGBBuilder b - (Integer b) { - this.b = b; - return this; - } - - public ColorRGB build() { - ColorRGB colorRGB = new ColorRGB(); - colorRGB.setR(r); - colorRGB.setG(g); - colorRGB.setB(b); - return colorRGB; - } - } } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/Comment.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/Comment.java index 73d763e..9b11c4e 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/Comment.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/Comment.java @@ -1,9 +1,16 @@ package com.dyj.applet.domain; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + /** * @author danmo * @date 2024-04-10 16:58 **/ +@AllArgsConstructor +@NoArgsConstructor +@Data public class Comment { /** @@ -54,84 +61,4 @@ public class Comment { * 用户昵称 */ private String nick_name; - - public String getComment_id() { - return comment_id; - } - - public void setComment_id(String comment_id) { - this.comment_id = comment_id; - } - - public String getReply_comment_id() { - return reply_comment_id; - } - - public void setReply_comment_id(String reply_comment_id) { - this.reply_comment_id = reply_comment_id; - } - - public String getComment_user_id() { - return comment_user_id; - } - - public void setComment_user_id(String comment_user_id) { - this.comment_user_id = comment_user_id; - } - - public String getContent() { - return content; - } - - public void setContent(String content) { - this.content = content; - } - - public Long getCreate_time() { - return create_time; - } - - public void setCreate_time(Long create_time) { - this.create_time = create_time; - } - - public Integer getDigg_count() { - return digg_count; - } - - public void setDigg_count(Integer digg_count) { - this.digg_count = digg_count; - } - - public Integer getReply_comment_total() { - return reply_comment_total; - } - - public void setReply_comment_total(Integer reply_comment_total) { - this.reply_comment_total = reply_comment_total; - } - - public Boolean getTop() { - return top; - } - - public void setTop(Boolean top) { - this.top = top; - } - - public String getAvatar() { - return avatar; - } - - public void setAvatar(String avatar) { - this.avatar = avatar; - } - - public String getNick_name() { - return nick_name; - } - - public void setNick_name(String nick_name) { - this.nick_name = nick_name; - } } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/ImAuthUser.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/ImAuthUser.java index 31a3068..49cd1ea 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/ImAuthUser.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/ImAuthUser.java @@ -1,9 +1,16 @@ package com.dyj.applet.domain; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + /** * @author danmo * @date 2024-04-08 17:20 **/ +@AllArgsConstructor +@NoArgsConstructor +@Data public class ImAuthUser { /** @@ -47,60 +54,4 @@ public class ImAuthUser { * 授权归因，不同的授权来源对应不同的归因字段 */ private AuthAttribution attribution; - - public String getEnter_from() { - return enter_from; - } - - public void setEnter_from(String enter_from) { - this.enter_from = enter_from; - } - - public String getAuth_user_source_app_id() { - return auth_user_source_app_id; - } - - public void setAuth_user_source_app_id(String auth_user_source_app_id) { - this.auth_user_source_app_id = auth_user_source_app_id; - } - - public String getData_im_extra() { - return data_im_extra; - } - - public void setData_im_extra(String data_im_extra) { - this.data_im_extra = data_im_extra; - } - - public String getPath() { - return path; - } - - public void setPath(String path) { - this.path = path; - } - - public String getQuery() { - return query; - } - - public void setQuery(String query) { - this.query = query; - } - - public String getTarget_open_id() { - return target_open_id; - } - - public void setTarget_open_id(String target_open_id) { - this.target_open_id = target_open_id; - } - - public AuthAttribution getAttribution() { - return attribution; - } - - public void setAttribution(AuthAttribution attribution) { - this.attribution = attribution; - } } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/ItemBaseInfo.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/ItemBaseInfo.java index 83cb99f..fd6e1a4 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/ItemBaseInfo.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/ItemBaseInfo.java @@ -1,9 +1,16 @@ package com.dyj.applet.domain; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + /** * @author danmo * @date 2024-04-18 18:21 **/ +@AllArgsConstructor +@NoArgsConstructor +@Data public class ItemBaseInfo { /** * 最近30天平均播放时长 @@ -26,43 +33,4 @@ public class ItemBaseInfo { */ private Long total_share; - public Double getAvg_play_duration() { - return avg_play_duration; - } - - public void setAvg_play_duration(Double avg_play_duration) { - this.avg_play_duration = avg_play_duration; - } - - public Long getTotal_comment() { - return total_comment; - } - - public void setTotal_comment(Long total_comment) { - this.total_comment = total_comment; - } - - public Long getTotal_like() { - return total_like; - } - - public void setTotal_like(Long total_like) { - this.total_like = total_like; - } - - public Long getTotal_play() { - return total_play; - } - - public void setTotal_play(Long total_play) { - this.total_play = total_play; - } - - public Long getTotal_share() { - return total_share; - } - - public void setTotal_share(Long total_share) { - this.total_share = total_share; - } } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/ItemCommentInfo.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/ItemCommentInfo.java index 3f6ef23..dccd00e 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/ItemCommentInfo.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/ItemCommentInfo.java @@ -1,9 +1,16 @@ package com.dyj.applet.domain; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + /** * @author danmo * @date 2024-04-19 11:17 **/ +@AllArgsConstructor +@NoArgsConstructor +@Data public class ItemCommentInfo { /** @@ -15,20 +22,4 @@ public class ItemCommentInfo { * 每日评论数 */ private String comment; - - public String getDate() { - return date; - } - - public void setDate(String date) { - this.date = date; - } - - public String getComment() { - return comment; - } - - public void setComment(String comment) { - this.comment = comment; - } } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/ItemLikeInfo.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/ItemLikeInfo.java index ea166f6..5c6e146 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/ItemLikeInfo.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/ItemLikeInfo.java @@ -1,9 +1,17 @@ package com.dyj.applet.domain; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + /** * @author danmo * @date 2024-04-18 18:39 **/ + +@AllArgsConstructor +@NoArgsConstructor +@Data public class ItemLikeInfo { /** @@ -15,20 +23,4 @@ public class ItemLikeInfo { * 每日点赞数 */ private String like; - - public String getDate() { - return date; - } - - public void setDate(String date) { - this.date = date; - } - - public String getLike() { - return like; - } - - public void setLike(String like) { - this.like = like; - } } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/ItemPlayInfo.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/ItemPlayInfo.java index 1b5742c..f433074 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/ItemPlayInfo.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/ItemPlayInfo.java @@ -1,9 +1,16 @@ package com.dyj.applet.domain; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + /** * @author danmo * @date 2024-04-19 11:17 **/ +@AllArgsConstructor +@NoArgsConstructor +@Data public class ItemPlayInfo { /** @@ -15,20 +22,4 @@ public class ItemPlayInfo { * 每日播放数 */ private String play; - - public String getDate() { - return date; - } - - public void setDate(String date) { - this.date = date; - } - - public String getPlay() { - return play; - } - - public void setPlay(String play) { - this.play = play; - } } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/ItemShareInfo.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/ItemShareInfo.java index d7dddd3..3e97161 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/ItemShareInfo.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/ItemShareInfo.java @@ -1,9 +1,16 @@ package com.dyj.applet.domain; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + /** * @author danmo * @date 2024-04-19 11:17 **/ +@AllArgsConstructor +@NoArgsConstructor +@Data public class ItemShareInfo { /** @@ -15,20 +22,4 @@ public class ItemShareInfo { * 每日播放数 */ private String share; - - public String getDate() { - return date; - } - - public void setDate(String date) { - this.date = date; - } - - public String getShare() { - return share; - } - - public void setShare(String share) { - this.share = share; - } } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/SchemaQuota.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/SchemaQuota.java index 46e43ac..d4b2fbf 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/SchemaQuota.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/SchemaQuota.java @@ -1,9 +1,16 @@ package com.dyj.applet.domain; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + /** * @author danmo * @date 2024-04-17 14:01 **/ +@AllArgsConstructor +@NoArgsConstructor +@Data public class SchemaQuota { /** @@ -14,20 +21,4 @@ public class SchemaQuota { * schema 已生成次数 */ private Integer schema_used; - - public Integer getSchema_limit() { - return schema_limit; - } - - public void setSchema_limit(Integer schema_limit) { - this.schema_limit = schema_limit; - } - - public Integer getSchema_used() { - return schema_used; - } - - public void setSchema_used(Integer schema_used) { - this.schema_used = schema_used; - } } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/SearchSubServiceInfo.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/SearchSubServiceInfo.java index fba9e74..76efbd3 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/SearchSubServiceInfo.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/SearchSubServiceInfo.java @@ -1,11 +1,18 @@ package com.dyj.applet.domain; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + import java.util.List; /** * @author danmo * @date 2024-04-22 18:55 **/ +@AllArgsConstructor +@NoArgsConstructor +@Data public class SearchSubServiceInfo { /** @@ -46,76 +53,4 @@ public class SearchSubServiceInfo { * 理由 */ private List reasons; - - public Long getApproval_state() { - return approval_state; - } - - public void setApproval_state(Long approval_state) { - this.approval_state = approval_state; - } - - public String getCreate_time() { - return create_time; - } - - public void setCreate_time(String create_time) { - this.create_time = create_time; - } - - public String getMicro_app_icon() { - return micro_app_icon; - } - - public void setMicro_app_icon(String micro_app_icon) { - this.micro_app_icon = micro_app_icon; - } - - public String getMicro_app_id() { - return micro_app_id; - } - - public void setMicro_app_id(String micro_app_id) { - this.micro_app_id = micro_app_id; - } - - public List getSearch_key_word() { - return search_key_word; - } - - public void setSearch_key_word(List search_key_word) { - this.search_key_word = search_key_word; - } - - public String getStart_page_url() { - return start_page_url; - } - - public void setStart_page_url(String start_page_url) { - this.start_page_url = start_page_url; - } - - public String getSub_service_id() { - return sub_service_id; - } - - public void setSub_service_id(String sub_service_id) { - this.sub_service_id = sub_service_id; - } - - public String getSub_service_name() { - return sub_service_name; - } - - public void setSub_service_name(String sub_service_name) { - this.sub_service_name = sub_service_name; - } - - public List getReasons() { - return reasons; - } - - public void setReasons(List reasons) { - this.reasons = reasons; - } } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/SearchSubServiceReason.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/SearchSubServiceReason.java index 777ef88..a9b9b92 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/SearchSubServiceReason.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/SearchSubServiceReason.java @@ -1,9 +1,16 @@ package com.dyj.applet.domain; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + /** * @author danmo * @date 2024-04-22 18:57 **/ +@AllArgsConstructor +@NoArgsConstructor +@Data public class SearchSubServiceReason { /** @@ -15,20 +22,4 @@ public class SearchSubServiceReason { * 审核拒绝原因 */ private String reason; - - public String getAudit_field() { - return audit_field; - } - - public void setAudit_field(String audit_field) { - this.audit_field = audit_field; - } - - public String getReason() { - return reason; - } - - public void setReason(String reason) { - this.reason = reason; - } } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/query/AptVideoQuery.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/query/AptVideoQuery.java index 2839e64..96bc76b 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/query/AptVideoQuery.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/query/AptVideoQuery.java @@ -1,9 +1,19 @@ package com.dyj.applet.domain.query; import com.dyj.common.domain.query.UserInfoQuery; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import java.util.List; +@EqualsAndHashCode(callSuper = true) +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder +@Data public class AptVideoQuery extends UserInfoQuery { /** @@ -16,61 +26,4 @@ public class AptVideoQuery extends UserInfoQuery { */ private List video_ids; - public List getItem_ids() { - return item_ids; - } - - public void setItem_ids(List item_ids) { - this.item_ids = item_ids; - } - - public List getVideo_ids() { - return video_ids; - } - - public void setVideo_ids(List video_ids) { - this.video_ids = video_ids; - } - - public static VideoDataQueryBuilder builder() { - return new VideoDataQueryBuilder(); - } - - public static class VideoDataQueryBuilder { - private List itemIds; - private List videoIds; - private String openId; - private Integer tenantId; - private String clientKey; - - public VideoDataQueryBuilder itemIds(List itemIds) { - this.itemIds = itemIds; - return this; - } - public VideoDataQueryBuilder videoIds(List videoIds) { - this.videoIds = videoIds; - return this; - } - public VideoDataQueryBuilder openId(String openId) { - this.openId = openId; - return this; - } - public VideoDataQueryBuilder tenantId(Integer tenantId) { - this.tenantId = tenantId; - return this; - } - public VideoDataQueryBuilder clientKey(String clientKey) { - this.clientKey = clientKey; - return this; - } - public AptVideoQuery build() { - AptVideoQuery videoDataQuery = new AptVideoQuery(); - videoDataQuery.setItem_ids(itemIds); - videoDataQuery.setVideo_ids(videoIds); - videoDataQuery.setOpen_id(openId); - videoDataQuery.setTenantId(tenantId); - videoDataQuery.setClientKey(clientKey); - return videoDataQuery; - } - } } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/query/Code2SessionQuery.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/query/Code2SessionQuery.java index d104b08..47fa353 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/query/Code2SessionQuery.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/query/Code2SessionQuery.java @@ -1,11 +1,21 @@ package com.dyj.applet.domain.query; import com.dyj.common.domain.query.BaseQuery; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; /** * @author danmo * @date 2024-04-17 10:55 **/ +@EqualsAndHashCode(callSuper = true) +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder(toBuilder = true) +@Data public class Code2SessionQuery extends BaseQuery { /** @@ -27,95 +37,4 @@ public class Code2SessionQuery extends BaseQuery { * login 接口返回的匿名登录凭 */ private String anonymous_code; - - - public String getAppid() { - return appid; - } - - public void setAppid(String appid) { - this.appid = appid; - } - - public String getSecret() { - return secret; - } - - public void setSecret(String secret) { - this.secret = secret; - } - - public String getCode() { - return code; - } - - public void setCode(String code) { - this.code = code; - } - - public String getAnonymous_code() { - return anonymous_code; - } - - public void setAnonymous_code(String anonymous_code) { - this.anonymous_code = anonymous_code; - } - - public static Code2SessionBuilder builder() { - return new Code2SessionBuilder(); - } - - public static class Code2SessionBuilder { - - private String appid; - private String secret; - - private String code; - private String anonymousCode; - - private Integer tenantId; - - private String clientKey; - - public Code2SessionBuilder appid(String appid) { - this.appid = appid; - return this; - } - - public Code2SessionBuilder secret(String secret) { - this.secret = secret; - return this; - } - - public Code2SessionBuilder code(String code) { - this.code = code; - return this; - } - - public Code2SessionBuilder anonymousCode(String anonymousCode) { - this.anonymousCode = anonymousCode; - return this; - } - - public Code2SessionBuilder tenantId(Integer tenantId) { - this.tenantId = tenantId; - return this; - } - - public Code2SessionBuilder clientKey(String clientKey) { - this.clientKey = clientKey; - return this; - } - - public Code2SessionQuery build() { - Code2SessionQuery query = new Code2SessionQuery(); - query.setAppid(appid); - query.setSecret(secret); - query.setCode(code); - query.setAnonymous_code(anonymousCode); - query.setTenantId(tenantId); - query.setClientKey(clientKey); - return query; - } - } } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/query/CommentQuery.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/query/CommentQuery.java index a7b6b28..1335fad 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/query/CommentQuery.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/query/CommentQuery.java @@ -1,11 +1,22 @@ package com.dyj.applet.domain.query; import com.dyj.common.domain.query.UserInfoQuery; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; /** * @author danmo * @date 2024-04-10 16:46 **/ + +@EqualsAndHashCode(callSuper = false) +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder(toBuilder = true) +@Data public class CommentQuery extends UserInfoQuery { /** @@ -27,99 +38,4 @@ public class CommentQuery extends UserInfoQuery { * true-置顶；false-不置顶 */ private Boolean top; - - public String getItem_id() { - return item_id; - } - - public void setItem_id(String item_id) { - this.item_id = item_id; - } - - public String getComment_id() { - return comment_id; - } - - public void setComment_id(String comment_id) { - this.comment_id = comment_id; - } - - public String getContent() { - return content; - } - - public void setContent(String content) { - this.content = content; - } - - public Boolean getTop() { - return top; - } - - public void setTop(Boolean top) { - this.top = top; - } - - public static CommentQueryBuilder builder() { - return new CommentQueryBuilder(); - } - - public static class CommentQueryBuilder { - private String itemId; - private String commentId; - private String content; - private Boolean top; - private Integer tenantId; - private String clientKey; - private String openId; - - public CommentQueryBuilder itemId(String itemId) { - this.itemId = itemId; - return this; - } - - public CommentQueryBuilder commentId(String commentId) { - this.commentId = commentId; - return this; - } - - public CommentQueryBuilder content(String content) { - this.content = content; - return this; - } - - public CommentQueryBuilder top(Boolean top) { - this.top = top; - return this; - } - - public CommentQueryBuilder tenantId(Integer tenantId) { - this.tenantId = tenantId; - return this; - } - - public CommentQueryBuilder clientKey(String clientKey) { - this.clientKey = clientKey; - return this; - } - - public CommentQueryBuilder openId(String openId) { - this.openId = openId; - return this; - } - - public CommentQuery build() { - CommentQuery commentQuery = new CommentQuery(); - commentQuery.setItem_id(itemId); - commentQuery.setComment_id(commentId); - commentQuery.setContent(content); - commentQuery.setTop(top); - commentQuery.setTenantId(tenantId); - commentQuery.setClientKey(clientKey); - commentQuery.setOpen_id(openId); - return commentQuery; - } - } - - } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/query/CreateClueComponentQuery.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/query/CreateClueComponentQuery.java index 2cefcbd..df99c66 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/query/CreateClueComponentQuery.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/query/CreateClueComponentQuery.java @@ -1,6 +1,11 @@ package com.dyj.applet.domain.query; import com.dyj.common.domain.query.BaseQuery; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import java.util.List; @@ -8,6 +13,12 @@ import java.util.List; * @author danmo * @date 2024-04-18 15:16 **/ + +@EqualsAndHashCode(callSuper = true) +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder +@Data public class CreateClueComponentQuery extends BaseQuery { /** @@ -31,84 +42,4 @@ public class CreateClueComponentQuery extends BaseQuery { * 小程序的服务类目id，格式为"xx,xx,xx"，需要传小程序已审核通过的服务类目id，获取小程序已设置的服务类目见获取服务类目 */ private String category_id; - - - public String getConfig_name() { - return config_name; - } - - public void setConfig_name(String config_name) { - this.config_name = config_name; - } - - public String getRegion() { - return region; - } - - public void setRegion(String region) { - this.region = region; - } - - public List getRegion_list() { - return region_list; - } - - public void setRegion_list(List region_list) { - this.region_list = region_list; - } - - public String getCategory_id() { - return category_id; - } - - public void setCategory_id(String category_id) { - this.category_id = category_id; - } - - public static CreateClueComponentQueryBuilder builder() { - return new CreateClueComponentQueryBuilder(); - } - - public static class CreateClueComponentQueryBuilder { - private String configName; - private String region; - private List regionList; - private String categoryId; - private Integer tenantId; - private String clientKey; - public CreateClueComponentQueryBuilder configName(String configName) { - this.configName = configName; - return this; - } - public CreateClueComponentQueryBuilder region(String region) { - this.region = region; - return this; - } - public CreateClueComponentQueryBuilder regionList(List regionList) { - this.regionList = regionList; - return this; - } - public CreateClueComponentQueryBuilder categoryId(String categoryId) { - this.categoryId = categoryId; - return this; - } - public CreateClueComponentQueryBuilder tenantId(Integer tenantId) { - this.tenantId = tenantId; - return this; - } - public CreateClueComponentQueryBuilder clientKey(String clientKey) { - this.clientKey = clientKey; - return this; - } - public CreateClueComponentQuery build() { - CreateClueComponentQuery createClueComponentQuery = new CreateClueComponentQuery(); - createClueComponentQuery.setConfig_name(configName); - createClueComponentQuery.setRegion(region); - createClueComponentQuery.setRegion_list(regionList); - createClueComponentQuery.setCategory_id(categoryId); - createClueComponentQuery.setTenantId(tenantId); - createClueComponentQuery.setClientKey(clientKey); - return createClueComponentQuery; - } - } } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/query/CreateQrCodeQuery.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/query/CreateQrCodeQuery.java index 4c43949..7ffc1bd 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/query/CreateQrCodeQuery.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/query/CreateQrCodeQuery.java @@ -2,11 +2,22 @@ package com.dyj.applet.domain.query; import com.dyj.applet.domain.ColorRGB; import com.dyj.common.domain.query.BaseQuery; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; /** * @author danmo * @date 2024-04-17 14:20 **/ + +@EqualsAndHashCode(callSuper = true) +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder(toBuilder = true) +@Data public class CreateQrCodeQuery extends BaseQuery { private String app_id; @@ -23,152 +34,4 @@ public class CreateQrCodeQuery extends BaseQuery { private ColorRGB background; private String is_circle_code; - - public String getApp_id() { - return app_id; - } - - public void setApp_id(String app_id) { - this.app_id = app_id; - } - - public String getApp_name() { - return app_name; - } - - public void setApp_name(String app_name) { - this.app_name = app_name; - } - - public String getPath() { - return path; - } - - public void setPath(String path) { - this.path = path; - } - - public Integer getWidth() { - return width; - } - - public void setWidth(Integer width) { - this.width = width; - } - - public Boolean getSet_icon() { - return set_icon; - } - - public void setSet_icon(Boolean set_icon) { - this.set_icon = set_icon; - } - - public ColorRGB getLine_color() { - return line_color; - } - - public void setLine_color(ColorRGB line_color) { - this.line_color = line_color; - } - - public ColorRGB getBackground() { - return background; - } - - public void setBackground(ColorRGB background) { - this.background = background; - } - - public String getIs_circle_code() { - return is_circle_code; - } - - public void setIs_circle_code(String is_circle_code) { - this.is_circle_code = is_circle_code; - } - - public static CreateQrCodeQueryBuilder builder() { - return new CreateQrCodeQueryBuilder(); - } - - public static class CreateQrCodeQueryBuilder { - private String appId; - private String appName; - private String path; - private Integer width; - private Boolean setIcon; - private ColorRGB lineColor; - private ColorRGB background; - - private String isCircleCode; - - private Integer tenantId; - private String clientKey; - - public CreateQrCodeQueryBuilder appId(String appId) { - this.appId = appId; - return this; - } - - public CreateQrCodeQueryBuilder appName(String appName) { - this.appName = appName; - return this; - } - - public CreateQrCodeQueryBuilder path(String path) { - this.path = path; - return this; - } - - public CreateQrCodeQueryBuilder width(Integer width) { - this.width = width; - return this; - } - - public CreateQrCodeQueryBuilder setIcon(Boolean setIcon) { - this.setIcon = setIcon; - return this; - } - - public CreateQrCodeQueryBuilder lineColor(ColorRGB lineColor) { - this.lineColor = lineColor; - return this; - } - - public CreateQrCodeQueryBuilder background(ColorRGB background) { - this.background = background; - return this; - } - - public CreateQrCodeQueryBuilder isCircleCode(String isCircleCode) { - this.isCircleCode = isCircleCode; - return this; - } - - public CreateQrCodeQueryBuilder tenantId(Integer tenantId) { - this.tenantId = tenantId; - return this; - } - - public CreateQrCodeQueryBuilder clientKey(String clientKey) { - this.clientKey = clientKey; - return this; - } - - public CreateQrCodeQuery build() { - CreateQrCodeQuery createQrCodeQuery = new CreateQrCodeQuery(); - createQrCodeQuery.setApp_id(appId); - createQrCodeQuery.setApp_name(appName); - createQrCodeQuery.setPath(path); - createQrCodeQuery.setWidth(width); - createQrCodeQuery.setSet_icon(setIcon); - createQrCodeQuery.setLine_color(lineColor); - createQrCodeQuery.setBackground(background); - createQrCodeQuery.setIs_circle_code(isCircleCode); - createQrCodeQuery.setTenantId(tenantId); - createQrCodeQuery.setClientKey(clientKey); - return createQrCodeQuery; - } - } } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/query/CreateSearchSubQuery.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/query/CreateSearchSubQuery.java index 2977bdc..f11a4fc 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/query/CreateSearchSubQuery.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/query/CreateSearchSubQuery.java @@ -1,6 +1,11 @@ package com.dyj.applet.domain.query; import com.dyj.common.domain.query.BaseQuery; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import java.util.List; @@ -8,6 +13,11 @@ import java.util.List; * @author danmo * @date 2024-04-22 18:46 **/ +@EqualsAndHashCode(callSuper = true) +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder(toBuilder = true) +@Data public class CreateSearchSubQuery extends BaseQuery { /** @@ -28,79 +38,5 @@ public class CreateSearchSubQuery extends BaseQuery { */ private String sub_service_name; - public List getSearch_key_word() { - return search_key_word; - } - public void setSearch_key_word(List search_key_word) { - this.search_key_word = search_key_word; - } - - public String getStart_page_url() { - return start_page_url; - } - - public void setStart_page_url(String start_page_url) { - this.start_page_url = start_page_url; - } - - public String getSub_service_name() { - return sub_service_name; - } - - public void setSub_service_name(String sub_service_name) { - this.sub_service_name = sub_service_name; - } - - public static CreateSearchSubQueryBuilder builder() { - return new CreateSearchSubQueryBuilder(); - } - - public static class CreateSearchSubQueryBuilder { - - private List searchKeyWord; - - private String startPageUrl; - - private String subServiceName; - - private Integer tenantId; - - private String clientKey; - - public CreateSearchSubQueryBuilder searchKeyWord(List searchKeyWord) { - this.searchKeyWord = searchKeyWord; - return this; - } - - public CreateSearchSubQueryBuilder startPageUrl(String startPageUrl) { - this.startPageUrl = startPageUrl; - return this; - } - - public CreateSearchSubQueryBuilder subServiceName(String subServiceName) { - this.subServiceName = subServiceName; - return this; - } - - public CreateSearchSubQueryBuilder tenantId(Integer tenantId) { - this.tenantId = tenantId; - return this; - } - - public CreateSearchSubQueryBuilder clientKey(String clientKey) { - this.clientKey = clientKey; - return this; - } - - public CreateSearchSubQuery build() { - CreateSearchSubQuery createSearchSubQuery = new CreateSearchSubQuery(); - createSearchSubQuery.setSearch_key_word(searchKeyWord); - createSearchSubQuery.setStart_page_url(startPageUrl); - createSearchSubQuery.setSub_service_name(subServiceName); - createSearchSubQuery.setTenantId(tenantId); - createSearchSubQuery.setClientKey(clientKey); - return createSearchSubQuery; - } - } } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/query/GenerateSchemaQuery.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/query/GenerateSchemaQuery.java index 1715324..6e5ad79 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/query/GenerateSchemaQuery.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/query/GenerateSchemaQuery.java @@ -32,96 +32,4 @@ public class GenerateSchemaQuery extends BaseQuery { */ private String query; - public String getApp_id() { - return app_id; - } - - public void setApp_id(String app_id) { - this.app_id = app_id; - } - - public Boolean getNo_expire() { - return no_expire; - } - - public void setNo_expire(Boolean no_expire) { - this.no_expire = no_expire; - } - - public Long getExpire_time() { - return expire_time; - } - - public void setExpire_time(Long expire_time) { - this.expire_time = expire_time; - } - - public String getPath() { - return path; - } - - public void setPath(String path) { - this.path = path; - } - - public String getQuery() { - return query; - } - - public void setQuery(String query) { - this.query = query; - } - - public static GenerateSchemaBuilder builder() { - return new GenerateSchemaBuilder(); - } - - public static class GenerateSchemaBuilder { - private String appId; - private Boolean noExpire; - private Long expireTime; - private String path; - private String query; - private Integer tenantId; - private String clientKey; - public GenerateSchemaBuilder tenantId(Integer tenantId) { - this.tenantId = tenantId; - return this; - } - public GenerateSchemaBuilder clientKey(String clientKey) { - this.clientKey = clientKey; - return this; - } - public GenerateSchemaBuilder appId(String appId) { - this.appId = appId; - return this; - } - public GenerateSchemaBuilder noExpire(Boolean noExpire) { - this.noExpire = noExpire; - return this; - } - public GenerateSchemaBuilder expireTime(Long expireTime) { - this.expireTime = expireTime; - return this; - } - public GenerateSchemaBuilder path(String path) { - this.path = path; - return this; - } - public GenerateSchemaBuilder query(String query) { - this.query = query; - return this; - } - public GenerateSchemaQuery build() { - GenerateSchemaQuery generateSchemaQuery = new GenerateSchemaQuery(); - generateSchemaQuery.setApp_id(appId); - generateSchemaQuery.setNo_expire(noExpire); - generateSchemaQuery.setExpire_time(expireTime); - generateSchemaQuery.setPath(path); - generateSchemaQuery.setQuery(query); - generateSchemaQuery.setTenantId(tenantId); - generateSchemaQuery.setClientKey(clientKey); - return generateSchemaQuery; - } - } } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/query/GenerateUrlLinkQuery.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/query/GenerateUrlLinkQuery.java index 5d7b8b7..7d6ddb9 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/query/GenerateUrlLinkQuery.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/query/GenerateUrlLinkQuery.java @@ -31,98 +31,4 @@ public class GenerateUrlLinkQuery extends BaseQuery { * 最大1024个字符，只支持数字，大小写英文以及部分特殊字符：`{}!#$&'()*+,/:;=?@-._~%``。 */ private String query; - - public String getApp_id() { - return app_id; - } - - public void setApp_id(String app_id) { - this.app_id = app_id; - } - - public String getApp_name() { - return app_name; - } - - public void setApp_name(String app_name) { - this.app_name = app_name; - } - - public Long getExpire_time() { - return expire_time; - } - - public void setExpire_time(Long expire_time) { - this.expire_time = expire_time; - } - - public String getPath() { - return path; - } - - public void setPath(String path) { - this.path = path; - } - - public String getQuery() { - return query; - } - - public void setQuery(String query) { - this.query = query; - } - - public static GenerateSchemaBuilder builder() { - return new GenerateSchemaBuilder(); - } - - public static class GenerateSchemaBuilder { - private String appId; - private String appName; - private Long expireTime; - private String path; - private String query; - private Integer tenantId; - private String clientKey; - public GenerateSchemaBuilder tenantId(Integer tenantId) { - this.tenantId = tenantId; - return this; - } - public GenerateSchemaBuilder clientKey(String clientKey) { - this.clientKey = clientKey; - return this; - } - public GenerateSchemaBuilder appId(String appId) { - this.appId = appId; - return this; - } - - public GenerateSchemaBuilder appName(String appName) { - this.appName = appName; - return this; - } - public GenerateSchemaBuilder expireTime(Long expireTime) { - this.expireTime = expireTime; - return this; - } - public GenerateSchemaBuilder path(String path) { - this.path = path; - return this; - } - public GenerateSchemaBuilder query(String query) { - this.query = query; - return this; - } - public GenerateUrlLinkQuery build() { - GenerateUrlLinkQuery generateUrlLinkQuery = new GenerateUrlLinkQuery(); - generateUrlLinkQuery.setApp_id(appId); - generateUrlLinkQuery.setApp_name(appName); - generateUrlLinkQuery.setExpire_time(expireTime); - generateUrlLinkQuery.setPath(path); - generateUrlLinkQuery.setQuery(query); - generateUrlLinkQuery.setTenantId(tenantId); - generateUrlLinkQuery.setClientKey(clientKey); - return generateUrlLinkQuery; - } - } } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/query/ImAuthStatusQuery.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/query/ImAuthStatusQuery.java index 6acbac6..f900399 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/query/ImAuthStatusQuery.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/query/ImAuthStatusQuery.java @@ -1,11 +1,21 @@ package com.dyj.applet.domain.query; import com.dyj.common.domain.query.UserInfoQuery; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; /** * @author danmo * @date 2024-04-18 13:35 **/ +@EqualsAndHashCode(callSuper = true) +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder(toBuilder = true) +@Data public class ImAuthStatusQuery extends UserInfoQuery { /** @@ -18,66 +28,4 @@ public class ImAuthStatusQuery extends UserInfoQuery { */ private String app_id; - public String getC_open_id() { - return c_open_id; - } - - public void setC_open_id(String c_open_id) { - this.c_open_id = c_open_id; - } - - public String getApp_id() { - return app_id; - } - - public void setApp_id(String app_id) { - this.app_id = app_id; - } - - public static ImAuthStatusQueryBuilder builder() { - return new ImAuthStatusQueryBuilder(); - } - - public static class ImAuthStatusQueryBuilder { - private String cOpenId; - private String appId; - private Integer tenantId; - private String clientKey; - private String openId; - - public ImAuthStatusQueryBuilder cOpenId(String cOpenId) { - this.cOpenId = cOpenId; - return this; - } - public ImAuthStatusQueryBuilder appId(String appId) { - this.appId = appId; - return this; - } - - public ImAuthStatusQueryBuilder tenantId(Integer tenantId) { - this.tenantId = tenantId; - return this; - } - - public ImAuthStatusQueryBuilder clientKey(String clientKey) { - this.clientKey = clientKey; - return this; - } - - public ImAuthStatusQueryBuilder openId(String openId) { - this.openId = openId; - return this; - } - - public ImAuthStatusQuery build() { - ImAuthStatusQuery imAuthStatusQuery = new ImAuthStatusQuery(); - imAuthStatusQuery.setC_open_id(cOpenId); - imAuthStatusQuery.setApp_id(appId); - imAuthStatusQuery.setTenantId(tenantId); - imAuthStatusQuery.setClientKey(clientKey); - imAuthStatusQuery.setOpen_id(openId); - return imAuthStatusQuery; - } - - } } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/query/ImAuthorizeUserListQuery.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/query/ImAuthorizeUserListQuery.java index da2857d..fa11452 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/query/ImAuthorizeUserListQuery.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/query/ImAuthorizeUserListQuery.java @@ -12,74 +12,4 @@ public class ImAuthorizeUserListQuery extends UserInfoQuery { private Long page_size; - - - public Long getPage_num() { - return page_num; - } - - public void setPage_num(Long page_num) { - this.page_num = page_num; - } - - public Long getPage_size() { - return page_size; - } - - public void setPage_size(Long page_size) { - this.page_size = page_size; - } - - public static AuthorizeUserListQueryBuilder builder() { - return new AuthorizeUserListQueryBuilder(); - } - - public static class AuthorizeUserListQueryBuilder { - private Long pageNum; - - private Long pageSize; - - private String openId; - - private String clientKey; - - private Integer tenantId; - - public AuthorizeUserListQueryBuilder pageNum(Long pageNum) { - this.pageNum = pageNum; - return this; - } - - public AuthorizeUserListQueryBuilder pageSize(Long pageSize) { - this.pageSize = pageSize; - return this; - } - - public AuthorizeUserListQueryBuilder openId(String openId) { - this.openId = openId; - return this; - } - - public AuthorizeUserListQueryBuilder clientKey(String clientKey) { - this.clientKey = clientKey; - return this; - } - - public AuthorizeUserListQueryBuilder tenantId(Integer tenantId) { - this.tenantId = tenantId; - return this; - } - public ImAuthorizeUserListQuery build() { - ImAuthorizeUserListQuery authorizeUserListQuery = new ImAuthorizeUserListQuery(); - authorizeUserListQuery.setPage_num(pageNum); - authorizeUserListQuery.setPage_size(pageSize); - authorizeUserListQuery.setOpen_id(openId); - authorizeUserListQuery.setClientKey(clientKey); - authorizeUserListQuery.setTenantId(tenantId); - return authorizeUserListQuery; - } - } - - - } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/query/ItemId2EncryptIdQuery.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/query/ItemId2EncryptIdQuery.java index 1a2b42c..1ed58c3 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/query/ItemId2EncryptIdQuery.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/query/ItemId2EncryptIdQuery.java @@ -1,6 +1,11 @@ package com.dyj.applet.domain.query; import com.dyj.common.domain.query.BaseQuery; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import java.util.List; @@ -8,6 +13,11 @@ import java.util.List; * @author danmo * @date 2024-04-19 14:33 **/ +@EqualsAndHashCode(callSuper = true) +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder(toBuilder = true) +@Data public class ItemId2EncryptIdQuery extends BaseQuery { /** @@ -20,62 +30,4 @@ public class ItemId2EncryptIdQuery extends BaseQuery { */ private List video_ids; - public String getAccess_key() { - return access_key; - } - - public void setAccess_key(String access_key) { - this.access_key = access_key; - } - - public List getVideo_ids() { - return video_ids; - } - - public void setVideo_ids(List video_ids) { - this.video_ids = video_ids; - } - - public static ItemId2EncryptIdQueryBuilder builder() { - return new ItemId2EncryptIdQueryBuilder(); - } - - public static class ItemId2EncryptIdQueryBuilder { - private String accessKey; - - private List videoIds; - - private Integer tenantId; - - private String clientKey; - - public ItemId2EncryptIdQueryBuilder accessKey(String accessKey) { - this.accessKey = accessKey; - return this; - } - - public ItemId2EncryptIdQueryBuilder videoIds(List videoIds) { - this.videoIds = videoIds; - return this; - } - - public ItemId2EncryptIdQueryBuilder tenantId(Integer tenantId) { - this.tenantId = tenantId; - return this; - } - - public ItemId2EncryptIdQueryBuilder clientKey(String clientKey) { - this.clientKey = clientKey; - return this; - } - - public ItemId2EncryptIdQuery build() { - ItemId2EncryptIdQuery itemId2EncryptIdQuery = new ItemId2EncryptIdQuery(); - itemId2EncryptIdQuery.setAccess_key(accessKey); - itemId2EncryptIdQuery.setVideo_ids(videoIds); - itemId2EncryptIdQuery.setTenantId(tenantId); - itemId2EncryptIdQuery.setClientKey(clientKey); - return itemId2EncryptIdQuery; - } - } } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/query/RevokeMsgQuery.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/query/RevokeMsgQuery.java index ffb5c1d..3109973 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/query/RevokeMsgQuery.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/query/RevokeMsgQuery.java @@ -24,78 +24,4 @@ public class RevokeMsgQuery extends UserInfoQuery { private String msg_id; - public String getConversation_id() { - return conversation_id; - } - - public void setConversation_id(String conversation_id) { - this.conversation_id = conversation_id; - } - - public Integer getConversation_type() { - return conversation_type; - } - - public void setConversation_type(Integer conversation_type) { - this.conversation_type = conversation_type; - } - - public String getMsg_id() { - return msg_id; - } - - public void setMsg_id(String msg_id) { - this.msg_id = msg_id; - } - - public static RevokeMsgQueryBuilder builder() { - return new RevokeMsgQueryBuilder(); - } - - public static class RevokeMsgQueryBuilder { - private String conversationId; - private Integer conversationType; - private String msgId; - private String openId; - private Integer tenantId; - private String clientKey; - - public RevokeMsgQueryBuilder conversationId(String conversationId) { - this.conversationId = conversationId; - return this; - } - public RevokeMsgQueryBuilder conversationType(Integer conversationType) { - this.conversationType = conversationType; - return this; - } - public RevokeMsgQueryBuilder msgId(String msgId) { - this.msgId = msgId; - return this; - } - public RevokeMsgQueryBuilder openId(String openId) { - this.openId = openId; - return this; - } - public RevokeMsgQueryBuilder tenantId(Integer tenantId) { - this.tenantId = tenantId; - return this; - } - public RevokeMsgQueryBuilder clientKey(String clientKey) { - this.clientKey = clientKey; - return this; - } - - public RevokeMsgQuery build() { - RevokeMsgQuery revokeMsgQuery = new RevokeMsgQuery(); - revokeMsgQuery.setConversation_id(conversationId); - revokeMsgQuery.setConversation_type(conversationType); - revokeMsgQuery.setMsg_id(msgId); - revokeMsgQuery.setOpen_id(openId); - revokeMsgQuery.setTenantId(tenantId); - revokeMsgQuery.setClientKey(clientKey); - return revokeMsgQuery; - } -} - - } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/query/SendMsgQuery.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/query/SendMsgQuery.java index 83eabf0..4745da9 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/query/SendMsgQuery.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/query/SendMsgQuery.java @@ -1,6 +1,11 @@ package com.dyj.applet.domain.query; import com.dyj.common.domain.query.UserInfoQuery; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import java.util.List; @@ -8,7 +13,12 @@ import java.util.List; * @author danmo * @date 2024-04-08 13:37 **/ -public class SendMsgQuery extends UserInfoQuery { +@EqualsAndHashCode(callSuper = true) +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder(toBuilder = true) +@Data +public class SendMsgQuery extends UserInfoQuery { /** * 消息id，场景一、场景二必传 @@ -40,7 +50,7 @@ public class SendMsgQuery extends UserInfoQuery { * 小程序券 content * 主动私信卡片 content */ - private T content; + private String content; /** * 私信场景 @@ -56,130 +66,5 @@ public class SendMsgQuery extends UserInfoQuery { * 场景三必须包含一条小程序卡片消息 * 场景四必须包含一条小程序卡片/主动私信卡片/小程序券消息 */ - private List content_list; - - public String getMsg_id() { - return msg_id; - } - - public void setMsg_id(String msg_id) { - this.msg_id = msg_id; - } - - public String getConversation_id() { - return conversation_id; - } - - public void setConversation_id(String conversation_id) { - this.conversation_id = conversation_id; - } - - public String getTo_user_id() { - return to_user_id; - } - - public void setTo_user_id(String to_user_id) { - this.to_user_id = to_user_id; - } - - public T getContent() { - return content; - } - - public void setContent(T content) { - this.content = content; - } - - public String getScene() { - return scene; - } - - public void setScene(String scene) { - this.scene = scene; - } - - public List getContent_list() { - return content_list; - } - - public void setContent_list(List content_list) { - this.content_list = content_list; - } - - public static SendMsgQueryBuilder builder() { - return new SendMsgQueryBuilder(); - } - public static class SendMsgQueryBuilder { - private String msgId; - private String conversationId; - private String toUserId; - private T content; - private String scene; - private List contentList; - - private Integer tenantId; - private String clientKey; - private String openId; - - public SendMsgQueryBuilder msgId(String msgId) { - this.msgId = msgId; - return this; - } - - public SendMsgQueryBuilder conversationId(String conversationId) { - this.conversationId = conversationId; - return this; - } - - public SendMsgQueryBuilder toUserId(String toUserId) { - this.toUserId = toUserId; - return this; - } - - public SendMsgQueryBuilder content(T content) { - this.content = content; - return this; - } - - public SendMsgQueryBuilder scene(String scene) { - this.scene = scene; - return this; - } - - public SendMsgQueryBuilder contentList(List contentList) { - this.contentList = contentList; - return this; - } - - public SendMsgQueryBuilder tenantId(Integer tenantId) { - this.tenantId = tenantId; - return this; - } - - public SendMsgQueryBuilder clientKey(String clientKey) { - this.clientKey = clientKey; - return this; - } - - public SendMsgQueryBuilder openId(String openId) { - this.openId = openId; - return this; - } - - - public SendMsgQuery build() { - SendMsgQuery sendMsgQuery = new SendMsgQuery(); - sendMsgQuery.setMsg_id(msgId); - sendMsgQuery.setConversation_id(conversationId); - sendMsgQuery.setTo_user_id(toUserId); - sendMsgQuery.setContent(content); - sendMsgQuery.setScene(scene); - sendMsgQuery.setContent_list(contentList); - sendMsgQuery.setTenantId(tenantId); - sendMsgQuery.setClientKey(clientKey); - sendMsgQuery.setOpen_id(openId); - return sendMsgQuery; - } - } - + private List content_list; } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/query/UpdateClueComponentQuery.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/query/UpdateClueComponentQuery.java index 6137abe..948e445 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/query/UpdateClueComponentQuery.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/query/UpdateClueComponentQuery.java @@ -1,6 +1,11 @@ package com.dyj.applet.domain.query; import com.dyj.common.domain.query.BaseQuery; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import java.util.List; @@ -8,6 +13,11 @@ import java.util.List; * @author danmo * @date 2024-04-18 15:16 **/ +@EqualsAndHashCode(callSuper = true) +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder(toBuilder = true) +@Data public class UpdateClueComponentQuery extends BaseQuery { /** @@ -35,98 +45,4 @@ public class UpdateClueComponentQuery extends BaseQuery { * 小程序的服务类目id，格式为"xx,xx,xx"，需要传小程序已审核通过的服务类目id，获取小程序已设置的服务类目见获取服务类目 */ private String category_id; - - public String getConfig_id() { - return config_id; - } - - public void setConfig_id(String config_id) { - this.config_id = config_id; - } - - public String getConfig_name() { - return config_name; - } - - public void setConfig_name(String config_name) { - this.config_name = config_name; - } - - public String getRegion() { - return region; - } - - public void setRegion(String region) { - this.region = region; - } - - public List getRegion_list() { - return region_list; - } - - public void setRegion_list(List region_list) { - this.region_list = region_list; - } - - public String getCategory_id() { - return category_id; - } - - public void setCategory_id(String category_id) { - this.category_id = category_id; - } - - public static CreateClueComponentQueryBuilder builder() { - return new CreateClueComponentQueryBuilder(); - } - - public static class CreateClueComponentQueryBuilder { - private String configId; - private String configName; - private String region; - private List regionList; - private String categoryId; - private Integer tenantId; - private String clientKey; - - public CreateClueComponentQueryBuilder configId(String configId) { - this.configId = configId; - return this; - } - public CreateClueComponentQueryBuilder configName(String configName) { - this.configName = configName; - return this; - } - public CreateClueComponentQueryBuilder region(String region) { - this.region = region; - return this; - } - public CreateClueComponentQueryBuilder regionList(List regionList) { - this.regionList = regionList; - return this; - } - public CreateClueComponentQueryBuilder categoryId(String categoryId) { - this.categoryId = categoryId; - return this; - } - public CreateClueComponentQueryBuilder tenantId(Integer tenantId) { - this.tenantId = tenantId; - return this; - } - public CreateClueComponentQueryBuilder clientKey(String clientKey) { - this.clientKey = clientKey; - return this; - } - public UpdateClueComponentQuery build() { - UpdateClueComponentQuery createClueComponentQuery = new UpdateClueComponentQuery(); - createClueComponentQuery.setConfig_id(configId); - createClueComponentQuery.setConfig_name(configName); - createClueComponentQuery.setRegion(region); - createClueComponentQuery.setRegion_list(regionList); - createClueComponentQuery.setCategory_id(categoryId); - createClueComponentQuery.setTenantId(tenantId); - createClueComponentQuery.setClientKey(clientKey); - return createClueComponentQuery; - } - } } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/query/VideoId2ItemIdQuery.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/query/VideoId2ItemIdQuery.java index 0af8279..68799e3 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/query/VideoId2ItemIdQuery.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/query/VideoId2ItemIdQuery.java @@ -1,6 +1,11 @@ package com.dyj.applet.domain.query; import com.dyj.common.domain.query.BaseQuery; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import java.util.List; @@ -8,6 +13,11 @@ import java.util.List; * @author danmo * @date 2024-04-19 14:27 **/ +@EqualsAndHashCode(callSuper = true) +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder(toBuilder = true) +@Data public class VideoId2ItemIdQuery extends BaseQuery { /** @@ -23,75 +33,4 @@ public class VideoId2ItemIdQuery extends BaseQuery { private List video_ids; - public String getAccess_key() { - return access_key; - } - - public void setAccess_key(String access_key) { - this.access_key = access_key; - } - - public String getApp_id() { - return app_id; - } - - public void setApp_id(String app_id) { - this.app_id = app_id; - } - - public List getVideo_ids() { - return video_ids; - } - - public void setVideo_ids(List video_ids) { - this.video_ids = video_ids; - } - - public static VideoId2ItemIdQueryBuilder builder() { - return new VideoId2ItemIdQueryBuilder(); - } - - public static class VideoId2ItemIdQueryBuilder { - private String accessKey; - private String appId; - private List videoIds; - private Integer tenantId; - private String clientKey; - - public VideoId2ItemIdQueryBuilder accessKey(String accessKey) { - this.accessKey = accessKey; - return this; - } - - public VideoId2ItemIdQueryBuilder appId(String appId) { - this.appId = appId; - return this; - } - - public VideoId2ItemIdQueryBuilder videoIds(List videoIds) { - this.videoIds = videoIds; - return this; - } - - public VideoId2ItemIdQueryBuilder tenantId(Integer tenantId) { - this.tenantId = tenantId; - return this; - } - - public VideoId2ItemIdQueryBuilder clientKey(String clientKey) { - this.clientKey = clientKey; - return this; - } - - public VideoId2ItemIdQuery build() { - VideoId2ItemIdQuery videoId2ItemIdQuery = new VideoId2ItemIdQuery(); - videoId2ItemIdQuery.setAccess_key(accessKey); - videoId2ItemIdQuery.setApp_id(appId); - videoId2ItemIdQuery.setVideo_ids(videoIds); - videoId2ItemIdQuery.setTenantId(tenantId); - videoId2ItemIdQuery.setClientKey(clientKey); - return videoId2ItemIdQuery; - } - -} } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/AptVideoListVo.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/AptVideoListVo.java index c55a9f5..7910f2a 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/AptVideoListVo.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/AptVideoListVo.java @@ -2,9 +2,19 @@ package com.dyj.applet.domain.vo; import com.dyj.applet.domain.AptAccountVideo; import com.dyj.common.domain.vo.BaseVo; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import java.util.List; +@EqualsAndHashCode(callSuper = true) +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder(toBuilder = true) +@Data public class AptVideoListVo extends BaseVo { private Long cursor; @@ -12,28 +22,4 @@ public class AptVideoListVo extends BaseVo { private Boolean has_more; private List list; - - public Long getCursor() { - return cursor; - } - - public void setCursor(Long cursor) { - this.cursor = cursor; - } - - public Boolean getHas_more() { - return has_more; - } - - public void setHas_more(Boolean has_more) { - this.has_more = has_more; - } - - public List getList() { - return list; - } - - public void setList(List list) { - this.list = list; - } } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/AuthSendMsgVo.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/AuthSendMsgVo.java index a4b5fae..dcb547e 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/AuthSendMsgVo.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/AuthSendMsgVo.java @@ -1,18 +1,16 @@ package com.dyj.applet.domain.vo; +import lombok.*; +import lombok.experimental.SuperBuilder; + /** * @author danmo * @date 2024-04-18 11:40 **/ +@AllArgsConstructor +@Builder +@Data public class AuthSendMsgVo { private String msg_id; - - public String getMsg_id() { - return msg_id; - } - - public void setMsg_id(String msg_id) { - this.msg_id = msg_id; - } } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/CheckSearchSubVo.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/CheckSearchSubVo.java index e1da210..f5b11d1 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/CheckSearchSubVo.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/CheckSearchSubVo.java @@ -1,22 +1,20 @@ package com.dyj.applet.domain.vo; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; + /** * @author danmo * @date 2024-04-22 15:15 **/ +@AllArgsConstructor +@Builder +@Data public class CheckSearchSubVo { /** * 是否有权限 */ private Boolean has_permission; - - - public Boolean getHas_permission() { - return has_permission; - } - - public void setHas_permission(Boolean has_permission) { - this.has_permission = has_permission; - } } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/ClueComponentVo.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/ClueComponentVo.java index 96ca9e0..4ed4099 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/ClueComponentVo.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/ClueComponentVo.java @@ -1,11 +1,17 @@ package com.dyj.applet.domain.vo; import com.dyj.applet.domain.ClueComponent; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; /** * @author danmo * @date 2024-04-18 15:27 **/ +@AllArgsConstructor +@Builder +@Data public class ClueComponentVo { /** @@ -23,27 +29,5 @@ public class ClueComponentVo { */ private Long total; - public ClueComponent getClue_component_list() { - return clue_component_list; - } - public void setClue_component_list(ClueComponent clue_component_list) { - this.clue_component_list = clue_component_list; - } - - public Boolean getCert_status() { - return cert_status; - } - - public void setCert_status(Boolean cert_status) { - this.cert_status = cert_status; - } - - public Long getTotal() { - return total; - } - - public void setTotal(Long total) { - this.total = total; - } } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/Code2SessionVo.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/Code2SessionVo.java index b60d00b..83f18d5 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/Code2SessionVo.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/Code2SessionVo.java @@ -1,9 +1,16 @@ package com.dyj.applet.domain.vo; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; + /** * @author danmo * @date 2024-04-17 10:57 **/ +@AllArgsConstructor +@Builder +@Data public class Code2SessionVo { /** @@ -29,36 +36,4 @@ public class Code2SessionVo { */ private String anonymous_openid; - - public String getSession_key() { - return session_key; - } - - public void setSession_key(String session_key) { - this.session_key = session_key; - } - - public String getOpenid() { - return openid; - } - - public void setOpenid(String openid) { - this.openid = openid; - } - - public String getUnionid() { - return unionid; - } - - public void setUnionid(String unionid) { - this.unionid = unionid; - } - - public String getAnonymous_openid() { - return anonymous_openid; - } - - public void setAnonymous_openid(String anonymous_openid) { - this.anonymous_openid = anonymous_openid; - } } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/CommentListVo.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/CommentListVo.java index c348980..10be97d 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/CommentListVo.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/CommentListVo.java @@ -2,6 +2,8 @@ package com.dyj.applet.domain.vo; import com.dyj.applet.domain.Comment; import com.dyj.common.domain.vo.BaseVo; +import lombok.*; +import lombok.experimental.SuperBuilder; import java.util.List; @@ -9,6 +11,11 @@ import java.util.List; * @author danmo * @date 2024-04-10 16:57 **/ +@EqualsAndHashCode(callSuper = true) +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder(toBuilder = true) +@Data public class CommentListVo extends BaseVo { /** @@ -26,28 +33,4 @@ public class CommentListVo extends BaseVo { */ private List list; - public Long getCursor() { - return cursor; - } - - public void setCursor(Long cursor) { - this.cursor = cursor; - } - - public Boolean getHas_more() { - return has_more; - } - - public void setHas_more(Boolean has_more) { - this.has_more = has_more; - } - - public List getList() { - return list; - } - - public void setList(List list) { - this.list = list; - } - } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/CommentReplyVo.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/CommentReplyVo.java index 4e17ec8..b5311eb 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/CommentReplyVo.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/CommentReplyVo.java @@ -1,11 +1,21 @@ package com.dyj.applet.domain.vo; import com.dyj.common.domain.vo.BaseVo; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; /** * @author danmo * @date 2024-04-10 17:09 **/ +@EqualsAndHashCode(callSuper = true) +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder(toBuilder = true) +@Data public class CommentReplyVo extends BaseVo { /** @@ -22,30 +32,4 @@ public class CommentReplyVo extends BaseVo { * 用户昵称 */ private String nick_name; - - public String getComment_id() { - return comment_id; - } - - public void setComment_id(String comment_id) { - this.comment_id = comment_id; - } - - public String getAvatar() { - return avatar; - } - - public void setAvatar(String avatar) { - this.avatar = avatar; - } - - public String getNick_name() { - return nick_name; - } - - public void setNick_name(String nick_name) { - this.nick_name = nick_name; - } - - } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/ConvertResultVo.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/ConvertResultVo.java index 9dc2c3b..122636e 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/ConvertResultVo.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/ConvertResultVo.java @@ -1,20 +1,20 @@ package com.dyj.applet.domain.vo; import com.alibaba.fastjson.JSONObject; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; /** * @author danmo * @date 2024-04-19 14:30 **/ +@AllArgsConstructor +@NoArgsConstructor +@Data public class ConvertResultVo { private JSONObject convert_resul; - public JSONObject getConvert_resul() { - return convert_resul; - } - public void setConvert_resul(JSONObject convert_resul) { - this.convert_resul = convert_resul; - } } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/CreateClueComponentVo.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/CreateClueComponentVo.java index 615164d..209cb44 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/CreateClueComponentVo.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/CreateClueComponentVo.java @@ -1,21 +1,20 @@ package com.dyj.applet.domain.vo; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + /** * @author danmo * @date 2024-04-18 15:20 **/ +@AllArgsConstructor +@NoArgsConstructor +@Data public class CreateClueComponentVo { /** * // 线索组件的id，唯一标识 */ private String config_id; - - public String getConfig_id() { - return config_id; - } - - public void setConfig_id(String config_id) { - this.config_id = config_id; - } } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/GenerateSchemaVo.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/GenerateSchemaVo.java index 9e2df0c..60fac7f 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/GenerateSchemaVo.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/GenerateSchemaVo.java @@ -1,18 +1,18 @@ package com.dyj.applet.domain.vo; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + /** * @author danmo * @date 2024-04-17 13:52 **/ +@AllArgsConstructor +@NoArgsConstructor +@Data public class GenerateSchemaVo { private String schema; - public String getSchema() { - return schema; - } - - public void setSchema(String schema) { - this.schema = schema; - } } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/GenerateUrlLinkVo.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/GenerateUrlLinkVo.java index 6a45e74..543549f 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/GenerateUrlLinkVo.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/GenerateUrlLinkVo.java @@ -1,18 +1,17 @@ package com.dyj.applet.domain.vo; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + /** * @author danmo * @date 2024-04-17 13:52 **/ +@AllArgsConstructor +@NoArgsConstructor +@Data public class GenerateUrlLinkVo { private String url_link; - - public String getUrl_link() { - return url_link; - } - - public void setUrl_link(String url_link) { - this.url_link = url_link; - } } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/ImAuthStatusVo.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/ImAuthStatusVo.java index 852acd4..3db05e0 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/ImAuthStatusVo.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/ImAuthStatusVo.java @@ -1,11 +1,17 @@ package com.dyj.applet.domain.vo; import com.dyj.applet.domain.AuthAttribution; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; /** * @author danmo * @date 2024-04-18 13:39 **/ +@AllArgsConstructor +@NoArgsConstructor +@Data public class ImAuthStatusVo { /** @@ -47,51 +53,4 @@ public class ImAuthStatusVo { */ private String query; - public Integer getStatus() { - return status; - } - - public void setStatus(Integer status) { - this.status = status; - } - - public AuthAttribution getAttribution() { - return attribution; - } - - public void setAttribution(AuthAttribution attribution) { - this.attribution = attribution; - } - - public String getData_im_extra() { - return data_im_extra; - } - - public void setData_im_extra(String data_im_extra) { - this.data_im_extra = data_im_extra; - } - - public String getEnter_from() { - return enter_from; - } - - public void setEnter_from(String enter_from) { - this.enter_from = enter_from; - } - - public String getPath() { - return path; - } - - public void setPath(String path) { - this.path = path; - } - - public String getQuery() { - return query; - } - - public void setQuery(String query) { - this.query = query; - } } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/ImAuthUserListVo.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/ImAuthUserListVo.java index ab6dcb6..12972c6 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/ImAuthUserListVo.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/ImAuthUserListVo.java @@ -2,6 +2,11 @@ package com.dyj.applet.domain.vo; import com.dyj.applet.domain.ImAuthUser; import com.dyj.common.domain.vo.BaseVo; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import java.util.List; @@ -9,6 +14,11 @@ import java.util.List; * @author danmo * @date 2024-04-08 17:18 **/ +@EqualsAndHashCode(callSuper = true) +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder(toBuilder = true) +@Data public class ImAuthUserListVo extends BaseVo { private List auth_user_list; diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/ItemBaseInfoVo.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/ItemBaseInfoVo.java index b512830..77452ab 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/ItemBaseInfoVo.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/ItemBaseInfoVo.java @@ -2,20 +2,22 @@ package com.dyj.applet.domain.vo; import com.dyj.applet.domain.ItemBaseInfo; import com.dyj.common.domain.vo.BaseVo; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; /** * @author danmo * @date 2024-04-18 18:20 **/ +@EqualsAndHashCode(callSuper = true) +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder(toBuilder = true) +@Data public class ItemBaseInfoVo extends BaseVo { private ItemBaseInfo result; - - public ItemBaseInfo getResult() { - return result; - } - - public void setResult(ItemBaseInfo result) { - this.result = result; - } } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/ItemCommentInfoVo.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/ItemCommentInfoVo.java index 93604cf..b0a940a 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/ItemCommentInfoVo.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/ItemCommentInfoVo.java @@ -2,20 +2,22 @@ package com.dyj.applet.domain.vo; import com.dyj.applet.domain.ItemCommentInfo; import com.dyj.common.domain.vo.BaseVo; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; /** * @author danmo * @date 2024-04-19 11:16 **/ +@EqualsAndHashCode(callSuper = true) +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder(toBuilder = true) +@Data public class ItemCommentInfoVo extends BaseVo { private ItemCommentInfo result_list; - - public ItemCommentInfo getResult_list() { - return result_list; - } - - public void setResult_list(ItemCommentInfo result_list) { - this.result_list = result_list; - } } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/ItemLikeInfoVo.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/ItemLikeInfoVo.java index 2e197fd..3fa860a 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/ItemLikeInfoVo.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/ItemLikeInfoVo.java @@ -2,20 +2,22 @@ package com.dyj.applet.domain.vo; import com.dyj.applet.domain.ItemLikeInfo; import com.dyj.common.domain.vo.BaseVo; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; /** * @author danmo * @date 2024-04-18 18:39 **/ +@EqualsAndHashCode(callSuper = true) +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder(toBuilder = true) +@Data public class ItemLikeInfoVo extends BaseVo { private ItemLikeInfo result_list; - - public ItemLikeInfo getResult_list() { - return result_list; - } - - public void setResult_list(ItemLikeInfo result_list) { - this.result_list = result_list; - } } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/ItemPlayInfoVo.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/ItemPlayInfoVo.java index 08bea5e..1adf06f 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/ItemPlayInfoVo.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/ItemPlayInfoVo.java @@ -2,11 +2,21 @@ package com.dyj.applet.domain.vo; import com.dyj.applet.domain.ItemPlayInfo; import com.dyj.common.domain.vo.BaseVo; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; /** * @author danmo * @date 2024-04-19 11:26 **/ +@EqualsAndHashCode(callSuper = true) +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder(toBuilder = true) +@Data public class ItemPlayInfoVo extends BaseVo { private ItemPlayInfo result_list; diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/ItemShareInfoVo.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/ItemShareInfoVo.java index 9f36d0a..b647941 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/ItemShareInfoVo.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/ItemShareInfoVo.java @@ -2,20 +2,22 @@ package com.dyj.applet.domain.vo; import com.dyj.applet.domain.ItemShareInfo; import com.dyj.common.domain.vo.BaseVo; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; /** * @author danmo * @date 2024-04-18 18:39 **/ +@EqualsAndHashCode(callSuper = true) +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder(toBuilder = true) +@Data public class ItemShareInfoVo extends BaseVo { private ItemShareInfo result_list; - - public ItemShareInfo getResult_list() { - return result_list; - } - - public void setResult_list(ItemShareInfo result_list) { - this.result_list = result_list; - } } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/QrCodeVo.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/QrCodeVo.java index fa29d12..1536ff3 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/QrCodeVo.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/QrCodeVo.java @@ -1,9 +1,16 @@ package com.dyj.applet.domain.vo; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + /** * @author danmo * @date 2024-04-17 14:24 **/ +@AllArgsConstructor +@NoArgsConstructor +@Data public class QrCodeVo { /** @@ -11,11 +18,4 @@ public class QrCodeVo { */ private String img; - public String getImg() { - return img; - } - - public void setImg(String img) { - this.img = img; - } } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/QuerySchemaQuotaVo.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/QuerySchemaQuotaVo.java index d0ffe4e..b0aa28c 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/QuerySchemaQuotaVo.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/QuerySchemaQuotaVo.java @@ -1,11 +1,17 @@ package com.dyj.applet.domain.vo; import com.dyj.applet.domain.SchemaQuota; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; /** * @author danmo * @date 2024-04-17 14:00 **/ +@AllArgsConstructor +@NoArgsConstructor +@Data public class QuerySchemaQuotaVo { /** @@ -18,19 +24,4 @@ public class QuerySchemaQuotaVo { */ private SchemaQuota short_term_schema_quota; - public SchemaQuota getLong_term_schema_quota() { - return long_term_schema_quota; - } - - public void setLong_term_schema_quota(SchemaQuota long_term_schema_quota) { - this.long_term_schema_quota = long_term_schema_quota; - } - - public SchemaQuota getShort_term_schema_quota() { - return short_term_schema_quota; - } - - public void setShort_term_schema_quota(SchemaQuota short_term_schema_quota) { - this.short_term_schema_quota = short_term_schema_quota; - } } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/QuerySchemaVo.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/QuerySchemaVo.java index 95aca4d..ce42a8c 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/QuerySchemaVo.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/QuerySchemaVo.java @@ -1,9 +1,16 @@ package com.dyj.applet.domain.vo; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + /** * @author danmo * @date 2024-04-17 13:56 **/ +@AllArgsConstructor +@NoArgsConstructor +@Data public class QuerySchemaVo { private String app_id; @@ -24,43 +31,4 @@ public class QuerySchemaVo { */ private String query; - public String getApp_id() { - return app_id; - } - - public void setApp_id(String app_id) { - this.app_id = app_id; - } - - public Long getCreate_time() { - return create_time; - } - - public void setCreate_time(Long create_time) { - this.create_time = create_time; - } - - public Long getExpire_time() { - return expire_time; - } - - public void setExpire_time(Long expire_time) { - this.expire_time = expire_time; - } - - public String getPath() { - return path; - } - - public void setPath(String path) { - this.path = path; - } - - public String getQuery() { - return query; - } - - public void setQuery(String query) { - this.query = query; - } } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/QueryUrlLinkQuotaVo.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/QueryUrlLinkQuotaVo.java index 05d67a4..f995e02 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/QueryUrlLinkQuotaVo.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/QueryUrlLinkQuotaVo.java @@ -1,9 +1,16 @@ package com.dyj.applet.domain.vo; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + /** * @author danmo * @date 2024-04-17 14:00 **/ +@AllArgsConstructor +@NoArgsConstructor +@Data public class QueryUrlLinkQuotaVo { /** * url_link 生成次数上限 @@ -13,20 +20,4 @@ public class QueryUrlLinkQuotaVo { * url_link 已生成次数 */ private Integer url_link_used; - - public Integer getUrl_link_limit() { - return url_link_limit; - } - - public void setUrl_link_limit(Integer url_link_limit) { - this.url_link_limit = url_link_limit; - } - - public Integer getUrl_link_used() { - return url_link_used; - } - - public void setUrl_link_used(Integer url_link_used) { - this.url_link_used = url_link_used; - } } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/QueryUrlLinkVo.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/QueryUrlLinkVo.java index e3f3c47..052b5b8 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/QueryUrlLinkVo.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/QueryUrlLinkVo.java @@ -1,9 +1,16 @@ package com.dyj.applet.domain.vo; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + /** * @author danmo * @date 2024-04-17 13:56 **/ +@AllArgsConstructor +@NoArgsConstructor +@Data public class QueryUrlLinkVo { private String app_id; @@ -25,52 +32,4 @@ public class QueryUrlLinkVo { * 小程序页面参数 */ private String query; - - public String getApp_id() { - return app_id; - } - - public void setApp_id(String app_id) { - this.app_id = app_id; - } - - public String getApp_name() { - return app_name; - } - - public void setApp_name(String app_name) { - this.app_name = app_name; - } - - public Long getCreate_time() { - return create_time; - } - - public void setCreate_time(Long create_time) { - this.create_time = create_time; - } - - public Long getExpire_time() { - return expire_time; - } - - public void setExpire_time(Long expire_time) { - this.expire_time = expire_time; - } - - public String getPath() { - return path; - } - - public void setPath(String path) { - this.path = path; - } - - public String getQuery() { - return query; - } - - public void setQuery(String query) { - this.query = query; - } } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/SearchSubListVo.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/SearchSubListVo.java index 9f66c89..2436d2a 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/SearchSubListVo.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/SearchSubListVo.java @@ -1,6 +1,9 @@ package com.dyj.applet.domain.vo; import com.dyj.applet.domain.SearchSubServiceInfo; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import java.util.List; @@ -8,6 +11,9 @@ import java.util.List; * @author danmo * @date 2024-04-22 18:54 **/ +@AllArgsConstructor +@NoArgsConstructor +@Data public class SearchSubListVo { private Boolean has_more; @@ -15,29 +21,4 @@ public class SearchSubListVo { private Long total; private List ma_sub_service_info_list; - - - public Boolean getHas_more() { - return has_more; - } - - public void setHas_more(Boolean has_more) { - this.has_more = has_more; - } - - public Long getTotal() { - return total; - } - - public void setTotal(Long total) { - this.total = total; - } - - public List getMa_sub_service_info_list() { - return ma_sub_service_info_list; - } - - public void setMa_sub_service_info_list(List ma_sub_service_info_list) { - this.ma_sub_service_info_list = ma_sub_service_info_list; - } } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/SendMsgResponseVo.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/SendMsgResponseVo.java index 388b97e..70f1e51 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/SendMsgResponseVo.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/SendMsgResponseVo.java @@ -2,6 +2,11 @@ package com.dyj.applet.domain.vo; import com.dyj.common.domain.DyResult; import com.dyj.common.domain.vo.BaseVo; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import java.util.List; @@ -9,6 +14,11 @@ import java.util.List; * @author danmo * @date 2024-04-09 10:20 **/ +@EqualsAndHashCode(callSuper = true) +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder(toBuilder = true) +@Data public class SendMsgResponseVo extends DyResult { /** @@ -20,22 +30,4 @@ public class SendMsgResponseVo extends DyResult { * 消息ID列表 */ public List msg_list; - - - public String getMsg_id() { - return msg_id; - } - - public void setMsg_id(String msg_id) { - this.msg_id = msg_id; - } - - public List getMsg_list() { - return msg_list; - } - - public void setMsg_list(List msg_list) { - this.msg_list = msg_list; - } - } diff --git a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/TopCommentVo.java b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/TopCommentVo.java index b1cfef0..eceb4ba 100644 --- a/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/TopCommentVo.java +++ b/dy-java-applet/src/main/java/com/dyj/applet/domain/vo/TopCommentVo.java @@ -2,11 +2,21 @@ package com.dyj.applet.domain.vo; import com.dyj.common.domain.DyResult; import com.dyj.common.domain.vo.BaseVo; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; /** * @author danmo * @date 2024-04-19 14:05 **/ +@EqualsAndHashCode(callSuper = true) +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder(toBuilder = true) +@Data public class TopCommentVo extends DyResult { /** @@ -17,20 +27,4 @@ public class TopCommentVo extends DyResult { * 置顶评论用户昵称 */ private String nick_name; - - public String getAvatar() { - return avatar; - } - - public void setAvatar(String avatar) { - this.avatar = avatar; - } - - public String getNick_name() { - return nick_name; - } - - public void setNick_name(String nick_name) { - this.nick_name = nick_name; - } } diff --git a/dy-java-common/pom.xml b/dy-java-common/pom.xml index ce1397b..3938052 100644 --- a/dy-java-common/pom.xml +++ b/dy-java-common/pom.xml @@ -21,7 +21,11 @@ com.dtflys.forest forest-spring-boot-starter - + + org.projectlombok + lombok + ${lombok.version} + com.alibaba fastjson diff --git a/dy-java-common/src/main/java/com/dyj/common/domain/AppletCardMsg.java b/dy-java-common/src/main/java/com/dyj/common/domain/AppletCardMsg.java index 13ef4a9..6bf9fb0 100644 --- a/dy-java-common/src/main/java/com/dyj/common/domain/AppletCardMsg.java +++ b/dy-java-common/src/main/java/com/dyj/common/domain/AppletCardMsg.java @@ -2,6 +2,11 @@ package com.dyj.common.domain; import com.alibaba.fastjson.JSONObject; import com.dyj.common.enums.MediaTypeEnum; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import org.springframework.util.StringUtils; import java.util.Objects; @@ -12,89 +17,13 @@ import java.util.Objects; * @author danmo * @date 2024-04-08 16:39 **/ +@EqualsAndHashCode(callSuper = true) +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder(toBuilder = true) +@Data public class AppletCardMsg extends MsgContent { private JSONObject applet_card; - - public AppletCardMsg() { - super.setMsg_type(MediaTypeEnum.APPLET_CARD); - } - - - - public JSONObject getApplet_card() { - return applet_card; - } - - public void setApplet_card(JSONObject applet_card) { - this.applet_card = applet_card; - } - - public void setAppletCard(String cardTemplateId, String path, String query, String appId, String schema) { - if (Objects.isNull(this.applet_card)) { - this.applet_card = new JSONObject(); - } - if (StringUtils.hasLength(cardTemplateId)) { - this.applet_card.put("card_template_id", cardTemplateId); - } - - if (StringUtils.hasLength(path)) { - this.applet_card.put("path", path); - } - if (StringUtils.hasLength(query)) { - this.applet_card.put("query", query); - } - - if (StringUtils.hasLength(appId)) { - this.applet_card.put("app_id", appId); - } - if(StringUtils.hasLength(schema)){ - this.applet_card.put("schema", schema); - } - } - - public static AppletCardMsgBuilder builder() { - return new AppletCardMsgBuilder(); - } - - public static class AppletCardMsgBuilder { - private String cardTemplateId; - private String path; - private String query; - private String appId; - private String schema; - - public AppletCardMsgBuilder cardTemplateId(String cardTemplateId) { - this.cardTemplateId = cardTemplateId; - return this; - } - - public AppletCardMsgBuilder path(String path) { - this.path = path; - return this; - } - - public AppletCardMsgBuilder query(String query) { - this.query = query; - return this; - } - - public AppletCardMsgBuilder appId(String appId) { - this.appId = appId; - return this; - } - - public AppletCardMsgBuilder schema(String schema) { - this.schema = schema; - return this; - } - - public AppletCardMsg build() { - AppletCardMsg appletCardMsg = new AppletCardMsg(); - appletCardMsg.setAppletCard(cardTemplateId, path, query, appId, schema); - return appletCardMsg; - } - - } } diff --git a/dy-java-common/src/main/java/com/dyj/common/domain/AppletCouponMsg.java b/dy-java-common/src/main/java/com/dyj/common/domain/AppletCouponMsg.java index a163342..4933c0a 100644 --- a/dy-java-common/src/main/java/com/dyj/common/domain/AppletCouponMsg.java +++ b/dy-java-common/src/main/java/com/dyj/common/domain/AppletCouponMsg.java @@ -2,6 +2,11 @@ package com.dyj.common.domain; import com.alibaba.fastjson.JSONObject; import com.dyj.common.enums.MediaTypeEnum; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import org.springframework.util.StringUtils; import java.util.Objects; @@ -11,54 +16,13 @@ import java.util.Objects; * @author danmo * @date 2024-04-08 16:47 **/ + +@EqualsAndHashCode(callSuper = true) +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder(toBuilder = true) +@Data public class AppletCouponMsg extends MsgContent{ private JSONObject applet_coupon; - - public AppletCouponMsg() { - super.setMsg_type(MediaTypeEnum.APPLET_COUPON); - } - - public JSONObject getApplet_coupon() { - return applet_coupon; - } - - public void setApplet_coupon(JSONObject applet_coupon) { - this.applet_coupon = applet_coupon; - } - - public void setAppletCoupon(String activityId ,String couponMetaId) { - if (Objects.isNull(this.applet_coupon)) { - this.applet_coupon = new JSONObject(); - } - - if (StringUtils.hasLength(activityId)){ - this.applet_coupon.put("activity_id",activityId); - } - if (StringUtils.hasLength(couponMetaId)){ - this.applet_coupon.put("coupon_meta_id",couponMetaId); - } - } - - public static AppletCouponMsgBuilder builder() { - return new AppletCouponMsgBuilder(); - } - public static class AppletCouponMsgBuilder { - private String activityId; - private String couponMetaId; - public AppletCouponMsgBuilder activityId(String activityId) { - this.activityId = activityId; - return this; - } - public AppletCouponMsgBuilder couponMetaId(String couponMetaId) { - this.couponMetaId = couponMetaId; - return this; - } - public AppletCouponMsg build() { - AppletCouponMsg appletCouponMsg = new AppletCouponMsg(); - appletCouponMsg.setAppletCoupon(activityId,couponMetaId); - return appletCouponMsg; - } - } - } diff --git a/dy-java-common/src/main/java/com/dyj/common/domain/AuthPrivateMessageCardMsg.java b/dy-java-common/src/main/java/com/dyj/common/domain/AuthPrivateMessageCardMsg.java index ff3237d..08d5719 100644 --- a/dy-java-common/src/main/java/com/dyj/common/domain/AuthPrivateMessageCardMsg.java +++ b/dy-java-common/src/main/java/com/dyj/common/domain/AuthPrivateMessageCardMsg.java @@ -2,6 +2,11 @@ package com.dyj.common.domain; import com.alibaba.fastjson.JSONObject; import com.dyj.common.enums.MediaTypeEnum; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import java.util.Objects; @@ -10,128 +15,12 @@ import java.util.Objects; * @author danmo * @date 2024-04-08 16:59 **/ +@EqualsAndHashCode(callSuper = true) +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder(toBuilder = true) +@Data public class AuthPrivateMessageCardMsg extends MsgContent{ private JSONObject auth_private_message_card; - - public AuthPrivateMessageCardMsg() { - super.setMsg_type(MediaTypeEnum.auth_private_message_card); - } - - - public JSONObject getAuth_private_message_card() { - return auth_private_message_card; - } - - public void setAuth_private_message_card(JSONObject auth_private_message_card) { - this.auth_private_message_card = auth_private_message_card; - } - public void setAuthPrivateMessageCard(AuthPrivateMessageCardAppInfo appInfo, AuthPrivateMessageCardToUserInfo toUserInfo) { - if(Objects.isNull(this.auth_private_message_card)){ - this.auth_private_message_card = new JSONObject(); - } - if(Objects.nonNull(appInfo)){ - this.auth_private_message_card.put("app_info",appInfo); - } - if(Objects.nonNull(toUserInfo)){ - this.auth_private_message_card.put("to_user_info",toUserInfo); - } - } - - public static AuthPrivateMessageCardMsgBuilder builder() { - return new AuthPrivateMessageCardMsgBuilder(); - } - - public static class AuthPrivateMessageCardMsgBuilder { - private AuthPrivateMessageCardAppInfo appInfo; - private AuthPrivateMessageCardToUserInfo toUserInfo; - public AuthPrivateMessageCardMsgBuilder appInfo(AuthPrivateMessageCardAppInfo appInfo) { - this.appInfo = appInfo; - return this; - } - public AuthPrivateMessageCardMsgBuilder toUserInfo(AuthPrivateMessageCardToUserInfo toUserInfo) { - this.toUserInfo = toUserInfo; - return this; - } - public AuthPrivateMessageCardMsg build() { - AuthPrivateMessageCardMsg authPrivateMessageCardMsg = new AuthPrivateMessageCardMsg(); - authPrivateMessageCardMsg.setAuthPrivateMessageCard(appInfo,toUserInfo); - return authPrivateMessageCardMsg; - } - } - - - public static class AuthPrivateMessageCardAppInfo{ - private String app_id; - - public String getApp_id() { - return app_id; - } - - public void setApp_id(String app_id) { - this.app_id = app_id; - } - - public static AuthPrivateMessageCardAppInfoBuilder builder(){ - return new AuthPrivateMessageCardAppInfoBuilder(); - } - public static class AuthPrivateMessageCardAppInfoBuilder { - private String appId; - public AuthPrivateMessageCardAppInfoBuilder appId(String appId){ - this.appId = appId; - return this; - } - public AuthPrivateMessageCardAppInfo build(){ - AuthPrivateMessageCardAppInfo authPrivateMessageCardAppInfo = new AuthPrivateMessageCardAppInfo(); - authPrivateMessageCardAppInfo.setApp_id(appId); - return authPrivateMessageCardAppInfo; - } - } - } - - public static class AuthPrivateMessageCardToUserInfo{ - private String app_id; - private String open_id; - - public String getApp_id() { - return app_id; - } - - public void setApp_id(String app_id) { - this.app_id = app_id; - } - - public String getOpen_id() { - return open_id; - } - - public void setOpen_id(String open_id) { - this.open_id = open_id; - } - - public static AuthPrivateMessageCardToUserInfoBuilder builder(){ - return new AuthPrivateMessageCardToUserInfoBuilder(); - } - - public static class AuthPrivateMessageCardToUserInfoBuilder { - private String appId; - private String openId; - public AuthPrivateMessageCardToUserInfoBuilder appId(String appId){ - this.appId = appId; - return this; - } - public AuthPrivateMessageCardToUserInfoBuilder openId(String openId){ - this.openId = openId; - return this; - } - public AuthPrivateMessageCardToUserInfo build(){ - AuthPrivateMessageCardToUserInfo authPrivateMessageCardToUserInfo = new AuthPrivateMessageCardToUserInfo(); - authPrivateMessageCardToUserInfo.setApp_id(appId); - authPrivateMessageCardToUserInfo.setOpen_id(openId); - return authPrivateMessageCardToUserInfo; - } - } - - } - } diff --git a/dy-java-common/src/main/java/com/dyj/common/domain/CardMsg.java b/dy-java-common/src/main/java/com/dyj/common/domain/CardMsg.java index a7c203d..ac0d5ce 100644 --- a/dy-java-common/src/main/java/com/dyj/common/domain/CardMsg.java +++ b/dy-java-common/src/main/java/com/dyj/common/domain/CardMsg.java @@ -2,6 +2,11 @@ package com.dyj.common.domain; import com.alibaba.fastjson.JSONObject; import com.dyj.common.enums.MediaTypeEnum; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import java.util.Objects; @@ -10,47 +15,14 @@ import java.util.Objects; * @author danmo * @date 2024-04-08 15:50 **/ +@EqualsAndHashCode(callSuper = true) +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder(toBuilder = true) +@Data public class CardMsg extends MsgContent { private JSONObject retain_consult_card; - public CardMsg() { - super.setMsg_type(MediaTypeEnum.RETAIN_CONSULT_CARD); - } - - - public JSONObject getRetain_consult_card() { - return retain_consult_card; - } - - public void setRetain_consult_card(JSONObject retain_consult_card) { - this.retain_consult_card = retain_consult_card; - } - - public void setRetainConsultCard(String cardId) { - if (Objects.isNull(this.retain_consult_card)) { - this.retain_consult_card = new JSONObject(); - } - this.retain_consult_card.put("card_id", cardId); - } - - public static CardMsgBuilder builder() { - return new CardMsgBuilder(); - } - - public static class CardMsgBuilder { - private String cardId; - - public CardMsgBuilder cardId(String cardId) { - this.cardId = cardId; - return this; - } - - public CardMsg build() { - CardMsg cardMsg = new CardMsg(); - cardMsg.setRetainConsultCard(this.cardId); - return cardMsg; - } - } } diff --git a/dy-java-common/src/main/java/com/dyj/common/domain/ClientTokenInfo.java b/dy-java-common/src/main/java/com/dyj/common/domain/ClientTokenInfo.java index 9e5759b..cb0983e 100644 --- a/dy-java-common/src/main/java/com/dyj/common/domain/ClientTokenInfo.java +++ b/dy-java-common/src/main/java/com/dyj/common/domain/ClientTokenInfo.java @@ -1,7 +1,17 @@ package com.dyj.common.domain; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + import java.io.Serializable; +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder(toBuilder = true) +@Data public class ClientTokenInfo implements Serializable { private static final long serialVersionUID = 1L; @@ -9,19 +19,4 @@ public class ClientTokenInfo implements Serializable { private String accessToken; private Long expiresIn; - public String getAccessToken() { - return accessToken; - } - - public void setAccessToken(String accessToken) { - this.accessToken = accessToken; - } - - public Long getExpiresIn() { - return expiresIn; - } - - public void setExpiresIn(Long expiresIn) { - this.expiresIn = expiresIn; - } } diff --git a/dy-java-common/src/main/java/com/dyj/common/domain/DyAppletResult.java b/dy-java-common/src/main/java/com/dyj/common/domain/DyAppletResult.java index 9554b82..4fa569b 100644 --- a/dy-java-common/src/main/java/com/dyj/common/domain/DyAppletResult.java +++ b/dy-java-common/src/main/java/com/dyj/common/domain/DyAppletResult.java @@ -1,9 +1,18 @@ package com.dyj.common.domain; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + /** * @author danmo * @date 2024-04-03 11:18 **/ +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder(toBuilder = true) +@Data public class DyAppletResult { /** @@ -17,27 +26,4 @@ public class DyAppletResult { */ private Integer error_code; - public T getData() { - return data; - } - - public void setData(T data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public Integer getError_code() { - return error_code; - } - - public void setError_code(Integer error_code) { - this.error_code = error_code; - } } diff --git a/dy-java-common/src/main/java/com/dyj/common/domain/DyExtra.java b/dy-java-common/src/main/java/com/dyj/common/domain/DyExtra.java index e0d0012..a750398 100644 --- a/dy-java-common/src/main/java/com/dyj/common/domain/DyExtra.java +++ b/dy-java-common/src/main/java/com/dyj/common/domain/DyExtra.java @@ -1,9 +1,18 @@ package com.dyj.common.domain; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + /** * @author danmo * @date 2024-04-03 11:19 **/ +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder(toBuilder = true) +@Data public class DyExtra { private String description; @@ -14,63 +23,4 @@ public class DyExtra { private String sub_description; private Integer sub_error_code; - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getError_code() { - return error_code; - } - - public void setError_code(String error_code) { - this.error_code = error_code; - } - - public String getLogid() { - return logid; - } - - public void setLogid(String logid) { - this.logid = logid; - } - - public Long getNow() { - return now; - } - - public void setNow(Long now) { - this.now = now; - } - - public String getSub_description() { - return sub_description; - } - - public void setSub_description(String sub_description) { - this.sub_description = sub_description; - } - - public Integer getSub_error_code() { - return sub_error_code; - } - - public void setSub_error_code(Integer sub_error_code) { - this.sub_error_code = sub_error_code; - } - - @Override - public String toString() { - return "DyExtra{" + - "description='" + description + '\'' + - ", error_code='" + error_code + '\'' + - ", logid='" + logid + '\'' + - ", now=" + now + - ", sub_description='" + sub_description + '\'' + - ", sub_error_code=" + sub_error_code + - '}'; - } } diff --git a/dy-java-common/src/main/java/com/dyj/common/domain/DyResult.java b/dy-java-common/src/main/java/com/dyj/common/domain/DyResult.java index 694faa3..b144979 100644 --- a/dy-java-common/src/main/java/com/dyj/common/domain/DyResult.java +++ b/dy-java-common/src/main/java/com/dyj/common/domain/DyResult.java @@ -1,9 +1,18 @@ package com.dyj.common.domain; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + /** * @author danmo * @date 2024-04-03 11:18 **/ +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder(toBuilder = true) +@Data public class DyResult { /** @@ -17,38 +26,4 @@ public class DyResult { */ private DyExtra extra; - - public T getData() { - return data; - } - - public void setData(T data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public DyExtra getExtra() { - return extra; - } - - public void setExtra(DyExtra extra) { - this.extra = extra; - } - - - @Override - public String toString() { - return "DyResult{" + - "data=" + data + - ", message='" + message + '\'' + - ", extra=" + extra + - '}'; - } } diff --git a/dy-java-common/src/main/java/com/dyj/common/domain/DySimpleResult.java b/dy-java-common/src/main/java/com/dyj/common/domain/DySimpleResult.java index e8927d1..42ee153 100644 --- a/dy-java-common/src/main/java/com/dyj/common/domain/DySimpleResult.java +++ b/dy-java-common/src/main/java/com/dyj/common/domain/DySimpleResult.java @@ -1,9 +1,18 @@ package com.dyj.common.domain; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + /** * @author danmo * @date 2024-04-09 11:30 **/ +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder(toBuilder = true) +@Data public class DySimpleResult { private String err_msg; @@ -15,55 +24,4 @@ public class DySimpleResult { private String log_id; private T data; - - public String getErr_msg() { - return err_msg; - } - - public void setErr_msg(String err_msg) { - this.err_msg = err_msg; - } - - public Integer getErr_no() { - return err_no; - } - - public void setErr_no(Integer err_no) { - this.err_no = err_no; - } - - public String getLog_id() { - return log_id; - } - - public void setLog_id(String log_id) { - this.log_id = log_id; - } - - public String getErr_tips() { - return err_tips; - } - - public void setErr_tips(String err_tips) { - this.err_tips = err_tips; - } - - public T getData() { - return data; - } - - public void setData(T data) { - this.data = data; - } - - @Override - public String toString() { - return "{" + - "err_msg='" + err_msg + '\'' + - ", err_no=" + err_no + - ", log_id='" + log_id + '\'' + - ", err_tips='" + err_tips + '\'' + - ", data=" + data + - '}'; - } } diff --git a/dy-java-common/src/main/java/com/dyj/common/domain/ImageMsg.java b/dy-java-common/src/main/java/com/dyj/common/domain/ImageMsg.java index 8fe07b9..2f371b1 100644 --- a/dy-java-common/src/main/java/com/dyj/common/domain/ImageMsg.java +++ b/dy-java-common/src/main/java/com/dyj/common/domain/ImageMsg.java @@ -2,6 +2,11 @@ package com.dyj.common.domain; import com.alibaba.fastjson.JSONObject; import com.dyj.common.enums.MediaTypeEnum; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import java.util.Objects; @@ -10,45 +15,14 @@ import java.util.Objects; * @author danmo * @date 2024-04-08 14:23 **/ +@EqualsAndHashCode(callSuper = true) +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder(toBuilder = true) +@Data public class ImageMsg extends MsgContent{ private JSONObject image; - public ImageMsg() { - super.setMsg_type(MediaTypeEnum.IMAGE); - } - - - public JSONObject getImage() { - return image; - } - - public void setImage(String mediaId) { - if (Objects.isNull(this.image)) { - this.image = new JSONObject(); - } - this.image.put("media_id", mediaId); - } - - public void setImage(JSONObject image) { - this.image = image; - } - - public static ImageMsgBuilder builder() { - return new ImageMsgBuilder(); - } - - public static class ImageMsgBuilder { - private String mediaId; - public ImageMsgBuilder mediaId(String mediaId) { - this.mediaId = mediaId; - return this; - } - public ImageMsg build() { - ImageMsg imageMsg = new ImageMsg(); - imageMsg.setImage(mediaId); - return imageMsg; - } - } } diff --git a/dy-java-common/src/main/java/com/dyj/common/domain/InvitationMsg.java b/dy-java-common/src/main/java/com/dyj/common/domain/InvitationMsg.java index 645a839..82fe241 100644 --- a/dy-java-common/src/main/java/com/dyj/common/domain/InvitationMsg.java +++ b/dy-java-common/src/main/java/com/dyj/common/domain/InvitationMsg.java @@ -2,6 +2,11 @@ package com.dyj.common.domain; import com.alibaba.fastjson.JSONObject; import com.dyj.common.enums.MediaTypeEnum; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import org.springframework.util.StringUtils; import java.util.Objects; @@ -12,57 +17,14 @@ import java.util.Objects; * @author danmo * @date 2024-04-08 15:56 **/ +@EqualsAndHashCode(callSuper = true) +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder(toBuilder = true) +@Data public class InvitationMsg extends MsgContent { private JSONObject group_invitation; - public InvitationMsg() { - super.setMsg_type(MediaTypeEnum.GROUP_INVITATION); - } - - public JSONObject getGroup_invitation() { - return group_invitation; - } - - public void setGroup_invitation(JSONObject group_invitation) { - this.group_invitation = group_invitation; - } - - public void setGroupInvitation(String groupId, String groupToken) { - if (Objects.isNull(this.group_invitation)) { - this.group_invitation = new JSONObject(); - } - if (StringUtils.hasLength(groupId)) { - this.group_invitation.put("group_id", groupId); - } - if (StringUtils.hasLength(groupToken)) { - this.group_invitation.put("group_id", groupId); - } - } - - public static InvitationMsgBuilder builder() { - return new InvitationMsgBuilder(); - } - - public static class InvitationMsgBuilder { - private String groupId; - private String groupToken; - - public InvitationMsgBuilder groupId(String groupId) { - this.groupId = groupId; - return this; - } - - public InvitationMsgBuilder groupToken(String groupToken) { - this.groupToken = groupToken; - return this; - } - - public InvitationMsg build() { - InvitationMsg invitationMsg = new InvitationMsg(); - invitationMsg.setGroupInvitation(groupId, groupToken); - return invitationMsg; - } - } } diff --git a/dy-java-common/src/main/java/com/dyj/common/domain/MsgContent.java b/dy-java-common/src/main/java/com/dyj/common/domain/MsgContent.java index 5770c70..47b3e7e 100644 --- a/dy-java-common/src/main/java/com/dyj/common/domain/MsgContent.java +++ b/dy-java-common/src/main/java/com/dyj/common/domain/MsgContent.java @@ -1,20 +1,21 @@ package com.dyj.common.domain; import com.dyj.common.enums.MediaTypeEnum; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; /** * @author danmo * @date 2024-04-08 14:13 **/ + +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder(toBuilder = true) +@Data public class MsgContent { public MediaTypeEnum msg_type; - - public MediaTypeEnum getMsg_type() { - return msg_type; - } - - public void setMsg_type(MediaTypeEnum msg_type) { - this.msg_type = msg_type; - } } diff --git a/dy-java-common/src/main/java/com/dyj/common/domain/TextMsg.java b/dy-java-common/src/main/java/com/dyj/common/domain/TextMsg.java index 25bda35..e6dbb81 100644 --- a/dy-java-common/src/main/java/com/dyj/common/domain/TextMsg.java +++ b/dy-java-common/src/main/java/com/dyj/common/domain/TextMsg.java @@ -2,6 +2,11 @@ package com.dyj.common.domain; import com.alibaba.fastjson.JSONObject; import com.dyj.common.enums.MediaTypeEnum; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import java.util.Objects; @@ -10,48 +15,13 @@ import java.util.Objects; * @author danmo * @date 2024-04-08 14:22 **/ +@EqualsAndHashCode(callSuper = true) +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder(toBuilder = true) +@Data public class TextMsg extends MsgContent{ private JSONObject text; - public TextMsg() { - super.setMsg_type(MediaTypeEnum.TEXT); - } - - public JSONObject getText() { - return text; - } - - public void setText(String text) { - if (Objects.isNull(this.text)) { - this.text = new JSONObject(); - } - this.text.put("text", text); - } - - public void setText(JSONObject text) { - this.text = text; - } - - public static TextMsgBuilder builder(){ - return new TextMsgBuilder(); - } - - public static class TextMsgBuilder{ - private String text; - - public TextMsgBuilder text(String text){ - this.text = text; - return this; - } - - public TextMsg build(){ - TextMsg textMsg = new TextMsg(); - textMsg.setText(text); - return textMsg; - } - } - - - } diff --git a/dy-java-common/src/main/java/com/dyj/common/domain/UserTokenInfo.java b/dy-java-common/src/main/java/com/dyj/common/domain/UserTokenInfo.java index 016405d..b894f04 100644 --- a/dy-java-common/src/main/java/com/dyj/common/domain/UserTokenInfo.java +++ b/dy-java-common/src/main/java/com/dyj/common/domain/UserTokenInfo.java @@ -1,11 +1,20 @@ package com.dyj.common.domain; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + import java.io.Serializable; /** * @author danmo * @date 2024-04-07 13:47 **/ +@AllArgsConstructor +@NoArgsConstructor +@Builder +@Data public class UserTokenInfo implements Serializable { private static final long serialVersionUID = 1L; @@ -18,44 +27,4 @@ public class UserTokenInfo implements Serializable { private Long refreshExpiresIn; private String openId; - - public String getAccessToken() { - return accessToken; - } - - public void setAccessToken(String accessToken) { - this.accessToken = accessToken; - } - - public String getRefreshToken() { - return refreshToken; - } - - public void setRefreshToken(String refreshToken) { - this.refreshToken = refreshToken; - } - - public Long getExpiresIn() { - return expiresIn; - } - - public void setExpiresIn(Long expiresIn) { - this.expiresIn = expiresIn; - } - - public Long getRefreshExpiresIn() { - return refreshExpiresIn; - } - - public void setRefreshExpiresIn(Long refreshExpiresIn) { - this.refreshExpiresIn = refreshExpiresIn; - } - - public String getOpenId() { - return openId; - } - - public void setOpenId(String openId) { - this.openId = openId; - } } diff --git a/dy-java-common/src/main/java/com/dyj/common/domain/VideoMsg.java b/dy-java-common/src/main/java/com/dyj/common/domain/VideoMsg.java index 5163107..fca7edf 100644 --- a/dy-java-common/src/main/java/com/dyj/common/domain/VideoMsg.java +++ b/dy-java-common/src/main/java/com/dyj/common/domain/VideoMsg.java @@ -2,6 +2,11 @@ package com.dyj.common.domain; import com.alibaba.fastjson.JSONObject; import com.dyj.common.enums.MediaTypeEnum; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import java.util.Objects; @@ -11,46 +16,14 @@ import java.util.Objects; * @author danmo * @date 2024-04-08 14:23 **/ +@EqualsAndHashCode(callSuper = true) +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder(toBuilder = true) +@Data public class VideoMsg extends MsgContent { private JSONObject video; - public VideoMsg() { - super.setMsg_type(MediaTypeEnum.VIDEO); - } - - public JSONObject getVideo() { - return video; - } - - public void setVideo(String itemId) { - if (Objects.isNull(this.video)) { - this.video = new JSONObject(); - } - this.video.put("item_id", itemId); - } - - public void setVideo(JSONObject video) { - this.video = video; - } - - public static VideoMsgBuilder builder() { - return new VideoMsgBuilder(); - } - - public static class VideoMsgBuilder { - private String itemId; - - public VideoMsgBuilder itemId(String itemId) { - this.itemId = itemId; - return this; - } - - public VideoMsg build() { - VideoMsg videoMsg = new VideoMsg(); - videoMsg.setVideo(itemId); - return videoMsg; - } - } } diff --git a/dy-java-common/src/main/java/com/dyj/common/domain/VideoStatistics.java b/dy-java-common/src/main/java/com/dyj/common/domain/VideoStatistics.java index 61abf66..9bca730 100644 --- a/dy-java-common/src/main/java/com/dyj/common/domain/VideoStatistics.java +++ b/dy-java-common/src/main/java/com/dyj/common/domain/VideoStatistics.java @@ -1,5 +1,14 @@ package com.dyj.common.domain; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@AllArgsConstructor +@NoArgsConstructor +@Builder +@Data public class VideoStatistics { /** diff --git a/dy-java-common/src/main/java/com/dyj/common/domain/query/AccessTokenQuery.java b/dy-java-common/src/main/java/com/dyj/common/domain/query/AccessTokenQuery.java index 70f097a..5de6b41 100644 --- a/dy-java-common/src/main/java/com/dyj/common/domain/query/AccessTokenQuery.java +++ b/dy-java-common/src/main/java/com/dyj/common/domain/query/AccessTokenQuery.java @@ -1,9 +1,19 @@ package com.dyj.common.domain.query; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + /** * @author danmo * @date 2024-04-03 11:34 **/ + +@AllArgsConstructor +@NoArgsConstructor +@Builder +@Data public class AccessTokenQuery { /** @@ -27,71 +37,4 @@ public class AccessTokenQuery { private final String grant_type = "authorization_code"; - public String getClient_key() { - return client_key; - } - - public void setClient_key(String client_key) { - this.client_key = client_key; - } - - public String getClient_secret() { - return client_secret; - } - - public void setClient_secret(String client_secret) { - this.client_secret = client_secret; - } - - public String getCode() { - return code; - } - - public void setCode(String code) { - this.code = code; - } - - public String getGrant_type() { - return grant_type; - } - - - public AccessTokenQuery() { - } - - private AccessTokenQuery(AccessTokenQueryBuilder builder) { - this.client_key = builder.client_key; - this.client_secret = builder.client_secret; - this.code = builder.code; - } - - public static AccessTokenQueryBuilder builder() { - return new AccessTokenQueryBuilder(); - } - - public static class AccessTokenQueryBuilder { - private String client_key; - private String client_secret; - private String code; - - public AccessTokenQueryBuilder clientKey(String clientKey) { - this.client_key = clientKey; - return this; - } - - public AccessTokenQueryBuilder clientSecret(String clientSecret) { - this.client_secret = clientSecret; - return this; - } - - public AccessTokenQueryBuilder code(String code) { - this.code = code; - return this; - } - - public AccessTokenQuery build() { - return new AccessTokenQuery(this); - } - } - } diff --git a/dy-java-common/src/main/java/com/dyj/common/domain/query/AppsV2TokenQuery.java b/dy-java-common/src/main/java/com/dyj/common/domain/query/AppsV2TokenQuery.java index 09e42a6..c98e1ff 100644 --- a/dy-java-common/src/main/java/com/dyj/common/domain/query/AppsV2TokenQuery.java +++ b/dy-java-common/src/main/java/com/dyj/common/domain/query/AppsV2TokenQuery.java @@ -1,9 +1,18 @@ package com.dyj.common.domain.query; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + /** * @author danmo * @date 2024-04-17 10:26 **/ +@AllArgsConstructor +@NoArgsConstructor +@Builder +@Data public class AppsV2TokenQuery { /** @@ -19,50 +28,5 @@ public class AppsV2TokenQuery { //获取 access_token 时值为 client_credential private String grant_type = "client_credential"; - public String getAppid() { - return appid; - } - - public void setAppid(String appid) { - this.appid = appid; - } - - public String getSecret() { - return secret; - } - - - public void setSecret(String secret) { - this.secret = secret; - } - - public String getGrant_type() { - return grant_type; - } - - public static AppsV2TokenQueryBuilder builder() { - return new AppsV2TokenQueryBuilder(); - } - - public static class AppsV2TokenQueryBuilder { - private String appid; - private String secret; - - public AppsV2TokenQueryBuilder appid(String appid) { - this.appid = appid; - return this; - } - - public AppsV2TokenQueryBuilder secret(String secret) { - this.secret = secret; - return this; - } - public AppsV2TokenQuery build() { - AppsV2TokenQuery appsV2TokenQuery = new AppsV2TokenQuery(); - appsV2TokenQuery.setAppid(appid); - appsV2TokenQuery.setSecret(secret); - return appsV2TokenQuery; - } - } } diff --git a/dy-java-common/src/main/java/com/dyj/common/domain/query/BaseQuery.java b/dy-java-common/src/main/java/com/dyj/common/domain/query/BaseQuery.java index 48ad248..5d3b667 100644 --- a/dy-java-common/src/main/java/com/dyj/common/domain/query/BaseQuery.java +++ b/dy-java-common/src/main/java/com/dyj/common/domain/query/BaseQuery.java @@ -1,9 +1,19 @@ package com.dyj.common.domain.query; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + /** * @author danmo * @date 2024-04-07 15:09 **/ +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder(toBuilder = true) +@Data public class BaseQuery { @@ -16,19 +26,4 @@ public class BaseQuery { */ protected String clientKey; - public Integer getTenantId() { - return tenantId; - } - - public void setTenantId(Integer tenantId) { - this.tenantId = tenantId; - } - - public String getClientKey() { - return clientKey; - } - - public void setClientKey(String clientKey) { - this.clientKey = clientKey; - } } diff --git a/dy-java-common/src/main/java/com/dyj/common/domain/query/BizRefreshTokenQuery.java b/dy-java-common/src/main/java/com/dyj/common/domain/query/BizRefreshTokenQuery.java index 87cac7f..bd322a6 100644 --- a/dy-java-common/src/main/java/com/dyj/common/domain/query/BizRefreshTokenQuery.java +++ b/dy-java-common/src/main/java/com/dyj/common/domain/query/BizRefreshTokenQuery.java @@ -1,9 +1,18 @@ package com.dyj.common.domain.query; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + /** * @author danmo * @date 2024-04-17 09:53 **/ +@AllArgsConstructor +@NoArgsConstructor +@Builder +@Data public class BizRefreshTokenQuery { /** @@ -22,59 +31,4 @@ public class BizRefreshTokenQuery { */ private String refresh_token; - - public String getClient_key() { - return client_key; - } - - public void setClient_key(String client_key) { - this.client_key = client_key; - } - - public String getClient_secret() { - return client_secret; - } - - public void setClient_secret(String client_secret) { - this.client_secret = client_secret; - } - - public String getRefresh_token() { - return refresh_token; - } - - public void setRefresh_token(String refresh_token) { - this.refresh_token = refresh_token; - } - - public static BizRefreshTokenQueryBuilder builder() { - return new BizRefreshTokenQueryBuilder(); - } - - public static class BizRefreshTokenQueryBuilder { - private String clientKey; - private String clientSecret; - private String refreshToken; - - public BizRefreshTokenQueryBuilder clientKey(String clientKey) { - this.clientKey = clientKey; - return this; - } - public BizRefreshTokenQueryBuilder clientSecret(String clientSecret) { - this.clientSecret = clientSecret; - return this; - } - public BizRefreshTokenQueryBuilder refreshToken(String refreshToken) { - this.refreshToken = refreshToken; - return this; - } - public BizRefreshTokenQuery build() { - BizRefreshTokenQuery bizRefreshTokenQuery = new BizRefreshTokenQuery(); - bizRefreshTokenQuery.setClient_key(clientKey); - bizRefreshTokenQuery.setClient_secret(clientSecret); - bizRefreshTokenQuery.setRefresh_token(refreshToken); - return bizRefreshTokenQuery; - } - - } } diff --git a/dy-java-common/src/main/java/com/dyj/common/domain/query/BizTokenQuery.java b/dy-java-common/src/main/java/com/dyj/common/domain/query/BizTokenQuery.java index 137274c..0228cc1 100644 --- a/dy-java-common/src/main/java/com/dyj/common/domain/query/BizTokenQuery.java +++ b/dy-java-common/src/main/java/com/dyj/common/domain/query/BizTokenQuery.java @@ -1,9 +1,18 @@ package com.dyj.common.domain.query; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + /** * @author danmo * @date 2024-04-17 09:53 **/ +@AllArgsConstructor +@NoArgsConstructor +@Builder +@Data public class BizTokenQuery { /** @@ -27,71 +36,4 @@ public class BizTokenQuery { */ private String scope; - public String getClient_key() { - return client_key; - } - - public void setClient_key(String client_key) { - this.client_key = client_key; - } - - public String getClient_secret() { - return client_secret; - } - - public void setClient_secret(String client_secret) { - this.client_secret = client_secret; - } - - public String getOpen_id() { - return open_id; - } - - public void setOpen_id(String open_id) { - this.open_id = open_id; - } - - public String getScope() { - return scope; - } - - public void setScope(String scope) { - this.scope = scope; - } - - public static BizTokenQueryBuilder builder() { - return new BizTokenQueryBuilder(); - } - - public static class BizTokenQueryBuilder { - private String clientKey; - private String clientSecret; - private String openId; - private String scope; - - public BizTokenQueryBuilder clientKey(String clientKey) { - this.clientKey = clientKey; - return this; - } - public BizTokenQueryBuilder clientSecret(String clientSecret) { - this.clientSecret = clientSecret; - return this; - } - public BizTokenQueryBuilder openId(String openId) { - this.openId = openId; - return this; - } - public BizTokenQueryBuilder scope(String scope) { - this.scope = scope; - return this; - } - public BizTokenQuery build() { - BizTokenQuery bizTokenQuery = new BizTokenQuery(); - bizTokenQuery.setClient_key(clientKey); - bizTokenQuery.setClient_secret(clientSecret); - bizTokenQuery.setOpen_id(openId); - bizTokenQuery.setScope(scope); - return bizTokenQuery; - } - } } diff --git a/dy-java-common/src/main/java/com/dyj/common/domain/query/ClientTokenQuery.java b/dy-java-common/src/main/java/com/dyj/common/domain/query/ClientTokenQuery.java index 37aa5a5..12080db 100644 --- a/dy-java-common/src/main/java/com/dyj/common/domain/query/ClientTokenQuery.java +++ b/dy-java-common/src/main/java/com/dyj/common/domain/query/ClientTokenQuery.java @@ -1,9 +1,18 @@ package com.dyj.common.domain.query; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + /** * @author danmo * @date 2024-04-03 11:34 **/ +@AllArgsConstructor +@NoArgsConstructor +@Builder +@Data public class ClientTokenQuery { /** @@ -22,24 +31,4 @@ public class ClientTokenQuery { */ private final String grant_type = "client_credential"; - - public String getClient_key() { - return client_key; - } - - public void setClient_key(String client_key) { - this.client_key = client_key; - } - - public String getClient_secret() { - return client_secret; - } - - public void setClient_secret(String client_secret) { - this.client_secret = client_secret; - } - - public String getGrant_type() { - return grant_type; - } } diff --git a/dy-java-common/src/main/java/com/dyj/common/domain/query/QuerySchemaQuery.java b/dy-java-common/src/main/java/com/dyj/common/domain/query/QuerySchemaQuery.java index b0254fb..6551cd2 100644 --- a/dy-java-common/src/main/java/com/dyj/common/domain/query/QuerySchemaQuery.java +++ b/dy-java-common/src/main/java/com/dyj/common/domain/query/QuerySchemaQuery.java @@ -1,9 +1,20 @@ package com.dyj.common.domain.query; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + /** * @author danmo * @date 2024-04-17 13:54 **/ +@EqualsAndHashCode(callSuper = true) +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder(toBuilder = true) +@Data public class QuerySchemaQuery extends BaseQuery{ private String app_id; @@ -13,59 +24,5 @@ public class QuerySchemaQuery extends BaseQuery{ */ private String schema; - public String getApp_id() { - return app_id; - } - - public void setApp_id(String app_id) { - this.app_id = app_id; - } - - public String getSchema() { - return schema; - } - - public void setSchema(String schema) { - this.schema = schema; - } - - public static QuerySchemaQueryBuilder builder(){ - return new QuerySchemaQueryBuilder(); - } - - public static class QuerySchemaQueryBuilder{ - private String appId; - private String schema; - private Integer tenantId; - private String clientKey; - - public QuerySchemaQueryBuilder appId(String appId){ - this.appId = appId; - return this; - } - - public QuerySchemaQueryBuilder schema(String schema){ - this.schema = schema; - return this; - } - - public QuerySchemaQueryBuilder tenantId(Integer tenantId){ - this.tenantId = tenantId; - return this; - } - - public QuerySchemaQueryBuilder clientKey(String clientKey){ - this.clientKey = clientKey; - return this; - } - public QuerySchemaQuery build(){ - QuerySchemaQuery querySchemaQuery = new QuerySchemaQuery(); - querySchemaQuery.setApp_id(appId); - querySchemaQuery.setSchema(schema); - querySchemaQuery.setTenantId(tenantId); - querySchemaQuery.setClientKey(clientKey); - return querySchemaQuery; - } - } } diff --git a/dy-java-common/src/main/java/com/dyj/common/domain/query/RefreshAccessTokenQuery.java b/dy-java-common/src/main/java/com/dyj/common/domain/query/RefreshAccessTokenQuery.java index 2afa551..5fe8400 100644 --- a/dy-java-common/src/main/java/com/dyj/common/domain/query/RefreshAccessTokenQuery.java +++ b/dy-java-common/src/main/java/com/dyj/common/domain/query/RefreshAccessTokenQuery.java @@ -1,9 +1,18 @@ package com.dyj.common.domain.query; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + /** * @author danmo * @date 2024-04-03 11:34 **/ +@AllArgsConstructor +@NoArgsConstructor +@Builder +@Data public class RefreshAccessTokenQuery { /** @@ -18,29 +27,4 @@ public class RefreshAccessTokenQuery { private String grant_type = "refresh_token"; - - - public String getClient_key() { - return client_key; - } - - public void setClient_key(String client_key) { - this.client_key = client_key; - } - - public String getRefresh_token() { - return refresh_token; - } - - public void setRefresh_token(String refresh_token) { - this.refresh_token = refresh_token; - } - - public String getGrant_type() { - return grant_type; - } - - public void setGrant_type(String grant_type) { - this.grant_type = grant_type; - } } diff --git a/dy-java-common/src/main/java/com/dyj/common/domain/query/RefreshTokenQuery.java b/dy-java-common/src/main/java/com/dyj/common/domain/query/RefreshTokenQuery.java index 0a552d5..81d8f35 100644 --- a/dy-java-common/src/main/java/com/dyj/common/domain/query/RefreshTokenQuery.java +++ b/dy-java-common/src/main/java/com/dyj/common/domain/query/RefreshTokenQuery.java @@ -1,9 +1,18 @@ package com.dyj.common.domain.query; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + /** * @author danmo * @date 2024-04-03 11:34 **/ +@AllArgsConstructor +@NoArgsConstructor +@Builder +@Data public class RefreshTokenQuery { /** @@ -15,20 +24,4 @@ public class RefreshTokenQuery { * 填写通过/oauth/access_token/ 获取到的 refresh_token 参数 */ private String refresh_token; - - public String getClient_key() { - return client_key; - } - - public void setClient_key(String client_key) { - this.client_key = client_key; - } - - public String getRefresh_token() { - return refresh_token; - } - - public void setRefresh_token(String refresh_token) { - this.refresh_token = refresh_token; - } } diff --git a/dy-java-common/src/main/java/com/dyj/common/domain/query/UserInfoQuery.java b/dy-java-common/src/main/java/com/dyj/common/domain/query/UserInfoQuery.java index a77adb3..5e10c59 100644 --- a/dy-java-common/src/main/java/com/dyj/common/domain/query/UserInfoQuery.java +++ b/dy-java-common/src/main/java/com/dyj/common/domain/query/UserInfoQuery.java @@ -1,11 +1,18 @@ package com.dyj.common.domain.query; import com.dyj.common.domain.query.BaseQuery; +import lombok.*; +import lombok.experimental.SuperBuilder; /** * @author danmo * @date 2024-04-07 14:56 **/ +@EqualsAndHashCode(callSuper = true) +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder(toBuilder = true) +@Data public class UserInfoQuery extends BaseQuery { /** @@ -13,13 +20,5 @@ public class UserInfoQuery extends BaseQuery { */ protected String open_id; - public String getOpen_id() { - return open_id; - } - - public void setOpen_id(String open_id) { - this.open_id = open_id; - } - } diff --git a/dy-java-common/src/main/java/com/dyj/common/domain/vo/AccessTokenVo.java b/dy-java-common/src/main/java/com/dyj/common/domain/vo/AccessTokenVo.java index 7f11b10..5e99a30 100644 --- a/dy-java-common/src/main/java/com/dyj/common/domain/vo/AccessTokenVo.java +++ b/dy-java-common/src/main/java/com/dyj/common/domain/vo/AccessTokenVo.java @@ -1,9 +1,20 @@ package com.dyj.common.domain.vo; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + /** * @author danmo * @date 2024-04-03 11:25 **/ +@EqualsAndHashCode(callSuper = true) +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder(toBuilder = true) +@Data public class AccessTokenVo extends BaseVo{ @@ -43,69 +54,4 @@ public class AccessTokenVo extends BaseVo{ - public String getAccess_token() { - return access_token; - } - - public void setAccess_token(String access_token) { - this.access_token = access_token; - } - - public Long getExpires_in() { - return expires_in; - } - - public void setExpires_in(Long expires_in) { - this.expires_in = expires_in; - } - - public String getLog_id() { - return log_id; - } - - public void setLog_id(String log_id) { - this.log_id = log_id; - } - - public String getOpen_id() { - return open_id; - } - - public void setOpen_id(String open_id) { - this.open_id = open_id; - } - - public Long getRefresh_expires_in() { - return refresh_expires_in; - } - - public void setRefresh_expires_in(Long refresh_expires_in) { - this.refresh_expires_in = refresh_expires_in; - } - - public String getRefresh_token() { - return refresh_token; - } - - public void setRefresh_token(String refresh_token) { - this.refresh_token = refresh_token; - } - - public String getScope() { - return scope; - } - - public void setScope(String scope) { - this.scope = scope; - } - - public Integer getUser_id() { - return user_id; - } - - public void setUser_id(Integer user_id) { - this.user_id = user_id; - } - - } diff --git a/dy-java-common/src/main/java/com/dyj/common/domain/vo/AppsV2TokenVo.java b/dy-java-common/src/main/java/com/dyj/common/domain/vo/AppsV2TokenVo.java index 137ec14..98a1e0d 100644 --- a/dy-java-common/src/main/java/com/dyj/common/domain/vo/AppsV2TokenVo.java +++ b/dy-java-common/src/main/java/com/dyj/common/domain/vo/AppsV2TokenVo.java @@ -1,9 +1,18 @@ package com.dyj.common.domain.vo; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + /** * @author danmo * @date 2024-04-17 10:29 **/ +@AllArgsConstructor +@NoArgsConstructor +@Builder +@Data public class AppsV2TokenVo { /** @@ -15,20 +24,4 @@ public class AppsV2TokenVo { * access_token 有效时间，单位：秒 */ private Long expires_in; - - public String getAccess_token() { - return access_token; - } - - public void setAccess_token(String access_token) { - this.access_token = access_token; - } - - public Long getExpires_in() { - return expires_in; - } - - public void setExpires_in(Long expires_in) { - this.expires_in = expires_in; - } } diff --git a/dy-java-common/src/main/java/com/dyj/common/domain/vo/BaseVo.java b/dy-java-common/src/main/java/com/dyj/common/domain/vo/BaseVo.java index b9b6f9d..032f0be 100644 --- a/dy-java-common/src/main/java/com/dyj/common/domain/vo/BaseVo.java +++ b/dy-java-common/src/main/java/com/dyj/common/domain/vo/BaseVo.java @@ -1,9 +1,18 @@ package com.dyj.common.domain.vo; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + /** * @author danmo * @date 2024-04-07 14:58 **/ +@AllArgsConstructor +@NoArgsConstructor +@Builder +@Data public class BaseVo { /** @@ -15,20 +24,4 @@ public class BaseVo { */ protected Integer error_code; - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public Integer getError_code() { - return error_code; - } - - public void setError_code(Integer error_code) { - this.error_code = error_code; - } - } diff --git a/dy-java-common/src/main/java/com/dyj/common/domain/vo/BizTokenVo.java b/dy-java-common/src/main/java/com/dyj/common/domain/vo/BizTokenVo.java index f5cc96b..03e57cc 100644 --- a/dy-java-common/src/main/java/com/dyj/common/domain/vo/BizTokenVo.java +++ b/dy-java-common/src/main/java/com/dyj/common/domain/vo/BizTokenVo.java @@ -1,9 +1,18 @@ package com.dyj.common.domain.vo; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + /** * @author danmo * @date 2024-04-03 11:25 **/ +@AllArgsConstructor +@NoArgsConstructor +@Builder +@Data public class BizTokenVo{ /** @@ -24,35 +33,4 @@ public class BizTokenVo{ */ private String biz_refresh_token; - public String getBiz_token() { - return biz_token; - } - - public void setBiz_token(String biz_token) { - this.biz_token = biz_token; - } - - public Long getBiz_expires_in() { - return biz_expires_in; - } - - public void setBiz_expires_in(Long biz_expires_in) { - this.biz_expires_in = biz_expires_in; - } - - public Long getBiz_refresh_expires_in() { - return biz_refresh_expires_in; - } - - public void setBiz_refresh_expires_in(Long biz_refresh_expires_in) { - this.biz_refresh_expires_in = biz_refresh_expires_in; - } - - public String getBiz_refresh_token() { - return biz_refresh_token; - } - - public void setBiz_refresh_token(String biz_refresh_token) { - this.biz_refresh_token = biz_refresh_token; - } } diff --git a/dy-java-common/src/main/java/com/dyj/common/domain/vo/ClientTokenVo.java b/dy-java-common/src/main/java/com/dyj/common/domain/vo/ClientTokenVo.java index 2b8e3a1..d281b4a 100644 --- a/dy-java-common/src/main/java/com/dyj/common/domain/vo/ClientTokenVo.java +++ b/dy-java-common/src/main/java/com/dyj/common/domain/vo/ClientTokenVo.java @@ -1,9 +1,20 @@ package com.dyj.common.domain.vo; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + /** * @author danmo * @date 2024-04-03 11:25 **/ +@EqualsAndHashCode(callSuper = true) +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder(toBuilder = true) +@Data public class ClientTokenVo extends BaseVo { /** @@ -15,22 +26,4 @@ public class ClientTokenVo extends BaseVo { */ private Long expires_in; - - public String getAccess_token() { - return access_token; - } - - public void setAccess_token(String access_token) { - this.access_token = access_token; - } - - public Long getExpires_in() { - return expires_in; - } - - public void setExpires_in(Long expires_in) { - this.expires_in = expires_in; - } - - } diff --git a/dy-java-common/src/main/java/com/dyj/common/domain/vo/DataAndExtraBodyVo.java b/dy-java-common/src/main/java/com/dyj/common/domain/vo/DataAndExtraBodyVo.java index e798004..5cb2a9d 100644 --- a/dy-java-common/src/main/java/com/dyj/common/domain/vo/DataAndExtraBodyVo.java +++ b/dy-java-common/src/main/java/com/dyj/common/domain/vo/DataAndExtraBodyVo.java @@ -1,27 +1,14 @@ package com.dyj.common.domain.vo; -import com.dyj.common.domain.DyExtra; - +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@AllArgsConstructor +@NoArgsConstructor +@Builder +@Data public class DataAndExtraBodyVo { - private T data; - - private DyExtra extra_body; - - public T getData() { - return data; - } - - public DataAndExtraBodyVo setData(T data) { - this.data = data; - return this; - } - - public DyExtra getExtra_body() { - return extra_body; - } - public DataAndExtraBodyVo setExtra_body(DyExtra extra_body) { - this.extra_body = extra_body; - return this; - } } diff --git a/dy-java-common/src/main/java/com/dyj/common/domain/vo/RefreshAccessTokenVo.java b/dy-java-common/src/main/java/com/dyj/common/domain/vo/RefreshAccessTokenVo.java index 37b60d3..29ab4e7 100644 --- a/dy-java-common/src/main/java/com/dyj/common/domain/vo/RefreshAccessTokenVo.java +++ b/dy-java-common/src/main/java/com/dyj/common/domain/vo/RefreshAccessTokenVo.java @@ -1,9 +1,20 @@ package com.dyj.common.domain.vo; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + /** * @author danmo * @date 2024-04-03 11:25 **/ +@EqualsAndHashCode(callSuper = true) +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder(toBuilder = true) +@Data public class RefreshAccessTokenVo extends BaseVo { private String access_token; @@ -35,61 +46,4 @@ public class RefreshAccessTokenVo extends BaseVo { */ private String scope; - - public String getAccess_token() { - return access_token; - } - - public void setAccess_token(String access_token) { - this.access_token = access_token; - } - - public Long getExpires_in() { - return expires_in; - } - - public void setExpires_in(Long expires_in) { - this.expires_in = expires_in; - } - - public String getLog_id() { - return log_id; - } - - public void setLog_id(String log_id) { - this.log_id = log_id; - } - - public String getOpen_id() { - return open_id; - } - - public void setOpen_id(String open_id) { - this.open_id = open_id; - } - - public Long getRefresh_expires_in() { - return refresh_expires_in; - } - - public void setRefresh_expires_in(Long refresh_expires_in) { - this.refresh_expires_in = refresh_expires_in; - } - - public String getRefresh_token() { - return refresh_token; - } - - public void setRefresh_token(String refresh_token) { - this.refresh_token = refresh_token; - } - - public String getScope() { - return scope; - } - - public void setScope(String scope) { - this.scope = scope; - } - } diff --git a/dy-java-common/src/main/java/com/dyj/common/domain/vo/RefreshTokenVo.java b/dy-java-common/src/main/java/com/dyj/common/domain/vo/RefreshTokenVo.java index 3d6e601..fd550f0 100644 --- a/dy-java-common/src/main/java/com/dyj/common/domain/vo/RefreshTokenVo.java +++ b/dy-java-common/src/main/java/com/dyj/common/domain/vo/RefreshTokenVo.java @@ -1,9 +1,20 @@ package com.dyj.common.domain.vo; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + /** * @author danmo * @date 2024-04-03 11:25 **/ +@EqualsAndHashCode(callSuper = true) +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder(toBuilder = true) +@Data public class RefreshTokenVo extends BaseVo { /** * 接口调用凭证 @@ -13,23 +24,4 @@ public class RefreshTokenVo extends BaseVo { * access_token接口调用凭证超时时间，单位（秒) */ private Integer expires_in; - - - public String getRefresh_token() { - return refresh_token; - } - - public void setRefresh_token(String refresh_token) { - this.refresh_token = refresh_token; - } - - public Integer getExpires_in() { - return expires_in; - } - - public void setExpires_in(Integer expires_in) { - this.expires_in = expires_in; - } - - } diff --git a/pom.xml b/pom.xml index 3b1e1bb..7bd29c0 100644 --- a/pom.xml +++ b/pom.xml @@ -23,6 +23,7 @@ 2.7.18 1.5.36 1.2.83 + 1.18.24 -- Gitee