dependency optimise, slf4j optimise

5b880b59 · 武汉红喜 · a062993b · 5b880b59 · 5b880b59 · 5b880b59
26 changed file
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,6 @@
        <velocity.version>1.7</velocity.version>
        <velocity-tools.version>2.0</velocity-tools.version>
        <jackson.version>2.9.5</jackson.version>
-        <log4j.version>1.2.17</log4j.version>
        <commons-lang.version>2.6</commons-lang.version>
        <commons-collections.version>3.2.2</commons-collections.version>
        <commons-codec.version>1.11</commons-codec.version>
@@ -102,11 +101,6 @@
                    </exclusion>
                </exclusions>
            </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.core</groupId>
-                <artifactId>jackson-core</artifactId>
-                <version>${jackson.version}</version>
-            </dependency>
            <dependency>
                <groupId>com.fasterxml.jackson.core</groupId>
                <artifactId>jackson-databind</artifactId>
@@ -117,11 +111,6 @@
                <artifactId>jackson-annotations</artifactId>
                <version>${jackson.version}</version>
            </dependency>
-            <dependency>
-                <groupId>log4j</groupId>
-                <artifactId>log4j</artifactId>
-                <version>${log4j.version}</version>
-            </dependency>
            <dependency>
                <groupId>commons-lang</groupId>
                <artifactId>commons-lang</artifactId>

--- a/whatsmars-common/pom.xml
+++ b/whatsmars-common/pom.xml
@@ -97,18 +97,10 @@
            <artifactId>dom4j</artifactId>
        </dependency>

-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-        </dependency>
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-databind</artifactId>
        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-        </dependency>

    </dependencies>


--- a/whatsmars-dbrouter/pom.xml
+++ b/whatsmars-dbrouter/pom.xml
@@ -58,8 +58,8 @@
        </dependency>

        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
        </dependency>
        <dependency>
            <groupId>commons-lang</groupId>

--- a/whatsmars-dbrouter/src/main/resources/sqlmap-config.xml
+++ b/whatsmars-dbrouter/src/main/resources/sqlmap-config.xml
@@ -4,7 +4,7 @@
 <configuration>
 	<settings>
 		<setting name="lazyLoadingEnabled" value="false" />
-		<setting name="logImpl" value="LOG4J"/>
+		<setting name="logImpl" value="SLF4J"/>
 	</settings>
 	<typeAliases>


--- a/whatsmars-dubbo/whatsmars-dubbo-consumer/pom.xml
+++ b/whatsmars-dubbo/whatsmars-dubbo-consumer/pom.xml
@@ -40,12 +40,8 @@
            <artifactId>fastjson</artifactId>
        </dependency>
        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
        </dependency>
        <dependency>
            <groupId>org.apache.commons</groupId>

--- a/whatsmars-dubbo/whatsmars-dubbo-consumer/src/main/resources/dubbo.properties
+++ b/whatsmars-dubbo/whatsmars-dubbo-consumer/src/main/resources/dubbo.properties
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ##
-dubbo.container=log4j,spring
+dubbo.container=logback,spring
 dubbo.spring.config=classpath*:META-INF/spring/*.xml
 dubbo.application.name=demo-consumer
 dubbo.application.owner=

--- a/whatsmars-dubbo/whatsmars-dubbo-consumer/src/main/resources/log4j.xml
+++ b/whatsmars-dubbo/whatsmars-dubbo-consumer/src/main/resources/log4j.xml
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- - Copyright 1999-2011 Alibaba Group.
- -  
- - Licensed under the Apache License, Version 2.0 (the "License");
- - you may not use this file except in compliance with the License.
- - You may obtain a copy of the License at
- -  
- -      http://www.apache.org/licenses/LICENSE-2.0
- -  
- - Unless required by applicable law or agreed to in writing, software
- - distributed under the License is distributed on an "AS IS" BASIS,
- - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- - See the License for the specific language governing permissions and
- - limitations under the License.
-->
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-	<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-		<layout class="org.apache.log4j.PatternLayout">
-			<param name="ConversionPattern" value="[%d{dd/MM/yy hh:mm:ss:sss z}] %t %5p %c{2}: %m%n" />
-		</layout>
-	</appender>
-	<root>
-		<level value="INFO" />
-		<appender-ref ref="CONSOLE" />
-	</root>
-</log4j:configuration>
\ No newline at end of file
--- a/whatsmars-dubbo/whatsmars-dubbo-consumer/src/main/resources/logback.xml
+++ b/whatsmars-dubbo/whatsmars-dubbo-consumer/src/main/resources/logback.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d %5p %40.40c:%4L - %m%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="info">
+        <appender-ref ref="console" />
+    </root>
+
+</configuration>
\ No newline at end of file
--- a/whatsmars-dubbo/whatsmars-dubbo-provider-boot/pom.xml
+++ b/whatsmars-dubbo/whatsmars-dubbo-provider-boot/pom.xml
@@ -47,6 +47,7 @@
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
        </dependency>
    </dependencies>


--- a/whatsmars-dubbo/whatsmars-dubbo-provider/pom.xml
+++ b/whatsmars-dubbo/whatsmars-dubbo-provider/pom.xml
@@ -40,12 +40,8 @@
            <artifactId>fastjson</artifactId>
        </dependency>
        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
        </dependency>
        <dependency>
            <groupId>org.apache.commons</groupId>

--- a/whatsmars-dubbo/whatsmars-dubbo-provider/src/main/resources/dubbo.properties
+++ b/whatsmars-dubbo/whatsmars-dubbo-provider/src/main/resources/dubbo.properties
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ##
-dubbo.container=log4j,spring
+dubbo.container=logback,spring
 dubbo.spring.config=classpath*:META-INF/spring/*.xml
 dubbo.application.name=demo-provider
 dubbo.application.owner=javahongxi

--- a/whatsmars-dubbo/whatsmars-dubbo-provider/src/main/resources/log4j.xml
+++ b/whatsmars-dubbo/whatsmars-dubbo-provider/src/main/resources/log4j.xml
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- - Copyright 1999-2011 Alibaba Group.
- -  
- - Licensed under the Apache License, Version 2.0 (the "License");
- - you may not use this file except in compliance with the License.
- - You may obtain a copy of the License at
- -  
- -      http://www.apache.org/licenses/LICENSE-2.0
- -  
- - Unless required by applicable law or agreed to in writing, software
- - distributed under the License is distributed on an "AS IS" BASIS,
- - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- - See the License for the specific language governing permissions and
- - limitations under the License.
-->
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-	<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-		<layout class="org.apache.log4j.PatternLayout">
-			<param name="ConversionPattern" value="[%d{dd/MM/yy hh:mm:ss:sss z}] %t %5p %c{2}: %m%n" />
-		</layout>
-	</appender>
-	<root>
-		<level value="INFO" />
-		<appender-ref ref="CONSOLE" />
-	</root>
-</log4j:configuration>
\ No newline at end of file
--- a/whatsmars-dubbo/whatsmars-dubbo-provider/src/main/resources/logback.xml
+++ b/whatsmars-dubbo/whatsmars-dubbo-provider/src/main/resources/logback.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d %5p %40.40c:%4L - %m%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="info">
+        <appender-ref ref="console" />
+    </root>
+
+</configuration>
\ No newline at end of file
--- a/whatsmars-earth/whatsmars-earth-dao/src/main/resources/sqlmap-config.xml
+++ b/whatsmars-earth/whatsmars-earth-dao/src/main/resources/sqlmap-config.xml
@@ -4,7 +4,7 @@
 <configuration>
 	<settings>
 		<setting name="lazyLoadingEnabled" value="false" />
-		<setting name="logImpl" value="LOG4J"/>
+		<!--<setting name="logImpl" value="SLF4J"/>-->
 	</settings>
 	<typeAliases>


--- a/whatsmars-earth/whatsmars-earth-support-web/pom.xml
+++ b/whatsmars-earth/whatsmars-earth-support-web/pom.xml
@@ -80,8 +80,9 @@
        </dependency>

        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>1.7.25</version>
        </dependency>

        <dependency>

--- a/whatsmars-earth/whatsmars-earth-support-web/src/main/java/org/hongxi/whatsmars/earth/support/web/service/impl/FileServiceImpl.java
+++ b/whatsmars-earth/whatsmars-earth-support-web/src/main/java/org/hongxi/whatsmars/earth/support/web/service/impl/FileServiceImpl.java
 package org.hongxi.whatsmars.earth.support.web.service.impl;

-import org.apache.log4j.Logger;
 import org.hongxi.whatsmars.common.ImageSizeEnum;
 import org.hongxi.whatsmars.common.mongo.GridFSClient;
 import org.hongxi.whatsmars.common.pojo.Result;
 import org.hongxi.whatsmars.common.pojo.ResultCode;
 import org.hongxi.whatsmars.earth.support.web.service.FileService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

@@ -19,7 +20,7 @@ import java.io.InputStream;
 @Service("fileService")
 public class FileServiceImpl implements FileService {

-    protected static final Logger logger = Logger.getLogger(FileService.class);
+    protected static final Logger logger = LoggerFactory.getLogger(FileService.class);

    @Autowired
    private GridFSClient gridFSClient;

--- a/whatsmars-earth/whatsmars-earth-web/pom.xml
+++ b/whatsmars-earth/whatsmars-earth-web/pom.xml
@@ -47,8 +47,9 @@
        </dependency>

        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>1.7.25</version>
        </dependency>

        <dependency>
@@ -78,11 +79,6 @@
            <artifactId>commons-dbcp</artifactId>
        </dependency>

-        <!-- jackson -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-        </dependency>
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-databind</artifactId>
@@ -90,6 +86,7 @@
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-annotations</artifactId>
+            <version>${jackson.version}</version>
        </dependency>
    </dependencies>


--- a/whatsmars-earth/whatsmars-earth-web/src/main/java/org/hongxi/whatsmars/earth/web/controller/MarsController.java
+++ b/whatsmars-earth/whatsmars-earth-web/src/main/java/org/hongxi/whatsmars/earth/web/controller/MarsController.java
 package org.hongxi.whatsmars.earth.web.controller;

+import com.itextpdf.text.log.Logger;
+import com.itextpdf.text.log.LoggerFactory;
 import org.hongxi.whatsmars.common.pojo.Result;
 import org.hongxi.whatsmars.common.util.ResultHelper;
 import org.hongxi.whatsmars.earth.service.AccountService;
-import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -21,7 +22,7 @@ import javax.servlet.http.HttpServletResponse;
 @RequestMapping("/account")
 public class MarsController extends BaseController {

-    private Logger accountLogger = Logger.getLogger("account-logger");
+    private Logger accountLogger = LoggerFactory.getLogger("account-logger");

    @Autowired
    private AccountService accountService;

--- a/whatsmars-earth/whatsmars-earth-web/src/main/java/org/hongxi/whatsmars/earth/web/controller/NewController.java
+++ b/whatsmars-earth/whatsmars-earth-web/src/main/java/org/hongxi/whatsmars/earth/web/controller/NewController.java
 package org.hongxi.whatsmars.earth.web.controller;

-import org.apache.log4j.Logger;
+import com.itextpdf.text.log.Logger;
+import com.itextpdf.text.log.LoggerFactory;
 import org.hongxi.whatsmars.common.result.Result;
 import org.hongxi.whatsmars.common.result.ResultHelper;
 import org.hongxi.whatsmars.earth.service.UserService;
@@ -19,7 +20,7 @@ import org.hongxi.whatsmars.earth.domain.pojo.User;
 @RequestMapping("/test")
 public class NewController {

-    private final Logger logger = Logger.getLogger(getClass());
+    private final Logger logger = LoggerFactory.getLogger(getClass());

    @Autowired
    private UserService userService;

--- a/whatsmars-earth/whatsmars-earth-web/src/main/java/org/hongxi/whatsmars/earth/web/interceptor/LoginInterceptor.java
+++ b/whatsmars-earth/whatsmars-earth-web/src/main/java/org/hongxi/whatsmars/earth/web/interceptor/LoginInterceptor.java
@@ -7,7 +7,6 @@ import org.hongxi.whatsmars.earth.domain.misc.SystemConfig;
 import org.hongxi.whatsmars.earth.domain.pojo.User;
 import net.sf.json.JSONObject;
 import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;

@@ -23,8 +22,6 @@ import java.util.Date;
 */
 public class LoginInterceptor implements HandlerInterceptor{

-    protected static final Logger logger = Logger.getLogger(LoginInterceptor.class);
-
    private SystemConfig systemConfig;

    public void setSystemConfig(SystemConfig systemConfig) {

--- a/whatsmars-earth/whatsmars-earth-web/src/main/java/org/hongxi/whatsmars/earth/web/interceptor/PermissionInterceptor.java
+++ b/whatsmars-earth/whatsmars-earth-web/src/main/java/org/hongxi/whatsmars/earth/web/interceptor/PermissionInterceptor.java
@@ -6,7 +6,6 @@ import org.hongxi.whatsmars.earth.domain.permission.Permission;
 import org.hongxi.whatsmars.earth.domain.pojo.User;
 import net.sf.json.JSONObject;
 import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.HandlerInterceptor;
@@ -24,8 +23,6 @@ import java.util.Set;
 */
 public class PermissionInterceptor implements HandlerInterceptor {

-    protected static final Logger logger = Logger.getLogger(PermissionInterceptor.class);
-
    @Override
    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {


--- a/whatsmars-mq/rocketmq-spring-boot-starter/pom.xml
+++ b/whatsmars-mq/rocketmq-spring-boot-starter/pom.xml
@@ -16,6 +16,11 @@
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter</artifactId>
        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
        <dependency>
            <groupId>org.apache.rocketmq</groupId>
            <artifactId>rocketmq-client</artifactId>
@@ -35,11 +40,6 @@
            <artifactId>jackson-databind</artifactId>
        </dependency>

-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-configuration-processor</artifactId>
-            <optional>true</optional>
-        </dependency>
        <dependency>
            <groupId>org.projectlombok</groupId>
            <artifactId>lombok</artifactId>

--- a/whatsmars-mq/rocketmq-spring-boot-starter/src/main/java/org/apache/rocketmq/spring/starter/RocketMQAutoConfiguration.java
+++ b/whatsmars-mq/rocketmq-spring-boot-starter/src/main/java/org/apache/rocketmq/spring/starter/RocketMQAutoConfiguration.java
@@ -37,7 +37,6 @@ import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionValidationException;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
@@ -51,7 +50,6 @@ import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Role;
 import org.springframework.core.annotation.Order;
 import org.springframework.core.env.StandardEnvironment;
 import org.springframework.util.Assert;

--- a/whatsmars-redis/pom.xml
+++ b/whatsmars-redis/pom.xml
@@ -27,10 +27,6 @@
            <groupId>com.alibaba</groupId>
            <artifactId>fastjson</artifactId>
        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-        </dependency>
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-databind</artifactId>
@@ -39,6 +35,7 @@
        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-test</artifactId>
+            <scope>test</scope>
        </dependency>
    </dependencies>


--- a/whatsmars-sharding-jdbc/pom.xml
+++ b/whatsmars-sharding-jdbc/pom.xml
@@ -20,10 +20,6 @@
    </properties>

    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-        </dependency>
        <dependency>
            <groupId>io.shardingjdbc</groupId>
            <artifactId>sharding-jdbc-core-spring-boot-starter</artifactId>
@@ -41,10 +37,6 @@
            <groupId>mysql</groupId>
            <artifactId>mysql-connector-java</artifactId>
        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jcl-over-slf4j</artifactId>
-        </dependency>
        <dependency>
            <groupId>ch.qos.logback</groupId>
            <artifactId>logback-classic</artifactId>

--- a/whatsmars-spring-boot/pom.xml
+++ b/whatsmars-spring-boot/pom.xml
@@ -86,6 +86,12 @@
            <groupId>org.hongxi</groupId>
            <artifactId>whatsmars-common</artifactId>
            <version>1.0-SNAPSHOT</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mongodb</groupId>
+                    <artifactId>mongo-java-driver</artifactId>
+                </exclusion>
+            </exclusions>
        </dependency>
    </dependencies>