Skip to content

Commit

Permalink
v8.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
839128 committed Jun 16, 2024
1 parent 19c73c0 commit fc13d1b
Show file tree
Hide file tree
Showing 10 changed files with 24 additions and 20 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -488,8 +488,8 @@ public SM2 setPublicKey(final PublicKey publicKey) {
* @param publicKeyParams 公钥参数
* @return this
*/
public SM2 setPublicKeyParams(final ECPublicKeyParameters publicKey) {
this.publicKeyParams = publicKey;
public SM2 setPublicKeyParams(final ECPublicKeyParameters publicKeyParams) {
this.publicKeyParams = publicKeyParams;
return this;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public TOTP(final Duration timeStep, final byte[] key) {
* @param key 共享密码,RFC 4226要求最少128位
*/
public TOTP(final Duration timeStep, final int passwordLength, final byte[] key) {
this(timeStep, passwordLength, HOTP_HMAC_ALGORITHM, key);
this(timeStep, passwordLength, Algorithm.HMACSHA1, key);
}

/**
Expand Down
6 changes: 4 additions & 2 deletions bus-extra/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -193,13 +193,13 @@
<groupId>org.apache.ftpserver</groupId>
<artifactId>ftpserver-core</artifactId>
<version>1.2.0</version>
<optional>true</optional>
<exclusions>
<exclusion>
<artifactId>slf4j-api</artifactId>
<groupId>org.slf4j</groupId>
</exclusion>
</exclusions>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.vdurmont</groupId>
Expand All @@ -217,11 +217,13 @@
<groupId>jakarta.mail</groupId>
<artifactId>jakarta.mail-api</artifactId>
<version>${mail.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-core</artifactId>
<version>2.12.0</version>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
Expand Down Expand Up @@ -271,13 +273,13 @@
<groupId>com.huaban</groupId>
<artifactId>jieba-analysis</artifactId>
<version>1.0.2</version>
<optional>true</optional>
<exclusions>
<exclusion>
<artifactId>commons-lang3</artifactId>
<groupId>org.apache.commons</groupId>
</exclusion>
</exclusions>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.lionsoul</groupId>
Expand Down
3 changes: 3 additions & 0 deletions bus-gitlab/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -92,16 +92,19 @@
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
<version>${jersey.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
<version>${jersey.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-multipart</artifactId>
<version>${jersey.version}</version>
<optional>true</optional>
</dependency>
</dependencies>

Expand Down
2 changes: 2 additions & 0 deletions bus-limiter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,13 @@
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>${bytebuddy.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-parameter-flow-control</artifactId>
<version>${sentinel.version}</version>
<optional>true</optional>
</dependency>
</dependencies>

Expand Down
2 changes: 0 additions & 2 deletions bus-pay/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@
<version>${bouncycastle.version}</version>
<optional>true</optional>
</dependency>

<dependency>
<groupId>com.alipay.sdk</groupId>
<artifactId>alipay-sdk-java</artifactId>
Expand Down Expand Up @@ -143,7 +142,6 @@
</exclusion>
</exclusions>
</dependency>

</dependencies>

<build>
Expand Down
1 change: 1 addition & 0 deletions bus-proxy/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
<version>${spring.boot.version}</version>
<optional>true</optional>
</dependency>
</dependencies>

Expand Down
3 changes: 2 additions & 1 deletion bus-socket/src/main/java/org/miaixz/bus/socket/Status.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@
/**
* 列举了当前所关注的各类状态枚举
*
* <p>当前枚举的各状态机事件在发生后都会及时触发{@link Handler#stateEvent(Session, Status, Throwable)}方法。
* <p>
* 当前枚举的各状态机事件在发生后都会及时触发{@link Handler#stateEvent(Session, Status, Throwable)}方法。
* 因此用户在实现的{@linkplain Handler}接口中可对自己关心的状态机事件进行处理。
* </p>
*
Expand Down
13 changes: 9 additions & 4 deletions bus-validate/src/main/java/org/miaixz/bus/validate/Builder.java
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,17 @@
*/
public class Builder extends Validator {

// 默认错误码
/**
* 默认错误码
*/
public static final String DEFAULT_ERRCODE = "-1";
// 默认属性名
/**
* 默认属性名
*/
public static final String DEFAULT_FIELD = "field";

// 校验对象参数
/**
* 校验对象参数
*/
public static final String VAL = "val";
public static final String FIELD = "field";
public static final String GROUP = "group";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,9 @@ public class Context {

/**
* 全局校验异常
* <p>
* 当校验失败时,如果定义了全局校验异常,则抛出全局校验异常;
* <p>
* 然后判断如果定义了字段异常,则抛出字段异常;
* <p>
* 最后判断如果定义了校验器注解异常,则抛出校验器注解上定义的异常;
* <p>
* 如果都没定义,则抛出{@link ValidateException}
*/
private Class<? extends ValidateException> exception;
Expand All @@ -88,12 +84,8 @@ public class Context {

/**
* 快速失败, 默认:true
* <p>
* true: 表示如果参数一旦校验,立刻抛出校验失败异常
* </P>
* <p>
* false: 即使存在参数校验失败,也必须等到该参数所有的校验器执行后,才会抛出异常
* </P>
*/
private boolean fast = true;

Expand Down

0 comments on commit fc13d1b

Please sign in to comment.