From 6cb932dca079e7f905b518b129a1db6428b6fa38 Mon Sep 17 00:00:00 2001
From: 3y <zhongfucheng_123@163.com>
Date: Sat, 29 Jan 2022 21:42:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E4=B9=89=E4=B8=8A=E4=BC=A0=E4=BA=BA?=
 =?UTF-8?q?=E7=BE=A4=E6=96=87=E4=BB=B6=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/MessageTemplateController.java | 14 ++++++++++-
 .../austin/controller/XxlJobController.java   | 24 -------------------
 2 files changed, 13 insertions(+), 25 deletions(-)
 delete mode 100644 austin-web/src/main/java/com/java3y/austin/controller/XxlJobController.java

diff --git a/austin-web/src/main/java/com/java3y/austin/controller/MessageTemplateController.java b/austin-web/src/main/java/com/java3y/austin/controller/MessageTemplateController.java
index 8d5ef98..5875871 100644
--- a/austin-web/src/main/java/com/java3y/austin/controller/MessageTemplateController.java
+++ b/austin-web/src/main/java/com/java3y/austin/controller/MessageTemplateController.java
@@ -18,6 +18,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.Arrays;
 import java.util.List;
@@ -132,11 +133,22 @@ public class MessageTemplateController {
         return messageTemplateService.startCronTask(id);
     }
     /**
-     * 启动模板的定时任务
+     * 暂停模板的定时任务
      */
     @PostMapping("stop/{id}")
     @ApiOperation("/暂停模板的定时任务")
     public BasicResultVO stop(@RequestBody @PathVariable("id") Long id) {
         return messageTemplateService.stopCronTask(id);
     }
+
+    /**
+     * 上传人群文件
+     */
+    @PostMapping("upload")
+    @ApiOperation("/上传人群文件")
+    public BasicResultVO upload(@RequestParam("file") MultipartFile file) {
+        return BasicResultVO.success();
+    }
+
+
 }
diff --git a/austin-web/src/main/java/com/java3y/austin/controller/XxlJobController.java b/austin-web/src/main/java/com/java3y/austin/controller/XxlJobController.java
deleted file mode 100644
index 97200d7..0000000
--- a/austin-web/src/main/java/com/java3y/austin/controller/XxlJobController.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.java3y.austin.controller;
-
-
-import com.java3y.austin.service.CronTaskService;
-import io.swagger.annotations.Api;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@Api(tags = {"定时任务接口"})
-@RestController
-public class XxlJobController {
-
-    @Autowired
-    private CronTaskService cronTaskService;
-
-
-    @RequestMapping("/xxl/add/task")
-    public Integer addTask() {
-
-       // return taskService.saveTask();
-        return null;
-    }
-}