Browse Source

logback-spring.xml不再引用的spring/base.xml,改用自定义的logback-base.xml文件。目的:解决base.xml中自动生成/tmp/spring.log文件,与自定义的日志文件重复,且不会滚动。

feature/teamB_zz_wgh
wangxianzhang 3 years ago
parent
commit
e859157284
  1. 3
      epmet-admin/epmet-admin-server/src/main/resources/logback-spring.xml
  2. 3
      epmet-auth/src/main/resources/logback-spring.xml
  3. 17
      epmet-commons/epmet-commons-tools/src/main/resources/logback-base.xml
  4. 3
      epmet-gateway/src/main/resources/logback-spring.xml
  5. 3
      epmet-module/data-aggregator/data-aggregator-server/src/main/resources/logback-spring.xml
  6. 3
      epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml
  7. 3
      epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml
  8. 3
      epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/logback-spring.xml
  9. 3
      epmet-module/epmet-common-service/common-service-server/src/main/resources/logback-spring.xml
  10. 3
      epmet-module/epmet-demo/epmet-demo-server/src/main/resources/logback-spring.xml
  11. 3
      epmet-module/epmet-ext/epmet-ext-server/src/main/resources/logback-spring.xml
  12. 3
      epmet-module/epmet-heart/epmet-heart-server/src/main/resources/logback-spring.xml
  13. 3
      epmet-module/epmet-job/epmet-job-server/src/main/resources/logback-spring.xml
  14. 3
      epmet-module/epmet-message/epmet-message-server/src/main/resources/logback-spring.xml
  15. 3
      epmet-module/epmet-oss/epmet-oss-server/src/main/resources/logback-spring.xml
  16. 3
      epmet-module/epmet-point/epmet-point-server/src/main/resources/logback-spring.xml
  17. 3
      epmet-module/epmet-third/epmet-third-server/src/main/resources/logback-spring.xml
  18. 3
      epmet-module/gov-access/gov-access-server/src/main/resources/logback-spring.xml
  19. 3
      epmet-module/gov-grid/gov-grid-server/src/main/resources/logback-spring.xml
  20. 3
      epmet-module/gov-issue/gov-issue-server/src/main/resources/logback-spring.xml
  21. 3
      epmet-module/gov-mine/gov-mine-server/src/main/resources/logback-spring.xml
  22. 1
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java
  23. 3
      epmet-module/gov-org/gov-org-server/src/main/resources/logback-spring.xml
  24. 3
      epmet-module/gov-project/gov-project-server/src/main/resources/logback-spring.xml
  25. 3
      epmet-module/gov-voice/gov-voice-server/src/main/resources/logback-spring.xml
  26. 3
      epmet-module/open-data-worker/open-data-worker-server/src/main/resources/logback-spring.xml
  27. 3
      epmet-module/oper-access/oper-access-server/src/main/resources/logback-spring.xml
  28. 3
      epmet-module/oper-crm/oper-crm-server/src/main/resources/logback-spring.xml
  29. 3
      epmet-module/oper-customize/oper-customize-server/src/main/resources/logback-spring.xml
  30. 3
      epmet-module/resi-group/resi-group-server/src/main/resources/logback-spring.xml
  31. 3
      epmet-module/resi-guide/resi-guide-server/src/main/resources/logback-spring.xml
  32. 3
      epmet-module/resi-hall/resi-hall-server/src/main/resources/logback-spring.xml
  33. 3
      epmet-module/resi-home/resi-home-server/src/main/resources/logback-spring.xml
  34. 3
      epmet-module/resi-mine/resi-mine-server/src/main/resources/logback-spring.xml
  35. 3
      epmet-module/resi-partymember/resi-partymember-server/src/main/resources/logback-spring.xml
  36. 3
      epmet-module/resi-voice/resi-voice-server/src/main/resources/logback-spring.xml
  37. 3
      epmet-openapi/epmet-openapi-scan/src/main/resources/logback-spring.xml
  38. 3
      epmet-user/epmet-user-server/src/main/resources/logback-spring.xml

3
epmet-admin/epmet-admin-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/admin"/>

3
epmet-auth/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/auth"/>

17
epmet-commons/epmet-commons-tools/src/main/resources/logback-base.xml

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Base logback configuration provided for compatibility with Spring Boot 1.1
从spring/logging包复制过来的,主要是屏蔽了/tmp/spring.log文件的生成(与我们自定义的重复,且不会滚动更新)。其他服务都改用引用此文件。
-->
<included>
<include resource="org/springframework/boot/logging/logback/defaults.xml" />
<!--<property name="LOG_FILE" value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/spring.log}"/>-->
<include resource="org/springframework/boot/logging/logback/console-appender.xml" />
<include resource="org/springframework/boot/logging/logback/file-appender.xml" />
<root level="INFO">
<appender-ref ref="CONSOLE" />
<appender-ref ref="FILE" />
</root>
</included>

3
epmet-gateway/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/gateway"/>

3
epmet-module/data-aggregator/data-aggregator-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/data-aggregator"/>

3
epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/data-report"/>

3
epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/data-statistical"/>

3
epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/activiti"/>

3
epmet-module/epmet-common-service/common-service-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/common-service"/>

3
epmet-module/epmet-demo/epmet-demo-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/demo"/>

3
epmet-module/epmet-ext/epmet-ext-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/ext"/>

3
epmet-module/epmet-heart/epmet-heart-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/heart"/>

3
epmet-module/epmet-job/epmet-job-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/job"/>

3
epmet-module/epmet-message/epmet-message-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/message"/>

3
epmet-module/epmet-oss/epmet-oss-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/oss"/>

3
epmet-module/epmet-point/epmet-point-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/point"/>

3
epmet-module/epmet-third/epmet-third-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/third"/>

3
epmet-module/gov-access/gov-access-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/gov-access"/>

3
epmet-module/gov-grid/gov-grid-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/gov-grid"/>

3
epmet-module/gov-issue/gov-issue-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/gov-issue"/>

3
epmet-module/gov-mine/gov-mine-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/gov-mine"/>

1
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java

@ -138,6 +138,7 @@ public class HouseController implements ResultDataResolver {
*/
@PostMapping("search")
public Result<PageData<IcHouseListResultDTO>> searchHouse(@RequestBody IcHouseListFormDTO formDTO, @LoginUser TokenDto loginUser) {
log.debug("xxx");
String keyword = formDTO.getKeyword();
if (StringUtils.isBlank(keyword)) {
return new Result<PageData<IcHouseListResultDTO>>().ok(new PageData<>(new ArrayList<>(), NumConstant.ZERO));

3
epmet-module/gov-org/gov-org-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/gov-org"/>

3
epmet-module/gov-project/gov-project-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/gov-project"/>

3
epmet-module/gov-voice/gov-voice-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/gov-voice"/>

3
epmet-module/open-data-worker/open-data-worker-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/open-data"/>

3
epmet-module/oper-access/oper-access-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/oper-access"/>

3
epmet-module/oper-crm/oper-crm-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/oper-crm"/>

3
epmet-module/oper-customize/oper-customize-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/oper-customize"/>

3
epmet-module/resi-group/resi-group-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/resi-group"/>

3
epmet-module/resi-guide/resi-guide-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/resi-guide"/>

3
epmet-module/resi-hall/resi-hall-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/resi-hall"/>

3
epmet-module/resi-home/resi-home-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/resi-home"/>

3
epmet-module/resi-mine/resi-mine-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/resi-mine"/>

3
epmet-module/resi-partymember/resi-partymember-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/resi-partymember"/>

3
epmet-module/resi-voice/resi-voice-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/resi-voice"/>

3
epmet-openapi/epmet-openapi-scan/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/epmet/openapi/scan"/>

3
epmet-user/epmet-user-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/epmetuser"/>

Loading…
Cancel
Save