调整日志收集的问题.

pom.xml

@@ -72,6 +72,12 @@
 		<dependency>
 			<groupId>com.uas.platform</groupId>
 			<artifactId>platform-core</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-log4j12</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>com.uas.api</groupId>
@@ -190,14 +196,46 @@
 			<groupId>org.slf4j</groupId>
 			<artifactId>jcl-over-slf4j</artifactId>
 		</dependency>
+		<!--<dependency>-->
+			<!--<groupId>org.slf4j</groupId>-->
+			<!--<artifactId>slf4j-log4j12</artifactId>-->
+		<!--</dependency>-->
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>aspectjrt</artifactId>
+		</dependency>
+		<!-- logback日志配置结束 -->
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+			<version>1.2.3</version>
+		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-core</artifactId>
+			<version>1.2.3</version>
+		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
+			<artifactId>log4j-over-slf4j</artifactId>
+			<version>1.7.25</version>
 		</dependency>
 		<dependency>
-			<groupId>org.aspectj</groupId>
-			<artifactId>aspectjrt</artifactId>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-access</artifactId>
+			<version>1.2.3</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>1.7.25</version>
+		</dependency>
+		<dependency>
+			<groupId>org.logback-extensions</groupId>
+			<artifactId>logback-ext-spring</artifactId>
+			<version>0.1.4</version>
 		</dependency>
+		<!-- logback日志配置结束 -->
 		<dependency>
 			<groupId>org.aspectj</groupId>
 			<artifactId>aspectjweaver</artifactId>

src/main/java/com/uas/platform/b2c/common/account/controller/RoleController.java

@@ -2,9 +2,9 @@ package com.uas.platform.b2c.common.account.controller;
 
 import com.uas.platform.b2c.common.account.model.Role;
 import com.uas.platform.b2c.common.account.service.RoleService;
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
-import com.uas.platform.core.logging.BufferedLoggerManager;
 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.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -28,7 +28,7 @@ public class RoleController {
     @Autowired
     private RoleService roleService;
 
-    private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
+    private final static Logger logger = LoggerFactory.getLogger(RoleController.class);
 
     /**
      * 取系统资源
@@ -62,7 +62,7 @@ public class RoleController {
     public ResponseEntity<String> save(@RequestBody String json) {
         Role role = FlexJsonUtils.fromJson(json, Role.class);
         role = roleService.save(role);
-        logger.log("角色", "添加角色", role.getDuty(), role.getDesc(), role.getId());
+        logger.info("角色", "添加角色", role.getDuty(), role.getDesc(), role.getId());
         return new ResponseEntity<String>(HttpStatus.OK);
     }
 
@@ -76,7 +76,7 @@ public class RoleController {
     public ResponseEntity<String> delete(@PathVariable("roleId") Long roleId) {
         Role role = roleService.findById(roleId);
         roleService.delete(role);
-        logger.log("角色", "删除角色", role.getDuty(), role.getDesc(), role.getId());
+        logger.info("角色", "删除角色", role.getDuty(), role.getDesc(), role.getId());
         return new ResponseEntity<String>(HttpStatus.OK);
     }
 

src/main/java/com/uas/platform/b2c/common/account/controller/SecurityController.java

@@ -24,7 +24,6 @@ import com.uas.sso.entity.UserSpaceView;
 import com.uas.sso.entity.UserView;
 import com.uas.sso.util.AccountUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.mobile.device.Device;
@@ -36,6 +35,8 @@ import org.springframework.ui.ModelMap;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -53,7 +54,7 @@ import java.util.List;
 @Controller
 public class SecurityController {
 
-	private static final Logger logger = Logger.getLogger(SecurityController.class);
+	private static final Logger logger = LoggerFactory.getLogger(SecurityController.class);
 
 	@Autowired
 	private UserService userService;

src/main/java/com/uas/platform/b2c/common/base/service/impl/FileClientImpl.java

@@ -6,7 +6,8 @@ import com.uas.dfs.domain.MetaData;
 import com.uas.dfs.service.FileClient;
 import com.uas.platform.b2c.common.base.constant.FileClientConstant;
 import com.uas.platform.b2c.core.config.SysConf;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ByteArrayResource;
 import org.springframework.http.*;
@@ -27,7 +28,7 @@ public class FileClientImpl implements FileClient {
 
     private final SysConf sysConf;
 
-    private final Logger logger = Logger.getLogger(getClass());
+    private final Logger logger = LoggerFactory.getLogger(FileClientImpl.class);
 
     @Autowired
     public FileClientImpl(RestTemplate restTemplate, SysConf sysConf) {

src/main/java/com/uas/platform/b2c/fa/settlement/controller/SettlementController.java

@@ -2,25 +2,21 @@ package com.uas.platform.b2c.fa.settlement.controller;
 
 
 import com.uas.platform.b2c.common.account.model.Enterprise;
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.fa.payment.model.BankTransfer;
 import com.uas.platform.b2c.fa.settlement.model.RequestPayment;
 import com.uas.platform.b2c.fa.settlement.service.SettlementService;
 import com.uas.platform.b2c.trade.order.model.PurchaseDetail;
 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;
-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.*;
 
 /**
  * 结算相关请求处理控制器
@@ -31,7 +27,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/trade/settlement")
 public class SettlementController {
 
-	private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
+	private static final Logger logger = LoggerFactory.getLogger(SettlementController.class);
 	private final SettlementService settlementService;
 
     /**
@@ -56,7 +52,7 @@ public class SettlementController {
 	public Page<Enterprise> findEnterPageByStatus(@ApiParam(required = true, value = "分页参数") PageParams params, @ApiParam(required = true, value = "搜索字符串") String keyword) {
 		PageInfo pageInfo = new PageInfo(params);
 		assert logger != null;
-		logger.log("供应商结算", "根据采购单分页查询供应商信息");
+		logger.info("供应商结算", "根据采购单分页查询供应商信息");
 		return settlementService.findEnterPageByStatus(pageInfo, keyword);
 	}
 
@@ -75,7 +71,7 @@ public class SettlementController {
 	public Page<PurchaseDetail> findPurchaseDetailPageByEnUu(@ApiParam(required = true, value = "分页参数") PageParams params, @ApiParam(required = true, value = "搜索字符串") String keyword, @ApiParam(required = true, value = "企业enuu") long enuu, @ApiParam(required = true, value = "开始日期") Long fromDate, @ApiParam(required = true, value = "结束日期") Long toDate) {
 		PageInfo pageInfo = new PageInfo(params);
 		assert logger != null;
-		logger.log("供应商结算", "获取待结算采购单明细信息");
+		logger.info("供应商结算", "获取待结算采购单明细信息");
 		return settlementService.findPurchaseDetailPageByEnUu(pageInfo, keyword, enuu, fromDate, toDate);
 	}
 
@@ -89,7 +85,7 @@ public class SettlementController {
 	@ApiOperation(value = "批量申请付款，生成付款申请单", httpMethod = "PUT")
 	public ResultMap batchRequestPay(@ApiParam(required = true, value = "采购单拼接字符串") @PathVariable("ids") String ids) {
 		assert logger != null;
-		logger.log("供应商结算", "批量申请付款，采购单ids[" + ids + "]");
+		logger.info("供应商结算", "批量申请付款，采购单ids[" + ids + "]");
 		return settlementService.batchRequestPay(ids);
 	}
 
@@ -107,7 +103,7 @@ public class SettlementController {
 	public Page<RequestPayment> findPaymentPage(@ApiParam(required = true, value = "分页参数") PageParams params, @ApiParam(required = true, value = "申请单状态") Integer status, @ApiParam(required = true, value = "是否到期") Integer type, @ApiParam(required = true, value = "搜索字符串") String keyword) {
 		PageInfo pageInfo = new PageInfo(params);
 		assert logger != null;
-		logger.log("供应商结算", "分页获取付款申请单，status=" + status + ",type=" + type);
+		logger.info("供应商结算", "分页获取付款申请单，status=" + status + ",type=" + type);
 		return settlementService.findPaymentPage(pageInfo, status, type, keyword);
 	}
 
@@ -125,7 +121,7 @@ public class SettlementController {
 	public Page<RequestPayment> findEnterPaymentPage(@ApiParam(required = true, value = "分页参数") PageParams params, @ApiParam(required = true, value = "申请单状态") Integer status, @ApiParam(required = true, value = "是否到期") Integer type, @ApiParam(required = true, value = "搜索字符串") String keyword) {
 		PageInfo pageInfo = new PageInfo(params);
 		assert logger != null;
-		logger.log("卖家中心-交易管理", "分页获取付款申请单记录信息，status=" + status + ",type=" + type);
+		logger.info("卖家中心-交易管理", "分页获取付款申请单记录信息，status=" + status + ",type=" + type);
 		return settlementService.findEnterPaymentPage(pageInfo, status, type, keyword);
 	}
 
@@ -141,7 +137,7 @@ public class SettlementController {
 	public ModelMap ensurePayment(@ApiParam(required = true, value = "申请单号") @PathVariable("id") Long id, @ApiParam(required = true, value = "BankTransfer对象") @RequestBody BankTransfer bankTransfer) {
 		ModelMap modelMap = new ModelMap();
 		assert logger != null;
-		logger.log("供应商结算", "确认付款申请单付款");
+		logger.info("供应商结算", "确认付款申请单付款");
 		try {
 			String str = settlementService.ensureSettle(id, bankTransfer);
 			modelMap.put("status", str);

src/main/java/com/uas/platform/b2c/logistics/controller/InvoiceController.java

@@ -3,7 +3,6 @@ package com.uas.platform.b2c.logistics.controller;
 import com.alibaba.fastjson.JSONObject;
 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.utils.FastjsonUtils;
 import com.uas.platform.b2c.core.utils.StringUtilB2C;
 import com.uas.platform.b2c.logistics.model.Invoice;
@@ -11,19 +10,16 @@ import com.uas.platform.b2c.logistics.service.InvoiceFOrderService;
 import com.uas.platform.b2c.logistics.service.InvoiceFPurchaseService;
 import com.uas.platform.b2c.logistics.service.InvoiceService;
 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 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.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.management.OperationsException;
 import java.util.List;
@@ -51,7 +47,7 @@ public class InvoiceController {
     @Autowired
     private InvoiceFPurchaseService inFpuService;
 	
-	private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
+	private static final Logger logger = LoggerFactory.getLogger(InvoiceController.class);
 
 	@RequestMapping(value = "/convert", method = RequestMethod.GET)
 	public ResultMap convert() {
@@ -68,7 +64,7 @@ public class InvoiceController {
 	@RequestMapping(value = "/inFor/create/{orid}/order", method = RequestMethod.PUT)
 	@ApiOperation(value = "订单转出货", httpMethod = "PUT")
 	public Invoice send(@ApiParam(required = true, value = "订单id") @PathVariable Long orid) {
-		logger.log("客户出货单信息管理", "转出货", "转出货的订单id=" + orid + ",操作人：" + SystemSession.getUser().getUserUU() + "-" + SystemSession.getUser().getUserName());
+		logger.info("客户出货单信息管理", "转出货", "转出货的订单id=" + orid + ",操作人：" + SystemSession.getUser().getUserUU() + "-" + SystemSession.getUser().getUserName());
 		return invoiceService.createInvoiceFromOrder(orid);
 	}
 
@@ -81,7 +77,7 @@ public class InvoiceController {
 	@RequestMapping(value = "/inFor/{inid}/send", method = RequestMethod.PUT)
 	@ApiOperation(value = "平台发货", httpMethod = "PUT")
 	public Invoice sendorder(@ApiParam(required = true, value = "发货单号") @PathVariable String inid) {
-		logger.log("客户出货单信息管理", "平台发货", "平台发货的流水号:" + inid + ",操作人：" + SystemSession.getUser().getUserUU() + "-" +SystemSession.getUser().getUserName());
+		logger.info("客户出货单信息管理", "平台发货", "平台发货的流水号:" + inid + ",操作人：" + SystemSession.getUser().getUserUU() + "-" +SystemSession.getUser().getUserName());
 		return invoiceService.sendInvoiceFOrder(inid);
 	}
 
@@ -96,7 +92,7 @@ public class InvoiceController {
 	@RequestMapping(value = "/inFor/admin", method = RequestMethod.GET)
 	@ApiOperation(value = "平台根据状态查看卖家出货单", httpMethod = "GET")
 	public Page<Invoice> findAdminInFor(@ApiParam(required = true, value = "分页参数") PageParams params, @ApiParam(required = true, value = "搜索字符串") String keyword, @ApiParam(required = true, value = "出货单状态") String status) {
-		logger.log("客户出货单信息管理", "平台根据状态查看卖家出货单");
+		logger.info("客户出货单信息管理", "平台根据状态查看卖家出货单");
 		PageInfo pageInfo = new PageInfo(params);
 		return invoiceService.findAdminInFor(pageInfo, keyword, status);
 	}
@@ -111,7 +107,7 @@ public class InvoiceController {
 	@RequestMapping(value = "/inFor/tobeshipped", method = RequestMethod.GET)
 	@ApiOperation(value = "查看待出货状态出货单", httpMethod = "GET")
 	public Page<Invoice> findToBeShipped(@ApiParam(required = true, value = "分页参数") PageParams params, @ApiParam(required = true, value = "搜索字符串") String keyword) {
-		logger.log("客户出货单信息管理", "查看待出货");
+		logger.info("客户出货单信息管理", "查看待出货");
 		PageInfo info = new PageInfo(params);
 		info.filter("status", Status.TOBESHIPPED.value());
 		return invoiceService.findPageByStatus(info, keyword, com.uas.platform.b2c.core.constant.Type.Invoice_B2c_code.value());
@@ -127,7 +123,7 @@ public class InvoiceController {
 	@RequestMapping(value = "/inFor/inbound", method = RequestMethod.GET)
 	@ApiOperation(value = "查看待收货状态出货单", httpMethod = "GET")
 	public Page<Invoice> findInbound(@ApiParam(required = true, value = "分页参数") PageParams params, @ApiParam(required = true, value = "搜索字符串") String keyword) {
-		logger.log("客户出货单信息管理", "查看待收货");
+		logger.info("客户出货单信息管理", "查看待收货");
 		PageInfo info = new PageInfo(params);
 		info.filter("status", Status.INBOUND.value());
 		return invoiceService.findPageByStatus(info, keyword, com.uas.platform.b2c.core.constant.Type.Invoice_B2c_code.value());
@@ -143,7 +139,7 @@ public class InvoiceController {
 	@RequestMapping(value = "/inFor/received", method = RequestMethod.GET)
 	@ApiOperation(value = "查看已收货状态出货单", httpMethod = "GET")
 	public Page<Invoice> findReceived(@ApiParam(required = true, value = "分页参数") PageParams params, @ApiParam(required = true, value = "搜索字符串") String keyword) {
-		logger.log("客户出货单信息管理", "查看已收货");
+		logger.info("客户出货单信息管理", "查看已收货");
 		PageInfo info = new PageInfo(params);
 		info.filter("status", Status.RECEIVED.value());
 		return invoiceService.findPageByStatus(info, keyword, com.uas.platform.b2c.core.constant.Type.Invoice_B2c_code.value());
@@ -159,7 +155,7 @@ public class InvoiceController {
 	@RequestMapping(value = "/inFor/paid", method = RequestMethod.GET)
 	@ApiOperation(value = "查看已付款状态出货单", httpMethod = "GET")
 	public Page<Invoice> findPaid(@ApiParam(required = true, value = "分页参数") PageParams params, @ApiParam(required = true, value = "搜索字符串") String keyword) {
-		logger.log("客户出货单信息管理", "查看已付款");
+		logger.info("客户出货单信息管理", "查看已付款");
 		PageInfo info = new PageInfo(params);
 		info.filter("status", Status.PAID.value());
 		return invoiceService.findPageByStatus(info, keyword, com.uas.platform.b2c.core.constant.Type.Invoice_B2c_code.value());
@@ -174,7 +170,7 @@ public class InvoiceController {
 	@RequestMapping(value = "/{inid}/find", method = RequestMethod.GET)
 	@ApiOperation(value = "根据转出货单id查看出货单信息", httpMethod = "GET")
 	public Invoice getInvoiceFOrder(@ApiParam(required = true, value = "出货单号") @PathVariable Long inid) {
-		logger.log("客户出货单信息管理", "产看客户出货单信息");
+		logger.info("客户出货单信息管理", "产看客户出货单信息");
 		return invoiceService.getInvoice(inid);
 	}
 
@@ -189,7 +185,7 @@ public class InvoiceController {
 	public String convertInvoiceFOrder(@ApiParam(required = true, value = "所有转出货单的订单map集合") @RequestBody String postDate) {
 		JSONObject jsonObject = FastjsonUtils.parseObject(postDate);
 		assert logger != null;
-		logger.log("客户出货单信息管理", "批量转出货单id号：" + jsonObject.getString("ids") + ",操作者：" + SystemSession.getUser().getUserUU() + "-" + SystemSession.getUser().getUserName());
+		logger.info("客户出货单信息管理", "批量转出货单id号：" + jsonObject.getString("ids") + ",操作者：" + SystemSession.getUser().getUserUU() + "-" + SystemSession.getUser().getUserName());
 		return invoiceService.convertInvoiceFOrder(jsonObject);
 	}
 
@@ -232,7 +228,7 @@ public class InvoiceController {
 	@RequestMapping(value = "/{invoiceid}/code", method = RequestMethod.GET)
 	@ApiOperation(value = "根据出货单号查看出货详情", httpMethod = "GET")
 	public Invoice getInvoiceFOrder(@ApiParam(required = true, value = "出货单号") @PathVariable String invoiceid) {
-		logger.log("客户出货单信息管理", "根据出货单号查看出货详情");
+		logger.info("客户出货单信息管理", "根据出货单号查看出货详情");
 		invoiceid = StringUtilB2C.decodeValue(invoiceid);
 		return invoiceService.getInvoice(invoiceid);
 	}
@@ -250,7 +246,7 @@ public class InvoiceController {
     @RequestMapping(value = "/inFpu/tobeshipped", method = RequestMethod.GET)
     @ApiOperation(value = "查看待出货状态的出货单(采购单)", httpMethod = "GET")
     public Page<Invoice> findInvoiceFPurchaseToBeShipped(@ApiParam(required = true, value = "分页参数") PageParams params, @ApiParam(required = true, value = "搜索字符串") String keyword) {
-        logger.log("平台出货单管理", "查看待出货");
+        logger.info("平台出货单管理", "查看待出货");
         PageInfo info = new PageInfo(params);
         info.filter("status", Status.TOBESHIPPED.value());
         return invoiceService.findPageByStatus(info, keyword, Type.Invoice_Vender_code.value());
@@ -268,7 +264,7 @@ public class InvoiceController {
     @RequestMapping(value = "/inFpu/business", method = RequestMethod.GET)
     @ApiOperation(value = "根据状态查看企业出货单", httpMethod = "GET")
     public Page<Invoice> findBusiness(@ApiParam(required = true, value = "分页参数") PageParams params, @ApiParam(required = true, value = "搜索字符串") String keyword, @ApiParam(required = true, value = "分页参数") String status, @ApiParam(required = true, value = "是否是送样单，是-送样单") boolean isProof) {
-        logger.log("平台出货单管理", "根据状态查看企业出货单");
+        logger.info("平台出货单管理", "根据状态查看企业出货单");
         PageInfo pageInfo = new PageInfo(params);
         pageInfo.filter("sellerenuu", SystemSession.getUser().getEnterprise().getUu());
         return invoiceService.findPageBusiness(pageInfo, keyword, status, isProof, Type.Invoice_Vender_code.value());
@@ -285,7 +281,7 @@ public class InvoiceController {
     @RequestMapping(value = "/inFpu/admin", method = RequestMethod.GET)
     @ApiOperation(value = "平台根据状态查看卖家出货单", httpMethod = "GET")
     public Page<Invoice> findAdminInFpu(@ApiParam(required = true, value = "分页参数") PageParams params, @ApiParam(required = true, value = "搜索字符串") String keyword, @ApiParam(required = true, value = "出货单状态") String status) {
-        logger.log("平台出货单管理", "平台根据状态查看卖家出货单");
+        logger.info("平台出货单管理", "平台根据状态查看卖家出货单");
         PageInfo pageInfo = new PageInfo(params);
         return invoiceService.findAdminInFpu(pageInfo, keyword, status, Type.Invoice_Vender_code.value());
     }
@@ -299,7 +295,7 @@ public class InvoiceController {
     @RequestMapping(value = "/inFpu/tobeshipped/{ids}", method = RequestMethod.GET)
     @ApiOperation(value = "批量查看平台出货单信息", httpMethod = "GET")
     public List<Invoice> findToBeShippedByInvoiceid(@ApiParam(required = true, value = "出货单号拼接字符串") @PathVariable("ids") String invoiceid) {
-        logger.log("平台出货单管理", "");
+        logger.info("平台出货单管理", "");
         return invoiceService.findToBeShippedByInvoiceid(invoiceid);
     }
 
@@ -313,7 +309,7 @@ public class InvoiceController {
     @RequestMapping(value = "/inFpu/inbound", method = RequestMethod.GET)
     @ApiOperation(value = "查看待收货", httpMethod = "GET")
     public Page<Invoice> findInvoiceFPurchaseInbound(@ApiParam(required = true, value = "分页参数") PageParams params, @ApiParam(required = true, value = "搜索字符串") String keyword) {
-        logger.log("平台出货单管理", "查看待收货");
+        logger.info("平台出货单管理", "查看待收货");
         PageInfo info = new PageInfo(params);
         info.filter("status", Status.INBOUND.value());
         return invoiceService.findPageByStatus(info, keyword, Type.Invoice_Vender_code.value());
@@ -330,7 +326,7 @@ public class InvoiceController {
     @RequestMapping(value = "/inFpu/received", method = RequestMethod.GET)
     @ApiOperation(value = "查看已收货", httpMethod = "GET")
     public Page<Invoice> findInvoiceFPurchaseReceived(@ApiParam(required = true, value = "分页参数") PageParams params, @ApiParam(required = true, value = "搜索字符串") String keyword) {
-        logger.log("平台出货单管理", "查看已收货");
+        logger.info("平台出货单管理", "查看已收货");
         PageInfo info = new PageInfo(params);
         info.filter("status", Status.RECEIVED.value());
         return invoiceService.findPageByStatus(info, keyword, Type.Invoice_Vender_code.value());
@@ -346,7 +342,7 @@ public class InvoiceController {
     @RequestMapping(value = "/inFpu/toreceivemoney", method = RequestMethod.GET)
     @ApiOperation(value = "查看待收款", httpMethod = "GET")
     public Page<Invoice> findToreceivemoney(@ApiParam(required = true, value = "分页参数") PageParams params, @ApiParam(required = true, value = "搜索字符串") String keyword) {
-        logger.log("平台出货单管理", "查看待收款");
+        logger.info("平台出货单管理", "查看待收款");
         PageInfo info = new PageInfo(params);
         info.filter("status", Status.TORECEIVEMONEY.value());
         return invoiceService.findPageByStatus(info, keyword, Type.Invoice_Vender_code.value());
@@ -362,7 +358,7 @@ public class InvoiceController {
     @RequestMapping(value = "/inFpu/moneyreceived", method = RequestMethod.GET)
     @ApiOperation(value = "查看已收款", httpMethod = "GET")
     public Page<Invoice> findMoneyreceived(@ApiParam(required = true, value = "分页参数") PageParams params, @ApiParam(required = true, value = "搜索字符串") String keyword) {
-        logger.log("平台出货单管理", "查看已收款");
+        logger.info("平台出货单管理", "查看已收款");
         PageInfo info = new PageInfo(params);
         info.filter("status", Status.MONEYRECEIVED.value());
         return invoiceService.findPageByStatus(info, keyword, com.uas.platform.b2c.core.constant.Type.Invoice_Vender_code.value());
@@ -379,7 +375,7 @@ public class InvoiceController {
     @RequestMapping(value = "/inFpu/save", method = RequestMethod.POST)
     @ApiOperation(value = "保存出货单信息", httpMethod = "POST")
     public ResultMap saveInvoiceFP(@ApiParam(required = true, value = "对象json字符串") @RequestBody String json, @ApiParam(required = true, value = "单号") Long id) throws OperationsException {
-        logger.log("平台出货单管理", "保存出货单信息", "保存出货单信息 流水号：" + id + ", 操作人：" + SystemSession.getUser().getUserUU() + "-" + SystemSession.getUser().getUserName());
+        logger.info("平台出货单管理", "保存出货单信息", "保存出货单信息 流水号：" + id + ", 操作人：" + SystemSession.getUser().getUserUU() + "-" + SystemSession.getUser().getUserName());
         return invoiceService.ship(json, id);
     }
 

src/main/java/com/uas/platform/b2c/logistics/controller/ReceiptController.java

@@ -3,16 +3,16 @@ package com.uas.platform.b2c.logistics.controller;
 
 import com.uas.platform.b2c.common.account.model.Enterprise;
 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.logistics.model.Receipt;
 import com.uas.platform.b2c.logistics.service.ReceiptService;
-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.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;
@@ -33,7 +33,7 @@ public class ReceiptController {
 	@Autowired
 	private ReceiptService receiptService;
 
-	private UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
+	private Logger logger = LoggerFactory.getLogger(ReceiptController.class);
 
 	/**
 	 * 查看有效入库单
@@ -47,7 +47,7 @@ public class ReceiptController {
 	public Page<Receipt> findAvailable(@ApiParam(required = true, value = "分页参数") PageParams params, @ApiParam(required = true, value = "搜索字符串") String keyword) {
 		PageInfo info = new PageInfo(params);
 		info.filter("status", Status.AVAILABLE.value());
-		logger.log("入库单管理", "获取有效入库单信息");
+		logger.info("入库单管理", "获取有效入库单信息");
 		return receiptService.findPageByStatus(info, keyword);
 	}
 
@@ -63,7 +63,7 @@ public class ReceiptController {
 	public Page<Receipt> findUnavailable(@ApiParam(required = true, value = "分页参数") PageParams params, @ApiParam(required = true, value = "搜索字符串") String keyword) {
 		PageInfo info = new PageInfo(params);
 		info.filter("status", Status.UNAVAILABLE.value());
-		logger.log("入库单管理", "获取无效入库单信息");
+		logger.info("入库单管理", "获取无效入库单信息");
 		return receiptService.findPageByStatus(info, keyword);
 	}
 
@@ -83,7 +83,7 @@ public class ReceiptController {
 		info.filter("status", Status.AVAILABLE.value());
 		info.filter("settlement", Status.SETTLED.value());
 		info.filter("sellerenuu", SystemSession.getUser().getEnterprise().getUu());// 获取供应商uu);
-		logger.log("入库单管理", "卖家获取已结算的入库单信息");
+		logger.info("入库单管理", "卖家获取已结算的入库单信息");
 		return receiptService.findVendorReceipt(info, keyword, fromDate, toDate);
 	}
 
@@ -104,7 +104,7 @@ public class ReceiptController {
 		// TODO 目前没有设置未结算，设置后去除注释即可用
 		info.filter("settlement", Status.NOTSETTLED.value());
 		info.filter("sellerenuu", SystemSession.getUser().getEnterprise().getUu());// 获取供应商uu);
-		logger.log("入库单管理", "卖家获取已结算的入库单信息");
+		logger.info("入库单管理", "卖家获取已结算的入库单信息");
 		return receiptService.findVendorReceipt(info, keyword, fromDate, toDate);
 	}
 
@@ -123,7 +123,7 @@ public class ReceiptController {
 		PageInfo info = new PageInfo(params);
 		info.filter("status", Status.UNAVAILABLE.value());
 		info.filter("sellerenuu", SystemSession.getUser().getEnterprise().getUu());// 获取供应商uu);
-		logger.log("入库单管理", "卖家获取无效的入库单信息");
+		logger.info("入库单管理", "卖家获取无效的入库单信息");
 		return receiptService.findVendorReceipt(info, keyword, fromDate, toDate);
 	}
 
@@ -137,7 +137,7 @@ public class ReceiptController {
 	@ApiOperation(value = "获取入库单详情", httpMethod = "GET")
 	public Receipt getReceipt(@ApiParam(required = true, value = "入库单id") @PathVariable String receiptid) {
 		receiptid = StringUtilB2C.decodeValue(receiptid);
-		logger.log("入库单管理", "获取入库单信息，单号： " + receiptid);
+		logger.info("入库单管理", "获取入库单信息，单号： " + receiptid);
 		return receiptService.findByReceiptid(receiptid);
 
 	}
@@ -150,7 +150,7 @@ public class ReceiptController {
 	@RequestMapping(value = "/getEnters", method = RequestMethod.GET)
 	@ApiOperation(value = "获取当前平台所有交易的供应商", httpMethod = "GET")
 	public List<Enterprise> getEnterByEnUus() {
-		logger.log("卖家管理", "获取当前平台所有卖家的信息");
+		logger.info("卖家管理", "获取当前平台所有卖家的信息");
 		return receiptService.getEnterByEnUus();
 	}
 
@@ -166,7 +166,7 @@ public class ReceiptController {
 	@ApiOperation(value = "获取当前平台所有交易的供应商(分页展示)", httpMethod = "GET")
 	public Page<Enterprise> findEnterPageByStatus(@ApiParam(required = true, value = "分页参数") PageParams params, @ApiParam(required = true, value = "搜索字符串") String keyword, @ApiParam(required = true, value = "入库单状态") Integer status) {
 		PageInfo info = new PageInfo(params);
-		logger.log("卖家管理", "分页获取当前平台所有卖家的信息");
+		logger.info("卖家管理", "分页获取当前平台所有卖家的信息");
 		return receiptService.findEnterPageByStatus(info, keyword, status);
 	}
 
@@ -189,7 +189,7 @@ public class ReceiptController {
 		info.filter("sellerenuu", enuu);
 		info.filter("status", Status.AVAILABLE.value());
 		info.filter("settlement", status);
-		logger.log("入库单管理", "获取卖家uu为 " + enuu + " 的有效入库单信息");
+		logger.info("入库单管理", "获取卖家uu为 " + enuu + " 的有效入库单信息");
 		return receiptService.findReceiptPageByEnUu(info, keyword, enuu, fromDate, toDate, available);
 	}
 
@@ -203,7 +203,7 @@ public class ReceiptController {
 	@ApiOperation(value = "结算交易金额", httpMethod = "PUT")
 	public ModelMap settleReceipt(@ApiParam(required = true, value = "入库单id字符串，以'-'相连") @PathVariable("ids") String ids) {
 		assert logger != null;
-		logger.log("平台结算中心", "结算入库单[" + ids + "]的交易金额");
+		logger.info("平台结算中心", "结算入库单[" + ids + "]的交易金额");
 		return receiptService.settleReceipt(ids);
 	}
 

src/main/java/com/uas/platform/b2c/prod/commodity/controller/BackgroundRecordController.java

@@ -1,11 +1,11 @@
 package com.uas.platform.b2c.prod.commodity.controller;
 
 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.Title;
 import com.uas.platform.b2c.prod.commodity.service.BackgroundRecordService;
 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;
@@ -26,7 +26,7 @@ public class BackgroundRecordController {
     @Autowired
     private BackgroundRecordService recordService;
 
-    private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
+    private final static Logger logger = LoggerFactory.getLogger(BackgroundRecordController.class);
 
     /**
      * 根据useruu返回设置的表头信息
@@ -34,7 +34,7 @@ public class BackgroundRecordController {
      */
     @RequestMapping(value = "/title", method = RequestMethod.GET)
     public Set<Title> getTitleByUseruu() {
-        logger.log("超级后台", "获取表头信息，userUU : " + SystemSession.getUser().getUserUU());
+        logger.info("超级后台", "获取表头信息，userUU : " + SystemSession.getUser().getUserUU());
         return recordService.getTitleInfoByUseruu();
     }
 
@@ -45,7 +45,7 @@ public class BackgroundRecordController {
      */
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     public ResultMap updateTitleInfo(@RequestBody Set<Title> titleSet) {
-        logger.log("超级后台", "更新表头信息，userUU : " + SystemSession.getUser().getUserUU());
+        logger.info("超级后台", "更新表头信息，userUU : " + SystemSession.getUser().getUserUU());
         return recordService.updateTitleInfo(titleSet);
     }
 }

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/CommodityInOutboundServiceImpl.java

@@ -162,103 +162,101 @@ public class CommodityInOutboundServiceImpl implements CommodityInOutboundServic
     public ResultMap inOutBound(String detail, String type, String enName) {
         if (StringUtilB2C.isEmpty(detail)) {
             return new ResultMap(CodeType.NO_INFO, "传入的信息为空");
-        } else {
-            List<InOutboundDetail> detaiList = null;
-            try {
-                detaiList = FlexJsonUtils.fromJsonArray(detail, InOutboundDetail.class);
-            } catch (Exception e) {
-                e.printStackTrace();
-                return new ResultMap(CodeType.NO_INFO, "信息格式不正确");
+        }
+        List<InOutboundDetail> detaiList = null;
+        try {
+            detaiList = FlexJsonUtils.fromJsonArray(detail, InOutboundDetail.class);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return new ResultMap(CodeType.NO_INFO, "信息格式不正确");
+        }
+        Set<Long> prids = new HashSet<>();
+        for (InOutboundDetail inOutboundDetail : detaiList) {
+            if (inOutboundDetail.getProductId() == null) {
+                throw new IllegalArgumentException("传入物料信息缺失");
             }
-            Set<Long> prids = new HashSet<>();
-            for (InOutboundDetail inOutboundDetail : detaiList) {
-                if (inOutboundDetail.getProductId() == null) {
-                    throw new IllegalArgumentException("传入物料信息缺失");
-                }
-                if (NumberUtil.compare(inOutboundDetail.getQty(), DoubleConstant.zero) < 1) {
-                    throw new IllegalArgumentException("传入数量缺失");
-                }
-                prids.add(inOutboundDetail.getProductId());
+            if (NumberUtil.compare(inOutboundDetail.getQty(), DoubleConstant.zero) < 1) {
+                throw new IllegalArgumentException("传入数量缺失");
             }
-            User user = SystemSession.getUser();
-            String inOutboundId = createNumberService.generateOrderNumber(com.uas.platform.b2c.core.constant.EncodingRulesConstant.INOUTBOUND_NUM, "trade$commodity_in_outbound", 8);
-            CommodityInOutbound inOutbound = new CommodityInOutbound(type);
-            inOutbound.setInOutId(inOutboundId);
-            Short i = 1;
-            Set<InOutboundDetail> set = new HashSet<>();
-            Set<Product> productSet = new HashSet<>();
-            if (CollectionUtils.isNotEmpty(prids)) {
-                List<Product> products = productService.findByProductId(prids);
-                for (InOutboundDetail inOutboundDetail : detaiList) {
-                    for (Product product : products) {
-                        if (user.getEnterprise().getUu().longValue() != product.getEnUU().longValue()) {
-                            throw new IllegalOperatorException("型号：" + product.getPcmpcode() + "，品牌：" +product.getPbranden()+"不属于本公司，不能做出入库");
+            prids.add(inOutboundDetail.getProductId());
+        }
+        if (CollectionUtils.isEmpty(prids)) {
+            throw new IllegalOperatorException("没有需要操作的信息");
+        }
+        User user = SystemSession.getUser();
+        String inOutboundId = createNumberService.generateOrderNumber(com.uas.platform.b2c.core.constant.EncodingRulesConstant.INOUTBOUND_NUM, "trade$commodity_in_outbound", 8);
+        CommodityInOutbound inOutbound = new CommodityInOutbound(type);
+        inOutbound.setInOutId(inOutboundId);
+        Short i = 1;
+        Set<InOutboundDetail> set = new HashSet<>();
+        Set<Product> productSet = new HashSet<>();
+        List<Product> products = productService.findByProductId(prids);
+        for (InOutboundDetail inOutboundDetail : detaiList) {
+            for (Product product : products) {
+                if (user.getEnterprise().getUu().longValue() != product.getEnUU().longValue()) {
+                    throw new IllegalOperatorException("型号：" + product.getPcmpcode() + "，品牌：" + product.getPbranden()+ "不属于本公司，不能做出入库");
+                }
+                if (inOutboundDetail.getProductId().longValue() == product.getId().longValue()) {
+                    if (InOutBoundType.INBOUND.equals(type) || InOutBoundType.OTHER_INBOUND.equals(type) || InOutBoundType.PURCHASE_INBOUND.equals(type)) {
+                        //只有入库会影响成本单价
+                        Double totalQty = 0.0d;
+                        Double price = 0.0d;
+                        if (NumberUtil.compare(product.getPrice(), DoubleConstant.zero) > 0 && NumberUtil.compare(product.getErpReserve(), DoubleConstant.zero) > 0) {
+                            price = NumberUtil.add(price, NumberUtil.mul(product.getErpReserve(), product.getPrice()));
+                            totalQty = NumberUtil.add(totalQty, product.getErpReserve());
                         }
-                        if (inOutboundDetail.getProductId().longValue() == product.getId().longValue()) {
-                            if (InOutBoundType.INBOUND.equals(type) || InOutBoundType.OTHER_INBOUND.equals(type) || InOutBoundType.PURCHASE_INBOUND.equals(type)) {
-                                //只有入库会影响成本单价
-                                Double totalQty = 0.0d;
-                                Double price = 0.0d;
-                                if (NumberUtil.compare(product.getPrice(), DoubleConstant.zero) > 0 && NumberUtil.compare(product.getErpReserve(), DoubleConstant.zero) > 0) {
-                                    price = NumberUtil.add(price, NumberUtil.mul(product.getErpReserve(), product.getPrice()));
-                                    totalQty = NumberUtil.add(totalQty, product.getErpReserve());
-                                }
-                                if (NumberUtil.compare(inOutboundDetail.getPrice(), DoubleConstant.zero) > 0 && NumberUtil.compare(inOutboundDetail.getQty(), DoubleConstant.zero) > 0) {
-                                    price = NumberUtil.add(price, NumberUtil.mul(inOutboundDetail.getPrice(),inOutboundDetail.getQty()));
-                                    totalQty = NumberUtil.add(totalQty, inOutboundDetail.getQty());
-                                }
-                                if (NumberUtil.compare(totalQty, DoubleConstant.zero) > 0) {
-                                    product.setPrice(NumberUtil.div(price, totalQty));
-                                }
-                                product.setErpReserve(NumberUtil.add(product.getErpReserve(), inOutboundDetail.getQty()));
-                                productSet.add(product);
-                            } else {
-                                //出库
-                                if (NumberUtil.compare(product.getErpReserve(), DoubleConstant.zero) == 0) {
-                                    throw new IllegalOperatorException("型号：" + product.getPcmpcode() + "，品牌：" +product.getPbranden()+"的物料为0，不能做出库");
-                                } else if (NumberUtil.compare(product.getErpReserve(), inOutboundDetail.getQty()) > -1) {
-                                    product.setErpReserve(NumberUtil.sub(product.getErpReserve(), inOutboundDetail.getQty()));
-                                    productSet.add(product);
-                                } else {
-                                    throw new IllegalOperatorException("型号：" + product.getPcmpcode() + "，品牌：" +product.getPbranden()+"的物料库存数为"+product.getErpReserve() + "出库数是："+inOutboundDetail.getQty()+"不能做出库");
-                                }
-
-                            }
-                            inOutboundDetail.setBrandCn(product.getPbrand());
-                            inOutboundDetail.setBrandEn(product.getPbranden());
-                            inOutboundDetail.setBrandId(product.getPbrandid());
-                            inOutboundDetail.setBranduuid(product.getPbranduuid());
-                            inOutboundDetail.setCmpCode(product.getPcmpcode());
-                            inOutboundDetail.setCmpuuid(product.getCmpUuId());
-                            inOutboundDetail.setKindId(product.getKindid());
-                            inOutboundDetail.setKindName(product.getKind());
-                            inOutboundDetail.setSpec(product.getSpec());
-                            set.add(inOutboundDetail);
-                            inOutboundDetail.setDetno(i++);
-                            inOutboundDetail.setCommodityInOutbound(inOutbound);
-                            break;
+                        if (NumberUtil.compare(inOutboundDetail.getPrice(), DoubleConstant.zero) > 0 && NumberUtil.compare(inOutboundDetail.getQty(), DoubleConstant.zero) > 0) {
+                            price = NumberUtil.add(price, NumberUtil.mul(inOutboundDetail.getPrice(),inOutboundDetail.getQty()));
+                            totalQty = NumberUtil.add(totalQty, inOutboundDetail.getQty());
+                        }
+                        if (NumberUtil.compare(totalQty, DoubleConstant.zero) > 0) {
+                            product.setPrice(NumberUtil.div(price, totalQty));
+                        }
+                        product.setErpReserve(NumberUtil.add(product.getErpReserve(), inOutboundDetail.getQty()));
+                        productSet.add(product);
+                    } else {
+                        //出库
+                        if (NumberUtil.compare(product.getErpReserve(), DoubleConstant.zero) == 0) {
+                            throw new IllegalOperatorException("型号：" + product.getPcmpcode() + "，品牌：" +product.getPbranden()+ "的物料为0，不能做出库");
+                        } else if (NumberUtil.compare(product.getErpReserve(), inOutboundDetail.getQty()) > -1) {
+                            product.setErpReserve(NumberUtil.sub(product.getErpReserve(), inOutboundDetail.getQty()));
+                            productSet.add(product);
+                        } else {
+                            throw new IllegalOperatorException("型号：" + product.getPcmpcode() + "，品牌：" +product.getPbranden() + "的物料库存数为" + product.getErpReserve() + "出库数是：" + inOutboundDetail.getQty()+ "不能做出库");
                         }
                     }
+                    inOutboundDetail.setBrandCn(product.getPbrand());
+                    inOutboundDetail.setBrandEn(product.getPbranden());
+                    inOutboundDetail.setBrandId(product.getPbrandid());
+                    inOutboundDetail.setBranduuid(product.getPbranduuid());
+                    inOutboundDetail.setCmpCode(product.getPcmpcode());
+                    inOutboundDetail.setCmpuuid(product.getCmpUuId());
+                    inOutboundDetail.setKindId(product.getKindid());
+                    inOutboundDetail.setKindName(product.getKind());
+                    inOutboundDetail.setSpec(product.getSpec());
+                    set.add(inOutboundDetail);
+                    inOutboundDetail.setDetno(i++);
+                    inOutboundDetail.setCommodityInOutbound(inOutbound);
+                    break;
                 }
-            } else {
-                throw new IllegalOperatorException("没有需要操作的信息");
-            }
-            inOutbound.setInOutboundDetails(set);
-            inOutbound.setAffiliatedEnterprise(enName);
-            CommodityInOutbound commodityInOutbound = commodityInOutboundDao.save(inOutbound);
-            //重新计算成本价、在售产品的库存信息需要更新
-            List<Long> pridList = new ArrayList<>();
-            pridList.addAll(prids);
-            List<Product> productList = new ArrayList<>();
-            productList.addAll(productSet);
-            if (CollectionUtils.isNotEmpty(productList)) {
-                productService.save(productList);
             }
-            if (CollectionUtils.isNotEmpty(pridList)) {
-                productService.updateProductsByInBound(pridList);
-            }
-            return ResultMap.success(commodityInOutbound);
         }
+
+        inOutbound.setInOutboundDetails(set);
+        inOutbound.setAffiliatedEnterprise(enName);
+        CommodityInOutbound commodityInOutbound = commodityInOutboundDao.save(inOutbound);
+        //重新计算成本价、在售产品的库存信息需要更新
+        List<Long> pridList = new ArrayList<>();
+        pridList.addAll(prids);
+        List<Product> productList = new ArrayList<>();
+        productList.addAll(productSet);
+        if (CollectionUtils.isNotEmpty(productList)) {
+            productService.save(productList);
+        }
+        if (CollectionUtils.isNotEmpty(pridList)) {
+            productService.updateProductsByInBound(pridList);
+        }
+        return ResultMap.success(commodityInOutbound);
     }
 
     /**

src/main/java/com/uas/platform/b2c/prod/product/property/controller/PropertyController.java

@@ -1,12 +1,12 @@
 package com.uas.platform.b2c.prod.product.property.controller;
 
+import com.uas.platform.b2c.core.utils.FastjsonUtils;
 import com.uas.platform.b2c.prod.product.property.model.Property;
 import com.uas.platform.b2c.prod.product.property.service.PropertyService;
-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;
@@ -26,7 +26,7 @@ public class PropertyController {
 	@Autowired
 	private PropertyService propertyService;
 
-	private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
+	private static final Logger logger = LoggerFactory.getLogger(PropertyController.class);
 
 	/**
 	 * 根据属性id获取属性信息
@@ -37,7 +37,7 @@ public class PropertyController {
 	@RequestMapping(value = "/{id}", method = RequestMethod.GET)
 	@ResponseBody
 	public Property getProperty(@PathVariable("id") Long id) {
-		logger.log("属性信息", "根据属性id获取属性信息", "属性id： " + id);
+		logger.info("属性信息", "根据属性id获取属性信息", "属性id： " + id);
 		return propertyService.findById(id);
 	}
 
@@ -49,7 +49,7 @@ public class PropertyController {
 	@RequestMapping(method = RequestMethod.GET)
 	@ResponseBody
 	public List<Property> getProperties() {
-		logger.log("属性信息", "获取全部属性信息");
+		logger.info("属性信息", "获取全部属性信息");
 		return propertyService.findAllProperties();
 	}
 
@@ -63,7 +63,7 @@ public class PropertyController {
 	@ResponseBody
 	public Property save(@RequestBody String json) {
 		Property property = FastjsonUtils.fromJson(json, Property.class);
-		logger.log("属性信息", "添加属性", "属性中文名: " + property.getLabelCn());
+		logger.info("属性信息", "添加属性", "属性中文名: " + property.getLabelCn());
 		return propertyService.save(property);
 	}
 
@@ -77,7 +77,7 @@ public class PropertyController {
 	@ResponseBody
 	public Property updateProperty(@RequestBody String json) {
 		Property property = FastjsonUtils.fromJson(json, Property.class);
-		logger.log("属性信息", "更新属性", "属性中文名: " + property.getLabelCn() + ",属性id： " + property.getId());
+		logger.info("属性信息", "更新属性", "属性中文名: " + property.getLabelCn() + ",属性id： " + property.getId());
 		return propertyService.update(property);
 	}
 
@@ -92,7 +92,7 @@ public class PropertyController {
 	@ResponseBody
 	public Page<Property> getAllProperties(PageParams params, String keyword) {
 		PageInfo info = new PageInfo(params);
-		logger.log("属性信息", "分页获取属性信息", "分页获取属性信息");
+		logger.info("属性信息", "分页获取属性信息", "分页获取属性信息");
 		return propertyService.findAllProperties(info, keyword);
 	}
 }

src/main/java/com/uas/platform/b2c/prod/store/task/ViolationsAutoFinish.java

@@ -1,7 +1,8 @@
 package com.uas.platform.b2c.prod.store.task;
 
 import com.uas.platform.b2c.prod.store.service.StoreViolationsService;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.EnableAsync;
@@ -26,7 +27,7 @@ public class ViolationsAutoFinish {
 
 	private final StoreViolationsService violationsService;
 
-	private final Logger logger = Logger.getLogger(getClass());
+	private final Logger logger = LoggerFactory.getLogger(ViolationsAutoFinish.class);
 
 	@Autowired
 	public ViolationsAutoFinish(StoreViolationsService violationsService) {

src/main/java/com/uas/platform/b2c/trade/deprecated/controller/MakeDemandController.java

@@ -2,23 +2,18 @@ package com.uas.platform.b2c.trade.deprecated.controller;
 
 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.utils.FastjsonUtils;
 import com.uas.platform.b2c.trade.deprecated.model.MakeDemand;
 import com.uas.platform.b2c.trade.deprecated.model.MakeDemandInfo;
 import com.uas.platform.b2c.trade.deprecated.service.MakeDemandService;
-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;
-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.*;
 
 /**
  * 创客需求
@@ -34,7 +29,7 @@ public class MakeDemandController {
 	@Autowired
 	private MakeDemandService makeDemandService;
 
-	private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
+	private static final Logger logger = LoggerFactory.getLogger(MakeDemandController.class);
 
 	/**
 	 * 未登录存储
@@ -51,7 +46,7 @@ public class MakeDemandController {
 			System.out.println("这次没有登录");
 		}
 		makeDemand.setUseruu(useruu);
-		logger.log("创客需求管理", "未登录状态保存创客需求");
+		logger.info("创客需求管理", "未登录状态保存创客需求");
 		makeDemandService.save(makeDemand);
 	}
 
@@ -68,7 +63,7 @@ public class MakeDemandController {
 			System.out.println("这次没有登录");
 		}
 		makeDemand.setUseruu(useruu);
-		logger.log("创客需求管理", "已登录状态保存创客需求");
+		logger.info("创客需求管理", "已登录状态保存创客需求");
 		makeDemandService.save(makeDemand);
 	}
 
@@ -78,7 +73,7 @@ public class MakeDemandController {
 	@RequestMapping(value = "/makeDemand/save/file", method = RequestMethod.POST)
 	public MakeDemand saveMakDemandFile(String maDemand, FileUpload fileItem) {
 		MakeDemand makeDemand = FastjsonUtils.fromJson(maDemand, MakeDemand.class);
-		logger.log("创客需求管理", "保存附件");
+		logger.info("创客需求管理", "保存附件");
 		return makeDemandService.save(makeDemand, fileItem);
 
 	}
@@ -92,7 +87,7 @@ public class MakeDemandController {
 
 	@RequestMapping(value = "/makeDemand/handle/{id}", method = RequestMethod.POST)
 	public void handleMakeDemand(@PathVariable("id") Long id, String remark) {
-		logger.log("创客需求管理", "处理创客需求", "处理创客需求，id：" + id, id.toString(), id);
+		logger.info("创客需求管理", "处理创客需求", "处理创客需求，id：" + id, id.toString(), id);
 		makeDemandService.handleMakeDemand(id, remark);
 	}
 
@@ -104,7 +99,7 @@ public class MakeDemandController {
 	 */
 	@RequestMapping(value = "/makeDemand/{id}", method = RequestMethod.GET)
 	public MakeDemand getMakeDemandById(@PathVariable("id") Long id) {
-		logger.log("创客需求管理", "获取创客需求", "获取创客需求信息，id：" + id, id.toString(), id);
+		logger.info("创客需求管理", "获取创客需求", "获取创客需求信息，id：" + id, id.toString(), id);
 		return makeDemandService.getMakeDemandById(id);
 	}
 
@@ -121,7 +116,7 @@ public class MakeDemandController {
 		PageInfo info = new PageInfo(params);
 		info.filter("useruu", SystemSession.getUser().getUserUU());
 		info.filter("resultStatus", status);
-		logger.log("创客需求管理", "分页获取创客需求信息", "个人用户获取创客需求信息");
+		logger.info("创客需求管理", "分页获取创客需求信息", "个人用户获取创客需求信息");
 		return makeDemandService.getPageMakeDemandInfo(info);
 	}
 
@@ -137,7 +132,7 @@ public class MakeDemandController {
 	public Page<MakeDemandInfo> getPageMakeDemandInfoAdmin(PageParams params, int status) {
 		PageInfo info = new PageInfo(params);
 		info.filter("resultStatus", status);
-		logger.log("创客需求管理", "分页获取创客需求信息", "管理平台获取创客需求信息");
+		logger.info("创客需求管理", "分页获取创客需求信息", "管理平台获取创客需求信息");
 		return makeDemandService.getPageMakeDemandInfo(info);
 	}
 
@@ -153,7 +148,7 @@ public class MakeDemandController {
 		map.addAttribute("makerName", SystemSession.getUser().getUserName());
 		map.addAttribute("telephone", SystemSession.getUser().getUserTel());
 		map.addAttribute("email", SystemSession.getUser().getUserEmail());
-		logger.log("创客需求管理", "获取用户基本信息");
+		logger.info("创客需求管理", "获取用户基本信息");
 		return map;
 	}
 }

src/main/java/com/uas/platform/b2c/trade/order/service/impl/PurchaseProductServiceImpl.java

@@ -136,8 +136,8 @@ public class PurchaseProductServiceImpl implements PurchaseProductService {
                         total++;
                     }
                 }
+                // 保存临时表信息
             }
-            // 保存临时表信息
             releaseProductByBatchDao.save(releaseProductByBatchArrayList);
             Long enUU = SystemSession.getUser().getEnterprise().getUu();
             // 验证数据信息是否重复

src/main/java/com/uas/platform/b2c/trade/vendor/controller/VendorIntroductionController.java

@@ -1,14 +1,14 @@
 package com.uas.platform.b2c.trade.vendor.controller;
 
 import com.uas.platform.b2c.common.account.model.Enterprise;
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.prod.commodity.model.V_ProductPrivate;
 import com.uas.platform.b2c.trade.vendor.model.InviteVendorHistory;
 import com.uas.platform.b2c.trade.vendor.model.VendorIntroduction;
 import com.uas.platform.b2c.trade.vendor.service.InviteVendorHistoryService;
 import com.uas.platform.b2c.trade.vendor.service.VendorIntroductionService;
-import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.sso.support.Page;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
@@ -34,7 +34,7 @@ public class VendorIntroductionController {
     @Autowired
 	private InviteVendorHistoryService inviteVendorHistoryService;
 	
-	private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
+	private static final Logger logger = LoggerFactory.getLogger(VendorIntroductionController.class);
 
 
     /**
@@ -120,11 +120,11 @@ public class VendorIntroductionController {
 		try {
 			inviteVendorHistoryService.inviteVendorByVendUU(vendUU);
 			map.put("success", true);
-			logger.log("供应商资源","邀请供应商完善信息成功，vendUU:" + vendUU);
+			logger.info("供应商资源","邀请供应商完善信息成功，vendUU:" + vendUU);
 		} catch (Exception e) {
 			map.put("success", false);
 			map.put("message", e.getMessage());
-			logger.log("供应商资源","邀请供应商完善信息失败，vendUU:" + vendUU + "原因：" + e.getMessage());
+			logger.info("供应商资源","邀请供应商完善信息失败，vendUU:" + vendUU + "原因：" + e.getMessage());
 		}
 		return map;
 	}

src/main/resources/log4j.properties

@@ -1,25 +0,0 @@
-# For JBoss: Avoid to setup Log4J outside $JBOSS_HOME/server/default/deploy/log4j.xml!
-# For all other servers: Comment out the Log4J listener in web.xml to activate Log4J.
-log4j.rootLogger=error, stdout, logfile
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d %p [%c]:%m%n
-
-log4j.appender.logfile=org.apache.log4j.RollingFileAppender
-log4j.appender.logfile.layout=org.apache.log4j.PatternLayout
-log4j.appender.logfile.File=../log4j.log
-#log4j.appender.logfile.File=$CATALINA_BASE/logs/b2c_log4j.log
-# Keep three backup files.
-log4j.appender.logfile.MaxBackupIndex=3
-log4j.appender.logfile.MaxFileSize=5120KB
-# Pattern to output: date priority [category] - message
-log4j.appender.logfile.layout.ConversionPattern=%d %p [%c]:%m%n
-#log4j.logger.org.springframework.samples.petclinic.aspects=DEBUG
-
-log4j.logger.com.uas = info, stdout, logfile
-#=========================================
-#=   spring framework log configuration  =
-#=========================================
-log4j.logger.org.springframework = error
-log4j.additivity.com.uas = false

src/main/resources/logback.xml

@@ -1,16 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <Target>System.out</Target>
         <encoder>
             <Pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</Pattern>
         </encoder>
     </appender>
 
+    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <append>true</append>
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${catalina.home}/logs/b2c-%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 保留 30天数据，默认无限-->
+            <MaxHistory>30</MaxHistory>
+        </rollingPolicy>
+    </appender>
+
     <logger name="com.uas" level="INFO"/>
 
     <root level="ERROR">
         <appender-ref ref="STDOUT"/>
+        <appender-ref ref="FILE" />
     </root>
-
 </configuration>

src/main/resources/logging.properties.deprecated

@@ -1,15 +0,0 @@
-#Tomcat Logger
-
-handlers = org.apache.juli.FileHandler, java.util.logging.ConsoleHandler   
-  
-############################################################   
-# Handler specific properties.   
-# Describes specific configuration info for Handlers.   
-############################################################   
-  
-org.apache.juli.FileHandler.level = FINE   
-org.apache.juli.FileHandler.directory = ${catalina.base}/logs
-org.apache.juli.FileHandler.prefix = error-debug.   
-  
-java.util.logging.ConsoleHandler.level = FINE   
-java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter