Merge branch 'master_activity-hf' into base-modify

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/controller/ActivityShowController.java

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @RequestMapping("/activityShow")
 public class ActivityShowController extends BaseController<ActivityShowBiz, ActivityShow> {
-    @GetMapping("/one/{activityId}")
+    @GetMapping("/app/unauth/one/{activityId}")
     public ObjectRestResponse getOne(@PathVariable Integer activityId){
       return ObjectRestResponse.succ(baseBiz.getOne(activityId));
     }

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/impl/UploadZipServiceImpl.java

 package com.xxfc.platform.universal.service.impl;
 
+import com.alibaba.druid.sql.visitor.functions.If;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.xxfc.platform.universal.constant.enumerate.FileTypeEnum;
@@ -66,8 +67,11 @@ public class UploadZipServiceImpl implements UploadZipService {
                 File dir = new File(destPath);
                 dir.mkdir();
             }else {
+                File targetFile = new File(destPath+File.separator+entry.getName());
+               if (targetFile.getParentFile().exists()){
                    
                }
+            }
 
 
         }