From 679ada60bc81e3dced3275448afede728f66e649 Mon Sep 17 00:00:00 2001
From: hello-hao <923453645@qq.com>
Date: Tue, 2 Jan 2024 17:33:01 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0=E5=BC=BA=E5=88=B6?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=EF=BC=8C=E4=BC=98=E5=8C=96=E4=B8=83=E7=89=9B?=
 =?UTF-8?q?=E4=BA=91=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/cn/hellohao/controller/IndexController.java | 7 ++++---
 src/main/java/cn/hellohao/service/impl/deleImages.java    | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/cn/hellohao/controller/IndexController.java b/src/main/java/cn/hellohao/controller/IndexController.java
index 9923d4d..18002ca 100644
--- 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 class IndexController {
         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 class IndexController {
         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 class IndexController {
         }
     }
 
-    @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
index 598aa63..5b4cbdd 100644
--- 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 class deleImages {
       boolean isDele = false;
       try {
         Images image = imgService.selectByPrimaryKey(imgIds[i]);
-        if (!forceDel) {
+        if (forceDel) {
           try {
             imgAndAlbumService.deleteImgAndAlbum(image.getImgurl());
             imgTempService.delImgAndExp(image.getImguid());