yujia 7 лет назад
Родитель
Сommit
bb17c27960
53 измененных файлов с 635 добавлено и 729 удалено
  1. 3 4
      src/main/java/com/uas/platform/b2c/common/account/controller/UsageLogController.java
  2. 30 34
      src/main/java/com/uas/platform/b2c/common/account/controller/UserController.java
  3. 11 11
      src/main/java/com/uas/platform/b2c/common/account/v2/service/impl/EnterpriseServiceImpl.java
  4. 9 10
      src/main/java/com/uas/platform/b2c/common/account/v2/service/impl/UserServiceImpl.java
  5. 9 13
      src/main/java/com/uas/platform/b2c/common/keyword/controller/KeyWordController.java
  6. 6 6
      src/main/java/com/uas/platform/b2c/common/message/controller/MessageInfoController.java
  7. 8 7
      src/main/java/com/uas/platform/b2c/fa/factoring/api/LoanApplyController.java
  8. 20 25
      src/main/java/com/uas/platform/b2c/fa/payment/controller/BankInfoController.java
  9. 15 15
      src/main/java/com/uas/platform/b2c/fa/payment/controller/BankTransferController.java
  10. 12 15
      src/main/java/com/uas/platform/b2c/fa/settlement/controller/BillController.java
  11. 7 6
      src/main/java/com/uas/platform/b2c/fa/settlement/controller/BillSubmitController.java
  12. 11 11
      src/main/java/com/uas/platform/b2c/fa/settlement/controller/RefundController.java
  13. 19 19
      src/main/java/com/uas/platform/b2c/logistics/controller/AddressController.java
  14. 7 6
      src/main/java/com/uas/platform/b2c/logistics/controller/DistributionRuleController.java
  15. 13 12
      src/main/java/com/uas/platform/b2c/logistics/controller/LogisticsOldController.java
  16. 8 12
      src/main/java/com/uas/platform/b2c/logistics/controller/PickUpAddressController.java
  17. 43 42
      src/main/java/com/uas/platform/b2c/prod/commodity/controller/GoodsController.java
  18. 5 5
      src/main/java/com/uas/platform/b2c/prod/commodity/controller/GoodsHistoryController.java
  19. 7 9
      src/main/java/com/uas/platform/b2c/prod/commodity/controller/GoodsModifyInfoController.java
  20. 10 14
      src/main/java/com/uas/platform/b2c/prod/commodity/controller/GoodsPriceInfoController.java
  21. 22 26
      src/main/java/com/uas/platform/b2c/prod/commodity/controller/ReleaseProductByBatchController.java
  22. 5 5
      src/main/java/com/uas/platform/b2c/prod/commodity/controller/UASBatchPutOnPropertyController.java
  23. 3 4
      src/main/java/com/uas/platform/b2c/prod/product/brand/controller/BrandController.java
  24. 6 7
      src/main/java/com/uas/platform/b2c/prod/product/brand/controller/BrandMapController.java
  25. 14 15
      src/main/java/com/uas/platform/b2c/prod/product/brand/controller/BrandSubmitController.java
  26. 8 9
      src/main/java/com/uas/platform/b2c/prod/product/brand/controller/BrandVersionController.java
  27. 10 10
      src/main/java/com/uas/platform/b2c/prod/product/brand/controller/VendorListSubmitController.java
  28. 17 18
      src/main/java/com/uas/platform/b2c/prod/product/component/controller/ComponentController.java
  29. 21 19
      src/main/java/com/uas/platform/b2c/prod/product/component/controller/ComponentSubmitController.java
  30. 8 9
      src/main/java/com/uas/platform/b2c/prod/product/component/controller/ComponentVersionController.java
  31. 6 7
      src/main/java/com/uas/platform/b2c/prod/product/kind/controller/KindAdviceController.java
  32. 17 24
      src/main/java/com/uas/platform/b2c/prod/product/kind/controller/KindController.java
  33. 5 6
      src/main/java/com/uas/platform/b2c/prod/product/property/controller/PropertySubmitController.java
  34. 9 13
      src/main/java/com/uas/platform/b2c/trade/deprecated/controller/CustomerServiceController.java
  35. 7 7
      src/main/java/com/uas/platform/b2c/trade/inquiry/controller/ChargeController.java
  36. 54 65
      src/main/java/com/uas/platform/b2c/trade/order/controller/OrderController.java
  37. 9 13
      src/main/java/com/uas/platform/b2c/trade/order/controller/ProofingController.java
  38. 35 45
      src/main/java/com/uas/platform/b2c/trade/order/controller/PurchaseController.java
  39. 8 7
      src/main/java/com/uas/platform/b2c/trade/order/controller/PurchaseProductController.java
  40. 3 6
      src/main/java/com/uas/platform/b2c/trade/order/service/impl/OrderServiceImpl.java
  41. 17 9
      src/main/java/com/uas/platform/b2c/trade/order/service/impl/PurchaseServiceImpl.java
  42. 4 5
      src/main/java/com/uas/platform/b2c/trade/order/task/OrderTask.java
  43. 11 11
      src/main/java/com/uas/platform/b2c/trade/presale/controller/CartController.java
  44. 6 10
      src/main/java/com/uas/platform/b2c/trade/presale/controller/TradeBasicPropertiesController.java
  45. 6 6
      src/main/java/com/uas/platform/b2c/trade/presale/controller/TradeDeliveryDelayTimeController.java
  46. 6 6
      src/main/java/com/uas/platform/b2c/trade/rate/task/RateTask.java
  47. 13 13
      src/main/java/com/uas/platform/b2c/trade/seek/controller/SeekPurchaseBomController.java
  48. 8 9
      src/main/java/com/uas/platform/b2c/trade/seek/controller/SeekPurchaseController.java
  49. 14 17
      src/main/java/com/uas/platform/b2c/trade/seek/controller/SeekPurchaseOfferController.java
  50. 8 14
      src/main/java/com/uas/platform/b2c/trade/seek/controller/SeekQualityBuyerController.java
  51. 11 10
      src/main/java/com/uas/platform/b2c/trade/seek/controller/SeekSalesmanInfoController.java
  52. 10 27
      src/main/java/com/uas/platform/b2c/trade/seek/service/impl/SeekPurchaseBomServiceImpl.java
  53. 1 1
      src/main/resources/logback.xml

+ 3 - 4
src/main/java/com/uas/platform/b2c/common/account/controller/UsageLogController.java

@@ -2,11 +2,11 @@ package com.uas.platform.b2c.common.account.controller;
 
 import com.uas.platform.b2c.common.account.model.UsageLog;
 import com.uas.platform.b2c.common.account.service.UsageLogService;
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
-import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import com.wordnik.swagger.annotations.ApiParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Sort;
@@ -28,8 +28,7 @@ public class UsageLogController {
 	@Autowired
 	private UsageLogService usageLogService;
 
-	private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
-
+    private final Logger logger = LoggerFactory.getLogger(UsageLogController.class);
 	/**
 	 * 根据分页信息获取
 	 * @return

+ 30 - 34
src/main/java/com/uas/platform/b2c/common/account/controller/UserController.java

@@ -10,10 +10,8 @@ import com.uas.platform.b2c.common.account.model.UserQuestion;
 import com.uas.platform.b2c.common.account.service.UserQuestionService;
 import com.uas.platform.b2c.common.account.service.UserService;
 import com.uas.platform.b2c.core.support.SystemSession;
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.core.utils.FastjsonUtils;
 import com.uas.platform.core.exception.IllegalOperatorException;
-import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.util.StringUtil;
@@ -21,12 +19,8 @@ import com.uas.platform.core.util.encry.Md5Utils;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 import com.wordnik.swagger.annotations.ApiOperation;
 import com.wordnik.swagger.annotations.ApiParam;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Page;
@@ -35,12 +29,14 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.StringUtils;
-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.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 用户信息的请求
@@ -67,9 +63,9 @@ public class UserController {
 	@Value("#{sys.profile}")
 	private String profile;
 
-	private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
+    private final Logger logger = LoggerFactory.getLogger(UserController.class);
 
-	/**
+    /**
 	 * 获取当前登录的用户信息
 	 * @return
 	 */
@@ -109,7 +105,7 @@ public class UserController {
 			user.setImageUrl(jsonObject.getString("imageUrl"));
 		}
 		assert logger != null;
-		logger.log("用户信息", "设置头像路径,UU:" + user.getUserUU());
+		logger.info("用户信息", "设置头像路径,UU:" + user.getUserUU());
 		userService.updateImageUrl(user.getImageUrl());
 		return user;
 	}
@@ -134,7 +130,7 @@ public class UserController {
 				return new ResponseEntity<>(HttpStatus.OK);
 			}
 			assert logger != null;
-			logger.log("用户信息", "验证用户密码,UU:" + user.getUserUU());
+			logger.info("用户信息", "验证用户密码,UU:" + user.getUserUU());
 		}
 		return new ResponseEntity<>(HttpStatus.EXPECTATION_FAILED);
 	}
@@ -167,7 +163,7 @@ public class UserController {
 			session.setAttribute("user", user);
 			SystemSession.setUser(user);
 			assert logger != null;
-			logger.log("用户信息", "修改用户密码,UU:" + user.getUserUU());
+			logger.info("用户信息", "修改用户密码,UU:" + user.getUserUU());
 			return new ResponseEntity<>(HttpStatus.OK);
 		} else
 			throw new IllegalOperatorException("新密码不能为空");
@@ -223,7 +219,7 @@ public class UserController {
 				session.setAttribute("checkTime", System.currentTimeMillis());
 				session.setAttribute("newUserEmail",newUserEmail);
 				assert logger != null;
-				logger.log("用户信息", "修改用户邮箱,邮箱地址为:" + newUserEmail + ", 验证码为:" + checkCode);
+				logger.info("用户信息", "修改用户邮箱,邮箱地址为:" + newUserEmail + ", 验证码为:" + checkCode);
 				return new ResponseEntity<>(HttpStatus.OK);
 			} catch (Exception e) {
 				e.printStackTrace();
@@ -312,7 +308,7 @@ public class UserController {
 			session.setAttribute("user", user);
 			SystemSession.setUser(user);
 			assert logger != null;
-			logger.log("用户信息", "修改用户邮箱地址,UU:" + user.getUserUU());
+			logger.info("用户信息", "修改用户邮箱地址,UU:" + user.getUserUU());
 			return new ResponseEntity<>(HttpStatus.OK);
 		} else
 			throw new IllegalOperatorException("新邮箱地址不能为空");
@@ -331,7 +327,7 @@ public class UserController {
 			boolean result = user.getUserTel().equals(userTel);
 			if (result) {
 				assert logger != null;
-				logger.log("用户信息", "验证用户手机,UU:" + user.getUserUU());
+				logger.info("用户信息", "验证用户手机,UU:" + user.getUserUU());
 				return new ResponseEntity<>(HttpStatus.OK);
 			}
 		}
@@ -367,7 +363,7 @@ public class UserController {
 				session.setAttribute("telCheckTime", System.currentTimeMillis());
 				session.setAttribute("newUserTel", newUserTel);
 				assert logger != null;
-				logger.log("用户信息", "修改用户手机号,手机号为:" + newUserTel + ", 验证码为:"+ checkCode);
+				logger.info("用户信息", "修改用户手机号,手机号为:" + newUserTel + ", 验证码为:"+ checkCode);
 				return new ResponseEntity<>(HttpStatus.OK);
 			} catch (Exception e) {
 				e.printStackTrace();
@@ -453,7 +449,7 @@ public class UserController {
 			session.setAttribute("user", user);
 			SystemSession.setUser(user);
 			assert logger != null;
-			logger.log("用户信息", "修改用户手机号,UU:" + user.getUserUU());
+			logger.info("用户信息", "修改用户手机号,UU:" + user.getUserUU());
 			return new ResponseEntity<>(HttpStatus.OK);
 		} else
 			throw new IllegalOperatorException("新手机号不能为空");
@@ -471,7 +467,7 @@ public class UserController {
 		headers.add("Content-Type", "application/text; charset=utf-8");
 		if (!StringUtils.isEmpty(user.getUserPay())) {
 			assert logger != null;
-			logger.log("用户信息", "是否设置支付密码,UU:" + user.getUserUU());
+			logger.info("用户信息", "是否设置支付密码,UU:" + user.getUserUU());
 			return new ResponseEntity<>(true, headers, HttpStatus.OK);
 		}
 		return new ResponseEntity<>(false, headers, HttpStatus.OK);
@@ -492,7 +488,7 @@ public class UserController {
 				return new ResponseEntity<>(HttpStatus.OK);
 			}
 			assert logger != null;
-			logger.log("用户信息", "验证用户支付密码,UU:" + user.getUserUU());
+			logger.info("用户信息", "验证用户支付密码,UU:" + user.getUserUU());
 		}
 		return new ResponseEntity<>(HttpStatus.EXPECTATION_FAILED);
 	}
@@ -523,7 +519,7 @@ public class UserController {
 			session.setAttribute("user", user);
 			SystemSession.setUser(user);
 			assert logger != null;
-			logger.log("用户信息", "修改用户支付密码,UU:" + user.getUserUU());
+			logger.info("用户信息", "修改用户支付密码,UU:" + user.getUserUU());
 			return new ResponseEntity<>(HttpStatus.OK);
 		} else
 			throw new IllegalOperatorException("新密码不能为空");
@@ -556,7 +552,7 @@ public class UserController {
 			uqService.save(uq);
 		}
 		assert logger != null;
-		logger.log("用户信息", "设置密保问题,UU:" + sysUser.getUserUU());
+		logger.info("用户信息", "设置密保问题,UU:" + sysUser.getUserUU());
 		return new ResponseEntity<>(HttpStatus.OK);
 	}
 
@@ -584,7 +580,7 @@ public class UserController {
 			request.getSession().setAttribute("user", user);
 			SystemSession.setUser(user);
 			assert logger != null;
-			logger.log("用户信息", "提交实名认证信息,UU:" + sysUser.getUserUU());
+			logger.info("用户信息", "提交实名认证信息,UU:" + sysUser.getUserUU());
 			return new ResponseEntity<>(HttpStatus.OK);
 		}else{
 			throw new IllegalOperatorException("找不到用户...");
@@ -636,7 +632,7 @@ public class UserController {
 		User user = FlexJsonUtils.fromJson(json, User.class);
 		user = userService.addUser(user, request);
 		if (user != null) {
-			logger.log("用户信息", "新增用户,姓名:" + user.getUserName());
+			logger.info("用户信息", "新增用户,姓名:" + user.getUserName());
 		}
 		return new ResponseEntity<String>(HttpStatus.OK);
 	}
@@ -650,7 +646,7 @@ public class UserController {
 	@RequestMapping(value = "/{uu}", method = RequestMethod.DELETE)
 	public ResponseEntity<String> removeUser(@PathVariable("uu") Long uu) {
 		userService.removeUser(uu);
-		logger.log("用户信息", "删除用户,UU:" + uu);
+		logger.info("用户信息", "删除用户,UU:" + uu);
 		return new ResponseEntity<String>(HttpStatus.OK);
 	}
 	/**
@@ -664,7 +660,7 @@ public class UserController {
 		User user = FlexJsonUtils.fromJson(json, User.class);
 		userService.saveUserRole(user);
 		if (user != null) {
-			logger.log("用户信息", "修改用户信息,UU:" + user.getUserUU());
+			logger.info("用户信息", "修改用户信息,UU:" + user.getUserUU());
 			if (SystemSession.getUser().getUserUU().equals(user.getUserUU())) {
 				user.setEnterprises(SystemSession.getUser().getEnterprises());
 				user.setCurrentEnterprise(SystemSession.getUser().getEnterprise().getUu());
@@ -685,7 +681,7 @@ public class UserController {
 		User user = FlexJsonUtils.fromJson(json, User.class);
 		userService.save(user);
 		if (user != null) {
-			logger.log("用户信息", "修改用户信息,UU:" + user.getUserUU());
+			logger.info("用户信息", "修改用户信息,UU:" + user.getUserUU());
 			if (SystemSession.getUser().getUserUU().equals(user.getUserUU()))
 				request.getSession().setAttribute("user", user);
 		}
@@ -835,7 +831,7 @@ public class UserController {
 			smsService.send("bda635e5-156d-4e86-894b-a83071a678e8", newUser.getUserTel(), new Object[] {newUser.getIdRemarks()});
 		}
 		assert logger != null;
-		logger.log("用户信息", SystemSession.getUser().getUserUU()+"后台审核实名认证,UU:" +  newUser.getUserUU());
+		logger.info("用户信息", SystemSession.getUser().getUserUU()+"后台审核实名认证,UU:" +  newUser.getUserUU());
 		return new ResponseEntity<String>(HttpStatus.OK);
 	}
 }

+ 11 - 11
src/main/java/com/uas/platform/b2c/common/account/v2/service/impl/EnterpriseServiceImpl.java

@@ -8,14 +8,14 @@ import com.uas.platform.b2c.common.account.model.ChangeAdminDetail;
 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.v2.service.EnterpriseService;
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.fa.payment.utils.StringUtils;
 import com.uas.platform.b2c.prod.store.dao.StoreInDao;
 import com.uas.platform.b2c.prod.store.model.EnterpriseSimple;
 import com.uas.platform.b2c.prod.store.model.StoreIn;
-import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.sso.entity.UserSpaceView;
 import org.apache.commons.collections.CollectionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -39,7 +39,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
     @Autowired
 	private StoreInDao storeInDao;
 
-    private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
+    private final Logger logger = LoggerFactory.getLogger(EnterpriseServiceImpl.class);
 
     private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-mm-dd");
 
@@ -48,11 +48,11 @@ public class EnterpriseServiceImpl implements EnterpriseService {
     public Enterprise update(UserSpaceView userSpaceView) {
       /*  List<User> admins = userDao.findUserByUserUU(userSpaceView.getAdminUU());
         if (admins.size() != 1) {
-            logger.log("更新企业信息出错,管理员有且仅有一个", "当前管理员数量:" + admins.size());
+            logger.info("更新企业信息出错,管理员有且仅有一个", "当前管理员数量:" + admins.size());
             return;
         }*/
         if (null == userSpaceView.getSpaceUU() && "".equals(userSpaceView.getSpaceUU())){
-            logger.log("更新企业信息出错,uu为空", "值为null", null,0L);
+            logger.info("更新企业信息出错,uu为空", "值为null", null,0L);
             return null;
         }
         Enterprise enterprise;
@@ -102,9 +102,9 @@ public class EnterpriseServiceImpl implements EnterpriseService {
             } catch (Exception e) {
                 e.printStackTrace();
             }
-            logger.log("更新企业信息", enterprise.getUu()+"time: " + sdf.format(new Date()), enterprise.getEnAdminuu(), 0L);
+            logger.info("更新企业信息", enterprise.getUu()+"time: " + sdf.format(new Date()), enterprise.getEnAdminuu(), 0L);
         } else {
-            logger.log("新增企业信息", enterprise.getUu()+"time: " + sdf.format(new Date()), enterprise.getEnAdminuu(), 0L);
+            logger.info("新增企业信息", enterprise.getUu()+"time: " + sdf.format(new Date()), enterprise.getEnAdminuu(), 0L);
         }
         return newEn;
     }
@@ -114,7 +114,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
     public void update(UserSpace userSpace, UserSpaceDetail userSpaceDetail) {
         Enterprise enterprise = new Enterprise();
         if (null == userSpace.getDialectUID() && "".equals(userSpace.getDialectUID())){
-            logger.log("更新企业信息出错,uu为空", "值为null", null,0L);
+            logger.info("更新企业信息出错,uu为空", "值为null", null,0L);
             return;
         }
         try{
@@ -149,9 +149,9 @@ public class EnterpriseServiceImpl implements EnterpriseService {
             userDao.save(adminUser);
         }
         if(null != oldenterprise) {
-            logger.log("更新企业信息", enterprise.getUu()+"time: " + sdf.format(new Date()), enterprise.getUu(), 0L);
+            logger.info("更新企业信息", enterprise.getUu()+"time: " + sdf.format(new Date()), enterprise.getUu(), 0L);
         } else {
-            logger.log("新增企业信息", enterprise.getUu()+"time: " + sdf.format(new Date()), enterprise.getUu(), 0L);
+            logger.info("新增企业信息", enterprise.getUu()+"time: " + sdf.format(new Date()), enterprise.getUu(), 0L);
         }
     }
 
@@ -164,7 +164,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
                 if(!CollectionUtils.isEmpty(users)) {
                     enterprise.setEnAdminuu(users.get(0).getUserUU());
                     enterpriseDao.save(enterprise);
-                    logger.log("更换管理员", enterprise.getEnName() + ":" + enterprise.getUu() + ";" + enterprise.getEnAdminuu());
+                    logger.info("更换管理员", enterprise.getEnName() + ":" + enterprise.getUu() + ";" + enterprise.getEnAdminuu());
                 }
             }
         }

+ 9 - 10
src/main/java/com/uas/platform/b2c/common/account/v2/service/impl/UserServiceImpl.java

@@ -9,10 +9,9 @@ import com.uas.platform.b2c.common.account.model.Role;
 import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.common.account.v2.service.UserService;
 import com.uas.platform.b2c.core.constant.IntegerConstant;
-import com.uas.platform.b2c.core.support.SystemSession;
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
-import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.sso.entity.UserView;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
@@ -34,7 +33,7 @@ public class UserServiceImpl implements UserService {
     @Autowired
     private RoleDao roleDao;
 
-    private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
+    private final Logger logger = LoggerFactory.getLogger(UserServiceImpl.class);
 
     private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-mm-dd");
 
@@ -135,9 +134,9 @@ public class UserServiceImpl implements UserService {
         List<com.uas.platform.b2c.common.account.model.User> oldUsers = userDao.findUserByUserUU(u.getUserUU());
         u = userDao.save(u);
         if (oldUsers.size() > 0) {
-            logger.log("更新用户信息", user.getMobile());
+            logger.info("更新用户信息", user.getMobile());
         } else {
-            logger.log("新增用户信息", user.getMobile());
+            logger.info("新增用户信息", user.getMobile());
         }
         return u;
     }
@@ -156,12 +155,12 @@ public class UserServiceImpl implements UserService {
                 user.removeEnterprise(enterprise);
                 if (user.getEnterprises().size() != 0) {
                     user.setEnable((short) Status.DISABLED.value());
-                    logger.log("删除用户", "禁用" + user.getUserUU(), enuu, uu);
+                    logger.info("删除用户", "禁用" + user.getUserUU(), enuu, uu);
                     userDao.save(user);
                 }
                 if (user.getEnterprises().size() == 0) {
                     userDao.delete(user);
-                    logger.log("删除用户", "删除" + user.getUserUU(), enuu, uu);
+                    logger.info("删除用户", "删除" + user.getUserUU(), enuu, uu);
                 }
             }
         }
@@ -172,11 +171,11 @@ public class UserServiceImpl implements UserService {
         User user = userDao.findOne(uu);
         Enterprise enterprise = enterpriseDao.findByUu(enuu);
         if (null == user) {
-            logger.log("绑定用户", uu + "用户不存在!");
+            logger.info("绑定用户", uu + "用户不存在!");
             return;
         }
         if (null == enterprise) {
-            logger.log("绑定用户", uu + "企业不存在!");
+            logger.info("绑定用户", uu + "企业不存在!");
             return;
         }
         if (null != type) {

+ 9 - 13
src/main/java/com/uas/platform/b2c/common/keyword/controller/KeyWordController.java

@@ -3,21 +3,16 @@ package com.uas.platform.b2c.common.keyword.controller;
 import com.uas.platform.b2c.common.keyword.model.KeyWord;
 import com.uas.platform.b2c.common.keyword.service.KeyWordService;
 import com.uas.platform.b2c.core.filter.KeyWordFilter;
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
-import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageParams;
 import com.wordnik.swagger.annotations.ApiOperation;
 import com.wordnik.swagger.annotations.ApiParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-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.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping(value = "/keyword")
@@ -26,7 +21,8 @@ public class KeyWordController {
     @Autowired
     private KeyWordService keyWordService;
 
-    private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
+    private final Logger logger = LoggerFactory.getLogger(KeyWordController.class);
+    
     /**
      * 保存关键词
      * @param keyWord
@@ -36,7 +32,7 @@ public class KeyWordController {
     public ResponseEntity<String> saveKeyWord(@RequestBody KeyWord keyWord) {
         keyWord = keyWordService.saveKeyWord(keyWord);
         KeyWordFilter.keyworsSet = keyWordService.getAllKeyWordContent();
-        logger.log("非法关键词", "保存关键词", "关键词: " + keyWord);
+        logger.info("非法关键词", "保存关键词", "关键词: " + keyWord);
         return new ResponseEntity<String>(HttpStatus.OK);
     }
 
@@ -48,7 +44,7 @@ public class KeyWordController {
     @RequestMapping(value = "/getKeyWordPageInfo", method = RequestMethod.GET)
     @ApiOperation(value = "分页获取关键词", httpMethod = "GET")
     public Page<KeyWord> getKeyWordPageInfo(@ApiParam(required = true, value = "分页参数") PageParams pageInfo,String keyword) {
-        logger.log("非法关键词", "分页获取关键词", "分页获取关键词 ");
+        logger.info("非法关键词", "分页获取关键词", "分页获取关键词 ");
         return keyWordService.getKeyWordPageInfo(pageInfo,keyword);
     }
 
@@ -60,7 +56,7 @@ public class KeyWordController {
     @RequestMapping(value = "/getOneKeyWord/{id}", method = RequestMethod.GET)
     @ResponseBody
     public KeyWord getOneKeyWord(@PathVariable("id") Long id) {
-        logger.log("非法关键词", "根据id获取关键词", "关键词id:"+id);
+        logger.info("非法关键词", "根据id获取关键词", "关键词id:"+id);
         return keyWordService.getOneKeyWord(id);
     }
 
@@ -73,7 +69,7 @@ public class KeyWordController {
     public ResponseEntity<String> deleteKeyWord(@PathVariable("id") Long id) {
         keyWordService.deleteKeyWord(id);
         KeyWordFilter.keyworsSet = keyWordService.getAllKeyWordContent();
-        logger.log("非法关键词", "根据id删除关键词", "关键词id:"+id);
+        logger.info("非法关键词", "根据id删除关键词", "关键词id:"+id);
         return new ResponseEntity<String>(HttpStatus.OK);
     }
 

+ 6 - 6
src/main/java/com/uas/platform/b2c/common/message/controller/MessageInfoController.java

@@ -2,10 +2,10 @@ package com.uas.platform.b2c.common.message.controller;
 
 import com.uas.platform.b2c.common.message.model.MessageInfo;
 import com.uas.platform.b2c.common.message.service.MessageInfoService;
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.trade.deprecated.facade.MessageInfoFacade;
 import com.uas.platform.b2c.trade.support.ResultMap;
-import com.uas.platform.core.logging.BufferedLoggerManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -26,7 +26,7 @@ public class MessageInfoController {
 
     private final MessageInfoFacade messageInfoFacade;
 
-    private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
+    private final Logger logger = LoggerFactory.getLogger(MessageInfoController.class);
 
     @Autowired
     public MessageInfoController(MessageInfoService messageInfoService, MessageInfoFacade messageInfoFacade) {
@@ -41,7 +41,7 @@ public class MessageInfoController {
      */
     @RequestMapping(method = RequestMethod.POST)
     public MessageInfo saveMessageInfo(MessageInfo messageInfo) {
-        logger.log("信息管理", "保存信息");
+        logger.info("信息管理", "保存信息");
         return messageInfoService.save(messageInfo);
     }
 
@@ -52,7 +52,7 @@ public class MessageInfoController {
      */
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     public MessageInfo getMessageInfoById(@PathVariable("id") Long id) {
-        logger.log("信息管理", "获取信息管理");
+        logger.info("信息管理", "获取信息管理");
         return messageInfoService.getMessageInfoById(id);
     }
 
@@ -64,7 +64,7 @@ public class MessageInfoController {
      */
     @RequestMapping(value = "/order/{id}", method = RequestMethod.POST)
     public ResultMap saveBuyerMessage(@PathVariable("id") Long id) {
-        logger.log("信息管理", "生成买家提醒卖家发货的信息");
+        logger.info("信息管理", "生成买家提醒卖家发货的信息");
         return messageInfoFacade.saveOrderMessageInfo(id);
     }
 }

+ 8 - 7
src/main/java/com/uas/platform/b2c/fa/factoring/api/LoanApplyController.java

@@ -1,18 +1,17 @@
 package com.uas.platform.b2c.fa.factoring.api;
 
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.core.utils.FastjsonUtils;
 import com.uas.platform.b2c.fa.factoring.model.LoanApply;
 import com.uas.platform.b2c.fa.factoring.service.LoanApplyService;
-import com.uas.platform.b2c.prod.product.brand.modal.Brand;
-import com.uas.platform.b2c.prod.product.brand.modal.BrandSubmit;
-import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageParams;
-import com.uas.platform.core.model.ServiceCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.*;
+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.RestController;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * 贷款申请Controller
@@ -26,6 +25,8 @@ public class LoanApplyController {
     @Autowired
     private LoanApplyService loanApplyService;
 
+    private final Logger logger = LoggerFactory.getLogger(LoanApplyController.class);
+
     /**
      * 分页获取数据
      * @param page

+ 20 - 25
src/main/java/com/uas/platform/b2c/fa/payment/controller/BankInfoController.java

@@ -6,25 +6,20 @@ import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.common.base.model.FileUpload;
 import com.uas.platform.b2c.core.config.SysConf;
 import com.uas.platform.b2c.core.support.SystemSession;
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.core.utils.FastjsonUtils;
 import com.uas.platform.b2c.fa.payment.model.BankInfo;
 import com.uas.platform.b2c.fa.payment.service.BankInfoService;
 import com.uas.platform.b2c.trade.support.ResultMap;
-import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.model.Type;
 import com.wordnik.swagger.annotations.ApiOperation;
 import com.wordnik.swagger.annotations.ApiParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
-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.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 import java.util.Set;
@@ -50,8 +45,8 @@ public class BankInfoController {
 	 */
 	@Autowired
 	SysConf sysConf;
-	
-	private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
+
+    private final Logger logger = LoggerFactory.getLogger(BankInfoController.class);
 
 
 	/**
@@ -62,7 +57,7 @@ public class BankInfoController {
 	@RequestMapping(value="/buy/personal", method=RequestMethod.GET, params = "type=buyer")
 	@ApiOperation(value = "获取买家个人银行账户", httpMethod = "GET")
 	public Page<BankInfo> getPersonalBank(PageParams params) {
-		logger.log("银行账户信息", "获取个人银行账户信息");
+		logger.info("银行账户信息", "获取个人银行账户信息");
 		return bankInfoService.getPersonBankInfo(params, Type.BUYER.value());
 	}
 
@@ -74,7 +69,7 @@ public class BankInfoController {
 	@RequestMapping(value="/buy/enterprise", method=RequestMethod.GET, params = {"status=104","type=buyer"})
 	@ApiOperation(value = "获取买家企业银行账户", httpMethod = "GET")
 	public List<BankInfo> getBuyerEnterprise() {
-		logger.log("银行账户信息", "获取企业银行账户信息");
+		logger.info("银行账户信息", "获取企业银行账户信息");
 		return bankInfoService.getEnterpriseBankInfoContainsStatus(Type.BUYER.value(), Status.ALLOW.value());
 	}
 
@@ -88,7 +83,7 @@ public class BankInfoController {
 	@RequestMapping(value="/delete/{id}", method=RequestMethod.DELETE)
 	@ApiOperation(value = "删除指定的银行账户", httpMethod = "DELETE")
 	public String deleteBankInfo(@ApiParam(required = true, value = "删除的id") @PathVariable("id") Long id) {
-		logger.log("银行账户信息", "删除银行账号信息", "删除人:"+ SystemSession.getUser().getUserUU() +"-" + SystemSession.getUser().getUserName()+ "删除信息id" + id);
+		logger.info("银行账户信息", "删除银行账号信息", "删除人:"+ SystemSession.getUser().getUserUU() +"-" + SystemSession.getUser().getUserName()+ "删除信息id" + id);
 		bankInfoService.delete(id);
 		return "success";
 	}
@@ -104,7 +99,7 @@ public class BankInfoController {
 	@RequestMapping(value="/sale/enterprise", method=RequestMethod.GET, params = {"type=sup", "status=104"})
 	@ApiOperation(value = "获取供应商审核通过的信息", httpMethod = "GET")
 	public List<BankInfo> getSaleBankInfoAudit() {
-		logger.log("银行账户信息", "获取供应商银行账户信息");
+		logger.info("银行账户信息", "获取供应商银行账户信息");
 		return bankInfoService.getEnterpriseBankInfoContainsStatus(Type.SUP.value(), Status.ALLOW.value());
 	}
 
@@ -118,7 +113,7 @@ public class BankInfoController {
 	@RequestMapping(value="/sale/enterprise/{enuu}", method=RequestMethod.GET, params = {"type=sup", "status=104"})
 	@ApiOperation(value = "获取供应商审核通过的信息", httpMethod = "GET")
 	public List<BankInfo> getSaleBankInfoAudit(@PathVariable("enuu") Long enuu) {
-		logger.log("银行账户信息", "获取供应商银行账户信息");
+		logger.info("银行账户信息", "获取供应商银行账户信息");
 		return bankInfoService.getEnterpriseBankInfoContainsStatus(Type.SUP.value(), Status.ALLOW.value(), enuu);
 	}
 
@@ -132,7 +127,7 @@ public class BankInfoController {
 	@RequestMapping(value="/sale/enterprise", method=RequestMethod.GET, params = "type=sup")
 	@ApiOperation(value = "获取供应商账户信息", httpMethod = "GET")
 	public Page<BankInfo> getSaleBankInfo(PageParams params) {
-		logger.log("银行账户信息", "获取供应商银行账户信息");
+		logger.info("银行账户信息", "获取供应商银行账户信息");
 		return bankInfoService.getSupBankInfo(params, Type.SUP.value());
 	}
 
@@ -146,7 +141,7 @@ public class BankInfoController {
 	@ResponseBody
 	@ApiOperation(value = "保存新增个人银行账户", httpMethod = "POST")
 	public BankInfo savePersonalBank(@ApiParam(required = true, value = "保存的银行账户信息") @RequestBody BankInfo bankInfo) {
-		logger.log("银行账户信息", "保存个人银行账户信息" + bankInfo.getBankname() + "-" + bankInfo.getNumber() + "-" + bankInfo.getAccountname());
+		logger.info("银行账户信息", "保存个人银行账户信息" + bankInfo.getBankname() + "-" + bankInfo.getNumber() + "-" + bankInfo.getAccountname());
 		return bankInfoService.save(bankInfo, Type.BUYER.value());
 	}
 
@@ -161,7 +156,7 @@ public class BankInfoController {
 	@ResponseBody
 	@ApiOperation(value = "保存新增卖家企业银行账户", httpMethod = "POST")
 	public BankInfo saveSupEnterpriseBank(@ApiParam(required = true, value = "银行账户json字符串") String bankInfo, @ApiParam(required = false, value = "上传附件") FileUpload uploadItem) {
-		logger.log("银行账户信息", "保存卖家企业银行账户信息 " + bankInfo);
+		logger.info("银行账户信息", "保存卖家企业银行账户信息 " + bankInfo);
 		BankInfo bank = FastjsonUtils.fromJson(bankInfo, BankInfo.class);
 		return bankInfoService.save(bank, Type.SUP.value(), uploadItem);
 	}
@@ -175,7 +170,7 @@ public class BankInfoController {
 	@RequestMapping(value="/vender/enterprise/{venduu}", method=RequestMethod.GET, params = {"status=104", "type=sup"})
 	@ApiOperation(value = "获取供应商的企业信息", httpMethod = "GET")
 	public List<BankInfo> getVenderBankInfoAudit(@ApiParam(required = true, value = "企业enuu") @PathVariable long venduu) {
-		logger.log("银行账户信息", "获取供应商"+venduu+"的银行账户信息" );
+		logger.info("银行账户信息", "获取供应商"+venduu+"的银行账户信息" );
 		return bankInfoService.getEnterpriseBankInfoContainsStatus(Type.SUP.value(), Status.ALLOW.value(), venduu);
 	}
 
@@ -187,7 +182,7 @@ public class BankInfoController {
 	@RequestMapping(value="/vender/enterprise", method=RequestMethod.GET, params = {"status=104", "type=sup"})
 	@ApiOperation(value = "获取供应商的企业信息", httpMethod = "GET")
 	public List<BankInfo> getVenderBankInfoByDefaultUUAudit() {
-		logger.log("银行账户信息", "获取供应商"+SystemSession.getUser().getEnterprise().getUu()+"的银行账户信息" );
+		logger.info("银行账户信息", "获取供应商"+SystemSession.getUser().getEnterprise().getUu()+"的银行账户信息" );
 		return bankInfoService.getEnterpriseBankInfoContainsStatus(Type.SUP.value(), Status.ALLOW.value());
 	}
 
@@ -201,7 +196,7 @@ public class BankInfoController {
 	public void setDefaultAccount(@ApiParam(required = true, value = "账户id") @PathVariable("id") Long id) {
 		User user = SystemSession.getUser();
 		Set<Role> roles = user.getRoles();
-		logger.log("银行账户信息", "设置默认账户", "将id为"+ id +"的账户信息设置成默认账户,操作人UU号是:"+ SystemSession.getUser().getUserUU());
+		logger.info("银行账户信息", "设置默认账户", "将id为"+ id +"的账户信息设置成默认账户,操作人UU号是:"+ SystemSession.getUser().getUserUU());
 		bankInfoService.setDefaultAccount(id);
 	}
 
@@ -213,7 +208,7 @@ public class BankInfoController {
 	@RequestMapping(value="/b2c/enterprise", method = RequestMethod.GET, params = {"status=104", "type=mall"})
 	@ApiOperation(value = "获取管理平台企业的银行信息", httpMethod = "GET")
 	public List<BankInfo> getAdminEnteBankInfoAudit() {
-		logger.log("银行账户信息", "获取管理平台的企业银行账户信息");
+		logger.info("银行账户信息", "获取管理平台的企业银行账户信息");
 		return bankInfoService.getEnterpriseBankInfoContainsStatus(Type.MALL.value(), Status.ALLOW.value(), sysConf.getEnUU());
 	}
 
@@ -226,7 +221,7 @@ public class BankInfoController {
 	@RequestMapping(value="/b2c/personal/save", method = RequestMethod.POST, params = "type=mall")
 	@ApiOperation(value = "保存平台的个人账户", httpMethod = "POST")
 	public void saveAdminPersonBankInfo(@ApiParam(required = true, value = "银行账户信息") @RequestBody BankInfo bankInfo) {
-		logger.log("银行账户信息", "保存平台个人账户信息", "保存银行账号为:"+ bankInfo.getNumber() +",开户人:"+ bankInfo.getAccountname() +", 操作人:"+ SystemSession.getUser().getUserUU());
+		logger.info("银行账户信息", "保存平台个人账户信息", "保存银行账号为:"+ bankInfo.getNumber() +",开户人:"+ bankInfo.getAccountname() +", 操作人:"+ SystemSession.getUser().getUserUU());
 		bankInfoService.save(bankInfo, Type.MALL.value());
 	}
 
@@ -253,7 +248,7 @@ public class BankInfoController {
 	@RequestMapping(value = "/audit/{id}", method = RequestMethod.PUT, params = "status=pass")
 	@ApiOperation(value = "管理平台审核银行账户通过", httpMethod = "GET")
 	public ResultMap auditBankInfoPass(@ApiParam(required = true, value = "账户id") @PathVariable("id") Long id) {
-		logger.log("银行账户信息", "审核银行账户为id:" + id  + "通过");
+		logger.info("银行账户信息", "审核银行账户为id:" + id  + "通过");
 		return bankInfoService.auditBankInfo(id, Status.ALLOW.value());
 	}
 
@@ -269,7 +264,7 @@ public class BankInfoController {
 	public ResultMap auditBankInfoFail(@ApiParam(required = true, value = "账户id") @PathVariable("id") Long id, @ApiParam(required = true, value = "审核结果") @RequestBody String reason) {
 		JSONObject jsonObject = FastjsonUtils.fromJson(reason, JSONObject.class);
 		ResultMap resultMap = bankInfoService.auditBankInfo(id, Status.NOTALLOW.value(), jsonObject.getString("reason"));
-		logger.log("银行账户信息", "审核银行账户为id:" + id  + "通过");
+		logger.info("银行账户信息", "审核银行账户为id:" + id  + "通过");
 		return resultMap;
 	}
 

+ 15 - 15
src/main/java/com/uas/platform/b2c/fa/payment/controller/BankTransferController.java

@@ -3,19 +3,19 @@ package com.uas.platform.b2c.fa.payment.controller;
 
 import com.uas.platform.b2c.core.config.SysConf;
 import com.uas.platform.b2c.core.support.SystemSession;
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.core.support.view.JxlsExcelView;
 import com.uas.platform.b2c.fa.payment.model.BankInfo;
 import com.uas.platform.b2c.fa.payment.model.BankTransfer;
 import com.uas.platform.b2c.fa.payment.service.BankTransferService;
 import com.uas.platform.b2c.trade.support.ResultMap;
-import com.uas.platform.core.logging.BufferedLoggerManager;
 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.persistence.criteria.PredicateUtils;
 import com.wordnik.swagger.annotations.ApiOperation;
 import com.wordnik.swagger.annotations.ApiParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;
@@ -46,8 +46,8 @@ public class BankTransferController {
 	 */
 	@Autowired
 	SysConf sysConf;
-	
-	private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
+
+    private final Logger logger = LoggerFactory.getLogger(BankTransferController.class);
 
 	/**
 	 * 2016年3月15日 下午5:16:52
@@ -61,7 +61,7 @@ public class BankTransferController {
 	@ApiOperation(value = "保存转账信息", httpMethod = "POST")
 	public String saveBankTransfer(@ApiParam(required = true, value = "转账信息对象") @RequestBody BankTransfer bankTransfer, @ApiParam(required = true, value = "订单id拼接字符串") String order) {
 		BankTransfer bankT = bankTransferService.save(bankTransfer, order);
-		logger.log("银行转账信息", "保存银行账户信息", "保存的转账流水号是:" + bankT.getBanktranssn() + ",操作人" + SystemSession.getUser().getUserUU());
+		logger.info("银行转账信息", "保存银行账户信息", "保存的转账流水号是:" + bankT.getBanktranssn() + ",操作人" + SystemSession.getUser().getUserUU());
 		return "success";
 	}
 
@@ -77,7 +77,7 @@ public class BankTransferController {
 	@ApiOperation(value = "保存转账信息,平台向供应商结算", httpMethod = "POST")
 	public String saveBankTransToVender(@ApiParam(required = true, value = "转账信息对象") @RequestBody BankTransfer bankTransfer, @ApiParam(required = true, value = "入库单id字符串") String receiptes) {
 		BankTransfer saveForVender = bankTransferService.saveForVender(bankTransfer, receiptes);
-		logger.log("银行转账信息", "保存银行账户信息", "保存的转账流水号是:"+saveForVender.getBanktranssn() + ",操作人:"+ SystemSession.getUser().getUserUU());
+		logger.info("银行转账信息", "保存银行账户信息", "保存的转账流水号是:"+saveForVender.getBanktranssn() + ",操作人:"+ SystemSession.getUser().getUserUU());
 		return receiptes;
 	}
 
@@ -92,7 +92,7 @@ public class BankTransferController {
 	@ApiOperation(value = "保存转账信息,平台向客户结算", httpMethod = "POST")
 	public String saveBankTransToReturn(@ApiParam(required = true, value = "转账信息对象") @RequestBody BankTransfer bankTransfer, @ApiParam(required = true, value = "退款单id字符串") String returnJson) {
 		bankTransferService.saveForReturn(bankTransfer, returnJson);
-		logger.log("银行转账信息", "保存转账信息,平台向客户结算");
+		logger.info("银行转账信息", "保存转账信息,平台向客户结算");
 		return returnJson;
 	}
 
@@ -109,7 +109,7 @@ public class BankTransferController {
 		PageInfo info = new PageInfo(page);
 		info.filter("payenuu", sysConf.getEnUU());
 		info.filter("payUseruu", sysConf.getAdminUU());
-		logger.log("银行转账信息", "查询历史转账信息(B2C管理者查看 与供应商的交易)");
+		logger.info("银行转账信息", "查询历史转账信息(B2C管理者查看 与供应商的交易)");
 		return bankTransferService.getHistoryBankTransfer(info, keyword);
 	}
 
@@ -124,7 +124,7 @@ public class BankTransferController {
 	@RequestMapping(value = "admins/history")
 	@ApiOperation(value = "供应商查看 有关自己的转账信息", httpMethod = "GET")
 	public Page<BankTransfer> getAdminBankTransfers(@ApiParam(required = true, value = "分页参数") PageParams page, @ApiParam(required = true, value = "搜索字符串") String keyword, @ApiParam(required = true, value = "是否是卖家") boolean isVender) {
-		logger.log("银行转账信息", "供应商查看 有关自己的转账信息");
+		logger.info("银行转账信息", "供应商查看 有关自己的转账信息");
 		PageInfo info = new PageInfo(page);
 		info.filter("payenuu", sysConf.getEnUU());
 		info.filter("payUseruu", sysConf.getAdminUU());
@@ -148,7 +148,7 @@ public class BankTransferController {
 	@RequestMapping(value = "/history")
 	@ApiOperation(value = "分页查询历史转账信息", httpMethod = "GET")
 	public Page<BankTransfer> getHistoryBankTransfer(@ApiParam(required = true, value = "分页参数") PageParams page, @ApiParam(required = true, value = "搜索字符串") String keyword) {
-		logger.log("银行转账信息", "查询历史转账信息");
+		logger.info("银行转账信息", "查询历史转账信息");
 		PageInfo info = new PageInfo(page);
 		info.filter("payUseruu", SystemSession.getUser().getUserUU());
 		info.filter("payenuu", SystemSession.getUser().getEnterprise().getUu());
@@ -168,7 +168,7 @@ public class BankTransferController {
 	@RequestMapping(value = "/fainout")
 	@ApiOperation(value = "分页获取供应商收支记录", httpMethod = "GET")
 	public Page<BankTransfer> getFaInOut(@ApiParam(required = true, value = "分页参数") PageParams page, @ApiParam(required = true, value = "搜索字符串") String keyword, @ApiParam(required = true, value = "转账状态") String state, @ApiParam(required = true, value = "开始日期") Long fromDate, @ApiParam(required = true, value = "结束日期") Long toDate) {
-		logger.log("银行转账信息", "获取供应商收支记录");
+		logger.info("银行转账信息", "获取供应商收支记录");
 			PageInfo info = new PageInfo(page);
 			if(state.equals("fain")){
 				 return bankTransferService.getFaIn(info, keyword, fromDate, toDate);
@@ -187,7 +187,7 @@ public class BankTransferController {
 	@RequestMapping(value = "findOne/{banktfid}",method=RequestMethod.GET)
 	@ApiOperation(value = "根据个人uu,查找指定的转账单", httpMethod = "GET")
 	public BankTransfer getBankTransferWithUser(@ApiParam(required = true, value = "转账流水单id") @PathVariable Long banktfid) {
-		logger.log("银行转账信息", "根据个人uu,查找指定的转账单");
+		logger.info("银行转账信息", "根据个人uu,查找指定的转账单");
 		return bankTransferService.findByIdAndCollectUseruu(banktfid);
 	}
 
@@ -201,7 +201,7 @@ public class BankTransferController {
 	@RequestMapping(value = "findByid/{banktfid}",method=RequestMethod.GET)
 	@ApiOperation(value = "根据转账流水单id查找转账单(客户)", httpMethod = "GET")
 	public BankTransfer getBankTransferByid(@ApiParam(required = true, value = "转账流水单id") @PathVariable Long banktfid) {
-		logger.log("银行转账信息", "根据转账流水单id查找转账单");
+		logger.info("银行转账信息", "根据转账流水单id查找转账单");
 		return bankTransferService.findBankTransById(banktfid);
 	}
 
@@ -214,7 +214,7 @@ public class BankTransferController {
 	@RequestMapping(value = "findByOrid/{orderid}",method=RequestMethod.GET)
 	@ApiOperation(value = "根据转orderid的流水号查找指定转账单", httpMethod = "GET")
 	public BankTransfer getBankTransferByOrid(@ApiParam(required = true, value = "订单id") @PathVariable Long orderid) {
-		logger.log("银行转账信息", "根据转账流水单号查找转账信息 id=" + orderid);
+		logger.info("银行转账信息", "根据转账流水单号查找转账信息 id=" + orderid);
 		return bankTransferService.findBankTransByOrId(orderid);
 	}
 
@@ -228,7 +228,7 @@ public class BankTransferController {
 	@ApiOperation(value = "根据订单的OrderId查询银行账户信息", httpMethod = "GET")
 	public BankInfo getBankTransferByOrderId(@ApiParam(required = true, value = "订单id") @PathVariable String orderid) {
 		assert logger != null;
-		logger.log("银行转账信息", "根据转账流水单号获取所属企业的银行账户信息 orderId=" + orderid);
+		logger.info("银行转账信息", "根据转账流水单号获取所属企业的银行账户信息 orderId=" + orderid);
 		return bankTransferService.getDefaultBankInfo(orderid);
 	}
 

+ 12 - 15
src/main/java/com/uas/platform/b2c/fa/settlement/controller/BillController.java

@@ -1,20 +1,18 @@
 package com.uas.platform.b2c.fa.settlement.controller;
 
 
-import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.common.base.model.FileUpload;
 import com.uas.platform.b2c.core.config.SysConf;
-import com.uas.platform.b2c.fa.settlement.model.Bill;
-import com.uas.platform.b2c.fa.settlement.service.BillService;
 import com.uas.platform.b2c.core.support.SystemSession;
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.core.utils.FastjsonUtils;
-import com.uas.platform.core.logging.BufferedLoggerManager;
+import com.uas.platform.b2c.fa.settlement.model.Bill;
+import com.uas.platform.b2c.fa.settlement.service.BillService;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
-import com.uas.platform.core.model.Type;
 import com.wordnik.swagger.annotations.ApiOperation;
 import com.wordnik.swagger.annotations.ApiParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -43,9 +41,8 @@ public class BillController {
 	 */
 	@Autowired
 	SysConf sysConf;
-	
-	private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
 
+    private final Logger logger = LoggerFactory.getLogger(BillController.class);
 	/**
 	 * 分页查找发票信息
 	 *
@@ -58,7 +55,7 @@ public class BillController {
 	public Page<Bill> findBills(@ApiParam(required = true, value = "分页参数") PageParams params, @ApiParam(required = true, value = "搜索字符串") String keyword) {
 		PageInfo info = new PageInfo(params);
 		Page<Bill> page = billService.findBills(info, keyword);
-		logger.log("发票管理", "查找包含关键字的发票信息");
+		logger.info("发票管理", "查找包含关键字的发票信息");
 		return page;
 	}
 
@@ -74,7 +71,7 @@ public class BillController {
 	public Bill saveBill(@ApiParam(required = true, value = "发票信息json") String bill, @ApiParam(required = true, value = "上传的附件") FileUpload uploadItem) {
 		Bill b = FastjsonUtils.fromJson(bill, Bill.class);
 		Bill bi = billService.save(b, uploadItem, null, null);
-		logger.log("发票管理", "保存发票资料","保存发票的资料信息,发票的id" + bi.getId() + ",发票开头:" + bi.getHead()+ "发票类型:" + bi.getKind()+ ",操作人:" + SystemSession.getUser().getUserUU());
+		logger.info("发票管理", "保存发票资料","保存发票的资料信息,发票的id" + bi.getId() + ",发票开头:" + bi.getHead()+ "发票类型:" + bi.getKind()+ ",操作人:" + SystemSession.getUser().getUserUU());
 		return bi;
 	}
 
@@ -92,7 +89,7 @@ public class BillController {
 		Long useruu = sysConf.getAdminUU();
 		Long enuu = sysConf.getEnUU();
 		Bill bi = billService.save(b, uploadItem, useruu, enuu);
-		logger.log("发票管理", "保存信息", "保存管理平台的开票资料,发票抬头" + b.getHead() + ", ");
+		logger.info("发票管理", "保存信息", "保存管理平台的开票资料,发票抬头" + b.getHead() + ", ");
 		return bi;
 	}
 
@@ -104,7 +101,7 @@ public class BillController {
 	@RequestMapping(value = "/list", method = RequestMethod.GET)
 	@ApiOperation(value = "根据当前登录信息,获取个人当前登录企业的发票列表", httpMethod = "GET")
 	public List<Bill> getBills() {
-		logger.log("发票管理", "当前登录企业的发票列表");
+		logger.info("发票管理", "当前登录企业的发票列表");
 		return billService.getBills();
 	}
 
@@ -116,7 +113,7 @@ public class BillController {
 	@RequestMapping(value = "/list/admin", method = RequestMethod.GET)
 	@ApiOperation(value = "获取管理平台的发票资料信息", httpMethod = "GET")
 	public List<Bill> getAdminBills() {
-		logger.log("发票管理", "获取管理平台的发票资料信息");
+		logger.info("发票管理", "获取管理平台的发票资料信息");
 		return billService.getAdminBills();
 	}
 
@@ -129,7 +126,7 @@ public class BillController {
 	@RequestMapping(value = "/{id}", method = RequestMethod.GET)
 	@ApiOperation(value = "根据id 查找发票信息", httpMethod = "GET")
 	public Bill getBill(@ApiParam(required = true, value = "发票id") @PathVariable("id") Long id) {
-		logger.log("发票管理", "根据指定的" + id+ "查找发票资料");
+		logger.info("发票管理", "根据指定的" + id+ "查找发票资料");
 		return billService.getBillById(id);
 	}
 
@@ -141,7 +138,7 @@ public class BillController {
 	@RequestMapping(value = "/delete/{id}", method = RequestMethod.DELETE)
 	@ApiOperation(value = "根据id 删除发票信息", httpMethod = "DELETE")
 	public void deleteBill(@ApiParam(required = true, value = "发票id") @PathVariable("id") Long id) {
-		logger.log("发票管理", "删除指定id" + id + "操作者是:" + SystemSession.getUser().getUserUU());
+		logger.info("发票管理", "删除指定id" + id + "操作者是:" + SystemSession.getUser().getUserUU());
 		billService.deleteById(id);
 	}
 

+ 7 - 6
src/main/java/com/uas/platform/b2c/fa/settlement/controller/BillSubmitController.java

@@ -2,12 +2,12 @@ package com.uas.platform.b2c.fa.settlement.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2c.core.constant.SplitChar;
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.fa.settlement.model.BillSubmit;
 import com.uas.platform.b2c.fa.settlement.service.BillSubmitService;
-import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;
@@ -25,7 +25,8 @@ public class BillSubmitController {
 
     private final BillSubmitService billSubmitService;
 
-    private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
+    private final Logger logger = LoggerFactory.getLogger(BillSubmitController.class);
+
 
     @Autowired
     public BillSubmitController (BillSubmitService billSubmitService) {
@@ -42,7 +43,7 @@ public class BillSubmitController {
         String orderids = jsonObject.get("orderids").toString();
         Long invoiceid = Long.valueOf(jsonObject.get("invoiceid").toString());
         String[] orderidList = orderids.split(SplitChar.COMMA);
-        logger.log("发票申请", "保存发票申请信息");
+        logger.info("发票申请", "保存发票申请信息");
         return billSubmitService.save(orderidList, invoiceid);
     }
 
@@ -56,7 +57,7 @@ public class BillSubmitController {
     @RequestMapping(method = RequestMethod.GET)
     public Page<BillSubmit> getBillSubmits(PageParams params, String keyword, String invoicetype , String status, String role) {
         PageInfo pageInfo = new PageInfo(params);
-        logger.log("发票申请", "查找包含关键字的发票申请信息");
+        logger.info("发票申请", "查找包含关键字的发票申请信息");
         return billSubmitService.getAll(pageInfo, keyword, invoicetype, status, role);
     }
 
@@ -67,7 +68,7 @@ public class BillSubmitController {
      */
     @RequestMapping(value = "/{ids}", method = RequestMethod.PUT)
     public List<BillSubmit> auditBillSubmit(@PathVariable("ids") String ids) {
-        logger.log("发票申请", "审核发票申请");
+        logger.info("发票申请", "审核发票申请");
         return billSubmitService.auditBillSubmit(ids);
     };
 }

+ 11 - 11
src/main/java/com/uas/platform/b2c/fa/settlement/controller/RefundController.java

@@ -1,15 +1,15 @@
 package com.uas.platform.b2c.fa.settlement.controller;
 
-import com.uas.platform.b2c.fa.payment.model.BankTransfer;
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.core.utils.StringUtilB2C;
+import com.uas.platform.b2c.fa.payment.model.BankTransfer;
 import com.uas.platform.b2c.fa.settlement.model.Refund;
 import com.uas.platform.b2c.fa.settlement.service.RefundService;
-import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import com.wordnik.swagger.annotations.ApiOperation;
 import com.wordnik.swagger.annotations.ApiParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -31,8 +31,8 @@ public class RefundController {
 
 	@Autowired
 	private RefundService refundService;
-	
-	private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
+
+    private final Logger logger = LoggerFactory.getLogger(RefundController.class);
 
     /**
      * 根据ID获取退款单
@@ -44,7 +44,7 @@ public class RefundController {
 	@ApiOperation(value = "根据ID获取退款单", httpMethod = "GET")
 	public Refund getRefundById(@ApiParam(required = true, value = "退款单id") @PathVariable("id") Long id) {
 		assert logger != null;
-		logger.log("退款单管理", "获取退款单信息");
+		logger.info("退款单管理", "获取退款单信息");
 		return refundService.getRefundById(id);
 	}
 
@@ -59,7 +59,7 @@ public class RefundController {
 	@ApiOperation(value = "分页获取退款单信息", httpMethod = "GET")
 	public Page<Refund> getRefundAllByB2C(@ApiParam(required = true, value = "分页参数") PageParams params, @ApiParam(required = true, value = "退款单状态") String status) {
 		assert logger != null;
-		logger.log("退款单管理", "分页获取退款单信息");
+		logger.info("退款单管理", "分页获取退款单信息");
 		PageInfo info = new PageInfo(params);
 		if(status != null) {
 			info.filter("status", status.toUpperCase());
@@ -78,7 +78,7 @@ public class RefundController {
 	@ApiOperation(value = "确认退款单,并且对退款单进行退款", httpMethod = "GET")
 	public String ensureRefund(@ApiParam(required = true, value = "request对象") HttpServletRequest request, @ApiParam(required = true, value = "退款单id") @PathVariable("reid") String reid) {
 		assert  logger != null;
-		logger.log("退款单管理", "对" + reid + "的退款单退款");
+		logger.info("退款单管理", "对" + reid + "的退款单退款");
 		return refundService.ensureRefund(reid, request);
 	}
 
@@ -93,7 +93,7 @@ public class RefundController {
 	@ApiOperation(value = "根据退款单号进行线下退款操作", httpMethod = "GET")
 	public String ensureOfflineRefund(@ApiParam(required = true, value = "退款单id") @PathVariable("reid") String reid, @ApiParam(required = true, value = "BankTransfer对象") BankTransfer transfer) {
 		assert logger != null;
-		logger.log("退款单管理", "对" + reid + "的退款单进行线下退款");
+		logger.info("退款单管理", "对" + reid + "的退款单进行线下退款");
 		return refundService.ensureOfflineRefund(reid, transfer);
 	}
 
@@ -110,7 +110,7 @@ public class RefundController {
 	@ApiOperation(value = "分页获取买家的退款单信息,并提供根据单据号进行搜索的功能", httpMethod = "GET")
 	public Page<Refund> pageOnesRefundByKeyword(@ApiParam(required = true, value = "分页参数") PageParams params, @ApiParam(required = true, value = "退款单状态") String status, @ApiParam(required = true, value = "搜索字符串") String keyword) {
 		assert logger != null;
-		logger.log("买家退款单管理", "分页获取买家退款单信息");
+		logger.info("买家退款单管理", "分页获取买家退款单信息");
 		PageInfo info = new PageInfo(params);
 		return refundService.pageOnesRefundByKeyword(info, status, keyword);
 	}
@@ -125,7 +125,7 @@ public class RefundController {
 	@ApiOperation(value = "根据买家退款单编号ID获取买家退款单信息", httpMethod = "GET")
 	public Refund getRefundByRefundId(@ApiParam(required = true, value = "退款单id") @PathVariable String refundId) {
 		assert logger != null;
-		logger.log("买家退款单管理", "根据买家退款单编号ID获取买家退款单信息");
+		logger.info("买家退款单管理", "根据买家退款单编号ID获取买家退款单信息");
 		return refundService.getRefundByRefundId(StringUtilB2C.decodeValue(refundId));
 	}
 }

+ 19 - 19
src/main/java/com/uas/platform/b2c/logistics/controller/AddressController.java

@@ -1,17 +1,16 @@
 package com.uas.platform.b2c.logistics.controller;
 
-import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.core.support.SystemSession;
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.core.utils.FastjsonUtils;
 import com.uas.platform.b2c.logistics.facade.AddressFacade;
 import com.uas.platform.b2c.logistics.model.Address;
 import com.uas.platform.b2c.logistics.service.AddressService;
-import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import com.wordnik.swagger.annotations.ApiOperation;
 import com.wordnik.swagger.annotations.ApiParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;
@@ -44,9 +43,10 @@ public class AddressController {
 		this.addressFacade = addressFacade;
 	}
 
-	private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
+    private final Logger logger = LoggerFactory.getLogger(AddressController.class);
 
-	/**
+
+    /**
 	 * 用户保存收/发货地址
 	 *
 	 * @param isSetTop   the isSetTop 是否置顶
@@ -59,7 +59,7 @@ public class AddressController {
 	@ApiOperation(value = "用户保存收/发货地址", httpMethod = "POST")
 	public Address saveShippingAdd(@ApiParam(required = true, value = "是否置顶") Boolean isSetTop, @ApiParam(required = true, value = "address的json字符串") @RequestBody String json, @ApiParam(required = true, value = "是否为发货地址,是-发货") Boolean send, @ApiParam(required = true, value = "是否是个人") Boolean isPersonal) {
 		Address address = FastjsonUtils.fromJson(json, Address.class);
-		logger.log("地址管理", "保存地址信息");
+		logger.info("地址管理", "保存地址信息");
 		return addressService.saveShippingAddress(address, isSetTop, send, isPersonal);
 	}
 
@@ -80,7 +80,7 @@ public class AddressController {
 		} else {
 			address.setTypeSending();
 		}
-		logger.log("地址管理", "平台保存地址信息");
+		logger.info("地址管理", "平台保存地址信息");
 		return addressService.saveAddressB2c(address, isSetTop);
 	}
 
@@ -93,7 +93,7 @@ public class AddressController {
 	@RequestMapping(value = "/shipping", method = RequestMethod.GET)
 	@ApiOperation(value = "查询当前用户的收/发货地址", httpMethod = "GET")
 	public List<Address> findOnesShippingAdd(@ApiParam(required = true, value = "是否为发货地址,是-发货") Boolean send) {
-		logger.log("地址管理", "获取地址信息", "获取 " + SystemSession.getUser().getUserName() + "的地址信息", SystemSession.getUser().getUserUU().toString(), SystemSession.getUser().getUserUU());
+		logger.info("地址管理", "获取地址信息", "获取 " + SystemSession.getUser().getUserName() + "的地址信息", SystemSession.getUser().getUserUU().toString(), SystemSession.getUser().getUserUU());
 		return addressService.findOnesShipingAdd(send);
 	}
 
@@ -106,7 +106,7 @@ public class AddressController {
 	@RequestMapping(value = "/settop/{addid}", method = RequestMethod.PUT)
 	@ApiOperation(value = "将某个地址置顶", httpMethod = "PUT")
 	public void setTop(@ApiParam(required = true, value = "要置顶的id") @PathVariable Long addid) {
-		logger.log("地址管理", "置顶地址", "将id为 " + addid + " 的地址置顶", addid.toString(), addid);
+		logger.info("地址管理", "置顶地址", "将id为 " + addid + " 的地址置顶", addid.toString(), addid);
 		addressService.setTop(addid, true);
 	}
 
@@ -119,7 +119,7 @@ public class AddressController {
 	@RequestMapping(value = "/delete/{addid}", method = RequestMethod.PUT)
 	@ApiOperation(value = "将某个地址删除", httpMethod = "PUT")
 	public void delete(@ApiParam(required = true, value = "要删除的id") @PathVariable Long addid) {
-		logger.log("地址管理", "删除地址", "将id为 " + addid + " 的地址删除", addid.toString(), addid);
+		logger.info("地址管理", "删除地址", "将id为 " + addid + " 的地址删除", addid.toString(), addid);
 		addressService.delete(addid);
 	}
 
@@ -132,7 +132,7 @@ public class AddressController {
 	@RequestMapping(value = "/shipping/enterprise", method = RequestMethod.GET)
 	@ApiOperation(value = "返回企业的收发货默认地址,这里不是b2c", httpMethod = "GET")
 	public List<Address> findEnShippingAdd(@ApiParam(required = true, value = "是否为发货地址,是-发货") boolean ship) {
-		logger.log("地址管理", "查询默认地址", "查询企业默认地址");
+		logger.info("地址管理", "查询默认地址", "查询企业默认地址");
 		return addressService.findDefaultEnterpriseAddress(ship);
 	}
 
@@ -146,7 +146,7 @@ public class AddressController {
 	@RequestMapping(value = "/enterprise", method = RequestMethod.GET)
 	@ApiOperation(value = "返回企业的收发货地址", httpMethod = "GET")
 	public List<Address> findEnAddress(@ApiParam(required = true, value = "是否为发货地址,是-发货") boolean ship) {
-		logger.log("地址管理", "查询默认地址", "查询平台的默认地址");
+		logger.info("地址管理", "查询默认地址", "查询平台的默认地址");
 		return addressService.findEnShippingAdd(ship);
 	}
 
@@ -159,7 +159,7 @@ public class AddressController {
 	@RequestMapping(value = "/findb2c/b2c", method = RequestMethod.GET)
 	@ApiOperation(value = "查询平台企业的发、收货地址", httpMethod = "GET")
 	public List<Address> findB2cAdd(@ApiParam(required = true, value = "是否为发货地址,是-发货") boolean send) {
-		logger.log("地址管理", "查询平台的地址");
+		logger.info("地址管理", "查询平台的地址");
 		return addressService.findB2cAdd(send);
 	}
 
@@ -172,7 +172,7 @@ public class AddressController {
 	@RequestMapping(value = "/enterprise/address", method = RequestMethod.GET)
 	@ApiOperation(value = "获取企业一页的地址信息", httpMethod = "GET")
 	public Page<Address> getEnterpriseAddress(@ApiParam(required = true, value = "分页参数") PageParams page) {
-		logger.log("地址管理", "获取一页的企业地址信息");
+		logger.info("地址管理", "获取一页的企业地址信息");
 		return addressService.getEnterpriseAddress(page);
 	}
 
@@ -185,7 +185,7 @@ public class AddressController {
 	@RequestMapping(value = "/enterprise/address", method = RequestMethod.GET, params = "_type=send")
 	@ApiOperation(value = "获取企业发货地址的信息", httpMethod = "GET")
 	public Page<Address> getEnterpriseSendAddress(@ApiParam(required = true, value = "分页参数") PageParams page) {
-		logger.log("地址管理", "获取一页的企业发货地址信息");
+		logger.info("地址管理", "获取一页的企业发货地址信息");
 		return addressService.getEnterpriseReceiveAddress(page, Boolean.TRUE);
 	}
 
@@ -198,7 +198,7 @@ public class AddressController {
 	@RequestMapping(value = "/enterprise/address", method = RequestMethod.GET, params = "_type=ship")
 	@ApiOperation(value = "获取企业收货地址信息", httpMethod = "GET")
 	public Page<Address> getEnterpriseReceiveAddress(@ApiParam(required = true, value = "分页参数") PageParams page) {
-		logger.log("地址管理", "获取一页的企业收货地址信息");
+		logger.info("地址管理", "获取一页的企业收货地址信息");
 		return addressService.getEnterpriseReceiveAddress(page, Boolean.FALSE);
 	}
 
@@ -211,7 +211,7 @@ public class AddressController {
 	@RequestMapping(value = "/b2c", method = RequestMethod.GET, params = "_type=send")
 	@ApiOperation(value = "获取商城发货地址的信息", httpMethod = "GET")
 	public Page<Address> getB2CSendAddress(@ApiParam(required = true, value = "分页参数") PageParams page) {
-		logger.log("地址管理", "获取一页的企业发货地址信息");
+		logger.info("地址管理", "获取一页的企业发货地址信息");
 		return addressFacade.getB2CSendAddress(page);
 	}
 
@@ -224,7 +224,7 @@ public class AddressController {
 	@RequestMapping(value = "/b2c", method = RequestMethod.GET, params = "_type=ship")
 	@ApiOperation(value = "获取企业收货地址信息", httpMethod = "GET")
 	public Page<Address> getB2CShipPageAddress(@ApiParam(required = true, value = "分页参数") PageParams page) {
-		logger.log("地址管理", "获取一页的企业收货地址信息");
+		logger.info("地址管理", "获取一页的企业收货地址信息");
 		return addressFacade.getB2CShipPageAddress(page);
 	}
 
@@ -239,7 +239,7 @@ public class AddressController {
 	@ApiOperation(value = "分页获取当前用户地址信息", httpMethod = "GET")
 	public Page<Address> pageAddressOfUser(@ApiParam(required = true, value = "分页参数") PageParams params, @ApiParam(required = true, value = "是否为发货地址,是-发货") Boolean isSend) {
 		assert  logger != null;
-		logger.log("物流信息", "分页获取地址信息");
+		logger.info("物流信息", "分页获取地址信息");
 		PageInfo pageInfo = new PageInfo(params);
 		return addressService.pageAddressOfUser(pageInfo, isSend);
 	}

+ 7 - 6
src/main/java/com/uas/platform/b2c/logistics/controller/DistributionRuleController.java

@@ -1,17 +1,18 @@
 package com.uas.platform.b2c.logistics.controller;
 
 import com.alibaba.fastjson.JSONObject;
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.core.utils.FastjsonUtils;
 import com.uas.platform.b2c.logistics.model.DistributionRule;
 import com.uas.platform.b2c.logistics.model.UsableRuleInfo;
 import com.uas.platform.b2c.logistics.service.DistributionRuleService;
 import com.uas.platform.b2c.trade.support.ResultMap;
-import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageParams;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;
+
 import java.util.List;
 import java.util.Map;
 
@@ -26,9 +27,9 @@ public class DistributionRuleController {
 	@Autowired
 	private DistributionRuleService distributionRuleService;
 
-	private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
+    private final Logger logger = LoggerFactory.getLogger(DistributionRuleController.class);
 
-	/**
+    /**
 	 * 分页获取配送规则
 	 * @param params
 	 * @return
@@ -120,7 +121,7 @@ public class DistributionRuleController {
 	@RequestMapping(value = "/rule/matchArea", method = RequestMethod.GET)
 	public List<DistributionRule> ruleOfMatchArea(Integer method, String area, String uuid){
 		assert logger != null;
-		logger.log("匹配配送规则", "订单的配送方式为" + method + ", 地区为 : " + area);
+		logger.info("匹配配送规则", "订单的配送方式为" + method + ", 地区为 : " + area);
 		return distributionRuleService.ruleMatchArea(method, area, uuid);
 	}
 
@@ -131,7 +132,7 @@ public class DistributionRuleController {
 	@RequestMapping(value = "/usable/rule", method = RequestMethod.POST)
 	public Map<String, List<UsableRuleInfo>> findUsableRule(String area, @RequestBody List<JSONObject> info){
 		assert logger != null;
-		logger.log("匹配配送规则", "收货地址地区信息为"  + area);
+		logger.info("匹配配送规则", "收货地址地区信息为"  + area);
 		return distributionRuleService.findRuleMatchArea(info, area);
 	}
 

+ 13 - 12
src/main/java/com/uas/platform/b2c/logistics/controller/LogisticsOldController.java

@@ -4,11 +4,11 @@ import com.uas.platform.b2c.logistics.model.Logistics;
 import com.uas.platform.b2c.logistics.model.LogisticsCompanyCode;
 import com.uas.platform.b2c.logistics.service.LogisticsCompanyCodeService;
 import com.uas.platform.b2c.logistics.service.LogisticsOldService;
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.trade.support.ResultMap;
-import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.wordnik.swagger.annotations.ApiOperation;
 import com.wordnik.swagger.annotations.ApiParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -27,9 +27,10 @@ public class LogisticsOldController {
 	@Autowired
 	private LogisticsCompanyCodeService logisticsCompanyCodeService;
 
-	private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
+    private final Logger logger = LoggerFactory.getLogger(LogisticsOldController.class);
 
-	/**
+
+    /**
 	 * 根据快递单id获取快递信息
 	 *
 	 * @param lgtid the lgtid 快递单id
@@ -38,7 +39,7 @@ public class LogisticsOldController {
 	@RequestMapping(value = "/{lgtid}", method = RequestMethod.GET)
 	@ApiOperation(value = "根据快递单id获取快递信息", httpMethod = "GET")
 	public Logistics findLogisticsById(@ApiParam(required = true, value = "快递单号") @PathVariable Long lgtid) {
-		logger.log("快递信息管理", "获取快递信息", "根据id获取快递信息,id:" + lgtid, lgtid.toString(), lgtid);
+		logger.info("快递信息管理", "获取快递信息", "根据id获取快递信息,id:" + lgtid, lgtid.toString(), lgtid);
 		return logisticsOldService.findLogistics(lgtid);
 	}
 
@@ -50,7 +51,7 @@ public class LogisticsOldController {
 	@RequestMapping(value = "/company", method = RequestMethod.GET)
 	@ApiOperation(value = "获取全部快递公司", httpMethod = "GET")
 	public List<LogisticsCompanyCode> findCompany() {
-		logger.log("快递信息管理", "获取全部快递公司信息");
+		logger.info("快递信息管理", "获取全部快递公司信息");
 		return logisticsCompanyCodeService.getAllCodes();
 	}
 
@@ -62,7 +63,7 @@ public class LogisticsOldController {
 	@RequestMapping(value = "/companyname", method = RequestMethod.GET)
 	@ApiOperation(value = "获取全部快递公司名称", httpMethod = "GET")
 	public List<String> findCompanyName() {
-		logger.log("快递信息管理", "获取全部快递公司名称");
+		logger.info("快递信息管理", "获取全部快递公司名称");
 		return logisticsCompanyCodeService.getAllName();
 	}
 
@@ -74,7 +75,7 @@ public class LogisticsOldController {
 	@RequestMapping(value = "/companyname/actived", method = RequestMethod.GET)
 	@ApiOperation(value = "获取已激活的快递公司名称", httpMethod = "GET")
 	public List<String> findActivedCompanyName() {
-		logger.log("快递信息管理", "获取已激活快递公司名称");
+		logger.info("快递信息管理", "获取已激活快递公司名称");
 		return logisticsCompanyCodeService.getActivedName();
 	}
 
@@ -87,7 +88,7 @@ public class LogisticsOldController {
 	@RequestMapping(value = "/company/active/{id}", method = RequestMethod.PUT)
 	@ApiOperation(value = "激活/弃用快递公司", httpMethod = "PUT")
 	public LogisticsCompanyCode activeCompany(@ApiParam(required = true, value = "快递id") @PathVariable("id") Long id) {
-		logger.log("快递信息管理", "激活快递公司", "激活快递公司,id:" + id, id.toString(), id);
+		logger.info("快递信息管理", "激活快递公司", "激活快递公司,id:" + id, id.toString(), id);
 		return logisticsCompanyCodeService.active(id);
 	}
 
@@ -99,7 +100,7 @@ public class LogisticsOldController {
 	@RequestMapping(value = "/company/actived", method = RequestMethod.GET)
 	@ApiOperation(value = "获取已激活的快递公司", httpMethod = "GET")
 	public List<LogisticsCompanyCode> getActived() {
-		logger.log("快递信息管理", "获取已激活快递公司信息");
+		logger.info("快递信息管理", "获取已激活快递公司信息");
 		return logisticsCompanyCodeService.getActived();
 	}
 
@@ -114,7 +115,7 @@ public class LogisticsOldController {
 	@ResponseBody
 	@ApiOperation(value = "交换序号", httpMethod = "POST")
 	public LogisticsCompanyCode exchange(@ApiParam(required = true, value = "交换前序号") Long preId, @ApiParam(required = true, value = "交换后序号") Long postId) {
-		logger.log("快递信息管理", "快递公司排序", "快递公司 " + preId + " 和 " + postId + " 的序号交换");
+		logger.info("快递信息管理", "快递公司排序", "快递公司 " + preId + " 和 " + postId + " 的序号交换");
 		return logisticsCompanyCodeService.exchange(preId, postId);
 	}
 
@@ -129,7 +130,7 @@ public class LogisticsOldController {
 	@RequestMapping(value = "/{id}", method = RequestMethod.POST)
 	@ApiOperation(value = "更新采购出货单的物流信息", httpMethod = "POST")
 	public ResultMap updateLogistics(@ApiParam(required = true, value = "单号") @PathVariable("id") Long id, @ApiParam(required = true, value = "物流对象") @RequestBody Logistics logistics, @ApiParam(required = true, value = "出货单号") @RequestParam("invoiceFuid") String invoiceFuid) {
-		logger.log("快递信息管理", "快递公司排序", "更新物流信息 id为" + id + " 的物流信息");
+		logger.info("快递信息管理", "快递公司排序", "更新物流信息 id为" + id + " 的物流信息");
 		return logisticsOldService.updateLogistics(id, logistics, invoiceFuid);
 	}
 

+ 8 - 12
src/main/java/com/uas/platform/b2c/logistics/controller/PickUpAddressController.java

@@ -1,18 +1,14 @@
 package com.uas.platform.b2c.logistics.controller;
 
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.core.utils.FastjsonUtils;
 import com.uas.platform.b2c.logistics.model.PickUpAddress;
 import com.uas.platform.b2c.logistics.service.PickUpAddressService;
-import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.wordnik.swagger.annotations.ApiOperation;
 import com.wordnik.swagger.annotations.ApiParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-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.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -26,7 +22,7 @@ public class PickUpAddressController {
 	@Autowired
 	private PickUpAddressService pickUpAddressService;
 
-	private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
+    private final Logger logger = LoggerFactory.getLogger(PickUpAddressController.class);
 
 	/**
 	 * 获取所有自取地址
@@ -36,7 +32,7 @@ public class PickUpAddressController {
 	@RequestMapping(method = RequestMethod.GET)
 	@ApiOperation(value = "获取所有自取地址", httpMethod = "GET")
 	public List<PickUpAddress> getAll() {
-		logger.log("地址管理", "获取所有自取地址");
+		logger.info("地址管理", "获取所有自取地址");
 		return pickUpAddressService.findAll();
 	}
 
@@ -50,7 +46,7 @@ public class PickUpAddressController {
 	@ApiOperation(value = "新增/修改自取地址", httpMethod = "POST")
 	public PickUpAddress AddNewAddress(@ApiParam(required = true, value = "PickUpAddress的json字符串") @RequestBody String address) {
 		PickUpAddress pickUpAddress = FastjsonUtils.fromJson(address, PickUpAddress.class);
-		logger.log("地址管理", "新增/修改自取地址");
+		logger.info("地址管理", "新增/修改自取地址");
 		return pickUpAddressService.AddNewAddress(pickUpAddress);
 	}
 
@@ -62,7 +58,7 @@ public class PickUpAddressController {
 	@RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
 	@ApiOperation(value = "删除取货地址", httpMethod = "DELETE")
 	public void DeleteAddress(@ApiParam(required = true, value = "删除的地址id") @PathVariable Long id) {
-		logger.log("地址管理", "删除取货地址");
+		logger.info("地址管理", "删除取货地址");
 		pickUpAddressService.DeleteAddress(id);
 	}
 
@@ -75,7 +71,7 @@ public class PickUpAddressController {
 	@RequestMapping(value = "/{id}", method = RequestMethod.GET)
 	@ApiOperation(value = "根据ID获取取货地址", httpMethod = "GET")
 	public PickUpAddress findById(@ApiParam(required = true, value = "获取的地址id") @PathVariable Long id) {
-		logger.log("地址管理", "获取取货地址,id: " + id);
+		logger.info("地址管理", "获取取货地址,id: " + id);
 		return pickUpAddressService.findById(id);
 	}
 }

+ 43 - 42
src/main/java/com/uas/platform/b2c/prod/commodity/controller/GoodsController.java

@@ -3,7 +3,6 @@ package com.uas.platform.b2c.prod.commodity.controller;
 import com.uas.platform.b2c.common.base.model.FileUpload;
 import com.uas.platform.b2c.common.search.rpc.service.SearchService;
 import com.uas.platform.b2c.core.support.SystemSession;
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.core.support.view.JxlsExcelView;
 import com.uas.platform.b2c.core.utils.FastjsonUtils;
 import com.uas.platform.b2c.core.utils.StringUtilB2C;
@@ -15,13 +14,14 @@ import com.uas.platform.b2c.prod.product.component.modal.ComponentInfo;
 import com.uas.platform.b2c.prod.product.component.service.ComponentService;
 import com.uas.platform.b2c.trade.support.ResultMap;
 import com.uas.platform.core.exception.IllegalOperatorException;
-import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.model.Status;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -53,7 +53,8 @@ import java.util.Map;
 @RequestMapping("/trade/goods")
 public class GoodsController {
 
-	private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
+	private final Logger logger = LoggerFactory.getLogger(GoodsController.class);
+
 	@Autowired
 	private GoodsService goodsService;
 	@Autowired
@@ -75,7 +76,7 @@ public class GoodsController {
     @RequestMapping(method = RequestMethod.POST)
 	public Goods publish(@RequestBody Goods goods) {
 		goods = goodsService.publish(goods, "NORMAL");
-		logger.log("商品批次", "上架商品批次", "uuid:" + goods.getUuid() + ",数量:" + goods.getReserve());
+		logger.info("商品批次", "上架商品批次", "uuid:" + goods.getUuid() + ",数量:" + goods.getReserve());
 		return goods;
 	}
 
@@ -98,7 +99,7 @@ public class GoodsController {
 			info.filter("status", Status.UNAVAILABLE.value());
 		}
 		Page<Goods> page = goodsService.findPageByStatus(info, keyword);
-		logger.log("商品批次", "分页查看所属企业的在售商品批次", "状态:" + status);
+		logger.info("商品批次", "分页查看所属企业的在售商品批次", "状态:" + status);
 		return page;
 	}
 
@@ -119,7 +120,7 @@ public class GoodsController {
 			info.filter("status", Status.UNAVAILABLE.value());
 		}
 		Page<Goods> page = goodsService.findPageByStatus(info, keyword);
-		logger.log("商品批次", "管理员分页查看在售商品批次", "状态:" + status);
+		logger.info("商品批次", "管理员分页查看在售商品批次", "状态:" + status);
 		return page;
 	}
 
@@ -137,7 +138,7 @@ public class GoodsController {
 		info.filter("enUU", enUU);
 		info.filter("status", Status.REMOVED.value());
 		Page<GoodsHistory> page = goodsHistoryService.findPageByStatus(info, keyword);
-		logger.log("商品批次", "分页查看所属企业已下架的商品批次");
+		logger.info("商品批次", "分页查看所属企业已下架的商品批次");
 		return page;
 	}
 
@@ -154,7 +155,7 @@ public class GoodsController {
 		Long enUU = SystemSession.getUser().getEnterprise().getUu();
 		info.filter("enUU", enUU);
 		Page<GoodsHistory> page = goodsHistoryService.findPageUpAndDown(info, keyword);
-		logger.log("商品批次", "分页查看所属企业上架/下架的商品批次");
+		logger.info("商品批次", "分页查看所属企业上架/下架的商品批次");
 		return page;
 	}
 
@@ -171,7 +172,7 @@ public class GoodsController {
 		PageInfo info = new PageInfo(params);
 		info.filter("status", Status.REMOVED.value());
 		Page<GoodsHistory> page = goodsHistoryService.findPageByStatus(info, keyword);
-		logger.log("商品批次", "管理员分页查看所有已下架的商品批次");
+		logger.info("商品批次", "管理员分页查看所有已下架的商品批次");
 		return page;
 	}
 
@@ -184,7 +185,7 @@ public class GoodsController {
     @RequestMapping(value = "/byUuid/{uuid}", method = RequestMethod.GET)
 	public List<Goods> findAllByUuid(@PathVariable("uuid") String uuid) {
 		List<Goods> goodses = goodsService.findGoodsByUuid(uuid);
-		logger.log("商品批次", "根据商品uuid获取商品所有批次", "uuid: " + uuid);
+		logger.info("商品批次", "根据商品uuid获取商品所有批次", "uuid: " + uuid);
 		return goodses;
 	}
 
@@ -197,7 +198,7 @@ public class GoodsController {
     @RequestMapping(value = "/simple/byUuid/{uuid}", method = RequestMethod.GET)
 	public List<GoodsSimple> findSimpleAllByUuid(@PathVariable("uuid") String uuid) {
 		List<GoodsSimple> goodses = goodsService.findGoodsSimpleByUuid(uuid);
-		logger.log("商品批次", "根据商品uuid获取商品批次", "uuid: " + uuid);
+		logger.info("商品批次", "根据商品uuid获取商品批次", "uuid: " + uuid);
 		return goodses;
 	}
 
@@ -213,10 +214,10 @@ public class GoodsController {
 	public List<GoodsSimple> findSimpleAvailableByUuid(String uuid, String currencyName) {
 		// 不进行币别筛选
 		if (StringUtils.isEmpty(currencyName) || "without".equals(currencyName)) {
-			logger.log("商品批次", "根据商品uuid获取有效的商品批次", "uuid: " + uuid);
+			logger.info("商品批次", "根据商品uuid获取有效的商品批次", "uuid: " + uuid);
 			return goodsService.findSimpleAvailableByUuid(uuid);
 		} else {
-			logger.log("商品批次", "根据商品uuid和币别获取有效的商品批次", "uuid: " + uuid + "  币别: " + currencyName);
+			logger.info("商品批次", "根据商品uuid和币别获取有效的商品批次", "uuid: " + uuid + "  币别: " + currencyName);
 			return goodsService.findSimpleAvailableByUuidAndCurrency(uuid, currencyName);
 		}
 	}
@@ -233,7 +234,7 @@ public class GoodsController {
 		List<ComponentInfo> components = componentService.findInfoByUuids(uuids);
 		modelAndView.addObject("components", components);
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/trade/publishByBatch", "UU电子商城批量发布商品"));
-		logger.log("商品批次", "下载批量上架商品的Excel模板");
+		logger.info("商品批次", "下载批量上架商品的Excel模板");
 		return modelAndView;
 	}
 
@@ -245,7 +246,7 @@ public class GoodsController {
     @RequestMapping(value = "/batchdown", method = RequestMethod.DELETE)
 	public void batchdown(String batchCodes) {
 		goodsService.batchDown(batchCodes);
-		logger.log("商品批次", "下架对应的批次" + batchCodes + ",操作者是:" + SystemSession.getUser().getUserUU() + "-" + SystemSession.getUser().getUserName());
+		logger.info("商品批次", "下架对应的批次" + batchCodes + ",操作者是:" + SystemSession.getUser().getUserUU() + "-" + SystemSession.getUser().getUserName());
 	}
 
     /**
@@ -274,7 +275,7 @@ public class GoodsController {
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
-		logger.log("商品批次", "导入Excel批量上传商品");
+		logger.info("商品批次", "导入Excel批量上传商品");
 		return map;
 	}
 
@@ -287,7 +288,7 @@ public class GoodsController {
      */
     @RequestMapping(method = RequestMethod.PUT)
 	public ResultMap updateGoods(@RequestBody Goods goods, Boolean updateStatus) {
-		logger.log("商品批次", "更新已上架商品信息");
+		logger.info("商品批次", "更新已上架商品信息");
 		return goodsService.updateGoods(goods);
 	}
 
@@ -297,7 +298,7 @@ public class GoodsController {
 	 */
 	@RequestMapping(value = "/putOn/{id}", method = RequestMethod.PUT)
 	public ResultMap putOn(@PathVariable("id") Long id) {
-		logger.log("商品上架", "将保存的信息做上架处理");
+		logger.info("商品上架", "将保存的信息做上架处理");
 		return goodsService.putOn(id);
 	}
 
@@ -307,7 +308,7 @@ public class GoodsController {
 	 */
 	@RequestMapping(value = "/addGoods", method = RequestMethod.POST)
 	public ResultMap addGoods(@RequestBody Goods goods) {
-		logger.log("商品上架", "添加产品信息,不做上架动作");
+		logger.info("商品上架", "添加产品信息,不做上架动作");
 		return goodsService.addGoods(goods);
 	}
 
@@ -319,7 +320,7 @@ public class GoodsController {
     @RequestMapping(value = "/batchdownAll", method = RequestMethod.DELETE)
 	public void batchDown() {
 		goodsService.batchDownAll();
-		logger.log("商品批次", "下架所有已失效产品");
+		logger.info("商品批次", "下架所有已失效产品");
 	}
 
     /**
@@ -333,7 +334,7 @@ public class GoodsController {
 		batchCode = StringUtilB2C.decodeValue(batchCode);
 		Goods goods = goodsService.findGoodsByBatchCode(batchCode);
 		goodsService.addVisitCount(batchCode);
-		logger.log("商品批次", "根据批次号获取商品信息", "批次号:" + batchCode);
+		logger.info("商品批次", "根据批次号获取商品信息", "批次号:" + batchCode);
 		return goods;
 	}
 
@@ -346,7 +347,7 @@ public class GoodsController {
     @RequestMapping(value = "/{id}/issample", method = RequestMethod.GET)
 	public Goods isSample(@PathVariable Long id) {
 		Goods goods = goodsService.isSample(id);
-		logger.log("商品批次", "判断商品是否被送样", "id:" + id);
+		logger.info("商品批次", "判断商品是否被送样", "id:" + id);
 		return goods;
 	}
 
@@ -359,7 +360,7 @@ public class GoodsController {
     @RequestMapping(value = "/refresh/{id}", method = RequestMethod.GET)
 	public Goods refresh(@PathVariable Long id) {
 		Goods goods = goodsService.refresh(id);
-		logger.log("商品批次", "刷新商品批次有效期", "id:" + id);
+		logger.info("商品批次", "刷新商品批次有效期", "id:" + id);
 		return goods;
 	}
 
@@ -371,7 +372,7 @@ public class GoodsController {
     @RequestMapping(value = "/overtime", method = RequestMethod.GET)
 	public List<Goods> getOvertime() {
 		List<Goods> goodses = goodsService.findOvertime();
-		logger.log("商品批次", "获取即将失效的商品批次");
+		logger.info("商品批次", "获取即将失效的商品批次");
 		return goodses;
 	}
 
@@ -419,7 +420,7 @@ public class GoodsController {
 	public Page<GoodsHistory> findGoodsHistoryWithVendor(PageParams params, String batchCode) {
 		PageInfo info = new PageInfo(params);
 		Page<GoodsHistory> page = goodsHistoryService.findPageByBatchCodeWithVendor(info, batchCode);
-		logger.log("商品批次", "分页查看所属企业已下架的商品批次");
+		logger.info("商品批次", "分页查看所属企业已下架的商品批次");
 		return page;
 	}
 
@@ -446,7 +447,7 @@ public class GoodsController {
     @RequestMapping(value = "/store/status", method = RequestMethod.GET)
 	public Page<Goods> getGoodsByPageAndStatus(@RequestParam String status, @RequestParam String keyword, PageParams params, @RequestParam(required = false) Boolean isSelfSupport) {
 		assert logger != null;
-		logger.log("货品管理", "分页获取当前企业的商品信息");
+		logger.info("货品管理", "分页获取当前企业的商品信息");
 		PageInfo pageInfo = new PageInfo(params);
 		return goodsService.getGoodsByPageAndStatus(status, keyword, pageInfo, isSelfSupport);
 	}
@@ -460,7 +461,7 @@ public class GoodsController {
     @RequestMapping(value = "/{batchCode}/putOnOnce", method = RequestMethod.PUT)
 	public ResultMap putOnCommodityOnce(@PathVariable("batchCode") String batchCode) {
 		assert logger != null;
-		logger.log("货品管理", "重新上架已下架商品");
+		logger.info("货品管理", "重新上架已下架商品");
 		return goodsService.putOnCommodityOnce(batchCode);
 	}
 
@@ -474,7 +475,7 @@ public class GoodsController {
     @RequestMapping(value = "/provider/off/shelf", method = RequestMethod.PUT)
 	public ResultMap offShelfGoodsByProvider(String batchCodes, String downMsg) {
 		assert logger != null;
-		logger.log("货品管理", "下架上架商品");
+		logger.info("货品管理", "下架上架商品");
 		return goodsService.offShelfGoodsByProvider(batchCodes, downMsg, false);
 	}
 
@@ -488,7 +489,7 @@ public class GoodsController {
 	@RequestMapping(value = "/hot/random", method = RequestMethod.GET)
 	public Page<Goods> randomGetHotCommodity(@PageableDefault(page = 1, size = 4, sort = "reserve", direction = Sort.Direction.DESC) Pageable pageable) {
 		assert  logger != null;
-		logger.log("热卖推荐", "随机生成热卖商品");
+		logger.info("热卖推荐", "随机生成热卖商品");
 		return  goodsService.randomGetHotCommodity(pageable);
 	}
 
@@ -501,7 +502,7 @@ public class GoodsController {
     @RequestMapping(value = "/storeid/{storeUuid}/counts", method = RequestMethod.GET)
 	public Map<String, Long> findCommodityAndKindNumberByStore(@PathVariable String storeUuid) {
 		assert logger != null;
-		logger.log("今日新店", "获取新店的商品数量和品牌数量");
+		logger.info("今日新店", "获取新店的商品数量和品牌数量");
 		return goodsService.findCommodityAndKindNumberByStore(storeUuid);
 	}
 
@@ -512,7 +513,7 @@ public class GoodsController {
      */
     @RequestMapping(value = "/increaseBatchCount", method = RequestMethod.GET)
 	public List<Map<String, Object>> findCountIncreaseBatchByMonth() {
-		logger.log("新增产品统计", "获取各月新增批次数量");
+		logger.info("新增产品统计", "获取各月新增批次数量");
 		return goodsService.findCountIncreaseBatchByMonth();
 	}
 
@@ -523,7 +524,7 @@ public class GoodsController {
      */
     @RequestMapping(value = "/increaseCmpCount", method = RequestMethod.GET)
 	public List<Map<String, Object>> findCountIncreaseCmpByMonth() {
-		logger.log("新增产品统计", "获取各月新增在售器件数量");
+		logger.info("新增产品统计", "获取各月新增在售器件数量");
 		return goodsService.findCountIncreaseCmpByMonth();
 	}
 
@@ -560,7 +561,7 @@ public class GoodsController {
 		modelView.setView(new JxlsExcelView("classpath:jxls-tpl/trade/goods", "优软商城在售产品"));
 		//重置为下载停止状态
 		session.setAttribute("loading", false);
-		logger.log("批量下载在售产品信息", "以Excel形式导出批量导出在售产品数据");
+		logger.info("批量下载在售产品信息", "以Excel形式导出批量导出在售产品数据");
 		return modelView;
 	}
 
@@ -596,7 +597,7 @@ public class GoodsController {
 		modelView.setView(new JxlsExcelView("classpath:jxls-tpl/trade/goods", "优软商城在售产品"));
 		//重置为下载停止状态
 		session.setAttribute("loading", false);
-		logger.log("批量下载在售产品信息", "以Excel形式导出批量导出在售产品数据");
+		logger.info("批量下载在售产品信息", "以Excel形式导出批量导出在售产品数据");
 		return modelView;
 	}
 
@@ -630,7 +631,7 @@ public class GoodsController {
 		modelView.setView(new JxlsExcelView("classpath:jxls-tpl/trade/upAndDown", "优软商城上下架历史"));
 		//重置为下载停止状态
 		session.setAttribute("loading", false);
-		logger.log("导出上下架历史产品信息", "以Excel形式导出上下架历史产品数据");
+		logger.info("导出上下架历史产品信息", "以Excel形式导出上下架历史产品数据");
 		return modelView;
 	}
 
@@ -704,7 +705,7 @@ public class GoodsController {
 	 */
     @RequestMapping(value = "/repeat/tag", method = RequestMethod.GET)
     public ResultMap getCountByTag(Long goodId, Long productId, String tag) {
-		logger.log("自定义标签", "查询标签是否重复");
+		logger.info("自定义标签", "查询标签是否重复");
 		return goodsService.getCountByTag(goodId, productId, tag);
 	}
 
@@ -715,14 +716,14 @@ public class GoodsController {
 	 */
 	@RequestMapping(value = "/delete/batch", method = RequestMethod.PUT)
 	public ResultMap batchDeleteGoods(@RequestBody List<Long> idList) {
-		logger.log("删除商品", "根据id删除指定商品");
+		logger.info("删除商品", "根据id删除指定商品");
 		return goodsService.batchDeleteGoods(idList);
 	}
 
 	@RequestMapping(value = "/delete/enUU", method = RequestMethod.PUT)
 	public ResultMap deleteAllOnSaleGoods() {
 		Long enUU = SystemSession.getUser().getEnterprise().getUu();
-		logger.log("下架商品", "下架该enUU" + enUU + "所有商品");
+		logger.info("下架商品", "下架该enUU" + enUU + "所有商品");
 		return goodsService.deleteGoodsByEnUU(enUU);
 	}
 
@@ -733,7 +734,7 @@ public class GoodsController {
 	@RequestMapping(value = "/down/enUU", method = RequestMethod.PUT)
 	public ResultMap downNowEnterpriseGoods() {
 		Long enUU = SystemSession.getUser().getEnterprise().getUu();
-		logger.log("下架商品", "下架该enUU" + enUU + "所有商品");
+		logger.info("下架商品", "下架该enUU" + enUU + "所有商品");
 		return goodsService.downNowEnterpriseGoods(enUU);
 	}
 
@@ -745,7 +746,7 @@ public class GoodsController {
      */
     @RequestMapping(value = "/downAllGoods/enterprise", method = RequestMethod.GET)
     public ResultMap downAllGoodsByEnterprise(String eName) {
-		logger.log("商品管理", "下架该公司所有商品");
+		logger.info("商品管理", "下架该公司所有商品");
 		return goodsService.downAllGoodsByEnterprise(eName);
 	}
 
@@ -823,7 +824,7 @@ public class GoodsController {
 	@RequestMapping(value = "/background/page", method = RequestMethod.POST)
 	public Page<Goods> getPageDataOfBackground(PageParams params, @RequestBody GoodsFilter goodsFilter) {
 		PageInfo info = new PageInfo(params);
-		logger.log("后台产品管理", "分页获取Goods信息");
+		logger.info("后台产品管理", "分页获取Goods信息");
 		return goodsService.getPageDataOfBackground(info, goodsFilter);
 	}
 
@@ -834,7 +835,7 @@ public class GoodsController {
 	 */
 	@RequestMapping(value = "/one", method = RequestMethod.GET)
 	public Goods getGoodsById(Long goodsId) {
-		logger.log("后台产品管理", "根据id: " + goodsId + "返回goods数据");
+		logger.info("后台产品管理", "根据id: " + goodsId + "返回goods数据");
 		return goodsService.getGoodsById(goodsId);
 	}
 }

+ 5 - 5
src/main/java/com/uas/platform/b2c/prod/commodity/controller/GoodsHistoryController.java

@@ -1,12 +1,12 @@
 package com.uas.platform.b2c.prod.commodity.controller;
 
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.prod.commodity.model.GoodsHistory;
 import com.uas.platform.b2c.prod.commodity.service.GoodsHistoryService;
 import com.uas.platform.b2c.trade.support.ResultMap;
-import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -25,7 +25,7 @@ public class GoodsHistoryController {
 
     private final GoodsHistoryService goodsHistoryService;
 
-    private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
+    private final Logger logger = LoggerFactory.getLogger(ProductController.class);
 
     /**
      * Instantiates a new Goods history controller.
@@ -55,7 +55,7 @@ public class GoodsHistoryController {
      */
     @RequestMapping(value = "/data/batchCode", method = RequestMethod.GET)
     public List<GoodsHistory> getDataByBatchCode(String batchCode) {
-        logger.log("获取上下架历史", "批次号" + batchCode);
+        logger.info("获取上下架历史", "批次号" + batchCode);
         return goodsHistoryService.findDataOfUpAndDown(batchCode);
     }
 
@@ -69,7 +69,7 @@ public class GoodsHistoryController {
     public Page<GoodsHistory> getPageByBatchCode(PageParams params, String batchCode, Long startDate,
                                                  Long endDate, String keyword) {
         PageInfo info = new PageInfo(params);
-        logger.log("获取上下架历史", "批次号" + batchCode);
+        logger.info("获取上下架历史", "批次号" + batchCode);
         return goodsHistoryService.findPageByBatchCode(info, batchCode, startDate, endDate, keyword);
     }
 

+ 7 - 9
src/main/java/com/uas/platform/b2c/prod/commodity/controller/GoodsModifyInfoController.java

@@ -1,11 +1,10 @@
 package com.uas.platform.b2c.prod.commodity.controller;
 
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.prod.commodity.model.GoodsModifyInfo;
-import com.uas.platform.b2c.prod.commodity.model.ModifyInfo;
 import com.uas.platform.b2c.prod.commodity.service.GoodsModifyInfoService;
-import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageParams;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -28,8 +27,7 @@ public class GoodsModifyInfoController {
     /**
      * 输出日志
      */
-    private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
-
+    private final Logger logger = LoggerFactory.getLogger(GoodsModifyInfoController.class);
     /**
      * 根据批次号分页获取该Goods的修改记录
      * @param params
@@ -39,7 +37,7 @@ public class GoodsModifyInfoController {
     @RequestMapping(value = "/page", method = RequestMethod.GET)
     public Page<GoodsModifyInfo> getPageDataByBatchCode(PageParams params, String batchCode, Long startDate,
                                                         Long endDate, String keyword) {
-        logger.log("产品信息记录", "分页获取该批次" + batchCode + "的修改记录");
+        logger.info("产品信息记录", "分页获取该批次" + batchCode + "的修改记录");
         return modifyInfoService.getPageModifyRecord(params, batchCode, startDate, endDate, keyword);
     }
 
@@ -52,7 +50,7 @@ public class GoodsModifyInfoController {
     @RequestMapping(value = "/detail/page", method = RequestMethod.GET)
     public Page<GoodsModifyInfo> getPageDetailByBatchCode(PageParams params, String batchCode, Long startDate,
                                                           Long endDate, String keyword) {
-        logger.log("产品信息记录", "分页获取该批次" + batchCode + "的修改记录明细");
+        logger.info("产品信息记录", "分页获取该批次" + batchCode + "的修改记录明细");
         return modifyInfoService.getPageModifyDetail(params, batchCode, startDate, endDate, keyword);
     }
 
@@ -63,7 +61,7 @@ public class GoodsModifyInfoController {
      */
     @RequestMapping(value = "/batchCode", method = RequestMethod.GET)
     public List<GoodsModifyInfo> getGoodsModifyByBatchCode(String batchCode) {
-        logger.log("产品信息记录", "获取该批次" + batchCode + "的修改记录");
+        logger.info("产品信息记录", "获取该批次" + batchCode + "的修改记录");
         return modifyInfoService.getModifyRecord(batchCode);
     }
 
@@ -75,7 +73,7 @@ public class GoodsModifyInfoController {
      */
     @RequestMapping(value = "/audit/goods", method = RequestMethod.PUT)
     public void auditedGoods(String batchCode, Boolean pass, String message) {
-        logger.log("产品信息记录", "审核该批次" + batchCode + "的修改记录");
+        logger.info("产品信息记录", "审核该批次" + batchCode + "的修改记录");
         modifyInfoService.auditedGoods(batchCode, pass, message);
     }
 }

+ 10 - 14
src/main/java/com/uas/platform/b2c/prod/commodity/controller/GoodsPriceInfoController.java

@@ -2,23 +2,19 @@ package com.uas.platform.b2c.prod.commodity.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.b2c.prod.commodity.model.GoodsPriceInfo;
 import com.uas.platform.b2c.prod.commodity.service.GoodsPriceInfoService;
-import com.uas.platform.b2c.core.support.SystemSession;
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
-import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 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.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.Collections;
 import java.util.List;
@@ -32,7 +28,7 @@ public class GoodsPriceInfoController {
 
 	private final GoodsPriceInfoService goodsPriceInfoService;
 
-	private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
+    private final Logger logger = LoggerFactory.getLogger(GoodsPriceInfoController.class);
 
     /**
      * 依赖注入
@@ -57,7 +53,7 @@ public class GoodsPriceInfoController {
 	public ModelMap findPriceInfo(String uuid, String code, String currencyName, Integer original) {
 		GoodsPriceInfo priceInfo = new GoodsPriceInfo(uuid, SystemSession.getUser().getEnterprise().getUu(), code, currencyName, original, null);
 		ModelMap price = goodsPriceInfoService.findBasicPriceInfo(priceInfo);
-		logger.log("商品价格", "根据企业UU、商品型号、币别、库存类型和税率查询商品价格信息");
+		logger.info("商品价格", "根据企业UU、商品型号、币别、库存类型和税率查询商品价格信息");
 		return price;
 	}
 
@@ -76,7 +72,7 @@ public class GoodsPriceInfoController {
 		} else {
 			list = Collections.emptyList();
 		}
-		logger.log("商品价格", "根据企业UU获取商品价格信息");
+		logger.info("商品价格", "根据企业UU获取商品价格信息");
 		return list;
 	}
 
@@ -108,7 +104,7 @@ public class GoodsPriceInfoController {
 			info.filter("status", Status.UNAVAILABLE.value());
 		}
 		Page<GoodsPriceInfo> page = goodsPriceInfoService.findPageByKeyword(info, keyword);
-		logger.log("商品价格", "分页查看所属企业的商品价格信息", "状态:" + status);
+		logger.info("商品价格", "分页查看所属企业的商品价格信息", "状态:" + status);
 		return page;
 	}
 
@@ -130,7 +126,7 @@ public class GoodsPriceInfoController {
 			info.filter("status", Status.UNAVAILABLE.value());
 		}
 		List<Long> ids = goodsPriceInfoService.findIdsByKeyword(info, keyword);
-		logger.log("商品价格", "获取所有符合条件的ID", "状态:" + status + ", 关键字:" + keyword);
+		logger.info("商品价格", "获取所有符合条件的ID", "状态:" + status + ", 关键字:" + keyword);
 		return ids;
 	}
 
@@ -156,7 +152,7 @@ public class GoodsPriceInfoController {
 			goodsPriceInfoService.maintain(id, range, price, "NORMAL");
 
 		}
-		logger.log("商品价格", "商品价格信息维护");
+		logger.info("商品价格", "商品价格信息维护");
 		return "{'status':'success'}";
 	}
 

+ 22 - 26
src/main/java/com/uas/platform/b2c/prod/commodity/controller/ReleaseProductByBatchController.java

@@ -2,7 +2,6 @@ package com.uas.platform.b2c.prod.commodity.controller;
 
 import com.uas.platform.b2c.common.base.model.FileUpload;
 import com.uas.platform.b2c.core.constant.IntegerConstant;
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.core.support.view.JxlsExcelView;
 import com.uas.platform.b2c.core.utils.FastjsonUtils;
 import com.uas.platform.b2c.prod.commodity.dao.ReleaseProductByBatchDao;
@@ -16,7 +15,6 @@ import com.uas.platform.b2c.prod.product.component.modal.Component;
 import com.uas.platform.b2c.trade.order.StringConstant.Currency;
 import com.uas.platform.b2c.trade.order.support.AjaxUtil;
 import com.uas.platform.core.exception.IllegalOperatorException;
-import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.model.ReleaseStatus;
@@ -24,21 +22,20 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 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.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.view.json.MappingJackson2JsonView;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -65,8 +62,7 @@ public class ReleaseProductByBatchController {
     @Autowired
     private ComponentDao componentDao;
 
-    private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
-
+    private final Logger logger = LoggerFactory.getLogger(ReleaseProductByBatchController.class);
     /**
      * 更新产品信息
      *
@@ -131,7 +127,7 @@ public class ReleaseProductByBatchController {
             releaseProductByBatch.setReleaseCode(ReleaseStatus.success.value());
             releaseProductByBatch.setReleaseStatus(ReleaseStatus.success.getPhrase());
         }
-        logger.log("批量上架模块", "更新上传的信息");
+        logger.info("批量上架模块", "更新上传的信息");
         return releaseProductByBatchDao.save(releaseProductByBatch);
     }
 
@@ -144,7 +140,7 @@ public class ReleaseProductByBatchController {
     @RequestMapping(value = "/delete/{id}", method = RequestMethod.DELETE)
     public String deleteProInfo(@PathVariable("id") Long id) {
         releaseProductByBatchService.delete(id);
-        logger.log("批量上架模块", "删除指定的批量上架的信息,id:" + id);
+        logger.info("批量上架模块", "删除指定的批量上架的信息,id:" + id);
         return "success";
     }
 
@@ -156,7 +152,7 @@ public class ReleaseProductByBatchController {
      */
     @RequestMapping(value = "/batchRelease", method = RequestMethod.POST)
     public String batchRelease(String batch) {
-        logger.log("批量上架模块", "批量发布指定批次:" + batch + "的上架内容");
+        logger.info("批量上架模块", "批量发布指定批次:" + batch + "的上架内容");
         // 第三个参数是默认忽略导入
         String byBatch = releaseProductByBatchService.publishByBatch(batch, false, 1);
         return byBatch;
@@ -170,7 +166,7 @@ public class ReleaseProductByBatchController {
      */
     @RequestMapping(value = "/batchRelease/pcb", method = RequestMethod.POST)
     public String batchPCBRelease(String batch) {
-        logger.log("批量上架模块", "批量发布指定批次:" + batch + "的上架内容");
+        logger.info("批量上架模块", "批量发布指定批次:" + batch + "的上架内容");
         // 第三个参数是默认忽略导入
         return releaseProductByBatchService.publishByBatch(batch, true, 1);
     }
@@ -183,7 +179,7 @@ public class ReleaseProductByBatchController {
      */
     @RequestMapping(value = "/batchRelease/person", method = RequestMethod.POST)
     public String batchReleasePerson(String batch) {
-        logger.log("批量上架模块", "批量导入个人产品库:" + batch + "的内容");
+        logger.info("批量上架模块", "批量导入个人产品库:" + batch + "的内容");
         return releaseProductByBatchService.publishByBatchPerson(batch);
     }
 
@@ -195,7 +191,7 @@ public class ReleaseProductByBatchController {
      */
     @RequestMapping(value = "/getAll", method = RequestMethod.POST)
     public List<ReleaseProductByBatch> getAll(@RequestBody Long uu) {
-        logger.log("批量上架模块", "根据UU获取指定的批量上架的内容");
+        logger.info("批量上架模块", "根据UU获取指定的批量上架的内容");
         return releaseProductByBatchService.findByPublisheruu(uu);
     }
 
@@ -211,7 +207,7 @@ public class ReleaseProductByBatchController {
         for (Long id : idArray) {
             releaseProductByBatchService.delete(id);
         }
-        logger.log("批量上架模块", "根据UU获取指定的批量上架的内容");
+        logger.info("批量上架模块", "根据UU获取指定的批量上架的内容");
         return "success";
     }
 
@@ -245,7 +241,7 @@ public class ReleaseProductByBatchController {
         } catch (IOException e) {
             e.printStackTrace();
         }
-        logger.log("批量上架模块", "导入Excel批量上传商品");
+        logger.info("批量上架模块", "导入Excel批量上传商品");
         return map;
     }
 
@@ -277,7 +273,7 @@ public class ReleaseProductByBatchController {
         } catch (IOException e) {
             e.printStackTrace();
         }
-        logger.log("批量上架模块", "导入Excel批量上传商品");
+        logger.info("批量上架模块", "导入Excel批量上传商品");
         return map;
     }
 
@@ -307,7 +303,7 @@ public class ReleaseProductByBatchController {
         } catch (IOException e) {
             e.printStackTrace();
         }
-        logger.log("批量上架模块", "导入Excel批量上传商品");
+        logger.info("批量上架模块", "导入Excel批量上传商品");
         return map;
     }
 
@@ -321,7 +317,7 @@ public class ReleaseProductByBatchController {
     @RequestMapping(value = "/batch/page", method = RequestMethod.GET)
     public Page<ReleaseProductByBatch> getRelease(PageParams param, String batch) {
         PageInfo info = new PageInfo(param);
-        logger.log("批量上架模块", "获取一页的批量上架的内容");
+        logger.info("批量上架模块", "获取一页的批量上架的内容");
         return releaseProductByBatchService.getPageReleaseProductByBatch(info, batch);
     }
 
@@ -363,7 +359,7 @@ public class ReleaseProductByBatchController {
         }
 
         modelAndView.setView(new JxlsExcelView(url, "导入失败产品-优软商城"));
-        logger.log("批量上架模块", "以Excel形式导出批量上架商品匹配不合格的数据");
+        logger.info("批量上架模块", "以Excel形式导出批量上架商品匹配不合格的数据");
         session.setAttribute("load-error-ing", false);
         return modelAndView;
     }
@@ -399,7 +395,7 @@ public class ReleaseProductByBatchController {
             }
         }
         modelAndView.setView(new JxlsExcelView(url, "导入失败产品-优软商城"));
-        logger.log("批量上架模块", "以Excel形式导出批量上架商品匹配不合格的数据");
+        logger.info("批量上架模块", "以Excel形式导出批量上架商品匹配不合格的数据");
         session.setAttribute("load-error-ing", false);
         return modelAndView;
     }
@@ -413,7 +409,7 @@ public class ReleaseProductByBatchController {
     @RequestMapping(value = "/release/template", method = RequestMethod.GET)
     public ModelAndView exportOrderses(String currency, Integer isPerson) {
         ModelAndView modelAndView = new ModelAndView();
-        logger.log("商品批次", "下载批量上架商品的Excel模板");
+        logger.info("商品批次", "下载批量上架商品的Excel模板");
         if (null != isPerson && isPerson.intValue() == IntegerConstant.YES_SHORT.intValue()) {
             modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/trade/releaseByBatch-person", "导入产品-优软商城"));
             return modelAndView;
@@ -458,7 +454,7 @@ public class ReleaseProductByBatchController {
     @RequestMapping(value = "/release/template/pcb", method = RequestMethod.GET)
     public ModelAndView exportOrdersesPCB(String currency) {
         ModelAndView modelAndView = new ModelAndView();
-        logger.log("商品批次", "下载批量上架PCB商品的Excel模板");
+        logger.info("商品批次", "下载批量上架PCB商品的Excel模板");
         if (Currency.USD.equals(currency)) {
             modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/trade/releasePCBbyBatch-usd", "PCB产品导入模板-优软商城"));
         } else {

+ 5 - 5
src/main/java/com/uas/platform/b2c/prod/commodity/controller/UASBatchPutOnPropertyController.java

@@ -1,10 +1,10 @@
 package com.uas.platform.b2c.prod.commodity.controller;
 
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.prod.commodity.model.UASBatchPutOnProperty;
 import com.uas.platform.b2c.prod.commodity.service.UASBatchPutOnPropertyService;
 import com.uas.platform.b2c.trade.support.ResultMap;
-import com.uas.platform.core.logging.BufferedLoggerManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -22,7 +22,7 @@ public class UASBatchPutOnPropertyController {
 
     private final UASBatchPutOnPropertyService uasBatchPutOnPropertyService;
 
-    private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
+    private final Logger logger = LoggerFactory.getLogger(UASBatchPutOnPropertyController.class);
 
     @Autowired
     public UASBatchPutOnPropertyController(UASBatchPutOnPropertyService uasBatchPutOnPropertyService) {
@@ -38,7 +38,7 @@ public class UASBatchPutOnPropertyController {
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     public ResultMap save(@RequestBody UASBatchPutOnProperty property) {
         ResultMap resultMap = uasBatchPutOnPropertyService.save(property);
-        logger.log("UAS批量上架", "保存批量上架的配置信息");
+        logger.info("UAS批量上架", "保存批量上架的配置信息");
         return resultMap;
     }
 
@@ -49,7 +49,7 @@ public class UASBatchPutOnPropertyController {
      */
     @RequestMapping(method = RequestMethod.GET)
     public UASBatchPutOnProperty getUASBatchPutOnProperty() {
-        logger.log("UAS批量上架", "获取配置信息");
+        logger.info("UAS批量上架", "获取配置信息");
         return uasBatchPutOnPropertyService.get();
     }
 }

+ 3 - 4
src/main/java/com/uas/platform/b2c/prod/product/brand/controller/BrandController.java

@@ -4,8 +4,8 @@ import com.uas.platform.b2c.prod.product.brand.modal.Brand;
 import com.uas.platform.b2c.prod.product.brand.modal.BrandInfo;
 import com.uas.platform.b2c.prod.product.brand.service.BrandService;
 import com.uas.platform.b2c.prod.product.kind.service.KindService;
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
-import com.uas.platform.core.logging.BufferedLoggerManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -28,8 +28,7 @@ public class BrandController {
 	@Autowired
 	private KindService kindService;
 
-	private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
-
+    private final Logger logger = LoggerFactory.getLogger(BrandController.class);
 
 	/**
 	 * 验证品牌名是否存在

+ 6 - 7
src/main/java/com/uas/platform/b2c/prod/product/brand/controller/BrandMapController.java

@@ -1,12 +1,12 @@
 package com.uas.platform.b2c.prod.product.brand.controller;
 
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.core.support.view.JxlsExcelView;
 import com.uas.platform.b2c.prod.product.brand.modal.BrandMap;
 import com.uas.platform.b2c.prod.product.brand.service.BrandMapService;
 import com.uas.platform.b2c.prod.store.model.StoreType;
-import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageParams;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.repository.query.Param;
@@ -34,8 +34,7 @@ public class BrandMapController {
 	@Autowired
 	private BrandMapService mapService;
 
-	private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
-
+    private final Logger logger = LoggerFactory.getLogger(BrandMapController.class);
 	/**
 	 * 根据以下参数分页获取对应的品牌映射关系
 	 *
@@ -58,7 +57,7 @@ public class BrandMapController {
 	 */
 	@RequestMapping(value = "/addOne", method = RequestMethod.POST)
 	public BrandMap addBrandMap(@RequestBody BrandMap map){
-		logger.log("品牌映射", "新增品牌映射记录");
+		logger.info("品牌映射", "新增品牌映射记录");
 		return mapService.addOneMap(map);
 	}
 
@@ -102,7 +101,7 @@ public class BrandMapController {
 	 */
 	@RequestMapping(value = "/initMap", method = RequestMethod.POST)
 	public void initAllBrandMap() {
-		logger.log("品牌映射", "品牌映射初始化");
+		logger.info("品牌映射", "品牌映射初始化");
 		mapService.initBrandMap();
 	}
 
@@ -112,7 +111,7 @@ public class BrandMapController {
 	 */
 	@RequestMapping(value = "/initMap/{enuu}", method = RequestMethod.GET)
 	public void initBrandMapByEnUU(@PathVariable Long enuu) {
-		logger.log("品牌映射", "品牌映射初始化");
+		logger.info("品牌映射", "品牌映射初始化");
 		mapService.initBrandMapByEnUU(enuu);
 	}
 }

+ 14 - 15
src/main/java/com/uas/platform/b2c/prod/product/brand/controller/BrandSubmitController.java

@@ -2,7 +2,6 @@ package com.uas.platform.b2c.prod.product.brand.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2c.core.support.SystemSession;
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.core.utils.FastjsonUtils;
 import com.uas.platform.b2c.external.erp.product.service.OperationInfoService;
 import com.uas.platform.b2c.prod.product.brand.modal.Brand;
@@ -10,11 +9,12 @@ import com.uas.platform.b2c.prod.product.brand.modal.BrandSubmit;
 import com.uas.platform.b2c.prod.product.brand.service.BrandSubmitService;
 import com.uas.platform.b2c.trade.support.ResultMap;
 import com.uas.platform.core.exception.IllegalOperatorException;
-import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.model.ServiceCode;
 import com.uas.platform.core.model.Status;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.data.domain.Page;
@@ -36,8 +36,7 @@ public class BrandSubmitController {
 	@Autowired
 	private OperationInfoService operationInfoService;
 
-	private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
-
+    private final Logger logger = LoggerFactory.getLogger(BrandSubmitController.class);
 	/**
 	 * 保存品牌版本信息(来自新增品牌,修改品牌)
 	 * 
@@ -48,7 +47,7 @@ public class BrandSubmitController {
 	public long saveBrandSubmit(@RequestBody String json) {
 		BrandSubmit brandSubmit = FastjsonUtils.fromJson(json, BrandSubmit.class);
 		brandSubmit = brandSubmitService.saveBrandSubmit(brandSubmit);
-		logger.log("品牌维护", "新增或修改品牌信息", "品牌名称:" + brandSubmit.getNameCn(), brandSubmit.getNameCn(),
+		logger.info("品牌维护", "新增或修改品牌信息", "品牌名称:" + brandSubmit.getNameCn(), brandSubmit.getNameCn(),
 				brandSubmit.getId());
 		operationInfoService.save(brandSubmit, ServiceCode.brandApply.value());
 		return brandSubmit.getId();
@@ -62,7 +61,7 @@ public class BrandSubmitController {
 	@RequestMapping(value = "/audit", params = "valid=true", method = RequestMethod.PUT)
 	public Brand valid(@RequestBody String json) {
 		BrandSubmit brandSubmit = FastjsonUtils.fromJson(json, BrandSubmit.class);
-		logger.log("品牌维护", "审核通过品牌申请", "品牌中文名称:" + brandSubmit.getNameCn(), brandSubmit.getNameCn(),
+		logger.info("品牌维护", "审核通过品牌申请", "品牌中文名称:" + brandSubmit.getNameCn(), brandSubmit.getNameCn(),
 				brandSubmit.getId());
 		return brandSubmitService.brandSubmitAudit(brandSubmit);
 	}
@@ -78,7 +77,7 @@ public class BrandSubmitController {
 	public BrandSubmit invalid(@PathVariable("id") Long id, @RequestBody String json) {
 		JSONObject jsonObject = FastjsonUtils.parseObject(json);
 		String auditOpinion = String.valueOf(jsonObject.get("auditOpinion"));
-		logger.log("品牌维护", "审核不通过品牌申请", "审核意见:" + auditOpinion, id.toString(), id);
+		logger.info("品牌维护", "审核不通过品牌申请", "审核意见:" + auditOpinion, id.toString(), id);
 		return brandSubmitService.brandSubmitInvalid(id, auditOpinion);
 	}
 
@@ -100,7 +99,7 @@ public class BrandSubmitController {
 		if (status != null) {
 			info.filter("status", status);
 		}
-		logger.log("品牌维护", "获取品牌申请信息", "分页获取品牌申请信息");
+		logger.info("品牌维护", "获取品牌申请信息", "分页获取品牌申请信息");
 		return brandSubmitService.findAllBrand(info, keyword);
 	}
 
@@ -116,7 +115,7 @@ public class BrandSubmitController {
 	public Page<BrandSubmit> getUnAuditedBrandSubmit(PageParams params, String keyword) {
 		PageInfo info = new PageInfo(params);
 		info.filter("status", Status.UNAUDIT.value());
-		logger.log("品牌维护", "获取待审核品牌申请信息", "分页获取待审核的品牌申请信息,关键词:" + keyword);
+		logger.info("品牌维护", "获取待审核品牌申请信息", "分页获取待审核的品牌申请信息,关键词:" + keyword);
 		return brandSubmitService.findAllBrand(info, keyword);
 	}
 
@@ -132,7 +131,7 @@ public class BrandSubmitController {
 	public Page<BrandSubmit> getAllowBrandSubmit(PageParams params, String keyword) {
 		PageInfo info = new PageInfo(params);
 		info.filter("status", Status.ALLOW.value());
-		logger.log("品牌维护", "获取审核通过的品牌申请信息", "分页获取审核通过的品牌申请信息,关键词:" + keyword);
+		logger.info("品牌维护", "获取审核通过的品牌申请信息", "分页获取审核通过的品牌申请信息,关键词:" + keyword);
 		return brandSubmitService.findAllBrand(info, keyword);
 	}
 
@@ -148,7 +147,7 @@ public class BrandSubmitController {
 	public Page<BrandSubmit> getNotAllowBrandSubmit(PageParams params, String keyword) {
 		PageInfo info = new PageInfo(params);
 		info.filter("status", Status.NOTALLOW.value());
-		logger.log("品牌维护", "获取审核未通过的品牌申请信息", "分页获取审核未通过的品牌申请信息,关键词:" + keyword);
+		logger.info("品牌维护", "获取审核未通过的品牌申请信息", "分页获取审核未通过的品牌申请信息,关键词:" + keyword);
 		return brandSubmitService.findAllBrand(info, keyword);
 	}
 
@@ -160,7 +159,7 @@ public class BrandSubmitController {
 	 */
 	@RequestMapping(value = "/{id}", method = RequestMethod.GET)
 	public BrandSubmit findBrandSubmitById(@PathVariable("id") Long id) {
-		logger.log("品牌维护", "获取品牌申请", "根据品牌申请id获取品牌申请,id:" + id, id.toString(), id);
+		logger.info("品牌维护", "获取品牌申请", "根据品牌申请id获取品牌申请,id:" + id, id.toString(), id);
 		return brandSubmitService.findBrandSubmitById(id);
 	}
 
@@ -173,7 +172,7 @@ public class BrandSubmitController {
 	@RequestMapping(value = "/audituUpdate", method = RequestMethod.PUT)
 	public Brand audituUpdate(@RequestBody String json) {
 		BrandSubmit brandSubmit = FastjsonUtils.fromJson(json, BrandSubmit.class);
-		logger.log("品牌维护", "审核通过冲突品牌申请", "审核通过与现版本信息冲突的品牌申请", brandSubmit.getNameCn(), brandSubmit.getId());
+		logger.info("品牌维护", "审核通过冲突品牌申请", "审核通过与现版本信息冲突的品牌申请", brandSubmit.getNameCn(), brandSubmit.getId());
 		try {
 			Brand brand = brandSubmitService.audituUpdate(brandSubmit);
 			return brand;
@@ -190,7 +189,7 @@ public class BrandSubmitController {
 	@RequestMapping(value = "/fromunstandard", method = RequestMethod.POST)
 	public ModelMap saveFromUnstandard(@RequestBody String json) {
 		ModelMap map = new ModelMap();
-		logger.log("品牌维护", "通过非标器件申请品牌", "通过非标器件申请品牌");
+		logger.info("品牌维护", "通过非标器件申请品牌", "通过非标器件申请品牌");
 		String brandSubmit = brandSubmitService.saveFromUnstandard(json);
 		if (brandSubmit == null) {
 			map.put("code", 400);
@@ -212,7 +211,7 @@ public class BrandSubmitController {
 	 */
 	@RequestMapping(value = "/submit/count", method = RequestMethod.GET)
 	public ResultMap countUnAuditedBrand(Long fromDate, Long toDate) {
-		logger.log("品牌维护", "统计未审核品牌信息");
+		logger.info("品牌维护", "统计未审核品牌信息");
 		return brandSubmitService.countUnAuditedBrand(fromDate, toDate);
 	}
 }

+ 8 - 9
src/main/java/com/uas/platform/b2c/prod/product/brand/controller/BrandVersionController.java

@@ -3,8 +3,8 @@ package com.uas.platform.b2c.prod.product.brand.controller;
 import com.uas.platform.b2c.prod.product.brand.modal.BrandVersion;
 import com.uas.platform.b2c.prod.product.brand.modal.BrandVersionInfo;
 import com.uas.platform.b2c.prod.product.brand.service.BrandVersionService;
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
-import com.uas.platform.core.logging.BufferedLoggerManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -25,8 +25,7 @@ public class BrandVersionController {
 	@Autowired
 	private BrandVersionService brandVersionService;
 
-	private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
-
+    private final Logger logger = LoggerFactory.getLogger(BrandVersionController.class);
 	/**
 	 * 根据uuid查找BrandVersion
 	 * 
@@ -35,7 +34,7 @@ public class BrandVersionController {
 	 */
 	@RequestMapping(value = "/list/{uuid}", method = RequestMethod.GET)
 	public List<BrandVersion> findListBrandVersionByUuid(@PathVariable("uuid") String uuid) {
-		logger.log("品牌版本信息", "获取品牌版本信息", "通过uuid获取品牌版本信息 ,uuid : " + uuid);
+		logger.info("品牌版本信息", "获取品牌版本信息", "通过uuid获取品牌版本信息 ,uuid : " + uuid);
 		return brandVersionService.findListBrandVersionByUuid(uuid);
 	}
 
@@ -47,7 +46,7 @@ public class BrandVersionController {
 	 */
 	@RequestMapping(value = "/count/{uuid}", method = RequestMethod.GET)
 	public short findBrandVersionCountByUuid(@PathVariable("uuid") String uuid) {
-		logger.log("品牌版本信息", "根据版本总数量", "根据uuid获取版本总数量,uuid : " + uuid);
+		logger.info("品牌版本信息", "根据版本总数量", "根据uuid获取版本总数量,uuid : " + uuid);
 		return brandVersionService.findCountBrandVersionByUuid(uuid);
 	}
 
@@ -64,18 +63,18 @@ public class BrandVersionController {
 			if (brandVersionService.findCountBrandVersionByUuid(uuid) > 0) {
 				BrandVersion brandVersion = new BrandVersion();
 				brandVersion.setVersion((short) 0);
-				logger.log("品牌版本信息", "根据uuid和version获取品牌版本信息", "uuid:" + uuid + ",version:" + version);
+				logger.info("品牌版本信息", "根据uuid和version获取品牌版本信息", "uuid:" + uuid + ",version:" + version);
 				return (new BrandVersionInfo(brandVersion));
 			} else {
 				BrandVersion brandVersion = new BrandVersion();
 				brandVersion.setVersion((short) -1);
-				logger.log("品牌版本信息", "根据uuid和version获取品牌版本信息", "uuid:" + uuid + ",version:" + version);
+				logger.info("品牌版本信息", "根据uuid和version获取品牌版本信息", "uuid:" + uuid + ",version:" + version);
 				return (new BrandVersionInfo(brandVersion));
 			}
 		} else {
 			BrandVersionInfo brandVersionInfo = new BrandVersionInfo(brandVersionService.findBrandVersionByUuidAndVersion(uuid, version));
 			brandVersionInfo.setVersionCount(brandVersionService.findCountBrandVersionByUuid(uuid));
-			logger.log("品牌版本信息", "根据uuid和version获取品牌版本信息", "uuid:" + uuid + ",version:" + version);
+			logger.info("品牌版本信息", "根据uuid和version获取品牌版本信息", "uuid:" + uuid + ",version:" + version);
 			return brandVersionInfo;
 		}
 	}

+ 10 - 10
src/main/java/com/uas/platform/b2c/prod/product/brand/controller/VendorListSubmitController.java

@@ -1,17 +1,17 @@
 package com.uas.platform.b2c.prod.product.brand.controller;
 
 import com.uas.platform.b2c.common.base.model.FileUpload;
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.core.support.view.JxlsExcelView;
 import com.uas.platform.b2c.prod.product.brand.modal.VendorListSubmit;
 import com.uas.platform.b2c.prod.product.brand.service.VendorListSubmitService;
 import com.uas.platform.core.exception.IllegalOperatorException;
-import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;
@@ -33,7 +33,7 @@ public class VendorListSubmitController {
 
     private final VendorListSubmitService vendorListSubmitService;
 
-    private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
+    private final Logger logger = LoggerFactory.getLogger(VendorListSubmitController.class);
 
     @Autowired
     public VendorListSubmitController(VendorListSubmitService vendorListSubmitService) {
@@ -57,7 +57,7 @@ public class VendorListSubmitController {
      */
     @RequestMapping(method = RequestMethod.POST)
     public VendorListSubmit save(@RequestBody VendorListSubmit vendorListSubmit) {
-        logger.log("品牌-供应商申请", "新增品牌供应商申请", "供应商名称:" + vendorListSubmit.getVendorName());
+        logger.info("品牌-供应商申请", "新增品牌供应商申请", "供应商名称:" + vendorListSubmit.getVendorName());
         return vendorListSubmitService.save(vendorListSubmit);
     }
 
@@ -68,7 +68,7 @@ public class VendorListSubmitController {
      */
     @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
     public VendorListSubmit delete(@PathVariable("id") Long id) {
-        logger.log("品牌-供应商申请", "删除品牌供应商申请", "供应商id:" + id);
+        logger.info("品牌-供应商申请", "删除品牌供应商申请", "供应商id:" + id);
         return vendorListSubmitService.delete(id);
     }
 
@@ -79,7 +79,7 @@ public class VendorListSubmitController {
      */
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     public VendorListSubmit update(@RequestBody VendorListSubmit vendorListSubmit) {
-        logger.log("品牌-供应商申请", "更新品牌供应商申请", "供应商名称:" + vendorListSubmit.getVendorName());
+        logger.info("品牌-供应商申请", "更新品牌供应商申请", "供应商名称:" + vendorListSubmit.getVendorName());
         return vendorListSubmitService.update(vendorListSubmit);
     }
 
@@ -90,7 +90,7 @@ public class VendorListSubmitController {
      */
     @RequestMapping(value = "/audit", method = RequestMethod.POST)
     public VendorListSubmit audit(@RequestBody VendorListSubmit vendorListSubmit) {
-        logger.log("品牌-供应商申请", "审核通过品牌供应商申请", "供应商名称:" + vendorListSubmit.getVendorName());
+        logger.info("品牌-供应商申请", "审核通过品牌供应商申请", "供应商名称:" + vendorListSubmit.getVendorName());
         return vendorListSubmitService.audit(vendorListSubmit);
     }
 
@@ -101,7 +101,7 @@ public class VendorListSubmitController {
      */
     @RequestMapping(value = "/unaudit/{id}", method = RequestMethod.POST)
     public VendorListSubmit unaudit(@PathVariable Long id) {
-        logger.log("品牌-供应商申请", "审核不通过品牌供应商申请", "供应商id:" + id);
+        logger.info("品牌-供应商申请", "审核不通过品牌供应商申请", "供应商id:" + id);
         return vendorListSubmitService.unaudit(id);
     }
 
@@ -115,7 +115,7 @@ public class VendorListSubmitController {
         ModelAndView modelAndView = new ModelAndView();
         modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/product/brand-vendor", "优软商城品牌供应商上传模板"));
 
-        logger.log("品牌-供应商申请", "下载批量导入供应商模板");
+        logger.info("品牌-供应商申请", "下载批量导入供应商模板");
         return modelAndView;
     }
 
@@ -126,7 +126,7 @@ public class VendorListSubmitController {
      */
     @RequestMapping(value = "/upload", method = RequestMethod.POST)
     public List<VendorListSubmit> uploadVendorList(FileUpload uploadItem) {
-        logger.log("品牌-供应商申请", "批量导入供应商");
+        logger.info("品牌-供应商申请", "批量导入供应商");
         String fileName = uploadItem.getFile().getOriginalFilename();
         String suffix = fileName.substring(fileName.lastIndexOf(".") + 1);
         InputStream is = null;

+ 17 - 18
src/main/java/com/uas/platform/b2c/prod/product/component/controller/ComponentController.java

@@ -1,17 +1,17 @@
 package com.uas.platform.b2c.prod.product.component.controller;
 
+import com.uas.platform.b2c.core.constant.SplitChar;
+import com.uas.platform.b2c.core.support.SystemSession;
+import com.uas.platform.b2c.core.utils.FastjsonUtils;
 import com.uas.platform.b2c.prod.product.component.modal.Component;
 import com.uas.platform.b2c.prod.product.component.modal.ComponentInfo;
 import com.uas.platform.b2c.prod.product.component.service.ComponentService;
-import com.uas.platform.b2c.core.support.SystemSession;
-import com.uas.platform.b2c.core.constant.SplitChar;
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
-import com.uas.platform.b2c.core.utils.FastjsonUtils;
-import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.persistence.criteria.CriterionExpression.Operator;
 import com.uas.platform.core.persistence.criteria.SimpleExpression;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.ui.ModelMap;
@@ -30,8 +30,7 @@ public class ComponentController {
 	@Autowired
 	private ComponentService componentService;
 
-	private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
-
+    private final Logger logger = LoggerFactory.getLogger(ComponentController.class);
 	/**
 	 * 根据uuid查找ComponentActive
 	 * 
@@ -44,10 +43,10 @@ public class ComponentController {
 		if (component == null) {
 			Component newComponent = new Component();
 			newComponent.setVersion((short) -1);
-			logger.log("器件信息", "获取器件信息", "通过uuid获取器件信息,uuid:" + uuid);
+			logger.info("器件信息", "获取器件信息", "通过uuid获取器件信息,uuid:" + uuid);
 			return newComponent;
 		} else {
-			logger.log("器件信息", "获取器件信息", "通过uuid获取器件信息,uuid:" + uuid);
+			logger.info("器件信息", "获取器件信息", "通过uuid获取器件信息,uuid:" + uuid);
 			return component;
 		}
 	}
@@ -62,7 +61,7 @@ public class ComponentController {
 	@RequestMapping(value = "/info", method = RequestMethod.GET)
 	public Page<ComponentInfo> findInfoPage(PageParams params, String keyword) {
 		PageInfo info = new PageInfo(params);
-		logger.log("器件信息", "获取器件信息", "分页获取器件简要信息");
+		logger.info("器件信息", "获取器件信息", "分页获取器件简要信息");
 		return componentService.findInfoPage(info);
 	}
 
@@ -74,7 +73,7 @@ public class ComponentController {
 	@RequestMapping(value = "/{batchCode}/detail", method = RequestMethod.GET)
 	public ComponentInfo getComponent(@PathVariable String batchCode) {
 		ComponentInfo component = componentService.findByBatchcode(batchCode);
-		logger.log("器件信息", "获取器件信息", "通过批次号:" + batchCode + " 获取器件简要信息");
+		logger.info("器件信息", "获取器件信息", "通过批次号:" + batchCode + " 获取器件简要信息");
 		return component;
 	}
 
@@ -87,7 +86,7 @@ public class ComponentController {
 	 */
 	@RequestMapping(value = "/codeAndBrandId/{code}", method = RequestMethod.GET)
 	public List<Component> getComponentByCodeAndBrandId(@PathVariable("code") String code, Long brandId) {
-		logger.log("器件信息", "获取器件信息", "通过原厂型号:" + code + " 和品牌id: " + brandId + " 获取器件简要信息");
+		logger.info("器件信息", "获取器件信息", "通过原厂型号:" + code + " 和品牌id: " + brandId + " 获取器件简要信息");
 		return componentService.findByCodeAndBrandId(code, brandId);
 	}
 
@@ -100,7 +99,7 @@ public class ComponentController {
 	 */
 	@RequestMapping(value = "/codeAndKindId/{code}", method = RequestMethod.GET)
 	public List<Component> getComponentByCodeAndKindId(@PathVariable("code") String code, Long kindId) {
-		logger.log("器件信息", "获取器件信息", "通过原厂型号:" + code + " 和物料名称(类目)id: " + kindId + " 获取器件简要信息");
+		logger.info("器件信息", "获取器件信息", "通过原厂型号:" + code + " 和物料名称(类目)id: " + kindId + " 获取器件简要信息");
 		return componentService.findByCodeAndKindId(code, kindId);
 	}
 
@@ -118,7 +117,7 @@ public class ComponentController {
 		SimpleExpression proofExpression = new SimpleExpression("sampleQty", new Double(0), Operator.GT);
 		info.expression(siExpression);
 		info.expression(proofExpression);
-		logger.log("器件信息", "获取器件信息", "分页获取器件信息,关键词为  " + keyword);
+		logger.info("器件信息", "获取器件信息", "分页获取器件信息,关键词为  " + keyword);
 		return componentService.findProofInfoPage(info, keyword, SystemSession.getUser());
 	}
 
@@ -130,7 +129,7 @@ public class ComponentController {
 	@RequestMapping(value = "/proofing/hasSample", method = RequestMethod.POST)
 	public ModelMap hasSamples(@RequestBody String json) {
 		ComponentInfo info = FastjsonUtils.fromJson(json, ComponentInfo.class);
-		logger.log("样品信息", "获取样品信息", "查询这个器件对当前登录企业是否有样品");
+		logger.info("样品信息", "获取样品信息", "查询这个器件对当前登录企业是否有样品");
 		return componentService.hasSamples(info, SystemSession.getUser());
 	}
 
@@ -141,7 +140,7 @@ public class ComponentController {
 	 */
 	@RequestMapping(value = "/{qty}/recommend/proofing", method = RequestMethod.GET)
 	public List<ComponentInfo> recommendSample(@PathVariable("qty") Integer qty) {
-		logger.log("样品信息", "获取样品信息", "获取最近上架的" + qty + "个样品");
+		logger.info("样品信息", "获取样品信息", "获取最近上架的" + qty + "个样品");
 		return componentService.recommendSample(qty);
 	}
 
@@ -158,7 +157,7 @@ public class ComponentController {
 		// 库存为0
 		SimpleExpression siExpression = new SimpleExpression("reserve", new Double(0), Operator.GT);
 		info.expression(siExpression);
-		logger.log("器件信息", "获取器件信息", "获取有库存的库存类型为  " + compType + " 的器件");
+		logger.info("器件信息", "获取器件信息", "获取有库存的库存类型为  " + compType + " 的器件");
 		return componentService.findOriginalInfoPage(info, keyword, compType);
 	}
 
@@ -187,7 +186,7 @@ public class ComponentController {
 	 */
 	@RequestMapping(value = "/{qty}/recommend/original", method = RequestMethod.GET)
 	public List<ComponentInfo> recommendOriginal(@PathVariable("qty") Integer qty) {
-		logger.log("器件信息", "获取器件信息", "获取最近上架的" + qty + "个器件");
+		logger.info("器件信息", "获取器件信息", "获取最近上架的" + qty + "个器件");
 		return componentService.recommendOriginal(qty);
 	}
 

+ 21 - 19
src/main/java/com/uas/platform/b2c/prod/product/component/controller/ComponentSubmitController.java

@@ -3,15 +3,16 @@ package com.uas.platform.b2c.prod.product.component.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2c.common.base.model.FileUpload;
 import com.uas.platform.b2c.core.support.SystemSession;
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.core.support.view.JxlsExcelView;
 import com.uas.platform.b2c.core.utils.FastjsonUtils;
 import com.uas.platform.b2c.external.erp.product.service.OperationInfoService;
-import com.uas.platform.b2c.prod.product.component.modal.*;
+import com.uas.platform.b2c.prod.product.component.modal.Component;
+import com.uas.platform.b2c.prod.product.component.modal.ComponentCrawlSubDetail;
+import com.uas.platform.b2c.prod.product.component.modal.ComponentCrawlSubmit;
+import com.uas.platform.b2c.prod.product.component.modal.ComponentSubmit;
 import com.uas.platform.b2c.prod.product.component.service.ComponentSubmitService;
 import com.uas.platform.b2c.trade.support.ResultMap;
 import com.uas.platform.core.exception.IllegalOperatorException;
-import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.model.ServiceCode;
@@ -19,6 +20,8 @@ import com.uas.platform.core.model.Status;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;
@@ -45,8 +48,7 @@ public class ComponentSubmitController {
 	@Autowired
 	private OperationInfoService operationInfoService;
 
-	private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
-
+    private final Logger logger = LoggerFactory.getLogger(ComponentSubmitController.class);
 	/**
 	 * 保存标准器件提交信息(来自新增品牌,修改品牌)
 	 *
@@ -59,7 +61,7 @@ public class ComponentSubmitController {
 		componentSubmit.setId(null);
 		componentSubmit = componentSubmitService.saveComponentSubmit(componentSubmit);
 		operationInfoService.save(componentSubmit, ServiceCode.componentApply.value());
-		logger.log("器件维护", "保存器件申请", "保存器件申请,原厂型号:" + componentSubmit.getCode(), componentSubmit.getCode(), componentSubmit.getId());
+		logger.info("器件维护", "保存器件申请", "保存器件申请,原厂型号:" + componentSubmit.getCode(), componentSubmit.getCode(), componentSubmit.getId());
 		return componentSubmit;
 	}
 
@@ -76,7 +78,7 @@ public class ComponentSubmitController {
 		componentSubmit.setId(null);
 		componentSubmit = componentSubmitService.saveComponentSubmit(componentSubmit, uploadItem);
 		operationInfoService.save(componentSubmit, ServiceCode.componentApply.value());
-		logger.log("器件维护", "保存器件申请", "保存器件申请,原厂型号:" + componentSubmit.getCode(), componentSubmit.getCode(), componentSubmit.getId());
+		logger.info("器件维护", "保存器件申请", "保存器件申请,原厂型号:" + componentSubmit.getCode(), componentSubmit.getCode(), componentSubmit.getId());
 		return componentSubmit;
 	}
 
@@ -89,7 +91,7 @@ public class ComponentSubmitController {
 	@RequestMapping(value = "/audit", params = "valid=true", method = RequestMethod.PUT)
 	public Component valid(@RequestBody String json) {
 		ComponentSubmit componentSubmit = FastjsonUtils.fromJson(json, ComponentSubmit.class);
-		logger.log("器件维护", "审核通过器件申请", "审核通过器件申请,原厂型号:" + componentSubmit.getCode(), componentSubmit.getId().toString(), componentSubmit.getId());
+		logger.info("器件维护", "审核通过器件申请", "审核通过器件申请,原厂型号:" + componentSubmit.getCode(), componentSubmit.getId().toString(), componentSubmit.getId());
 		return componentSubmitService.componentSubmitAudit(componentSubmit);
 	}
 
@@ -104,7 +106,7 @@ public class ComponentSubmitController {
 	public ComponentSubmit invalid(@PathVariable("id") Long id, @RequestBody String json) {
 		JSONObject jsonObject = FastjsonUtils.parseObject(json);
 		String auditOpinion = String.valueOf(jsonObject.get("auditOpinion"));
-		logger.log("器件维护", "审核不通过器件申请", "审核不通过器件申请,审核意见:" + auditOpinion, id.toString(), id);
+		logger.info("器件维护", "审核不通过器件申请", "审核不通过器件申请,审核意见:" + auditOpinion, id.toString(), id);
 		return componentSubmitService.componentSubmitInvalid(id, auditOpinion);
 	}
 
@@ -127,7 +129,7 @@ public class ComponentSubmitController {
 		if (status != null) {
 			info.filter("status", status);
 		}
-		logger.log("器件维护", "获取器件申请", "分页获取器件申请信息");
+		logger.info("器件维护", "获取器件申请", "分页获取器件申请信息");
 		return componentSubmitService.findAllComponentSubmit(info, keyword);
 	}
 
@@ -141,7 +143,7 @@ public class ComponentSubmitController {
 	public Page<ComponentSubmit> getUnAuditedComponentSubmit(PageParams params, String keyword) {
 		PageInfo info = new PageInfo(params);
 		info.filter("status", Status.UNAUDIT.value());
-		logger.log("器件维护", "获取待审核器件申请", "分页获取待审核器件申请信息");
+		logger.info("器件维护", "获取待审核器件申请", "分页获取待审核器件申请信息");
 		return componentSubmitService.findAllComponentSubmit(info, keyword);
 	}
 
@@ -155,7 +157,7 @@ public class ComponentSubmitController {
 	public Page<ComponentSubmit> getAllowComponentSubmit(PageParams params, String keyword) {
 		PageInfo info = new PageInfo(params);
 		info.filter("status", Status.ALLOW.value());
-		logger.log("器件维护", "获取审核通过器件申请", "分页获取审核通过器件申请信息");
+		logger.info("器件维护", "获取审核通过器件申请", "分页获取审核通过器件申请信息");
 		return componentSubmitService.findAllComponentSubmit(info, keyword);
 	}
 
@@ -169,7 +171,7 @@ public class ComponentSubmitController {
 	public Page<ComponentSubmit> getNotAllowComponentSubmit(PageParams params, String keyword) {
 		PageInfo info = new PageInfo(params);
 		info.filter("status", Status.NOTALLOW.value());
-		logger.log("器件维护", "获取审核不通过器件申请", "分页获取审核不通过器件申请信息");
+		logger.info("器件维护", "获取审核不通过器件申请", "分页获取审核不通过器件申请信息");
 		return componentSubmitService.findAllComponentSubmit(info, keyword);
 	}
 
@@ -181,7 +183,7 @@ public class ComponentSubmitController {
 	 */
 	@RequestMapping(value = "/{id}", method = RequestMethod.GET)
 	public ComponentSubmit findComponentSubmitById(@PathVariable("id") Long id) {
-		logger.log("器件维护", "获取器件申请", "获取器件申请信息,id :" + id, id.toString(), id);
+		logger.info("器件维护", "获取器件申请", "获取器件申请信息,id :" + id, id.toString(), id);
 		return componentSubmitService.findComponentSubmitById(id);
 	}
 
@@ -199,7 +201,7 @@ public class ComponentSubmitController {
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("componentSubmits", submitDetails);
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/product/componentBatchMaintenance", "优软商城器件批量申请"));
-		logger.log("器件申请", "下载器件批量申请的Excel模板");
+		logger.info("器件申请", "下载器件批量申请的Excel模板");
 		return modelAndView;
 	}
 
@@ -229,7 +231,7 @@ public class ComponentSubmitController {
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
-		logger.log("器件申请", "导入Excel批量上传器件申请");
+		logger.info("器件申请", "导入Excel批量上传器件申请");
 		return submit;
 	}
 
@@ -452,7 +454,7 @@ public class ComponentSubmitController {
 	@Transactional
 	@RequestMapping(value = "upload/componentCrawls", method = RequestMethod.POST)
 	public ResultMap uploadComponentCrawlV2(FileUpload uploadItem) {
-		logger.log("器件上传", "器件上传");
+		logger.info("器件上传", "器件上传");
 		return componentSubmitService.uploadComponentCrawl(uploadItem);
 	}
 
@@ -466,7 +468,7 @@ public class ComponentSubmitController {
 	@Transactional
 	@RequestMapping(value = "upload/componentCrawlsWithSame/{kindContrastId}", method = RequestMethod.POST)
 	public ResultMap uploadComponentCrawlWithSame(FileUpload uploadItem, @PathVariable("kindContrastId") Long kindContrastId) {
-		logger.log("器件上传", "器件重新上传");
+		logger.info("器件上传", "器件重新上传");
 		return componentSubmitService.uploadComponentCrawlWithSame(uploadItem, kindContrastId);
 	}
 
@@ -479,7 +481,7 @@ public class ComponentSubmitController {
 	 */
 	@RequestMapping(value = "/submit/count", method = RequestMethod.GET)
 	public ResultMap countUnAuditedComponentSubmit(Long fromDate, Long toDate) {
-		logger.log("品牌维护", "统计未审核品牌信息");
+		logger.info("品牌维护", "统计未审核品牌信息");
 		return componentSubmitService.countUnAuditedComponentSubmit(fromDate, toDate);
 	}
 }

+ 8 - 9
src/main/java/com/uas/platform/b2c/prod/product/component/controller/ComponentVersionController.java

@@ -3,8 +3,8 @@ package com.uas.platform.b2c.prod.product.component.controller;
 import com.uas.platform.b2c.prod.product.component.modal.ComponentVersion;
 import com.uas.platform.b2c.prod.product.component.modal.ComponentVersionInfo;
 import com.uas.platform.b2c.prod.product.component.service.ComponentVersionService;
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
-import com.uas.platform.core.logging.BufferedLoggerManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -24,8 +24,7 @@ public class ComponentVersionController {
 	@Autowired
 	private ComponentVersionService componentVersionService;
 
-	private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
-
+    private final Logger logger = LoggerFactory.getLogger(ComponentVersionController.class);
 	/**
 	 * 根据uuid查找ComponentVersion
 	 * @param uuid
@@ -33,7 +32,7 @@ public class ComponentVersionController {
 	 */
 	@RequestMapping(value = "/list/{uuid}", method = RequestMethod.GET)
 	public List<ComponentVersion> findListComponentVersionByUuid(@PathVariable("uuid") String uuid) {
-		logger.log("器件版本信息", "获取版本信息", "根据uuid:" + uuid + " 获取版本信息");
+		logger.info("器件版本信息", "获取版本信息", "根据uuid:" + uuid + " 获取版本信息");
 		return componentVersionService.findListComponentVersionByUuid(uuid);
 	}
 
@@ -44,7 +43,7 @@ public class ComponentVersionController {
 	 */
 	@RequestMapping(value = "/count/{uuid}", method = RequestMethod.GET)
 	public short findComponentVersionCountByUuid(@PathVariable("uuid") String uuid) {
-		logger.log("器件版本信息", "获取版本信息数量", "根据uuid:" + uuid + " 获取版本信息数量");
+		logger.info("器件版本信息", "获取版本信息数量", "根据uuid:" + uuid + " 获取版本信息数量");
 		return componentVersionService.findCountComponentVersionByUuid(uuid);
 	}
 
@@ -61,18 +60,18 @@ public class ComponentVersionController {
 			if (componentVersionService.findCountComponentVersionByUuid(uuid) > 0) {
 				ComponentVersion componentVersion = new ComponentVersion();
 				componentVersion.setVersion((short) 0);
-				logger.log("器件版本信息", "获取版本信息", "根据uuid:" + uuid + " 和version:" + version + " 获取版本信息");
+				logger.info("器件版本信息", "获取版本信息", "根据uuid:" + uuid + " 和version:" + version + " 获取版本信息");
 				return (new ComponentVersionInfo(componentVersion));
 			} else {
 				ComponentVersion componentVersion = new ComponentVersion();
 				componentVersion.setVersion((short) -1);
-				logger.log("器件版本信息", "获取版本信息", "根据uuid:" + uuid + " 和version:" + version + " 获取版本信息");
+				logger.info("器件版本信息", "获取版本信息", "根据uuid:" + uuid + " 和version:" + version + " 获取版本信息");
 				return (new ComponentVersionInfo(componentVersion));
 			}
 		} else {
 			ComponentVersionInfo componentVersionInfo = new ComponentVersionInfo(componentVersionService.findComponentVersionByUuidAndVersion(uuid, version));
 			componentVersionInfo.setVersionCount(componentVersionService.findCountComponentVersionByUuid(uuid));
-			logger.log("器件版本信息", "获取版本信息", "根据uuid:" + uuid + " 和version:" + version + " 获取版本信息");
+			logger.info("器件版本信息", "获取版本信息", "根据uuid:" + uuid + " 和version:" + version + " 获取版本信息");
 			return componentVersionInfo;
 		}
 	}

+ 6 - 7
src/main/java/com/uas/platform/b2c/prod/product/kind/controller/KindAdviceController.java

@@ -1,12 +1,12 @@
 package com.uas.platform.b2c.prod.product.kind.controller;
 
+import com.uas.platform.b2c.core.utils.FastjsonUtils;
 import com.uas.platform.b2c.prod.product.kind.model.KindAdvice;
 import com.uas.platform.b2c.prod.product.kind.service.KindAdviceService;
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
-import com.uas.platform.b2c.core.utils.FastjsonUtils;
-import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Controller;
@@ -28,8 +28,7 @@ public class KindAdviceController {
 	@Autowired
 	private KindAdviceService kindAdviceService;
 
-	private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
-
+    private final Logger logger = LoggerFactory.getLogger(KindAdviceController.class);
 	/**
 	 * 用户提交一个类目结构建议
 	 * 
@@ -39,7 +38,7 @@ public class KindAdviceController {
 	@ResponseBody
 	public void submit(@RequestBody String json) {
 		KindAdvice advice = FastjsonUtils.fromJson(json, KindAdvice.class);
-		logger.log("物料名称(类目)建议", "保存物料名称(类目)建议", "保存物料名称(类目)建议,原因" + advice.getReason());
+		logger.info("物料名称(类目)建议", "保存物料名称(类目)建议", "保存物料名称(类目)建议,原因" + advice.getReason());
 		kindAdviceService.save(advice);
 	}
 
@@ -52,7 +51,7 @@ public class KindAdviceController {
 	@ResponseBody
 	public Page<KindAdvice> getAllAdvice(PageParams params) {
 		PageInfo info = new PageInfo(params);
-		logger.log("物料名称(类目)建议", "获取物料名称(类目)建议", "分页获取物料名称(类目)建议信息");
+		logger.info("物料名称(类目)建议", "获取物料名称(类目)建议", "分页获取物料名称(类目)建议信息");
 		return kindAdviceService.findAll(info);
 	}
 }

+ 17 - 24
src/main/java/com/uas/platform/b2c/prod/product/kind/controller/KindController.java

@@ -1,23 +1,17 @@
 package com.uas.platform.b2c.prod.product.kind.controller;
 
+import com.uas.platform.b2c.core.utils.FastjsonUtils;
 import com.uas.platform.b2c.prod.product.kind.model.Kind;
 import com.uas.platform.b2c.prod.product.kind.model.KindInfo;
 import com.uas.platform.b2c.prod.product.kind.model.KindProperty;
 import com.uas.platform.b2c.prod.product.kind.service.KindService;
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
-import com.uas.platform.b2c.core.utils.FastjsonUtils;
 import com.uas.platform.b2c.trade.support.ResultMap;
-import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.wordnik.swagger.annotations.ApiOperation;
 import com.wordnik.swagger.annotations.ApiParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-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 java.util.List;
@@ -33,8 +27,7 @@ public class KindController {
 	@Autowired
 	private KindService kindService;
 
-	private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
-
+    private final Logger logger = LoggerFactory.getLogger(KindController.class);
 	/**
 	 * 新增类目
 	 * 
@@ -47,7 +40,7 @@ public class KindController {
 	public Kind save(Long parentId, @RequestBody String json) {
 		Kind kind = FastjsonUtils.fromJson(json, Kind.class);
 		kind = kindService.save(parentId, kind);
-		logger.log("物料名称(类目)管理", "新增物料名称(类目)", "新增物料名称(类目),物料名称(类目)名:" + kind.getNameCn(), kind.getNameCn(), kind.getId());
+		logger.info("物料名称(类目)管理", "新增物料名称(类目)", "新增物料名称(类目),物料名称(类目)名:" + kind.getNameCn(), kind.getNameCn(), kind.getId());
 		return kind;
 	}
 
@@ -66,7 +59,7 @@ public class KindController {
 	public Kind update(@ApiParam(required = true, value = "物料名称(类目)ID") @PathVariable("kindId") Long kindId, @ApiParam(required = true, value = "提交的数据") @RequestBody String json) {
 		Kind kind = FastjsonUtils.fromJson(json, Kind.class);
 		kind = kindService.updateKind(kindId, kind);
-		logger.log("物料名称(类目)管理", "修改物料名称(类目)", "修改物料名称(类目)名:" + kind.getNameCn(), kind.getNameCn(), kindId);
+		logger.info("物料名称(类目)管理", "修改物料名称(类目)", "修改物料名称(类目)名:" + kind.getNameCn(), kind.getNameCn(), kindId);
 		return kind;
 	}
 
@@ -78,7 +71,7 @@ public class KindController {
 	@RequestMapping(value = "/{kindId}", method = RequestMethod.DELETE)
 	@ResponseBody
 	public void delete(@PathVariable("kindId") Long kindId) {
-		logger.log("物料名称(类目)管理", "删除物料名称(类目)", "删除物料名称(类目)id:" + kindId);
+		logger.info("物料名称(类目)管理", "删除物料名称(类目)", "删除物料名称(类目)id:" + kindId);
 		kindService.delete(kindId);
 	}
 
@@ -93,7 +86,7 @@ public class KindController {
 	@RequestMapping(value = "/number", method = RequestMethod.POST, params = "operate=exchange")
 	@ResponseBody
 	public void exchangeNumber(Long preId, Long postId) {
-		logger.log("物料名称(类目)管理", "修改物料名称(类目)排序", "物料名称(类目)id顺序交换:" + preId + " 和 " + postId);
+		logger.info("物料名称(类目)管理", "修改物料名称(类目)排序", "物料名称(类目)id顺序交换:" + preId + " 和 " + postId);
 		kindService.exchangeNumber(preId, postId);
 	}
 
@@ -107,7 +100,7 @@ public class KindController {
 	@ResponseBody
 	public List<KindProperty> updateProperties(@PathVariable("kindId") Long kindId, @RequestBody String json) {
 		List<KindProperty> properties = FastjsonUtils.fromJsonArray(json, KindProperty.class);
-		logger.log("物料名称(类目)管理", "修改物料名称(类目)属性", "修改物料名称(类目)属性,物料名称(类目)id:" + kindId);
+		logger.info("物料名称(类目)管理", "修改物料名称(类目)属性", "修改物料名称(类目)属性,物料名称(类目)id:" + kindId);
 		return kindService.updateProperties(kindId, properties);
 	}
 
@@ -121,7 +114,7 @@ public class KindController {
 	@RequestMapping(value = "/kindCount/reset", method = RequestMethod.GET)
 	@ResponseBody
 	public void resetComponentCountGroupByKind() {
-		logger.log("物料名称(类目)管理", "统计物料名称(类目)下器件数量");
+		logger.info("物料名称(类目)管理", "统计物料名称(类目)下器件数量");
 		kindService.setKindCountByComponentActive();
 	}
 
@@ -135,7 +128,7 @@ public class KindController {
 	@RequestMapping(value = "/kindPropertyValues/reset", method = RequestMethod.GET)
 	@ResponseBody
 	public void resetKindPropertyValues() {
-		logger.log("物料名称(类目)管理", "物料名称(类目)标准属性可能值计算");
+		logger.info("物料名称(类目)管理", "物料名称(类目)标准属性可能值计算");
 		kindService.resetKindPropertyValues();
 	}
 
@@ -157,7 +150,7 @@ public class KindController {
 	 */
 	@RequestMapping(value = "/kindProperty/{kindPropertyId}", method = RequestMethod.DELETE)
 	public KindProperty deleteKindProperty(@PathVariable("kindPropertyId") Long kindPropertyId) {
-		logger.log("物料名称(类目)属性管理", "删除物料名称(类目)属性", "物料名称(类目)属性id:" + kindPropertyId);
+		logger.info("物料名称(类目)属性管理", "删除物料名称(类目)属性", "物料名称(类目)属性id:" + kindPropertyId);
 		return kindService.deleteKindProperty(kindPropertyId);
 	}
 
@@ -170,7 +163,7 @@ public class KindController {
 	@RequestMapping(value = "/kindProperty/add", method = RequestMethod.PUT)
 	public KindProperty addKindProperty(@RequestBody String json) {
 		KindProperty kindProperty = FastjsonUtils.fromJson(json, KindProperty.class);
-		logger.log("物料名称(类目)属性管理", "增加物料名称(类目)属性", "增加物料名称(类目)属性,属性id:" + kindProperty.getPropertyId() + ",属性名:" + kindProperty.getProperty().getLabelCn());
+		logger.info("物料名称(类目)属性管理", "增加物料名称(类目)属性", "增加物料名称(类目)属性,属性id:" + kindProperty.getPropertyId() + ",属性名:" + kindProperty.getProperty().getLabelCn());
 		return kindService.addKindProperty(kindProperty);
 	}
 
@@ -183,7 +176,7 @@ public class KindController {
 	@RequestMapping(value = "/kindProperty/update", method = RequestMethod.PUT)
 	public KindProperty updateKindProperty(@RequestBody String json) {
 		KindProperty kindProperty = FastjsonUtils.fromJson(json, KindProperty.class);
-		logger.log("物料名称(类目)属性管理", "更新物料名称(类目)属性", "更新物料名称(类目)属性,属性id: " + kindProperty.getPropertyId());
+		logger.info("物料名称(类目)属性管理", "更新物料名称(类目)属性", "更新物料名称(类目)属性,属性id: " + kindProperty.getPropertyId());
 		return kindService.updateKindProperty(kindProperty);
 	}
 
@@ -198,7 +191,7 @@ public class KindController {
 	 */
 	@RequestMapping(value = "/kindProperty/changeDetno", method = RequestMethod.PUT)
 	public List<KindProperty> changeDetno(Long activeId, Long passiveId) {
-		logger.log("物料名称(类目)属性管理", "调整物料名称(类目)属性顺序", "属性id : " + activeId + ",属性id: " + passiveId);
+		logger.info("物料名称(类目)属性管理", "调整物料名称(类目)属性顺序", "属性id : " + activeId + ",属性id: " + passiveId);
 		return kindService.changeDetno(activeId, passiveId);
 	}
 
@@ -211,7 +204,7 @@ public class KindController {
 	 */
 	@RequestMapping(value = "/kindProperty/changeKindProperty")
 	public KindProperty changeKindProperty(String labelCn, Long kindPropertyId) {
-		logger.log("物料名称(类目)属性管理", "更换物料名称(类目)属性", "物料名称(类目)属性id:" + kindPropertyId + ",替换成属性: " + labelCn);
+		logger.info("物料名称(类目)属性管理", "更换物料名称(类目)属性", "物料名称(类目)属性id:" + kindPropertyId + ",替换成属性: " + labelCn);
 		return kindService.changeKindProperty(labelCn, kindPropertyId);
 	}
 

+ 5 - 6
src/main/java/com/uas/platform/b2c/prod/product/property/controller/PropertySubmitController.java

@@ -2,8 +2,8 @@ package com.uas.platform.b2c.prod.product.property.controller;
 
 import com.uas.platform.b2c.prod.product.property.model.PropertyValueSubmit;
 import com.uas.platform.b2c.prod.product.property.service.PropertySubmitService;
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
-import com.uas.platform.core.logging.BufferedLoggerManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -24,8 +24,7 @@ public class PropertySubmitController {
 	@Autowired
 	private PropertySubmitService propertySubmitService;
 
-	private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
-
+    private final Logger logger = LoggerFactory.getLogger(PropertySubmitController.class);
 	/**
 	 * 根据ComponentSubmit.id查找ListPropertiesSubmit
 	 * 
@@ -34,7 +33,7 @@ public class PropertySubmitController {
 	 */
 	@RequestMapping(value = "/{id}", method = RequestMethod.GET)
 	public List<PropertyValueSubmit> findListPropertiesSubmitById(@PathVariable("id") Long id) {
-		logger.log("器件属性申请", "获取器件申请对应的属性申请", "获取器件申请id为 " + id + " 的属性申请信息", id.toString(), null);
+		logger.info("器件属性申请", "获取器件申请对应的属性申请", "获取器件申请id为 " + id + " 的属性申请信息", id.toString(), null);
 		return propertySubmitService.findPropertySubmitByComponentId(id);
 	}
 
@@ -47,7 +46,7 @@ public class PropertySubmitController {
 	 */
 	@RequestMapping(value = "/property", method = RequestMethod.GET)
 	public PropertyValueSubmit findPropertySubmit(Long componentSubmitId, Long propertyId) {
-		logger.log("器件属性申请", "获取器件申请的单个属性申请", "获取器件申请id为: " + componentSubmitId + ",属性id为: " + propertyId);
+		logger.info("器件属性申请", "获取器件申请的单个属性申请", "获取器件申请id为: " + componentSubmitId + ",属性id为: " + propertyId);
 		return propertySubmitService.findByComponentIdAndPropertyId(componentSubmitId, propertyId);
 	}
 }

+ 9 - 13
src/main/java/com/uas/platform/b2c/trade/deprecated/controller/CustomerServiceController.java

@@ -1,15 +1,11 @@
 package com.uas.platform.b2c.trade.deprecated.controller;
 
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.trade.deprecated.model.CustomerServiceLog;
 import com.uas.platform.b2c.trade.deprecated.service.CustomerServiceLogService;
-import com.uas.platform.core.logging.BufferedLoggerManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 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.*;
 
 @RestController
 @RequestMapping("/trade/order/service")
@@ -17,16 +13,16 @@ public class CustomerServiceController {
 	
 	@Autowired
 	private CustomerServiceLogService customerServiceLogService;
-	
-	private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
-	
-	/**
+
+    private final Logger logger = LoggerFactory.getLogger(CustomerServiceController.class);
+
+    /**
 	 * 添加和修改服务记录信息
 	 */
 	@RequestMapping(value = "/save", method = RequestMethod.POST)
 	public CustomerServiceLog saveCustomerServiceLog(@RequestBody CustomerServiceLog customerServiceLog) {
 		CustomerServiceLog customerService = customerServiceLogService.saveCustomerService(customerServiceLog);
-		logger.log("买家订单管理", "添加或修改客服信息", "处理订单号:" + customerService.getOrderid() + ",服务类型:" + customerService.getServiceType());
+		logger.info("买家订单管理", "添加或修改客服信息", "处理订单号:" + customerService.getOrderid() + ",服务类型:" + customerService.getServiceType());
 		return customerService;
 	}
 	
@@ -36,7 +32,7 @@ public class CustomerServiceController {
 	@RequestMapping(method = RequestMethod.GET)
 	public CustomerServiceLog findOneLog(@RequestParam("orderid") String orderid, @RequestParam("serviceType") Integer serviceType) {
 		CustomerServiceLog customerService = customerServiceLogService.findByOrderidAndServiceType(orderid, serviceType);
-		logger.log("买家订单管理", "查询客服信息", "处理订单号:" + customerService.getOrderid() + ",服务类型:" + customerService.getServiceType());
+		logger.info("买家订单管理", "查询客服信息", "处理订单号:" + customerService.getOrderid() + ",服务类型:" + customerService.getServiceType());
 		return customerService;
 	}
 

+ 7 - 7
src/main/java/com/uas/platform/b2c/trade/inquiry/controller/ChargeController.java

@@ -1,12 +1,12 @@
 package com.uas.platform.b2c.trade.inquiry.controller;
 
 import com.uas.platform.b2c.core.support.SystemSession;
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.core.utils.FastjsonUtils;
 import com.uas.platform.b2c.trade.inquiry.model.TradeCharge;
-import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.ui.ModelMap;
@@ -28,8 +28,8 @@ public class ChargeController {
 
 	@Autowired
 	private com.uas.platform.b2c.trade.inquiry.service.ChargeService ChargeService;
-	
-	private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
+
+    private final Logger logger = LoggerFactory.getLogger(ChargeController.class);
 
 
     /**
@@ -44,7 +44,7 @@ public class ChargeController {
 	public Page<TradeCharge> findIndividualVendor(PageParams params, String keyword, String status) {
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("sellerenuu", SystemSession.getUser().getEnterprise().getUu());
-		logger.log("议价单信息管理", "根据状态查看不同的议价单(供应商)");
+		logger.info("议价单信息管理", "根据状态查看不同的议价单(供应商)");
 		return ChargeService.findIndividualVendor(pageInfo, keyword, status);
 	}
 
@@ -57,7 +57,7 @@ public class ChargeController {
     @RequestMapping(value = "/refuse", method = RequestMethod.PUT)
 	public ModelMap refuse(@RequestBody String json) {
 		TradeCharge charge = FastjsonUtils.fromJson(json, TradeCharge.class);
-		logger.log("议价单信息管理", "审核不通过", "审核不通过的id:" + charge.getId() + ",操作人:" + SystemSession.getUser().getUserUU() + "-" + SystemSession.getUser().getUserName());
+		logger.info("议价单信息管理", "审核不通过", "审核不通过的id:" + charge.getId() + ",操作人:" + SystemSession.getUser().getUserUU() + "-" + SystemSession.getUser().getUserName());
 		return ChargeService.refuse(charge);
 	}
 
@@ -70,7 +70,7 @@ public class ChargeController {
     @RequestMapping(value = "/accept", method = RequestMethod.PUT)
 	public ModelMap accept(@RequestBody String json) {
 		TradeCharge charge = FastjsonUtils.fromJson(json, TradeCharge.class);
-		logger.log("议价单信息管理", "审核通过", "审核通过的id:" + charge.getId() + ",操作人:" + SystemSession.getUser().getUserUU() + "-" + SystemSession.getUser().getUserName());
+		logger.info("议价单信息管理", "审核通过", "审核通过的id:" + charge.getId() + ",操作人:" + SystemSession.getUser().getUserUU() + "-" + SystemSession.getUser().getUserName());
 		return ChargeService.accept(charge);
 	}
 

+ 54 - 65
src/main/java/com/uas/platform/b2c/trade/order/controller/OrderController.java

@@ -8,7 +8,6 @@ import com.uas.platform.b2c.common.account.service.VendorService;
 import com.uas.platform.b2c.core.constant.SplitChar;
 import com.uas.platform.b2c.core.constant.Type;
 import com.uas.platform.b2c.core.support.SystemSession;
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.core.support.view.JxlsExcelView;
 import com.uas.platform.b2c.core.utils.FastjsonUtils;
 import com.uas.platform.b2c.core.utils.StringUtilB2C;
@@ -22,32 +21,23 @@ import com.uas.platform.b2c.trade.order.service.OrderService;
 import com.uas.platform.b2c.trade.order.type.ResultMapType;
 import com.uas.platform.b2c.trade.support.ResultMap;
 import com.uas.platform.core.exception.IllegalOperatorException;
-import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.model.Status;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.StringUtils;
-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.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.view.json.MappingJackson2JsonView;
 
 import javax.management.OperationsException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import static com.uas.platform.b2c.core.utils.StringUtilB2C.decodeValue;
 
@@ -70,8 +60,7 @@ public class OrderController {
 	@Autowired
 	private OrderDetailService orderDetailService;
 
-	private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
-
+    private final Logger logger = LoggerFactory.getLogger(OrderController.class);
 	/**
 	 * 某个人的某些订单的获取
 	 *
@@ -84,7 +73,7 @@ public class OrderController {
 		// 判断是否可以显示订单 必须是用户UU下的订单号才可以显示
 		String[] ids = orderid.split(SplitChar.HYPHEN);
 		assert logger != null;
-		logger.log("买家订单管理", "获取订单信息", "获取订单号: " + orderid);
+		logger.info("买家订单管理", "获取订单信息", "获取订单号: " + orderid);
 		return orderService.findOnesByOrderId(ids);
 	}
 
@@ -119,7 +108,7 @@ public class OrderController {
 		assert logger != null;
 		if(resultMap.getCode() == ResultMapType.OK.getCode()) {
 			Order order = (Order) resultMap.getData();
-			logger.log("买家订单管理", "立即购买", "生成订单号:" + order.getOrderid());
+			logger.info("买家订单管理", "立即购买", "生成订单号:" + order.getOrderid());
 		}
 		return resultMap;
 	}
@@ -138,7 +127,7 @@ public class OrderController {
 		String orderid= fromJson.get("orderid").toString();
 		orderService.deleteOrderDetails(orderDetailIds, orderid);
 		assert logger != null;
-		logger.log("买家订单管理", "买家删除订单明细", "删除订单明细: " + ids);
+		logger.info("买家订单管理", "买家删除订单明细", "删除订单明细: " + ids);
 		return "success";
 	}
 
@@ -155,7 +144,7 @@ public class OrderController {
 	public ResultMap ensureOnes(@PathVariable String orderid, @RequestBody JSONObject[] ordersInfo) {
 		orderid = StringUtilB2C.decodeValue(orderid);
 		assert  logger != null;
-		logger.log("买家订单管理", "买家确认订单", "确认订单号: " + orderid);
+		logger.info("买家订单管理", "买家确认订单", "确认订单号: " + orderid);
 		return orderService.ensureOrder(orderid, ordersInfo);
 	}
 
@@ -167,7 +156,7 @@ public class OrderController {
 	@RequestMapping(value = "/simpleinfo/ones", method = RequestMethod.GET)
 	public List<OrderSimpleInfo> findOnesSimpleInfo() {
 		assert logger != null;
-		logger.log("买家订单管理", "获取个人订单简要信息");
+		logger.info("买家订单管理", "获取个人订单简要信息");
 		return orderService.findOnesSimpleInfo();
 	}
 
@@ -179,7 +168,7 @@ public class OrderController {
 	@RequestMapping(value = "/simpleinfo/ones", method = RequestMethod.GET, params = "_status=tobeConfirmed")
 	public List<OrderSimpleInfo> findOnesToBeConfirmedSimpleInfo() {
 		assert logger != null;
-		logger.log("买家订单管理", "获取个人待确认订单简要信息");
+		logger.info("买家订单管理", "获取个人待确认订单简要信息");
 		return orderService.findOnesToBeConfirmedSimpleInfo();
 	}
 
@@ -191,7 +180,7 @@ public class OrderController {
 	@RequestMapping(value = "/simpleinfo/ones", method = RequestMethod.GET, params = "_status=tobePaid")
 	public List<OrderSimpleInfo> findOnesToBePaidSimpleInfo() {
 		assert logger != null;
-		logger.log("买家订单管理", "获取个人待付款订单简要信息");
+		logger.info("买家订单管理", "获取个人待付款订单简要信息");
 		return orderService.findOnesToBePaidSimpleInfo();
 	}
 
@@ -208,7 +197,7 @@ public class OrderController {
 		info.filter("status", Status.TOBEPAID.value());
 		info.filter("buyeruu", SystemSession.getUser().getUserUU());
 		assert logger != null;
-		logger.log("买家订单管理", "分页获取个人待付款订单简要信息");
+		logger.info("买家订单管理", "分页获取个人待付款订单简要信息");
 		return orderService.findOnesToBePaidPageSimpleInfo(info, keyword);
 	}
 
@@ -220,7 +209,7 @@ public class OrderController {
 	@RequestMapping(value = "/simpleinfo/ones", method = RequestMethod.GET, params = "_status=paid")
 	public List<OrderSimpleInfo> findOnesPaidSimpleInfo() {
 		assert logger != null;
-		logger.log("买家订单管理", "获取个人已付款订单简要信息");
+		logger.info("买家订单管理", "获取个人已付款订单简要信息");
 		return orderService.findOnesPaidSimpleInfo();
 	}
 
@@ -232,7 +221,7 @@ public class OrderController {
 	@RequestMapping(value = "/simpleinfo/ones", method = RequestMethod.GET, params = "_status=inbounds")
 	public List<OrderSimpleInfo> findOnesInbounds() {
 		assert logger != null;
-		logger.log("买家订单管理", "获取个人待出货、出货中、已出货、发货中、待收货订单简要信息");
+		logger.info("买家订单管理", "获取个人待出货、出货中、已出货、发货中、待收货订单简要信息");
 		return orderService.findOnesPaidInbounds();
 	}
 
@@ -244,7 +233,7 @@ public class OrderController {
 	@RequestMapping(value = "/simpleinfo/ones", method = RequestMethod.GET, params = "_status=received")
 	public List<OrderSimpleInfo> findReceived() {
 		assert logger != null;
-		logger.log("买家订单管理", "获取个人已收货订单简要信息");
+		logger.info("买家订单管理", "获取个人已收货订单简要信息");
 		return orderService.findReceived();
 	}
 
@@ -272,7 +261,7 @@ public class OrderController {
 		List<String> orderIds = new ArrayList<>();
 		Collections.addAll(orderIds, ids);
 		assert logger != null;
-		logger.log("买家订单管理", "取消订单", "取消订单号: " + orderid);
+		logger.info("买家订单管理", "取消订单", "取消订单号: " + orderid);
 		return orderService.cancle(orderIds);
 	}
 
@@ -286,7 +275,7 @@ public class OrderController {
 	@RequestMapping(value = "/{orderid}/ensurePay", method = RequestMethod.PUT)
 	public Order setToBeShipped(@PathVariable String orderid) throws OperationsException {
 		assert logger != null;
-		logger.log("买家订单管理", "平台确认收款", "确认收款订单号: " + orderid);
+		logger.info("买家订单管理", "平台确认收款", "确认收款订单号: " + orderid);
 		return orderService.ensurePayed(orderid, null);
 	}
 
@@ -300,7 +289,7 @@ public class OrderController {
 	public String batchToBeShipped(@PathVariable String orderids) {
 		orderService.batchToEnsureReceMoney(orderids);
 		assert logger != null;
-		logger.log("买家订单管理", "平台批量确认收款", "确认收款订单号: " + orderids);
+		logger.info("买家订单管理", "平台批量确认收款", "确认收款订单号: " + orderids);
 		return "success";
 	}
 
@@ -313,7 +302,7 @@ public class OrderController {
 	@RequestMapping(value = "/{orderid}/received", method = RequestMethod.PUT)
 	public Order setReceived(@PathVariable String orderid) {
 		assert logger != null;
-		logger.log("买家订单管理", "买家确认收货", "确认收货订单号: " + orderid);
+		logger.info("买家订单管理", "买家确认收货", "确认收货订单号: " + orderid);
 		return orderService.setReceived(orderid);
 	}
 
@@ -330,7 +319,7 @@ public class OrderController {
 		info.filter("status", Status.PAID.value());
 		Page<Order> page = orderService.findPageByStatus(info, keyword);
 		assert logger != null;
-		logger.log("买家订单管理", "平台获取已付款买家订单信息");
+		logger.info("买家订单管理", "平台获取已付款买家订单信息");
 		return page;
 	}
 
@@ -347,7 +336,7 @@ public class OrderController {
 		info.filter("status", Status.TOBEPAID.value());
 		Page<Order> page = orderService.findPageByStatus(info, keyword);
 		assert logger != null;
-		logger.log("买家订单管理", "平台获取待付款买家订单信息");
+		logger.info("买家订单管理", "平台获取待付款买家订单信息");
 		return page;
 	}
 
@@ -364,7 +353,7 @@ public class OrderController {
 		info.filter("status", Status.TOBESHIPPED.value());
 		Page<Order> page = orderService.findPageByStatus(info, keyword);
 		assert logger != null;
-		logger.log("买家订单管理", "平台获取待出货买家订单信息");
+		logger.info("买家订单管理", "平台获取待出货买家订单信息");
 		return page;
 	}
 
@@ -381,7 +370,7 @@ public class OrderController {
 		info.filter("status", Status.SHIPPINGIN.value());
 		Page<Order> page = orderService.findPageByStatus(info, keyword);
 		assert logger != null;
-		logger.log("买家订单管理", "平台获取出货中买家订单信息");
+		logger.info("买家订单管理", "平台获取出货中买家订单信息");
 		return page;
 	}
 
@@ -398,7 +387,7 @@ public class OrderController {
 		info.filter("status", Status.SHIPPED.value());
 		Page<Order> page = orderService.findPageByStatus(info, keyword);
 		assert logger != null;
-		logger.log("买家订单管理", "平台获取已出货买家订单信息");
+		logger.info("买家订单管理", "平台获取已出货买家订单信息");
 		return page;
 	}
 
@@ -415,7 +404,7 @@ public class OrderController {
 		info.filter("status", Status.INBOUND.value());
 		Page<Order> page = orderService.findPageByStatus(info, keyword);
 		assert logger != null;
-		logger.log("买家订单管理", "平台获取待收货买家订单信息");
+		logger.info("买家订单管理", "平台获取待收货买家订单信息");
 		return page;
 	}
 
@@ -432,7 +421,7 @@ public class OrderController {
 		info.filter("status", Status.RECEIVED.value());
 		Page<Order> page = orderService.findPageByStatus(info, keyword);
 		assert logger != null;
-		logger.log("买家订单管理", "平台获取已收货买家订单信息");
+		logger.info("买家订单管理", "平台获取已收货买家订单信息");
 		return page;
 	}
 
@@ -448,7 +437,7 @@ public class OrderController {
 	public Page<Order> findAdminOrders(PageParams params, String keyword, String status) {
 		PageInfo pageInfo = new PageInfo(params);
 		assert logger != null;
-		logger.log("买家订单管理", "平台获取买家订单信息");
+		logger.info("买家订单管理", "平台获取买家订单信息");
 		return orderService.findAdminOrders(pageInfo, keyword, status);
 	}
 
@@ -471,7 +460,7 @@ public class OrderController {
 		Date end = endDate != null ? new Date(endDate) : null;
 
 		assert logger != null;
-		logger.log("买家订单管理", "买家获取买家订单信息");
+		logger.info("买家订单管理", "买家获取买家订单信息");
 		return orderService.findOrdersByInternal(pageInfo, keyword, status, available, false, start, end, exType,isRate);
 	}
 
@@ -488,7 +477,7 @@ public class OrderController {
 	public Page<Order> findIndividualProofs(PageParams params, String keyword, String status, Integer available) {
 		PageInfo pageInfo = new PageInfo(params);
 		assert logger != null;
-		logger.log("买家订单管理", "买家获取买家样品订单信息");
+		logger.info("买家订单管理", "买家获取买家样品订单信息");
 		return orderService.findIndividualOrders(pageInfo, keyword, status, available, true);
 	}
 
@@ -503,7 +492,7 @@ public class OrderController {
 		orderid = StringUtilB2C.decodeValue(orderid);
 		Order order = orderService.findOrderDetail(orderid);
 		assert logger != null;
-		logger.log("买家订单管理", "平台获取买家订单详情信息", "根据订单号: " + orderid + "获取订单详情", orderid, order.getId());
+		logger.info("买家订单管理", "平台获取买家订单详情信息", "根据订单号: " + orderid + "获取订单详情", orderid, order.getId());
 		return order;
 	}
 
@@ -518,7 +507,7 @@ public class OrderController {
 		String or_id = StringUtilB2C.decodeValue(orderid);
 		Order order = orderService.buyerOrderDetail(or_id);
 		assert logger != null;
-		logger.log("买家订单管理", "买家获取买家订单详情信息", "根据订单号: " + orderid + "获取订单详情", orderid, order.getId());
+		logger.info("买家订单管理", "买家获取买家订单详情信息", "根据订单号: " + orderid + "获取订单详情", orderid, order.getId());
 		return order;
 	}
 
@@ -532,7 +521,7 @@ public class OrderController {
 	public BankTransfer getBankInfo(@PathVariable Long banktfid) {
 		BankTransfer bankTransfer = orderService.getBankInfo(banktfid);
 		assert logger != null;
-		logger.log("银行信息管理", "获取银行转账信息", "根据银行转账信息id: " + banktfid + "获取银行转账信息详情", banktfid.toString(), banktfid);
+		logger.info("银行信息管理", "获取银行转账信息", "根据银行转账信息id: " + banktfid + "获取银行转账信息详情", banktfid.toString(), banktfid);
 		return bankTransfer;
 	}
 
@@ -546,7 +535,7 @@ public class OrderController {
 	public Order findByCode(@PathVariable String orderid) {
 		orderid = StringUtilB2C.decodeValue(orderid);
 		assert logger != null;
-		logger.log("买家订单管理", "获取买家订单信息", "根据订单号: " + orderid + "获取订单详情");
+		logger.info("买家订单管理", "获取买家订单信息", "根据订单号: " + orderid + "获取订单详情");
 		return orderService.findOnesByOrderId(orderid);
 	}
 
@@ -564,7 +553,7 @@ public class OrderController {
 		Enterprise enterprise = vendorService.getVendorByUu(sellerenuu);
 		map.put("enterprise", enterprise);
 		assert logger != null;
-		logger.log("买家订单管理", "获取买家订单买家卖家信息", "根据卖方企业uu号: " + sellerenuu + "获取买卖双方信息");
+		logger.info("买家订单管理", "获取买家订单买家卖家信息", "根据卖方企业uu号: " + sellerenuu + "获取买卖双方信息");
 		return map;
 	}
 
@@ -577,7 +566,7 @@ public class OrderController {
 	 */
 	@RequestMapping(value = "simpleinfo/ones/{orderid}/release", method = RequestMethod.PUT)
 	public String releaseOrder(@PathVariable String orderid, @RequestBody String reason) {
-		logger.log("买家订单管理", "取消订单", "根据订单号: " + orderid + "取消订单,释放库存");
+		logger.info("买家订单管理", "取消订单", "根据订单号: " + orderid + "取消订单,释放库存");
 		return orderService.releaseOrder(orderid, reason);
 	}
 
@@ -588,7 +577,7 @@ public class OrderController {
 	 */
 	@RequestMapping(value = "simpleinfo/ones/{orderid}/release/audit", method = RequestMethod.PUT)
 	public String aduitReleaseOrder(@PathVariable String orderid) {
-		logger.log("买家订单管理", "同意取消订单申请", "根据订单号: " + orderid + "取消订单,释放库存");
+		logger.info("买家订单管理", "同意取消订单申请", "根据订单号: " + orderid + "取消订单,释放库存");
 		return orderService.aduitReleaseOrder(orderid);
 	}
 
@@ -599,7 +588,7 @@ public class OrderController {
 	 */
 	@RequestMapping(value = "simpleinfo/ones/{orderid}/release/unaudit", method = RequestMethod.PUT)
 	public String unaduitReleaseOrder(@PathVariable String orderid) {
-		logger.log("买家订单管理", "不同意取消订单申请");
+		logger.info("买家订单管理", "不同意取消订单申请");
 		return orderService.unaduitReleaseOrder(orderid);
 	}
 
@@ -613,7 +602,7 @@ public class OrderController {
 	public String setUnavailable(@PathVariable String orderid) {
 		orderid = StringUtilB2C.decodeValue(orderid);
 		assert logger != null;
-		logger.log("买家订单管理", "失效订单", "根据订单号: " + orderid + "将订单设为失效");
+		logger.info("买家订单管理", "失效订单", "根据订单号: " + orderid + "将订单设为失效");
 		return orderService.setUnavailable(orderid);
 	}
 
@@ -626,7 +615,7 @@ public class OrderController {
 	@RequestMapping(value = "/admin/findUserVender/{orderid}", method = RequestMethod.GET)
 	public ModelMap findUserVenderByCode(@PathVariable String orderid) {
 		assert logger != null;
-		logger.log("买家订单管理", "获取订单关联企业用户信息", "根据订单号: " + orderid + "获取订单关联企业用户信息");
+		logger.info("买家订单管理", "获取订单关联企业用户信息", "根据订单号: " + orderid + "获取订单关联企业用户信息");
 		return orderService.findUserVenderByCode(orderid);
 	}
 
@@ -640,7 +629,7 @@ public class OrderController {
 	@RequestMapping(value = "/personal/count", method = RequestMethod.GET)
 	public ModelMap getCountByUseruuAndStatus(String status) {
 		assert logger != null;
-		logger.log("买家订单管理", "获取买家订单信息", "根据状态: " + status + "获取买家订单信息");
+		logger.info("买家订单管理", "获取买家订单信息", "根据状态: " + status + "获取买家订单信息");
 		return orderService.getCountByUseruuAndStatus(SystemSession.getUser().getUserUU(), status);
 	}
 
@@ -653,7 +642,7 @@ public class OrderController {
 	@RequestMapping(value = "/personal/counts", method = RequestMethod.GET)
 	public ModelMap getCountByAllStatus() {
 		assert logger != null;
-		logger.log("买家订单管理", "获取各状态买家订单总数");
+		logger.info("买家订单管理", "获取各状态买家订单总数");
 		return orderService.getCountByAllStatus(SystemSession.getUser().getUserUU());
 	}
 
@@ -668,7 +657,7 @@ public class OrderController {
 	public ModelMap applyCharge(@RequestBody String json, @PathVariable Long detailid) {
 		TradeCharge charge = FastjsonUtils.fromJson(json, TradeCharge.class);
 		assert logger != null;
-		logger.log("客户议价单管理", "申请议价单", "申请客户议价单: " + charge.getId());
+		logger.info("客户议价单管理", "申请议价单", "申请客户议价单: " + charge.getId());
 		return orderService.applyCharge(charge, detailid);
 	}
 
@@ -681,7 +670,7 @@ public class OrderController {
 	@RequestMapping(value = "/getreply/{detailid}", method = RequestMethod.GET)
 	public List<TradeCharge> getreply(@PathVariable Long detailid) {
 		assert logger != null;
-		logger.log("客户议价单管理", "获取议价单信息", "获取客户议价单信息: " + detailid);
+		logger.info("客户议价单管理", "获取议价单信息", "获取客户议价单信息: " + detailid);
 		return orderService.findReplyByOrderDetail(detailid);
 	}
 
@@ -704,7 +693,7 @@ public class OrderController {
 		}
 
 		assert logger != null;
-		logger.log("买家订单管理", "买家获取买家订单信息", "获取待开发票的订单");
+		logger.info("买家订单管理", "买家获取买家订单信息", "获取待开发票的订单");
 		return orderService.getBillByStatus(pageInfo, keyword, status);
 	}
 
@@ -720,7 +709,7 @@ public class OrderController {
 	public Page<Order> getBillByStatus(PageParams params, String keyword, int status) {
 		PageInfo pageInfo = new PageInfo(params);
 		assert logger != null;
-		logger.log("买家订单管理", "平台获取买家订单信息", "获取待开发票的订单");
+		logger.info("买家订单管理", "平台获取买家订单信息", "获取待开发票的订单");
 		return orderService.getBillByStatus(pageInfo, keyword, status);
 	}
 
@@ -739,7 +728,7 @@ public class OrderController {
 			map.put(key, arr);
 		}
 		assert logger != null;
-		logger.log("发票管理", "确认开票", "确认开票,发票号: " + billNum);
+		logger.info("发票管理", "确认开票", "确认开票,发票号: " + billNum);
 		orderService.makeOutBill(map, billNum);
 	}
 
@@ -752,7 +741,7 @@ public class OrderController {
 	public void confirmBill(@RequestBody String str) {
 		JSONObject jsonObject = FastjsonUtils.parseObject(str);
 		assert logger != null;
-		logger.log("发票管理", "确认收票", "确认收票,发票号: " + str);
+		logger.info("发票管理", "确认收票", "确认收票,发票号: " + str);
 		orderService.confirmBill(jsonObject);
 	}
 
@@ -770,7 +759,7 @@ public class OrderController {
 		String[] idArray = ids.split(SplitChar.HYPHEN);
 		orderDetailService.comfirmCancle(idArray);
 		assert logger != null;
-		logger.log("买家订单管理", "买家确认取消订单明细(供应商缺货)", "取消订单明细: " + ids);
+		logger.info("买家订单管理", "买家确认取消订单明细(供应商缺货)", "取消订单明细: " + ids);
 		return "success";
 	}
 
@@ -783,7 +772,7 @@ public class OrderController {
 	@RequestMapping(value = "/{ids}", method = RequestMethod.DELETE, params = "_status=unavailable")
 	public String deleteOrder(@PathVariable("ids") String ids) {
 		assert logger != null;
-		logger.log("买家订单管理", "买家删除订单", "删除订单明细: " + ids);
+		logger.info("买家订单管理", "买家删除订单", "删除订单明细: " + ids);
 		return orderService.deleteOrder(ids);
 	}
 
@@ -803,7 +792,7 @@ public class OrderController {
 			String exceptionType, String originalState) {
 		PageInfo pageInfo = new PageInfo(params);
 		assert logger != null;
-		logger.log("后台管理-买家销售单跟踪", "根据参数分页获取订单列表信息,状态码=" + status);
+		logger.info("后台管理-买家销售单跟踪", "根据参数分页获取订单列表信息,状态码=" + status);
 		return orderService.findOrderByPageAndParams(pageInfo, keyword, status, fromDateMils, exceptionType, originalState);
 	}
 
@@ -819,7 +808,7 @@ public class OrderController {
 	@RequestMapping(value = "/draw/bill/{id}", method = RequestMethod.POST, params="role=admin")
 	public void drawBill(@RequestBody String json, @PathVariable("id") String id) {
 		assert logger != null;
-		logger.log("对订单开发票", "开发票的 订单号是 : " + id);
+		logger.info("对订单开发票", "开发票的 订单号是 : " + id);
 		orderService.drawBill(json, id);
 	}
 
@@ -835,7 +824,7 @@ public class OrderController {
 	@RequestMapping(value = "/{orderId}/details/isNotReturn", method = RequestMethod.GET)
 	public Map<String, Boolean> queryOrderDetailsNotReturn(@PathVariable("orderId") String orderId) {
 		assert logger != null;
-		logger.log("买家异常处理", "查询明细[" + orderId + "]的所有明细的退款状态");
+		logger.info("买家异常处理", "查询明细[" + orderId + "]的所有明细的退款状态");
 		return orderService.queryOrderDetailsNotReturn(orderId);
 	}
 
@@ -896,7 +885,7 @@ public class OrderController {
 	 */
 	@RequestMapping(value = "/{orderId}/payment/failure", method = RequestMethod.PUT)
 	public ResultMap auditPaymentFailure(@PathVariable("orderId") String orderId, @RequestBody  String reason) {
-		logger.log("买家订单管理", "管理平台审核不通过");
+		logger.info("买家订单管理", "管理平台审核不通过");
 		return orderService.auditPaymentFailure(orderId, reason);
 	}
 

+ 9 - 13
src/main/java/com/uas/platform/b2c/trade/order/controller/ProofingController.java

@@ -1,18 +1,14 @@
 package com.uas.platform.b2c.trade.order.controller;
 
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.core.utils.FastjsonUtils;
 import com.uas.platform.b2c.core.utils.StringUtilB2C;
 import com.uas.platform.b2c.trade.order.model.TradeProofing;
 import com.uas.platform.b2c.trade.order.service.ProofingService;
-import com.uas.platform.core.logging.BufferedLoggerManager;
+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.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.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * 样品接口类
@@ -27,9 +23,9 @@ public class ProofingController {
 	@Autowired
 	private ProofingService proofingService;
 
-	private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
+    private final Logger logger = LoggerFactory.getLogger(ProofingController.class);
 
-	/**
+    /**
 	 * 保存客户送样申请单
 	 *
 	 * @param json the json
@@ -38,7 +34,7 @@ public class ProofingController {
 	@RequestMapping(value = "/save", method = RequestMethod.POST)
 	public String saveProofing(@RequestBody String json) {
 		TradeProofing proofing = FastjsonUtils.fromJson(json, TradeProofing.class);
-		logger.log("样品管理", "保存客户送样申请单", "保存客户送样申请单");
+		logger.info("样品管理", "保存客户送样申请单", "保存客户送样申请单");
 		return proofingService.saveProofing(proofing);
 	}
 
@@ -50,7 +46,7 @@ public class ProofingController {
 	 */
 	@RequestMapping(value = "/{id}/issample", method = RequestMethod.GET)
 	public ModelMap isSample(@PathVariable String id) {
-		logger.log("样品管理", "判断是否被送样", "id: " + id);
+		logger.info("样品管理", "判断是否被送样", "id: " + id);
 		return proofingService.isSample(StringUtilB2C.decodeValue(id));
 	}
 
@@ -62,7 +58,7 @@ public class ProofingController {
 	 */
 	@RequestMapping(value = "/{id}/cancel", method = RequestMethod.PUT)
 	public ModelMap cancel(@PathVariable String id) {
-		logger.log("样品管理", "用户取消送样申请单", "用户取消送样申请单,id: " + id);
+		logger.info("样品管理", "用户取消送样申请单", "用户取消送样申请单,id: " + id);
 		return proofingService.cancel(id);
 	}
 
@@ -74,7 +70,7 @@ public class ProofingController {
 	 */
 	@RequestMapping(value = "/{batchcode}/issamplebatch", method = RequestMethod.GET)
 	public ModelMap isSampleBatch(@PathVariable String batchcode) {
-		logger.log("样品管理", "判断商品是否被送样", "商品批次号: " + batchcode);
+		logger.info("样品管理", "判断商品是否被送样", "商品批次号: " + batchcode);
 		return proofingService.isSample(batchcode);
 	}
 

+ 35 - 45
src/main/java/com/uas/platform/b2c/trade/order/controller/PurchaseController.java

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2c.core.constant.SplitChar;
 import com.uas.platform.b2c.core.support.SystemSession;
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.core.support.view.JxlsExcelView;
 import com.uas.platform.b2c.core.utils.FastjsonUtils;
 import com.uas.platform.b2c.core.utils.StringUtilB2C;
@@ -16,31 +15,22 @@ import com.uas.platform.b2c.trade.order.model.PurchaseModifyingHistory;
 import com.uas.platform.b2c.trade.order.service.PurchaseDetailService;
 import com.uas.platform.b2c.trade.order.service.PurchaseService;
 import com.uas.platform.b2c.trade.support.ResultMap;
-import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.model.Status;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 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.view.json.MappingJackson2JsonView;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 /**
  * 采购单接口类
@@ -52,8 +42,8 @@ import java.util.Set;
 @RequestMapping("/trade/purchase")
 public class PurchaseController {
 
-	private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
-	private final PurchaseService purchaseService;
+    private final Logger logger = LoggerFactory.getLogger(PurchaseController.class);
+    private final PurchaseService purchaseService;
 	private final PurchaseDetailService purchaseDetailService;
 	private final StoreInService storeinfose;
 
@@ -75,7 +65,7 @@ public class PurchaseController {
 	public Map<String, List<Order>> checkPurchase(@RequestBody String json) {
 		List<Order> orders = FastjsonUtils.fromJsonArray(json, Order.class);
 		assert logger != null;
-		logger.log("采购单管理", "检测订单是否可以合并转采购单");
+		logger.info("采购单管理", "检测订单是否可以合并转采购单");
 		return purchaseService.checkPurc(orders);
 	}
 
@@ -117,7 +107,7 @@ public class PurchaseController {
 		PageInfo info = new PageInfo(params);
 		info.filter("status", Status.TOBESHIPPED.value());
 		assert logger != null;
-		logger.log("采购单管理", "获取待出货状态采购单");
+		logger.info("采购单管理", "获取待出货状态采购单");
 		return purchaseService.findPageByStatus(info, keyword);
 	}
 
@@ -133,7 +123,7 @@ public class PurchaseController {
 		PageInfo info = new PageInfo(params);
 		info.filter("status", Status.INBOUND.value());
 		assert logger != null;
-		logger.log("采购单管理", "获取待收货状态采购单");
+		logger.info("采购单管理", "获取待收货状态采购单");
 		return purchaseService.findPageByStatus(info, keyword);
 	}
 
@@ -149,7 +139,7 @@ public class PurchaseController {
 		PageInfo info = new PageInfo(params);
 		info.filter("status", Status.RECEIVED.value());
 		assert logger != null;
-		logger.log("采购单管理", "获取已收货状态采购单");
+		logger.info("采购单管理", "获取已收货状态采购单");
 		return purchaseService.findPageByStatus(info, keyword);
 	}
 
@@ -165,7 +155,7 @@ public class PurchaseController {
 		PageInfo info = new PageInfo(params);
 		info.filter("status", Status.TOBEPAID.value());
 		assert logger != null;
-		logger.log("采购单管理", "获取待付款状态采购单");
+		logger.info("采购单管理", "获取待付款状态采购单");
 		return purchaseService.findPageByStatus(info, keyword);
 	}
 
@@ -181,7 +171,7 @@ public class PurchaseController {
 		PageInfo info = new PageInfo(params);
 		info.filter("status", Status.PAID.value());
 		assert logger != null;
-		logger.log("采购单管理", "获取已付款状态采购单");
+		logger.info("采购单管理", "获取已付款状态采购单");
 		return purchaseService.findPageByStatus(info, keyword);
 	}
 
@@ -197,7 +187,7 @@ public class PurchaseController {
 	public Page<Purchase> findAdminPurchases(PageParams params, String keyword, String status) {
 		PageInfo info = new PageInfo(params);
 		assert logger != null;
-		logger.log("采购单管理", "平台获取采购单信息");
+		logger.info("采购单管理", "平台获取采购单信息");
 		return purchaseService.findAdminPurchases(info, keyword, status);
 	}
 
@@ -211,7 +201,7 @@ public class PurchaseController {
 	@RequestMapping(value = "/{puid}/ensureAccept", method = RequestMethod.PUT)
 	public Purchase ensuerAccept(@PathVariable Long puid) {
 		assert logger != null;
-		logger.log("采购单管理", "确认收货,id: " + puid);
+		logger.info("采购单管理", "确认收货,id: " + puid);
 		return purchaseService.ensuerAccept(puid);
 	}
 
@@ -225,7 +215,7 @@ public class PurchaseController {
 	public Purchase getPurchase(@PathVariable String puid) {
 		assert logger != null;
 		String id = StringUtilB2C.decodeValue(puid);
-		logger.log("采购单管理", "获取采购单信息,id: " + puid);
+		logger.info("采购单管理", "获取采购单信息,id: " + puid);
 		return purchaseService.getPurchase(Long.parseLong(id));
 	}
 
@@ -238,7 +228,7 @@ public class PurchaseController {
 	@RequestMapping(value = "/{invoiceid}/ensurereceipt", method = RequestMethod.PUT)
 	public Invoice ensureReceipt(@PathVariable String invoiceid) {
 		assert logger != null;
-		logger.log("采购单管理", "平台确认收货,出货单id: " + invoiceid);
+		logger.info("采购单管理", "平台确认收货,出货单id: " + invoiceid);
 		return purchaseService.ensuerAcceptInvoise(invoiceid);
 	}
 
@@ -252,7 +242,7 @@ public class PurchaseController {
 	public String ensureReceivedMoney(@PathVariable("ids") String ids) {
 		assert logger != null;
 		String result = purchaseService.ensureReceivedMoney(ids);
-		logger.log("采购单管理", "供应商确认收款,出货单ids: " + ids);
+		logger.info("采购单管理", "供应商确认收款,出货单ids: " + ids);
 		return result;
 	}
 
@@ -265,7 +255,7 @@ public class PurchaseController {
 	@RequestMapping(value = "/{invoiceids}/batchEnsureReceipt", method = RequestMethod.PUT)
 	public String batchEnsureReceipt(@PathVariable String invoiceids) {
 		assert logger != null;
-		logger.log("采购单管理", "平台批量确认收货,出货单id: " + invoiceids);
+		logger.info("采购单管理", "平台批量确认收货,出货单id: " + invoiceids);
 		return purchaseService.batchEnsureReceipt(invoiceids);
 	}
 
@@ -278,7 +268,7 @@ public class PurchaseController {
 	@RequestMapping(value = "/{id}/ensurePaid", method = RequestMethod.PUT)
 	public Purchase ensurePaid(@PathVariable Long id, Long installmentDetailId) {
 		assert logger != null;
-		logger.log("采购单管理", "确认付款,采购单id: " + id);
+		logger.info("采购单管理", "确认付款,采购单id: " + id);
 		return purchaseService.ensurePaid(id, installmentDetailId);
 	}
 
@@ -292,7 +282,7 @@ public class PurchaseController {
 	public Purchase findByPurchaseid(@PathVariable String purchaseid) {
 		purchaseid = StringUtilB2C.decodeValue(purchaseid);
 		assert logger != null;
-		logger.log("采购单管理", "平台获取采购单信息,采购单号: " + purchaseid);
+		logger.info("采购单管理", "平台获取采购单信息,采购单号: " + purchaseid);
 		return purchaseService.findByPurchaseid(purchaseid);
 	}
 
@@ -306,7 +296,7 @@ public class PurchaseController {
 	public Purchase getByPurchaseidWithEnterprise(@PathVariable String purchaseid) {
 		purchaseid = StringUtilB2C.decodeValue(purchaseid);
 		assert logger != null;
-		logger.log("采购单管理", "卖家获取采购单信息,采购单号: " + purchaseid);
+		logger.info("采购单管理", "卖家获取采购单信息,采购单号: " + purchaseid);
 		return purchaseService.findByPurchaseidWithEnterprise(purchaseid);
 	}
 
@@ -319,7 +309,7 @@ public class PurchaseController {
 	@RequestMapping(value = "/{id}/find", method = RequestMethod.GET)
 	public Purchase findById(@PathVariable Long id) {
 		assert logger != null;
-		logger.log("采购单管理", "平台获取采购单信息,采购id: " + id);
+		logger.info("采购单管理", "平台获取采购单信息,采购id: " + id);
 		return purchaseService.findById(id);
 	}
 
@@ -336,7 +326,7 @@ public class PurchaseController {
 	public Page<Purchase> getPurchaseByStatus(PageParams param, String keyword, String status, boolean isProof) {
 		final PageInfo info = new PageInfo(param);
 		assert logger != null;
-		logger.log("采购单管理", "分页获取采购单信息");
+		logger.info("采购单管理", "分页获取采购单信息");
 		return purchaseService.getPurchaseByStatus(info, keyword, status, isProof);
 	}
 
@@ -359,7 +349,7 @@ public class PurchaseController {
 		Date startDate = startMils != null ? new Date(startMils) : null;
 		Date endDate = endMils != null ? new Date(endMils) : null;
 		assert logger != null;
-		logger.log("采购单管理", "分页获取下单时间在" + startDate + "~" + endDate + "区间的采购单信息");
+		logger.info("采购单管理", "分页获取下单时间在" + startDate + "~" + endDate + "区间的采购单信息");
 		return purchaseService.getPurchaseByStatusAndInternal(info, keyword, status, startDate, endDate, isProof, exceptionType, storeType);
 	}
 
@@ -375,7 +365,7 @@ public class PurchaseController {
 	public Page<Purchase> getPurchaseBillByStatus(PageParams param, String keyword, int status) {
 		PageInfo pageInfo = new PageInfo(param);
 		assert logger != null;
-		logger.log("采购单管理", "平台根据开票状态获取采购单信息");
+		logger.info("采购单管理", "平台根据开票状态获取采购单信息");
 		return purchaseService.getPurchaseBillByStatus(pageInfo, status, keyword);
 	}
 
@@ -392,7 +382,7 @@ public class PurchaseController {
 		PageInfo pageInfo = new PageInfo(param);
 		pageInfo.filter("sellerenuu", SystemSession.getUser().getEnterprise().getUu());
 		assert logger != null;
-		logger.log("采购单管理", "卖家根据开票状态获取采购单信息");
+		logger.info("采购单管理", "卖家根据开票状态获取采购单信息");
 		return purchaseService.getPurchaseBillByStatus(pageInfo, status, keyword);
 	}
 
@@ -411,7 +401,7 @@ public class PurchaseController {
 			map.put(key, arr);
 		}
 		assert logger != null;
-		logger.log("采购单管理", "处理采购单发票信息", "发票单号: " + billNum);
+		logger.info("采购单管理", "处理采购单发票信息", "发票单号: " + billNum);
 		purchaseService.makeOutPurchaseBill(map, billNum);
 	}
 
@@ -424,7 +414,7 @@ public class PurchaseController {
 	public void confirmBill(@RequestBody String str) {
 		JSONObject jsonObject = FastjsonUtils.parseObject(str);
 		assert logger != null;
-		logger.log("采购单管理", "确认收票", str);
+		logger.info("采购单管理", "确认收票", str);
 		purchaseService.confirmBill(jsonObject);
 	}
 
@@ -437,7 +427,7 @@ public class PurchaseController {
 	public void refusePurDetail(@PathVariable String ids) {
 		String[] idArray = ids.split(SplitChar.HYPHEN);
 		assert logger != null;
-		logger.log("采购单管理", "批量拒单", "采购单号: " + ids);
+		logger.info("采购单管理", "批量拒单", "采购单号: " + ids);
 		purchaseDetailService.refusePurDetail(idArray, true);
 	}
 
@@ -451,7 +441,7 @@ public class PurchaseController {
 	public ModelMap toBeShiped(@PathVariable String id) {
 		ModelMap map = new ModelMap();
 		assert logger != null;
-		logger.log("采购单管理", "转出货单", "采购单号: " + id + ",操作人:" + SystemSession.getUser().getUserUU());
+		logger.info("采购单管理", "转出货单", "采购单号: " + id + ",操作人:" + SystemSession.getUser().getUserUU());
 		String invoiceId = purchaseService.purToBeShiped(Long.valueOf(id));
 		map.addAttribute("inId", invoiceId);
 		return map;
@@ -468,7 +458,7 @@ public class PurchaseController {
 	@RequestMapping(value = "/vendor/counts", method = RequestMethod.GET)
 	public ModelMap getCountByAllStatus(@RequestParam("storeType") String storeType) {
 		assert logger != null;
-		logger.log("卖家订单管理", "获取各状态卖家订单总数");
+		logger.info("卖家订单管理", "获取各状态卖家订单总数");
 		return purchaseService.getCountByAllStatus(SystemSession.getUser().getEnterprise().getUu(), storeinfose.getStoreInfoUuid(storeType));
 	}
 
@@ -484,7 +474,7 @@ public class PurchaseController {
 	public void drawBill(@RequestBody String json, @PathVariable("id") String id) {
 		assert logger != null;
 		String puid = StringUtilB2C.decodeValue(id);
-		logger.log("卖家订单管理", "对采购单开发票 采购单号 " + puid);
+		logger.info("卖家订单管理", "对采购单开发票 采购单号 " + puid);
 		purchaseService.drawBill(puid, json);
 	}
 
@@ -498,7 +488,7 @@ public class PurchaseController {
 	public ResultMap findPurchaseByPurchaseId(@PathVariable String purchaseId) {
 		assert logger != null;
 		String puid = StringUtilB2C.decodeValue(purchaseId);
-		logger.log("采购单详情", String.format("查询采购单%s详情", puid));
+		logger.info("采购单详情", String.format("查询采购单%s详情", puid));
 		return purchaseService.findPurchaseByPurchaseId(puid);
 	}
 
@@ -537,7 +527,7 @@ public class PurchaseController {
 		modelView.setView(new JxlsExcelView("classpath:jxls-tpl/trade/purchase", "优软商城销售订单"));
 		//重置为下载停止状态
 		session.setAttribute("loading", false);
-		logger.log("批量下载采购单信息", "以Excel形式导出批量导出采购单数据");
+		logger.info("批量下载采购单信息", "以Excel形式导出批量导出采购单数据");
 
 		return modelView;
 	}
@@ -607,7 +597,7 @@ public class PurchaseController {
 	 */
 	@RequestMapping(value = "simpleinfo/ones/{purchaseId}/release", method = RequestMethod.PUT)
 	public String release(@PathVariable String purchaseId, String reason) {
-		logger.log("卖家订单管理", "取消订单", "根据订单号: " + purchaseId + "取消订单,释放库存");
+		logger.info("卖家订单管理", "取消订单", "根据订单号: " + purchaseId + "取消订单,释放库存");
 		return purchaseService.release(purchaseId, reason);
 	}
 

+ 8 - 7
src/main/java/com/uas/platform/b2c/trade/order/controller/PurchaseProductController.java

@@ -1,17 +1,17 @@
 package com.uas.platform.b2c.trade.order.controller;
 
 import com.uas.platform.b2c.common.base.model.FileUpload;
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.core.support.view.JxlsExcelView;
 import com.uas.platform.b2c.prod.commodity.service.ReleaseProductByBatchService;
 import com.uas.platform.b2c.trade.order.service.PurchaseProductService;
 import com.uas.platform.b2c.trade.order.support.AjaxUtil;
 import com.uas.platform.b2c.trade.support.ResultMap;
 import com.uas.platform.core.exception.IllegalOperatorException;
-import com.uas.platform.core.logging.BufferedLoggerManager;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -22,7 +22,8 @@ import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStream;
 
 /**
  * 买家中心物料相关
@@ -38,7 +39,7 @@ public class PurchaseProductController {
     /**
      * 系统操作日志
      */
-    private static final UsageBufferedLogger LOGGER = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
+    private final Logger logger = LoggerFactory.getLogger(PurchaseProductController.class);
 
     @Autowired
     private PurchaseProductService purchaseProductService;
@@ -53,7 +54,7 @@ public class PurchaseProductController {
      */
     @RequestMapping(value = "/release/template", method = RequestMethod.GET)
     public ModelAndView releasePersonalProductTemplate() {
-        LOGGER.log("买家物料", "下载Excel批量上传个人物料模板");
+        logger.info("买家物料", "下载Excel批量上传个人物料模板");
         ModelAndView modelAndView = new ModelAndView();
         modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/trade/releaseByBatch-person", "导入个人产品库-优软商城"));
         return modelAndView;
@@ -89,7 +90,7 @@ public class PurchaseProductController {
                 return ResultMap.error(new IllegalOperatorException("文件格式不正确!请上传.xls或.xlsx格式的文件"));
             }
             ResultMap resultMap = purchaseProductService.releasePersonalProductByExcel(workbook, ignoreImport);
-            LOGGER.log("买家物料", "通过Excel批量上传个人物料-优软商城");
+            logger.info("买家物料", "通过Excel批量上传个人物料-优软商城");
             return resultMap;
         } catch (IOException e) {
             return ResultMap.error(e);
@@ -118,7 +119,7 @@ public class PurchaseProductController {
         modelAndView.addObject("data", releaseProductByBatchService.findFailureReleaseProductByBatch(batch));
         String url = "classpath:jxls-tpl/trade/releaseByBatchError-person";
         modelAndView.setView(new JxlsExcelView(url, "导出失败的个人物料-优软商城"));
-        LOGGER.log("买家物料", "以Excel形式导出失败的个人物料");
+        logger.info("买家物料", "以Excel形式导出失败的个人物料");
         session.setAttribute("load-error-ing", false);
         return modelAndView;
     }

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

@@ -1398,9 +1398,9 @@ public class OrderServiceImpl implements OrderService {
     @Transactional
     public Order ensurePayed(String orderid, Integer type, Long... param) {
         Order order = orderDao.findByOrderid(orderid);
-        if (order == null)
+        if (order == null) {
             throw new IllegalOperatorException("此订单不存在,请重新确认订单信息");
-
+        }
         // 分期付款目前只支持直接付款给卖家
         if (order.getInstallmentId() != null) {
             Installment installment = installmentDao.findOne(order.getInstallmentId());
@@ -2282,12 +2282,9 @@ public class OrderServiceImpl implements OrderService {
     public String unaduitReleaseOrder(String orderid) {
         Order order = orderDao.findByOrderid(orderid);
         List<Purchase> purchase = purchaseDao.findByOrderid(orderid);
-        if (purchase == null)
-            throw new IllegalOperatorException("此订单不存在");
-        if (order == null) {
+        if (purchase == null || order == null) {
             throw new IllegalOperatorException("此订单不存在");
         }
-
         if (order.getInstallmentId() == null) {
             throw new IllegalOperatorException("此订单付款方式非直接付款给卖家,您无法取消,请重新确认订单信息");
         }

+ 17 - 9
src/main/java/com/uas/platform/b2c/trade/order/service/impl/PurchaseServiceImpl.java

@@ -657,16 +657,17 @@ public class PurchaseServiceImpl implements PurchaseService {
 	@Override
 	public Purchase ensurePaid(Long id, Long installmentDetailId) {
 		Purchase purchase = purchaseDao.findOne(id);
-		if (purchase == null)
+		if (purchase == null) {
 			throw new IllegalOperatorException("此订单不存在,请重新确认订单信息");
+		}
         Order order = orderDao.findByOrderid(purchase.getOrderid());
-        if (order == null)
-            throw new IllegalOperatorException("此订单不存在,请重新确认订单信息");
-
+        if (order == null) {
+			throw new IllegalOperatorException("此订单不存在,请重新确认订单信息");
+		}
         // 分期付款目前只支持直接付款给卖家
-        if (order.getInstallmentId() == null)
-            throw new IllegalOperatorException("此订单为向平台付款,您不可确认收款,请重新确认订单信息");
-
+        if (order.getInstallmentId() == null) {
+			throw new IllegalOperatorException("此订单为向平台付款,您不可确认收款,请重新确认订单信息");
+		}
         if (order.getStatus().intValue() != Status.PAID.value()
                 && order.getStatus().intValue() != Status.TOBEPAID.value()) {
             throw new IllegalOperatorException(
@@ -1434,6 +1435,7 @@ public class PurchaseServiceImpl implements PurchaseService {
 		return purchases;
 	}
 
+	@Override
 	public String isSelfSupport(String storeid) {
 		if (storeid.equals(sysConf.getStoreid())) {
 			return "寄售";
@@ -1442,6 +1444,7 @@ public class PurchaseServiceImpl implements PurchaseService {
 		}
 	}
 
+	@Override
 	public String statusHistory(String statushistory) {
 		StringBuffer wholeHistory = new StringBuffer();
 		SimpleDateFormat dateFormat= new SimpleDateFormat("yyyy/MM/dd hh:mm:ss");
@@ -1460,16 +1463,19 @@ public class PurchaseServiceImpl implements PurchaseService {
 		return wholeHistory.toString();
 	}
 
+	@Override
 	public String getName(String jsonAddress){
 		JSONObject jsonObject = FastjsonUtils.parseObject(jsonAddress);
 		return jsonObject.getString("name");
 	}
 
+	@Override
 	public String getTel(String jsonAddress){
 		JSONObject jsonObject = FastjsonUtils.parseObject(jsonAddress);
 		return jsonObject.getString("tel");
 	}
 
+	@Override
 	public String getArea(String jsonAddress){
 		JSONObject jsonObject = FastjsonUtils.parseObject(jsonAddress);
 		return jsonObject.getString("area");
@@ -1635,8 +1641,9 @@ public class PurchaseServiceImpl implements PurchaseService {
 			PurchaseModifyingHistory purchaseModifyingHistory = list.get(0);
 			PurchaseDetail purchaseDetail = purchaseDetailDao.findByDetailid(purchaseModifyingHistory.getDetailid());
 			Purchase purchase = purchaseDetail.getPurchase();
-			if (purchase.getInstallmentId() != null)
+			if (purchase.getInstallmentId() != null) {
 				installmentService.updateAfterModifyPurchasePrice(list.get(0).getDetailid());
+			}
 		}
 		return "success";
 	}
@@ -1666,8 +1673,9 @@ public class PurchaseServiceImpl implements PurchaseService {
 	@Override
 	public String release(String purchaseId,  String reason) {
 		Purchase purchase = purchaseDao.findByPurchaseid(purchaseId);
-		if (purchase == null)
+		if (purchase == null) {
 			throw new IllegalOperatorException("订单不存在");
+		}
 		Order order = orderDao.findByOrderid(purchase.getOrderid());
 		if (order == null) {
 			throw new IllegalOperatorException("此订单不存在");

+ 4 - 5
src/main/java/com/uas/platform/b2c/trade/order/task/OrderTask.java

@@ -9,7 +9,6 @@ import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.core.config.SysConf;
 import com.uas.platform.b2c.core.constant.SplitChar;
 import com.uas.platform.b2c.core.support.SystemSession;
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.core.utils.FastjsonUtils;
 import com.uas.platform.b2c.trade.order.dao.OrderDao;
 import com.uas.platform.b2c.trade.order.model.Order;
@@ -17,10 +16,11 @@ import com.uas.platform.b2c.trade.order.model.StatusHistory;
 import com.uas.platform.b2c.trade.order.service.OrderService;
 import com.uas.platform.b2c.trade.presale.dao.TradeBasicPropertiesDao;
 import com.uas.platform.core.exception.IllegalOperatorException;
-import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.model.Type;
 import org.apache.commons.collections.map.HashedMap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
@@ -56,8 +56,7 @@ public class OrderTask {
 
     private final MailService mailService;
 
-    private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
-
+    private final Logger logger = LoggerFactory.getLogger(OrderTask.class);
 	/**
 	 * Instantiates a new Order task.
 	 *  @param orderDao                the order dao
@@ -147,7 +146,7 @@ public class OrderTask {
 
                 }
             }
-            logger.log("自动收货", "买家自动收货订单:" + ids);
+            logger.info("自动收货", "买家自动收货订单:" + ids);
         } catch (Exception e) {
             Map<String, Object> map  = new HashedMap();
             map.put("title", "自动确认收货");

+ 11 - 11
src/main/java/com/uas/platform/b2c/trade/presale/controller/CartController.java

@@ -1,18 +1,18 @@
 package com.uas.platform.b2c.trade.presale.controller;
 
 import com.uas.platform.b2c.core.support.SystemSession;
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.core.utils.FastjsonUtils;
 import com.uas.platform.b2c.core.utils.JacksonUtils;
 import com.uas.platform.b2c.trade.presale.facade.CartFacade;
 import com.uas.platform.b2c.trade.presale.model.Cart;
 import com.uas.platform.b2c.trade.presale.service.CartService;
 import com.uas.platform.b2c.trade.support.ResultMap;
-import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import com.wordnik.swagger.annotations.ApiOperation;
 import com.wordnik.swagger.annotations.ApiParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.ui.ModelMap;
@@ -34,8 +34,8 @@ public class CartController {
 
 	private final CartService cartService;
 
-	private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
-
+    private final Logger logger = LoggerFactory.getLogger(CartController.class);
+    
 	@Autowired
 	public CartController(CartFacade cartFacade, CartService cartService) {
 		this.cartFacade = cartFacade;
@@ -67,7 +67,7 @@ public class CartController {
 	@RequestMapping(value = "/save/batch", method = RequestMethod.POST)
 	@ApiOperation(value = "批量添加商品到购物车中", httpMethod = "POST")
 	public List<Cart> saveCartsBatch(@ApiParam(required = true, value = "cart集合") @RequestBody List<Cart> carts) {
-		logger.log("买家订单管理",
+		logger.info("买家订单管理",
 				"批量添加商品到购物车, 操作人" + SystemSession.getUser().getUserUU() + "-" + SystemSession.getUser().getUserName());
 		return cartService.saveCartsBatch(carts);
 	}
@@ -98,7 +98,7 @@ public class CartController {
 	@RequestMapping(value = "/pageInfo/{page}", method = RequestMethod.GET)
 	@ApiOperation(value = "查找某个人的购物车列表的分组信息", httpMethod = "GET")
 	public Map<String, List<Cart>> findOnesGroupByUuid(@ApiParam(required = true, value = "一页的信息") @PathVariable("page") int page) {
-		logger.log("购物车信息管理", "查找某个人的购物车列表的分组信息");
+		logger.info("购物车信息管理", "查找某个人的购物车列表的分组信息");
 		return cartService.findOnesGroupByUuid(page);
 
 	}
@@ -112,7 +112,7 @@ public class CartController {
 	@RequestMapping(value = "/{uuid}", method = RequestMethod.GET)
 	@ApiOperation(value = "获取个人指定uuid的购物车列表", httpMethod = "GET")
 	public List<Cart> findPersonalByUuid(@ApiParam(required = true, value = "器件uuid") @PathVariable("uuid") String uuid) {
-		logger.log("购物车信息管理", "获取用户购物车中包含指定uuid的信息");
+		logger.info("购物车信息管理", "获取用户购物车中包含指定uuid的信息");
 		return cartService.findOnesByUuid(uuid);
 	}
 
@@ -126,7 +126,7 @@ public class CartController {
 	public ModelMap countCart() {
 		ModelMap map = new ModelMap();
 		map.put("count", cartService.countCart());
-		logger.log("购物车信息管理", "获取购物车数量信息");
+		logger.info("购物车信息管理", "获取购物车数量信息");
 		return map;
 	}
 
@@ -140,7 +140,7 @@ public class CartController {
 	public void delete(@ApiParam(required = true, value = "批次号集合") @RequestBody String batchCodes) {
 		List<String> batchCodeSet = FastjsonUtils.fromJsonArray(batchCodes, String.class);
 		cartService.delete(batchCodeSet);
-		logger.log("购物车信息管理", "删除购物车信息", "删除购物车中包含" + batchCodes + "批次的信息,操作人:" + SystemSession.getUser().getUserUU()
+		logger.info("购物车信息管理", "删除购物车信息", "删除购物车中包含" + batchCodes + "批次的信息,操作人:" + SystemSession.getUser().getUserUU()
 				+ "-" + SystemSession.getUser().getUserName());
 	}
 
@@ -152,7 +152,7 @@ public class CartController {
 	@ApiOperation(value = "批量删除购物车信息,根据购物车id", httpMethod = "DELETE")
 	public void deleteById(@ApiParam(required = true, value = "id集合") String ids) {
 		cartService.deleteById(ids);
-		logger.log("购物车信息管理", "删除购物车信息", "删除购物车中包含" + ids + "购物车d等id的信息,操作人:" + SystemSession.getUser().getUserUU()
+		logger.info("购物车信息管理", "删除购物车信息", "删除购物车中包含" + ids + "购物车d等id的信息,操作人:" + SystemSession.getUser().getUserUU()
 				+ "-" + SystemSession.getUser().getUserName());
 	}
 
@@ -176,7 +176,7 @@ public class CartController {
 	@RequestMapping(value = "/add", method = RequestMethod.POST)
 	@ApiOperation(value = "添加一个商品到购物车", httpMethod = "POST")
 	public ResultMap addToCart(@ApiParam(required = true, value = "cart对象") @RequestBody Cart cart) {
-		logger.log("添加到购物车", JacksonUtils.toJson(cart));
+		logger.info("添加到购物车", JacksonUtils.toJson(cart));
 		return cartFacade.addOneCartRecord(cart);
 	}
 }

+ 6 - 10
src/main/java/com/uas/platform/b2c/trade/presale/controller/TradeBasicPropertiesController.java

@@ -1,19 +1,15 @@
 package com.uas.platform.b2c.trade.presale.controller;
 
 import com.uas.platform.b2c.core.support.SystemSession;
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.trade.presale.model.TradeBasicProperties;
 import com.uas.platform.b2c.trade.presale.service.TradeBasicPropertiesService;
-import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.Type;
 import com.wordnik.swagger.annotations.ApiOperation;
 import com.wordnik.swagger.annotations.ApiParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-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.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /** 
   * b2c基础信息配置表
@@ -22,8 +18,8 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping(value = "/trade/tradebasicproperties")
 public class TradeBasicPropertiesController {
-	
-	private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
+
+    private final Logger logger = LoggerFactory.getLogger(TradeBasicPropertiesController.class);
 	
 	@Autowired
 	private TradeBasicPropertiesService propertiesService;
@@ -38,7 +34,7 @@ public class TradeBasicPropertiesController {
 	@ApiOperation(value = "保存b2c基本配置信息表", httpMethod = "POST")
 	public TradeBasicProperties saveTradeBasicProperties(@ApiParam(required = true, value = "保存的基础信息对象") @RequestBody TradeBasicProperties property) {
 		TradeBasicProperties prop = propertiesService.saveTradeBasicProperties(property);
-		logger.log("基本配置表", "保存基本信息", "保存基本信息 保存的类型是:" + Type.valueOf(property.getType()).getPhrase() 
+		logger.info("基本配置表", "保存基本信息", "保存基本信息 保存的类型是:" + Type.valueOf(property.getType()).getPhrase() 
 				+ "操作人:" + SystemSession.getUser().getUserName() + ", 操作人UU" + SystemSession.getUser().getUserUU() 
 				+ "保存id = " + prop.getId());
 		return prop;

+ 6 - 6
src/main/java/com/uas/platform/b2c/trade/presale/controller/TradeDeliveryDelayTimeController.java

@@ -1,12 +1,12 @@
 package com.uas.platform.b2c.trade.presale.controller;
 
 import com.uas.platform.b2c.core.support.SystemSession;
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.trade.presale.model.TradeDeliveryDelayTime;
 import com.uas.platform.b2c.trade.presale.service.TradeDeliveryDelayTimeService;
-import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.wordnik.swagger.annotations.ApiOperation;
 import com.wordnik.swagger.annotations.ApiParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -23,8 +23,8 @@ import java.util.List;
 @RestController
 @RequestMapping(value = "/trade/tradeDeliveryDelayTime")
 public class TradeDeliveryDelayTimeController {
-	
-	private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
+
+    private final Logger logger = LoggerFactory.getLogger(TradeDeliveryDelayTimeController.class);
 	
 	@Autowired
 	private TradeDeliveryDelayTimeService tradeDeliveryDelayTimeService;
@@ -38,7 +38,7 @@ public class TradeDeliveryDelayTimeController {
 	@RequestMapping(value = "/save", method = RequestMethod.POST)
 	@ApiOperation(value = "保存供应商交货周期延长时间", httpMethod = "POST")
 	public List<TradeDeliveryDelayTime> saveTradeDeliveryDelayTime(@ApiParam(required = true, value = "TradeDeliveryDelayTime集合") @RequestBody List<TradeDeliveryDelayTime> list) {
-		logger.log("供应商交货周期延长时间管理", "供应商交货周期延长时间保存", "供应商交货周期延长时间 操作人:" + SystemSession.getUser().getUserName());
+		logger.info("供应商交货周期延长时间管理", "供应商交货周期延长时间保存", "供应商交货周期延长时间 操作人:" + SystemSession.getUser().getUserName());
 		return tradeDeliveryDelayTimeService.saveTradeDeliveryDelayTime(list);
 	}
 
@@ -50,7 +50,7 @@ public class TradeDeliveryDelayTimeController {
 	@RequestMapping(value = "/get", method = RequestMethod.GET)
 	@ApiOperation(value = "获取供应商交货周期延长时间", httpMethod = "GET")
 	public List<TradeDeliveryDelayTime> getTradeDeliveryDelayTime() {
-		logger.log("供应商交货周期延长时间管理", "供应商交货周期延长时间获取");
+		logger.info("供应商交货周期延长时间管理", "供应商交货周期延长时间获取");
 		return tradeDeliveryDelayTimeService.getTradeDeliveryDelayTime();
 	}
 }

+ 6 - 6
src/main/java/com/uas/platform/b2c/trade/rate/task/RateTask.java

@@ -10,7 +10,6 @@ import com.uas.platform.b2c.common.account.model.Enterprise;
 import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.core.config.SysConf;
 import com.uas.platform.b2c.core.support.SystemSession;
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.core.utils.FastjsonUtils;
 import com.uas.platform.b2c.trade.order.dao.OrderDao;
 import com.uas.platform.b2c.trade.order.model.Order;
@@ -21,9 +20,10 @@ import com.uas.platform.b2c.trade.order.service.PurchaseService;
 import com.uas.platform.b2c.trade.presale.dao.TradeBasicPropertiesDao;
 import com.uas.platform.b2c.trade.rate.service.RateService;
 import com.uas.platform.core.exception.IllegalOperatorException;
-import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.model.Type;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
@@ -60,7 +60,7 @@ public class RateTask {
     private final RateService rateService;
 
 
-    private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
+    private final Logger logger = LoggerFactory.getLogger(RateTask.class);
 
     @Autowired
     public RateTask(OrderDao orderDao, OrderService orderService,PurchaseService purchaseService, TradeBasicPropertiesDao tradeBasicPropertiesDao, UserDao userDao, SysConf sysConf, EnterpriseDao enterpriseDao, RateService rateService) {
@@ -131,7 +131,7 @@ public class RateTask {
                 ids = ids.substring(1, ids.length() - 1);
                 rateService.autosavebuyerRate(ids);
             }
-            logger.log("自动初评", "买家自动初评订单:" + ids);
+            logger.info("自动初评", "买家自动初评订单:" + ids);
             autoVendorRate(automaticReceipt,true);
     }
     /**
@@ -190,7 +190,7 @@ public class RateTask {
                 ids = ids.substring(1, ids.length() - 1);
                 rateService.autosaveAfterbuyerRate(ids);
             }
-            logger.log("自动追评", "买家自动追加评价:" + ids);
+            logger.info("自动追评", "买家自动追加评价:" + ids);
             autoVendorRate(automaticReceipt, false);
         }catch (Exception e) {
         } finally {
@@ -234,7 +234,7 @@ public class RateTask {
                 pids = pids.substring(1, pids.length() - 1);
                 rateService.autosaveVendorRate(pids,isFirst?true:false);
             }
-            logger.log("自动初评", "卖家自动初评订单:" + pids);
+            logger.info("自动初评", "卖家自动初评订单:" + pids);
         }catch (Exception e){}
         finally {}
     }

+ 13 - 13
src/main/java/com/uas/platform/b2c/trade/seek/controller/SeekPurchaseBomController.java

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.common.base.model.FileUpload;
 import com.uas.platform.b2c.core.support.SystemSession;
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.core.support.view.JxlsExcelView;
 import com.uas.platform.b2c.core.utils.FastjsonUtils;
 import com.uas.platform.b2c.trade.seek.model.SeekPurchaseBom;
@@ -14,12 +13,13 @@ import com.uas.platform.b2c.trade.seek.service.SeekPurchaseBomService;
 import com.uas.platform.b2c.trade.support.CodeType;
 import com.uas.platform.b2c.trade.support.ResultMap;
 import com.uas.platform.core.exception.IllegalOperatorException;
-import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Page;
@@ -30,7 +30,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.List;
 import java.util.Map;
 
@@ -56,8 +57,7 @@ public class SeekPurchaseBomController {
     /**
      * 日志
      */
-    private static final UsageBufferedLogger logger = BufferedLoggerManager
-            .getLogger(UsageBufferedLogger.class);
+    private final Logger logger = LoggerFactory.getLogger(SeekPurchaseBomController.class);
 
 
     /**
@@ -85,7 +85,7 @@ public class SeekPurchaseBomController {
             } else {
                 return new ResultMap(CodeType.PARAMETER_ERROR, "文件格式不正确!请上传.xls或.xlsx格式的文件");
             }
-            logger.log("求购", "导入新的bom求购,bom名称:" + bomName);
+            logger.info("求购", "导入新的bom求购,bom名称:" + bomName);
             return seekPurchaseBomService.importBom(workbook, bomName);
         } catch (IOException e) {
             e.printStackTrace();
@@ -102,7 +102,7 @@ public class SeekPurchaseBomController {
     @RequestMapping(value = "/getSeekPurchaseByBatchPageInfo", method = RequestMethod.GET)
     public Page<SeekPurchaseByBatch> getSeekPurchaseByBatchPageInfo(PageParams params, Long bomId) {
         PageInfo pageInfo = new PageInfo(params);
-        logger.log("求购", "分页获取求购临时数据,bomId:" + bomId);
+        logger.info("求购", "分页获取求购临时数据,bomId:" + bomId);
         return seekPurchaseBomService.getSeekPurchaseByBatchPageInfo(pageInfo, bomId);
     }
 
@@ -112,7 +112,7 @@ public class SeekPurchaseBomController {
      */
     @RequestMapping(value = "/confirmBom", method = RequestMethod.POST)
     public ResultMap confirmBom(Long bomId,  Long endTime, Integer count) {
-        logger.log("求购", "确认发布bom求购,bomId:" + bomId);
+        logger.info("求购", "确认发布bom求购,bomId:" + bomId);
         return seekPurchaseBomService.confirmBom(bomId, inquiryServiceInnerUrl, endTime, count);
     }
 
@@ -125,7 +125,7 @@ public class SeekPurchaseBomController {
     public Page<SeekPurchaseBomList> getSeekPurchaseBomListPage(PageParams params, String minReleaseDate, String maxReleaseDate, String name) {
         User user = SystemSession.getUser();
         PageInfo pageInfo = new PageInfo(params);
-        logger.log("求购", "获取bom求购列表,uu:" + user.getUserUU());
+        logger.info("求购", "获取bom求购列表,uu:" + user.getUserUU());
         return seekPurchaseBomService.getSeekPurchaseBomListPage(pageInfo, user, minReleaseDate, maxReleaseDate, name);
     }
 
@@ -188,7 +188,7 @@ public class SeekPurchaseBomController {
     public ModelAndView exportSeekPurchaseByBatch() {
         ModelAndView modelAndView = new ModelAndView();
         modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/trade/seekPurchaseByBatch", "bom求购模板-优软商城"));
-        logger.log("求购", "下载bom求购的Excel模板");
+        logger.info("求购", "下载bom求购的Excel模板");
         return modelAndView;
     }
 
@@ -211,7 +211,7 @@ public class SeekPurchaseBomController {
      */
     @RequestMapping(value = "/bom/list", method = RequestMethod.GET)
     public Page<SeekPurchaseBom> getBomListByPageInfo(PageInfo pageInfo, String keyword) {
-        logger.log("bom列表","查询本企业所有bom列表信息");
+        logger.info("bom列表","查询本企业所有bom列表信息");
         return seekPurchaseBomService.findAllByPageInfo(pageInfo, keyword);
     }
 
@@ -275,7 +275,7 @@ public class SeekPurchaseBomController {
      */
     @RequestMapping(value = "/confirmBom/selected", method = RequestMethod.POST)
     public ResultMap confirmBomSelectedItems(String detailIds, Long endTime, Integer count) {
-        logger.log("求购", "部分发布bom求购,detailIds: " + detailIds);
+        logger.info("求购", "部分发布bom求购,detailIds: " + detailIds);
         return seekPurchaseBomService.confirmBomSelectedItems(detailIds, inquiryServiceInnerUrl, endTime, count);
     }
 
@@ -287,7 +287,7 @@ public class SeekPurchaseBomController {
     @RequestMapping(value = "/bom/detail/add", method = RequestMethod.POST)
     public ModelMap saveBomProducts(@RequestBody List<SeekPurchaseByBatch> newProducts){
         ModelMap map = seekPurchaseBomService.saveNewProducts(newProducts);
-        logger.log("求购", "保存新增物料, newProducts:{}" + newProducts);
+        logger.info("求购", "保存新增物料, newProducts:{}" + newProducts);
         return  map;
 
     }

+ 8 - 9
src/main/java/com/uas/platform/b2c/trade/seek/controller/SeekPurchaseController.java

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.common.base.model.FileUpload;
 import com.uas.platform.b2c.core.support.SystemSession;
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.core.support.view.JxlsExcelView;
 import com.uas.platform.b2c.core.utils.FastjsonUtils;
 import com.uas.platform.b2c.prod.commodity.model.Goods;
@@ -35,6 +34,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * 求购操作接口类
@@ -55,9 +56,7 @@ public class SeekPurchaseController {
     /**
      * 日志
      */
-    private static final UsageBufferedLogger logger = BufferedLoggerManager
-            .getLogger(UsageBufferedLogger.class);
-
+    private final Logger logger = LoggerFactory.getLogger(SeekPurchaseController.class);
     /**
      * 分页获取求购列表
      *
@@ -67,7 +66,7 @@ public class SeekPurchaseController {
      */
     @RequestMapping(value = "/getSeekPageInfo", method = RequestMethod.GET)
     public Page<SeekPurchase> getSeekPageInfo(PageParams params, String keyWord) {
-        logger.log("求购", "分页获取采购列表,参数为" + params);
+        logger.info("求购", "分页获取采购列表,参数为" + params);
         PageInfo info = new PageInfo(params);
         return seekPurchaseService
                 .getSeekPageInfo(info, keyWord);
@@ -79,7 +78,7 @@ public class SeekPurchaseController {
      */
     @RequestMapping(value = "/getSeekRanking", method = RequestMethod.GET)
     public List<Map<String, Object>> getSeekRanking() {
-        logger.log("求购", "获取采购排行榜");
+        logger.info("求购", "获取采购排行榜");
         return seekPurchaseService.getSeekRanking();
     }
 
@@ -93,7 +92,7 @@ public class SeekPurchaseController {
     @ResponseBody
     public ResultMap saveOneSeekPurchase(@RequestBody SeekPurchase seekPurchase) {
         User user = SystemSession.getUser();
-        logger.log("求购", "发布采购,uu为:" + user.getUserUU());
+        logger.info("求购", "发布采购,uu为:" + user.getUserUU());
         return seekPurchaseService.saveOneSeekPurchase(seekPurchase, user);
     }
 
@@ -107,7 +106,7 @@ public class SeekPurchaseController {
      */
     @RequestMapping(value = "/updateSeekPurchaseStatus", method = RequestMethod.PUT)
     public ResultMap updateSeekPurchaseStatus(Long spId, Long ofId, Double purchaseQuantity) {
-        logger.log("求购", "采纳报价,求购id:" + spId + ",报价id为" + ofId);
+        logger.info("求购", "采纳报价,求购id:" + spId + ",报价id为" + ofId);
         return seekPurchaseService.updateSeekPurchaseStatus(spId, ofId, purchaseQuantity);
     }
 
@@ -125,7 +124,7 @@ public class SeekPurchaseController {
     @RequestMapping(value = "/getUserSeekPageInfo", method = RequestMethod.GET)
     public Page<SeekPurchaseGoods> getUserSeekPageInfo(PageParams params, String keyWord, String deadline,
             Integer status, String minReleaseDate, String maxReleaseDate, boolean  isMallGoods, Long bomId) {
-        logger.log("求购", "分页获取采购列表,参数为" + params);
+        logger.info("求购", "分页获取采购列表,参数为" + params);
         User user = SystemSession.getUser();
         PageInfo info = new PageInfo(params);
         return seekPurchaseService

+ 14 - 17
src/main/java/com/uas/platform/b2c/trade/seek/controller/SeekPurchaseOfferController.java

@@ -2,25 +2,22 @@ package com.uas.platform.b2c.trade.seek.controller;
 
 import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.core.support.SystemSession;
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.trade.seek.model.SeekPurchaseOffer;
 import com.uas.platform.b2c.trade.seek.model.SeekPurchaseOfferGoods;
 import com.uas.platform.b2c.trade.seek.model.SeekPurchasePushGoods;
 import com.uas.platform.b2c.trade.seek.service.SeekPurchaseOfferService;
 import com.uas.platform.b2c.trade.support.ResultMap;
-import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
-import java.util.List;
-import java.util.Map;
-import javax.servlet.http.HttpSession;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
-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.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpSession;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 卖家报价操作接口类
@@ -34,7 +31,7 @@ public class SeekPurchaseOfferController {
     /**
      * 日志
      */
-    private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
+    private final Logger logger = LoggerFactory.getLogger(SeekPurchaseOfferController.class);
 
     /**
      * 卖家报价业务逻辑接口
@@ -51,7 +48,7 @@ public class SeekPurchaseOfferController {
     @ResponseBody
     public ResultMap saveOffer(@RequestBody SeekPurchaseOffer seekPurchaseOffer) {
         User user = SystemSession.getUser();
-        logger.log("求购", "卖家报价,企业uu号为:" + user.getUserUU());
+        logger.info("求购", "卖家报价,企业uu号为:" + user.getUserUU());
         return seekPurchaseOfferService.saveOffer(seekPurchaseOffer, user);
     }
 
@@ -63,7 +60,7 @@ public class SeekPurchaseOfferController {
     @RequestMapping(value = "/getSeekPurchaseRate", method = RequestMethod.GET)
     public Map<String, Object> getSeekPurchaseRate() {
         User user = SystemSession.getUser();
-        logger.log("求购", "获取卖家求购成交率,企业uu号:" + user.getEnterprise().getUu());
+        logger.info("求购", "获取卖家求购成交率,企业uu号:" + user.getEnterprise().getUu());
         return seekPurchaseOfferService.getSeekPurchaseRate(user.getEnterprise().getUu());
     }
 
@@ -77,7 +74,7 @@ public class SeekPurchaseOfferController {
     @RequestMapping(value = "/getSeekPurchaseOfferPageInfo", method = RequestMethod.GET)
     public Page<SeekPurchaseOffer> getSeekPurchaseOfferPageInfo(PageParams params, Long spId, HttpSession session) {
         User user = (User) session.getAttribute("user");
-        logger.log("求购", "获取买家求购报价列表,求购id为" + spId);
+        logger.info("求购", "获取买家求购报价列表,求购id为" + spId);
         PageInfo info = new PageInfo(params);
         return seekPurchaseOfferService.getSeekPurchaseOfferPageInfo(info, spId, user);
     }
@@ -91,7 +88,7 @@ public class SeekPurchaseOfferController {
     public Page<SeekPurchasePushGoods> getSeekPushGoodsPageInfo(PageParams params, String minReleaseDate, String maxReleaseDate, String keyWord, String deadline) {
         User user = SystemSession.getUser();
         PageInfo info = new PageInfo(params);
-        logger.log("求购", "卖家获取求购询价,enUu为" + user.getEnterprise().getUu());
+        logger.info("求购", "卖家获取求购询价,enUu为" + user.getEnterprise().getUu());
         return seekPurchaseOfferService.getSeekPushGoodsPageInfo(info, user, minReleaseDate, maxReleaseDate, keyWord, deadline);
     }
 
@@ -107,7 +104,7 @@ public class SeekPurchaseOfferController {
     @RequestMapping(value = "/getMyOfferPageInfo", method = RequestMethod.GET)
     public Page<SeekPurchaseOfferGoods> getMyOfferPageInfo(PageParams params, String minReleaseDate, String maxReleaseDate, String keyWord, String deadline) {
         User user = SystemSession.getUser();
-        logger.log("求购", "卖家获取个人报价列表,enUu为" + user.getEnterprise().getUu());
+        logger.info("求购", "卖家获取个人报价列表,enUu为" + user.getEnterprise().getUu());
         PageInfo info = new PageInfo(params);
         return seekPurchaseOfferService.getMyOfferPageInfo(info, user, minReleaseDate, maxReleaseDate, keyWord, deadline);
     }
@@ -121,7 +118,7 @@ public class SeekPurchaseOfferController {
     @ResponseBody
     public List<SeekPurchaseOffer> getSeekPurchaseOfferList(String spIds) {
         User user = SystemSession.getUser();
-        logger.log("求购", "获取用户求购列表的报价状态,uu为" + user.getUserUU());
+        logger.info("求购", "获取用户求购列表的报价状态,uu为" + user.getUserUU());
         return seekPurchaseOfferService.getSeekPurchaseOfferList(spIds, user);
     }
 }

+ 8 - 14
src/main/java/com/uas/platform/b2c/trade/seek/controller/SeekQualityBuyerController.java

@@ -2,23 +2,18 @@ package com.uas.platform.b2c.trade.seek.controller;
 
 import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.core.support.SystemSession;
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
-import com.uas.platform.b2c.trade.seek.model.SeekPurchase;
 import com.uas.platform.b2c.trade.seek.model.SeekQualityBuyer;
 import com.uas.platform.b2c.trade.seek.service.SeekQualityBuyerService;
-import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.util.StringUtils;
-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.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * 求购-优质采购商操作接口类
@@ -39,8 +34,7 @@ public class SeekQualityBuyerController {
     /**
      * 日志
      */
-    private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
-
+    private final Logger logger = LoggerFactory.getLogger(SeekQualityBuyerController.class);
     /**
      * 获取优质采购商列表
      * @return 采购商列表
@@ -49,7 +43,7 @@ public class SeekQualityBuyerController {
     public Page<SeekQualityBuyer> getBuyerPageInfo(PageParams params) {
         User user = SystemSession.getUser();
         if (!StringUtils.isEmpty(user)) {
-            logger.log("求购", "分页获取优质采购商列表");
+            logger.info("求购", "分页获取优质采购商列表");
         }
         PageInfo info = new PageInfo(params);
         return seekQualityBuyerService.getBuyerPageInfo(info);
@@ -62,7 +56,7 @@ public class SeekQualityBuyerController {
      */
     @RequestMapping(value = "/saveBuyer", method = RequestMethod.POST)
     public ResponseEntity<String> saveBuyer(@RequestBody SeekQualityBuyer buyer) {
-        logger.log("求购-优质采购商", "保存优质采购商,参数为" + buyer);
+        logger.info("求购-优质采购商", "保存优质采购商,参数为" + buyer);
         seekQualityBuyerService.saveBuyer(buyer);
         return new ResponseEntity<>(HttpStatus.OK);
     }
@@ -75,7 +69,7 @@ public class SeekQualityBuyerController {
     @RequestMapping(value = "/getOneBuyer", method = RequestMethod.GET)
     @ResponseBody
     public SeekQualityBuyer getOneBuyer(Long id) {
-        logger.log("求购", "分页获取单个优质采购商,id为" + id);
+        logger.info("求购", "分页获取单个优质采购商,id为" + id);
         return seekQualityBuyerService.getOneBuyer(id);
     }
 
@@ -87,7 +81,7 @@ public class SeekQualityBuyerController {
     @RequestMapping(value = "/deleteBuyer", method = RequestMethod.PUT)
     public ResponseEntity<String> deleteBuyer(Long id) {
         seekQualityBuyerService.deleteBuyer(id);
-        logger.log("求购-优质采购商", "删除优质采购商,id参数为" + id);
+        logger.info("求购-优质采购商", "删除优质采购商,id参数为" + id);
         return new ResponseEntity<>(HttpStatus.OK);
     }
 }

+ 11 - 10
src/main/java/com/uas/platform/b2c/trade/seek/controller/SeekSalesmanInfoController.java

@@ -2,19 +2,21 @@ package com.uas.platform.b2c.trade.seek.controller;
 
 import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.core.support.SystemSession;
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.prod.commodity.model.Product;
 import com.uas.platform.b2c.trade.seek.model.SeekSalesman;
 import com.uas.platform.b2c.trade.seek.model.SeekSalesmanInfo;
 import com.uas.platform.b2c.trade.seek.model.SeekSalesmanMember;
 import com.uas.platform.b2c.trade.seek.service.SeekSalesmanInfoService;
 import com.uas.platform.b2c.trade.support.ResultMap;
-import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -31,8 +33,7 @@ public class SeekSalesmanInfoController {
     /**
      * 日志
      */
-    private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
-
+    private final Logger logger = LoggerFactory.getLogger(SeekSalesmanInfoController.class);
     @Autowired
     private SeekSalesmanInfoService seekSalesmanInfoService;
 
@@ -47,7 +48,7 @@ public class SeekSalesmanInfoController {
     @RequestMapping(value = "/getPageInfo", method = RequestMethod.GET)
     public Page<SeekSalesmanInfo> getPageInfo(PageParams params, Integer status, String salesman, String keyword) {
         PageInfo info = new PageInfo(params);
-        logger.log("求购", "获取求购-业务员分配列表");
+        logger.info("求购", "获取求购-业务员分配列表");
         return seekSalesmanInfoService.getPageInfo(info, status, salesman, keyword);
     }
 
@@ -59,7 +60,7 @@ public class SeekSalesmanInfoController {
     @RequestMapping(value = "/orders", method = RequestMethod.POST)
     public ResultMap orders(Long id) {
         User user = SystemSession.getUser();
-        logger.log("求购", "业务员求购接单,uu为" + user.getUserUU());
+        logger.info("求购", "业务员求购接单,uu为" + user.getUserUU());
         return seekSalesmanInfoService.orders(id, user);
     }
 
@@ -69,7 +70,7 @@ public class SeekSalesmanInfoController {
      */
     @RequestMapping(value = "/getMembers", method = RequestMethod.GET)
     public List<SeekSalesmanMember> getMembers(){
-        logger.log("求购", "获取业务员列表");
+        logger.info("求购", "获取业务员列表");
         return seekSalesmanInfoService.getMembers();
     }
 
@@ -80,14 +81,14 @@ public class SeekSalesmanInfoController {
      */
     @RequestMapping(value = "/findByCmpCode", method = RequestMethod.GET)
     public List<Product> findByCmpCode(String cmpCode) {
-        logger.log("求购", "通过型号查询物料信息");
+        logger.info("求购", "通过型号查询物料信息");
         return seekSalesmanInfoService.findByCmpCode(cmpCode);
     }
 
     // 通过公共询价id判断是否有业务员跟进
     @RequestMapping(value = "/getSalesmanByPublicId", method = RequestMethod.GET)
     public SeekSalesman getSalesmanByPublicId(Long publicId) {
-        logger.log("求购", "通过型号查询物料信息");
+        logger.info("求购", "通过型号查询物料信息");
         return seekSalesmanInfoService.getSalesmanByPublicId(publicId);
     }
 

+ 10 - 27
src/main/java/com/uas/platform/b2c/trade/seek/service/impl/SeekPurchaseBomServiceImpl.java

@@ -3,7 +3,6 @@ package com.uas.platform.b2c.trade.seek.service.impl;
 import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.common.search.service.SearcherService;
 import com.uas.platform.b2c.core.support.SystemSession;
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.core.utils.StringUtilB2C;
 import com.uas.platform.b2c.prod.commodity.dao.GoodsDao;
 import com.uas.platform.b2c.prod.commodity.dao.ProductDao;
@@ -12,22 +11,12 @@ import com.uas.platform.b2c.prod.product.brand.dao.BrandDao;
 import com.uas.platform.b2c.prod.product.brand.modal.Brand;
 import com.uas.platform.b2c.prod.product.component.dao.ComponentDao;
 import com.uas.platform.b2c.prod.product.component.modal.Component;
-import com.uas.platform.b2c.trade.seek.dao.SeekPurchaseBomDao;
-import com.uas.platform.b2c.trade.seek.dao.SeekPurchaseBomListDao;
-import com.uas.platform.b2c.trade.seek.dao.SeekPurchaseByBatchDao;
-import com.uas.platform.b2c.trade.seek.dao.SeekPurchaseDao;
-import com.uas.platform.b2c.trade.seek.dao.SeekPurchaseGoodsDao;
-import com.uas.platform.b2c.trade.seek.dao.SeekPurchaseOfferDao;
-import com.uas.platform.b2c.trade.seek.model.PurcInquiry;
-import com.uas.platform.b2c.trade.seek.model.PurcInquiryItem;
-import com.uas.platform.b2c.trade.seek.model.SeekPurchaseBom;
-import com.uas.platform.b2c.trade.seek.model.SeekPurchaseBomList;
-import com.uas.platform.b2c.trade.seek.model.SeekPurchaseByBatch;
+import com.uas.platform.b2c.trade.seek.dao.*;
+import com.uas.platform.b2c.trade.seek.model.*;
 import com.uas.platform.b2c.trade.seek.service.SeekPurchaseBomService;
 import com.uas.platform.b2c.trade.support.CodeType;
 import com.uas.platform.b2c.trade.support.ResultMap;
 import com.uas.platform.core.exception.IllegalOperatorException;
-import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.persistence.criteria.PredicateUtils;
 import com.uas.platform.core.util.HttpUtil;
@@ -38,6 +27,8 @@ import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 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.dao.DataAccessException;
 import org.springframework.data.domain.Page;
@@ -56,20 +47,11 @@ import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
-import java.io.*;
+import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -121,7 +103,8 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService {
     @Autowired
     private ProductDao productDao;
 
-    private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
+    private final Logger logger = LoggerFactory.getLogger(SeekPurchaseBomServiceImpl.class);
+
 
     /**
      * 模板列
@@ -913,9 +896,9 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService {
         String res = "";
         try {
             res = HttpUtil.doPost(url + "/inquiry/buyer/save", FlexJsonUtils.toJsonDeep(inquiry));
-            logger.log("bom求购确认发布成功", user.getUserUU() + ",参数:" + FlexJsonUtils.toJsonDeep(inquiry));
+            logger.info("bom求购确认发布成功", user.getUserUU() + ",参数:" + FlexJsonUtils.toJsonDeep(inquiry));
         } catch (Exception e) {
-            logger.log("bom求购确认发布报错", user.getUserUU() + ",错误:" + e.getMessage() + "参数:" + FlexJsonUtils.toJsonDeep(inquiry));
+            logger.info("bom求购确认发布报错", user.getUserUU() + ",错误:" + e.getMessage() + "参数:" + FlexJsonUtils.toJsonDeep(inquiry));
             e.printStackTrace();
             throw new IllegalOperatorException("发布失败");
         }

+ 1 - 1
src/main/resources/logback.xml

@@ -5,7 +5,7 @@
     <!-- 文件输出指定项目日志 -->
     <appender name="file" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>logs/%d{yyyy-MM-dd}.log</fileNamePattern>
+            <fileNamePattern>${CATALINA_HOME}/logs/yuija%d{yyyy-MM-dd}.log</fileNamePattern>
             <maxHistory>30</maxHistory>
         </rollingPolicy>