diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/AdminApplication.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/AdminApplication.java index 4678542a56..67c7a22169 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/AdminApplication.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/AdminApplication.java @@ -27,6 +27,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients; public class AdminApplication { public static void main(String[] args) { + System.setProperty("rocketmq.client.logUseSlf4j", "true"); SpringApplication.run(AdminApplication.class, args); } diff --git a/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml b/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml index c6a439be3c..80503e260f 100644 --- a/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml +++ b/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml @@ -140,8 +140,7 @@ shutdown: rocketmq: enable: @rocketmq.enable@ name-server: @rocketmq.nameserver@ - client: - logUseSlf4j: true + thread: # 线程池配置 threadPool: diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml index 5771dfad79..1b159cb69d 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml @@ -429,10 +429,10 @@ DEL_FLAG = '0' AND AGENCY_ID = #{agencyId} - AND DATE_FORMAT(CREATED_TIME,"%Y%m%d") = ]]> #{startDate} + AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") = ]]> #{startDate} - AND DATE_FORMAT(CREATED_TIME,"%Y%m%d") #{endDate} + AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") #{endDate} GROUP BY GRID_ID @@ -450,10 +450,10 @@ AND GRID_ID IS NOT NULL AND GRID_ID != '' - AND DATE_FORMAT(CREATED_TIME,"%Y%m%d") = ]]> #{startDate} + AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") = ]]> #{startDate} - AND DATE_FORMAT(CREATED_TIME,"%Y%m%d") #{endDate} + AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") #{endDate} GROUP BY GRID_ID @@ -471,10 +471,10 @@ AND GRID_ID = #{orgId} - AND DATE_FORMAT(CREATED_TIME,"%Y%m%d") = ]]> #{startDate} + AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") = ]]> #{startDate} - AND DATE_FORMAT(CREATED_TIME,"%Y%m%d") #{endDate} + AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") #{endDate} GROUP BY CREATED_BY @@ -493,10 +493,10 @@ AND GRID_ID = #{orgId} - AND DATE_FORMAT(CREATED_TIME,"%Y%m%d") = ]]> #{startDate} + AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") = ]]> #{startDate} - AND DATE_FORMAT(CREATED_TIME,"%Y%m%d") #{endDate} + AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") #{endDate} GROUP BY STAFF_ID @@ -511,10 +511,10 @@ DEL_FLAG = '0' AND (AGENCY_ID = #{agencyId} OR ORG_ID_PATH LIKE CONCAT('%', #{agencyId}, '%')) - AND DATE_FORMAT(CREATED_TIME,"%Y%m%d") = ]]> #{startDate} + AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") = ]]> #{startDate} - AND DATE_FORMAT(CREATED_TIME,"%Y%m%d") #{endDate} + AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") #{endDate} GROUP BY AGENCY_ID @@ -530,10 +530,10 @@ AND (AGENCY_ID = #{agencyId} OR ORG_ID_PATH LIKE CONCAT('%', #{agencyId}, '%')) AND OPERATION = 'close' - AND DATE_FORMAT(CREATED_TIME,"%Y%m%d") = ]]> #{startDate} + AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") = ]]> #{startDate} - AND DATE_FORMAT(CREATED_TIME,"%Y%m%d") #{endDate} + AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") #{endDate} GROUP BY AGENCY_ID diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 98bb995c7e..b04561cd9a 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -444,7 +444,7 @@ SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd - local + false 192.168.1.140:9876;192.168.1.141:9876 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/DataStatsApplication.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/DataStatsApplication.java index 15bb6ee2a6..37be951be3 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/DataStatsApplication.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/DataStatsApplication.java @@ -16,6 +16,8 @@ import org.springframework.scheduling.annotation.EnableAsync; public class DataStatsApplication { public static void main(String[] args) { + // 让rocketmq使用slf4j管理日志 + System.setProperty("rocketmq.client.logUseSlf4j", "true"); SpringApplication.run(DataStatsApplication.class ,args); } } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml index 0fdb1169d4..ed65817966 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml @@ -226,5 +226,4 @@ shutdown: rocketmq: enable: @rocketmq.enable@ name-server: @rocketmq.nameserver@ - client: - logUseSlf4j: true + diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/EpmetHeartApplication.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/EpmetHeartApplication.java index 236d81d8d9..caec050a5f 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/EpmetHeartApplication.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/EpmetHeartApplication.java @@ -29,6 +29,8 @@ import org.springframework.scheduling.annotation.EnableAsync; public class EpmetHeartApplication { public static void main(String[] args) { + // 让rocketmq使用slf4j管理日志 + System.setProperty("rocketmq.client.logUseSlf4j", "true"); SpringApplication.run(EpmetHeartApplication.class, args); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml index 124d7b778b..352a8283aa 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml @@ -151,8 +151,7 @@ rocketmq: # 是否开启mq enable: @rocketmq.enable@ name-server: @rocketmq.nameserver@ - client: - logUseSlf4j: true + # 停机选项 shutdown: graceful: diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/logback-spring.xml index d0428fcee3..b03ee98c4c 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/logback-spring.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/logback-spring.xml @@ -138,11 +138,35 @@ + + + + ${log.path}/rocketmqclient.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%X{Transaction-Serial}] %-5level %logger{50} - %msg%n + UTF-8 + + + + ${log.path}/rocketmqclient-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + + + + @@ -156,6 +180,10 @@ + + + + diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/MessageApplication.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/MessageApplication.java index 5a2a928d7a..120a8d5f7e 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/MessageApplication.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/MessageApplication.java @@ -29,6 +29,7 @@ import org.springframework.scheduling.annotation.EnableAsync; public class MessageApplication { public static void main(String[] args) { + System.setProperty("rocketmq.client.logUseSlf4j", "true"); SpringApplication.run(MessageApplication.class, args); } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/logback-spring.xml index 6b34183b22..338e0b9495 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/logback-spring.xml +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/logback-spring.xml @@ -139,12 +139,36 @@ + + + + ${log.path}/rocketmqclient.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%X{Transaction-Serial}] %-5level %logger{50} - %msg%n + UTF-8 + + + + ${log.path}/rocketmqclient-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + + + + @@ -158,6 +182,10 @@ + + + + diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/EpmetPointApplication.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/EpmetPointApplication.java index 7315813d90..47a7df815a 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/EpmetPointApplication.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/EpmetPointApplication.java @@ -20,6 +20,7 @@ import org.springframework.scheduling.annotation.EnableAsync; @EnableAsync public class EpmetPointApplication { public static void main(String[] args) { + System.setProperty("rocketmq.client.logUseSlf4j", "true"); SpringApplication.run(EpmetPointApplication.class, args); } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml index 4c7bbe3542..b3fa3f8fe9 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml @@ -147,6 +147,4 @@ shutdown: rocketmq: enable: @rocketmq.enable@ - name-server: @rocketmq.nameserver@ - client: - logUseSlf4j: true \ No newline at end of file + name-server: @rocketmq.nameserver@ \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/GovIssueApplication.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/GovIssueApplication.java index fd9e212221..2f660d47ba 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/GovIssueApplication.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/GovIssueApplication.java @@ -17,6 +17,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients; @ServletComponentScan(basePackages = "com.epmet") public class GovIssueApplication { public static void main(String[] args) { + System.setProperty("rocketmq.client.logUseSlf4j", "true"); SpringApplication.run(GovIssueApplication.class, args); } } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml index 940a51c056..06332fbf9b 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml @@ -142,8 +142,7 @@ shutdown: rocketmq: enable: @rocketmq.enable@ name-server: @rocketmq.nameserver@ - client: - logUseSlf4j: true + thread: # 线程池配置 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/GovOrgApplication.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/GovOrgApplication.java index 3dda2f6217..8fdce3f561 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/GovOrgApplication.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/GovOrgApplication.java @@ -29,6 +29,7 @@ import org.springframework.scheduling.annotation.EnableAsync; public class GovOrgApplication { public static void main(String[] args) { + System.setProperty("rocketmq.client.logUseSlf4j", "true"); SpringApplication.run(GovOrgApplication.class, args); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml b/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml index 2dd0a7d172..5a6a066a1b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml @@ -165,8 +165,6 @@ rocketmq: # 是否开启mq enable: @rocketmq.enable@ name-server: @rocketmq.nameserver@ - client: - logUseSlf4j: true # consume-thread-min: 2 # consume-thread-max: 2 diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/OpenDataApplication.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/OpenDataApplication.java index 8332bdca9e..cd3642aca1 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/OpenDataApplication.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/OpenDataApplication.java @@ -22,6 +22,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; //@ComponentScan(value = { "com.epmet" }) public class OpenDataApplication { public static void main(String[] args) { + System.setProperty("rocketmq.client.logUseSlf4j", "true"); SpringApplication.run(OpenDataApplication.class, args); } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml index 397003f631..6118195219 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml @@ -147,8 +147,6 @@ rocketmq: # 是否开启mq enable: @rocketmq.enable@ name-server: @rocketmq.nameserver@ - client: - logUseSlf4j: true thread: # 线程池配置 diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/OperCustomizeApplication.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/OperCustomizeApplication.java index 8b60526acf..f0b206f086 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/OperCustomizeApplication.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/OperCustomizeApplication.java @@ -27,6 +27,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients; public class OperCustomizeApplication { public static void main(String[] args) { + System.setProperty("rocketmq.client.logUseSlf4j", "true"); SpringApplication.run(OperCustomizeApplication.class, args); } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml index 91b9bbfe59..346506fb54 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml @@ -130,8 +130,6 @@ dingTalk: rocketmq: enable: @rocketmq.enable@ name-server: @rocketmq.nameserver@ - client: - logUseSlf4j: true # 停机选项 shutdown: diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/ResiGroupApplication.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/ResiGroupApplication.java index 0e3a138491..278d64b9a6 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/ResiGroupApplication.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/ResiGroupApplication.java @@ -29,6 +29,7 @@ import org.springframework.scheduling.annotation.EnableAsync; public class ResiGroupApplication { public static void main(String[] args) { + System.setProperty("rocketmq.client.logUseSlf4j", "true"); SpringApplication.run(ResiGroupApplication.class, args); } } diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml b/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml index e1e520b3dd..b782d086dc 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml @@ -175,5 +175,3 @@ shutdown: rocketmq: enable: @rocketmq.enable@ name-server: @rocketmq.nameserver@ - client: - logUseSlf4j: true diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/ResiPartyMemberApplication.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/ResiPartyMemberApplication.java index 74e592b898..180e65cfe2 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/ResiPartyMemberApplication.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/ResiPartyMemberApplication.java @@ -29,6 +29,7 @@ import org.springframework.scheduling.annotation.EnableAsync; public class ResiPartyMemberApplication { public static void main(String[] args) { + System.setProperty("rocketmq.client.logUseSlf4j", "true"); SpringApplication.run(ResiPartyMemberApplication.class, args); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml index 7513661df2..751620e91d 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml @@ -147,6 +147,4 @@ thread: # rocketmq rocketmq: enable: @rocketmq.enable@ - name-server: @rocketmq.nameserver@ - client: - logUseSlf4j: true \ No newline at end of file + name-server: @rocketmq.nameserver@ \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/logback-spring.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/logback-spring.xml index 3bbff08587..f4fc5a99ea 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/logback-spring.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/logback-spring.xml @@ -139,12 +139,36 @@ + + + + ${log.path}/rocketmqclient.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%X{Transaction-Serial}] %-5level %logger{50} - %msg%n + UTF-8 + + + + ${log.path}/rocketmqclient-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + + + + @@ -159,6 +183,10 @@ + + + + diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/UserApplication.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/UserApplication.java index 4f9b736afb..5767fb4d33 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/UserApplication.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/UserApplication.java @@ -30,6 +30,7 @@ import org.springframework.scheduling.annotation.EnableAsync; public class UserApplication { public static void main(String[] args) { + System.setProperty("rocketmq.client.logUseSlf4j", "true"); SpringApplication.run(UserApplication.class, args); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index c9c416d63c..77af73c96d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -45,7 +45,6 @@ import com.epmet.dao.StaffRoleDao; import com.epmet.dto.*; import com.epmet.dto.form.*; import com.epmet.dto.result.*; -import com.epmet.dto.result.NewUserRoleResultDTO; import com.epmet.entity.CustomerStaffEntity; import com.epmet.entity.GovStaffRoleEntity; import com.epmet.entity.StaffRoleEntity; @@ -846,11 +845,13 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl staffRoleList = staffRoleDao.staffRoleList(gridStaffs.getData()); - + if(CollectionUtils.isEmpty(staffRoleList)){ + return resultList; + } //3.查询工作人员基础信息 List staffIdList = staffRoleList.stream().map(GridMobileListResultDTO.Role::getStaffId).collect(Collectors.toList()); staffIdList = staffIdList.stream().distinct().collect(Collectors.toList()); - List list = baseDao.selectStaffByIds(staffIdList, Constant.ENABLE); + List list = CollectionUtils.isEmpty(staffIdList) ? new ArrayList<>() : baseDao.selectStaffByIds(staffIdList, Constant.ENABLE); //4.封装数据并返回 resultList = ConvertUtils.sourceToTarget(list, GridMobileListResultDTO.class); diff --git a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml index cfe4da3c8f..a9ec2fcadb 100644 --- a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml +++ b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml @@ -168,8 +168,6 @@ rocketmq: # 是否开启mq enable: @rocketmq.enable@ name-server: @rocketmq.nameserver@ - client: - logUseSlf4j: true # 停机选项 shutdown: diff --git a/epmet-user/epmet-user-server/src/main/resources/logback-spring.xml b/epmet-user/epmet-user-server/src/main/resources/logback-spring.xml index 41f567fccf..899eed6c7a 100644 --- a/epmet-user/epmet-user-server/src/main/resources/logback-spring.xml +++ b/epmet-user/epmet-user-server/src/main/resources/logback-spring.xml @@ -139,11 +139,35 @@ + + + + ${log.path}/rocketmqclient.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%X{Transaction-Serial}] %-5level %logger{50} - %msg%n + UTF-8 + + + + ${log.path}/rocketmqclient-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + + + + @@ -157,6 +181,10 @@ + + + +