Forráskód Böngészése

use ps-httplog to print logs

sunyj 7 éve
szülő
commit
2b9c4b1922

+ 4 - 0
pom.xml

@@ -24,6 +24,10 @@
             <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>-->

+ 2 - 9
src/main/java/com/uas/ps/product/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();
-    }
-
     /**
      * 异常处理
      */

+ 18 - 0
src/main/java/com/uas/ps/product/controller/ProductController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.uas.ps.core.util.CollectionUtils;
 import com.uas.ps.entity.Product;
 import com.uas.ps.entity.Status;
+import com.uas.ps.httplog.annotation.HttpLog;
 import com.uas.ps.product.MessageConsumer;
 import com.uas.ps.product.entity.Prod;
 import com.uas.ps.product.entity.ProductSaler;
@@ -49,6 +50,7 @@ public class ProductController {
      * @return
      * @throws UnsupportedEncodingException
      */
+    @HttpLog
     @RequestMapping(value = "/erp/save", method = RequestMethod.POST)
     public void saveProducts(@RequestParam("data") String data, Long enUU) throws UnsupportedEncodingException {
         String jsonStr = URLDecoder.decode(data, "UTF-8");
@@ -65,6 +67,7 @@ public class ProductController {
      * @return
      * @throws UnsupportedEncodingException
      */
+    @HttpLog
     @RequestMapping(value = "/erp/update", method = RequestMethod.POST)
     public void updateProduct(@RequestParam("data") String data, @RequestParam("enUU") Long enUU) throws UnsupportedEncodingException {
         String jsonStr = URLDecoder.decode(data, "UTF-8");
@@ -80,6 +83,7 @@ public class ProductController {
      * @return
      * @throws UnsupportedEncodingException
      */
+    @HttpLog
     @RequestMapping(value = "/cycleupdate", method = RequestMethod.POST)
     @ResponseBody
     public void updateProducts(@RequestParam("data") String data, Long enUU) throws UnsupportedEncodingException {
@@ -95,6 +99,7 @@ public class ProductController {
      * @param data 物料信息
      * @return
      */
+    @HttpLog
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
     public List<Long> updateProdInfo(@RequestBody String data) throws UnsupportedEncodingException {
@@ -121,6 +126,7 @@ public class ProductController {
      * @param data 物料信息
      * @return
      */
+    @HttpLog
     @RequestMapping(value = "/update/b2b", method = RequestMethod.POST)
     @ResponseBody
     public List<Long> updateB2bProdInfo(@RequestBody List<Product> data) throws UnsupportedEncodingException {
@@ -156,6 +162,7 @@ public class ProductController {
      * @param json
      * @return
      */
+    @HttpLog
     @RequestMapping(value = "/match/nonProduct", method = RequestMethod.POST)
     @ResponseBody
     public ModelMap matchB2cAll(@RequestBody String json) {
@@ -170,6 +177,7 @@ public class ProductController {
      * @param idList
      * @return
      */
+    @HttpLog
     @RequestMapping(value = "/match/selected", method = RequestMethod.POST)
     public ModelMap matchSelected(@RequestParam Long enUU, @RequestBody List<Long> idList) {
         return productService.batchMatch(enUU, idList);
@@ -182,6 +190,7 @@ public class ProductController {
      * @param productId
      * @return
      */
+    @HttpLog
     @RequestMapping("/assign")
     @ResponseBody
     public ModelMap assignPersonalProduct(@RequestParam Long userUU, @RequestParam Long productId) {
@@ -195,6 +204,7 @@ public class ProductController {
      * @param productId
      * @return
      */
+    @HttpLog
     @RequestMapping(value = "/assign/batch", method = RequestMethod.POST)
     @ResponseBody
     public String assignPersonalProductByBatch(@RequestParam Long userUU, @RequestBody String productId) throws UnsupportedEncodingException {
@@ -212,6 +222,7 @@ public class ProductController {
      * @param productId
      * @return
      */
+    @HttpLog
     @RequestMapping("/assign/delete")
     @ResponseBody
     public ModelMap assignPersonalProductDelete(@RequestParam Long userUU, @RequestParam Long productId) {
@@ -223,6 +234,7 @@ public class ProductController {
      *
      * @return
      */
+    @HttpLog
     @RequestMapping(value = "/backtouas", method = RequestMethod.GET)
     @ResponseBody
     public List<Prod> getProds(Long enUU) {
@@ -246,6 +258,7 @@ public class ProductController {
      * @param data 下载成功的物料id
      * @throws UnsupportedEncodingException
      */
+    @HttpLog
     @RequestMapping(value = "/refreshDownloadStatus", method = RequestMethod.POST)
     @ResponseBody
     public void refreshDownloadStatus(@RequestParam("data") String data) throws UnsupportedEncodingException {
@@ -260,6 +273,7 @@ public class ProductController {
      * @param data 同步的个人物料信息
      * @throws UnsupportedEncodingException
      */
+    @HttpLog
     @RequestMapping(value = "/produser", method = RequestMethod.POST)
     @ResponseBody
     public void updateProdSaler(@RequestParam("data") String data) throws UnsupportedEncodingException {
@@ -277,6 +291,7 @@ public class ProductController {
      * @param data 删除的个人物料信息
      * @throws UnsupportedEncodingException 解析异常
      */
+    @HttpLog
     @RequestMapping(value = "/produser/quit", method = RequestMethod.POST)
     @ResponseBody
     public void uploadProductSalerForCancel(@RequestParam("data") String data) throws UnsupportedEncodingException {
@@ -293,6 +308,7 @@ public class ProductController {
      * @since 2018-01-23 19:23
      * @param id 物料id
      */
+    @HttpLog
     @RequestMapping(value = "/matchResultAndProductUser/delete", method = RequestMethod.POST)
     @ResponseBody
     public void deleteMatchResultAndProductUser(@RequestParam("id") Long id) {
@@ -307,6 +323,7 @@ public class ProductController {
      * @param switchType  开关类型(销售/采购)  sale or purc
      * @param switchStatus 开关状态 1 或 0
      */
+    @HttpLog
     @RequestMapping(value = "/saleAndPurchase/edit/toggle", method = RequestMethod.POST)
     @ResponseBody
     public void switchProductByEnUU(@RequestParam("enUU") Long enUU,
@@ -327,6 +344,7 @@ public class ProductController {
      * @param switchType  开关类型(销售/采购)  sale or purc
      * @param switchStatus 开关状态 1 或 0
      */
+    @HttpLog
     @RequestMapping(value = "/edit/toggle/one", method = RequestMethod.POST)
     @ResponseBody
     public void switchProductById(@RequestParam("id") Long id,

+ 10 - 5
src/main/java/com/uas/ps/product/controller/ProductUsersController.java

@@ -4,17 +4,14 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.ps.entity.Product;
 import com.uas.ps.entity.ProductUsers;
+import com.uas.ps.httplog.annotation.HttpLog;
 import com.uas.ps.product.MessageConsumer;
 import com.uas.ps.product.repository.ProductDao;
 import com.uas.ps.product.service.ProductService;
 import com.uas.ps.product.service.ProductUsersService;
 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.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
@@ -49,6 +46,7 @@ public class ProductUsersController {
      * @param data 用户个人物料信息
      * @return
      */
+    @HttpLog
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     public ModelMap saveProductUsers(@RequestBody String data) throws UnsupportedEncodingException {
         String json = URLDecoder.decode(data, "utf-8");
@@ -70,6 +68,7 @@ public class ProductUsersController {
      * @param data 用户个人物料信息
      * @return
      */
+    @HttpLog
     @RequestMapping(value = "/saveBatch", method = RequestMethod.POST)
     public List<Long> saveProductUsersBatch(@RequestBody String data) throws UnsupportedEncodingException {
         String json = URLDecoder.decode(data, "utf-8");
@@ -94,6 +93,7 @@ public class ProductUsersController {
      * @param data  物料信息
      * @return
      */
+    @HttpLog
     @RequestMapping(value = "/edit/addNewProduct", method = RequestMethod.POST)
     public ModelMap addNewProduct(@RequestParam("data") String data) throws Exception {
         String json = URLDecoder.decode(data, "utf-8");
@@ -109,6 +109,7 @@ public class ProductUsersController {
      * @return
      * @throws Exception
      */
+    @HttpLog
     @RequestMapping(value = "/edit/delete", method = RequestMethod.POST)
     public ModelMap deleteById(@RequestParam("id") Long id) {
         ModelMap map = new ModelMap();
@@ -128,6 +129,7 @@ public class ProductUsersController {
      * @return
      * @throws Exception
      */
+    @HttpLog
     @RequestMapping(value = "/edit/deleteByBatch", method = RequestMethod.POST)
     public ModelMap deleteByBatch(@RequestParam("ids") String ids) throws UnsupportedEncodingException {
         List<Long> idList = JSONObject.parseArray(URLDecoder.decode(ids, "utf-8"), Long.class);
@@ -146,6 +148,7 @@ public class ProductUsersController {
      *
      * @param data (ids 物料ids, userUU 当前用户UU, enUU 当前企业UU)
      */
+    @HttpLog
     @RequestMapping(value = "/coverToUserByIds", method = RequestMethod.POST)
     public Integer coverToUserByIds(@RequestParam("data") String data) throws UnsupportedEncodingException {
         String json = URLDecoder.decode(data, "utf-8");
@@ -162,6 +165,7 @@ public class ProductUsersController {
      * @param data (id 物料id, userUU 当前用户UU, enUU 当前企业UU)
      * @return
      */
+    @HttpLog
     @RequestMapping(value = "/covertToUser", method = RequestMethod.POST)
     public void coverToUserById(@RequestParam("data") String data) throws UnsupportedEncodingException {
         String json = URLDecoder.decode(data, "utf-8");
@@ -178,6 +182,7 @@ public class ProductUsersController {
      * @param cmpCode 物料原厂型号
      * @return
      */
+    @HttpLog
     @RequestMapping(value = "/getProductUsersByEnUUAndCmpCode", method = RequestMethod.GET)
     public List<ProductUsers> getProductUsersByEnUUAndCmpCode(Long enUU, String cmpCode) {
         return productUsersService.getProductUsersByEnUUAndCmpCode(enUU, cmpCode);