guochao vor 5 Jahren
Ursprung
Commit
aa08d7472f

+ 2 - 2
.idea/workspace.xml

@@ -3,7 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="c25ee83f-38b8-4a56-8a1f-62ecc8d6cec2" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/service/impl/AutoReportProductServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/service/impl/AutoReportProductServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/web/ctrl/HandleReportController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/web/ctrl/HandleReportController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/web/ctrl/UploadController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/web/ctrl/UploadController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/static/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/index.html" afterDir="false" />
     </list>
@@ -124,7 +124,7 @@
       <workItem from="1574148794239" duration="247000" />
       <workItem from="1574243622969" duration="17039000" />
       <workItem from="1574324790942" duration="17204000" />
-      <workItem from="1574392825833" duration="2061000" />
+      <workItem from="1574392825833" duration="3103000" />
     </task>
     <servers />
   </component>

+ 1 - 1
src/main/java/cn/iselab/mooctest/site/web/ctrl/HandleReportController.java

@@ -81,7 +81,7 @@ public class HandleReportController {
 //    public Map handleReport(@PathVariable(value = "orderId") Long orderId,
 //                               @PathVariable(value = "ownerId") Long ownerId, @RequestBody VulReportDataVO vulReportDataVO) {
     @ResponseBody
-    @RequestMapping(value = "/api/generate/report/order/{orderId}/owner/{ownerId}/reportType/{reportType}", method = RequestMethod.POST)
+    @RequestMapping(value = "/api/report/generate/order/{orderId}/owner/{ownerId}/reportType/{reportType}", method = RequestMethod.POST)
     public Map handleReport(@PathVariable(value = "orderId") Long orderId,
                             @PathVariable(value = "ownerId") Long ownerId,
                             @PathVariable(value = "reportType") String reportType) {

+ 1 - 2
src/main/java/cn/iselab/mooctest/site/web/ctrl/UploadController.java

@@ -10,7 +10,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.UUID;
 
 /**
  * @author: Diors.Po
@@ -30,7 +29,7 @@ public class UploadController {
     @Autowired
     private AutoReportProductService autoReportProductService;
 
-    @RequestMapping(value = "/generalReportTemplate", method = RequestMethod.POST)
+    @RequestMapping(value = "/api/report/generalReportTemplate", method = RequestMethod.POST)
     public String uploadGeneralFile(MultipartFile file) throws IOException {
         // 将文件上传至本地服务器中
 

+ 1 - 1
src/main/resources/static/index.html

@@ -443,7 +443,7 @@ body {
     function UpladFile() {
         var fileObj = document.getElementById("file").files[0]; // js 获取文件对象
 		// var url = "http://127.0.0.1:8080" + "/generalReportTemplate"; // 接收上传文件的后台地址
-        var url = "http://106.14.81.62:8080" + "/generalReportTemplate"; // 接收上传文件的后台地址
+        var url = "http://106.14.81.62:8080" + "/api/report/generalReportTemplate"; // 接收上传文件的后台地址
 
         var form = new FormData(); // FormData 对象
         form.append("file", fileObj); // 文件对象