第二次提交

pom.xml

@@ -30,12 +30,12 @@
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger2</artifactId>
-            <version>2.9.2</version>
+            <version>2.9.1</version>
         </dependency>
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger-ui</artifactId>
-            <version>2.9.2</version>
+            <version>2.9.1</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

src/main/java/com/example/train/config/Swagger2Config.java

@@ -47,20 +47,20 @@ public class Swagger2Config extends WebMvcConfigurationSupport {
                 .build();
     }
 
-    /**
-     * 我们使用的 @Configuration 继承了WebMvcConfigurationSupport，导致默认的Swagger静态资源被覆盖，而缺失了配置。
-     * @param registry registry
-     */
-    @Override
-    public void addResourceHandlers(ResourceHandlerRegistry registry) {
-        registry.addResourceHandler("doc.html")
-                .addResourceLocations("classpath:/META-INF/resources/");
-
-        registry.addResourceHandler("swagger-ui.html")
-                .addResourceLocations("classpath:/META-INF/resources/");
-        registry.addResourceHandler("/webjars/**")
-                .addResourceLocations("classpath:/META-INF/resources/webjars/");
-//        registry.addResourceHandler("/static/**").addResourceLocations("classpath:/static/");
-    }
+//    /**
+//     * 我们使用的 @Configuration 继承了WebMvcConfigurationSupport，导致默认的Swagger静态资源被覆盖，而缺失了配置。
+//     * @param registry registry
+//     */
+//    @Override
+//    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+//        registry.addResourceHandler("doc.html")
+//                .addResourceLocations("classpath:/META-INF/resources/");
+//
+//        registry.addResourceHandler("swagger-ui.html")
+//                .addResourceLocations("classpath:/META-INF/resources/");
+//        registry.addResourceHandler("/webjars/**")
+//                .addResourceLocations("classpath:/META-INF/resources/webjars/");
+////        registry.addResourceHandler("/static/**").addResourceLocations("classpath:/static/");
+//    }
 
 }

src/main/java/com/example/train/config/WebMvcConfig.java

+package com.example.train.config;
+
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+/**
+ * @author zsp
+ * @version V1.0
+ * @data 2020/6/11
+ **/
+@Configuration
+public class WebMvcConfig {
+
+    @Bean
+    public WebMvcConfigurer corsConfigurer() {
+
+        return new WebMvcConfigurer() {
+            @Override
+            public void addCorsMappings(CorsRegistry registry) {
+                registry.addMapping("/**")
+                        .allowCredentials(true)
+                        .allowedOriginPatterns("*")
+                        .allowedMethods("GET", "POST", "DELETE", "PUT", "PATCH")
+                        .maxAge(3600);
+            }
+
+//            @Override
+//    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+//        registry.addResourceHandler("swagger-ui.html")
+//                .addResourceLocations("classpath:/META-INF/resources/");
+//                .addResourceLocations("classpath:/META-INF/resources/");
+//
+//        registry.addResourceHandler("swagger-ui.html")
+//                .addResourceLocations("classpath:/META-INF/resources/");
+//        registry.addResourceHandler("/webjars/**")
+//                .addResourceLocations("classpath:/META-INF/resources/webjars/");
+////        r
+// egistry.addResourceHandler("/static/**").addResourceLocations("classpath:/static/");
+//    }
+
+
+        };
+    }
+
+}

src/main/java/com/example/train/controller/Controller.java → src/main/java/com/example/train/controller/TainController.java

@@ -20,9 +20,9 @@ import java.util.List;
  * @author tykj
  */
 @RestController
-@RequestMapping("/model4")
+@RequestMapping("/zt/train")
 @Api(tags = "浙江省培训管理系统",description = "基础接口")
-public class Controller {
+public class TainController {
 
     @Autowired
    private ParticularsService particularsService;
@@ -40,14 +40,13 @@ public class Controller {
 
     @PostMapping("/findAll")
     @ApiOperation(value = "动态查询培训信息")
-    public PagePojo findAll(ParticularsCondition particularsCondition) {
+    public PagePojo findAll(@RequestBody ParticularsCondition particularsCondition) {
         return particularsService.findAll(particularsCondition);
     }
 
-
     @PostMapping("/saveParticulars")
     @ApiOperation(value = "发起培训")
-    public Particulars saveParticulars(Particulars particulars, MultipartFile file1,MultipartFile file2) throws IOException {
+    public Particulars saveParticulars(Particulars particulars,MultipartFile file1,MultipartFile file2) throws IOException {
         String upload1 = particularsService.upload(file1);
         String upload2 = particularsService.upload(file2);
         particulars.setCoursewareUpload(upload1);
@@ -55,20 +54,25 @@ public class Controller {
         return particularsService.saveOne(particulars);
     }
 
-
     @PostMapping("/saveVideo")
     @ApiOperation(value = "视频上传")
-    public Video saveVideo(Video video,MultipartFile videoFile) throws IOException{
-
-        String videoUpload = videoService.uploadVideo(videoFile);
-        video.setVideoUpload(videoUpload);
-        video.setVideoLength(VideoUtil.getDurationBackString(videoUpload));
+    public Video saveVideo(@RequestBody Video video) {
+        video.setVideoLength(VideoUtil.getDurationBackString(video.getVideoUpload()));
         return videoService.saveVideo(video);
     }
+    @PostMapping("/saveFile")
+    @ApiOperation(value = "视频文件上传")
+    public String saveFile1(@RequestParam("multipartFile") MultipartFile multipartFile){
+        try {
+            return videoService.uploadVideo(multipartFile);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }return "上传失败";
+    }
 
     @PostMapping("findVideo")
     @ApiOperation(value = "视频动态查询")
-    public PagePojo findVideo(VideoCondition videoCondition){
+    public PagePojo findVideo(@RequestBody VideoCondition videoCondition){
         return videoService.findVideo(videoCondition);
     }
 

src/main/java/com/example/train/pojo/DatumPojo.java

+package com.example.train.pojo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+/**
+ * @author tykj
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Entity
+@ApiModel("资料详情详情")
+public class DatumPojo {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @ApiModelProperty(value = "资料主键ID",example = "1")
+    private Integer id;
+
+    @ApiModelProperty(value = "视频标题",example = "输入一段文字")
+    private String videoTitle;
+
+
+
+    @ApiModelProperty(value = "视频分类",example = "分类1")
+    private String videoType;
+
+    @ApiModelProperty(value = "视频简介",example = "输入一段文字")
+    private String videoProcess;
+
+    @ApiModelProperty(value = "视频上传",example = "视频保存路径")
+    private String videoUpload;
+
+}

src/main/java/com/example/train/service/impl/VideoServiceImpl.java

@@ -59,6 +59,7 @@ public class VideoServiceImpl implements VideoService {
 
     @Override
     public Video saveVideo(Video video) {
+
         return videoDao.save(video);
     }