use ps-httplog to print logs

pom.xml

@@ -19,12 +19,15 @@
         <dependency>
             <groupId>com.uas.ps</groupId>
             <artifactId>ps-core</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.uas.ps</groupId>
             <artifactId>ps-entity</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.uas.ps</groupId>
+            <artifactId>ps-httplog</artifactId>
+        </dependency>
 
         <!--<dependency>-->
             <!--<groupId>com.uas.account</groupId>-->

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

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.alibaba.fastjson.support.config.FastJsonConfig;
 import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
 import com.uas.ps.core.intercept.ExceptionHandlerAdvice;
-import com.uas.ps.core.intercept.WebLogAspect;
+import com.uas.ps.httplog.config.EnableHttpLog;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
@@ -25,6 +25,7 @@ import java.util.List;
  */
 @Configuration
 @ComponentScan
+@EnableHttpLog
 public class WebAppConfiguration extends WebMvcConfigurerAdapter {
 
     @Override
@@ -43,14 +44,6 @@ public class WebAppConfiguration extends WebMvcConfigurerAdapter {
         super.configureMessageConverters(converters);
     }
 
-    /**
-     * 打印 HTTP 请求信息
-     */
-    @Bean
-    public WebLogAspect webLog() {
-        return new WebLogAspect();
-    }
-
     /**
      * 异常处理
      */

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

@@ -2,6 +2,7 @@ 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;
 import com.uas.ps.inquiry.entity.InquiryProductInfo;
@@ -15,14 +16,11 @@ import com.uas.ps.inquiry.support.InquiryBufferedLogger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Sort;
-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.util.Map;
-
 /**
  * 针对买家，对询价的操作
  *
@@ -43,6 +41,7 @@ public class InquiryForBuyerController {
      * @param inquiry 询价信息
      * @return
      */
+    @HttpLog
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     public String saveInquiry(@RequestBody PurcInquiry inquiry) throws Exception {
         inquiry = inquiryService.saveInquiry(inquiry);
@@ -63,6 +62,7 @@ public class InquiryForBuyerController {
      * @return
      * @throws Exception
      */
+    @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());
@@ -76,6 +76,7 @@ public class InquiryForBuyerController {
      * @param enuu 企业UU
      * @return
      */
+    @HttpLog
     @RequestMapping(value = "/detail", method = RequestMethod.GET)
     public InquiryDetailInfo findById(Long id, Long enuu) {
         logger.log("公共询价", "客户查询供应商报价详情", "id： " + id, Constant.UU, enuu, InquirySource.PLAIN.name());
@@ -89,6 +90,7 @@ public class InquiryForBuyerController {
      * @param searchFilter 过滤条件
      * @return
      */
+    @HttpLog
     @RequestMapping(value = "/inquiryList", method = RequestMethod.GET)
     public Page<PurcInquiry> getInquiry(PageInfo pageInfo, SearchFilter searchFilter) {
         if (pageInfo.getOffset() == 0) {
@@ -122,6 +124,7 @@ public class InquiryForBuyerController {
      * @param overdue 是否过期 1、过期；0、 未过期
      * @return
      */
+    @HttpLog
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     public Page<PurcInquiryItemInfo> getInquiryList(PageInfo pageInfo, SearchFilter searchFilter, String state, Integer overdue) {
         Sort sort = new Sort(Sort.Direction.DESC, "date");
@@ -147,6 +150,7 @@ public class InquiryForBuyerController {
      * @param enuu 当前企业UU
      * @return
      */
+    @HttpLog
     @RequestMapping(value = "/product/detail", method = RequestMethod.GET)
     public InquiryProductInfo findInquiryDetailById(Long id, Long enuu) {
         logger.log("公共询价", "针对客户查询单个物料明细的报价情况", null, Constant.UU, enuu, InquirySource.PLAIN.name());
@@ -162,6 +166,7 @@ public class InquiryForBuyerController {
      * @param userUU 用户UU
      * @return
      */
+    @HttpLog
     @RequestMapping(value = "/quotations", method = RequestMethod.GET)
     public Page<PurcInquiryItemInfo> findQuotationsByPage(PageInfo pageInfo, SearchFilter searchFilter, Long enUU, Long userUU) {
         if (enUU == null && userUU == null) {

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

@@ -3,21 +3,19 @@ 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.httplog.annotation.HttpLog;
 import com.uas.ps.inquiry.domain.IPage;
 import com.uas.ps.inquiry.entity.Constant;
-import com.uas.ps.inquiry.entity.Inquiry;
 import com.uas.ps.inquiry.entity.InquirySource;
 import com.uas.ps.inquiry.model.Attach;
 import com.uas.ps.inquiry.model.InquiryRemind;
 import com.uas.ps.inquiry.model.PublicInquiryItem;
 import com.uas.ps.inquiry.model.PublicInquiryReply;
 import com.uas.ps.inquiry.page.PageInfo;
-import com.uas.ps.inquiry.page.PageParams;
 import com.uas.ps.inquiry.page.SearchFilter;
 import com.uas.ps.inquiry.service.InquiryForSaleService;
 import com.uas.ps.inquiry.support.InquiryBufferedLogger;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Sort;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -48,6 +46,7 @@ public class InquiryForSaleController {
      * @param itemId 已转报价的明细id
      * @return
      */
+    @HttpLog
     @RequestMapping(value = "/inquiry/detail", method = RequestMethod.GET)
     public PublicInquiryItem findById(Long itemId, Long en_uu) {
         logger.log("公共询价", "查询已转报价的明细", "id: " + itemId, Constant.UU, en_uu, InquirySource.PLAIN.name());
@@ -61,6 +60,7 @@ public class InquiryForSaleController {
      * @param enuu 企业UU号
      * @return
      */
+    @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());
@@ -74,6 +74,7 @@ public class InquiryForSaleController {
      * @return
      * @throws Exception
      */
+    @HttpLog
     @RequestMapping(value = "/attach", method = RequestMethod.POST)
     public String addAttachs(@RequestBody Attach attach) throws Exception {
         attach = saleService.addAttachs(attach);
@@ -90,6 +91,7 @@ public class InquiryForSaleController {
      * @param item 前台数据
      * @return
      */
+    @HttpLog
     @RequestMapping(value = "/item/add", method = RequestMethod.POST)
     public String saveInquiryItem(@RequestBody PublicInquiryItem item) throws Exception {
         item = saleService.add(item);
@@ -106,6 +108,7 @@ public class InquiryForSaleController {
      * @param item 前台数据
      * @return
      */
+    @HttpLog
     @RequestMapping(value = "/item/save", method = RequestMethod.POST)
     public String saveInquiryItems(@RequestBody PublicInquiryItem item) throws Exception {
         item = saleService.saveItem(item);
@@ -127,6 +130,7 @@ public class InquiryForSaleController {
      * @return
      * @throws Exception
      */
+    @HttpLog
     @RequestMapping(value = "/renew", method = RequestMethod.POST)
     public String saveItem(@RequestBody PublicInquiryItem inquiryItem) throws Exception {
         inquiryItem = saleService.save(inquiryItem);
@@ -140,6 +144,7 @@ public class InquiryForSaleController {
      * @param en_uu 当前企业UU
      * @return
      */
+    @HttpLog
     @RequestMapping(value = "/quote", method = RequestMethod.GET)
     public PublicInquiryItem findBySourceId(Long id, Long en_uu) {
         logger.log("公共询价", "查询公共询价单是否已报价", "id: " + id,
@@ -158,6 +163,7 @@ public class InquiryForSaleController {
      * @param minPackQty 最小包装
      * @return
      */
+    @HttpLog
     @RequestMapping(value = "/mobile/quote", method = RequestMethod.POST)
     public ModelMap quote(Long inquiryItemId, Long en_uu, Long useruu, Long leadtime, Double minPackQty, Double minOrderQty, String replies) throws Exception {
         List<PublicInquiryReply> replyList = JSONObject.parseArray(replies, PublicInquiryReply.class);
@@ -175,6 +181,7 @@ public class InquiryForSaleController {
      * @param searchFilter 过滤条件
      * @return page<T>
      */
+    @HttpLog
     @RequestMapping(value = "/remind", method = RequestMethod.GET)
     public IPage<InquiryRemind> findByUserInfo(Long useruu, Long enuu, PageInfo pageInfo, SearchFilter searchFilter) {
         if (useruu == null || enuu == null) {

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

@@ -1,6 +1,7 @@
 package com.uas.ps.inquiry.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.uas.ps.httplog.annotation.HttpLog;
 import com.uas.ps.inquiry.entity.MessageModel;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -23,6 +24,7 @@ public class PostDataController {
      * @param model
      * @return
      */
+    @HttpLog
     @RequestMapping(method = RequestMethod.POST)
     public ModelMap getPostInfo(@RequestBody MessageModel model) {
         return new ModelMap("info", JSONObject.toJSON(model));

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

@@ -2,9 +2,12 @@ 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.*;
-import com.uas.ps.inquiry.model.*;
+import com.uas.ps.inquiry.model.PublicInquiryItemInfo;
+import com.uas.ps.inquiry.model.PurcInquiry;
+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.AttachService;
@@ -16,7 +19,10 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Sort;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
@@ -48,6 +54,7 @@ public class PublicInquiryController {
      * @return
      * @throws UnsupportedEncodingException
      */
+    @HttpLog
     @RequestMapping(method = RequestMethod.POST)
     public void saveInquiries(@RequestParam("data") String data, Long enuu, String address) throws NotFoundException, UnsupportedEncodingException {
         String jsonStr = URLDecoder.decode(data, "UTF-8");
@@ -64,6 +71,7 @@ public class PublicInquiryController {
      * @param enuu 询价企业UU
      * @throws UnsupportedEncodingException
      */
+    @HttpLog
     @RequestMapping(value = "/check", method = RequestMethod.POST)
     public void updateInquiryStatus(@RequestParam("data") String data, @RequestParam("enuu") Long enuu) throws UnsupportedEncodingException {
         String jsonStr = URLDecoder.decode(data, "UTF-8");
@@ -79,6 +87,7 @@ public class PublicInquiryController {
      * @date 2018-01-14 15:20
      * @param enuu 询价企业UU
      */
+    @HttpLog
     @RequestMapping(value = "/quotation", method = RequestMethod.GET)
     public List<InquiryDetail> getReply(Long enuu) {
         List<InquiryDetail> details = publicInquiryService.findNotUploadReply(enuu);
@@ -93,6 +102,7 @@ public class PublicInquiryController {
      * @return
      * @throws UnsupportedEncodingException
      */
+    @HttpLog
     @RequestMapping(value = "/reply/back", method = RequestMethod.POST)
     public void onReplySuccess(@RequestParam("data") String data, Long enuu) throws UnsupportedEncodingException {
         String[] idArray = URLDecoder.decode(data, "UTF-8").split(",");
@@ -106,6 +116,7 @@ public class PublicInquiryController {
      * @param data 封装的data信息
      * @throws UnsupportedEncodingException
      */
+    @HttpLog
     @RequestMapping(value = "/checking", method = RequestMethod.POST)
     public void checkInquiry(@RequestParam("data") String data, Long enuu) throws UnsupportedEncodingException {
         String jsonStr = URLDecoder.decode(data, "UTF-8");
@@ -120,6 +131,7 @@ public class PublicInquiryController {
      * @return 封装的data信息
      * @throws UnsupportedEncodingException
      */
+    @HttpLog
     @RequestMapping(value = "/reply/decide", method = RequestMethod.POST)
     public void onReplyDecide(@RequestParam("data") String data, Long enuu) throws UnsupportedEncodingException {
         String jsonStr = URLDecoder.decode(data, "UTF-8");
@@ -135,6 +147,7 @@ public class PublicInquiryController {
      * @return
      * @throws UnsupportedEncodingException
      */
+    @HttpLog
     @RequestMapping(value = "/invalid", method = RequestMethod.POST)
     public void onReplyInvalid(@RequestParam("data") String data, Long enuu) throws UnsupportedEncodingException {
         String jsonStr = URLDecoder.decode(data, "UTF-8");
@@ -153,6 +166,7 @@ public class PublicInquiryController {
      * @param useruu 报价个人UU
      * @return
      */
+    @HttpLog
     @RequestMapping(value = "/turntoInquiry", method = RequestMethod.POST)
     private ModelMap transtoInquiry(Long id, Long enuu, Long useruu) {
         return publicInquiryService.transtoInquiry(id, enuu, useruu);
@@ -167,6 +181,7 @@ public class PublicInquiryController {
      * @param searchFilter 过滤条件
      * @return
      */
+    @HttpLog
     @RequestMapping(method = RequestMethod.GET)
     public IPage<PurcInquiryItemInfo> getInquiry(PageInfo pageInfo, SearchFilter searchFilter) {
         Sort sort = new Sort(Sort.Direction.DESC, "date");
@@ -185,6 +200,7 @@ public class PublicInquiryController {
      * @param searchFilter 过滤条件
      * @return
      */
+    @HttpLog
     @RequestMapping(value = "/inquiryList", method = RequestMethod.GET)
     public IPage<PurcInquiryItemInfo> getInquiryList(PageInfo pageInfo, SearchFilter searchFilter) {
         Sort sort = new Sort(Sort.Direction.DESC, "date");
@@ -215,6 +231,7 @@ public class PublicInquiryController {
      * @param endDate 截止日期
      * @return
      */
+    @HttpLog
     @RequestMapping(value = "/mobile", method = RequestMethod.GET)
     public ModelMap publincInquiry(Integer page, Integer size, Long en_uu, String _state,
                                                     String keyword, String user_tel, Long fromDate, Long endDate) {
@@ -273,6 +290,7 @@ public class PublicInquiryController {
      * @param filter 过滤条件
      * @return
      */
+    @HttpLog
     @RequestMapping(value = "/quotation/list", method = RequestMethod.GET)
     public Page<PublicInquiryItemInfo> getQuotation(PageInfo pageInfo, String filter, String _state) {
         Sort sort = new Sort(Sort.Direction.DESC, "date");
@@ -302,6 +320,7 @@ public class PublicInquiryController {
      * @param _state
      * @return
      */
+    @HttpLog
     @RequestMapping(value = "/quotationList", method = RequestMethod.GET)
     public Page<PublicInquiryItemInfo> getQuotationList(PageInfo pageInfo, String filter, String _state) {
         Sort sort = new Sort(Sort.Direction.DESC, "date");
@@ -323,6 +342,7 @@ public class PublicInquiryController {
      * @param size 大小
      * @return
      */
+    @HttpLog
     @RequestMapping(value = "/messageList", method = RequestMethod.GET)
     public List<InquiryMessage> getList(Long enuu, Integer size) {
         logger.log("公共询价", "获取最新的公共询价", "大小: " + size, Constant.UU, enuu, InquirySource.PLAIN.name());
@@ -335,6 +355,7 @@ public class PublicInquiryController {
      * @param id 附件id
      * @return
      */
+    @HttpLog
     @RequestMapping(value = "/attachUrl", method = RequestMethod.GET)
     public com.uas.ps.inquiry.model.Attach getAttach(Long id) {
         return attachService.findById(id);
@@ -346,6 +367,7 @@ public class PublicInquiryController {
      * @param id 主表id
      * @return
      */
+    @HttpLog
     @RequestMapping(value = "/findInquiryById", method = RequestMethod.GET)
     public PurcInquiry findById(Long id, Long enuu) {
         logger.log("公共询价", "获取询价信息", "id: " + id, Constant.UU, enuu, InquirySource.PLAIN.name());