日志配置调整

9cc3ad5c · lixian7 · 2f0a07ca · 9cc3ad5c · 9cc3ad5c · 9cc3ad5c
Commit 9cc3ad5c authored Jun 22, 2020 by lixian7
3 changed files
--- a/api/src/main/java/com/hikcreate/edl/pub/web/mobile/api/controller/BindInfoControlller.java
+++ b/api/src/main/java/com/hikcreate/edl/pub/web/mobile/api/controller/BindInfoControlller.java
 package com.hikcreate.edl.pub.web.mobile.api.controller;
+import com.hikcreate.common.orika.DefaultConverter;
 import com.hikcreate.common.sdk.response.apiparam.Response;
 import com.hikcreate.common.sdk.response.apiparam.ResponseGenerator;
 import com.hikcreate.common.sdk.response.statuscode.StatusCode;
@@ -9,6 +10,7 @@ import com.hikcreate.edl.pub.web.mobile.infra.core.annotatiion.ResponseEncryptAn
 import com.hikcreate.edl.pub.web.mobile.infra.data.mapper.BindInfoMapper;
 import com.hikcreate.edl.pub.web.mobile.infra.model.BindInfo;
 import com.hikcreate.edl.pub.web.mobile.infra.model.param.request.BindInfoQueryReq;
+import com.hikcreate.edl.pub.web.mobile.infra.model.param.request.BindInfoReq;
 import com.hikcreate.edl.pub.web.mobile.infra.model.param.request.UnBindReq;
 import com.hikcreate.edl.pub.web.mobile.infra.model.param.response.ResultList;
 import lombok.extern.slf4j.Slf4j;
@@ -35,14 +37,14 @@ public class BindInfoControlller extends BaseController {
    @Autowired
    IBindService service;
-    @Resource
+    @Autowired
-    BindInfoMapper mapper;
+   DefaultConverter defaultConverter;
    /**
     * 绑定用户信息的接口
     *
-     * @param info
+     * @param req
     * @return Result
     * @author: xsx
     * @date: 2020/6/19 10:27
@@ -50,11 +52,11 @@ public class BindInfoControlller extends BaseController {
    @PostMapping("bind")
    @BodyDecryptAnnotation
    @ResponseEncryptAnnotation
-    public Response<String> bindInfo(@RequestBody BindInfo info) {
+    public Response<String> bindInfo(@RequestBody @Validated BindInfoReq req) {
-        if (info == null) {
-            return ResponseGenerator.fail(StatusCode.PARAM_ERROR);
+        BindInfo bindInfo = new BindInfo();
-        }
+        defaultConverter.getMapperFacade().map(req, bindInfo);
-        return service.bind(info);
+        return service.bind(bindInfo);
    }

--- a/api/src/main/resources/logback.xml
+++ b/api/src/main/resources/logback.xml
@@ -2,51 +2,44 @@
 <configuration scan="true" scanPeriod="60 seconds" debug="false">
    <springProperty scope="context" name="logPath" source="logging.path" defaultValue="../../log"/>
-    <property name="logPath" value="../../../log/park"/>
-    <property name="appName" value="park"/>
-    <property name="moduleName" value="park"/>
+    <property name="appName" value="park"/>
+    <property name="moduleName" value="extend"/>
    <!-- 文档保留天数 -->
-    <property name="maxHistory" value="10"/>
+    <property name="maxHistory" value="30"/>
    <!-- 文档保留总大小 -->
    <property name="totalSizeCap" value="10GB"/>
-    <!-- 日志文件大小 -->
-    <property name="maxFileSize" value="100MB"/>
    <property name="CONSOLE_LOG_PATTERN"
-              value="%cyan(%d)|%highlight(%level)|${moduleName},%X{X-B3-TraceId},%X{X-B3-SpanId},%X{X-Span-Export}|%yellow(%thread)|%blue(%logger{36}:%line)|%msg%n"/>
+              value="%cyan(%d)|%highlight(%level)|${moduleName},%X{_API_URL},%X{X-B3-TraceId},%X{X-B3-SpanId},%X{X-Span-Export}|%X{_USER_ID}|%yellow(%thread)|%blue(%logger{36}:%line)|%msg%n"/>
    <!--没有颜色-->
    <property name="FILE_LOG_PATTERN"
-              value="%d|%level|${moduleName},%X{X-B3-TraceId},%X{X-B3-SpanId},%X{X-Span-Export}|%thread|%logger{36}:%line|%msg%n"/>
+              value="%d|%level|${moduleName},%X{_API_URL},%X{X-B3-TraceId},%X{X-B3-SpanId},%X{X-Span-Export}|%X{_USER_ID}|%thread|%logger{36}:%line|%msg%n"/>
    <!--%X{requestId}-->
    <!--输出到控制台 ConsoleAppender-->
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+    <appender name="consoleLog" class="ch.qos.logback.core.ConsoleAppender">
        <layout class="ch.qos.logback.classic.PatternLayout">
            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
        </layout>
    </appender>
-    <appender name="rollingFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <appender name="fileInfoLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
        <!--日志名称，如果没有File 属性，那么只会使用FileNamePattern的文件路径规则
            如果同时有<File>和<FileNamePattern>，那么当天日志是<File>，明天会自动把今天
            的日志改名为今天的日期。即，<File> 的日志都是当天的。
        -->
        <File>${logPath}/${appName}-${moduleName}.log</File>
        <!--滚动策略，按照时间滚动 TimeBasedRollingPolicy-->
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
            <!--文件路径,定义了日志的切分方式——把每一天的日志归档到一个文件中,以防止日志填满整个磁盘空间-->
-            <FileNamePattern>${logPath}/${appName}-${moduleName}.log.%d{yyyy-MM-dd}.%i</FileNamePattern>
+            <FileNamePattern>${logPath}/${appName}-${moduleName}.log.%d{yyyy-MM-dd}</FileNamePattern>
-            <!--只保留最近天数的日志-->
+            <!--只保留最近90天的日志-->
            <maxHistory>${maxHistory}</maxHistory>
            <!--用来指定日志文件的上限大小，那么到了这个值，就会删除旧的日志-->
            <totalSizeCap>${totalSizeCap}</totalSizeCap>
-            <maxFileSize>${maxFileSize}</maxFileSize>
-            <cleanHistoryOnStart>true</cleanHistoryOnStart>
        </rollingPolicy>
        <!--日志输出编码格式化-->
        <encoder>
            <charset>UTF-8</charset>
@@ -54,13 +47,34 @@
        </encoder>
    </appender>
-    <!-- 在程序的开发测试阶段，可以调整level的级别，常用级别优先级为： -->
+    <appender name="ASYNC" class="ch.qos.logback.classic.AsyncAppender">
-    <!-- TRACE < DEBUG < INFO < WARN < ERROR  -->
+        <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 -->
-    <logger name="org.springframework.boot" level="WARN"/>
+        <discardingThreshold>0</discardingThreshold>
-    <logger name="com.netflix.discovery.shared.resolver.aws.ConfigClusterResolver" level="WARN"/>
+        <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 -->
+        <queueSize>2048</queueSize>
+        <includeCallerData>true</includeCallerData>
+        <!-- 添加附加的appender,最多只能添加一个 -->
+        <appender-ref ref="fileInfoLog"/>
+    </appender>
+    <springProfile name="dev,local">
+        <logger name="root" level="INFO" additivity="false">
+            <appender-ref ref="consoleLog"/>
+            <appender-ref ref="ASYNC"/>
+        </logger>
+        <logger name="com.hikcreate.edl.pub.service.activity.dataaccess.dao.mysql" level="DEBUG"></logger>
+    </springProfile>
+    <springProfile name="test">
+        <logger name="root" level="INFO" additivity="false">
+            <appender-ref ref="consoleLog"/>
+            <appender-ref ref="ASYNC"/>
+        </logger>
+        <logger name="com.hikcreate.edl.pub.service.activity.dataaccess.dao.mysql" level="DEBUG"></logger>
+    </springProfile>
+    <springProfile name="pro,ys">
        <logger name="root" level="INFO" additivity="false">
-        <appender-ref ref="console"/>
+            <appender-ref ref="ASYNC"/>
-        <appender-ref ref="rollingFile"/>
        </logger>
+    </springProfile>
 </configuration>
\ No newline at end of file
--- a/infra/src/main/java/com/hikcreate/edl/pub/web/mobile/infra/model/param/request/BindInfoReq.java
+++ b/infra/src/main/java/com/hikcreate/edl/pub/web/mobile/infra/model/param/request/BindInfoReq.java
+package com.hikcreate.edl.pub.web.mobile.infra.model.param.request;
+import lombok.Data;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+/**
+ * @author lixian
+ * @description
+ * @date 2020/6/22 14:12
+ **/
+@Data
+public class BindInfoReq {
+    /**
+     * 客户id
+     */
+    @NotBlank(message = "客户唯一编码不能为空")
+    private String userId;
+    /**
+     * 客户电话号码
+     */
+    @NotBlank(message = "客户手机号不能为空")
+    private String phone;
+    /**
+     * 车牌颜色:A:白,B:灰,C:黄,D:粉,E:红,
+     * F:紫,G:绿,H:蓝,I:棕,J:黑',
+     */
+    @NotBlank(message = "车牌颜色不能为空")
+    private String plateColor;
+    /**
+     * 车牌号
+     */
+    @NotBlank(message = "车牌号不能为空")
+    private String plateNum;
+    /**
+     * 时间戳
+     */
+    @NotNull(message = "时间戳不能为空")
+    private Long    timestamp;
+}