delete image

travel/admin/src/main/java/com/lc/admin/config/RedisConfig.java

@@ -10,7 +10,7 @@ import org.springframework.data.redis.serializer.RedisSerializer;
 @Configuration
 public class RedisConfig {
 
-    @Bean("UserRedisTemplate")
+    @Bean("deleteImageRedisTemplate")
     @SuppressWarnings("all")
     public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory redisConnectionFactory){
         RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();

travel/admin/src/main/java/com/lc/admin/controller/SetmealController.java

@@ -20,13 +20,12 @@ import com.qiniu.storage.UploadManager;
 import com.qiniu.storage.model.DefaultPutRet;
 import com.qiniu.util.Auth;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.PropertySource;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import java.io.IOException;
+import java.util.UUID;
 
 @RequestMapping("/setmeal")
 @RestController
@@ -44,6 +43,9 @@ public class SetmealController {
     @Value("${setmeal.upload.imageprefix}")
     private String uploadImagePrefix;
 
+    @Value("setmeal.upload.delete.imageprefix")
+    private String uploadDeleteImagePrefix;
+
     @Resource
     RedisService redisService;
 
@@ -53,6 +55,9 @@ public class SetmealController {
     @PostMapping("/add.do")
     public Result add(@RequestBody TSetmeal setmeal, @RequestParam Integer[] travelgroupIds){
         int i = setmealService.add( setmeal, travelgroupIds );
+
+        //我们在这里记录删除的图片
+        redisService.sAdd(uploadDeleteImagePrefix, setmeal.getImg());
         return Result.ok();
     }
 
@@ -69,7 +74,8 @@ public class SetmealController {
 
     @PostMapping("/upload.do")
     public Result upload(MultipartFile file){
-        String originalFilename = file.getOriginalFilename();
+        String fileName = UUID.randomUUID().toString();
+        String originalFilename = fileName + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
         OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret);
         try {
             PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName,
@@ -87,7 +93,7 @@ public class SetmealController {
             }
         }
         //把图片暂时存储在 Redis 中
-        redisService.lPush(uploadImagePrefix, originalFilename);
+        redisService.sAdd(uploadImagePrefix, originalFilename);
         return Result.data(originalFilename);
     }
 

travel/admin/src/main/java/com/lc/admin/controller/TravelGroupController.java

@@ -1,17 +1,13 @@
 package com.lc.admin.controller;
 
-import com.cl.mbg.mapper.TTravelitemMapper;
 import com.cl.mbg.model.TTravelgroup;
-import com.cl.mbg.model.TTravelitem;
 import com.lc.common.pojo.TravelParams;
 import com.lc.common.utils.Result;
 import com.lc.service.TravelGroupService;
-import com.lc.service.TravelItemService;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
-import java.util.Arrays;
 
 @RestController
 @RequestMapping("/travelgroup")

travel/admin/src/main/java/com/lc/admin/controller/TravelItemController.java

@@ -1,11 +1,9 @@
 package com.lc.admin.controller;
 
-import com.cl.mbg.mapper.TTravelitemMapper;
 import com.cl.mbg.model.TTravelitem;
 import com.lc.common.pojo.TravelParams;
 import com.lc.common.utils.Result;
 import com.lc.service.TravelItemService;
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;

travel/admin/src/main/java/com/lc/admin/scheduling/DelImageJob.java

@@ -12,6 +12,6 @@ public class DelImageJob extends QuartzJobBean {
     @Override
     protected void executeInternal(JobExecutionContext context) throws JobExecutionException {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        System.out.println( " Quartz 定时器运行了" + simpleDateFormat.format(new Date()) );
+        //System.out.println( " Quartz 定时器运行了" + simpleDateFormat.format(new Date()) );
     }
 }

travel/admin/src/main/java/com/lc/admin/scheduling/DeleteImageScheduling.java

@@ -9,6 +9,8 @@ import org.springframework.stereotype.Component;
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Iterator;
+import java.util.Set;
 
 @Component
 public class DeleteImageScheduling {
@@ -17,30 +19,43 @@ public class DeleteImageScheduling {
     RedisService redisService;
 
     @Value("${setmeal.upload.imageprefix}")
-    String deleteImage;
+    private String uploadImagePrefix;
+
+    @Value("setmeal.upload.delete.imageprefix")
+    private String uploadDeleteImagePrefix;
 
     /**
      * 周表达式 1  指的是 周日
      * 2-6  表示的就是  周1 到 周五
      */
-    @Scheduled(cron = "0/10 * * * * ?")
+    //@Scheduled(cron = "0/10 * * * * ?")
     public void delImg(){
 
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         System.out.println( "定时器运行了" + simpleDateFormat.format(new Date()) );
         //取出集合  ， 使用OSS 删除图片
-        redisService.del(deleteImage);
+        //redisService.del(deleteImage);
 
     }
 
     @XxlJob("TestJobHandler")
     public String test(){
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Set<Object> diff = redisService.diff(uploadImagePrefix, uploadDeleteImagePrefix);
+
+        Iterator<Object> iterator = diff.iterator();
+        while ( iterator.hasNext() ) {
+            String s = iterator.next().toString();
+
+            //调用 OSS 存储 接口， 删除图片
+            System.out.println( "删除图片" + s );
+
+        }
 
-        System.out.println( " XxlJob 定时器运行了" + simpleDateFormat.format(new Date()) );
+        redisService.del( uploadImagePrefix );
+        redisService.del( uploadDeleteImagePrefix );
+        return "OK";
 
-        return "OK!";
     }
 
 }

travel/admin/src/main/resources/application.properties

@@ -15,6 +15,7 @@ setmeal.upload.alioss.accessKeyId=Z75YxVNFPfXK48zg
 setmeal.upload.alioss.accessKeySecret=DC5nkj1XSWwzqmuHQ8SIQByrgUm13q
 setmeal.upload.alioss.bucketName=80boys-beijing
 setmeal.upload.imageprefix=setmeal.upload.imageprefix
+setmeal.upload.delete.imageprefix=setmeal.upload.delete.imageprefix
 
 spring.redis.database=9
 spring.redis.host=127.0.0.1

travel/admin/src/main/resources/templates/setmeal.html

@@ -258,7 +258,8 @@
 									//this.imageUrl = `http://ra5vj2ycp.hn-bkt.clouddn.com/${response.data}`
 									this.imageUrl = `https://80boys-beijing.oss-cn-beijing.aliyuncs.com/${response.data}`
 									//this.imageUrl = response.data
-									this.$message({
+                                    this.formData.img = response.data
+                                    this.$message({
 										message : response.message,
 										type : response.flag ? 'success' : 'error'
 									})
@@ -279,7 +280,7 @@
                 handleAdd () {
 								
 									//图片路径
-									this.formData.img = this.imageUrl
+									//this.formData.img = this.imageUrl
 									axios.post(`/setmeal/add.do?travelgroupIds=`+this.travelgroupIds,this.formData).then( res =>{
 										//赋值
 										if(res.data.flag){

travel/mbg/${project.build.directory}/classes/application.yaml

@@ -1,9 +0,0 @@
-spring:
-  datasource:
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    username: root
-    password: 0JZBdtlYoiOepddh
-    url: jdbc:mysql://127.0.0.1:13306/travel?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=true&tinyInt1isBit=false
-
-
-