perfect: 日志统一使用sl4j接口

src/main/java/com/uas/platform/b2b/controller/SaleInquiryController.java

@@ -31,7 +31,8 @@ import com.uas.search.b2b.model.SPage;
 import com.uas.search.b2b.model.Sort;
 import com.uas.search.b2b.model.Sort.Type;
 import com.uas.search.b2b.util.SearchConstants;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -83,7 +84,7 @@ public class SaleInquiryController {
 
 	private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
 
-	private final static Logger LOGGER_INFO = Logger.getLogger(SaleInquiryController.class);
+	private final static Logger LOGGER_INFO = LoggerFactory.getLogger(SaleInquiryController.class);
 
 	/**
 	 * 询价种类
@@ -595,7 +596,6 @@ public class SaleInquiryController {
 	public ResponseEntity<String> replyInquiryItem(@RequestBody String json,
 			@PathVariable("inquiryItemId") Long inquiryItemId, String token) {
 		PurchaseInquiryItem item = FlexJsonUtils.fromJson(json, PurchaseInquiryItem.class);
-        LOGGER_INFO.info(item.getReplies());
 		if (item.getReplies().size() == 1) {
             item.getReplies().forEach(reply -> {
                if (null != reply.getLapQty() && reply.getLapQty() > 0) {
@@ -625,7 +625,6 @@ public class SaleInquiryController {
 	public ResponseEntity<String> saveInquiryItem(@RequestBody String json,
 			@PathVariable("inquiryItemId") Long inquiryItemId, String token) {
 		PurchaseInquiryItem item = FlexJsonUtils.fromJson(json, PurchaseInquiryItem.class);
-        LOGGER_INFO.info(item.getReplies());
         if (item.getReplies().size() == 1) {
             item.getReplies().forEach(reply -> {
                 if (null != reply.getLapQty() && reply.getLapQty() > 0) {

src/main/java/com/uas/platform/b2b/controller/SecurityController.java

@@ -15,7 +15,8 @@ import com.uas.sso.SSOConfig;
 import com.uas.sso.SSOHelper;
 import com.uas.sso.SSOToken;
 import com.uas.sso.entity.UserAccount;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.mobile.device.Device;
@@ -38,7 +39,7 @@ import java.util.List;
 @RestController
 public class SecurityController {
 
-	private static final Logger logger = Logger.getLogger(SecurityController.class);
+	private static final Logger logger = LoggerFactory.getLogger(SecurityController.class);
 
 	@Autowired
 	private UserService userService;

src/main/java/com/uas/platform/b2b/controller/SnapshotController.java

@@ -1,7 +1,6 @@
 package com.uas.platform.b2b.controller;
 
 import com.uas.platform.b2b.core.util.BoundedExecutor;
-import com.uas.platform.b2b.core.util.ThreadUtils;
 import com.uas.platform.b2b.model.Role;
 import com.uas.platform.b2b.model.Snapshot;
 import com.uas.platform.b2b.model.User;
@@ -9,6 +8,8 @@ import com.uas.platform.b2b.ps.MessageUtils;
 import com.uas.platform.b2b.service.OrderRedDotService;
 import com.uas.platform.b2b.service.SnapshotService;
 import com.uas.platform.b2b.support.SystemSession;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.ui.ModelMap;
@@ -42,6 +43,11 @@ public class SnapshotController {
 
     private final BoundedExecutor executor;
 
+    /**
+     * 日志
+     */
+    private static final Logger logger = LoggerFactory.getLogger(SnapshotController.class);
+
     @Autowired
     public SnapshotController(SnapshotService snapshotService, OrderRedDotService redDotService) {
         this.snapshotService = snapshotService;
@@ -50,11 +56,6 @@ public class SnapshotController {
         executor = new BoundedExecutor(executorService, 1600);
     }
 
-    /**
-     * 日志
-     */
-    private static final org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(SnapshotController.class);
-
 	/**
 	 * 统计待处理事项
 	 * 

src/main/java/com/uas/platform/b2b/core/support/ApplicationContextRegister.java

@@ -1,7 +1,8 @@
 package com.uas.platform.b2b.core.support;
 
 import com.uas.platform.b2b.core.util.ContextUtils;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
@@ -13,7 +14,7 @@ import org.springframework.context.ApplicationContextAware;
  */
 public class ApplicationContextRegister implements ApplicationContextAware {
 
-	private static Logger logger = Logger.getLogger(ApplicationContextRegister.class);
+	private static Logger logger = LoggerFactory.getLogger(ApplicationContextRegister.class);
 
 	@Override
     public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {

src/main/java/com/uas/platform/b2b/core/util/ContextUtils.java

@@ -1,6 +1,7 @@
 package com.uas.platform.b2b.core.util;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationEvent;
 
@@ -13,7 +14,7 @@ import org.springframework.context.ApplicationEvent;
 public class ContextUtils {
 	private static ApplicationContext applicationContext;
 
-	private static Logger logger = Logger.getLogger(ContextUtils.class);
+	private static Logger logger = LoggerFactory.getLogger(ContextUtils.class);
 
 	public static void setApplicationContext(ApplicationContext applicationContext) {
 		synchronized (ContextUtils.class) {

src/main/java/com/uas/platform/b2b/event/SaleSendAgentListener.java

@@ -3,7 +3,8 @@ package com.uas.platform.b2b.event;
 import com.uas.platform.b2b.model.PurchaseNotice;
 import com.uas.platform.b2b.model.SaleSend;
 import com.uas.platform.b2b.service.SaleSendAgentService;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationListener;
 import org.springframework.scheduling.annotation.Async;
@@ -22,7 +23,7 @@ public class SaleSendAgentListener implements ApplicationListener<SaleSendAgentE
     @Autowired
     SaleSendAgentService saleSendService;
 
-    private final static Logger LOGGER = Logger.getLogger(SaleSendAgentListener.class);
+    private final static Logger LOGGER = LoggerFactory.getLogger(SaleSendAgentListener.class);
 
     /**
      * Handle an application event.

src/main/java/com/uas/platform/b2b/filter/AccessSignatureInterceptor.java

@@ -3,7 +3,8 @@ package com.uas.platform.b2b.filter;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
@@ -28,7 +29,7 @@ public class AccessSignatureInterceptor extends HandlerInterceptorAdapter {
 	private final static String idParam = "access_id";
 	private final static String signatureParam = "_signature";
 
-	private static final Logger logger = Logger.getLogger(AccessSignatureInterceptor.class);
+	private static final Logger logger = LoggerFactory.getLogger(AccessSignatureInterceptor.class);
 
 	@Autowired
 	private EnterpriseService enterpriseService;

src/main/java/com/uas/platform/b2b/filter/AccessTokenInterceptor.java

@@ -4,7 +4,8 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
@@ -36,7 +37,7 @@ public class AccessTokenInterceptor extends HandlerInterceptorAdapter {
 
 	private static final String user_param = "user";
 
-	private static final Logger logger = Logger.getLogger(AccessSignatureInterceptor.class);
+	private static final Logger logger = LoggerFactory.getLogger(AccessSignatureInterceptor.class);
 
 	@Autowired
 	private EnterpriseService enterpriseService;

src/main/java/com/uas/platform/b2b/filter/AppAccessInterceptor.java

@@ -10,7 +10,8 @@ import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.exception.SystemError;
 import com.uas.platform.core.util.AgentUtils;
 import org.apache.axis.utils.StringUtils;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
@@ -40,7 +41,7 @@ public class AppAccessInterceptor extends HandlerInterceptorAdapter {
 
 	private static final String user_param = "user";
 
-	private static final Logger logger = Logger.getLogger(AccessSignatureInterceptor.class);
+	private static final Logger logger = LoggerFactory.getLogger(AccessSignatureInterceptor.class);
 
 	@Autowired
 	private EnterpriseService enterpriseService;

src/main/java/com/uas/platform/b2b/filter/SSOInterceptor.java

@@ -27,7 +27,8 @@ import com.uas.sso.SSOToken;
 import com.uas.sso.entity.UserAccount;
 import com.uas.sso.web.spring.AbstractSSOInterceptor;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.mobile.device.Device;
@@ -66,7 +67,7 @@ import java.util.Set;
 @SuppressWarnings("deprecation")
 public class SSOInterceptor extends AbstractSSOInterceptor {
 
-	private static final Logger logger = Logger.getLogger(SSOInterceptor.class);
+	private static final Logger logger = LoggerFactory.getLogger(SSOInterceptor.class);
 
 	@Autowired
 	private UserService userService;

src/main/java/com/uas/platform/b2b/filter/SecurityInterceptor.java

@@ -13,7 +13,8 @@ import com.uas.platform.b2b.support.UserCreater;
 import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.util.AgentUtils;
 import com.uas.platform.core.util.encry.Md5Utils;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.mobile.device.Device;
@@ -79,7 +80,7 @@ public class SecurityInterceptor extends AbstractSecurityInterceptor implements
 
 	private final DeviceResolver deviceResolver;
 
-	private static final Logger logger = Logger.getLogger(SecurityInterceptor.class);
+	private static final Logger logger = LoggerFactory.getLogger(SecurityInterceptor.class);
 
 	public SecurityInterceptor() {
 		this.deviceResolver = new LiteDeviceResolver();

src/main/java/com/uas/platform/b2b/mobile/controller/AppInquiryController.java

@@ -23,7 +23,8 @@ import com.uas.search.b2b.model.Sort;
 import com.uas.search.b2b.util.SearchConstants;
 import com.uas.sso.support.Page;
 import org.apache.axis.utils.StringUtils;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -61,7 +62,7 @@ public class AppInquiryController {
 
     private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
 
-    private final static Logger LOGGER_INFO = Logger.getLogger(AppInquiryController.class);
+    private final static Logger LOGGER_INFO = LoggerFactory.getLogger(AppInquiryController.class);
 
     /**
      * 作为卖家，收到的采购询价（全部）- 搜索
@@ -494,7 +495,6 @@ public class AppInquiryController {
     @RequestMapping(value = "/items/{inquiryItemId}/reply", method = RequestMethod.POST)
     public ResponseEntity<String> replyInquiryItem(@PathVariable("inquiryItemId") Long inquiryItemId, String replies, Long leadtime, Double minPackQty, Double minOrderQty) {
         PurchaseInquiryItem item = toItem(inquiryItemId, replies, leadtime, minOrderQty, minPackQty);
-        LOGGER_INFO.info(item.getReplies());
         if (item.getReplies().size() == 1) {
             item.getReplies().forEach(reply -> {
                 if (null != reply.getLapQty() && reply.getLapQty() > 0) {

src/main/java/com/uas/platform/b2b/ps/ProductUtils.java

@@ -20,7 +20,8 @@ import com.uas.search.b2b.model.SPage;
 import com.uas.sso.support.Page;
 import org.apache.commons.collections.map.HashedMap;
 import org.apache.http.protocol.HTTP;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.CollectionUtils;
@@ -51,7 +52,7 @@ public class ProductUtils {
     /**
      * 记录日志
      */
-    private static final Logger logger = Logger.getLogger(ProductUtils.class);
+    private static final Logger logger = LoggerFactory.getLogger(ProductUtils.class);
 
     /**
      * 失败标志

src/main/java/com/uas/platform/b2b/publicapi/controller/ApCheckApiController.java

@@ -2,7 +2,8 @@ package com.uas.platform.b2b.publicapi.controller;
 
 import com.uas.platform.b2b.publicapi.service.ApCheckApiService;
 import com.uas.platform.b2b.task.ApCheckTask;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -29,7 +30,7 @@ public class ApCheckApiController {
     /**
      * 日志
      */
-    private static final Logger logger = Logger.getLogger(ApCheckApiController.class);
+    private static final Logger logger = LoggerFactory.getLogger(ApCheckApiController.class);
 
     /**
      * 查询个人对账金额

src/main/java/com/uas/platform/b2b/service/impl/AttachServiceImpl.java

@@ -9,7 +9,8 @@ import com.uas.platform.b2b.support.HttpUtils;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.temporary.model.FileUrl;
 import com.uas.platform.core.util.FileUtils;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -40,7 +41,7 @@ public class AttachServiceImpl implements AttachService {
     /**
      * 记录日志
      */
-    private static final Logger LOGGER = org.apache.log4j.Logger.getLogger(AttachServiceImpl.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(AttachServiceImpl.class);
 
 	@Override
 	public Attach getAttach(Long id) {

src/main/java/com/uas/platform/b2b/service/impl/SaleSendAgentServiceImpl.java

@@ -8,13 +8,13 @@ import com.uas.platform.b2b.model.PurchaseOrder;
 import com.uas.platform.b2b.model.SaleSend;
 import com.uas.platform.b2b.model.SaleSendItem;
 import com.uas.platform.b2b.service.SaleSendAgentService;
-import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.TokenService;
 import com.uas.platform.core.exception.IllegalOperatorException;
 import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.Status;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.ui.ModelMap;
@@ -45,7 +45,7 @@ public class SaleSendAgentServiceImpl implements SaleSendAgentService {
     @Autowired
     private SaleSendDao saleSendDao;
 
-    private final static Logger LOGGER = Logger.getLogger(SaleSendAgentServiceImpl.class);
+    private final static Logger LOGGER = LoggerFactory.getLogger(SaleSendAgentServiceImpl.class);
 
     /**
      * 代采订单发货

src/main/java/com/uas/platform/b2b/support/CustomSecurityMetadataSource.java

@@ -8,7 +8,8 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.access.SecurityConfig;
@@ -33,7 +34,7 @@ public class CustomSecurityMetadataSource implements FilterInvocationSecurityMet
 	/**
 	 * LOGGER 日志对象
 	 */
-	private final static Logger LOGGER = Logger.getLogger(CustomSecurityMetadataSource.class);
+	private final static Logger LOGGER = LoggerFactory.getLogger(CustomSecurityMetadataSource.class);
 
 	private HashMap<String, Collection<ConfigAttribute>> resourceMap;
 
@@ -68,7 +69,6 @@ public class CustomSecurityMetadataSource implements FilterInvocationSecurityMet
 	@Override
     public Collection<ConfigAttribute> getAttributes(Object object) throws IllegalArgumentException {
 
-		LOGGER.info(object);
 		if (resourceMap == null) {
             loadResourceDefine();
         }

src/main/java/com/uas/platform/b2b/support/SendMailService.java

@@ -5,8 +5,9 @@ import java.util.Map;
 import javax.mail.MessagingException;
 import javax.mail.internet.MimeMessage;
 
-import org.apache.log4j.Logger;
 import org.apache.velocity.app.VelocityEngine;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.mail.SimpleMailMessage;
 import org.springframework.mail.javamail.JavaMailSenderImpl;
@@ -24,7 +25,7 @@ public class SendMailService {
 	@Autowired
 	private VelocityEngine velocityEngine;
 
-	private final static Logger LOGGER = Logger.getLogger(SendMailService.class);
+	private final static Logger LOGGER = LoggerFactory.getLogger(SendMailService.class);
 
 	/**
 	 * 发送模板邮件

src/main/java/com/uas/platform/b2b/task/SendNoticeTask.java

@@ -8,7 +8,8 @@ import com.uas.platform.b2b.model.CommunalLog;
 import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.util.HttpUtil;
 import org.apache.http.client.methods.HttpRequestBase;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -46,7 +47,7 @@ public class SendNoticeTask {
     @Autowired
     PurchaseOrderDao purchaseOrderDao;
 
-    private static final Logger logger = Logger.getLogger(SendNoticeTask.class);
+    private static final Logger logger = LoggerFactory.getLogger(SendNoticeTask.class);
 
     /**
      * 时间格式

src/main/java/com/uas/platform/b2b/v2/service/impl/EnterpriseServiceImpl.java

@@ -16,7 +16,8 @@ import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.Status;
 import com.uas.sso.entity.UserSpaceView;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -51,7 +52,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 
 	private final static CommBufferedLogger LOGGER = BufferedLoggerManager.getLogger(CommBufferedLogger.class);
 
-	private final static Logger INFO_LOG = Logger.getLogger(EnterpriseServiceImpl.class);
+	private final static Logger INFO_LOG = LoggerFactory.getLogger(EnterpriseServiceImpl.class);
 
 	@Override
 	public Enterprise save(UserSpaceView detail) {

src/main/java/com/uas/platform/b2b/v2/service/impl/UserServiceImpl.java

@@ -1,6 +1,6 @@
 package com.uas.platform.b2b.v2.service.impl;
 
-import com.alibaba.fastjson.JSONObject;
+import com.uas.platform.b2b.core.util.FastjsonUtils;
 import com.uas.platform.b2b.dao.EnterpriseDao;
 import com.uas.platform.b2b.dao.RoleDao;
 import com.uas.platform.b2b.dao.UserDao;
@@ -12,7 +12,8 @@ import com.uas.platform.b2b.v2.service.UserService;
 import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.util.encry.Md5Utils;
 import com.uas.sso.entity.UserView;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -41,7 +42,7 @@ public class UserServiceImpl implements UserService {
 	@Autowired
     private EnterpriseService enterpriseService;
 
-	private final static Logger LOGGER = Logger.getLogger(UserServiceImpl.class);
+	private final static Logger LOGGER = LoggerFactory.getLogger(UserServiceImpl.class);
 	
 	private static final String defaultPassword = "111111";
 
@@ -70,7 +71,7 @@ public class UserServiceImpl implements UserService {
 			}
 		}
 		oldUser = userDao.save(oldUser);
-        LOGGER.info(JSONObject.toJSON(oldUser));
+        LOGGER.info(FastjsonUtils.toJson(oldUser));
 		// 判断新注册用户是否绑定企业并且设置成管理员
         if (!CollectionUtils.isEmpty(oldUser.getEnterprises()) && oldUser.getEnterprises().size() == 1) {
             oldUser = checkIsAdmin(oldUser);