视频

src/main/java/com/yunzhi/marketing/interceptor/AccessInterceptor.java

@@ -253,12 +253,12 @@ public class AccessInterceptor implements HandlerInterceptor {
     private boolean inWhiteList(HttpServletRequest request) {
         String requestURI = request.getRequestURI();
 
-//        for (String it : whiteList) {
-//            if (requestURI.startsWith(it)) {
+        for (String it : whiteList) {
+            if (requestURI.startsWith(it)) {
                 return true;
-//            }
-//        }
-//
-//        return false;
+            }
+        }
+
+        return false;
     }
 }

src/main/java/com/yunzhi/marketing/xlk/controller/VideoController.java

@@ -1,23 +1,31 @@
 package com.yunzhi.marketing.xlk.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.marketing.base.BaseController;
 import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.common.StringUtils;
+import com.yunzhi.marketing.xlk.entity.Brand;
 import com.yunzhi.marketing.xlk.entity.Video;
 import com.yunzhi.marketing.xlk.service.IVideoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * <p>
     * 视频表  前端控制器
@@ -28,6 +36,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/api")
+@Api(value = "视频表", tags = "xlk-视频表")
 public class VideoController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(VideoController.class);
@@ -42,15 +51,20 @@ public class VideoController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/video",method= RequestMethod.GET)
+    @ApiOperation(value = "视频列表", notes = "视频列表")
+    @RequestMapping(value="/admin/video",method= RequestMethod.GET)
     public ResponseBean videoList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                  @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+                                  @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                  @RequestParam(value ="name") String name,
+                                  @RequestHeader("authorization") String token, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
 		    IPage<Video> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<Video> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+            LambdaQueryWrapper<Video> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(!StringUtils.isEmpty(name),Video::getName,name);
+            queryWrapper.eq(Video::getOrgId,getOrgId(request));
+            queryWrapper.orderByDesc(Video::getCreatedTime);
 
             IPage<Video> result = iVideoService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
@@ -67,10 +81,12 @@ public class VideoController extends BaseController {
      * @param video 实体对象
      * @return
      */
+    @ApiOperation(value = "添加视频", notes = "添加视频")
     @RequestMapping(value="/video",method= RequestMethod.POST)
-    public ResponseBean videoAdd(@RequestBody Video video){
+    public ResponseBean videoAdd(@RequestBody Video video,@RequestHeader("authorization") String token, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+            video.setOrgId(getOrgId(request));
             if (iVideoService.save(video)){
                 responseBean.addSuccess(video);
             }else {
@@ -88,6 +104,7 @@ public class VideoController extends BaseController {
      * 根据id删除对象
      * @param id  实体ID
      */
+    @ApiOperation(value = "根据id删除视频", notes = "根据id删除视频")
     @ResponseBody
     @RequestMapping(value="/video/{id}", method= RequestMethod.DELETE)
     public ResponseBean videoDelete(@PathVariable Integer id){
@@ -112,6 +129,7 @@ public class VideoController extends BaseController {
      * @param video 实体对象
      * @return
      */
+    @ApiOperation(value = "根据id修改视频", notes = "根据id修改视频")
     @RequestMapping(value="/video/{id}",method= RequestMethod.PUT)
     public ResponseBean videoUpdate(@PathVariable Integer id,
                                         @RequestBody Video video){
@@ -134,6 +152,7 @@ public class VideoController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
+    @ApiOperation(value = "根据id查询详情", notes = "根据id查询详情")
     @RequestMapping(value="/video/{id}",method= RequestMethod.GET)
     public ResponseBean videoGet(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();

src/main/resources/application-prod.yml

@@ -97,5 +97,4 @@ fadada:
   redirectUrl: "https://wx.fangdeal.cn/other/redirect.html"
 # file path
 file:
-  path: /Users/fuxingfan/CODE/images/
-  domain: http://localhost:8080
+  path: /yunpan/dev/files/

src/main/resources/log/logback-spring.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="false">
     <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
-    <property name="LOG_HOME" value="/home/dev/estateagents/service/logs" />
+    <property name="LOG_HOME" value="/yunpan/dev/logs" />
     <!-- 控制台输出 -->
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">