hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-11-04 12:18:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

update: hutool 5.6.1 ==> 5.7.22

Browse Source
This commit is contained in:
xingyu
2022-07-22 12:08:59 +08:00
parent 14594e492e
commit 9bdae339cc
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-dependencies/pom.xml
View File

@@ -48,7 +48,7 @@
<jasypt-spring-boot-starter.version>3.0.4</jasypt-spring-boot-starter.version> <jasypt-spring-boot-starter.version>3.0.4</jasypt-spring-boot-starter.version>
<lombok.version>1.18.20</lombok.version> <lombok.version>1.18.20</lombok.version>
<mapstruct.version>1.4.1.Final</mapstruct.version> <mapstruct.version>1.4.1.Final</mapstruct.version>
<hutool.version>5.6.1</hutool.version> <hutool.version>5.7.22</hutool.version>
<easyexcel.verion>3.1.1</easyexcel.verion> <easyexcel.verion>3.1.1</easyexcel.verion>
<velocity.version>2.2</velocity.version> <velocity.version>2.2</velocity.version>
<screw.version>1.0.5</screw.version> <screw.version>1.0.5</screw.version>

2
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/json/JsonUtils.java
View File

@@ -132,7 +132,7 @@ public class JsonUtils {
} }
public static boolean isJson(String text) { public static boolean isJson(String text) {
return JSONUtil.isJson(text); return JSONUtil.isTypeJSON(text);
} }
} }

4
yudao-framework/yudao-spring-boot-starter-config/src/main/java/cn/iocoder/yudao/framework/apollo/internals/DefaultXInjector.java
View File

@@ -8,7 +8,7 @@ import com.ctrip.framework.apollo.tracer.Tracer;
import com.ctrip.framework.apollo.util.ConfigUtil; import com.ctrip.framework.apollo.util.ConfigUtil;
import com.ctrip.framework.apollo.util.factory.DefaultPropertiesFactory; import com.ctrip.framework.apollo.util.factory.DefaultPropertiesFactory;
import com.ctrip.framework.apollo.util.factory.PropertiesFactory; import com.ctrip.framework.apollo.util.factory.PropertiesFactory;
import com.ctrip.framework.apollo.util.http.HttpUtil; import com.ctrip.framework.apollo.util.http.DefaultHttpClient;
import com.ctrip.framework.apollo.util.yaml.YamlParser; import com.ctrip.framework.apollo.util.yaml.YamlParser;
import com.google.inject.AbstractModule; import com.google.inject.AbstractModule;
import com.google.inject.Guice; import com.google.inject.Guice;
@@ -63,7 +63,7 @@ public class DefaultXInjector implements Injector {
bind(ConfigFactory.class).to(DBConfigFactory.class).in(Singleton.class); bind(ConfigFactory.class).to(DBConfigFactory.class).in(Singleton.class);
bind(ConfigUtil.class).in(Singleton.class); bind(ConfigUtil.class).in(Singleton.class);
bind(HttpUtil.class).in(Singleton.class); bind(DefaultHttpClient.class).in(Singleton.class);
bind(ConfigServiceLocator.class).in(Singleton.class); bind(ConfigServiceLocator.class).in(Singleton.class);
bind(RemoteConfigLongPollService.class).in(Singleton.class); bind(RemoteConfigLongPollService.class).in(Singleton.class);
bind(YamlParser.class).in(Singleton.class); bind(YamlParser.class).in(Singleton.class);

2
yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/core/aop/BizTraceAspect.java
View File

@@ -38,7 +38,7 @@ public class BizTraceAspect {
String operationName = getOperationName(joinPoint, trace); String operationName = getOperationName(joinPoint, trace);
Span span = tracer.buildSpan(operationName) Span span = tracer.buildSpan(operationName)
.withTag(Tags.COMPONENT.getKey(), "biz") .withTag(Tags.COMPONENT.getKey(), "biz")
.startManual(); .start();
try { try {
// 执行原有方法 // 执行原有方法
return joinPoint.proceed(); return joinPoint.proceed();

4
yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/util/RandomUtils.java
View File

@@ -40,7 +40,7 @@ public class RandomUtils {
// Integer // Integer
PODAM_FACTORY.getStrategy().addOrReplaceTypeManufacturer(Integer.class, (dataProviderStrategy, attributeMetadata, map) -> { PODAM_FACTORY.getStrategy().addOrReplaceTypeManufacturer(Integer.class, (dataProviderStrategy, attributeMetadata, map) -> {
// 如果是 status 的字段，返回 0 或 1 // 如果是 status 的字段，返回 0 或 1
if (attributeMetadata.getAttributeName().equals("status")) { if ("status".equals(attributeMetadata.getAttributeName())) {
return RandomUtil.randomEle(CommonStatusEnum.values()).getStatus(); return RandomUtil.randomEle(CommonStatusEnum.values()).getStatus();
} }
// 如果是 type、status 结尾的字段，返回 tinyint 范围 // 如果是 type、status 结尾的字段，返回 tinyint 范围
@@ -53,7 +53,7 @@ public class RandomUtils {
// Boolean // Boolean
PODAM_FACTORY.getStrategy().addOrReplaceTypeManufacturer(Boolean.class, (dataProviderStrategy, attributeMetadata, map) -> { PODAM_FACTORY.getStrategy().addOrReplaceTypeManufacturer(Boolean.class, (dataProviderStrategy, attributeMetadata, map) -> {
// 如果是 deleted 的字段，返回非删除 // 如果是 deleted 的字段，返回非删除
if (attributeMetadata.getAttributeName().equals("deleted")) { if ("deleted".equals(attributeMetadata.getAttributeName())) {
return false; return false;
} }
return RandomUtil.randomBoolean(); return RandomUtil.randomBoolean();

2
yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/config/YudaoSwaggerAutoConfiguration.java
View File

@@ -95,7 +95,7 @@ public class YudaoSwaggerAutoConfiguration {
return Collections.singletonList(SecurityContext.builder() return Collections.singletonList(SecurityContext.builder()
.securityReferences(securityReferences()) .securityReferences(securityReferences())
// 通过 PathSelectors.regex("^(?!auth).*$")，排除包含 "auth" 的接口不需要使用securitySchemes // 通过 PathSelectors.regex("^(?!auth).*$")，排除包含 "auth" 的接口不需要使用securitySchemes
.forPaths(PathSelectors.regex("^(?!auth).*$")) .operationSelector(o -> o.requestMappingPattern().matches("^(?!auth).*$"))
.build()); .build());
} }