Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud

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);
     }
 

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:

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}
             <if test="null != startDate and '' != startDate">
-                AND DATE_FORMAT(CREATED_TIME,"%Y%m%d") <![CDATA[ >= ]]> #{startDate}
+                AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") <![CDATA[ >= ]]> #{startDate}
             </if>
             <if test="null != endDate and '' != endDate">
-                AND DATE_FORMAT(CREATED_TIME,"%Y%m%d") <![CDATA[ <= ]]> #{endDate}
+                AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") <![CDATA[ <= ]]> #{endDate}
             </if>
         GROUP BY
             GRID_ID
@@ -450,10 +450,10 @@
             AND GRID_ID IS NOT NULL
             AND GRID_ID != ''
             <if test="null != startDate and '' != startDate">
-                AND DATE_FORMAT(CREATED_TIME,"%Y%m%d") <![CDATA[ >= ]]> #{startDate}
+                AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") <![CDATA[ >= ]]> #{startDate}
             </if>
             <if test="null != endDate and '' != endDate">
-                AND DATE_FORMAT(CREATED_TIME,"%Y%m%d") <![CDATA[ <= ]]> #{endDate}
+                AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") <![CDATA[ <= ]]> #{endDate}
             </if>
         GROUP BY
             GRID_ID
@@ -471,10 +471,10 @@
                 AND GRID_ID = #{orgId}
             </if>
             <if test="null != startDate and '' != startDate">
-                AND DATE_FORMAT(CREATED_TIME,"%Y%m%d") <![CDATA[ >= ]]> #{startDate}
+                AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") <![CDATA[ >= ]]> #{startDate}
             </if>
             <if test="null != endDate and '' != endDate">
-                AND DATE_FORMAT(CREATED_TIME,"%Y%m%d") <![CDATA[ <= ]]> #{endDate}
+                AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") <![CDATA[ <= ]]> #{endDate}
             </if>
         GROUP BY
             CREATED_BY
@@ -493,10 +493,10 @@
                 AND GRID_ID = #{orgId}
             </if>
             <if test="null != startDate and '' != startDate">
-                AND DATE_FORMAT(CREATED_TIME,"%Y%m%d") <![CDATA[ >= ]]> #{startDate}
+                AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") <![CDATA[ >= ]]> #{startDate}
             </if>
             <if test="null != endDate and '' != endDate">
-                AND DATE_FORMAT(CREATED_TIME,"%Y%m%d") <![CDATA[ <= ]]> #{endDate}
+                AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") <![CDATA[ <= ]]> #{endDate}
             </if>
         GROUP BY
             STAFF_ID
@@ -511,10 +511,10 @@
             DEL_FLAG = '0'
             AND (AGENCY_ID = #{agencyId} OR ORG_ID_PATH LIKE CONCAT('%', #{agencyId}, '%'))
             <if test="null != startDate and '' != startDate">
-                AND DATE_FORMAT(CREATED_TIME,"%Y%m%d") <![CDATA[ >= ]]> #{startDate}
+                AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") <![CDATA[ >= ]]> #{startDate}
             </if>
             <if test="null != endDate and '' != endDate">
-                AND DATE_FORMAT(CREATED_TIME,"%Y%m%d") <![CDATA[ <= ]]> #{endDate}
+                AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") <![CDATA[ <= ]]> #{endDate}
             </if>
         GROUP BY
             AGENCY_ID
@@ -530,10 +530,10 @@
             AND (AGENCY_ID = #{agencyId} OR ORG_ID_PATH LIKE CONCAT('%', #{agencyId}, '%'))
             AND OPERATION = 'close'
             <if test="null != startDate and '' != startDate">
-                AND DATE_FORMAT(CREATED_TIME,"%Y%m%d") <![CDATA[ >= ]]> #{startDate}
+                AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") <![CDATA[ >= ]]> #{startDate}
             </if>
             <if test="null != endDate and '' != endDate">
-                AND DATE_FORMAT(CREATED_TIME,"%Y%m%d") <![CDATA[ <= ]]> #{endDate}
+                AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") <![CDATA[ <= ]]> #{endDate}
             </if>
         GROUP BY
             AGENCY_ID

epmet-module/data-statistical/data-statistical-server/pom.xml

@@ -444,7 +444,7 @@
                 <dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd</dingTalk.robot.secret>
 
                 <!--rocketmq-->
-                <rocketmq.enable>local</rocketmq.enable>
+                <rocketmq.enable>false</rocketmq.enable>
                 <rocketmq.nameserver>192.168.1.140:9876;192.168.1.141:9876</rocketmq.nameserver>
             </properties>
         </profile>

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);
     }
 }

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

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);
     }
 

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:

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

@@ -138,11 +138,35 @@
         </filter>
     </appender>
 
+    <!--  rocketmq client 的日志appender  -->
+    <appender name="RocketmqClientAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/rocketmqclient.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%X{Transaction-Serial}] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/rocketmqclient-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+    </appender>
+
     <!-- 开发、测试环境 -->
     <springProfile name="local,dev,test">
         <logger name="org.springframework.web" level="INFO"/>
         <logger name="org.springboot.sample" level="INFO"/>
         <logger name="com.epmet.dao" level="DEBUG"/>
+        <!-- 只打印rocketmq client的日志 -->
+        <logger name="RocketmqClient" level="INFO" additivity="false">
+            <appender-ref ref="RocketmqClientAppender"/>
+        </logger>
         <root level="INFO">
             <appender-ref ref="DEBUG_FILE"/>
             <appender-ref ref="INFO_FILE"/>
@@ -156,6 +180,10 @@
         <logger name="org.springframework.web" level="INFO"/>
         <logger name="org.springboot.sample" level="INFO"/>
         <logger name="com.epmet.dao" level="INFO"/>
+        <!-- 只打印rocketmq client的日志 -->
+        <logger name="RocketmqClient" level="INFO" additivity="false">
+            <appender-ref ref="RocketmqClientAppender"/>
+        </logger>
         <root level="INFO">
             <appender-ref ref="CONSOLE"/>
             <appender-ref ref="DEBUG_FILE"/>

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);
     }
 

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

@@ -139,12 +139,36 @@
         </filter>
     </appender>
 
+    <!--  rocketmq client 的日志appender  -->
+    <appender name="RocketmqClientAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/rocketmqclient.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%X{Transaction-Serial}] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/rocketmqclient-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+    </appender>
+
     <!-- 开发、测试环境 -->
     <springProfile name="dev,test,local">
         <logger name="org.springframework.web" level="INFO"/>
         <logger name="org.springboot.sample" level="INFO"/>
         <logger name="com.epmet.dao" level="INFO"/>
         <logger name="com.epmet.dao" level="DEBUG"/>
+        <!-- 只打印rocketmq client的日志 -->
+        <logger name="RocketmqClient" level="INFO" additivity="false">
+            <appender-ref ref="RocketmqClientAppender"/>
+        </logger>
         <root level="INFO">
             <appender-ref ref="DEBUG_FILE"/>
             <appender-ref ref="INFO_FILE"/>
@@ -158,6 +182,10 @@
         <logger name="org.springframework.web" level="INFO"/>
         <logger name="org.springboot.sample" level="INFO"/>
         <logger name="com.epmet.dao" level="INFO"/>
+        <!-- 只打印rocketmq client的日志 -->
+        <logger name="RocketmqClient" level="INFO" additivity="false">
+            <appender-ref ref="RocketmqClientAppender"/>
+        </logger>
         <root level="INFO">
             <appender-ref ref="CONSOLE"/>
             <appender-ref ref="DEBUG_FILE"/>

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);
     }
 

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@
+  name-server: @rocketmq.nameserver@
-  client:
-    logUseSlf4j: true

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);
 	}
 }

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:
   # 线程池配置

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);
     }
 

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
 

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);
     }
 }

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:
   # 线程池配置

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);
     }
 

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:

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);
     }
 }

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

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);
     }
 

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@
+  name-server: @rocketmq.nameserver@
-  client:
-    logUseSlf4j: true

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

@@ -139,12 +139,36 @@
         </filter>
     </appender>
 
+    <!--  rocketmq client 的日志appender  -->
+    <appender name="RocketmqClientAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/rocketmqclient.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%X{Transaction-Serial}] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/rocketmqclient-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+    </appender>
+
     <!-- 开发、测试环境 -->
     <springProfile name="dev,test">
         <logger name="org.springframework.web" level="INFO"/>
         <logger name="org.springboot.sample" level="INFO"/>
         <logger name="com.epmet.modules.partymember.dao" level="DEBUG"/>
         <logger name="com.epmet.modules.warmhearted.dao" level="DEBUG"/>
+        <!-- 只打印rocketmq client的日志 -->
+        <logger name="RocketmqClient" level="INFO" additivity="false">
+            <appender-ref ref="RocketmqClientAppender"/>
+        </logger>
         <root level="INFO">
             <appender-ref ref="DEBUG_FILE"/>
             <appender-ref ref="INFO_FILE"/>
@@ -159,6 +183,10 @@
         <logger name="org.springboot.sample" level="INFO"/>
         <logger name="com.epmet.modules.partymember.dao" level="INFO"/>
         <logger name="com.epmet.modules.warmhearted.dao" level="INFO"/>
+        <!-- 只打印rocketmq client的日志 -->
+        <logger name="RocketmqClient" level="INFO" additivity="false">
+            <appender-ref ref="RocketmqClientAppender"/>
+        </logger>
         <root level="INFO">
             <appender-ref ref="CONSOLE"/>
             <appender-ref ref="DEBUG_FILE"/>

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);
     }
 

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<CustomerStaffDao,
 
         //2.查询工作人员中拥有网格长网格员角色的人员列表
         List<GridMobileListResultDTO.Role> staffRoleList = staffRoleDao.staffRoleList(gridStaffs.getData());
-
+        if(CollectionUtils.isEmpty(staffRoleList)){
+            return resultList;
+        }
         //3.查询工作人员基础信息
         List<String> staffIdList = staffRoleList.stream().map(GridMobileListResultDTO.Role::getStaffId).collect(Collectors.toList());
         staffIdList = staffIdList.stream().distinct().collect(Collectors.toList());
-        List<StaffListResultDTO> list = baseDao.selectStaffByIds(staffIdList, Constant.ENABLE);
+        List<StaffListResultDTO> list = CollectionUtils.isEmpty(staffIdList) ? new ArrayList<>() : baseDao.selectStaffByIds(staffIdList, Constant.ENABLE);
 
         //4.封装数据并返回
         resultList = ConvertUtils.sourceToTarget(list, GridMobileListResultDTO.class);

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:

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

@@ -139,11 +139,35 @@
         </filter>
     </appender>
 
+    <!--  rocketmq client 的日志appender  -->
+    <appender name="RocketmqClientAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/rocketmqclient.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%X{Transaction-Serial}] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/rocketmqclient-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+    </appender>
+
     <!-- 开发、测试环境 -->
     <springProfile name="local,dev,test">
         <logger name="org.springframework.web" level="INFO"/>
         <logger name="org.springboot.sample" level="INFO"/>
         <logger name="com.epmet.dao" level="DEBUG"/>
+        <!-- 只打印rocketmq client的日志 -->
+        <logger name="RocketmqClient" level="INFO" additivity="false">
+            <appender-ref ref="RocketmqClientAppender"/>
+        </logger>
         <root level="INFO">
             <appender-ref ref="DEBUG_FILE"/>
             <appender-ref ref="INFO_FILE"/>
@@ -157,6 +181,10 @@
         <logger name="org.springframework.web" level="INFO"/>
         <logger name="org.springboot.sample" level="INFO"/>
         <logger name="com.epmet.dao" level="INFO"/>
+        <!-- 只打印rocketmq client的日志 -->
+        <logger name="RocketmqClient" level="INFO" additivity="false">
+            <appender-ref ref="RocketmqClientAppender"/>
+        </logger>
         <root level="INFO">
             <appender-ref ref="CONSOLE"/>
             <appender-ref ref="DEBUG_FILE"/>