添加对查询回收站的权限拦截

设置swagger只能再开发环境下可以查询
更新回收站删除后文件和图片没有一起删除的问题

Author: WxrLZQ

springboot-dubbo-api/src/main/java/com/lzq/api/service/ExampleService.java

@@ -4,6 +4,8 @@
 import com.github.pagehelper.PageInfo;
 import com.lzq.api.pojo.Example;
 
+import java.util.List;
+
 /**
  * (Example)表服务接口
  *
@@ -53,9 +55,10 @@ public interface ExampleService {
      *
      * @param username    用户名
      * @param currentPage 当前页
+     * @param orderCondition
      * @return
      */
-    PageInfo<Example> queryByPublic(String username, Integer currentPage);
+    PageInfo<Example> queryByPublic(String username, Integer currentPage,Integer orderCondition);
 
     /**
      * 删除实例（物理删除实例）
@@ -80,4 +83,26 @@ public interface ExampleService {
      */
     Example queryByIdUsername(Example example);
 
+
+    /**
+     * 查询用户的回收站
+     * @param username
+     * @return
+     */
+    List<Example> queryRecycle(String username);
+
+    /**
+     * 恢复回收站实例
+     * @param exampleId
+     * @return
+     */
+    Boolean resumeExample(String exampleId);
+
+    /**
+     * 查询回收站是否有该实例
+     * @param example
+     * @return
+     */
+    Example getExampleByDeleted(Example example);
+
 }

springboot-dubbo-service/src/main/java/com/lzq/dubboservice/mapper/ExampleMapper.java

@@ -1,11 +1,9 @@
 package com.lzq.dubboservice.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lzq.api.dto.ExampleAccount;
-import com.lzq.api.pojo.Account;
 import com.lzq.api.pojo.Example;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.security.core.parameters.P;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -19,4 +17,10 @@
 public interface ExampleMapper extends BaseMapper<Example> {
 
     Integer deleteExample(@Param("exampleId")String exampleId);
+
+    List<Example> queryDeleted(@Param("username") String username);
+
+    Integer resumeExample(@Param("exmapleId") String exampleId);
+
+    Example getExampleByDeleted(Example example);
 }

springboot-dubbo-service/src/main/java/com/lzq/dubboservice/service/ExampleServiceImpl.java

@@ -58,10 +58,21 @@ public PageInfo<Example> queryByAccount(String username, Integer currentPage, In
     }
 
     @Override
-    public PageInfo<Example> queryByPublic(String username, Integer currentPage) {
+    public PageInfo<Example> queryByPublic(String username, Integer currentPage, Integer orderCondition) {
         QueryWrapper<Example> wrapper = new QueryWrapper<>();
         wrapper.eq("username", username);
         wrapper.eq("ispublic", 0);
+        switch (orderCondition){
+            case 0:
+                wrapper.orderByDesc("create_time");
+                break;
+            case 1:
+                wrapper.orderByDesc("update_time");
+                break;
+            case 2:
+                wrapper.orderByDesc("favorites");
+                break;
+        }
         //当前页和每页条数
         PageHelper.startPage(currentPage, 12);
         List<Example> list = baseMapper.selectList(wrapper);
@@ -89,5 +100,20 @@ public Example queryByIdUsername(Example example) {
         return baseMapper.selectOne(wrapper);
     }
 
+    @Override
+    public List<Example> queryRecycle(String username) {
+        return baseMapper.queryDeleted(username);
+    }
+
+    @Override
+    public Boolean resumeExample(String exampleId) {
+        return baseMapper.resumeExample(exampleId)>0?true:false;
+    }
+
+    @Override
+    public Example getExampleByDeleted(Example example) {
+        return baseMapper.getExampleByDeleted(example);
+    }
+
 
 }

springboot-dubbo-service/src/main/resources/application-dev.yml

@@ -1,8 +1,8 @@
 resources:
-  route: /home/demo/data/
-  InitHtml: /home/demo/data/HelloWord.html
+  route: F:/项目/MyDemo/data/
+  InitHtml: F:/项目/MyDemo/data/HelloWord.html
 
 qiniuyun:
-  accessKey: Z_7eMJdtj_n4lrAdSs3zVuZ8rn4wZXu75b1gYJbC
-  secretKey: QIriVPlgNKoKdjU02q166-7IBPy3z9sQTMn5Ae7R
-  bucket: js-encoder
+  accessKey: fIf9nYz-wQo3HD1AlhQ5wrUrdjtygUPGe2dpuLlY
+  secretKey: ItVUX8sAaxsuj7kgmk3IZ0ip3BHljAx61N8m922C
+  bucket: lzqwxr

springboot-dubbo-service/src/main/resources/application-prod.yml

@@ -0,0 +1,8 @@
+resources:
+  route: /home/demo/data/
+  InitHtml: /home/demo/data/HelloWord.html
+
+qiniuyun:
+  accessKey: Z_7eMJdtj_n4lrAdSs3zVuZ8rn4wZXu75b1gYJbC
+  secretKey: QIriVPlgNKoKdjU02q166-7IBPy3z9sQTMn5Ae7R
+  bucket: js-encoder

springboot-dubbo-service/src/main/resources/application-test.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: test
+    active: dev
   application:
     #项目名称
     name: service

springboot-dubbo-service/src/main/resources/application.yml

@@ -1,8 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.lzq.dubboservice.mapper.ExampleMapper">
-
     <delete id="deleteExample">
-        delete from example where example_id=#{exampleId} and deleted=1
+        delete from example
+        where
+              example_id=#{exampleId} and deleted=1
     </delete>
+    <select id="queryDeleted" resultType="com.lzq.api.pojo.Example">
+        select
+               example_id, example_name, update_time
+        from example
+        where
+              username=#{username} and deleted=1;
+    </select>
+    <update id="resumeExample">
+        update example
+        set
+            deleted=0
+        where
+              example_id=#{exmapleId}
+    </update>
+    <select id="getExampleByDeleted" resultType="com.lzq.api.pojo.Example">
+        select
+               example_id, img, file_name, username
+        from example
+        where
+              username=#{username} and example_id=#{exampleId} and deleted=1
+    </select>
+
 </mapper>

springboot-dubbo-service/src/main/resources/mapper/ExampleMapper.xml

@@ -82,7 +82,7 @@ protected void configure(HttpSecurity http) throws Exception {
                 .authorizeRequests()
                 //放行index接口
                 .antMatchers("/").permitAll()
-                .antMatchers("/user/**", "/example/**", "/index/verify", "/feedback/**").
+                .antMatchers("/user/**", "/example/**", "/index/verify", "/feedback/**","/query/getRecycle").
 
                 authenticated()
                 //所有请求都需要登录验证

springboot-dubbo-web/src/main/java/com/lzq/web/config/SecurityConfig.java

@@ -22,16 +22,23 @@ public class SwaggerConfig {
     @Bean
     public Docket docket(Environment environment){
 
+        //设置要显示的Swagger环境
+        Profiles profiles = Profiles.of("prod");
+
+        //通过environment.acceptsProfiles判断是否处于当前的环境中
+        boolean flag = environment.acceptsProfiles(profiles);
+
+
         return new Docket(DocumentationType.SWAGGER_2)
                 //编写api的基本信息
                 .apiInfo(apiInfo())
+                //enable是否启动Swagger,如果为false,则Swagger不能在浏览器中访问
+                .enable(flag)
                 .select()
                 .apis(RequestHandlerSelectors.basePackage("com.lzq.web.controller"))
                 //paths():过滤路径
                 //PathSelectors.ant():只扫描扫描下的接口
-                // .paths(PathSelectors.ant("/lzq/**"))
-                .build()
-                ;
+                .build();
     }