Browse Source

使用日志门面类记录日志

liuam 7 years ago
parent
commit
824ffb87c0
25 changed files with 121 additions and 192 deletions
  1. 12 0
      pom.xml
  2. 3 2
      src/main/java/com/uas/platform/b2c/advertise/ad/api/FloorsController.java
  3. 3 6
      src/main/java/com/uas/platform/b2c/common/account/controller/AuthenticationController.java
  4. 10 10
      src/main/java/com/uas/platform/b2c/core/filter/AccessTokenInterceptor.java
  5. 9 14
      src/main/java/com/uas/platform/b2c/core/filter/KeyWordFilter.java
  6. 3 3
      src/main/java/com/uas/platform/b2c/core/filter/SSOInterceptor.java
  7. 3 2
      src/main/java/com/uas/platform/b2c/core/support/ApplicationContextRegister.java
  8. 3 4
      src/main/java/com/uas/platform/b2c/core/support/CustomAccessDecisionManager.java
  9. 4 8
      src/main/java/com/uas/platform/b2c/core/support/CustomSecurityMetadataSource.java
  10. 3 2
      src/main/java/com/uas/platform/b2c/core/utils/ContextUtils.java
  11. 3 2
      src/main/java/com/uas/platform/b2c/external/erp/commodity/service/impl/ProductDetailERPServiceImpl.java
  12. 3 2
      src/main/java/com/uas/platform/b2c/external/erp/order/service/impl/OrderServiceImpl.java
  13. 3 2
      src/main/java/com/uas/platform/b2c/external/erp/prod/service/impl/ProdServiceImpl.java
  14. 6 6
      src/main/java/com/uas/platform/b2c/fa/payment/utils/ApipaySubmit.java
  15. 6 10
      src/main/java/com/uas/platform/b2c/fa/payment/utils/SignUtils.java
  16. 6 16
      src/main/java/com/uas/platform/b2c/prod/commodity/controller/ProductController.java
  17. 7 31
      src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/GoodsServiceImpl.java
  18. 3 2
      src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ProductAttachServiceImpl.java
  19. 8 55
      src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ProductServiceImpl.java
  20. 3 2
      src/main/java/com/uas/platform/b2c/prod/commodity/task/ReleaseByBatchTask.java
  21. 3 2
      src/main/java/com/uas/platform/b2c/prod/store/controller/ConsignmentAgreeRecordController.java
  22. 4 7
      src/main/java/com/uas/platform/b2c/prod/store/controller/StoreViolationsController.java
  23. 4 3
      src/main/java/com/uas/platform/b2c/trade/deprecated/controller/RecommendController.java
  24. 3 1
      src/main/java/com/uas/platform/b2c/trade/order/service/impl/PurchaseProductServiceImpl.java
  25. 6 0
      src/main/resources/logback.xml

+ 12 - 0
pom.xml

@@ -82,6 +82,12 @@
 		<dependency>
 		<dependency>
 			<groupId>com.uas.api</groupId>
 			<groupId>com.uas.api</groupId>
 			<artifactId>b2c-erp-api</artifactId>
 			<artifactId>b2c-erp-api</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>log4j</groupId>
+					<artifactId>log4j</artifactId>
+				</exclusion>
+			</exclusions>
 			<version>0.0.5-SNAPSHOT</version>
 			<version>0.0.5-SNAPSHOT</version>
 		</dependency>
 		</dependency>
 		<dependency>
 		<dependency>
@@ -341,6 +347,12 @@
 			<groupId>cn.beecloud</groupId>
 			<groupId>cn.beecloud</groupId>
 			<artifactId>beecloud-java-sdk</artifactId>
 			<artifactId>beecloud-java-sdk</artifactId>
 			<version>3.1.0</version>
 			<version>3.1.0</version>
+			<exclusions>
+				<exclusion>
+					<groupId>log4j</groupId>
+					<artifactId>log4j</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		</dependency>
 		<dependency>
 		<dependency>
 			<groupId>jaxen</groupId>
 			<groupId>jaxen</groupId>

+ 3 - 2
src/main/java/com/uas/platform/b2c/advertise/ad/api/FloorsController.java

@@ -2,7 +2,8 @@ package com.uas.platform.b2c.advertise.ad.api;
 
 
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2c.advertise.ad.service.FloorsService;
 import com.uas.platform.b2c.advertise.ad.service.FloorsService;
-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.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -23,7 +24,7 @@ import java.util.List;
 @RequestMapping("/api/floors")
 @RequestMapping("/api/floors")
 public class FloorsController {
 public class FloorsController {
 
 
-    private final Logger logger = Logger.getLogger(getClass());
+    private final Logger logger = LoggerFactory.getLogger(FloorsController.class);
 
 
     @Autowired
     @Autowired
     private FloorsService floorsService;
     private FloorsService floorsService;

+ 3 - 6
src/main/java/com/uas/platform/b2c/common/account/controller/AuthenticationController.java

@@ -1,9 +1,7 @@
 package com.uas.platform.b2c.common.account.controller;
 package com.uas.platform.b2c.common.account.controller;
 
 
-import com.uas.platform.b2c.common.account.dao.UserLoginTimeDao;
 import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.common.account.model.UserInfo;
 import com.uas.platform.b2c.common.account.model.UserInfo;
-import com.uas.platform.b2c.common.account.model.UserLoginTime;
 import com.uas.platform.b2c.common.account.service.RoleService;
 import com.uas.platform.b2c.common.account.service.RoleService;
 import com.uas.platform.b2c.common.account.service.UserService;
 import com.uas.platform.b2c.common.account.service.UserService;
 import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.b2c.core.support.SystemSession;
@@ -13,12 +11,12 @@ import com.uas.sso.SSOHelper;
 import com.uas.sso.SSOToken;
 import com.uas.sso.SSOToken;
 import com.uas.sso.entity.UserAccount;
 import com.uas.sso.entity.UserAccount;
 import net.sf.ehcache.CacheManager;
 import net.sf.ehcache.CacheManager;
-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.Autowired;
 import org.springframework.data.repository.query.Param;
 import org.springframework.data.repository.query.Param;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.HttpStatus;
 import org.springframework.ui.ModelMap;
 import org.springframework.ui.ModelMap;
-import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
@@ -26,7 +24,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 import java.io.UnsupportedEncodingException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.net.URLDecoder;
-import java.util.List;
 
 
 /**
 /**
  *
  *
@@ -36,7 +33,7 @@ import java.util.List;
 public class AuthenticationController {
 public class AuthenticationController {
 
 
 
 
-	private static final Logger logger = Logger.getLogger(AuthenticationController.class);
+	private static final Logger logger = LoggerFactory.getLogger(AuthenticationController.class);
 
 
 	@Autowired
 	@Autowired
 	private UserService userService;
 	private UserService userService;

+ 10 - 10
src/main/java/com/uas/platform/b2c/core/filter/AccessTokenInterceptor.java

@@ -1,23 +1,23 @@
 package com.uas.platform.b2c.core.filter;
 package com.uas.platform.b2c.core.filter;
 
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
 import com.uas.platform.b2c.common.account.model.Enterprise;
 import com.uas.platform.b2c.common.account.model.Enterprise;
 import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.common.account.service.EnterpriseService;
 import com.uas.platform.b2c.common.account.service.EnterpriseService;
 import com.uas.platform.b2c.common.account.service.UserService;
 import com.uas.platform.b2c.common.account.service.UserService;
+import com.uas.platform.b2c.common.account.support.AuthenErrors;
 import com.uas.platform.b2c.common.base.model.AccessToken;
 import com.uas.platform.b2c.common.base.model.AccessToken;
 import com.uas.platform.b2c.common.base.service.AccessTokenService;
 import com.uas.platform.b2c.common.base.service.AccessTokenService;
-import org.apache.log4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
-
-import com.uas.platform.b2c.common.account.support.AuthenErrors;
 import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.core.exception.SystemError;
 import com.uas.platform.core.exception.SystemError;
 import com.uas.platform.core.util.AgentUtils;
 import com.uas.platform.core.util.AgentUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 
 
 /**
 /**
  * 验证access_token拦截器
  * 验证access_token拦截器
@@ -34,7 +34,7 @@ public class AccessTokenInterceptor extends HandlerInterceptorAdapter {
 	private static final String access_token_param = "access_token";
 	private static final String access_token_param = "access_token";
 	private static final String redirect_param = "redirect_page";
 	private static final String redirect_param = "redirect_page";
 
 
-	private static final Logger logger = Logger.getLogger(AccessTokenInterceptor.class);
+	private static final Logger logger = LoggerFactory.getLogger(AccessTokenInterceptor.class);
 
 
 	@Autowired
 	@Autowired
 	private EnterpriseService enterpriseService;
 	private EnterpriseService enterpriseService;

+ 9 - 14
src/main/java/com/uas/platform/b2c/core/filter/KeyWordFilter.java

@@ -2,23 +2,18 @@ package com.uas.platform.b2c.core.filter;
 
 
 import com.uas.platform.b2c.common.keyword.service.KeyWordService;
 import com.uas.platform.b2c.common.keyword.service.KeyWordService;
 import com.uas.platform.b2c.core.support.BodyReaderHttpServletRequestWrapper;
 import com.uas.platform.b2c.core.support.BodyReaderHttpServletRequestWrapper;
-import java.io.IOException;
-import java.util.Set;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-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.util.StringUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 import org.springframework.web.context.support.XmlWebApplicationContext;
 import org.springframework.web.context.support.XmlWebApplicationContext;
 
 
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Set;
+
 /**
 /**
  * 非法关键字过滤
  * 非法关键字过滤
  * @author liusw
  * @author liusw
@@ -32,7 +27,7 @@ public class KeyWordFilter implements Filter {
      */
      */
     private static String HESSIAN_URI_PREFIX = "/api/service/";
     private static String HESSIAN_URI_PREFIX = "/api/service/";
 
 
-    private Logger logger = Logger.getLogger(this.getClass());
+    private Logger logger = LoggerFactory.getLogger(KeyWordFilter.class);
 
 
     @Override
     @Override
     public void destroy() {
     public void destroy() {

+ 3 - 3
src/main/java/com/uas/platform/b2c/core/filter/SSOInterceptor.java

@@ -9,7 +9,6 @@ import com.uas.platform.b2c.common.account.service.SigninLogService;
 import com.uas.platform.b2c.common.account.service.UserService;
 import com.uas.platform.b2c.common.account.service.UserService;
 import com.uas.platform.b2c.core.constant.PathConstant;
 import com.uas.platform.b2c.core.constant.PathConstant;
 import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.b2c.core.support.SystemSession;
-import com.uas.platform.b2c.core.utils.FastjsonUtils;
 import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.util.AgentUtils;
 import com.uas.platform.core.util.AgentUtils;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
@@ -19,7 +18,8 @@ import com.uas.sso.SSOToken;
 import com.uas.sso.entity.UserAccount;
 import com.uas.sso.entity.UserAccount;
 import com.uas.sso.web.spring.AbstractSSOInterceptor;
 import com.uas.sso.web.spring.AbstractSSOInterceptor;
 import org.apache.commons.collections.CollectionUtils;
 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.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.HttpStatus;
@@ -49,7 +49,7 @@ import java.util.*;
  */
  */
 public class SSOInterceptor extends AbstractSSOInterceptor {
 public class SSOInterceptor extends AbstractSSOInterceptor {
 
 
-    private static final Logger logger = Logger.getLogger(SSOInterceptor.class);
+    private static final Logger logger = LoggerFactory.getLogger(SSOInterceptor.class);
 
 
     @Autowired
     @Autowired
     private UserService userService;
     private UserService userService;

+ 3 - 2
src/main/java/com/uas/platform/b2c/core/support/ApplicationContextRegister.java

@@ -1,7 +1,8 @@
 package com.uas.platform.b2c.core.support;
 package com.uas.platform.b2c.core.support;
 
 
 import com.uas.platform.b2c.core.utils.ContextUtils;
 import com.uas.platform.b2c.core.utils.ContextUtils;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.ApplicationContextAware;
@@ -13,7 +14,7 @@ import org.springframework.context.ApplicationContextAware;
  */
  */
 public class ApplicationContextRegister implements ApplicationContextAware {
 public class ApplicationContextRegister implements ApplicationContextAware {
 
 
-	private static Logger logger = Logger.getLogger(ApplicationContextRegister.class);
+	private static Logger logger = LoggerFactory.getLogger(ApplicationContextRegister.class);
 
 
 	/**
 	/**
 	 * 将上下文对象保存到ContextUtils中
 	 * 将上下文对象保存到ContextUtils中

+ 3 - 4
src/main/java/com/uas/platform/b2c/core/support/CustomAccessDecisionManager.java

@@ -1,9 +1,5 @@
 package com.uas.platform.b2c.core.support;
 package com.uas.platform.b2c.core.support;
 
 
-import java.util.Collection;
-import java.util.Iterator;
-
-//import org.apache.log4j.Logger;
 import org.springframework.security.access.AccessDecisionManager;
 import org.springframework.security.access.AccessDecisionManager;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.access.ConfigAttribute;
@@ -11,6 +7,9 @@ import org.springframework.security.authentication.InsufficientAuthenticationExc
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.GrantedAuthority;
 
 
+import java.util.Collection;
+import java.util.Iterator;
+
 /**
 /**
  * 访问决策器,决定某个用户具有的角色,是否有足够的权限去访问某个资源 ;做最终的访问控制决定
  * 访问决策器,决定某个用户具有的角色,是否有足够的权限去访问某个资源 ;做最终的访问控制决定
  * 
  * 

+ 4 - 8
src/main/java/com/uas/platform/b2c/core/support/CustomSecurityMetadataSource.java

@@ -2,7 +2,8 @@ package com.uas.platform.b2c.core.support;
 
 
 import com.uas.platform.b2c.common.account.dao.ResourceItemDao;
 import com.uas.platform.b2c.common.account.dao.ResourceItemDao;
 import com.uas.platform.b2c.common.account.model.ResourceItem;
 import com.uas.platform.b2c.common.account.model.ResourceItem;
-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.Autowired;
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.access.SecurityConfig;
 import org.springframework.security.access.SecurityConfig;
@@ -11,11 +12,7 @@ import org.springframework.security.web.access.intercept.FilterInvocationSecurit
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
 
 
 /**
 /**
  * 资源数据定义,将所有的资源和权限对应关系建立起来,即定义某一资源可以被哪些角色访问
  * 资源数据定义,将所有的资源和权限对应关系建立起来,即定义某一资源可以被哪些角色访问
@@ -32,7 +29,7 @@ public class CustomSecurityMetadataSource implements FilterInvocationSecurityMet
 	/**
 	/**
 	 * LOGGER 日志对象
 	 * 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;
 	private HashMap<String, Collection<ConfigAttribute>> resourceMap;
 
 
@@ -66,7 +63,6 @@ public class CustomSecurityMetadataSource implements FilterInvocationSecurityMet
 	 */
 	 */
 	public Collection<ConfigAttribute> getAttributes(Object object) throws IllegalArgumentException {
 	public Collection<ConfigAttribute> getAttributes(Object object) throws IllegalArgumentException {
 
 
-		LOGGER.info(object);
 		if (resourceMap == null)
 		if (resourceMap == null)
 			loadResourceDefine();
 			loadResourceDefine();
 		HttpServletRequest request = ((FilterInvocation) object).getRequest();
 		HttpServletRequest request = ((FilterInvocation) object).getRequest();

+ 3 - 2
src/main/java/com/uas/platform/b2c/core/utils/ContextUtils.java

@@ -1,6 +1,7 @@
 package com.uas.platform.b2c.core.utils;
 package com.uas.platform.b2c.core.utils;
 
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationEvent;
 
 
@@ -13,7 +14,7 @@ import org.springframework.context.ApplicationEvent;
 public class ContextUtils {
 public class ContextUtils {
 	private static ApplicationContext applicationContext;
 	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) {
 	public static void setApplicationContext(ApplicationContext applicationContext) {
 		logger.debug("setApplicationContext, notifyAll");
 		logger.debug("setApplicationContext, notifyAll");

+ 3 - 2
src/main/java/com/uas/platform/b2c/external/erp/commodity/service/impl/ProductDetailERPServiceImpl.java

@@ -17,7 +17,8 @@ import com.uas.platform.b2c.prod.commodity.model.Product;
 import com.uas.platform.b2c.prod.commodity.model.ProductDetail;
 import com.uas.platform.b2c.prod.commodity.model.ProductDetail;
 import com.uas.platform.b2c.prod.commodity.service.GoodsService;
 import com.uas.platform.b2c.prod.commodity.service.GoodsService;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.logging.BufferedLoggerManager;
-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.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.CollectionUtils;
 
 
@@ -50,7 +51,7 @@ public class ProductDetailERPServiceImpl implements ProductDetailERPService {
 
 
     private static final ErpB2cBufferedLogger logger = BufferedLoggerManager.getLogger(ErpB2cBufferedLogger.class);
     private static final ErpB2cBufferedLogger logger = BufferedLoggerManager.getLogger(ErpB2cBufferedLogger.class);
 
 
-    private final Logger loggerInfo = Logger.getLogger(getClass());
+    private final Logger loggerInfo = LoggerFactory.getLogger(ProductDetailERPServiceImpl.class);
 
 
     @Autowired
     @Autowired
     private SysConf sysConf;
     private SysConf sysConf;

+ 3 - 2
src/main/java/com/uas/platform/b2c/external/erp/order/service/impl/OrderServiceImpl.java

@@ -24,7 +24,8 @@ import com.uas.platform.core.model.Status;
 import com.uas.platform.core.persistence.criteria.LogicalExpression;
 import com.uas.platform.core.persistence.criteria.LogicalExpression;
 import com.uas.platform.core.persistence.criteria.PredicateUtils;
 import com.uas.platform.core.persistence.criteria.PredicateUtils;
 import com.uas.platform.core.persistence.criteria.SimpleExpression;
 import com.uas.platform.core.persistence.criteria.SimpleExpression;
-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.Autowired;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.CollectionUtils;
@@ -60,7 +61,7 @@ public class OrderServiceImpl implements OrderService {
 	@Autowired
 	@Autowired
 	private EnterpriseDao enterpriseDao;
 	private EnterpriseDao enterpriseDao;
 
 
-	private final Logger loggerInfo = Logger.getLogger(getClass());
+	private final Logger loggerInfo = LoggerFactory.getLogger(OrderServiceImpl.class);
 
 
 	private static final ErpB2cBufferedLogger logger = BufferedLoggerManager.getLogger(ErpB2cBufferedLogger.class);
 	private static final ErpB2cBufferedLogger logger = BufferedLoggerManager.getLogger(ErpB2cBufferedLogger.class);
 
 

+ 3 - 2
src/main/java/com/uas/platform/b2c/external/erp/prod/service/impl/ProdServiceImpl.java

@@ -23,7 +23,8 @@ import com.uas.platform.b2c.prod.store.model.StoreIn;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.model.PageParams;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.BatchPreparedStatementSetter;
 import org.springframework.jdbc.core.BatchPreparedStatementSetter;
@@ -78,7 +79,7 @@ public class ProdServiceImpl implements ProdService {
 
 
     private static final ErpB2cBufferedLogger logger = BufferedLoggerManager.getLogger(ErpB2cBufferedLogger.class);
     private static final ErpB2cBufferedLogger logger = BufferedLoggerManager.getLogger(ErpB2cBufferedLogger.class);
 
 
-    private final Logger loggerOut = Logger.getLogger(getClass());
+    private final Logger loggerOut = LoggerFactory.getLogger(ProdServiceImpl.class);
 
 
     @Override
     @Override
     public String uploadProducts(List<Prod> prods) {
     public String uploadProducts(List<Prod> prods) {

+ 6 - 6
src/main/java/com/uas/platform/b2c/fa/payment/utils/ApipaySubmit.java

@@ -1,16 +1,16 @@
 package com.uas.platform.b2c.fa.payment.utils;
 package com.uas.platform.b2c.fa.payment.utils;
 
 
-import java.io.InputStream;
-import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.core.io.FileSystemResource;
 
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
-
-import org.apache.log4j.Logger;
-import org.springframework.core.io.FileSystemResource;
+import java.io.InputStream;
+import java.util.Map;
 
 
 public class ApipaySubmit {
 public class ApipaySubmit {
 
 
-	private static Logger logger = Logger.getLogger(ApipaySubmit.class);
+	private static Logger logger = LoggerFactory.getLogger(ApipaySubmit.class);
 
 
 	/**
 	/**
 	 * api请求的签名工具方法,把请求参数按照字符排序拼接,然后进行RAS加密
 	 * api请求的签名工具方法,把请求参数按照字符排序拼接,然后进行RAS加密

+ 6 - 10
src/main/java/com/uas/platform/b2c/fa/payment/utils/SignUtils.java

@@ -1,24 +1,20 @@
 package com.uas.platform.b2c.fa.payment.utils;
 package com.uas.platform.b2c.fa.payment.utils;
 
 
+import org.apache.commons.codec.binary.Base64;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.InputStream;
 import java.io.InputStream;
 import java.security.KeyStore;
 import java.security.KeyStore;
 import java.security.PrivateKey;
 import java.security.PrivateKey;
 import java.security.PublicKey;
 import java.security.PublicKey;
 import java.security.cert.Certificate;
 import java.security.cert.Certificate;
 import java.security.cert.CertificateFactory;
 import java.security.cert.CertificateFactory;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.codec.binary.Base64;
-import org.apache.log4j.Logger;
+import java.util.*;
 
 
 public class SignUtils {
 public class SignUtils {
 
 
-	private static Logger logger = Logger.getLogger(SignUtils.class);
+	private static Logger logger = LoggerFactory.getLogger(SignUtils.class);
 
 
 	/**
 	/**
 	 * 缓存公钥和私钥
 	 * 缓存公钥和私钥

+ 6 - 16
src/main/java/com/uas/platform/b2c/prod/commodity/controller/ProductController.java

@@ -6,12 +6,7 @@ import com.uas.platform.b2c.core.constant.SplitChar;
 import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.b2c.core.support.view.JxlsExcelView;
 import com.uas.platform.b2c.core.support.view.JxlsExcelView;
 import com.uas.platform.b2c.prod.commodity.facade.ProductFacade;
 import com.uas.platform.b2c.prod.commodity.facade.ProductFacade;
-import com.uas.platform.b2c.prod.commodity.model.Goods;
-import com.uas.platform.b2c.prod.commodity.model.Product;
-import com.uas.platform.b2c.prod.commodity.model.ProductDetail;
-import com.uas.platform.b2c.prod.commodity.model.ProductReplace;
-import com.uas.platform.b2c.prod.commodity.model.V_ProductPerson;
-import com.uas.platform.b2c.prod.commodity.model.V_ProductPrivate;
+import com.uas.platform.b2c.prod.commodity.model.*;
 import com.uas.platform.b2c.prod.commodity.service.GoodsService;
 import com.uas.platform.b2c.prod.commodity.service.GoodsService;
 import com.uas.platform.b2c.prod.commodity.service.ProductService;
 import com.uas.platform.b2c.prod.commodity.service.ProductService;
 import com.uas.platform.b2c.prod.commodity.type.ProductConstant;
 import com.uas.platform.b2c.prod.commodity.type.ProductConstant;
@@ -20,23 +15,18 @@ import com.uas.platform.b2c.trade.support.ResultMap;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.model.PageParams;
 import org.apache.commons.collections.CollectionUtils;
 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.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Page;
 import org.springframework.ui.ModelMap;
 import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.view.json.MappingJackson2JsonView;
 import org.springframework.web.servlet.view.json.MappingJackson2JsonView;
 
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 import javax.servlet.http.HttpSession;
-import java.io.*;
+import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.List;
@@ -61,7 +51,7 @@ public class ProductController {
 	@Autowired
 	@Autowired
 	private GoodsService goodsService;
 	private GoodsService goodsService;
 
 
-	private final Logger logger = Logger.getLogger(getClass());
+	private final Logger logger = LoggerFactory.getLogger(ProductController.class);
 
 
     /**
     /**
      * Instantiates a new Product controller.
      * Instantiates a new Product controller.

+ 7 - 31
src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/GoodsServiceImpl.java

@@ -18,24 +18,13 @@ import com.uas.platform.b2c.core.constant.ShortConstant;
 import com.uas.platform.b2c.core.constant.SplitChar;
 import com.uas.platform.b2c.core.constant.SplitChar;
 import com.uas.platform.b2c.core.constant.Status;
 import com.uas.platform.b2c.core.constant.Status;
 import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.b2c.core.support.SystemSession;
-import com.uas.platform.b2c.core.utils.DoubleArith;
-import com.uas.platform.b2c.core.utils.FastjsonUtils;
-import com.uas.platform.b2c.core.utils.NumberUtil;
-import com.uas.platform.b2c.core.utils.RegexConstant;
-import com.uas.platform.b2c.core.utils.StringUtilB2C;
+import com.uas.platform.b2c.core.utils.*;
 import com.uas.platform.b2c.external.erp.commodity.util.ModelConverter;
 import com.uas.platform.b2c.external.erp.commodity.util.ModelConverter;
 import com.uas.platform.b2c.prod.commodity.constant.DoubleConstant;
 import com.uas.platform.b2c.prod.commodity.constant.DoubleConstant;
 import com.uas.platform.b2c.prod.commodity.constant.IntegerConstant;
 import com.uas.platform.b2c.prod.commodity.constant.IntegerConstant;
 import com.uas.platform.b2c.prod.commodity.constant.StringConstant;
 import com.uas.platform.b2c.prod.commodity.constant.StringConstant;
 import com.uas.platform.b2c.prod.commodity.constant.UploadConstant;
 import com.uas.platform.b2c.prod.commodity.constant.UploadConstant;
-import com.uas.platform.b2c.prod.commodity.dao.GoodsDao;
-import com.uas.platform.b2c.prod.commodity.dao.GoodsHistoryDao;
-import com.uas.platform.b2c.prod.commodity.dao.GoodsModifyInfoDao;
-import com.uas.platform.b2c.prod.commodity.dao.GoodsSimpleDao;
-import com.uas.platform.b2c.prod.commodity.dao.PCBDao;
-import com.uas.platform.b2c.prod.commodity.dao.ProductDao;
-import com.uas.platform.b2c.prod.commodity.dao.ProductDetailDao;
-import com.uas.platform.b2c.prod.commodity.dao.ProductPrivateDao;
+import com.uas.platform.b2c.prod.commodity.dao.*;
 import com.uas.platform.b2c.prod.commodity.model.*;
 import com.uas.platform.b2c.prod.commodity.model.*;
 import com.uas.platform.b2c.prod.commodity.model.GoodsHistory.OperateType;
 import com.uas.platform.b2c.prod.commodity.model.GoodsHistory.OperateType;
 import com.uas.platform.b2c.prod.commodity.service.*;
 import com.uas.platform.b2c.prod.commodity.service.*;
@@ -77,11 +66,7 @@ import com.uas.platform.b2c.trade.support.CodeType;
 import com.uas.platform.b2c.trade.support.ResultMap;
 import com.uas.platform.b2c.trade.support.ResultMap;
 import com.uas.platform.b2c.trade.util.BoundedExecutor;
 import com.uas.platform.b2c.trade.util.BoundedExecutor;
 import com.uas.platform.core.exception.IllegalOperatorException;
 import com.uas.platform.core.exception.IllegalOperatorException;
-import com.uas.platform.core.model.Constant;
-import com.uas.platform.core.model.EncodingRulesConstant;
-import com.uas.platform.core.model.PageInfo;
-import com.uas.platform.core.model.PageParams;
-import com.uas.platform.core.model.Type;
+import com.uas.platform.core.model.*;
 import com.uas.platform.core.persistence.criteria.CriterionExpression;
 import com.uas.platform.core.persistence.criteria.CriterionExpression;
 import com.uas.platform.core.persistence.criteria.CriterionExpression.Operator;
 import com.uas.platform.core.persistence.criteria.CriterionExpression.Operator;
 import com.uas.platform.core.persistence.criteria.LogicalExpression;
 import com.uas.platform.core.persistence.criteria.LogicalExpression;
@@ -93,11 +78,12 @@ import org.apache.commons.beanutils.ConvertUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.collections.map.HashedMap;
 import org.apache.commons.collections.map.HashedMap;
-import org.apache.log4j.Logger;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.usermodel.Workbook;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Page;
@@ -125,17 +111,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.SQLException;
 import java.text.ParseException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Executors;
 import java.util.regex.Matcher;
 import java.util.regex.Matcher;
@@ -272,7 +248,7 @@ public class GoodsServiceImpl implements GoodsService {
     @Autowired
     @Autowired
     private EnterpriseService enterpriseService;
     private EnterpriseService enterpriseService;
 
 
-    private final Logger logger = Logger.getLogger(getClass());
+    private final Logger logger = LoggerFactory.getLogger(GoodsServiceImpl.class);
 
 
     @Autowired
     @Autowired
     public GoodsServiceImpl(KindService kindService, StoreInDao storeInDao, StoreInService storeInService, ProductDao productDao, BrowsingHistoryService browsingHistoryService, RecommendProductService recommendProductService, BrandDao brandDao, KindInfoDao kindInfoDao) {
     public GoodsServiceImpl(KindService kindService, StoreInDao storeInDao, StoreInService storeInService, ProductDao productDao, BrowsingHistoryService browsingHistoryService, RecommendProductService recommendProductService, BrandDao brandDao, KindInfoDao kindInfoDao) {

+ 3 - 2
src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ProductAttachServiceImpl.java

@@ -34,7 +34,8 @@ import com.uas.platform.core.persistence.criteria.LogicalExpression;
 import com.uas.platform.core.persistence.criteria.PredicateUtils;
 import com.uas.platform.core.persistence.criteria.PredicateUtils;
 import com.uas.platform.core.persistence.criteria.SimpleExpression;
 import com.uas.platform.core.persistence.criteria.SimpleExpression;
 import org.apache.commons.collections.CollectionUtils;
 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.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageImpl;
@@ -81,7 +82,7 @@ public class ProductAttachServiceImpl implements ProductAttachService {
 
 
     private final String AUDIT_FAILED = "审核不通过";
     private final String AUDIT_FAILED = "审核不通过";
 
 
-    private final Logger LOGGER = Logger.getLogger(getClass());
+    private final Logger LOGGER = LoggerFactory.getLogger(ProductAttachServiceImpl.class);
 
 
     @Autowired
     @Autowired
     private ProductService productService;
     private ProductService productService;

+ 8 - 55
src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ProductServiceImpl.java

@@ -13,11 +13,7 @@ import com.uas.platform.b2c.common.base.dao.CommonDao;
 import com.uas.platform.b2c.common.search.rpc.service.SearchService;
 import com.uas.platform.b2c.common.search.rpc.service.SearchService;
 import com.uas.platform.b2c.common.search.util.SPage;
 import com.uas.platform.b2c.common.search.util.SPage;
 import com.uas.platform.b2c.core.config.SysConf;
 import com.uas.platform.b2c.core.config.SysConf;
-import com.uas.platform.b2c.core.constant.IntegerConstant;
-import com.uas.platform.b2c.core.constant.ReleaseStatus;
-import com.uas.platform.b2c.core.constant.ShortConstant;
-import com.uas.platform.b2c.core.constant.SplitChar;
-import com.uas.platform.b2c.core.constant.Status;
+import com.uas.platform.b2c.core.constant.*;
 import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.b2c.core.utils.FastjsonUtils;
 import com.uas.platform.b2c.core.utils.FastjsonUtils;
 import com.uas.platform.b2c.core.utils.NumberUtil;
 import com.uas.platform.b2c.core.utils.NumberUtil;
@@ -25,44 +21,9 @@ import com.uas.platform.b2c.core.utils.StringUtilB2C;
 import com.uas.platform.b2c.prod.commodity.constant.DoubleConstant;
 import com.uas.platform.b2c.prod.commodity.constant.DoubleConstant;
 import com.uas.platform.b2c.prod.commodity.constant.PublicProductUrl;
 import com.uas.platform.b2c.prod.commodity.constant.PublicProductUrl;
 import com.uas.platform.b2c.prod.commodity.constant.StringConstant;
 import com.uas.platform.b2c.prod.commodity.constant.StringConstant;
-import com.uas.platform.b2c.prod.commodity.dao.GoodsDao;
-import com.uas.platform.b2c.prod.commodity.dao.GoodsHistoryDao;
-import com.uas.platform.b2c.prod.commodity.dao.MatchModelDao;
-import com.uas.platform.b2c.prod.commodity.dao.PCBDao;
-import com.uas.platform.b2c.prod.commodity.dao.ProductDao;
-import com.uas.platform.b2c.prod.commodity.dao.ProductDetailDao;
-import com.uas.platform.b2c.prod.commodity.dao.ProductMatchResultDao;
-import com.uas.platform.b2c.prod.commodity.dao.ProductModifyHistoryDao;
-import com.uas.platform.b2c.prod.commodity.dao.ProductPersonDao;
-import com.uas.platform.b2c.prod.commodity.dao.ProductPrivateDao;
-import com.uas.platform.b2c.prod.commodity.dao.ProductReplaceDao;
-import com.uas.platform.b2c.prod.commodity.dao.ProductStoreStatusDao;
-import com.uas.platform.b2c.prod.commodity.dao.V_ProductPersonDao;
-import com.uas.platform.b2c.prod.commodity.dao.V_ProductPrivateDao;
-import com.uas.platform.b2c.prod.commodity.model.Goods;
-import com.uas.platform.b2c.prod.commodity.model.GoodsHistory;
-import com.uas.platform.b2c.prod.commodity.model.GoodsQtyPrice;
-import com.uas.platform.b2c.prod.commodity.model.InOutboundDetail;
-import com.uas.platform.b2c.prod.commodity.model.MatchModel;
-import com.uas.platform.b2c.prod.commodity.model.Product;
-import com.uas.platform.b2c.prod.commodity.model.ProductAttachSubmit;
-import com.uas.platform.b2c.prod.commodity.model.ProductDetail;
-import com.uas.platform.b2c.prod.commodity.model.ProductMatchResult;
-import com.uas.platform.b2c.prod.commodity.model.ProductPerson;
-import com.uas.platform.b2c.prod.commodity.model.ProductPrivate;
-import com.uas.platform.b2c.prod.commodity.model.ProductReplace;
-import com.uas.platform.b2c.prod.commodity.model.ProductStoreStatus;
-import com.uas.platform.b2c.prod.commodity.model.ReleaseProductByBatch;
-import com.uas.platform.b2c.prod.commodity.model.UASBatchPutOnProperty;
-import com.uas.platform.b2c.prod.commodity.model.V_ProductPerson;
-import com.uas.platform.b2c.prod.commodity.model.V_ProductPrivate;
-import com.uas.platform.b2c.prod.commodity.service.GoodsHistoryService;
-import com.uas.platform.b2c.prod.commodity.service.GoodsService;
-import com.uas.platform.b2c.prod.commodity.service.InOutboundDetailService;
-import com.uas.platform.b2c.prod.commodity.service.ProductAttachService;
-import com.uas.platform.b2c.prod.commodity.service.ProductPrivateService;
-import com.uas.platform.b2c.prod.commodity.service.ProductService;
-import com.uas.platform.b2c.prod.commodity.service.UASBatchPutOnPropertyService;
+import com.uas.platform.b2c.prod.commodity.dao.*;
+import com.uas.platform.b2c.prod.commodity.model.*;
+import com.uas.platform.b2c.prod.commodity.service.*;
 import com.uas.platform.b2c.prod.commodity.type.ProductConstant;
 import com.uas.platform.b2c.prod.commodity.type.ProductConstant;
 import com.uas.platform.b2c.prod.commodity.util.GoodsUtil;
 import com.uas.platform.b2c.prod.commodity.util.GoodsUtil;
 import com.uas.platform.b2c.prod.product.brand.dao.BrandDao;
 import com.uas.platform.b2c.prod.product.brand.dao.BrandDao;
@@ -102,7 +63,8 @@ import com.uas.platform.core.util.serializer.FlexJsonUtils;
 import org.apache.commons.beanutils.ConvertUtils;
 import org.apache.commons.beanutils.ConvertUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.map.HashedMap;
 import org.apache.commons.collections.map.HashedMap;
-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.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataAccessException;
@@ -129,16 +91,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.sql.Statement;
 import java.text.SimpleDateFormat;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Executors;
@@ -149,7 +102,7 @@ import java.util.concurrent.Executors;
 @Service
 @Service
 public class ProductServiceImpl implements ProductService {
 public class ProductServiceImpl implements ProductService {
 
 
-    private final Logger logger = Logger.getLogger(getClass());
+    private final Logger logger = LoggerFactory.getLogger(ProductServiceImpl.class);
 
 
     @Autowired
     @Autowired
     private ProductDao productDao;
     private ProductDao productDao;

+ 3 - 2
src/main/java/com/uas/platform/b2c/prod/commodity/task/ReleaseByBatchTask.java

@@ -1,7 +1,8 @@
 package com.uas.platform.b2c.prod.commodity.task;
 package com.uas.platform.b2c.prod.commodity.task;
 
 
 import com.uas.platform.b2c.prod.commodity.service.ReleaseProductByBatchService;
 import com.uas.platform.b2c.prod.commodity.service.ReleaseProductByBatchService;
-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.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
 
 
@@ -15,7 +16,7 @@ public class ReleaseByBatchTask {
 
 
     private final ReleaseProductByBatchService releaseProductByBatchService;
     private final ReleaseProductByBatchService releaseProductByBatchService;
 
 
-    private final Logger logger = Logger.getLogger(getClass());
+    private final Logger logger = LoggerFactory.getLogger(ReleaseByBatchTask.class);
 
 
     @Autowired
     @Autowired
     public ReleaseByBatchTask(ReleaseProductByBatchService releaseProductByBatchService) {
     public ReleaseByBatchTask(ReleaseProductByBatchService releaseProductByBatchService) {

+ 3 - 2
src/main/java/com/uas/platform/b2c/prod/store/controller/ConsignmentAgreeRecordController.java

@@ -6,7 +6,8 @@ import com.uas.platform.b2c.prod.store.service.ConsignmentAgreeRecordService;
 import com.uas.platform.b2c.trade.support.ResultMap;
 import com.uas.platform.b2c.trade.support.ResultMap;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.model.PageParams;
-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.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Pageable;
@@ -26,7 +27,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping(value = "/auth/store/consignment/record")
 @RequestMapping(value = "/auth/store/consignment/record")
 public class ConsignmentAgreeRecordController {
 public class ConsignmentAgreeRecordController {
 
 
-	private final Logger logger = Logger.getLogger(getClass());
+	private final Logger logger = LoggerFactory.getLogger(ConsignmentAgreeRecordController.class);
 
 
 	private final ConsignmentAgreeRecordService recordService;
 	private final ConsignmentAgreeRecordService recordService;
 
 

+ 4 - 7
src/main/java/com/uas/platform/b2c/prod/store/controller/StoreViolationsController.java

@@ -6,13 +6,10 @@ import com.uas.platform.b2c.prod.store.service.StoreViolationsService;
 import com.uas.platform.b2c.trade.support.ResultMap;
 import com.uas.platform.b2c.trade.support.ResultMap;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.model.PageParams;
-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.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 
 /**
 /**
  * 店铺违规处理鉴权接口
  * 店铺违规处理鉴权接口
@@ -24,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping(value = "/auth/store/violations")
 @RequestMapping(value = "/auth/store/violations")
 public class StoreViolationsController {
 public class StoreViolationsController {
 
 
-	private final Logger logger = Logger.getLogger(getClass());
+	private final Logger logger = LoggerFactory.getLogger(StoreViolationsController.class);
 
 
 	private final StoreViolationsService storeViolationsService;
 	private final StoreViolationsService storeViolationsService;
 
 

+ 4 - 3
src/main/java/com/uas/platform/b2c/trade/deprecated/controller/RecommendController.java

@@ -1,9 +1,10 @@
 package com.uas.platform.b2c.trade.deprecated.controller;
 package com.uas.platform.b2c.trade.deprecated.controller;
 
 
-import com.uas.platform.b2c.prod.product.component.modal.ComponentInfo;
 import com.uas.platform.b2c.prod.commodity.model.Goods;
 import com.uas.platform.b2c.prod.commodity.model.Goods;
+import com.uas.platform.b2c.prod.product.component.modal.ComponentInfo;
 import com.uas.platform.b2c.trade.deprecated.service.RecommendService;
 import com.uas.platform.b2c.trade.deprecated.service.RecommendService;
-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.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Pageable;
@@ -22,7 +23,7 @@ import java.util.List;
 @RequestMapping("/recommendation")
 @RequestMapping("/recommendation")
 public class RecommendController {
 public class RecommendController {
 
 
-    private Logger logger = Logger.getLogger(getClass());
+    private Logger logger = LoggerFactory.getLogger(RecommendController.class);
 
 
     @Autowired
     @Autowired
     private RecommendService recommendService;
     private RecommendService recommendService;

+ 3 - 1
src/main/java/com/uas/platform/b2c/trade/order/service/impl/PurchaseProductServiceImpl.java

@@ -23,6 +23,8 @@ import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.usermodel.Workbook;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
@@ -70,7 +72,7 @@ public class PurchaseProductServiceImpl implements PurchaseProductService {
     /**
     /**
      * 程序执行日志
      * 程序执行日志
      */
      */
-    private static final org.apache.log4j.Logger LOGGER = org.apache.log4j.Logger.getLogger(PurchaseProductServiceImpl.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(PurchaseProductServiceImpl.class);
 
 
     /**
     /**
      * 通过excel批量导入个人物料
      * 通过excel批量导入个人物料

+ 6 - 0
src/main/resources/logback.xml

@@ -38,6 +38,12 @@
         <appender-ref ref="stdout" />
         <appender-ref ref="stdout" />
     </root>
     </root>
 
 
+    <logger name="org.hibernate" additivity="false">
+        <level value="WARN" />
+        <appender-ref ref="stdout" />
+        <appender-ref ref="async"/>
+    </logger>
+
     <logger name="com.uas" additivity="false">
     <logger name="com.uas" additivity="false">
         <level value="INFO" />
         <level value="INFO" />
         <appender-ref ref="stdout" />
         <appender-ref ref="stdout" />