Browse Source

更改日志实现

liuam 7 years ago
parent
commit
b1f3f80801

+ 1 - 16
pom.xml

@@ -80,12 +80,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-logging</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -95,16 +89,7 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-        <!-- 配置 log4j2 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-log4j2</artifactId>
-        </dependency>
-        <!-- 加上这个才能辨认到log4j2.yml文件 -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.dataformat</groupId>
-            <artifactId>jackson-dataformat-yaml</artifactId>
-        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-configuration-processor</artifactId>

+ 16 - 15
src/main/java/com/uas/ps/inquiry/service/impl/PublicInquiryServiceImpl.java

@@ -984,25 +984,26 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
     @Override
     public void onReplyInvalid(List<Inquiry> inquiries, final Long enuu) {
         final List<PublicInquiryItem> newInquiryItems = new ArrayList<>();
-        ThreadUtils.tasks(new IRunnable<Inquiry>() {
-
-            @Override
-            public void run(Inquiry inquiry) {
-                List<PublicInquiry> purchaseInquiries = publicInquiryDao.findByEnUUAndCode(enuu, inquiry.getIn_code());
-                if (!CollectionUtils.isEmpty(purchaseInquiries)) {
-                    PublicInquiry publicInquiry = purchaseInquiries.get(0);
-                    for (PublicInquiryItem item : publicInquiry.getInquiryItems()) {
-                        item.setStatus((short) Status.DISABLED.value());
-                        // 获取作废信息时,更新作废上传状态为 待上传
-                        item.setInvalidStatus((short) Status.NOT_UPLOAD.value());
-                        synchronized (newInquiryItems) {
-                            newInquiryItems.add(item);
+        for (final Inquiry inquiry : inquiries) {
+            ThreadUtils.task(new Runnable() {
+                @Override
+                public void run() {
+                    List<PublicInquiry> purchaseInquiries = publicInquiryDao.findByEnUUAndCode(enuu, inquiry.getIn_code());
+                    if (!CollectionUtils.isEmpty(purchaseInquiries)) {
+                        PublicInquiry publicInquiry = purchaseInquiries.get(0);
+                        for (PublicInquiryItem item : publicInquiry.getInquiryItems()) {
+                            item.setStatus((short) Status.DISABLED.value());
+                            // 获取作废信息时,更新作废上传状态为 待上传
+                            item.setInvalidStatus((short) Status.NOT_UPLOAD.value());
+                            synchronized (newInquiryItems) {
+                                newInquiryItems.add(item);
+                            }
                         }
                     }
                 }
-            }
+            });
+        }
 
-        }, inquiries);
     }
 
     /**

+ 1 - 2
src/main/resources/application.yml

@@ -10,6 +10,5 @@ spring:
 
 sso:
  secretKey: 0taQcW073Z7G628g5H
-
 logging:
-  config: classpath:log4j2.yml
+  path: logs/log.log

+ 0 - 55
src/main/resources/log4j2.yml

@@ -1,55 +0,0 @@
-# 共有8个级别,按照从低到高为:ALL < TRACE < DEBUG < INFO < WARN < ERROR < FATAL < OFF。
-Configuration:
-  status: warn
-  monitorInterval: 30
-  Properties: # 定义全局变量
-    Property: # 缺省配置(用于开发环境)。其他环境需要在VM参数中指定,如下:
-      #测试:-Dlog.level.console=warn -Dlog.level.xjj=trace
-      #生产:-Dlog.level.console=warn -Dlog.level.xjj=info
-      - name: log.level.console
-        value: info
-      - name: log.path
-        value: logs
-      - name: project.name
-        value: log
-      - name: log.pattern
-        value: "%d{yyyy-MM-dd HH:mm:ss.SSS} -%5p ${PID:-} [%15.15t] %-30.30C{1.} : %m%n"
-  Appenders:
-    Console:  #输出到控制台
-      name: CONSOLE
-      target: SYSTEM_OUT
-      PatternLayout:
-        pattern: ${log.pattern}
-#   启动日志
-    RollingFile:
-      - name: ROLLING_FILE
-        fileName: ${log.path}/${project.name}.log
-        filePattern: "${log.path}/historyRunLog/$${date:yyyy-MM}/${project.name}-%d{yyyy-MM-dd}-%i.log.gz"
-        PatternLayout:
-          pattern: ${log.pattern}
-        Filters:
-#        一定要先去除不接受的日志级别,然后获取需要接受的日志级别
-          ThresholdFilter:
-            - level: info
-              onMatch: ACCEPT
-              onMismatch: DENY
-        Policies:
-          TimeBasedTriggeringPolicy:  # 按天分类
-            modulate: true
-            interval: 1
-        DefaultRolloverStrategy:     # 文件最多100个
-          max: 100
-  Loggers:
-    Root:
-      level: info
-      AppenderRef:
-        - ref: CONSOLE
-        - ref: ROLLING_FILE
-#    监听具体包下面的日志
-#    Logger: # 为com.xjj包配置特殊的Log级别,方便调试
-#      - name: com.xjj
-#        additivity: false
-#        level: ${sys:log.level.xjj}
-#        AppenderRef:
-#          - ref: CONSOLE
-#          - ref: ROLLING_FILE