瀏覽代碼

up spring boot version

AE86 5 年之前
父節點
當前提交
82ee121dd7

+ 0 - 6
dbsyncer-common/pom.xml

@@ -66,12 +66,6 @@
             <artifactId>json</artifactId>
         </dependency>
 
-        <!-- lombok -->
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-
     </dependencies>
 
 </project>

+ 0 - 3
dbsyncer-monitor/src/main/java/org/dbsyncer/monitor/MonitorFactory.java

@@ -8,8 +8,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Component;
 
-import java.time.LocalDateTime;
-
 /**
  * @author AE86
  * @version 1.0.0
@@ -26,7 +24,6 @@ public class MonitorFactory implements Monitor {
     @Override
     @Cacheable(value = "connector", keyGenerator = "cacheKeyGenerator")
     public boolean alive(String id) {
-        logger.info("{}从DB检查alive,id:{}", LocalDateTime.now(), id);
         Connector connector = manager.getConnector(id);
         return null != connector ? manager.alive(connector.getConfig()) : false;
     }

+ 0 - 1
dbsyncer-web/src/main/java/org/dbsyncer/web/Application.java

@@ -3,7 +3,6 @@ package org.dbsyncer.web;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.scheduling.annotation.EnableScheduling;
 

+ 32 - 13
dbsyncer-web/src/main/java/org/dbsyncer/web/config/CacheConfiguration.java

@@ -2,8 +2,8 @@ package org.dbsyncer.web.config;
 
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.Ticker;
-import lombok.Data;
-import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.caffeine.CaffeineCache;
@@ -25,30 +25,24 @@ import java.util.stream.Collectors;
  * @version 1.0.0
  * @date 2020/04/23 11:30
  */
-@Data
-@Slf4j
 @Configuration
 @ConfigurationProperties(prefix = "dbsyncer.caching")
 public class CacheConfiguration {
 
-    private Map<String, CacheConfig> cache;
+    private final Logger logger = LoggerFactory.getLogger(getClass());
 
-    @Data
-    static class CacheConfig {
-        private Integer timeout;
-        private Integer max = 200;
-    }
+    private Map<String, CacheConfig> cache;
 
     @Bean
     public KeyGenerator cacheKeyGenerator() {
-        return new KeyGenerator(){
+        return new KeyGenerator() {
             @Override
             public Object generate(Object target, Method method, Object... params) {
                 String className = method.getDeclaringClass().getSimpleName();
                 String methodName = method.getName();
                 String paramHash = String.valueOf(Arrays.toString(params).hashCode());
                 String cacheKey = new StringJoiner("_").add(className).add(methodName).add(paramHash).toString();
-                log.debug("generate cache key : {}", cacheKey);
+                logger.debug("generate cache key : {}", cacheKey);
                 return cacheKey;
             }
         };
@@ -73,7 +67,7 @@ public class CacheConfiguration {
     }
 
     private CaffeineCache buildCache(String key, CacheConfig config, Ticker ticker) {
-        log.info("Cache key {} specified timeout of {} min, max of {}", key, config.getTimeout(), config.getMax());
+        logger.info("Cache key {} specified timeout of {} min, max of {}", key, config.getTimeout(), config.getMax());
         final Caffeine<Object, Object> caffeineBuilder = Caffeine.newBuilder()
                 .expireAfterWrite(config.getTimeout(), TimeUnit.SECONDS)
                 .maximumSize(config.getMax())
@@ -81,4 +75,29 @@ public class CacheConfiguration {
         return new CaffeineCache(key, caffeineBuilder.build());
     }
 
+    static class CacheConfig {
+        private Integer timeout;
+        private Integer max = 200;
+
+        public Integer getTimeout() {
+            return timeout;
+        }
+
+        public void setTimeout(Integer timeout) {
+            this.timeout = timeout;
+        }
+
+        public Integer getMax() {
+            return max;
+        }
+
+        public void setMax(Integer max) {
+            this.max = max;
+        }
+    }
+
+    public void setCache(Map<String, CacheConfig> cache) {
+        this.cache = cache;
+    }
+
 }

+ 1 - 1
pom.xml

@@ -39,7 +39,7 @@
         <!-- maven 编译插件版本 -->
         <maven.compiler.compilerVersion>1.8</maven.compiler.compilerVersion>
         <java.version>1.8</java.version>
-        <spring-boot.version>2.1.7.RELEASE</spring-boot.version>
+        <spring-boot.version>2.1.8.RELEASE</spring-boot.version>
         <commons-lang.version>2.6</commons-lang.version>
         <commons-io.version>2.5</commons-io.version>
         <commons-dbcp.version>1.4</commons-dbcp.version>