update:task server

mec-gateway/mec-gateway-web/src/main/resources/application.yml

@@ -22,6 +22,13 @@ zuul:
       #url: http://localhost:8001/
       ##加上下面参数，可将header信息传递至下游
       sensitiveHeaders: 
+    api-task:
+      ### 以 /api-auth/访问转发到会员服务
+      path: /api-task/**
+      serviceId: task-server
+      #url: http://localhost:8001/
+      ##加上下面参数，可将header信息传递至下游
+      sensitiveHeaders: 
   #忽略某个微服务
   ignored-services: eureka-server
   #重试

mec-task/pom.xml

@@ -46,6 +46,12 @@
             <artifactId>druid-spring-boot-starter</artifactId>
              <version>1.1.10</version>
         </dependency>
+        
+		<dependency>
+			<groupId>com.spring4all</groupId>
+			<artifactId>swagger-spring-boot-starter</artifactId>
+			<version>1.9.0.RELEASE</version>
+		</dependency>
 		
 		<dependency>
             <groupId>mysql</groupId>

mec-task/src/main/java/com/ym/mec/task/TaskApplication.java

@@ -0,0 +1,34 @@
+package com.ym.mec.task;
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.client.loadbalancer.LoadBalanced;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.client.RestTemplate;
+
+import com.spring4all.swagger.EnableSwagger2Doc;
+
+@SpringBootApplication
+@EnableDiscoveryClient
+@EnableFeignClients
+@MapperScan("com.ym.mec.task.dal.dao")
+@ComponentScan(basePackages="com.ym.mec")
+@Configuration
+@EnableSwagger2Doc
+public class TaskApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(TaskApplication.class, args);
+	}
+	
+	@Bean
+	@LoadBalanced
+	public RestTemplate restTemplate(){
+		return new RestTemplate();
+	}
+}

mec-task/src/main/java/com/ym/mec/task/controller/TaskController.java

@@ -1,5 +1,9 @@
 package com.ym.mec.task.controller;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -11,6 +15,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -25,6 +30,7 @@ import com.ym.mec.util.collection.MapUtil;
 
 @RestController
 @RequestMapping(value = "task")
+@Api(description = "任务调度")
 public class TaskController extends BaseController {
 
 	private final static Logger LOGGER = LoggerFactory.getLogger(TaskController.class);
@@ -35,7 +41,8 @@ public class TaskController extends BaseController {
 	@Autowired
 	private Scheduler scheduler;
 
-	@GetMapping(value = "list")
+	@ApiOperation("任务列表分页查询")
+	@GetMapping("/list")
 	public HttpResponseResult list(TaskQueryInfo queryInfo) {
 		PageInfo<Task> pageInfo = new PageInfo<Task>(queryInfo.getPage(), queryInfo.getRows());
 		Map<String, Object> params = new HashMap<String, Object>();
@@ -55,8 +62,10 @@ public class TaskController extends BaseController {
 		return succeed(pageInfo);
 	}
 
-	@PostMapping(value = "execute")
-	public HttpResponseResult execute(int taskId) {
+	@ApiOperation("执行当前任务")
+	@ApiImplicitParam(name = "taskId", value = "任务编号", required = true, dataType = "Integer", paramType = "path")
+	@PostMapping("/execute/{taskId}")
+	public HttpResponseResult execute(@PathVariable("taskId") int taskId) {
 		boolean result = false;
 		try {
 			result = taskService.execute(taskId, scheduler);
@@ -67,8 +76,10 @@ public class TaskController extends BaseController {
 		return result ? succeed() : failed();
 	}
 
-	@PostMapping(value = "pause")
-	public HttpResponseResult pause(int taskId) {
+	@ApiOperation("暂停当前任务")
+	@ApiImplicitParam(name = "taskId", value = "任务编号", required = true, dataType = "Integer", paramType = "path")
+	@PostMapping("/pause/{taskId}")
+	public HttpResponseResult pause(@PathVariable("taskId") int taskId) {
 		boolean result = false;
 		try {
 			result = taskService.pause(taskId, scheduler);
@@ -79,8 +90,10 @@ public class TaskController extends BaseController {
 		return result ? succeed() : failed();
 	}
 
-	@PostMapping(value = "resume")
-	public HttpResponseResult resume(int taskId) {
+	@ApiOperation("暂停当前任务")
+	@ApiImplicitParam(name = "taskId", value = "任务编号", required = true, dataType = "Integer", paramType = "path")
+	@PostMapping("/resume/{taskId}")
+	public HttpResponseResult resume(@PathVariable("taskId") int taskId) {
 		boolean result = false;
 		try {
 			result = taskService.resume(taskId, scheduler);

mec-task/src/main/resources/bootstrap.properties

@@ -0,0 +1,16 @@
+#\u6307\u5b9a\u5f00\u53d1\u73af\u5883
+#spring.profiles.active=dev
+#\u670d\u52a1\u5668\u5730\u5740
+spring.cloud.nacos.config.server-addr=localhost:8848
+#\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
+spring.cloud.nacos.config.namespace=40ebb2ed-23ac-4afb-b48f-8d727f332edc
+#\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
+spring.cloud.nacos.config.group=DEFAULT_GROUP
+#\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}
+spring.cloud.nacos.config.prefix=task
+#\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
+spring.cloud.nacos.config.file-extension=yaml
+#\u662f\u5426\u52a8\u6001\u5237\u65b0
+spring.cloud.nacos.config.refresh.enabled=true
+#\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
+spring.cloud.nacos.config.enabled=true