|
@@ -52,6 +52,11 @@ public class TaskController {
|
|
|
@Value("${report.host}")
|
|
|
String reportHost;
|
|
|
|
|
|
+ @Value("${useOss}")
|
|
|
+ boolean useOss;
|
|
|
+ @Value("${urlPath}")
|
|
|
+ String urlPrefix;
|
|
|
+
|
|
|
@GetMapping("/crowdTask")
|
|
|
public String home(Model model) {
|
|
|
// 获得所有taskDTO,包括本地和慕测端
|
|
@@ -183,7 +188,10 @@ public class TaskController {
|
|
|
public String addCrowdTask2(@RequestParam("name")String name,@RequestParam("description")String description,
|
|
|
@RequestParam("time")String time,@RequestParam("type")String type,
|
|
|
@RequestParam("webUrl")String webUrl,@RequestParam(value = "apk",required = false)MultipartFile apk,
|
|
|
- @RequestParam("requirement") MultipartFile requirement,@RequestParam("threePage") MultipartFile threePage){
|
|
|
+ @RequestParam("requirement") MultipartFile requirement,@RequestParam("threePage") MultipartFile threePage,
|
|
|
+ Model model){
|
|
|
+// String templateUrl = useOss?""
|
|
|
+ model.addAttribute("templateUrl",useOss?"http://mooctest-site.oss-cn-shanghai.aliyuncs.com/excel-template.xlsx":urlPrefix+"excel-template.xlsx");
|
|
|
return taskService.addCrowdTask(name, description, time, type, webUrl, apk, requirement, threePage);
|
|
|
}
|
|
|
|
|
@@ -194,9 +202,11 @@ public class TaskController {
|
|
|
|
|
|
return taskService.importTask(number, originId, zipFile, jsonFile)?"success":"导出失败";
|
|
|
}
|
|
|
+
|
|
|
@PostMapping("/exportTask")
|
|
|
@ResponseBody
|
|
|
- public String exportTask(@RequestParam("caseId")String caseId){
|
|
|
- return taskService.exportTask(caseId)?"success":"导出失败";
|
|
|
+ public String exportTask(@RequestParam("caseId") String caseId) {
|
|
|
+
|
|
|
+ return taskService.exportTask(caseId) ? "success" : "导出失败";
|
|
|
}
|
|
|
}
|