Переглянути джерело

修改私有云 示例文件

insomniaLee 4 роки тому
батько
коміт
42ed2b7c8d

+ 13 - 3
src/main/java/com/mooctest/controller/TaskController.java

@@ -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" : "导出失败";
     }
 }

+ 1 - 1
src/main/resources/templates/addCrowdTask.html

@@ -129,7 +129,7 @@
 <!--                    </div>-->
 
                     <div class="form-group">
-                        <label for="threePage" class="col-sm-2 control-label">三级页面<br><a href="http://mooctest-site.oss-cn-shanghai.aliyuncs.com/excel-template.xlsx">示例</a></label>
+                        <label for="threePage" class="col-sm-2 control-label">三级页面<br><a th:href="${templateUrl}">示例</a></label>
                         <div class="col-sm-10">
                             <input  type="file" id="threePage"/>
                             <!--                               <p class="help-block">Example block-level help text here.</p>-->

+ 5 - 0
src/main/resources/templates/task_detail.html

@@ -114,6 +114,11 @@
                     <i class="fa fa-file-excel-o"></i>导入第三方项目
                 </a>
             </li>
+            <li id="crowdSidebarMenu-importTask">
+                <a href="/importTask">
+                    <i class="fa  fa-object-ungroup"></i>导入任务
+                </a>
+            </li>
         </ul>
     </li>