feat:添加强制删除，优化七牛云对接

gradendripar · Jan 2, 2024 · 679ada6 · 679ada6
1 parent e2e723e
commit 679ada6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/main/java/cn/hellohao/controller/IndexController.java b/src/main/java/cn/hellohao/controller/IndexController.java
@@ -44,7 +44,7 @@ public class IndexController {
     @Autowired private IRedisService iRedisService;
     @Autowired private AppClientService appClientService;
 
-    public static String version =  "20230925";
+    public static String version =  "20240102";
     @RequestMapping(value = "/")
     public String Welcome(Model model, HttpServletRequest httpServletRequest) {
         model.addAttribute("name", "服务端程序(开源版)");
@@ -65,6 +65,7 @@ public Msg webInfo() {
         JSONObject jsonObject = new JSONObject();
         AppClient appClient = appClientService.getAppClientData("app");
         jsonObject.put("webname", cd.getString("webname"));
+        jsonObject.put("systype","free");
         jsonObject.put("version",version);
         jsonObject.put("websubtitle", cd.getString("websubtitle"));
         jsonObject.put("keywords", cd.getString("keywords"));
@@ -85,7 +86,7 @@ public Msg webInfo() {
         msg.setData(jsonObject);
         return msg;
     }
-    @PostMapping("/uploadChunkFile")
+    @PostMapping(value = {"/uploadChunkFile","/client/uploadChunkFile"})
     @ResponseBody
     @CrossOrigin
     public Msg uploadChunk(HttpServletRequest request,Chunk chunk) {
@@ -108,7 +109,7 @@ public Msg uploadChunk(HttpServletRequest request,Chunk chunk) {
         }
     }
 
-    @PostMapping("/processFile")
+    @PostMapping(value = {"/processFile","/client/processFile"})
     @ResponseBody
     @CrossOrigin
     public Msg processFile(HttpServletRequest request,@RequestParam(value = "data", defaultValue = "") String data){

diff --git a/src/main/java/cn/hellohao/service/impl/deleImages.java b/src/main/java/cn/hellohao/service/impl/deleImages.java
@@ -44,7 +44,7 @@ public Msg dele(boolean forceDel,String uuid, Long... imgIds) {
       boolean isDele = false;
       try {
         Images image = imgService.selectByPrimaryKey(imgIds[i]);
-        if (!forceDel) {
+        if (forceDel) {
           try {
             imgAndAlbumService.deleteImgAndAlbum(image.getImgurl());
             imgTempService.delImgAndExp(image.getImguid());