diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml index e5866cc29..ef9ea2333 100644 --- a/pigx-common/pigx-common-bom/pom.xml +++ b/pigx-common/pigx-common-bom/pom.xml @@ -1,277 +1,286 @@ - 4.0.0 - - group.springframework - spring-cloud-dependencies-parent - 2021.0.0 - - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + group.springframework + spring-cloud-dependencies-parent + 2021.0.0 + + - com.pig4cloud - pigx-common-bom - pom - ${pigx.version} - pigx 公共版本控制 + com.pig4cloud + pigx-common-bom + pom + ${pigx.version} + pigx 公共版本控制 - - 4.3.0-SNAPSHOT - 3.5.1 - 3.4.1 - 1.2.8 - 8.0.27 - 21.3.0.0 - 8.4.1.jre8 - 1.5.22 - 4.2.0 - 2.7.6 - 3.0.3 - 1.13.1 - 0.5.0 - 2.3.6.RELEASE - 1.2.75 - 2.3.0 - 3.0.52.ALL - 1.11.543 - 2.17.1 - 0.0.23 - 0.33.0 - 1.0.0 - + + 4.3.0-SNAPSHOT + 3.5.1 + 3.4.1 + 1.2.8 + 5.7.21 + 8.0.27 + 21.3.0.0 + 8.4.1.jre8 + 1.5.22 + 4.2.0 + 2.7.6 + 3.0.3 + 1.13.1 + 0.5.0 + 2.3.6.RELEASE + 1.2.75 + 2.3.0 + 3.0.52.ALL + 1.11.543 + 2.17.1 + 0.0.23 + 0.33.0 + 1.0.0 + - - - - com.pig4cloud - pigx-common-core - ${pigx.version} - - - com.pig4cloud - pigx-common-data - ${pigx.version} - - - com.pig4cloud - pigx-common-gateway - ${pigx.version} - - - com.pig4cloud - pigx-common-gray - ${pigx.version} - - - com.pig4cloud - pigx-common-datasource - ${pigx.version} - - - com.pig4cloud - pigx-common-idempotent - ${pigx.version} - - - com.pig4cloud - pigx-common-job - ${pigx.version} - - - com.pig4cloud - pigx-common-log - ${pigx.version} - - - com.pig4cloud - pigx-common-oss - ${pigx.version} - - - com.pig4cloud - pigx-common-security - ${pigx.version} - - - com.pig4cloud - pigx-common-sentinel - ${pigx.version} - - - com.pig4cloud - pigx-common-feign - ${pigx.version} - - - com.pig4cloud - pigx-common-sequence - ${pigx.version} - - - com.pig4cloud - pigx-common-swagger - ${pigx.version} - - - com.pig4cloud - pigx-common-transaction - ${pigx.version} - - - com.pig4cloud - pigx-common-test - ${pigx.version} - - - com.pig4cloud - pigx-common-xss - ${pigx.version} - - - com.pig4cloud - pigx-common-websocket - ${pigx.version} - - - com.pig4cloud - pigx-common-excel - ${pigx.version} - - - com.pig4cloud - pigx-upms-api - ${pigx.version} - - - - com.baomidou - mybatis-plus-extension - ${mybatis-plus.version} - - - - com.baomidou - mybatis-plus-boot-starter - ${mybatis-plus.version} - - - com.baomidou - dynamic-datasource-spring-boot-starter - ${dynamic-ds.version} - - - - com.alibaba - druid-spring-boot-starter - ${druid.version} - - - com.alibaba - druid - ${druid.version} - - - - mysql - mysql-connector-java - ${mysql.connector.version} - - - - com.oracle.database.jdbc - ojdbc8 - ${oracle.version} - - - - com.microsoft.sqlserver - mssql-jdbc - ${sqlserver.version} - - - - com.alibaba - fastjson - ${fastjson.version} - - - - io.swagger - swagger-models - ${swagger.core.version} - - - io.swagger - swagger-annotations - ${swagger.core.version} - - - - com.github.binarywang - weixin-java-mp - ${mp.weixin.version} - - - com.github.binarywang - weixin-java-common - ${mp.weixin.version} - - - - com.github.javen205 - IJPay-WxPay - ${ijpay.version} - - - com.github.javen205 - IJPay-AliPay - ${ijpay.version} - - - - org.codehaus.groovy - groovy - ${groovy.version} - - - - org.springframework.security.oauth - spring-security-oauth2 - ${security.oauth.version} - - - - org.jsoup - jsoup - ${jsoup.version} - - - - org.apache.logging.log4j - log4j-to-slf4j - ${log4j2.version} - - - org.apache.logging.log4j - log4j-bom - ${log4j2.version} - pom - import - - - + + + + com.pig4cloud + pigx-common-core + ${pigx.version} + + + com.pig4cloud + pigx-common-data + ${pigx.version} + + + com.pig4cloud + pigx-common-gateway + ${pigx.version} + + + com.pig4cloud + pigx-common-gray + ${pigx.version} + + + com.pig4cloud + pigx-common-datasource + ${pigx.version} + + + com.pig4cloud + pigx-common-idempotent + ${pigx.version} + + + com.pig4cloud + pigx-common-job + ${pigx.version} + + + com.pig4cloud + pigx-common-log + ${pigx.version} + + + com.pig4cloud + pigx-common-oss + ${pigx.version} + + + com.pig4cloud + pigx-common-security + ${pigx.version} + + + com.pig4cloud + pigx-common-sentinel + ${pigx.version} + + + com.pig4cloud + pigx-common-feign + ${pigx.version} + + + com.pig4cloud + pigx-common-sequence + ${pigx.version} + + + com.pig4cloud + pigx-common-swagger + ${pigx.version} + + + com.pig4cloud + pigx-common-transaction + ${pigx.version} + + + com.pig4cloud + pigx-common-test + ${pigx.version} + + + com.pig4cloud + pigx-common-xss + ${pigx.version} + + + com.pig4cloud + pigx-common-websocket + ${pigx.version} + + + com.pig4cloud + pigx-common-excel + ${pigx.version} + + + com.pig4cloud + pigx-upms-api + ${pigx.version} + + + + com.baomidou + mybatis-plus-extension + ${mybatis-plus.version} + + + + com.baomidou + mybatis-plus-boot-starter + ${mybatis-plus.version} + + + com.baomidou + dynamic-datasource-spring-boot-starter + ${dynamic-ds.version} + + + + com.alibaba + druid-spring-boot-starter + ${druid.version} + + + com.alibaba + druid + ${druid.version} + + + + mysql + mysql-connector-java + ${mysql.connector.version} + + + + com.oracle.database.jdbc + ojdbc8 + ${oracle.version} + + + + com.microsoft.sqlserver + mssql-jdbc + ${sqlserver.version} + + + + com.alibaba + fastjson + ${fastjson.version} + + + + io.swagger + swagger-models + ${swagger.core.version} + + + io.swagger + swagger-annotations + ${swagger.core.version} + + + + com.github.binarywang + weixin-java-mp + ${mp.weixin.version} + + + com.github.binarywang + weixin-java-common + ${mp.weixin.version} + + + + com.github.javen205 + IJPay-WxPay + ${ijpay.version} + + + com.github.javen205 + IJPay-AliPay + ${ijpay.version} + + + + org.codehaus.groovy + groovy + ${groovy.version} + + + + org.springframework.security.oauth + spring-security-oauth2 + ${security.oauth.version} + + + + org.jsoup + jsoup + ${jsoup.version} + + + + org.apache.logging.log4j + log4j-to-slf4j + ${log4j2.version} + + + org.apache.logging.log4j + log4j-bom + ${log4j2.version} + pom + import + + + + cn.hutool + hutool-bom + ${hutool.version} + pom + import + + + - - - aliyun-plugin - https://maven.aliyun.com/repository/public - - true - - - false - - - + + + aliyun-plugin + https://maven.aliyun.com/repository/public + + true + + + false + + + diff --git a/pigx-common/pigx-common-core/pom.xml b/pigx-common/pigx-common-core/pom.xml index 31f3a327a..c9380bf9b 100644 --- a/pigx-common/pigx-common-core/pom.xml +++ b/pigx-common/pigx-common-core/pom.xml @@ -37,8 +37,7 @@ cn.hutool - hutool-all - ${hutool.version} + hutool-json diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/SpringContextHolder.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/SpringContextHolder.java index 9385274b4..89374271b 100644 --- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/SpringContextHolder.java +++ b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/SpringContextHolder.java @@ -27,6 +27,8 @@ import org.springframework.context.ApplicationEvent; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; +import java.util.Map; + /** * @author lengleng * @date 2018/6/27 Spring 工具类 @@ -61,6 +63,13 @@ public class SpringContextHolder implements ApplicationContextAware, DisposableB return (T) applicationContext.getBean(name); } + /** + * 从静态变量applicationContext中取得Bean, Map + */ + public static Map getBeansOfType(Class type) { + return applicationContext.getBeansOfType(type); + } + /** * 从静态变量applicationContext中取得Bean, 自动转型为所赋值对象的类型. */ diff --git a/pigx-common/pigx-common-gateway/pom.xml b/pigx-common/pigx-common-gateway/pom.xml index 1a00f7728..0949f3aeb 100644 --- a/pigx-common/pigx-common-gateway/pom.xml +++ b/pigx-common/pigx-common-gateway/pom.xml @@ -19,41 +19,45 @@ --> - 4.0.0 - - com.pig4cloud - pigx-common - 4.3.0-SNAPSHOT - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + com.pig4cloud + pigx-common + 4.3.0-SNAPSHOT + - pigx-common-gateway - jar + pigx-common-gateway + jar - pigx gateway + pigx gateway - - - com.pig4cloud - pigx-common-core - - - - org.springframework.cloud - spring-cloud-gateway-server - - - org.springframework.boot - spring-boot-starter-data-redis-reactive - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - compile - - - org.springframework.cloud - spring-cloud-starter-loadbalancer - - + + + com.pig4cloud + pigx-common-core + + + cn.hutool + hutool-cache + + + + org.springframework.cloud + spring-cloud-gateway-server + + + org.springframework.boot + spring-boot-starter-data-redis-reactive + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + compile + + + org.springframework.cloud + spring-cloud-starter-loadbalancer + + diff --git a/pigx-common/pigx-common-log/pom.xml b/pigx-common/pigx-common-log/pom.xml index 136618f7b..3fc257fb6 100644 --- a/pigx-common/pigx-common-log/pom.xml +++ b/pigx-common/pigx-common-log/pom.xml @@ -19,39 +19,48 @@ --> - 4.0.0 - - com.pig4cloud - pigx-common - 4.3.0-SNAPSHOT - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + com.pig4cloud + pigx-common + 4.3.0-SNAPSHOT + - pigx-common-log - jar + pigx-common-log + jar - pigx 日志服务 + pigx 日志服务 - - - - com.pig4cloud - pigx-common-core - - - - com.pig4cloud - pigx-upms-api - - - - org.springframework.security - spring-security-core - - - org.springframework.security.oauth - spring-security-oauth2 - - + + + + com.pig4cloud + pigx-common-core + + + + cn.hutool + hutool-http + + + cn.hutool + hutool-extra + + + + com.pig4cloud + pigx-upms-api + + + + org.springframework.security + spring-security-core + + + org.springframework.security.oauth + spring-security-oauth2 + + diff --git a/pigx-common/pigx-common-security/pom.xml b/pigx-common/pigx-common-security/pom.xml index fbfe7d690..0aa9f1a19 100644 --- a/pigx-common/pigx-common-security/pom.xml +++ b/pigx-common/pigx-common-security/pom.xml @@ -18,47 +18,52 @@ --> - 4.0.0 - - com.pig4cloud - pigx-common - 4.3.0-SNAPSHOT - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + com.pig4cloud + pigx-common + 4.3.0-SNAPSHOT + - pigx-common-security - jar + pigx-common-security + jar - pigx 安全工具类 + pigx 安全工具类 - - - - com.pig4cloud - pigx-common-core - - - - org.springframework.security.oauth.boot - spring-security-oauth2-autoconfigure - - - - io.github.openfeign - feign-core - - - - org.aspectj - aspectjrt - - - - org.springframework.data - spring-data-redis - - + + + + com.pig4cloud + pigx-common-core + + + + cn.hutool + hutool-http + + + + org.springframework.security.oauth.boot + spring-security-oauth2-autoconfigure + + + + io.github.openfeign + feign-core + + + + org.aspectj + aspectjrt + + + + org.springframework.data + spring-data-redis + + com.pig4cloud pigx-upms-api diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxDaoAuthenticationProvider.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxDaoAuthenticationProvider.java index c8a07975a..0dcaa196c 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxDaoAuthenticationProvider.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxDaoAuthenticationProvider.java @@ -1,6 +1,6 @@ package com.pig4cloud.pigx.common.security.component; -import cn.hutool.extra.spring.SpringUtil; +import com.pig4cloud.pigx.common.core.util.SpringContextHolder; import com.pig4cloud.pigx.common.core.util.WebUtils; import com.pig4cloud.pigx.common.security.service.PigxUserDetailsService; import org.springframework.core.Ordered; @@ -87,7 +87,7 @@ public class PigxDaoAuthenticationProvider extends AbstractUserDetailsAuthentica clientId = clientAuthentication.getName(); } - Map userDetailsServiceMap = SpringUtil + Map userDetailsServiceMap = SpringContextHolder .getBeansOfType(PigxUserDetailsService.class); Optional optional = userDetailsServiceMap.values().stream() .filter(service -> service.support(clientId, null)).max(Comparator.comparingInt(Ordered::getOrder)); diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxLocalResourceServerTokenServices.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxLocalResourceServerTokenServices.java index 1bd60640f..1744a6c43 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxLocalResourceServerTokenServices.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxLocalResourceServerTokenServices.java @@ -1,6 +1,6 @@ package com.pig4cloud.pigx.common.security.component; -import cn.hutool.extra.spring.SpringUtil; +import com.pig4cloud.pigx.common.core.util.SpringContextHolder; import com.pig4cloud.pigx.common.security.exception.UnauthorizedException; import com.pig4cloud.pigx.common.security.service.PigxUser; import com.pig4cloud.pigx.common.security.service.PigxUserDetailsService; @@ -51,7 +51,7 @@ public class PigxLocalResourceServerTokenServices implements ResourceServerToken String clientId = oAuth2Request.getClientId(); - Map userDetailsServiceMap = SpringUtil + Map userDetailsServiceMap = SpringContextHolder .getBeansOfType(PigxUserDetailsService.class); Optional optional = userDetailsServiceMap.values().stream() diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/grant/CustomAppAuthenticationProvider.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/grant/CustomAppAuthenticationProvider.java index fb805de0c..d1d732f79 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/grant/CustomAppAuthenticationProvider.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/grant/CustomAppAuthenticationProvider.java @@ -1,6 +1,6 @@ package com.pig4cloud.pigx.common.security.grant; -import cn.hutool.extra.spring.SpringUtil; +import com.pig4cloud.pigx.common.core.util.SpringContextHolder; import com.pig4cloud.pigx.common.security.service.PigxUserDetailsService; import lombok.Setter; import lombok.extern.slf4j.Slf4j; @@ -64,7 +64,7 @@ public class CustomAppAuthenticationProvider extends AbstractUserDetailsAuthenti Authentication clientAuthentication = SecurityContextHolder.getContext().getAuthentication(); String clientId = clientAuthentication.getName(); - Map userDetailsServiceMap = SpringUtil + Map userDetailsServiceMap = SpringContextHolder .getBeansOfType(PigxUserDetailsService.class); Optional optional = userDetailsServiceMap.values().stream() .filter(service -> service.support(clientId, requestToken.getGrantType())) diff --git a/pigx-common/pigx-common-sentinel/src/main/java/com/pig4cloud/pigx/common/sentinel/handle/PigxUrlBlockHandler.java b/pigx-common/pigx-common-sentinel/src/main/java/com/pig4cloud/pigx/common/sentinel/handle/PigxUrlBlockHandler.java index 96cc62432..f378461b0 100644 --- a/pigx-common/pigx-common-sentinel/src/main/java/com/pig4cloud/pigx/common/sentinel/handle/PigxUrlBlockHandler.java +++ b/pigx-common/pigx-common-sentinel/src/main/java/com/pig4cloud/pigx/common/sentinel/handle/PigxUrlBlockHandler.java @@ -17,7 +17,6 @@ package com.pig4cloud.pigx.common.sentinel.handle; -import cn.hutool.http.ContentType; import cn.hutool.json.JSONUtil; import com.alibaba.csp.sentinel.adapter.spring.webmvc.callback.BlockExceptionHandler; import com.alibaba.csp.sentinel.slots.block.BlockException; @@ -40,8 +39,7 @@ public class PigxUrlBlockHandler implements BlockExceptionHandler { @Override public void handle(HttpServletRequest request, HttpServletResponse response, BlockException e) throws Exception { log.error("sentinel 降级 资源名称{}", e.getRule().getResource(), e); - - response.setContentType(ContentType.JSON.toString()); + response.setContentType("application/json"); response.setStatus(HttpStatus.TOO_MANY_REQUESTS.value()); response.getWriter().print(JSONUtil.toJsonStr(R.failed(e.getMessage()))); } diff --git a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/db/BaseDbHelper.java b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/db/BaseDbHelper.java index e7a8e9a4c..e1b3e2121 100755 --- a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/db/BaseDbHelper.java +++ b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/db/BaseDbHelper.java @@ -2,7 +2,7 @@ package com.pig4cloud.pigx.common.sequence.range.impl.db; import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; -import cn.hutool.extra.spring.SpringUtil; +import com.pig4cloud.pigx.common.core.util.SpringContextHolder; import com.pig4cloud.pigx.common.sequence.exception.SeqException; import com.pig4cloud.pigx.common.sequence.range.impl.db.provider.SqlProviderFactory; @@ -16,7 +16,8 @@ import java.sql.*; */ abstract class BaseDbHelper { - private static final SqlProviderFactory SQL_PROVIDER_FACTORY = SpringUtil.getBean(SqlProviderFactory.class); + private static final SqlProviderFactory SQL_PROVIDER_FACTORY = SpringContextHolder + .getBean(SqlProviderFactory.class); private static final long DELTA = 100000000L; diff --git a/pigx-common/pigx-common-websocket/pom.xml b/pigx-common/pigx-common-websocket/pom.xml index cdf9d8325..1820c7adc 100755 --- a/pigx-common/pigx-common-websocket/pom.xml +++ b/pigx-common/pigx-common-websocket/pom.xml @@ -28,7 +28,6 @@ cn.hutool hutool-json - ${hutool.version} diff --git a/pigx-common/pigx-common-xss/pom.xml b/pigx-common/pigx-common-xss/pom.xml index 4be58b1e3..cbb6fe8f2 100755 --- a/pigx-common/pigx-common-xss/pom.xml +++ b/pigx-common/pigx-common-xss/pom.xml @@ -18,7 +18,6 @@ cn.hutool hutool-core - ${hutool.version} @@ -42,4 +41,4 @@ provided - \ No newline at end of file + diff --git a/pigx-gateway/pom.xml b/pigx-gateway/pom.xml index 7b6a20c1f..c957d6ce9 100644 --- a/pigx-gateway/pom.xml +++ b/pigx-gateway/pom.xml @@ -19,91 +19,100 @@ --> - 4.0.0 - - com.pig4cloud - pigx - 4.3.0-SNAPSHOT - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + com.pig4cloud + pigx + 4.3.0-SNAPSHOT + - pigx-gateway - jar + pigx-gateway + jar - pigx 服务网关，基于 spring cloud gateway + pigx 服务网关，基于 spring cloud gateway - - - - org.springframework.cloud - spring-cloud-starter-gateway - - - org.springframework.boot - spring-boot-starter-data-redis-reactive - - - - com.pig4cloud - pigx-common-gateway - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - com.github.anji-plus - captcha-spring-boot-starter - ${captcha.version} - - - - org.springframework.boot - spring-boot-starter-data-redis - - - - com.alibaba.cloud - spring-cloud-alibaba-sentinel-gateway - - - - com.pig4cloud - pigx-common-sentinel - - - - com.github.ben-manes.caffeine - caffeine - - - - com.pig4cloud - pigx-common-swagger - - + + + + org.springframework.cloud + spring-cloud-starter-gateway + + + org.springframework.boot + spring-boot-starter-data-redis-reactive + + + + com.pig4cloud + pigx-common-gateway + + + + cn.hutool + hutool-crypto + + + cn.hutool + hutool-http + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + com.github.anji-plus + captcha-spring-boot-starter + ${captcha.version} + + + + org.springframework.boot + spring-boot-starter-data-redis + + + + com.alibaba.cloud + spring-cloud-alibaba-sentinel-gateway + + + + com.pig4cloud + pigx-common-sentinel + + + + com.github.ben-manes.caffeine + caffeine + + + + com.pig4cloud + pigx-common-swagger + + - - - - org.springframework.boot - spring-boot-maven-plugin - - - io.fabric8 - docker-maven-plugin - - false - - - - + + + + org.springframework.boot + spring-boot-maven-plugin + + + io.fabric8 + docker-maven-plugin + + false + + + + diff --git a/pigx-register/pom.xml b/pigx-register/pom.xml index 878509685..097e5de44 100755 --- a/pigx-register/pom.xml +++ b/pigx-register/pom.xml @@ -60,7 +60,6 @@ cn.hutool hutool-system - ${hutool.version} diff --git a/pigx-visual/pigx-monitor/pom.xml b/pigx-visual/pigx-monitor/pom.xml index 1d894171a..4c669b914 100644 --- a/pigx-visual/pigx-monitor/pom.xml +++ b/pigx-visual/pigx-monitor/pom.xml @@ -37,6 +37,10 @@ com.pig4cloud pigx-common-core + + cn.hutool + hutool-http + org.springframework.boot spring-boot-starter-data-redis diff --git a/pom.xml b/pom.xml index 2d8fa6278..0abf77805 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,6 @@ 0.0.28 2.2.5 2.6.0 - 5.7.18 1.2.7 3.6.4 3.0.0