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 c5d1751dc5643d4f5b924c2a78d46597e072ef29..f24b636106b2b1d52f6bbbebb3e5781cf3dbea76 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 6422603123bee258e347bb9719fc2c6092424112..e626208068a60b43cbb327b6251e334743b5bce0 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 cc4ade2a4b57b8ecabc378cccc9f3ba599a58b01..6a2dedcfcc944ddabca2ba93b726d4615a2e7576 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 e1e704cf7b4edc5ebba775fd7941e32485b7bd1b..67d6ec6a3cce17cb4b05a8514348292c3699bc78 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 8a17457fda31637f1d77b41d164cf68cc3b303d5..3918812bd030b3cf8b4b81e8d91b1fa43030d54f 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 90b04cdd23b455544681ae16cb2a812effd67cd3..cfd9ffb1b3fe46f669a2dd85c1b4cadbbaffa893 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; }