Merge remote-tracking branch 'origin/dev' into dev

pom.xml

@@ -48,6 +48,11 @@
             <artifactId>httpclient</artifactId>
             <version>4.4</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+            <version>4.4.8</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpmime</artifactId>
@@ -63,6 +68,12 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -72,6 +83,16 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+        <!-- 配置 log4j2 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-log4j2</artifactId>
+        </dependency>
+        <!-- 加上这个才能辨认到log4j2.yml文件 -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-yaml</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-configuration-processor</artifactId>

src/main/java/com/uas/ps/inquiry/Application.java

@@ -28,11 +28,6 @@ import java.io.PrintStream;
 //@EnableSSO
 public class Application {
     public static void main(String[] args) throws FileNotFoundException {
-        File logFile = new File("logs/log.log");
-        if (!logFile.getParentFile().exists()) {
-            logFile.getParentFile().mkdir();
-        }
-        System.setErr(new PrintStream(new FileOutputStream(logFile, true)));
         SpringApplication application = new SpringApplication(Application.class);
         application.addListeners(new ApplicationListener<ApplicationPreparedEvent>() {
             @Override

src/main/java/com/uas/ps/inquiry/SchedulingConfig.java

@@ -5,7 +5,8 @@ import com.uas.ps.inquiry.dao.CronDao;
 import com.uas.ps.inquiry.model.Cron;
 import com.uas.ps.inquiry.model.InquiryRemind;
 import com.uas.ps.inquiry.service.impl.InquiryServiceImpl;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.Trigger;
@@ -28,7 +29,7 @@ import java.util.List;
 @EnableScheduling
 public class SchedulingConfig implements SchedulingConfigurer {
 
-    private final Logger logger = Logger.getLogger(Logger.class);
+    private final Logger logger = LoggerFactory.getLogger(SchedulingConfig.class);
 
     private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("HH:mm:ss");
 

src/main/java/com/uas/ps/inquiry/controller/DeadlineTask.java

@@ -15,7 +15,8 @@ import com.uas.ps.inquiry.service.InquiryService;
 import com.uas.ps.inquiry.util.FlexJsonUtils;
 import com.uas.ps.inquiry.util.HttpUtil;
 import com.uas.ps.inquiry.util.ThreadUtils;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.scheduling.annotation.EnableAsync;
@@ -52,7 +53,7 @@ public class DeadlineTask {
     @Autowired
     private InquiryDataDao inquiryDataDao;
 
-    private static final Logger log = Logger.getLogger(Logger.class);
+    private static final Logger log = LoggerFactory.getLogger(DeadlineTask.class);
 
     /**
      * 消息类型，公共询价的采纳结果

src/main/java/com/uas/ps/inquiry/controller/ErpDownloadController.java

@@ -1,6 +1,5 @@
 package com.uas.ps.inquiry.controller;
 
-import com.uas.ps.core.logging.BufferedLoggerManager;
 import com.uas.ps.httplog.annotation.HttpLog;
 import com.uas.ps.inquiry.entity.*;
 import com.uas.ps.inquiry.model.InquiryEnRemind;
@@ -8,16 +7,15 @@ import com.uas.ps.inquiry.model.PublicInquiryItem;
 import com.uas.ps.inquiry.service.AttachService;
 import com.uas.ps.inquiry.service.InquiryForSaleService;
 import com.uas.ps.inquiry.service.PublicInquiryService;
-import com.uas.ps.inquiry.support.InquiryBufferedLogger;
 import javassist.NotFoundException;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
-
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.util.ArrayList;
@@ -45,9 +43,7 @@ public class ErpDownloadController {
     @Autowired
     private InquiryForSaleService saleService;
 
-    private final static InquiryBufferedLogger logger = BufferedLoggerManager.getLogger(InquiryBufferedLogger.class);
-
-    private final static Logger log = Logger.getLogger(Logger.class);
+    private final static Logger log = LoggerFactory.getLogger(ErpDownloadController.class);
 
     /**
      * 将买家ERP的公共询价写到公共询价服务中心
@@ -64,7 +60,8 @@ public class ErpDownloadController {
         long start = System.currentTimeMillis();
         publicInquiryService.save(inquiries, enuu, URLDecoder.decode(address, "UTF-8"));
         log.info("/inquiry/public post 耗时:" + (System.currentTimeMillis() - start));
-        logger.log("公共询价", "ERP上传公共询价", "size: " + inquiries.size(), Constant.UU, enuu, InquirySource.ERP.name());
+        log.info("公共询价, ERP上传公共询价, size: {}, Constant: {}, enuu: {}, 报价的应用来源: {}", inquiries.size(), Constant.UU, enuu, InquirySource.ERP.name());
+
     }
 
     /**
@@ -80,7 +77,8 @@ public class ErpDownloadController {
         long start = System.currentTimeMillis();
         publicInquiryService.updateStatus(inquiries, enuu);
         log.info("/inquiry/public/check post 耗时:" + (System.currentTimeMillis() - start));
-        logger.log("公共询价", "ERP设置公共询价不能报价", "size: " + inquiries.size(), Constant.UU, enuu, InquirySource.ERP.name());
+        log.info("公共询价, ERP设置公共询价不能报价, size: {}, Constant: {}, enuu: {}, 报价的应用来源: {}", inquiries.size(), Constant.UU, enuu, InquirySource.ERP.name());
+
     }
 
     /**
@@ -96,7 +94,7 @@ public class ErpDownloadController {
         long start = System.currentTimeMillis();
         List<InquiryDetail> details = publicInquiryService.findNotUploadReply(enuu);
         log.info("/inquiry/public/quotation 耗时:" + (System.currentTimeMillis() - start));
-        logger.log("公共询价", "ERP获取供应商报价信息", "size: " + details.size(), Constant.UU, enuu, InquirySource.ERP.name());
+        log.info("公共询价, ERP获取供应商报价信息, size: {}, Constant: {}, enuu: {}, 报价的应用来源: {}",details.size(), Constant.UU, enuu, InquirySource.ERP.name());
         return details;
     }
 
@@ -112,7 +110,7 @@ public class ErpDownloadController {
     public void onReplySuccess(@RequestBody String data, Long enuu) throws UnsupportedEncodingException {
         long start = System.currentTimeMillis();
         String[] idArray = URLDecoder.decode(data, "UTF-8").split(",");
-        logger.log("公共询价", "ERP获取报价信息返回id", "id: " + idArray, Constant.UU, enuu, InquirySource.ERP.name());
+        log.info("公共询价, ERP获取报价信息返回id, id: {}, Constant: {}, enuu: {}, 报价的应用来源: {}",idArray, Constant.UU, enuu, InquirySource.ERP.name());
         publicInquiryService.onReplyUploadSuccess(idArray);
         log.info("/inquiry/public/reply/back post 耗时:" + (System.currentTimeMillis() - start));
     }
@@ -127,7 +125,7 @@ public class ErpDownloadController {
     @RequestMapping(value = "/checking", method = RequestMethod.POST)
     public void checkInquiry(@RequestBody List<InquiryDetail> details , Long enuu) throws UnsupportedEncodingException {
         long start = System.currentTimeMillis();
-        logger.log("公共询价", "ERP提交报价信息应用禁止报价", "size: " + details.size(), Constant.UU, enuu, InquirySource.ERP.name());
+        log.info("公共询价, ERP提交报价信息应用禁止报价, size: {}, Constant: {}, enuu: {}, 报价的应用来源: {}", details.size(), Constant.UU, enuu, InquirySource.ERP.name());
         publicInquiryService.updateInquiryStatus(details, enuu);
         log.info("/inquiry/public/checking post 耗时:" + (System.currentTimeMillis() - start));
     }
@@ -142,7 +140,7 @@ public class ErpDownloadController {
     @RequestMapping(value = "/reply/decide", method = RequestMethod.POST)
     public void onReplyDecide(@RequestBody List<InquiryDecide> decides, Long enuu) throws UnsupportedEncodingException {
         long start = System.currentTimeMillis();
-        logger.log("公共询价", "ERP针对供应报价信息进行（不）采纳操作", "size: " + decides.size(), Constant.UU, enuu, InquirySource.ERP.name());
+        log.info("公共询价, ERP针对供应报价信息进行（不）采纳操作, size: {}, Constant: {}, enuu: {}, 报价的应用来源: {}", decides.size(), Constant.UU, enuu, InquirySource.ERP.name());
         publicInquiryService.onReplyDecide(decides, enuu);
         log.info("/inquiry/public/reply/decide post 耗时:" + (System.currentTimeMillis() - start));
     }
@@ -158,7 +156,7 @@ public class ErpDownloadController {
     @RequestMapping(value = "/invalid", method = RequestMethod.POST)
     public void onReplyInvalid(@RequestBody List<Inquiry> inquiries, Long enuu) throws UnsupportedEncodingException {
         long start = System.currentTimeMillis();
-        logger.log("公共询价", "ERP作废公共询价单返回数据到公共服务", "size: " + inquiries.size(), Constant.UU, enuu, InquirySource.ERP.name());
+        log.info("公共询价, ERP作废公共询价单返回数据到公共服务, size: {}, Constant: {}, enuu: {}, 报价的应用来源: {}", inquiries.size(), Constant.UU, enuu, InquirySource.ERP.name());
         publicInquiryService.onReplyInvalid(inquiries, enuu);
         log.info("/inquiry/public/invalid post 耗时:" + (System.currentTimeMillis() - start));
     }
@@ -176,7 +174,7 @@ public class ErpDownloadController {
         long start = System.currentTimeMillis();
         List<PublicInquiryItem> items = publicInquiryService.findDecideNotUploadReply(enUU);
         log.info("/inquiry/public/down/decide 耗时:" + (System.currentTimeMillis() - start));
-        logger.log("公共询价", "买家采纳或拒绝之后，上传到报价方UAS", "size: " + items.size(), Constant.UU, enUU, InquirySource.ERP.name());
+        log.info("公共询价, 买家采纳或拒绝之后，上传到报价方UAS, size: {}, Constant: {}, enuu: {}, 报价的应用来源: {}", items.size(), Constant.UU, enUU, InquirySource.ERP.name());
         return items;
     }
 
@@ -199,7 +197,7 @@ public class ErpDownloadController {
         }
         ModelMap map = publicInquiryService.downloadDecideBack(idList, enUU);
         log.info("/inquiry/public/down/decide/back 耗时:" + (System.currentTimeMillis() - start));
-        logger.log("公共询价", "买家采纳或拒绝之后，上传到报价方UAS的回调", "size: " + idList.size(), Constant.UU, enUU, InquirySource.ERP.name());
+        log.info("公共询价, 买家采纳或拒绝之后，上传到报价方UAS的回调, size: {}, Constant: {}, enuu: {}, 报价的应用来源: {}", idList.size(), Constant.UU, enUU, InquirySource.ERP.name());
         return map;
     }
 
@@ -216,7 +214,7 @@ public class ErpDownloadController {
         long start = System.currentTimeMillis();
         List<PublicInquiryItem> details = publicInquiryService.findNotUploadToUas(enUU);
         log.info("/inquiry/public/down/reply 耗时:" + (System.currentTimeMillis() - start));
-        logger.log("公共询价", "ERP获取供应商报价信息", "size: " + details.size(), Constant.UU, enUU, InquirySource.ERP.name());
+        log.info("公共询价, ERP获取供应商报价信息, size: {}, Constant: {}, enuu: {}, 报价的应用来源: {}", details.size(), Constant.UU, enUU, InquirySource.ERP.name());
         return details;
     }
 
@@ -233,7 +231,7 @@ public class ErpDownloadController {
     public void onReplyDownSuccess(String ids, Long enUU) throws UnsupportedEncodingException {
         long start = System.currentTimeMillis();
         String[] idArray = URLDecoder.decode(ids, "UTF-8").split(",");
-        logger.log("公共询价", "将报价方在商城报价的单据同步到报价方UAS 之后 回调 修改状态", "id: " + idArray, Constant.UU, enUU, InquirySource.ERP.name());
+        log.info("公共询价, 将报价方在商城报价的单据同步到报价方UAS之后回调修改状态, id: {}, Constant: {}, enuu: {}, 报价的应用来源: {}", idArray, Constant.UU, enUU, InquirySource.ERP.name());
         publicInquiryService.onReplyDownLoadSuccess(idArray);
         log.info("/inquiry/public/down/reply/back post 耗时:" + (System.currentTimeMillis() - start));
     }
@@ -251,7 +249,7 @@ public class ErpDownloadController {
         long start = System.currentTimeMillis();
         List<InquiryEnRemind> details = publicInquiryService.findNotUploadEnRemind(vendUU);
         log.info("/inquiry/public/enremind 耗时:" + (System.currentTimeMillis() - start));
-        logger.log("公共询价", "UAS获取商城账套下企业商机", "size: " + details.size(), Constant.UU, vendUU, InquirySource.ERP.name());
+        log.info("公共询价, UAS获取商城账套下企业商机, size: {}, Constant: {}, vendUU: {}, 报价的应用来源: {}", details.size(), Constant.UU, vendUU, InquirySource.ERP.name());
         return details;
     }
 
@@ -268,7 +266,7 @@ public class ErpDownloadController {
     public void downEnRemindSuccess(String ids, Long vendUU) throws UnsupportedEncodingException {
         long start = System.currentTimeMillis();
         String[] idArray = URLDecoder.decode(ids, "UTF-8").split(",");
-        logger.log("公共询价", "UAS获取商城账套下企业商机之后 之后 回调 修改状态", "id: " + Arrays.toString(idArray), Constant.UU, vendUU, InquirySource.ERP.name());
+        log.info("公共询价, UAS获取商城账套下企业商机之后 之后 回调 修改状态, id: {}, Constant: {}, vendUU: {}, 报价的应用来源: {}", Arrays.toString(idArray), Constant.UU, vendUU, InquirySource.ERP.name());
         publicInquiryService.downEnRemindSuccess(idArray, vendUU);
         log.info("/inquiry/public/enremind/back post 耗时:" + (System.currentTimeMillis() - start));
     }

src/main/java/com/uas/ps/inquiry/controller/InquiryForBuyerController.java

@@ -1,7 +1,6 @@
 package com.uas.ps.inquiry.controller;
 
 import com.alibaba.fastjson.JSONObject;
-import com.uas.ps.core.logging.BufferedLoggerManager;
 import com.uas.ps.httplog.annotation.HttpLog;
 import com.uas.ps.inquiry.entity.Constant;
 import com.uas.ps.inquiry.entity.InquiryDetailInfo;
@@ -12,8 +11,8 @@ import com.uas.ps.inquiry.model.PurcInquiryItemInfo;
 import com.uas.ps.inquiry.page.PageInfo;
 import com.uas.ps.inquiry.page.SearchFilter;
 import com.uas.ps.inquiry.service.InquiryService;
-import com.uas.ps.inquiry.support.InquiryBufferedLogger;
-import org.apache.log4j.Logger;
+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;
@@ -33,9 +32,7 @@ public class InquiryForBuyerController {
     @Autowired
     private InquiryService inquiryService;
 
-    private final static InquiryBufferedLogger logger = BufferedLoggerManager.getLogger(InquiryBufferedLogger.class);
-
-    private final static Logger log = Logger.getLogger(Logger.class);
+    private final static Logger log = LoggerFactory.getLogger(InquiryForBuyerController.class);
 
     /**
      * 客户查询供应商报价详情
@@ -47,7 +44,7 @@ public class InquiryForBuyerController {
     @HttpLog
     @RequestMapping(value = "/detail", method = RequestMethod.GET)
     public InquiryDetailInfo findById(Long id, Long enuu) {
-        logger.log("公共询价", "客户查询供应商报价详情", "id： " + id, Constant.UU, enuu, InquirySource.PLAIN.name());
+        log.info("公共询价, 客户查询供应商报价详情, id: {}, Constant: {}, enuu: {}, 报价的应用来源: {}", id, Constant.UU, enuu, InquirySource.PLAIN.name());
         long start = System.currentTimeMillis();
         InquiryDetailInfo detailInfo = inquiryService.findById(id, enuu);
         log.info("/inquiry/buyer/save 耗时:" + (System.currentTimeMillis() - start));
@@ -64,7 +61,7 @@ public class InquiryForBuyerController {
     @HttpLog
     @RequestMapping(value = "/inquiryList", method = RequestMethod.GET)
     public Page<PurcInquiry> getInquiry(PageInfo pageInfo, SearchFilter searchFilter) {
-        logger.log("公共询价", "通过企业UU和分页参数获取已发布的询价信息", null, searchFilter.getUserUU(), searchFilter.getEnUU(), InquirySource.PLAIN.name());
+        log.info("公共询价, 通过企业UU和分页参数获取已发布的询价信息, UserUU: {}, enuu: {}, 报价的应用来源: {}",  searchFilter.getUserUU(), searchFilter.getEnUU(), InquirySource.PLAIN.name());
         long start = System.currentTimeMillis();
         Page<PurcInquiry> page = inquiryService.findByPageInfo(pageInfo, searchFilter);
         page = inquiryService.setQuotedAmount(page);
@@ -84,7 +81,7 @@ public class InquiryForBuyerController {
     @HttpLog
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     public Page<PurcInquiryItemInfo> getInquiryList(PageInfo pageInfo, SearchFilter searchFilter, String state, Integer overdue) {
-        logger.log("公共询价", "通过企业UU和分页参数获取已发布的询价信息", null, searchFilter.getUserUU(), searchFilter.getEnUU(), InquirySource.PLAIN.name());
+        log.info("公共询价, 通过企业UU和分页参数获取已发布的询价明细, UserUU: {}, enuu: {}, 报价的应用来源: {}",  searchFilter.getUserUU(), searchFilter.getEnUU(), InquirySource.PLAIN.name());
         long start = System.currentTimeMillis();
         Page<PurcInquiryItemInfo> page = inquiryService.findTodoByPageInfo(pageInfo, searchFilter, state, overdue);
         log.info("/inquiry/buyer/list 耗时:" + (System.currentTimeMillis() - start));
@@ -101,7 +98,8 @@ public class InquiryForBuyerController {
     @HttpLog
     @RequestMapping(value = "/product/detail", method = RequestMethod.GET)
     public InquiryProductInfo findInquiryDetailById(Long id, Long enuu) {
-        logger.log("公共询价", "针对客户查询单个物料明细的报价情况", null, Constant.UU, enuu, InquirySource.PLAIN.name());
+        log.info("公共询价, 针对客户查询单个物料明细的报价情况, Constant: {}, enuu: {}, 报价的应用来源: {}",  Constant.UU, enuu, InquirySource.PLAIN.name());
+        /*logger.log("公共询价", "针对客户查询单个物料明细的报价情况", null, Constant.UU, enuu, InquirySource.PLAIN.name());*/
         long start = System.currentTimeMillis();
         InquiryProductInfo info = inquiryService.findInquiryDetailById(id, enuu);
         log.info("/inquiry/buyer/product/detail 耗时:" + (System.currentTimeMillis() - start));
@@ -120,7 +118,8 @@ public class InquiryForBuyerController {
     @HttpLog
     @RequestMapping(value = "/quotations", method = RequestMethod.GET)
     public Page<PurcInquiryItemInfo> findQuotationsByPage(PageInfo pageInfo, SearchFilter searchFilter, Long enUU, Long userUU, Short overdue) {
-        logger.log("公共询价", "客户查询供应商报价信息", null, userUU, enUU, InquirySource.MALL.name());
+        log.info("公共询价, 客户查询供应商报价信息, userUU: {}, enUU: {}, 报价的应用来源: {}",  userUU, enUU, InquirySource.MALL.name());
+        /* logger.log("公共询价", "客户查询供应商报价信息", null, userUU, enUU, InquirySource.MALL.name());*/
         long start = System.currentTimeMillis();
         Page<PurcInquiryItemInfo> page = inquiryService.findQuotationsByPage(pageInfo, searchFilter, enUU, userUU, overdue);
         log.info("/inquiry/buyer/quotations 耗时:" + (System.currentTimeMillis() - start));
@@ -155,10 +154,12 @@ public class InquiryForBuyerController {
         inquiry = inquiryService.saveInquiry(inquiry);
         log.info("/inquiry/buyer/save post 耗时:" + (System.currentTimeMillis() - start));
         if (null != inquiry.getId()) {
-            logger.log("公共询价", "新增公共询价信息", "单号： " + inquiry.getCode() + "生成id: " + inquiry.getId(), inquiry.getRecorderUU(), inquiry.getEnUU(), InquirySource.PLAIN.name());
+            log.info("公共询价, 新增公共询价信息, 单号: {}, 生成id: {}, RecorderUU: {}, EnUU: {}, 报价的应用来源: {}",  inquiry.getCode(), inquiry.getId(), inquiry.getRecorderUU(), inquiry.getEnUU(), InquirySource.PLAIN.name());
+            /*logger.log("公共询价", "新增公共询价信息", "单号： " + inquiry.getCode() + "生成id: " + inquiry.getId(), inquiry.getRecorderUU(), inquiry.getEnUU(), InquirySource.PLAIN.name());*/
             return JSONObject.toJSONString(inquiry);
         } else {
-            logger.log("公共询价", "新增公共询价信息失败", "单号： " + inquiry.getCode(), inquiry.getRecorderUU(), inquiry.getEnUU(), InquirySource.PLAIN.name());
+            log.info("公共询价, 新增公共询价信息失败, 单号: {}, RecorderUU: {}, EnUU: {}, 报价的应用来源: {}",  inquiry.getCode(), inquiry.getRecorderUU(), inquiry.getEnUU(), InquirySource.PLAIN.name());
+            /*logger.log("公共询价", "新增公共询价信息失败", "单号： " + inquiry.getCode(), inquiry.getRecorderUU(), inquiry.getEnUU(), InquirySource.PLAIN.name());*/
             throw new Exception("保存失败");
         }
     }
@@ -174,7 +175,8 @@ public class InquiryForBuyerController {
     @HttpLog
     @RequestMapping(value = "/decide", method = RequestMethod.POST)
     public void decideQuote(Long id, Short status, Long enuu, Long useruu) throws Exception {
-        logger.log("公共询价", "通过明细id对供应商报价进行审核操作", "id： " + id + ",采纳状态： " + status, useruu, enuu, InquirySource.PLAIN.name());
+        log.info("公共询价, 通过明细id对供应商报价进行审核操作, id: {}, 采纳状态: {}, UserUU: {}, Enuu: {}, 报价的应用来源: {}",  id, status, useruu, enuu, InquirySource.PLAIN.name());
+       /* logger.log("公共询价", "通过明细id对供应商报价进行审核操作", "id： " + id + ",采纳状态： " + status, useruu, enuu, InquirySource.PLAIN.name());*/
         long start = System.currentTimeMillis();
         inquiryService.decideQuote(id, status);
         log.info("/inquiry/buyer/decide post 耗时:" + (System.currentTimeMillis() - start));
@@ -191,7 +193,8 @@ public class InquiryForBuyerController {
     @HttpLog
     @RequestMapping(value = "/adopt", method = RequestMethod.POST)
     public void adoptQuote(Long id, Short status, Long enuu, Long useruu) throws Exception {
-        logger.log("公共询价", "通过明细id采纳供应商报价", "id： " + id + ",采纳状态： " + status, useruu, enuu, InquirySource.PLAIN.name());
+        log.info("公共询价, 通过明细id采纳供应商报价, id: {}, 采纳状态: {}, UserUU: {}, Enuu: {}, 报价的应用来源: {}",  id, status, useruu, enuu, InquirySource.PLAIN.name());
+/*        logger.log("公共询价", "通过明细id采纳供应商报价", "id： " + id + ",采纳状态： " + status, useruu, enuu, InquirySource.PLAIN.name());*/
         long start = System.currentTimeMillis();
         inquiryService.adpotQuote(id, status);
         log.info("/inquiry/buyer/adopt post 耗时:" + (System.currentTimeMillis() - start));
@@ -209,9 +212,10 @@ public class InquiryForBuyerController {
     @HttpLog
     @RequestMapping(value = "/refuse", method = RequestMethod.POST)
     public void refuseQuote(Long id, Short status, Long enuu, Long useruu,String refusereason) throws Exception {
-        logger.log("公共询价", "通过明细id拒绝供应商报价", "id： " + id + ",采纳状态： " + status, useruu, enuu, InquirySource.PLAIN.name());
+        log.info("公共询价, 通过明细id拒绝供应商报价, id: {}, 采纳状态: {}, UserUU: {}, Enuu: {}, 报价的应用来源: {}",  id, status, useruu, enuu, InquirySource.PLAIN.name());
+      /*  logger.log("公共询价", "通过明细id拒绝供应商报价", "id： " + id + ",采纳状态： " + status, useruu, enuu, InquirySource.PLAIN.name());*/
         long start = System.currentTimeMillis();
-        inquiryService.refuseQuote(id, status,refusereason);
+        inquiryService.refuseQuote(id, status, refusereason);
         log.info("/inquiry/buyer/refuse post 耗时:" + (System.currentTimeMillis() - start));
     }
 

src/main/java/com/uas/ps/inquiry/controller/InquiryForSaleController.java

@@ -2,7 +2,6 @@ package com.uas.ps.inquiry.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.uas.ps.core.logging.BufferedLoggerManager;
 import com.uas.ps.core.page.exception.IllegalOperatorException;
 import com.uas.ps.httplog.annotation.HttpLog;
 import com.uas.ps.inquiry.domain.IPage;
@@ -13,8 +12,8 @@ import com.uas.ps.inquiry.page.PageInfo;
 import com.uas.ps.inquiry.page.SearchFilter;
 import com.uas.ps.inquiry.service.InquiryForSaleService;
 import com.uas.ps.inquiry.service.PublicInquiryService;
-import com.uas.ps.inquiry.support.InquiryBufferedLogger;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.StringUtils;
@@ -40,9 +39,7 @@ public class InquiryForSaleController {
     @Autowired
     private PublicInquiryService publicInquiryService;
 
-    private final static InquiryBufferedLogger logger = BufferedLoggerManager.getLogger(InquiryBufferedLogger.class);
-
-    private final static Logger log = Logger.getLogger(Logger.class);
+    private final static Logger log = LoggerFactory.getLogger(InquiryForSaleController.class);
 
     /**
      * 保存报价接口
@@ -78,7 +75,7 @@ public class InquiryForSaleController {
     @HttpLog
     @RequestMapping(value = "/inquiry/detail", method = RequestMethod.GET)
     public PublicInquiryItem findById(Long itemId, Long en_uu) throws IllegalAccessException {
-        logger.log("公共询价", "查询已转报价的明细", "id: " + itemId, Constant.UU, en_uu, InquirySource.PLAIN.name());
+        log.info("公共询价, 查询已转报价的明细, id: {}, Constant: {}, en_uu: {}, 报价的应用来源: {}", itemId, Constant.UU, en_uu, InquirySource.PLAIN.name());
         long start = System.currentTimeMillis();
         PublicInquiryItem item = saleService.findById(itemId, en_uu);
         log.info("/inquiry/sale/inquiry/detail 耗时:" + (System.currentTimeMillis() - start));
@@ -95,7 +92,7 @@ public class InquiryForSaleController {
     @HttpLog
     @RequestMapping(value = "/publicInquiry/detail", method = RequestMethod.GET)
     public ModelMap findInquiryById(Long id, Long enuu) {
-        logger.log("公共询价", "通过id查询公共询价详情", "id: " + id, Constant.UU, enuu, InquirySource.PLAIN.name());
+        log.info("公共询价, 通过id查询公共询价详情, id: {}, Constant: {}, en_uu: {}, 报价的应用来源: {}", id, Constant.UU, enuu, InquirySource.PLAIN.name());
         long start = System.currentTimeMillis();
         ModelMap map = saleService.findByIdAndEnuu(id, enuu);
         log.info("/inquiry/sale/publicInquiry/detail 耗时:" + (System.currentTimeMillis() - start));
@@ -151,7 +148,7 @@ public class InquiryForSaleController {
     @HttpLog
     @RequestMapping(value = "/quote", method = RequestMethod.GET)
     public PublicInquiryItem findBySourceId(Long id, Long en_uu) {
-        logger.log("公共询价", "查询公共询价单是否已报价", "id: " + id, Constant.UU, en_uu, InquirySource.PLAIN.name());
+        log.info("公共询价, 查询公共询价单是否已报价, id: {}, Constant: {}, en_uu: {}, 报价的应用来源: {}", id, Constant.UU, en_uu, InquirySource.PLAIN.name());
         long start = System.currentTimeMillis();
         PublicInquiryItem item = saleService.findBySourceIdAndEnuu(id, en_uu);
         log.info("/inquiry/sale/quote 耗时:" + (System.currentTimeMillis() - start));
@@ -176,7 +173,7 @@ public class InquiryForSaleController {
         } else {
             pageInfo.filter("vendUU", enuu);
             pageInfo.filter("vendUserUU", useruu);
-            logger.log("公共询价", "查询推荐询价信息", null, useruu, enuu, InquirySource.PLAIN.name());
+            log.info("公共询价, 查询推荐询价信息, useruu: {}, enuu: {}, 报价的应用来源: {}", useruu, enuu, InquirySource.PLAIN.name());
             IPage<InquiryRemind> remindIPage = saleService.findRemindByPageInfo(pageInfo, searchFilter);
             log.info("/inquiry/sale/remind 耗时:" + (System.currentTimeMillis() - start));
             return remindIPage;
@@ -200,7 +197,7 @@ public class InquiryForSaleController {
             throw new IllegalAccessError("非法访问");
         } else {
             pageInfo.filter("vendUU", enuu);
-            logger.log("公共询价", "查询企业推荐询价信息", null, useruu, enuu, InquirySource.PLAIN.name());
+            log.info("公共询价, 查询企业推荐询价信息, useruu: {}, enuu: {}, 报价的应用来源: {}", useruu, enuu, InquirySource.PLAIN.name());
             IPage<InquiryEnRemind> enRemindIPage = saleService.findEnRemindByPageInfo(pageInfo, searchFilter);
             log.info("/inquiry/sale/enremind 耗时:" + (System.currentTimeMillis() - start));
             return enRemindIPage;
@@ -260,7 +257,7 @@ public class InquiryForSaleController {
             throw new IllegalOperatorException("en_uu或useruu不能为空");
         }
         List<PublicInquiryReply> replyList = JSONObject.parseArray(replies, PublicInquiryReply.class);
-        logger.log("公共询价", "作为卖家,对公共询价进行报价操作", "sourceid: " + inquiryItemId,
+        log.info("公共询价, 作为卖家,对公共询价进行报价操作, sourceid: {}, useruu: {}, en_uu, 报价的应用来源: {}", inquiryItemId,
                 useruu, en_uu, InquirySource.UU.name());
         ModelMap map = saleService.quoteInquiry(inquiryItemId, en_uu, useruu, replyList, leadtime, minPackQty, minOrderQty, currency, taxrate);
         log.info("/inquiry/sale/mobile/quote post 耗时:" + (System.currentTimeMillis() - start));
@@ -301,8 +298,7 @@ public class InquiryForSaleController {
         long start = System.currentTimeMillis();
         item = saleService.saveItem(item);
         log.info("/inquiry/sale/item/save post 耗时:" + (System.currentTimeMillis() - start));
-        logger.log("公共询价", "作为卖家,对公共询价进行报价操作", "sourceid: " + item.getSourceId() == null ? null : item.getSourceId() + ", id" + item.getId(),
-                item.getVendUserUU(), item.getVendUU(), item.getQutoApp());
+        log.info("公共询价, 作为卖家,对公共询价进行报价操作, sourceid: {}, id: {}, VendUserUU: {}, VendUU: {} , QutoApp: {}", item.getSourceId() == null ? null : item.getSourceId(), item.getId(), item.getVendUserUU(), item.getVendUU(), item.getQutoApp());
         publicInquiryService.ReceiveMessage(item,InquirySource.MALL.name());
         if (null != item) {
             PublicInquiry inquiry = item.getInquiry();

src/main/java/com/uas/ps/inquiry/controller/PublicInquiryController.java

@@ -1,7 +1,6 @@
 package com.uas.ps.inquiry.controller;
 
 import com.alibaba.fastjson.JSONObject;
-import com.uas.ps.core.logging.BufferedLoggerManager;
 import com.uas.ps.httplog.annotation.HttpLog;
 import com.uas.ps.inquiry.domain.IPage;
 import com.uas.ps.inquiry.entity.Constant;
@@ -17,8 +16,8 @@ import com.uas.ps.inquiry.page.SearchFilter;
 import com.uas.ps.inquiry.service.AttachService;
 import com.uas.ps.inquiry.service.InquiryForSaleService;
 import com.uas.ps.inquiry.service.PublicInquiryService;
-import com.uas.ps.inquiry.support.InquiryBufferedLogger;
-import org.apache.log4j.Logger;
+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;
@@ -51,9 +50,7 @@ public class PublicInquiryController {
     @Autowired
     private InquiryForSaleService saleService;
 
-    private final static InquiryBufferedLogger logger = BufferedLoggerManager.getLogger(InquiryBufferedLogger.class);
-
-    private final static Logger log = Logger.getLogger(Logger.class);
+    private final static Logger log = LoggerFactory.getLogger(PublicInquiryController.class);
 
 
     /**
@@ -74,7 +71,7 @@ public class PublicInquiryController {
             searchFilter.setDistribute(distribute);
         }
         IPage<PurcInquiryItemInfo> page = publicInquiryService.findTodoByPageInfo(pageInfo, searchFilter);
-        logger.log("公共询价", "查询公共询价信息", null, searchFilter.getUserUU(), searchFilter.getEnUU(), InquirySource.PLAIN.name());
+        log.info("公共询价, 查询公共询价信息, UserUU: {}, EnUU: {}, 报价的应用来源: {}",  searchFilter.getUserUU(), searchFilter.getEnUU(), InquirySource.PLAIN.name());
         log.info("/inquiry/public 耗时:" + (System.currentTimeMillis() - start));
         return page;
     }
@@ -97,7 +94,7 @@ public class PublicInquiryController {
             pageInfo.filter("inquiry.enUU", searchFilter.getEnUU());
         }
         IPage<PurcInquiryItemInfo> infoIPage = publicInquiryService.findTodoByPageInfo(pageInfo, searchFilter);
-        logger.log("公共询价", "查询已发布公共询价信息", null, searchFilter.getUserUU(), searchFilter.getEnUU(), InquirySource.MALL.name());
+        log.info("公共询价, 查询公共询价信息, UserUU: {}, EnUU: {}, 报价的应用来源: {}",  searchFilter.getUserUU(), searchFilter.getEnUU(), InquirySource.MALL.name());
         log.info("/inquiry/public/inquiryList 耗时:" + (System.currentTimeMillis() - start));
         return infoIPage;
     }
@@ -130,7 +127,7 @@ public class PublicInquiryController {
         if (null != _state) {
             pageInfo = publicInquiryService.covert(pageInfo, _state, overdue);
         }
-        logger.log("公共询价", "查询已转报价询价列表信息", "状态: " + (_state == null ? "all" : _state), searchFilter != null ? searchFilter.getUserUU() : null, searchFilter != null ? searchFilter.getEnUU() : null, InquirySource.PLAIN.name());
+        log.info("公共询价, 查询已转报价询价列表信息, 状态:{}, UserUU: {}, EnUU: {}, 报价的应用来源: {}",  (_state == null ? "all" : _state), searchFilter != null ? searchFilter.getUserUU() : null, searchFilter != null ? searchFilter.getEnUU() : null, InquirySource.PLAIN.name());
         IPage<PublicInquiryItemInfo> inquiryItemInfoIPage = publicInquiryService.findByPageInfo(pageInfo, searchFilter);
         log.info("/inquiry/public/quotation/list 耗时:" + (System.currentTimeMillis() - start));
         return inquiryItemInfoIPage;
@@ -186,7 +183,7 @@ public class PublicInquiryController {
     @RequestMapping(value = "/messageList", method = RequestMethod.GET)
     public List<InquiryMessage> getList(Long enuu, Integer size) {
         long start = System.currentTimeMillis();
-        logger.log("公共询价", "获取最新的公共询价", "大小: " + size, Constant.UU, enuu, InquirySource.PLAIN.name());
+        log.info("公共询价, 获取最新的公共询价, size:{}, Constant: {}, EnUU: {}, 报价的应用来源: {}", size, Constant.UU, enuu, InquirySource.PLAIN.name());
         List<InquiryMessage> messages = publicInquiryService.getMessageList(enuu, size);
         log.info("/inquiry/public/messageList 耗时:" + (System.currentTimeMillis() - start));
         return messages;
@@ -236,7 +233,7 @@ public class PublicInquiryController {
     @RequestMapping(value = "/findInquiryById", method = RequestMethod.GET)
     public PurcInquiry findById(Long id, Long enuu) {
         long start = System.currentTimeMillis();
-        logger.log("公共询价", "获取询价信息", "id: " + id, Constant.UU, enuu, InquirySource.PLAIN.name());
+        log.info("公共询价, 获取询价信息, id:{}, Constant: {}, EnUU: {}, 报价的应用来源: {}", id, Constant.UU, enuu, InquirySource.PLAIN.name());
         PurcInquiry inquiry = publicInquiryService.findInquiryById(id);
         inquiry = publicInquiryService.getQuotedDetail(inquiry);
         log.info("/inquiry/public/findInquiryById 耗时:" + (System.currentTimeMillis() - start));
@@ -269,7 +266,7 @@ public class PublicInquiryController {
     public PurcInquiryItemInfo findItemByItemId(Long itemId, Long enuu) {
         long start = System.currentTimeMillis();
         PurcInquiryItemInfo itemInfo = publicInquiryService.findItemByItemId(itemId, enuu);
-        logger.log("公共询价", "获取询价信息", "id: " + itemId, Constant.UU, enuu, InquirySource.B2B.name());
+        log.info("公共询价, 获取询价信息, id:{}, Constant: {}, EnUU: {}, 报价的应用来源: {}", itemId, Constant.UU, enuu, InquirySource.B2B.name());
         log.info("/inquiry/public/findItemByItemId 耗时:" + (System.currentTimeMillis() - start));
         return itemInfo;
     }
@@ -343,17 +340,17 @@ public class PublicInquiryController {
         filter.setKeyword(keyword);
         if (StringUtils.hasText(_state)) {
             if (_state.equals(OrderStatus.end.name())) {
-                logger.log("公共询价", "查询公共询价信息", "tel: " + user_tel, Constant.UU, en_uu, InquirySource.UU.name());
+                log.info("公共询价, 查询公共询价信息, tel:{}, Constant: {}, EnUU: {}, 报价的应用来源: {}", user_tel, Constant.UU, en_uu, InquirySource.UU.name());
                 pageInfo.filter("overdue", Constant.YES);
                 map.put("content", publicInquiryService.findTodoByPageInfo(pageInfo, filter).getContent());
                 return map;
             } else if (_state.equals(OrderStatus.invalid.name())) {
-                logger.log("公共询价", "查询公共询价信息", "tel: " + user_tel, Constant.UU, en_uu, InquirySource.UU.name());
+                log.info("公共询价, 查询公共询价信息, tel:{}, Constant: {}, EnUU: {}, 报价的应用来源: {}", user_tel, Constant.UU, en_uu, InquirySource.UU.name());
                 pageInfo.filter("invalid", Constant.YES);
                 map.put("content", publicInquiryService.findTodoByPageInfo(pageInfo, filter).getContent());
                 return map;
             } else if (_state.equals(OrderStatus.done.name())) {
-                logger.log("公共询价", "查询已转报价询价列表信息", "tel: " + user_tel, Constant.UU, en_uu, InquirySource.UU.name());
+                log.info("公共询价, 查询已转报价询价列表信息, tel:{}, Constant: {}, EnUU: {}, 报价的应用来源: {}", user_tel, Constant.UU, en_uu, InquirySource.UU.name());
                 pageInfo.filter("vendUU", en_uu);
                 filter.setKeyword(keyword);
                 map.put("content", publicInquiryService.findByPageInfo(pageInfo, filter).getContent());
@@ -361,7 +358,7 @@ public class PublicInquiryController {
             }
         } else {
             filter.setEnUU(en_uu);
-            logger.log("公共询价", "查询公共询价信息", "tel: " + user_tel, Constant.UU, en_uu, InquirySource.UU.name());
+            log.info("公共询价, 查询公共询价信息, tel:{}, Constant: {}, EnUU: {}, 报价的应用来源: {}", user_tel, Constant.UU, en_uu, InquirySource.UU.name());
             map.put("content", publicInquiryService.findTodoByPageInfo(pageInfo, filter).getContent());
             return map;
         }
@@ -421,24 +418,24 @@ public class PublicInquiryController {
         filter.setKeyword(keyword);
         if (StringUtils.hasText(_state)) {
             if (_state.equals(OrderStatus.end.name())) {
-                logger.log("公共询价", "查询公共询价信息", "tel: " + user_tel, Constant.UU, en_uu, InquirySource.UU.name());
+                log.info("公共询价, 查询公共询价信息, tel:{}, Constant: {}, EnUU: {}, 报价的应用来源: {}", user_tel, Constant.UU, en_uu, InquirySource.UU.name());
                 pageInfo.filter("overdue", Constant.YES);
                 map.put("content", publicInquiryService.findTodoByPageInfo(pageInfo, filter).getContent());
                 return map;
             } else if (_state.equals(OrderStatus.invalid.name())) {
-                logger.log("公共询价", "查询公共询价信息", "tel: " + user_tel, Constant.UU, en_uu, InquirySource.UU.name());
+                log.info("公共询价, 查询公共询价信息, tel:{}, Constant: {}, EnUU: {}, 报价的应用来源: {}", user_tel, Constant.UU, en_uu, InquirySource.UU.name());
                 pageInfo.filter("invalid", Constant.YES);
                 map.put("content", publicInquiryService.findTodoByPageInfo(pageInfo, filter).getContent());
                 return map;
             } else if (_state.equals(OrderStatus.done.name())) {
-                logger.log("公共询价", "查询已转报价询价列表信息", "tel: " + user_tel, Constant.UU, en_uu, InquirySource.UU.name());
+                log.info("公共询价, 查询已转报价询价列表信息, tel:{}, Constant: {}, EnUU: {}, 报价的应用来源: {}", user_tel, Constant.UU, en_uu, InquirySource.UU.name());
                 pageInfo.filter("vendUU", en_uu);
                 filter.setKeyword(keyword);
                 map.put("content", publicInquiryService.findByPageInfo(pageInfo, filter).getContent());
                 return map;
             }
         } else {
-            logger.log("公共询价", "查询公共询价信息", "tel: " + user_tel, Constant.UU, en_uu, InquirySource.UU.name());
+            log.info("公共询价, 查询公共询价信息, tel:{}, Constant: {}, EnUU: {}, 报价的应用来源: {}", user_tel, Constant.UU, en_uu, InquirySource.UU.name());
             pageInfo.filter("vendUU", en_uu);
             map.put("content", publicInquiryService.covertRemindToInquiry(saleService.findRemindByPageInfo(pageInfo, filter).getContent()));
             return map;

src/main/java/com/uas/ps/inquiry/model/PurcInquiry.java

@@ -11,7 +11,9 @@ import java.util.Set;
  * Created by hejq on 2018-01-13.
  */
 @Entity
-@Table(name = "purc$puinquiry")
+@Table(name = "purc$puinquiry", indexes = {
+        @Index(name = "puinquiry_enuu_code_sourceapp", columnList = "in_enuu,in_code,in_sourceapp", unique = true)
+})
 public class PurcInquiry implements Serializable {
 
     /**

src/main/java/com/uas/ps/inquiry/service/impl/InquiryForSaleServiceImpl.java

@@ -1,7 +1,6 @@
 package com.uas.ps.inquiry.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
-import com.uas.ps.core.logging.BufferedLoggerManager;
 import com.uas.ps.core.util.ContextUtils;
 import com.uas.ps.entity.Product;
 import com.uas.ps.entity.Status;
@@ -39,7 +38,8 @@ import com.uas.ps.inquiry.support.InquiryBufferedLogger;
 import com.uas.ps.inquiry.util.FlexJsonUtils;
 import com.uas.ps.inquiry.util.HttpUtil;
 import com.uas.ps.inquiry.util.IPageUtils;
-import org.apache.log4j.Logger;
+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;
@@ -103,9 +103,8 @@ public class InquiryForSaleServiceImpl implements InquiryForSaleService {
     /**
      * 日志
      */
-    private final static InquiryBufferedLogger logger = BufferedLoggerManager.getLogger(InquiryBufferedLogger.class);
 
-    private final static Logger log = Logger.getLogger(Logger.class);
+    private final static Logger log = LoggerFactory.getLogger(InquiryForSaleServiceImpl.class);
 
     /**
      * 公共物料访问地址
@@ -323,15 +322,15 @@ public class InquiryForSaleServiceImpl implements InquiryForSaleService {
             JSONObject result = JSONObject.parseObject(res);
             Boolean success = (Boolean) result.get("success");
             if (success) {
-                logger.log("报价成功后保存到个人物料库", "保存报价id【" + inquiryItem.getId() + "】到个人物料库成功", "保存成功", product.getUserUU(), product.getEnUU(), inquiryItem.getSource());
+                log.info("报价成功后保存到个人物料库", "保存报价id【" + inquiryItem.getId() + "】到个人物料库成功", "保存成功", "UserUU:" + product.getUserUU(), "EnUU:" + product.getEnUU(), "保存询价的应用:" + inquiryItem.getSource());
             } else {
-                logger.log("报价成功后保存到个人物料库", "保存报价id【" + inquiryItem.getId() + "】到个人物料库失败", result.get("message").toString(), product.getUserUU(), product.getEnUU(), inquiryItem.getSource());
+                log.info("报价成功后保存到个人物料库", "保存报价id【" + inquiryItem.getId() + "】到个人物料库失败", result.get("message").toString(), "UserUU:" + product.getUserUU(), "EnUU:" + product.getEnUU(), "保存询价的应用:" + inquiryItem.getSource());
             }
         } catch (Exception e) {
             log.info("/product/save/inquiry 报价成功后保存到个人物料库中 出错：" + e.getMessage());
             e.printStackTrace();
             String reason = e.getMessage().length() > 10 ? e.getMessage().substring(0, 999).concat("") : e.getMessage();
-            logger.log("报价成功后保存到个人物料库", "保存报价id【" + inquiryItem.getId() + "】到个人物料库失败", reason, product.getUserUU(), product.getEnUU(), inquiryItem.getSource());
+            log.info("报价成功后保存到个人物料库", "保存报价id【" + inquiryItem.getId() + "】到个人物料库失败", "原因：" + reason, "UserUU:" + product.getUserUU(), "EnUU:" + product.getEnUU(), "保存询价的应用:" + inquiryItem.getSource());
         }
     }
 

src/main/java/com/uas/ps/inquiry/service/impl/InquiryServiceImpl.java

@@ -1,7 +1,6 @@
 package com.uas.ps.inquiry.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
-import com.uas.ps.core.logging.BufferedLoggerManager;
 import com.uas.ps.core.util.CollectionUtils;
 import com.uas.ps.core.util.ContextUtils;
 import com.uas.ps.entity.Product;
@@ -43,7 +42,8 @@ import com.uas.ps.inquiry.util.FlexJsonUtils;
 import com.uas.ps.inquiry.util.HttpUtil;
 import com.uas.ps.inquiry.util.ThreadUtils;
 import javassist.NotFoundException;
-import org.apache.log4j.Logger;
+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;
@@ -168,9 +168,8 @@ public class InquiryServiceImpl implements InquiryService {
     /**
      * 日志
      */
-    private final static InquiryBufferedLogger logger = BufferedLoggerManager.getLogger(InquiryBufferedLogger.class);
 
-    private static final Logger log = Logger.getLogger(Logger.class);
+    private static final Logger log = LoggerFactory.getLogger(InquiryServiceImpl.class);
 
     /**
      * 查询公共询价列表信息
@@ -337,9 +336,9 @@ public class InquiryServiceImpl implements InquiryService {
      */
     @Override
     public List<InquiryRemind> testMessage(Date startTime, Date endTime, Long useruu, Long enuu){
-        logger.log("公共询价","9点定时统计询价单总数服务开启");
+        log.info("公共询价","9点定时统计询价单总数服务开启");
         List<InquiryRemind> list = inquiryRemindDao.findTestInfo(startTime,endTime,useruu,enuu);
-        logger.log("公共询价","9点定时统计询价单总数服务结束");
+        log.info("公共询价","9点定时统计询价单总数服务结束");
         return list;
     }
 
@@ -885,7 +884,7 @@ public class InquiryServiceImpl implements InquiryService {
                     log.info("/message 耗时：" + (System.currentTimeMillis() - start) + "消息数：" + models.size());
                     System.out.println(FlexJsonUtils.toJsonDeep(models));
                     System.out.println(res);
-                    logger.log("公共询价", "此次"+company+"公司新增"+count+"张公共询价");
+                    log.info("公共询价", "此次"+company+"公司新增"+count+"张公共询价");
                 } catch (Exception e) {
                     e.printStackTrace();
                 }

src/main/java/com/uas/ps/inquiry/service/impl/PublicInquiryServiceImpl.java

@@ -2,7 +2,6 @@ package com.uas.ps.inquiry.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.uas.ps.core.logging.BufferedLoggerManager;
 import com.uas.ps.core.util.ContextUtils;
 import com.uas.ps.entity.Product;
 import com.uas.ps.entity.ProductUsers;
@@ -20,7 +19,8 @@ import com.uas.ps.inquiry.page.exception.IllegalOperatorException;
 import com.uas.ps.inquiry.service.PublicInquiryService;
 import com.uas.ps.inquiry.support.InquiryBufferedLogger;
 import com.uas.ps.inquiry.util.*;
-import org.apache.log4j.Logger;
+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;
@@ -94,7 +94,6 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
     @Autowired
     private InquiryDataDao inquiryDataDao;
 
-    private static final Logger log = Logger.getLogger(Logger.class);
 
     /**
      * 应用来源
@@ -180,7 +179,7 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
     /**
      * 日志
      */
-    private final static InquiryBufferedLogger logger = BufferedLoggerManager.getLogger(InquiryBufferedLogger.class);
+    private static final Logger log = LoggerFactory.getLogger(PublicInquiryServiceImpl.class);
 
     /**
      * 保存公共询价信息
@@ -298,7 +297,7 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                                 model.setMailTemplate(MAIL_TEMP_ID);
                                 model.setSmTemplate(SMS_TEMP_ID);
                                 models.add(model);
-                                logger.log("公共询价产生消息", "根据物料型号【" + cmpCode + "】查询接收人", "关联询价单明细【" + item.getId() + "】", user.getUseruu(), user.getEnuu(), InquirySource.ERP.name());
+                                log.info("公共询价产生消息", "根据物料型号【" + cmpCode + "】查询接收人", "关联询价单明细【" + item.getId() + "】", "UserUU:" + user.getUseruu(), "Enuu:" + user.getEnuu(), "报价的应用来源:" + InquirySource.ERP.name());
                             }
                             if (!CollectionUtils.isEmpty(models)) {
                                 sendMessage(models);
@@ -310,7 +309,7 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                     }
                 } catch (Exception e) {
                     String reason = e.getMessage().length() > 10 ? e.getMessage().substring(0, 1000).concat("") : e.getMessage();
-                    logger.log("公共询价产生消息", "根据物料型号【" + cmpCode + "】查询接收人失败,id" + item.getId(), reason, Constant.UU, Constant.UU, InquirySource.ERP.name());
+                    log.info("公共询价产生消息", "根据物料型号【" + cmpCode + "】查询接收人失败,id" + item.getId(), "原因：" + reason,"Constant:" + Constant.UU, "报价的应用来源:" + InquirySource.ERP.name());
                     e.printStackTrace();
                 }
             }

src/main/java/com/uas/ps/inquiry/util/MessageUtils.java

@@ -5,7 +5,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.uas.ps.core.util.ContextUtils;
 import com.uas.ps.inquiry.AccessConfiguration;
 import com.uas.ps.inquiry.entity.MessageModel;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
 
 import java.util.HashMap;
@@ -23,7 +24,7 @@ public class MessageUtils {
 
     private static final String MESSAGE_PUBLIC_SERVICE_URL = ContextUtils.getBean(AccessConfiguration.class).getPsMessageUrl();
 
-    private static final Logger log = Logger.getLogger(Logger.class);
+    private static final Logger log = LoggerFactory.getLogger(MessageUtils.class);
 
     /**
      * 单次请求数据量大小

src/main/resources/application.yml

@@ -9,4 +9,7 @@ spring:
      auto: update
 
 sso:
- secretKey: 0taQcW073Z7G628g5H
+ secretKey: 0taQcW073Z7G628g5H
+
+logging:
+  config: classpath:log4j2.yml

src/main/resources/config/application-cloud.properties

@@ -13,7 +13,6 @@ datasource.testWhileIdle=true
 datasource.testOnBorrow=true
 datasource.testOnReturn=false
 datasource.poolPreparedStatements=true
-datasource.timeBetweenLogStatsMillis=300000
 datasource.maxPoolPreparedStatementPerConnectionSize=20
 datasource.filters=stat,slf4j
 datasource.connectionProperties=druid.stat.mergeSql=false;druid.stat.slowSqlMillis=5000

src/main/resources/config/application-dev.properties

@@ -13,7 +13,6 @@ datasource.testWhileIdle=true
 datasource.testOnBorrow=true
 datasource.testOnReturn=false
 datasource.poolPreparedStatements=true
-datasource.timeBetweenLogStatsMillis=60000
 datasource.maxPoolPreparedStatementPerConnectionSize=20
 datasource.filters=stat,slf4j
 datasource.connectionProperties=druid.stat.mergeSql=false;druid.stat.slowSqlMillis=5000

src/main/resources/config/application-test.properties

@@ -13,7 +13,6 @@ datasource.testWhileIdle=true
 datasource.testOnBorrow=true
 datasource.testOnReturn=false
 datasource.poolPreparedStatements=true
-datasource.timeBetweenLogStatsMillis=60000
 datasource.maxPoolPreparedStatementPerConnectionSize=20
 datasource.filters=stat,slf4j
 datasource.connectionProperties=druid.stat.mergeSql=false;druid.stat.slowSqlMillis=5000

src/main/resources/config/application-txcloud.properties

@@ -0,0 +1,28 @@
+datasource.url=jdbc:mysql://10.10.0.208:3306/mall_prod?characterEncoding=utf-8&useSSL=false&autoReconnect=true&failOverReadOnly=false
+datasource.username=sa
+datasource.password=Select123!#%*(
+datasource.driverClassName=com.mysql.jdbc.Driver
+datasource.initialSize=1
+datasource.minIdle=30
+datasource.maxActive=100
+datasource.maxWait=5000
+datasource.timeBetweenEvictionRunsMillis=60000
+datasource.minEvictableIdleTimeMillis=300000
+datasource.validationQuery=SELECT 1
+datasource.testWhileIdle=true
+datasource.testOnBorrow=true
+datasource.testOnReturn=false
+datasource.poolPreparedStatements=true
+datasource.timeBetweenLogStatsMillis=300000
+datasource.maxPoolPreparedStatementPerConnectionSize=20
+datasource.filters=stat,slf4j
+datasource.connectionProperties=druid.stat.mergeSql=false;druid.stat.slowSqlMillis=5000
+
+# Access path
+ps.product.url=https://api-product.usoftmall.com/
+ps.message.url=http://api-message.ubtob.com/
+mall.url = http://10.10.0.10
+
+#message
+message.senderuu=1000010022
+message.senderEnuu=10042875

src/main/resources/log4j2.yml

@@ -0,0 +1,55 @@
+# 共有8个级别，按照从低到高为：ALL < TRACE < DEBUG < INFO < WARN < ERROR < FATAL < OFF。
+Configuration:
+  status: warn
+  monitorInterval: 30
+  Properties: # 定义全局变量
+    Property: # 缺省配置（用于开发环境）。其他环境需要在VM参数中指定，如下：
+      #测试：-Dlog.level.console=warn -Dlog.level.xjj=trace
+      #生产：-Dlog.level.console=warn -Dlog.level.xjj=info
+      - name: log.level.console
+        value: info
+      - name: log.path
+        value: logs
+      - name: project.name
+        value: log
+      - name: log.pattern
+        value: "%d{yyyy-MM-dd HH:mm:ss.SSS} -%5p ${PID:-} [%15.15t] %-30.30C{1.} : %m%n"
+  Appenders:
+    Console:  #输出到控制台
+      name: CONSOLE
+      target: SYSTEM_OUT
+      PatternLayout:
+        pattern: ${log.pattern}
+#   启动日志
+    RollingFile:
+      - name: ROLLING_FILE
+        fileName: ${log.path}/${project.name}.log
+        filePattern: "${log.path}/historyRunLog/$${date:yyyy-MM}/${project.name}-%d{yyyy-MM-dd}-%i.log.gz"
+        PatternLayout:
+          pattern: ${log.pattern}
+        Filters:
+#        一定要先去除不接受的日志级别，然后获取需要接受的日志级别
+          ThresholdFilter:
+            - level: info
+              onMatch: ACCEPT
+              onMismatch: DENY
+        Policies:
+          TimeBasedTriggeringPolicy:  # 按天分类
+            modulate: true
+            interval: 1
+        DefaultRolloverStrategy:     # 文件最多100个
+          max: 100
+  Loggers:
+    Root:
+      level: info
+      AppenderRef:
+        - ref: CONSOLE
+        - ref: ROLLING_FILE
+#    监听具体包下面的日志
+#    Logger: # 为com.xjj包配置特殊的Log级别，方便调试
+#      - name: com.xjj
+#        additivity: false
+#        level: ${sys:log.level.xjj}
+#        AppenderRef:
+#          - ref: CONSOLE
+#          - ref: ROLLING_FILE

src/main/resources/logback.xml

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-	<appender name="FILE"
-		class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<File>logs/log.log</File>
-		<encoder>
-			<pattern>
-				%date{yyyy-MM-dd HH:mm:ss:SSS} [%relative ms] %-5level [%50.50(%logger{36}.%method:%line)] ---- %msg%n
-			</pattern>
-			<charset>UTF-8</charset> <!-- 此处设置字符集 -->
-		</encoder>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<!-- daily rollover -->
-			<FileNamePattern>logs/log.%d{yyyy-MM-dd}.log</FileNamePattern>
-			<!-- keep 10 days' worth of history -->
-			<maxHistory>10</maxHistory>
-		</rollingPolicy>
-		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-			<level>INFO</level>
-		</filter>
-	</appender>
-
-	<!-- Console output -->
-	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-		<!-- encoder defaults to ch.qos.logback.classic.encoder.PatternLayoutEncoder -->
-		<encoder>
-			<pattern>
-				%date{yyyy-MM-dd HH:mm:ss:SSS} [%relative ms] %-5level [%50.50(%logger{36}.%method:%line)] ---- %msg%n
-			</pattern>
-			<charset>UTF-8</charset> <!-- 此处设置字符集 -->
-		</encoder>
-		<!-- Only log level WARN and above -->
-		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-			<level>INFO</level>
-		</filter>
-	</appender>
-
-	<!-- Enable FILE and STDOUT appenders for all log messages. By default, 
-		only log at level INFO and above. -->
-	<root level="INFO">
-		<appender-ref ref="FILE" />
-		<appender-ref ref="STDOUT" />
-	</root>
-</configuration>