Merge branch 'master' into dev

src/main/java/com/tanpu/feo/feojob/jobs/OrgSyncByWxcpJob.java

@@ -69,7 +69,7 @@ public class OrgSyncByWxcpJob {
     @Resource
     private FeignClientForFatools feignClientForFatools;
 
-    @Scheduled(cron = "0 30 6-19/1 * * ?")   //每日凌晨6点30开始执行
+    @Scheduled(cron = "10 0/30 6-19/1 * * ?")   //每日凌晨6点30开始执行，半小时检查一次
     public void execute() {
         log.info("====== 开始执行OrgSyncByWxcpJob ======");
         try {

src/main/resources/bootstrap.yml

+spring:
+  application:
+    name: feo-jobs
\ No newline at end of file

src/main/resources/logback.xml

 <?xml version="1.0" encoding="UTF-8"?>
+
 <configuration scan="true" scanPeriod="15 seconds">
+    <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
 
     <property name="LOG_PATH" value="/data/logs"/>
     <property name="LOG_FILE" value="app"/>
 
+    <property name="CONSOLE_LOG_PATTERN"
+              value="%clr(%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) [uid:%X{X-UserID:- }] %clr(${PID:- }){magenta} %clr(-){faint} %clr([%t]){faint} %clr(%logger{40}:%line %M){cyan}%clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}"/>
+    <property name="CONSOLE_LOG_CHARSET" value="${CONSOLE_LOG_CHARSET:-UTF-8}"/>
+    <property name="FILE_LOG_PATTERN"
+              value="%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} ${LOG_LEVEL_PATTERN:-%5p} [uid:%X{X-UserID:- }] ${PID:- } - [%t] %logger{40}:%line %M:%m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+    <property name="FILE_LOG_CHARSET" value="${FILE_LOG_CHARSET:-UTF-8}"/>
+
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{500}:%line - %msg%n</pattern>
+            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
+            <charset>${CONSOLE_LOG_CHARSET}</charset>
         </encoder>
     </appender>
 
     <!-- info日志记录器，日期滚动记录 -->
     <appender name="file" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%line - %msg%n</pattern>
+            <pattern>${FILE_LOG_PATTERN}</pattern>
+            <charset>${CONSOLE_LOG_CHARSET}</charset>
         </encoder>
         <append>true</append>
         <file>${LOG_PATH}/${LOG_FILE}.log</file>
@@ -29,8 +40,10 @@
     <!-- ERROR日志记录器，日期滚动记录 -->
     <appender name="errorFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%line - %msg%n</pattern>
+            <pattern>${FILE_LOG_PATTERN}</pattern>
+            <charset>${CONSOLE_LOG_CHARSET}</charset>
         </encoder>
+
         <append>true</append>
 
         <file>${LOG_PATH}/error.log</file>