fuxingfan 4 years ago
parent
commit
0746b1bbe9

+ 6
- 6
src/main/java/com/yunzhi/marketing/interceptor/AccessInterceptor.java View File

253
     private boolean inWhiteList(HttpServletRequest request) {
253
     private boolean inWhiteList(HttpServletRequest request) {
254
         String requestURI = request.getRequestURI();
254
         String requestURI = request.getRequestURI();
255
 
255
 
256
-//        for (String it : whiteList) {
257
-//            if (requestURI.startsWith(it)) {
256
+        for (String it : whiteList) {
257
+            if (requestURI.startsWith(it)) {
258
                 return true;
258
                 return true;
259
-//            }
260
-//        }
261
-//
262
-//        return false;
259
+            }
260
+        }
261
+
262
+        return false;
263
     }
263
     }
264
 }
264
 }

+ 24
- 5
src/main/java/com/yunzhi/marketing/xlk/controller/VideoController.java View File

1
 package com.yunzhi.marketing.xlk.controller;
1
 package com.yunzhi.marketing.xlk.controller;
2
 
2
 
3
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
3
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4
 import com.baomidou.mybatisplus.core.metadata.IPage;
5
 import com.baomidou.mybatisplus.core.metadata.IPage;
5
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6
 import com.yunzhi.marketing.base.BaseController;
7
 import com.yunzhi.marketing.base.BaseController;
7
 import com.yunzhi.marketing.base.ResponseBean;
8
 import com.yunzhi.marketing.base.ResponseBean;
9
+import com.yunzhi.marketing.common.StringUtils;
10
+import com.yunzhi.marketing.xlk.entity.Brand;
8
 import com.yunzhi.marketing.xlk.entity.Video;
11
 import com.yunzhi.marketing.xlk.entity.Video;
9
 import com.yunzhi.marketing.xlk.service.IVideoService;
12
 import com.yunzhi.marketing.xlk.service.IVideoService;
13
+import io.swagger.annotations.Api;
14
+import io.swagger.annotations.ApiOperation;
10
 import org.slf4j.Logger;
15
 import org.slf4j.Logger;
11
 import org.slf4j.LoggerFactory;
16
 import org.slf4j.LoggerFactory;
12
 import org.springframework.beans.factory.annotation.Autowired;
17
 import org.springframework.beans.factory.annotation.Autowired;
13
 import org.springframework.web.bind.annotation.PathVariable;
18
 import org.springframework.web.bind.annotation.PathVariable;
14
 import org.springframework.web.bind.annotation.RequestBody;
19
 import org.springframework.web.bind.annotation.RequestBody;
20
+import org.springframework.web.bind.annotation.RequestHeader;
15
 import org.springframework.web.bind.annotation.RequestMapping;
21
 import org.springframework.web.bind.annotation.RequestMapping;
16
 import org.springframework.web.bind.annotation.RequestMethod;
22
 import org.springframework.web.bind.annotation.RequestMethod;
17
 import org.springframework.web.bind.annotation.RequestParam;
23
 import org.springframework.web.bind.annotation.RequestParam;
18
 import org.springframework.web.bind.annotation.ResponseBody;
24
 import org.springframework.web.bind.annotation.ResponseBody;
19
 import org.springframework.web.bind.annotation.RestController;
25
 import org.springframework.web.bind.annotation.RestController;
20
 
26
 
27
+import javax.servlet.http.HttpServletRequest;
28
+
21
 /**
29
 /**
22
  * <p>
30
  * <p>
23
     * 视频表  前端控制器
31
     * 视频表  前端控制器
28
  */
36
  */
29
 @RestController
37
 @RestController
30
 @RequestMapping("/api")
38
 @RequestMapping("/api")
39
+@Api(value = "视频表", tags = "xlk-视频表")
31
 public class VideoController extends BaseController {
40
 public class VideoController extends BaseController {
32
 
41
 
33
     private final Logger logger = LoggerFactory.getLogger(VideoController.class);
42
     private final Logger logger = LoggerFactory.getLogger(VideoController.class);
42
      * @param pageSize
51
      * @param pageSize
43
      * @return
52
      * @return
44
      */
53
      */
45
-    @RequestMapping(value="/video",method= RequestMethod.GET)
54
+    @ApiOperation(value = "视频列表", notes = "视频列表")
55
+    @RequestMapping(value="/admin/video",method= RequestMethod.GET)
46
     public ResponseBean videoList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
56
     public ResponseBean videoList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
47
-                                  @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
57
+                                  @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
58
+                                  @RequestParam(value ="name") String name,
59
+                                  @RequestHeader("authorization") String token, HttpServletRequest request){
48
         ResponseBean responseBean = new ResponseBean();
60
         ResponseBean responseBean = new ResponseBean();
49
         try {
61
         try {
50
             //使用分页插件
62
             //使用分页插件
51
 		    IPage<Video> pg = new Page<>(pageNum, pageSize);
63
 		    IPage<Video> pg = new Page<>(pageNum, pageSize);
52
-            QueryWrapper<Video> queryWrapper = new QueryWrapper<>();
53
-            queryWrapper.orderByDesc("create_date");
64
+            LambdaQueryWrapper<Video> queryWrapper = new LambdaQueryWrapper<>();
65
+            queryWrapper.eq(!StringUtils.isEmpty(name),Video::getName,name);
66
+            queryWrapper.eq(Video::getOrgId,getOrgId(request));
67
+            queryWrapper.orderByDesc(Video::getCreatedTime);
54
 
68
 
55
             IPage<Video> result = iVideoService.page(pg, queryWrapper);
69
             IPage<Video> result = iVideoService.page(pg, queryWrapper);
56
             responseBean.addSuccess(result);
70
             responseBean.addSuccess(result);
67
      * @param video 实体对象
81
      * @param video 实体对象
68
      * @return
82
      * @return
69
      */
83
      */
84
+    @ApiOperation(value = "添加视频", notes = "添加视频")
70
     @RequestMapping(value="/video",method= RequestMethod.POST)
85
     @RequestMapping(value="/video",method= RequestMethod.POST)
71
-    public ResponseBean videoAdd(@RequestBody Video video){
86
+    public ResponseBean videoAdd(@RequestBody Video video,@RequestHeader("authorization") String token, HttpServletRequest request){
72
         ResponseBean responseBean = new ResponseBean();
87
         ResponseBean responseBean = new ResponseBean();
73
         try {
88
         try {
89
+            video.setOrgId(getOrgId(request));
74
             if (iVideoService.save(video)){
90
             if (iVideoService.save(video)){
75
                 responseBean.addSuccess(video);
91
                 responseBean.addSuccess(video);
76
             }else {
92
             }else {
88
      * 根据id删除对象
104
      * 根据id删除对象
89
      * @param id  实体ID
105
      * @param id  实体ID
90
      */
106
      */
107
+    @ApiOperation(value = "根据id删除视频", notes = "根据id删除视频")
91
     @ResponseBody
108
     @ResponseBody
92
     @RequestMapping(value="/video/{id}", method= RequestMethod.DELETE)
109
     @RequestMapping(value="/video/{id}", method= RequestMethod.DELETE)
93
     public ResponseBean videoDelete(@PathVariable Integer id){
110
     public ResponseBean videoDelete(@PathVariable Integer id){
112
      * @param video 实体对象
129
      * @param video 实体对象
113
      * @return
130
      * @return
114
      */
131
      */
132
+    @ApiOperation(value = "根据id修改视频", notes = "根据id修改视频")
115
     @RequestMapping(value="/video/{id}",method= RequestMethod.PUT)
133
     @RequestMapping(value="/video/{id}",method= RequestMethod.PUT)
116
     public ResponseBean videoUpdate(@PathVariable Integer id,
134
     public ResponseBean videoUpdate(@PathVariable Integer id,
117
                                         @RequestBody Video video){
135
                                         @RequestBody Video video){
134
      * 根据id查询对象
152
      * 根据id查询对象
135
      * @param id  实体ID
153
      * @param id  实体ID
136
      */
154
      */
155
+    @ApiOperation(value = "根据id查询详情", notes = "根据id查询详情")
137
     @RequestMapping(value="/video/{id}",method= RequestMethod.GET)
156
     @RequestMapping(value="/video/{id}",method= RequestMethod.GET)
138
     public ResponseBean videoGet(@PathVariable Integer id){
157
     public ResponseBean videoGet(@PathVariable Integer id){
139
         ResponseBean responseBean = new ResponseBean();
158
         ResponseBean responseBean = new ResponseBean();

+ 1
- 2
src/main/resources/application-prod.yml View File

97
   redirectUrl: "https://wx.fangdeal.cn/other/redirect.html"
97
   redirectUrl: "https://wx.fangdeal.cn/other/redirect.html"
98
 # file path
98
 # file path
99
 file:
99
 file:
100
-  path: /Users/fuxingfan/CODE/images/
101
-  domain: http://localhost:8080
100
+  path: /yunpan/dev/files/

+ 1
- 1
src/main/resources/log/logback-spring.xml View File

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