Merge branch 'master_activity' into dev

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/biz/UserBiz.java

@@ -97,7 +97,7 @@ public class UserBiz extends BaseBiz<UserMapper, User> {
             log.info("----code为空---");
             throw new BaseException(ResultCode.FAILED_CODE, Sets.newSet("code为空"));
         }
-        String openid = "oXDd91MppH9i5F7xzPwigiMj--5w";
+        String openid = "oXDd91N8Rwijd3gscAND9TO77a2I";
         /*String access_token = null;
         try {
             JSONObject jsonData = weixinService.getAccessToken(code);

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

@@ -61,7 +61,7 @@ public class UploadZipServiceImpl implements UploadZipService {
             log.error("zip file save to " + uploadPath + " error", e.getMessage(), e);
             return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"保存压缩文件到:" + uploadPath + " 失败!");
         }
-            //zip压缩包解压
+        //zip压缩包解压
         return   unPackZip(file, prefix);
 
     }
@@ -77,7 +77,7 @@ public class UploadZipServiceImpl implements UploadZipService {
         while (entries.hasMoreElements()) {
             ZipEntry entry = entries.nextElement();
             if (entry.isDirectory() && index++ == 0) {
-                File dir = new File(uploadPath+dirPathToday);
+                File dir = new File(uploadPath+File.separator+dirPathToday);
                 dir.mkdir();
             } else if (!entry.isDirectory()) {
 
@@ -89,12 +89,11 @@ public class UploadZipServiceImpl implements UploadZipService {
                 String format = name.substring(name.lastIndexOf("."));
                 if (PHOTO_FORMAT.contains(format)) {
                     String realFileRelPath = dirPathToday + File.separator + no +format;
-                    File targetFile = new File(uploadPath+realFileRelPath);
+                    File targetFile = new File(uploadPath+File.separator+realFileRelPath);
                     FileUtils.copyInputStreamToFile(zipFile.getInputStream(entry),targetFile);
-                    realFileRelPath=xx_url+ SystemConfig.XXMP_URL+realFileRelPath;
+                    realFileRelPath=xx_url+ SystemConfig.XXMP_URL+File.separator+realFileRelPath;
                     result.append(realFileRelPath+",");
                 }
-
             }
         }
         result.substring(0,result.length()-1);