diff --git a/opsli-api/pom.xml b/opsli-api/pom.xml index 31ee2ac7..82a1fb33 100644 --- a/opsli-api/pom.xml +++ b/opsli-api/pom.xml @@ -27,6 +27,12 @@ ${plugins.version} + + + com.baomidou + mybatis-plus-boot-starter + + com.github.xiaoymin diff --git a/opsli-base-support/opsli-core/pom.xml b/opsli-base-support/opsli-core/pom.xml index ddb8543d..5bb7732b 100644 --- a/opsli-base-support/opsli-core/pom.xml +++ b/opsli-base-support/opsli-core/pom.xml @@ -62,19 +62,20 @@ + + org.crazycake shiro-redis-spring-boot-starter - 3.3.1 - + com.github.whvcse easy-captcha - + com.auth0 java-jwt @@ -82,6 +83,71 @@ + + + + com.baomidou + mybatis-plus-boot-starter + + + + + com.github.pagehelper + pagehelper-spring-boot-starter + + + + + com.alibaba + druid-spring-boot-starter + + + + + com.baomidou + dynamic-datasource-spring-boot-starter + + + + + mysql + mysql-connector-java + runtime + + + + + com.microsoft.sqlserver + sqljdbc4 + runtime + + + + + com.oracle + ojdbc6 + runtime + + + + + org.postgresql + postgresql + runtime + + + + + + + com.github.oshi + oshi-core + + + net.java.dev.jna + jna-platform + + diff --git a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/DistributedLockUtil.java b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/DistributedLockUtil.java index 417c2949..53915ed8 100644 --- a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/DistributedLockUtil.java +++ b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/DistributedLockUtil.java @@ -82,7 +82,7 @@ public class DistributedLockUtil { * 初始化 * @param redissonLock 分布式锁 */ - @Autowired + @Autowired(required = false) public void init(RedissonLock redissonLock){ DistributedLockUtil.REDISSON_LOCK = redissonLock; } diff --git a/pom.xml b/pom.xml index 159fdb47..f0d8b72a 100644 --- a/pom.xml +++ b/pom.xml @@ -65,16 +65,24 @@ 1.2.75 3.4.0 1.3.0 - 1.1.17 - 2.5.4 + 3.10.3 3.9.1 4.5.2 3.9.0 + 3.15.0 1.6.2 - 1.6.0 + 3.3.1 1.68 + + 1.1.17 + 2.5.4 + 8.0.20 + 4.0 + 11.2.0.3 + 42.2.6 + 5.5.5 29.0-jre @@ -120,7 +128,86 @@ org.redisson redisson - 3.15.0 + ${redisson.version} + + + + + com.baomidou + mybatis-plus-boot-starter + ${mybatis-plus.version} + + + + + com.github.pagehelper + pagehelper-spring-boot-starter + ${pagehelper.version} + + + + + org.crazycake + shiro-redis-spring-boot-starter + ${shiro.redis.version} + + + + + com.alibaba + druid-spring-boot-starter + ${druid.version} + + + + + com.baomidou + dynamic-datasource-spring-boot-starter + ${dynamic.version} + + + + + mysql + mysql-connector-java + ${mysql.version} + runtime + + + + + com.microsoft.sqlserver + sqljdbc4 + ${sqlserver.version} + runtime + + + + + com.oracle + ojdbc6 + ${oracle.version} + runtime + + + + + org.postgresql + postgresql + ${postgresql.version} + runtime + + + + + com.github.oshi + oshi-core + ${oshi.version} + + + net.java.dev.jna + jna-platform + ${jna.version} @@ -171,66 +258,6 @@ --> - - - - - com.baomidou - mybatis-plus-boot-starter - ${mybatis-plus.version} - - - - - com.github.pagehelper - pagehelper-spring-boot-starter - ${pagehelper.version} - - - - - com.alibaba - druid-spring-boot-starter - ${druid.version} - - - - - com.baomidou - dynamic-datasource-spring-boot-starter - ${dynamic.version} - - - - - mysql - mysql-connector-java - 8.0.20 - runtime - - - - com.microsoft.sqlserver - sqljdbc4 - 4.0 - runtime - - - - com.oracle - ojdbc6 - 11.2.0.3 - runtime - - - - org.postgresql - postgresql - 42.2.6 - runtime - - - @@ -291,17 +318,6 @@ ${snakeyaml.version} - - - com.github.oshi - oshi-core - ${oshi.version} - - - net.java.dev.jna - jna-platform - ${jna.version} -