Merge branch 'gray' into test6.8.6

@@ -268,15 +268,15 @@ public class TradeBillsServiceImpl implements ITradeBillsService {
 					return getMobileByUid(uid);
 				}
 			});
-		}catch (ExecutionException e){
-			LOGGER.error("TradeBillsServiceImpl  getMobileByUidFromCache  error uid is{}", uid);
+		}catch (Exception e){
+			LOGGER.error("TradeBillsServiceImpl  getMobileByUidFromCache  error uid is {}", uid);
 			//throw new RuntimeException(e);
 			return "";
 		}
 	}
 
 	private String getMobileByUid(Integer uid) {
-		LOGGER.info("TradeBillsServiceImpl call getMobileByUid uid is{}", uid);
+		LOGGER.info("TradeBillsServiceImpl call getMobileByUid uid is {}", uid);
 		Map<String,Integer> request = Collections.singletonMap("uid", uid);
 		JSONObject jsonObject = serviceCaller.get("uic.getProfileAction", "http://" + uicServerIpAndPort + UIC_GETPROFILE_URL, request, JSONObject.class, null).get(1);
 

@@ -20,7 +20,7 @@ import com.yoho.ufo.service.IChannelSkuCompareService;
  */
 @Service(value="scheduledUpdateSuggestPrice")
 @YhJobDef(desc = "定时变参考价", jobName = "scheduledUpdateSuggestPrice", cron = "0 0/15 * * * ?", misfiredPolicy = MisfiredPolicy.CRON_DO_NOTHING,
-jobType = JobType.CRON, jobGroup = "ufoPlatform", needUpdate=true)
+jobType = JobType.CRON, jobGroup = "ufoPlatform")
 public class ScheduledUpdateSuggestPrice implements YhJob{
 	private static final Logger LOGGER = LoggerFactory.getLogger("scheduledLog");
 	

@@ -81,21 +81,27 @@
             <pattern>%-1relative - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{0}:%line -- %msg%n</pattern>
         </encoder>
     </appender>
-    
-        <!-- 定时任务日志 appender -->
+
+    <!-- 定时任务日志 appender -->
     <appender name="SCHEDULED_LOG" class="ch.qos.logback.core.rolling.RollingFileAppender">
-         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">  
-            <!-- 按天回滚 daily -->  
-            <fileNamePattern>${catalina.home}/logs/%d{yyyy-MM-dd}/scheduled-log.log</fileNamePattern>
-            <!-- 日志最大的历史 60天 -->  
+        <file>${yoho.logs.basedir}/${ufo.platform.env.namespace}/scheduled-log.log</file>
+        <!-- 过滤器，过滤掉 TRACE 和 DEBUG 和 INFO 级别的日志 -->
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>INFO</level>
+        </filter>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- daily rollover -->
+            <fileNamePattern>${yoho.logs.basedir}/${ufo.platform.env.namespace}/archived/scheduled.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <!-- or whenever the file size reaches 100MB -->
+                <maxFileSize>${yoho.logs.maxFileSize}</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!-- keep 30 days' worth of history -->
             <maxHistory>${yoho.logs.maxHistory}</maxHistory>
-        </rollingPolicy>  
-		<triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-            <maxFileSize>${yoho.logs.maxFileSize}</maxFileSize>
-        </triggeringPolicy>
-        <encoder>  
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger:%line - %msg%n</pattern>  
-        </encoder>  
+        </rollingPolicy>
+        <encoder>
+            <pattern>%-1relative - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{0}:%line -- %msg%n</pattern>
+        </encoder>
     </appender>
 
     <!-- MQ日志 appender -->