diff --git a/pom.xml b/pom.xml index 07d5cf37471fdab65a2d69dd97ba862da816070d..0720858b14a1de9d3574eb25c0d1a7b130dc4e5a 100644 --- a/pom.xml +++ b/pom.xml @@ -13,11 +13,11 @@ 1.8 UTF-8 8 - 2.2.1.RELEASE - 2.2.9.RELEASE - Hoxton.SR7 + 2.2.3.RELEASE + 2.2.10.RELEASE + Hoxton.SR8 4.4 - 1.2.70 + 1.2.73 2.9.2 1.8.7 1.0.6 @@ -31,7 +31,7 @@ 3.11.5 1.6.2 5.1.4 - 3.3.1 + 3.4.0 3.8.1 7.2.28 4.1.3 @@ -48,9 +48,9 @@ 1.1.6.RELEASE 2.6 4.0.1 - 3.2.7.RELEASE + 3.2.10.RELEASE 7.8.0 - 2.0.4 + 2.0.5 1.2.2 zlt-job/**/*, zlt-register/**/*, zlt-web/**/* openjdk:8-jre-alpine @@ -172,6 +172,11 @@ mybatis-plus-extension ${mybatis-plus-boot-starter.version} + + com.baomidou + mybatis-plus + ${mybatis-plus-boot-starter.version} + org.springframework.security.oauth @@ -259,11 +264,6 @@ easypoi-base ${easypoi.version} - - com.baomidou - mybatis-plus - ${mybatis-plus-boot-starter.version} - de.codecentric spring-boot-admin-starter-server diff --git a/zlt-commons/zlt-common-core/src/main/java/com/central/common/service/impl/SuperServiceImpl.java b/zlt-commons/zlt-common-core/src/main/java/com/central/common/service/impl/SuperServiceImpl.java index 30ef9508acd8f5843572ce1eaf29a8cb72aad02d..27df85fe0eba7cb7eb1fb4abcbef820cf7064810 100644 --- a/zlt-commons/zlt-common-core/src/main/java/com/central/common/service/impl/SuperServiceImpl.java +++ b/zlt-commons/zlt-common-core/src/main/java/com/central/common/service/impl/SuperServiceImpl.java @@ -68,7 +68,7 @@ public class SuperServiceImpl, T> extends ServiceImpl cls = entity.getClass(); TableInfo tableInfo = TableInfoHelper.getTableInfo(cls); if (null != tableInfo && StrUtil.isNotEmpty(tableInfo.getKeyProperty())) { - Object idVal = ReflectionKit.getMethodValue(cls, entity, tableInfo.getKeyProperty()); + Object idVal = ReflectionKit.getFieldValue(entity, tableInfo.getKeyProperty()); if (StringUtils.checkValNull(idVal) || Objects.isNull(getById((Serializable) idVal))) { if (StrUtil.isEmpty(msg)) { msg = "已存在"; diff --git a/zlt-commons/zlt-common-core/src/main/java/com/central/common/utils/WebfluxResponseUtil.java b/zlt-commons/zlt-common-core/src/main/java/com/central/common/utils/WebfluxResponseUtil.java index 5e5ed0232fcdd3059a9c792505fae6331e29fddf..53159eae444f8c6c3d45c3902b137fa8efce1aae 100644 --- a/zlt-commons/zlt-common-core/src/main/java/com/central/common/utils/WebfluxResponseUtil.java +++ b/zlt-commons/zlt-common-core/src/main/java/com/central/common/utils/WebfluxResponseUtil.java @@ -47,7 +47,7 @@ public class WebfluxResponseUtil { response.getHeaders().setAccessControlAllowCredentials(true); response.getHeaders().setAccessControlAllowOrigin("*"); response.setStatusCode(HttpStatus.valueOf(httpStatus)); - response.getHeaders().setContentType(MediaType.APPLICATION_JSON_UTF8); + response.getHeaders().setContentType(MediaType.APPLICATION_JSON); DataBufferFactory dataBufferFactory = response.bufferFactory(); DataBuffer buffer = dataBufferFactory.wrap(JSONObject.toJSONString(result).getBytes(Charset.defaultCharset())); return response.writeWith(Mono.just(buffer)).doOnError((error) -> {