Browse Source

use ps-httplog to print logs

sunyj 7 years ago
parent
commit
3b5cadccbc

+ 4 - 0
pom.xml

@@ -28,6 +28,10 @@
             <groupId>com.uas.ps</groupId>
             <artifactId>ps-core</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/message/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();
-    }
-
     /**
      * 异常处理
      */

+ 2 - 0
src/main/java/com/uas/ps/message/api/ConfigureTaskController.java

@@ -1,5 +1,6 @@
 package com.uas.ps.message.api;
 
+import com.uas.ps.httplog.annotation.HttpLog;
 import com.uas.ps.message.SchedulingConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -25,6 +26,7 @@ public class ConfigureTaskController {
      * @param cron 定时频率
      * @return
      */
+    @HttpLog
     @RequestMapping(value = "/pushsm/cron/update", method = RequestMethod.POST, produces = "application/json")
     public String updateCron(@RequestBody String cron) {
        return schedulingConfig.setCron(cron);

+ 8 - 4
src/main/java/com/uas/ps/message/api/MessageController.java

@@ -1,19 +1,19 @@
 package com.uas.ps.message.api;
 
-import com.uas.ps.core.page.PageInfo;
 import com.uas.ps.core.page.PageParams;
+import com.uas.ps.httplog.annotation.HttpLog;
 import com.uas.ps.message.domain.Message;
 import com.uas.ps.message.service.MessageService;
-import java.util.List;
-import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * Created by wangyc on 2018/1/13.
  *
@@ -38,6 +38,7 @@ public class MessageController {
      * @param pageParams 分页参数
      * @return
      */
+    @HttpLog
     @RequestMapping(method = RequestMethod.GET, produces = "application/json")
     public Page<Message> getMessages(String receiverUu, String receiverEnuu, String consumerApp, PageParams pageParams) {
         return messageService.getMessages(receiverUu, receiverEnuu, consumerApp, pageParams);
@@ -48,6 +49,7 @@ public class MessageController {
      * @param messages 消息
      * @return
      */
+    @HttpLog
     @RequestMapping(method = RequestMethod.POST, produces = "application/json")
     public List<Message> saveMessages(@RequestBody String messages) {
         // TODO 日志
@@ -59,6 +61,7 @@ public class MessageController {
      * @param consumerApp 接收消息app
      * @return
      */
+    @HttpLog
     @RequestMapping(value = "/send", method = RequestMethod.POST, produces = "application/json")
     public Map<String, Object> sendMessage(@RequestBody String consumerApp) {
         return messageService.sendMessage(consumerApp);
@@ -69,6 +72,7 @@ public class MessageController {
      * @param cousumer 消息接收者信息
      * @return
      */
+    @HttpLog
     @RequestMapping(value = "/read", method = RequestMethod.POST, produces = "application/json")
     public Message read(@RequestBody String cousumer) {
         return messageService.readMessage(cousumer);