1.增加日志切面

2.修改compose错误，调整资源配置

epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml

@@ -9,9 +9,9 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx250m -jar ./app.jar"
     deploy:
       resources:
         limits:
           cpus: '0.1'
-          memory: 250M
+          memory: 300M

epmet-module/data-report/data-report-server/deploy/docker-compose-test.yml

@@ -1,7 +1,7 @@
 version: "3.7"
 services:
   data-report-server:
-    container_name: data-report-server-dev
+    container_name: data-report-server-test
     image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/data-report-server:0.3.1
     ports:
       - "8108:8108"
@@ -9,9 +9,9 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx250m -jar ./app.jar"
     deploy:
       resources:
         limits:
           cpus: '0.1'
-          memory: 400M
+          memory: 300M

epmet-module/data-report/data-report-server/src/main/java/com/epmet/aspect/RequestLogAspect.java

@@ -0,0 +1,40 @@
+package com.epmet.aspect;
+
+import com.epmet.commons.tools.aspect.BaseRequestLogAspect;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * 日志/异常处理切面实现，调用父类方法完成日志记录和异常处理。
+ */
+@Aspect
+@Component
+@Order(0)
+public class RequestLogAspect extends BaseRequestLogAspect {
+
+    @Override
+    @Around(value = "execution(* com.epmet.controller.*Controller*.*(..)) ")
+    public Object proceed(ProceedingJoinPoint point) throws Throwable {
+        return super.proceed(point, getRequest());
+    }
+
+    /**
+     * 获取Request对象
+     *
+     * @return
+     */
+    private HttpServletRequest getRequest() {
+        RequestAttributes ra = RequestContextHolder.getRequestAttributes();
+        ServletRequestAttributes sra = (ServletRequestAttributes) ra;
+        return sra.getRequest();
+    }
+
+}

epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml

@@ -9,9 +9,9 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx250m -jar ./app.jar"
     deploy:
       resources:
         limits:
           cpus: '0.1'
-          memory: 250M
+          memory: 300M

epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml

@@ -1,7 +1,7 @@
 version: "3.7"
 services:
   data-statistical-server:
-    container_name: data-statistical-server-dev
+    container_name: data-statistical-server-test
     image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/data-statistical-server:0.3.1
     ports:
       - "8108:8108"
@@ -9,9 +9,9 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx250m -jar ./app.jar"
     deploy:
       resources:
         limits:
           cpus: '0.1'
-          memory: 400M
+          memory: 300M

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/aspect/RequestLogAspect.java

@@ -0,0 +1,40 @@
+package com.epmet.aspect;
+
+import com.epmet.commons.tools.aspect.BaseRequestLogAspect;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * 日志/异常处理切面实现，调用父类方法完成日志记录和异常处理。
+ */
+@Aspect
+@Component
+@Order(0)
+public class RequestLogAspect extends BaseRequestLogAspect {
+
+    @Override
+    @Around(value = "execution(* com.epmet.controller.*Controller*.*(..)) ")
+    public Object proceed(ProceedingJoinPoint point) throws Throwable {
+        return super.proceed(point, getRequest());
+    }
+
+    /**
+     * 获取Request对象
+     *
+     * @return
+     */
+    private HttpServletRequest getRequest() {
+        RequestAttributes ra = RequestContextHolder.getRequestAttributes();
+        ServletRequestAttributes sra = (ServletRequestAttributes) ra;
+        return sra.getRequest();
+    }
+
+}