BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 9bdae339cc1b0fc1102f694a3a8d14bbf19a3c9e

Authored by xingyu
1 parent 14594e49

update: hutool 5.6.1 ==> 5.7.22

Inline Side-by-side
Showing 6 changed files with 8 additions and 8 deletions
yudao-dependencies/pom.xml
  View file @9bdae33
... ... @@ -48,7 +48,7 @@
48 48 <jasypt-spring-boot-starter.version>3.0.4</jasypt-spring-boot-starter.version>
49 49 <lombok.version>1.18.20</lombok.version>
50 50 <mapstruct.version>1.4.1.Final</mapstruct.version>
51   - <hutool.version>5.6.1</hutool.version>
  51 + <hutool.version>5.7.22</hutool.version>
52 52 <easyexcel.verion>3.1.1</easyexcel.verion>
53 53 <velocity.version>2.2</velocity.version>
54 54 <screw.version>1.0.5</screw.version>
... ...
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/json/JsonUtils.java
  View file @9bdae33
... ... @@ -132,7 +132,7 @@ public class JsonUtils {
132 132 }
133 133  
134 134 public static boolean isJson(String text) {
135   - return JSONUtil.isJson(text);
  135 + return JSONUtil.isTypeJSON(text);
136 136 }
137 137  
138 138 }
... ...
yudao-framework/yudao-spring-boot-starter-config/src/main/java/cn/iocoder/yudao/framework/apollo/internals/DefaultXInjector.java
  View file @9bdae33
... ... @@ -8,7 +8,7 @@ import com.ctrip.framework.apollo.tracer.Tracer;
8 8 import com.ctrip.framework.apollo.util.ConfigUtil;
9 9 import com.ctrip.framework.apollo.util.factory.DefaultPropertiesFactory;
10 10 import com.ctrip.framework.apollo.util.factory.PropertiesFactory;
11   -import com.ctrip.framework.apollo.util.http.HttpUtil;
  11 +import com.ctrip.framework.apollo.util.http.DefaultHttpClient;
12 12 import com.ctrip.framework.apollo.util.yaml.YamlParser;
13 13 import com.google.inject.AbstractModule;
14 14 import com.google.inject.Guice;
... ... @@ -63,7 +63,7 @@ public class DefaultXInjector implements Injector {
63 63 bind(ConfigFactory.class).to(DBConfigFactory.class).in(Singleton.class);
64 64  
65 65 bind(ConfigUtil.class).in(Singleton.class);
66   - bind(HttpUtil.class).in(Singleton.class);
  66 + bind(DefaultHttpClient.class).in(Singleton.class);
67 67 bind(ConfigServiceLocator.class).in(Singleton.class);
68 68 bind(RemoteConfigLongPollService.class).in(Singleton.class);
69 69 bind(YamlParser.class).in(Singleton.class);
... ...
yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/core/aop/BizTraceAspect.java
  View file @9bdae33
... ... @@ -38,7 +38,7 @@ public class BizTraceAspect {
38 38 String operationName = getOperationName(joinPoint, trace);
39 39 Span span = tracer.buildSpan(operationName)
40 40 .withTag(Tags.COMPONENT.getKey(), "biz")
41   - .startManual();
  41 + .start();
42 42 try {
43 43 // 执行原有方法
44 44 return joinPoint.proceed();
... ...
yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/util/RandomUtils.java
  View file @9bdae33
... ... @@ -40,7 +40,7 @@ public class RandomUtils {
40 40 // Integer
41 41 PODAM_FACTORY.getStrategy().addOrReplaceTypeManufacturer(Integer.class, (dataProviderStrategy, attributeMetadata, map) -> {
42 42 // 如果是 status 的字段，返回 0 或 1
43   - if (attributeMetadata.getAttributeName().equals("status")) {
  43 + if ("status".equals(attributeMetadata.getAttributeName())) {
44 44 return RandomUtil.randomEle(CommonStatusEnum.values()).getStatus();
45 45 }
46 46 // 如果是 type、status 结尾的字段，返回 tinyint 范围
... ... @@ -53,7 +53,7 @@ public class RandomUtils {
53 53 // Boolean
54 54 PODAM_FACTORY.getStrategy().addOrReplaceTypeManufacturer(Boolean.class, (dataProviderStrategy, attributeMetadata, map) -> {
55 55 // 如果是 deleted 的字段，返回非删除
56   - if (attributeMetadata.getAttributeName().equals("deleted")) {
  56 + if ("deleted".equals(attributeMetadata.getAttributeName())) {
57 57 return false;
58 58 }
59 59 return RandomUtil.randomBoolean();
... ...
yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/config/YudaoSwaggerAutoConfiguration.java
  View file @9bdae33
... ... @@ -95,7 +95,7 @@ public class YudaoSwaggerAutoConfiguration {
95 95 return Collections.singletonList(SecurityContext.builder()
96 96 .securityReferences(securityReferences())
97 97 // 通过 PathSelectors.regex("^(?!auth).*$")，排除包含 "auth" 的接口不需要使用securitySchemes
98   - .forPaths(PathSelectors.regex("^(?!auth).*$"))
  98 + .operationSelector(o -> o.requestMappingPattern().matches("^(?!auth).*$"))
99 99 .build());
100 100 }
101 101  
... ...