添加LogRequest拦截器

zen-api/src/main/kotlin/com/gxzc/zen/logging/annotation/LogAnnotation.kt

@@ -0,0 +1,14 @@
+package com.gxzc.zen.logging.annotation
+
+/**
+ * <p>
+ * 使用在Controller方法上<br>
+ * 用于配置 请求日志
+ * </p>
+ * @author NorthLan
+ * @date 2018/8/23
+ * @url https://noahlan.com
+ */
+@Target(AnnotationTarget.FUNCTION)
+@Retention(AnnotationRetention.RUNTIME)
+annotation class LogAnnotation(val ignore: Boolean = false, val remark: String = "")

zen-api/src/main/kotlin/com/gxzc/zen/logging/aop/LogRequestAspect.kt

@@ -0,0 +1,135 @@
+package com.gxzc.zen.logging.aop
+
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.gxzc.zen.common.properties.PlatformProperties
+import com.gxzc.zen.logging.annotation.LogAnnotation
+import com.gxzc.zen.logging.model.LogRequest
+import com.gxzc.zen.logging.util.MQLogUtil
+import com.gxzc.zen.umps.util.SSOUtil
+import org.aspectj.lang.ProceedingJoinPoint
+import org.aspectj.lang.annotation.Around
+import org.aspectj.lang.annotation.Aspect
+import org.aspectj.lang.annotation.Pointcut
+import org.aspectj.lang.reflect.MethodSignature
+import org.slf4j.LoggerFactory
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.core.annotation.Order
+import org.springframework.stereotype.Component
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.context.request.RequestContextHolder
+import org.springframework.web.context.request.ServletRequestAttributes
+import java.util.*
+
+/**
+ *
+ * @author NorthLan
+ * @date 2018/8/23
+ * @url https://noahlan.com
+ */
+@Suppress("unused")
+@Aspect
+@Order(1)
+@Component
+class LogRequestAspect {
+    companion object {
+        private val logger = LoggerFactory.getLogger(LogRequestAspect::class.java)
+    }
+
+    @Autowired
+    private lateinit var platformProperties: PlatformProperties
+
+    @Autowired
+    private lateinit var mapper: ObjectMapper
+
+    /**
+     * 拦截所有 Controller结尾 的所有方法
+     */
+    @Pointcut("execution(* com.gxzc.zen..*Controller.*(..)))")
+    fun controllerCut() {
+    }
+
+    @Around("controllerCut()")
+    fun after(joinPoint: ProceedingJoinPoint): Any? {
+        val method = (joinPoint.signature as MethodSignature).method
+        val logAnnotation = method.getAnnotation(LogAnnotation::class.java)
+        var remark: String? = null
+        if (logAnnotation != null) {
+            if (logAnnotation.ignore) {
+                return joinPoint.proceed()
+            }
+            remark = logAnnotation.remark
+        }
+        val fullMethodName = method.declaringClass.name + "." + method.name
+        var requestBody: Any? = null
+
+        var i = -1
+        method.parameterAnnotations.forEach { annotations ->
+            ++i
+            annotations.forEach {
+                if (it is RequestBody) {
+                    requestBody = joinPoint.args[i]
+                }
+            }
+        }
+
+        val attr = RequestContextHolder.getRequestAttributes() as ServletRequestAttributes
+        val request = attr.request
+
+        val requestUri = request.requestURI
+        val remoteHost = request.remoteHost
+
+        val requestMethod = request.method
+        val requestParam = request.queryString
+
+        val platformId = platformProperties.id!!
+        var account: String? = null
+        var accountName: String? = null
+        try {
+            account = SSOUtil.getCurAccount()!!
+            accountName = SSOUtil.getCurUserInfo()!!.username
+        } catch (e: Throwable) {
+        }
+
+        val data = LogRequest().apply {
+            this.platformId = platformId
+            this.requestUri = requestUri
+            this.requestMethod = requestMethod
+            this.requestParam = requestParam
+            this.requestBody = mapper.writeValueAsString(requestBody)
+            //            this.responseBody = mapper.writeValueAsString(result)
+            this.remoteHost = remoteHost
+            this.method = fullMethodName
+            this.operatorAccount = account
+            this.operatorName = accountName
+            this.operatorTime = Date()
+            //            this.exMsg = exMsg
+            this.remark = remark
+        }
+        return try {
+            val result = joinPoint.proceed()
+
+            data.responseBody = mapper.writeValueAsString(result)
+
+            MQLogUtil.logRequest(data)
+            result
+        } catch (e: Throwable) {
+            // 运行时异常
+            var exMsg = e.javaClass.name + " : " + e.message + "\r\n"
+            run breaking@{
+                e.stackTrace.forEachIndexed { index, it ->
+                    if (index > 9) {
+                        return@breaking
+                    }
+                    exMsg += it
+                    exMsg += "\r\n"
+                }
+            }
+            exMsg += "......"
+
+            data.exMsg = exMsg
+
+            MQLogUtil.logRequest(data)
+            throw e
+        }
+    }
+}

zen-api/src/main/kotlin/com/gxzc/zen/logging/model/LogRequest.kt

@@ -9,11 +9,16 @@ import java.util.*
  * @date 2018/8/23
  * @url https://noahlan.com
  */
-data class LogRequest(val pid: Int, val operator: String) : Serializable {
+open class LogRequest : Serializable {
     companion object {
         private const val serialVersionUID = 10000000000000002L
     }
 
+    /**
+     * 平台ID
+     */
+    var platformId: Int? = null
+
     /**
      * 请求URI
      */
@@ -34,20 +39,40 @@ data class LogRequest(val pid: Int, val operator: String) : Serializable {
      */
     var requestBody: String? = null
 
+    /**
+     * 返回内容
+     */
+    var responseBody: String? = null
+
+    /**
+     * targetMethod 请求方法
+     */
+    var method: String? = null
+
+    /**
+     * 操作人account
+     */
+    var operatorAccount: String? = null
+
+    /**
+     * 操作人name
+     */
+    var operatorName: String? = null
+
     /**
      * 操作时间
      */
-    var operTime: Date = Date()
+    var operatorTime: Date = Date()
 
     /**
      * 客户端host
      */
-    var host: String? = null
+    var remoteHost: String? = null
 
     /**
-     * 客户端用户代理
+     * 异常信息
      */
-    var userAgent: String? = null
+    var exMsg: String? = null
 
     /**
      * 备注

zen-core/src/main/kotlin/com/gxzc/zen/common/exception/aop/BaseControllerExceptionHandler.kt

@@ -42,6 +42,6 @@ class BaseControllerExceptionHandler {
     @ResponseBody
     fun runtimeException(e: RuntimeException): ErrorTip {
         logger.error("运行时异常:", e)
-        return ErrorTip(ZenExceptionEnum.SERVER_ERROR.code, e.message!!)
+        return ErrorTip(ZenExceptionEnum.SERVER_ERROR.code, e.message ?: "")
     }
 }

zen-web/src/main/kotlin/com/gxzc/zen/web/sys/controller/TestController.kt

@@ -1,10 +1,11 @@
 package com.gxzc.zen.web.sys.controller
 
 import com.gxzc.zen.common.base.BaseController
+import com.gxzc.zen.common.dto.RequestDto
+import com.gxzc.zen.logging.annotation.LogAnnotation
 import org.springframework.http.ResponseEntity
-import org.springframework.web.bind.annotation.GetMapping
-import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.RestController
+import org.springframework.web.bind.annotation.*
+import java.io.IOException
 
 
 /**
@@ -17,8 +18,10 @@ import org.springframework.web.bind.annotation.RestController
 @RequestMapping("test")
 class TestController : BaseController() {
 
-    @GetMapping("a")
-    fun get(): ResponseEntity<*> {
+    @PostMapping("a/{id}")
+    @LogAnnotation(remark = "备注")
+    fun get(@PathVariable id: Long, @RequestParam a: String, @RequestParam b: Int, @RequestBody dto: RequestDto): ResponseEntity<*> {
+        throw IOException("2333")
         return ResponseEntity.ok(2)
     }
 }