From 39e62c311c261455fa6b40f3c125aa4caa476241 Mon Sep 17 00:00:00 2001 From: eelve Date: Fri, 3 Apr 2020 17:34:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9B=AA=E8=8A=B1=E7=AE=97?= =?UTF-8?q?=E6=B3=95=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 ------ .../eelve/lovinstarter/component/SnowflakeComponent.java | 6 +++++- src/main/resources/application.yml | 2 +- src/main/resources/{logback.xml => logback-spring.xml} | 5 +++++ .../eelve/lovinstarter/LovinstarterApplicationTests.java | 9 ++++++++- 5 files changed, 19 insertions(+), 9 deletions(-) rename src/main/resources/{logback.xml => logback-spring.xml} (95%) diff --git a/pom.xml b/pom.xml index ee7b97d..325aa45 100644 --- a/pom.xml +++ b/pom.xml @@ -111,12 +111,6 @@ org.springframework.boot spring-boot-devtools - - - com.github.penggle - kaptcha - 2.3.2 - commons-fileupload diff --git a/src/main/java/com/eelve/lovinstarter/component/SnowflakeComponent.java b/src/main/java/com/eelve/lovinstarter/component/SnowflakeComponent.java index 944b241..07020c0 100644 --- a/src/main/java/com/eelve/lovinstarter/component/SnowflakeComponent.java +++ b/src/main/java/com/eelve/lovinstarter/component/SnowflakeComponent.java @@ -2,6 +2,7 @@ import com.eelve.lovinstarter.model.SnowflakeIdWorker; import lombok.extern.java.Log; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Component; @@ -13,9 +14,12 @@ * @Date 2020/4/3 14:17 * @Version 1.0 **/ -@Log + @Component +@Log public class SnowflakeComponent { + + @Value("${server.datacenterId}") private long datacenterId; diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 7c8cb29..7145cab 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -96,7 +96,7 @@ spring: trigger-file: trigger.txt mybatis: mapper-locations: classpath:mapper/*.xml - type-aliases-package: com.eelve.springbootredis.model + type-aliases-package: com.eelve.lovinstarter.model #pagehelper pagehelper: diff --git a/src/main/resources/logback.xml b/src/main/resources/logback-spring.xml similarity index 95% rename from src/main/resources/logback.xml rename to src/main/resources/logback-spring.xml index 41cd5c7..b164669 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback-spring.xml @@ -35,6 +35,11 @@ + + + + + diff --git a/src/test/java/com/eelve/lovinstarter/LovinstarterApplicationTests.java b/src/test/java/com/eelve/lovinstarter/LovinstarterApplicationTests.java index ecd8ab0..cf6d2d3 100644 --- a/src/test/java/com/eelve/lovinstarter/LovinstarterApplicationTests.java +++ b/src/test/java/com/eelve/lovinstarter/LovinstarterApplicationTests.java @@ -1,18 +1,25 @@ package com.eelve.lovinstarter; import com.eelve.lovinstarter.utils.SnowflakeUtil; +import lombok.extern.java.Log; import org.junit.Test; import org.junit.runner.RunWith; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) @SpringBootTest +@Log public class LovinstarterApplicationTests { + @Test public void contextLoads() { - System.out.println(SnowflakeUtil.nextId()); + log.info("----------------------"); + log.info(SnowflakeUtil.nextId()+""); } }