igl 1 rok pred
rodič
commit
df951021bb

+ 1 - 1
framework-common/pom.xml

@@ -102,7 +102,7 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-core</artifactId>
-            <version>3.5.3.1</version>
+            <version>3.4.2</version>
         </dependency>
     </dependencies>
 </project>

+ 0 - 9
framework-redis/pom.xml

@@ -32,14 +32,5 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>lock4j-redisson-spring-boot-starter</artifactId>
-            <version>2.2.4</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-pool2</artifactId>
-        </dependency>
     </dependencies>
 </project>

+ 0 - 58
framework-redis/src/main/java/com/chelvc/framework/redis/config/RedissonConfig.java

@@ -1,58 +0,0 @@
-package com.chelvc.framework.redis.config;
-
-import lombok.RequiredArgsConstructor;
-import org.redisson.Redisson;
-import org.redisson.api.RedissonClient;
-import org.redisson.config.Config;
-import org.redisson.spring.data.connection.RedissonConnectionFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Primary;
-
-/**
- * Redisson配置
- *
- * @author igl
- * @date 2023/05/28 18:06
- */
-@Configurable
-@RequiredArgsConstructor(onConstructor = @__(@Autowired))
-public class RedissonConfig {
-
-  private static final String REDIS_CONNECTION_TEMPLATE = "redis://%s:%d";
-
-  @Value("${spring.redis.host:127.0.0.1}")
-  private String host;
-
-  @Value("${spring.redis.port:60379}")
-  private Integer port;
-
-  @Value("${spring.redis.password:igl611}")
-  private String password;
-
-  @Value("${spring.redis.database:0}")
-  private Integer database;
-
-  @Bean
-  @Primary
-  public RedissonConnectionFactory redisConnectionFactory() {
-    return new RedissonConnectionFactory(createConfig());
-  }
-
-  @Bean
-  public RedissonClient redissonClient() {
-    return Redisson.create(createConfig());
-  }
-
-  private Config createConfig() {
-    Config config = new Config();
-    String address = String.format(REDIS_CONNECTION_TEMPLATE, host, port);
-    config.useSingleServer()
-        .setAddress(address)
-        .setPassword(password)
-        .setDatabase(database);
-    return config;
-  }
-}

+ 0 - 26
framework-redis/src/main/java/com/chelvc/framework/redis/handler/LockExceptionHandler.java

@@ -1,26 +0,0 @@
-package com.chelvc.framework.redis.handler;
-
-import com.baomidou.lock.exception.LockFailureException;
-import com.chelvc.framework.base.exception.ResourceUnavailableException;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.RestControllerAdvice;
-
-/**
- * 锁异常处理
- *
- * @author 武尊
- * @date 2023/05/28 20:36
- */
-@Slf4j
-@Configurable
-@RestControllerAdvice
-public class LockExceptionHandler {
-
-  @ExceptionHandler(LockFailureException.class)
-  public void exceptionHandler(LockFailureException e) {
-    log.warn("锁异常:{}", e.getMessage(), e);
-    throw new ResourceUnavailableException("服务器繁忙,请稍后再试");
-  }
-}