修改AQListener数据源获取方式；调整日志输出

search-console/src/main/java/com/uas/search/console/DruidDBConfiguration.java

@@ -67,6 +67,9 @@ public class DruidDBConfiguration {
 	@Value("${spring.datasource.removeAbandoned}")
 	private boolean removeAbandoned;
 
+	@Value("${spring.datasource.removeAbandonedTimeout}")
+	private int removeAbandonedTimeout;
+
 	@Value("${spring.datasource.poolPreparedStatements}")
 	private boolean poolPreparedStatements;
 
@@ -79,9 +82,6 @@ public class DruidDBConfiguration {
 	@Value("${spring.datasource.connectionProperties}")
 	private String connectionProperties;
 
-	@Value("${spring.datasource.removeAbandonedTimeout}")
-	private int removeAbandonedTimeout;
-
 	@Bean("dataSource")
 	@Primary
 	public DataSource dataSource() {
@@ -104,9 +104,9 @@ public class DruidDBConfiguration {
 		datasource.setTestOnBorrow(testOnBorrow);
 		datasource.setTestOnReturn(testOnReturn);
 		datasource.setRemoveAbandoned(removeAbandoned);
+		datasource.setRemoveAbandonedTimeout(removeAbandonedTimeout);
 		datasource.setPoolPreparedStatements(poolPreparedStatements);
 		datasource.setMaxPoolPreparedStatementPerConnectionSize(maxPoolPreparedStatementPerConnectionSize);
-		datasource.setRemoveAbandonedTimeout(removeAbandonedTimeout);
 		try {
 			datasource.setFilters(filters);
 		} catch (SQLException e) {

search-console/src/main/java/com/uas/search/console/jms/AQListener.java

@@ -19,7 +19,6 @@ import org.springframework.stereotype.Service;
 
 import com.alibaba.druid.pool.DruidDataSource;
 import com.alibaba.fastjson.JSONException;
-import com.uas.search.console.core.util.ContextUtils;
 import com.uas.search.console.model.ParsedQueueMessage;
 import com.uas.search.console.service.IndexService;
 import com.uas.search.console.util.SearchConstants;
@@ -43,6 +42,9 @@ public class AQListener {
 	@Autowired
 	private QueueMessageParser queueMessageParser;
 
+	@Autowired
+	private DruidDataSource dataSource;
+
 	// 消息队列的消费者
 	private MessageConsumer consumer;
 
@@ -63,8 +65,6 @@ public class AQListener {
 			return message;
 		}
 
-		DruidDataSource dataSource = ContextUtils.getApplicationContext().getBean("dataSource", DruidDataSource.class);
-
 		try {
 			QueueConnectionFactory queueConnectionFactory = AQjmsFactory.getQueueConnectionFactory(dataSource.getUrl(),
 					new Properties());

search-console/src/main/resources/logback.xml

@@ -5,7 +5,7 @@
 		<File>logs/log.log</File>
 		<encoder>
 			<pattern>
-				%date{yyyy-MM-dd HH:mm:ss} %-5level [%-36.36logger{36}:%method:%3.3line] ---- %msg%n
+				%date{yyyy-MM-dd HH:mm:ss:SSS} [%relative ms] %-5level [%50.50(%logger{36}.%method:%line)] ---- %msg%n
 			</pattern>
 			<charset>UTF-8</charset> <!-- 此处设置字符集 -->
 		</encoder>
@@ -25,7 +25,7 @@
 		<!-- encoder defaults to ch.qos.logback.classic.encoder.PatternLayoutEncoder -->
 		<encoder>
 			<pattern>
-				%date{yyyy-MM-dd HH:mm:ss} %-5level [%-36.36logger{36}:%method:%3.3line] ---- %msg%n
+				%date{yyyy-MM-dd HH:mm:ss:SSS} [%relative ms] %-5level [%50.50(%logger{36}.%method:%line)] ---- %msg%n
 			</pattern>
 			<charset>UTF-8</charset> <!-- 此处设置字符集 -->
 		</encoder>