chenzihao/sac
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: chenzihao:ca_router
Branches Tags
chenzihao:ca_router
chenzihao:sac_ca_router_merge_test
chenzihao:sac_ca_router_merge_test_1
chenzihao:chenzihao-patch-1
..
compare: chenzihao:sac_ca_router_merge_test
Branches Tags
chenzihao:ca_router
chenzihao:sac_ca_router_merge_test
chenzihao:sac_ca_router_merge_test_1
chenzihao:chenzihao-patch-1

2 Commits
ca_router ... sac_ca_rou

Author SHA1 Message Date
BertrandC
0cc6b173d9 合并申请时冲突合并处理测试22 2025-05-23 18:55:42 +08:00
BertrandC
41e63dd670 合并申请时冲突合并处理测试 2025-05-23 18:48:01 +08:00
5 changed files with 5 additions and 7 deletions
Show Stats Expand all files Collapse all files

2
sf-vertx/pom.xml
View File

@ -15,7 +15,7 @@
<properties> <properties>
<vertx.version>4.5.7</vertx.version> <vertx.version>4.5.7</vertx.version>
<hystrix.version>1.5.2</hystrix.version> <hystrix.version>1.5.2</hystrix.version>
<resilience4j.version>1.7.0</resilience4j.version> <resilience4j.version>2.2.0</resilience4j.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>

2
sf-vertx/src/main/java/com/sf/vertx/config/RedisConfig.java
View File

@ -10,7 +10,7 @@ import org.springframework.data.redis.core.script.DefaultRedisScript;
import org.springframework.data.redis.serializer.StringRedisSerializer; import org.springframework.data.redis.serializer.StringRedisSerializer;
/** /**
* redis配置 * redis配置 hhhh666666
* *
* @author ztzh * @author ztzh
*/ */

3
sf-vertx/src/main/java/com/sf/vertx/handle/ApiRateLimitHandlerImpl.java
View File

@ -8,9 +8,8 @@ import com.sf.vertx.exception.ServiceException;
import com.sf.vertx.pojo.SacCurrentLimiting; import com.sf.vertx.pojo.SacCurrentLimiting;
import com.sf.vertx.utils.AppUtils; import com.sf.vertx.utils.AppUtils;
//import io.github.resilience4j.core.functions.CheckedRunnable; import io.github.resilience4j.core.functions.CheckedRunnable;
import io.github.resilience4j.ratelimiter.RateLimiter; import io.github.resilience4j.ratelimiter.RateLimiter;
import io.vavr.CheckedRunnable;
import io.vertx.ext.web.RoutingContext; import io.vertx.ext.web.RoutingContext;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;

3
sf-vertx/src/main/java/com/sf/vertx/handle/AppRateLimitHandlerImpl.java
View File

@ -6,9 +6,8 @@ import com.sf.vertx.exception.ServiceException;
import com.sf.vertx.pojo.SacCurrentLimiting; import com.sf.vertx.pojo.SacCurrentLimiting;
import com.sf.vertx.utils.AppUtils; import com.sf.vertx.utils.AppUtils;
//import io.github.resilience4j.core.functions.CheckedRunnable; import io.github.resilience4j.core.functions.CheckedRunnable;
import io.github.resilience4j.ratelimiter.RateLimiter; import io.github.resilience4j.ratelimiter.RateLimiter;
import io.vavr.CheckedRunnable;
import io.vertx.ext.web.RoutingContext; import io.vertx.ext.web.RoutingContext;
import io.vertx.ext.web.handler.HttpException; import io.vertx.ext.web.handler.HttpException;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;

2
zt-vertx/zt-vertx-service/pom.xml
View File

@ -18,7 +18,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<vertx.version>4.5.7</vertx.version> <vertx.version>4.5.7</vertx.version>
<hystrix.version>1.5.2</hystrix.version> <hystrix.version>1.5.2</hystrix.version>
<resilience4j.version>1.7.0</resilience4j.version> <resilience4j.version>2.2.0</resilience4j.version>
<fastjson.version>2.0.34</fastjson.version> <fastjson.version>2.0.34</fastjson.version>
<commons.collections.version>3.2.2</commons.collections.version> <commons.collections.version>3.2.2</commons.collections.version>
<hutool.version>5.8.22</hutool.version> <hutool.version>5.8.22</hutool.version>