-
Notifications
You must be signed in to change notification settings - Fork 74
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #223 from shiyindaxiaojie/feature
update
- Loading branch information
Showing
11 changed files
with
57 additions
and
106 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -42,7 +42,7 @@ | |
* @author <a href="mailto:[email protected]">gyl</a> | ||
* @since 2.4.13 | ||
*/ | ||
@Plugin(name = "MaskingStringLayout", category = Node.CATEGORY, elementType = Layout.ELEMENT_TYPE, printObject = true) | ||
@Plugin(name = "DataMaskerStringLayout", category = Node.CATEGORY, elementType = Layout.ELEMENT_TYPE, printObject = true) | ||
public class DataMaskerStringLayout extends AbstractStringLayout { | ||
|
||
private static final String KEY = "Converter"; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 1 addition & 0 deletions
1
...-data-masker/src/main/resources/META-INF/data-masker/org.ylzl.eden.data.masker.DataMasker
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -24,16 +24,16 @@ | |
import org.springframework.context.annotation.Configuration; | ||
import org.springframework.context.annotation.Import; | ||
import org.springframework.context.annotation.Role; | ||
import org.ylzl.eden.idempotent.spring.boot.env.TimeToLiveIdempotentProperties; | ||
import org.ylzl.eden.idempotent.spring.boot.env.IdempotentProperties; | ||
|
||
/** | ||
* 幂等请求自动装配 | ||
* | ||
* @author <a href="mailto:[email protected]">gyl</a> | ||
* @since 2.4.13 | ||
*/ | ||
@ConditionalOnProperty(prefix = TimeToLiveIdempotentProperties.PREFIX) | ||
@EnableConfigurationProperties(TimeToLiveIdempotentProperties.class) | ||
@ConditionalOnProperty(prefix = IdempotentProperties.TimeToLive.PREFIX) | ||
@EnableConfigurationProperties(IdempotentProperties.class) | ||
@RequiredArgsConstructor | ||
@Import(TimeToLiveIdempotentAspectRegistrar.class) | ||
@Slf4j | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -25,7 +25,7 @@ | |
import org.springframework.context.annotation.Configuration; | ||
import org.springframework.context.annotation.Role; | ||
import org.ylzl.eden.commons.lang.StringUtils; | ||
import org.ylzl.eden.idempotent.spring.boot.env.TokenIdempotentProperties; | ||
import org.ylzl.eden.idempotent.spring.boot.env.IdempotentProperties; | ||
import org.ylzl.eden.idempotent.strategy.TokenIdempotentStrategy; | ||
import org.ylzl.eden.idempotent.web.controller.TokenIdempotentController; | ||
import org.ylzl.eden.idempotent.web.interceptor.TokenIdempotentInterceptor; | ||
|
@@ -36,8 +36,8 @@ | |
* @author <a href="mailto:[email protected]">gyl</a> | ||
* @since 2.4.13 | ||
*/ | ||
@ConditionalOnProperty(prefix = TokenIdempotentProperties.PREFIX) | ||
@EnableConfigurationProperties(TokenIdempotentProperties.class) | ||
@ConditionalOnProperty(prefix = IdempotentProperties.Token.PREFIX) | ||
@EnableConfigurationProperties(IdempotentProperties.class) | ||
@RequiredArgsConstructor | ||
@Slf4j | ||
@Role(BeanDefinition.ROLE_INFRASTRUCTURE) | ||
|
@@ -48,7 +48,7 @@ public class TokenIdempotentAutoConfiguration { | |
|
||
private static final String AUTOWIRED_IDEMPOTENT_TOKEN_INTERCEPTOR = "Autowired TokenIdempotentInterceptor"; | ||
|
||
private final TokenIdempotentProperties properties; | ||
private final IdempotentProperties properties; | ||
|
||
@Bean | ||
public TokenIdempotentController idempotentTokenController(TokenIdempotentStrategy strategy) { | ||
|
@@ -60,8 +60,8 @@ public TokenIdempotentController idempotentTokenController(TokenIdempotentStrate | |
public TokenIdempotentInterceptor idempotentTokenInterceptor(TokenIdempotentStrategy strategy) { | ||
log.debug(AUTOWIRED_IDEMPOTENT_TOKEN_INTERCEPTOR); | ||
TokenIdempotentInterceptor interceptor = new TokenIdempotentInterceptor(strategy); | ||
if (StringUtils.isNotBlank(properties.getTokenName())) { | ||
interceptor.setTokenName(properties.getTokenName()); | ||
if (StringUtils.isNotBlank(properties.getToken().getTokenName())) { | ||
interceptor.setTokenName(properties.getToken().getTokenName()); | ||
} | ||
return interceptor; | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
37 changes: 0 additions & 37 deletions
37
...rc/main/java/org/ylzl/eden/idempotent/spring/boot/env/TimeToLiveIdempotentProperties.java
This file was deleted.
Oops, something went wrong.
38 changes: 0 additions & 38 deletions
38
...rter/src/main/java/org/ylzl/eden/idempotent/spring/boot/env/TokenIdempotentConvertor.java
This file was deleted.
Oops, something went wrong.