dromara-org
/
dy-java
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pre Merge pull request !3 from bigsun/v1.0.0.0

This commit is contained in:
bigsun 2024-04-23 08:59:03 +00:00 committed by Gitee
parent bf27a96913 4a971d68b1
commit 498c1d5c8b
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dy-java-common/src/main/java/com/dyj/common/interceptor/ClientTokenInterceptor.java
View File

@ -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<DyResult> {
public class ClientTokenInterceptor implements Interceptor<DySimpleResult> {
private final Log log = LogFactory.getLog(ClientTokenInterceptor.class);
@Resource
private AuthClient authClient;

34
dy-java-spring/src/main/java/com/dyj/spring/DyConfigurationRegister.java
View File

@ -68,7 +68,7 @@ public class DyConfigurationRegister implements ResourceLoaderAware, BeanPostPro
}
String tokenSourceClass = dyConfigurationProperties.getTokenSourceClass();
if (StringUtils.hasLength(tokenSourceClass)) {
IAgentTokenService agentTokenService = applicationContext.getBean("dyTokenService", IAgentTokenService.class);
IAgentTokenService agentTokenService = applicationContext.getBean("dyTokenService", IAgentTokenService.class);
configuration.setAgentTokenService(agentTokenService);
}
//configuration.setInterceptorFactory(DyInterceptorFactory);
@ -77,8 +77,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());
@ -94,20 +94,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());
}