!9 update

Merge pull request !9 from 邹旋/zouxuan

mec-auth/mec-auth-server/src/main/resources/application.yml

@@ -39,17 +39,17 @@ spring:
     database: 0
     #连接超时时间（毫秒）
     timeout: 10000
-    pool:
-      #连接池最大连接数（使用负值表示没有限制）
-      max-active: 10
-      #连接池最大阻塞等待时间（使用负值表示没有限制）
-      max-wait: -1
-      #连接池中的最大空闲连接
-      max-idle: 10
-      #连接池中的最小空闲连接
-      min-idle: 0
-      
-         
+    jedis:
+      pool:
+        #连接池最大连接数（使用负值表示没有限制）
+        max-active: 10
+        #连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-wait: -1
+        #连接池中的最大空闲连接
+        max-idle: 10
+        #连接池中的最小空闲连接
+        min-idle: 0
+
 mybatis:
     mapperLocations: classpath:config/mybatis/*.xml
     
@@ -64,29 +64,4 @@ management:
         include: "*"
   endpoint:
     health:
-      show-details: ALWAYS
-
-
-
-system:
-  #客户端配置
-  client:
-    clients[0]:
-      clientId: lvhaibao
-      clientSecret: 123456
-    clients[1]:
-      clientId: lhb
-      clientSecret: 123456
-    clients[2]:
-      clientId: app
-      clientSecret: app
-  social:
-    qq:
-      app-id: xxxx
-      app-secret: xxxx
-      providerId: callback.do
-
-    filterProcessesUrl: /qqLogin
-    weixin:
-      app-id: xxxx
-      app-secret: xxxxx
+      show-details: ALWAYS

mec-task/pom.xml

@@ -24,15 +24,10 @@
 			<artifactId>mec-common</artifactId>
 		</dependency>
 
-		<dependency>
+		<!--<dependency>
 			<groupId>org.quartz-scheduler</groupId>
 			<artifactId>quartz</artifactId>
-		</dependency>
-		
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
-		</dependency>
+		</dependency>-->
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -58,9 +53,16 @@
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-quartz</artifactId>
+		</dependency>
 		
 	</dependencies>
-	
 	<build>
 		<plugins>
 			<plugin>

mec-task/src/main/java/com/ym/mec/task/core/TaskSchedulerBootstrap.java

@@ -17,6 +17,7 @@ import org.springframework.core.io.Resource;
 
 import com.ym.mec.task.dal.model.Task;
 import com.ym.mec.task.service.TaskService;
+import org.springframework.scheduling.quartz.SchedulerFactoryBean;
 
 @Configuration
 public class TaskSchedulerBootstrap implements InitializingBean {
@@ -32,31 +33,35 @@ public class TaskSchedulerBootstrap implements InitializingBean {
 	@Autowired
 	private LocalJobFactory jobFactory;
 
-	@Value("${task.configLocation}")
-	private Resource configLocation;
-
-	@Value("${task.autoStartup}")
-	private boolean autoStartup;
+	@Autowired
+	private SchedulerFactoryBean schedulerFactoryBean;
 
-	@Value("${task.startupDelay}")
-	private int startupDelay;
+//	@Value("${task.configLocation}")
+//	private Resource configLocation;
+//
+//	@Value("${task.autoStartup}")
+//	private boolean autoStartup;
+//
+//	@Value("${task.startupDelay}")
+//	private int startupDelay;
 
 	@Bean
 	@Primary
 	public Scheduler getScheduler() throws Exception {
-		LocalSchedulerFactoryBean factoryBean = new LocalSchedulerFactoryBean();
-
-		factoryBean.setDataSource(dataSource);
-		factoryBean.setOverwriteExistingJobs(true);
-		factoryBean.setConfigLocation(configLocation);
-		factoryBean.setJobFactory(jobFactory);
-		factoryBean.setWaitForJobsToCompleteOnShutdown(true);
-		factoryBean.setStartupDelay(startupDelay);
-		factoryBean.setAutoStartup(autoStartup);
-
-		factoryBean.afterPropertiesSet();
-
-		return factoryBean.getObject();
+		return schedulerFactoryBean.getScheduler();
+//		LocalSchedulerFactoryBean factoryBean = new LocalSchedulerFactoryBean();
+//
+//		factoryBean.setDataSource(dataSource);
+//		factoryBean.setOverwriteExistingJobs(true);
+//		factoryBean.setConfigLocation(configLocation);
+//		factoryBean.setJobFactory(jobFactory);
+//		factoryBean.setWaitForJobsToCompleteOnShutdown(true);
+//		factoryBean.setStartupDelay(startupDelay);
+//		factoryBean.setAutoStartup(autoStartup);
+//
+//		factoryBean.afterPropertiesSet();
+//
+//		return factoryBean.getObject();
 	}
 
 	@SuppressWarnings("unchecked")
@@ -77,9 +82,9 @@ public class TaskSchedulerBootstrap implements InitializingBean {
 			if (BaseTask.class.isAssignableFrom(clazz)) {
 				QuartzHelper.addJob(scheduler, task.getName(), task.getGroup(), task.getName(), task.getGroup(),
 						(Class<? extends BaseTask>) Class.forName(task.getJobClass()), task.getTimeExp());
-				LOGGER.info("Successed add job[{}.{}] to Schedule", task.getGroup(), task.getName());
+				LOGGER.info("Successed add jobs[{}.{}] to Schedule", task.getGroup(), task.getName());
 			} else {
-				LOGGER.warn("Failed add job[{}.{}],because class[{}] not implements com.yqh.p2p.task.BaseTask", task.getGroup(), task.getName(),
+				LOGGER.warn("Failed add jobs[{}.{}],because class[{}] not implements com.yqh.p2p.task.BaseTask", task.getGroup(), task.getName(),
 						task.getJobClass());
 			}
 		}

mec-task/src/main/java/com/ym/mec/task/jobs/QueryPayStatusTask.java

@@ -0,0 +1,20 @@
+package com.ym.mec.task.jobs;
+
+import com.ym.mec.task.core.BaseTask;
+import com.ym.mec.task.core.TaskException;
+import org.springframework.stereotype.Service;
+
+/**
+ * 手动查询订单支付状态
+ */
+@Service
+public class QueryPayStatusTask extends BaseTask {
+
+	@Override
+	public void execute() throws TaskException {
+		// TODO Auto-generated method stub
+		System.out.println("打印一句话就可以了！");
+
+	}
+
+}

mec-task/src/main/resources/application.yml

@@ -9,10 +9,10 @@ eureka:
 spring:
   application:
     name: task-server
-    
+
   datasource:
     name: test
-    url: jdbc:mysql://120.26.238.168:3306/mec_dev?useUnicode=true&characterEncoding=UTF8
+    url: jdbc:mysql://47.99.212.176:3306/mec_dev?useUnicode=true&characterEncoding=UTF8
     username: mec_dev
     password: mec_dev
     # 使用druid数据源
@@ -31,14 +31,14 @@ spring:
     testOnReturn: false
     poolPreparedStatements: true
     maxOpenPreparedStatements: 20
-    
+
 mybatis:
     mapperLocations: classpath:config/mybatis/*.xml
     
-task:
-  configLocation: classpath:config/properties/quartz.properties
-  autoStartup: true
-  startupDelay: 30
+#task:
+  #configLocation: classpath:config/properties/quartz.properties
+  #autoStartup: true
+  #startupDelay: 30
   
       
 security:
@@ -48,4 +48,6 @@ security:
       client-secret: app
     resource:
       token-info-uri: http://localhost:8001/oauth/check_token
-      
+      
+swagger:
+  base-package: com.ym.mec.task.controller