From 71a4fdfbaf762dd74d31c14f068af0a3ac1017ed Mon Sep 17 00:00:00 2001
From: zhaojun <873019219@qq.com>
Date: Sun, 5 Mar 2023 15:33:14 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=20GoogleDrive=20?=
 =?UTF-8?q?=E5=BF=AB=E6=8D=B7=E6=96=B9=E5=BC=8F=E6=96=87=E4=BB=B6=E5=A4=B9?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=AD=A3=E5=B8=B8=E8=8E=B7=E5=8F=96=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E7=9A=84=20BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/GoogleDriveServiceImpl.java  | 262 +++++++++---------
 1 file changed, 137 insertions(+), 125 deletions(-)

diff --git a/src/main/java/im/zhaojun/zfile/module/storage/service/impl/GoogleDriveServiceImpl.java b/src/main/java/im/zhaojun/zfile/module/storage/service/impl/GoogleDriveServiceImpl.java
index 7b187ee..2e7cc2d 100644
--- a/src/main/java/im/zhaojun/zfile/module/storage/service/impl/GoogleDriveServiceImpl.java
+++ b/src/main/java/im/zhaojun/zfile/module/storage/service/impl/GoogleDriveServiceImpl.java
@@ -1,5 +1,6 @@
 package im.zhaojun.zfile.module.storage.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.exceptions.ExceptionUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.IdUtil;
@@ -57,6 +58,7 @@ import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author zhaojun
@@ -65,41 +67,41 @@ import java.util.List;
 @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 @Slf4j
 public class GoogleDriveServiceImpl extends AbstractProxyTransferService<GoogleDriveParam> implements RefreshTokenService {
-	
+
 	/**
 	 * 文件类型：文件夹
 	 */
 	private static final String FOLDER_MIME_TYPE = "application/vnd.google-apps.folder";
-	
+
 	/**
 	 * 文件类型：快捷方式
 	 */
 	private static final String SHORTCUT_MIME_TYPE = "application/vnd.google-apps.shortcut";
-	
+
 	/**
 	 * 文件基础操作 API
 	 */
 	private static final String DRIVE_FILE_URL = "https://www.googleapis.com/drive/v3/files";
-	
-	
+
+
 	/**
 	 * 文件上传操作 API
 	 */
 	private static final String DRIVE_FILE_UPLOAD_URL = "https://www.googleapis.com/upload/drive/v3/files?uploadType=multipart";
-	
+
 	/**
 	 * 刷新 AccessToken URL
 	 */
 	private static final String REFRESH_TOKEN_URL = "https://oauth2.googleapis.com/token";
-	
+
 	@javax.annotation.Resource
 	private StorageSourceConfigService storageSourceConfigService;
-	
+
 	@Override
 	public void init() {
 		refreshAccessToken();
 	}
-	
+
 	/**
 	 * 根据路径获取文件/文件夹 id
 	 *
@@ -113,39 +115,44 @@ public class GoogleDriveServiceImpl extends AbstractProxyTransferService<GoogleD
 		if (StrUtil.isEmpty(fullPath) || StrUtil.equals(fullPath, StringUtils.DELIMITER_STR)) {
 			return StrUtil.isEmpty(param.getDriveId()) ? "root" : param.getDriveId();
 		}
-		
+
 		List<String> pathList = StrUtil.splitTrim(fullPath, "/");
-		
+
 		String driveId = "";
 		for (String subPath : pathList) {
 			String folderIdParam = new GoogleDriveAPIParam().getDriveIdByPathParam(subPath, driveId);
 			HttpRequest httpRequest = HttpUtil.createGet(DRIVE_FILE_URL);
 			httpRequest.header("Authorization", "Bearer " + param.getAccessToken());
 			httpRequest.body(folderIdParam);
-			
+
 			HttpResponse httpResponse = httpRequest.execute();
-			
+
 			checkHttpResponseIsError(httpResponse);
-			
+
 			String body = httpResponse.body();
-			
-			JSONObject jsonObject = JSON.parseObject(body);
-			JSONArray files = jsonObject.getJSONArray("files");
-			
+
+			JSONObject jsonRoot = JSON.parseObject(body);
+			JSONArray files = jsonRoot.getJSONArray("files");
+
 			if (files.size() == 0) {
 				throw ExceptionUtil.wrapRuntime(new FileNotFoundException());
 			}
-			
-			driveId = files.getJSONObject(0).getString("id");
+
+			JSONObject jsonLastItem = files.getJSONObject(files.size() - 1);
+			if (jsonLastItem.containsKey("shortcutDetails")) {
+				driveId = jsonLastItem.getJSONObject("shortcutDetails").getString("targetId");
+			} else {
+				driveId = jsonLastItem.getString("id");
+			}
 		}
-		
+
 		return driveId;
 	}
-	
+
 	@Override
 	public List<FileItemResult> fileList(String folderPath) throws Exception {
 		List<FileItemResult> result = new ArrayList<>();
-		
+
 		String folderId = getIdByPath(folderPath);
 		String pageToken = "";
 		do {
@@ -153,41 +160,41 @@ public class GoogleDriveServiceImpl extends AbstractProxyTransferService<GoogleD
 			HttpRequest httpRequest = HttpUtil.createGet(DRIVE_FILE_URL);
 			httpRequest.header("Authorization", "Bearer " + param.getAccessToken());
 			httpRequest.body(folderIdParam);
-			
+
 			HttpResponse httpResponse = httpRequest.execute();
-			
+
 			checkHttpResponseIsError(httpResponse);
-			
+
 			String body = httpResponse.body();
-			
+
 			JSONObject jsonObject = JSON.parseObject(body);
 			pageToken = jsonObject.getString("nextPageToken");
 			JSONArray files = jsonObject.getJSONArray("files");
 			result.addAll(jsonArrayToFileList(files, folderPath));
 		} while (StrUtil.isNotEmpty(pageToken));
-		
+
 		return result;
 	}
-	
+
 	@Override
 	public FileItemResult getFileItem(String pathAndName) {
 		String fileId = getIdByPath(pathAndName);
-		
+
 		String folderName = FileUtil.getParent(pathAndName, 1);
-		
+
 		HttpRequest httpRequest = HttpUtil.createGet(DRIVE_FILE_URL + "/" + fileId);
 		httpRequest.header("Authorization", "Bearer " + param.getAccessToken());
 		httpRequest.body("fields=id,name,mimeType,shortcutDetails,size,modifiedTime");
 		HttpResponse httpResponse = httpRequest.execute();
-		
+
 		checkHttpResponseIsError(httpResponse);
-		
+
 		String body = httpResponse.body();
 		JSONObject jsonObject = JSON.parseObject(body);
 		return jsonObjectToFileItem(jsonObject, folderName);
 	}
-	
-	
+
+
 	@Override
 	public boolean newFolder(String path, String name) {
 		HttpResponse httpResponse = HttpRequest.post(DRIVE_FILE_URL)
@@ -198,57 +205,57 @@ public class GoogleDriveServiceImpl extends AbstractProxyTransferService<GoogleD
 						.fluentPut("parents", Collections.singletonList(getIdByPath(path)))
 						.toJSONString())
 				.execute();
-		
+
 		checkHttpResponseIsError(httpResponse);
-		
+
 		return true;
 	}
-	
+
 	@Override
 	public boolean deleteFile(String path, String name) {
 		String pathAndName = StringUtils.concat(path, name);
 		HttpResponse httpResponse = HttpRequest.delete(DRIVE_FILE_URL + "/" + getIdByPath(pathAndName))
 				.header("Authorization", "Bearer " + param.getAccessToken())
 				.execute();
-		
+
 		checkHttpResponseIsError(httpResponse);
-		
+
 		return true;
 	}
-	
+
 	@Override
 	public boolean deleteFolder(String path, String name) {
 		return deleteFile(path, name);
 	}
-	
+
 	@Override
 	public boolean renameFile(String path, String name, String newName) {
 		String pathAndName = StringUtils.concat(path, name);
 		String fileId = getIdByPath(pathAndName);
-		
+
 		HttpResponse httpResponse = HttpRequest.patch(DRIVE_FILE_URL + "/" + fileId)
 				.header("Authorization", "Bearer " + param.getAccessToken())
 				.body(new JSONObject()
 						.fluentPut("name", newName)
 						.toJSONString())
 				.execute();
-		
+
 		checkHttpResponseIsError(httpResponse);
-		
+
 		return true;
 	}
-	
+
 	@Override
 	public boolean renameFolder(String path, String name, String newName) {
 		return renameFile(path, name, newName);
 	}
-	
+
 	@Override
 	public void uploadFile(String pathAndName, InputStream inputStream) {
 		String boundary = IdUtil.fastSimpleUUID();
 		String fileName = FileUtil.getName(pathAndName);
 		String folderName = StringUtils.getParentPath(pathAndName);
-		
+
 		String jsonString = new JSONObject()
 				.fluentPut("name", fileName)
 				.fluentPut("parents", Collections.singletonList(getIdByPath(folderName)))
@@ -259,39 +266,44 @@ public class GoogleDriveServiceImpl extends AbstractProxyTransferService<GoogleD
 				.addTextBody(boundary, jsonString, ContentType.APPLICATION_JSON)
 				.addBinaryBody(boundary, inputStream)
 				.build();
-		
+
 		try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
 			HttpUriRequest httpUriRequest = RequestBuilder.post(DRIVE_FILE_UPLOAD_URL)
 					.addHeader(HttpHeaders.AUTHORIZATION, "Bearer " + param.getAccessToken())
 					.setEntity(entity)
 					.build();
-			
+
 			CloseableHttpResponse response = httpClient.execute(httpUriRequest);
 			checkHttpResponseIsError(response);
 		} catch (IOException e) {
 			throw ExceptionUtil.wrapRuntime(e);
 		}
 	}
-	
+
 	@Override
 	public ResponseEntity<Resource> downloadToStream(String pathAndName) {
 		String fileId = getIdByPath(pathAndName);
-		
+
 		HttpServletRequest request = RequestHolder.getRequest();
-		
+
 		HttpRequest httpRequest = HttpUtil.createGet(DRIVE_FILE_URL + "/" + fileId);
 		httpRequest.header("Authorization", "Bearer " + param.getAccessToken());
 		httpRequest.body("alt=media");
 		httpRequest.header(HttpHeaders.RANGE, request.getHeader(HttpHeaders.RANGE));
 		HttpResponse httpResponse = httpRequest.executeAsync();
 		checkHttpResponseIsError(httpResponse);
-		
+
+
 		try {
 			HttpServletResponse response = RequestHolder.getResponse();
-			response.setHeader(HttpHeaders.CONTENT_RANGE, httpResponse.header(HttpHeaders.CONTENT_RANGE));
-			response.setHeader(HttpHeaders.ACCEPT_RANGES, "bytes");
-			response.setHeader(HttpHeaders.CONTENT_LENGTH, httpResponse.header(HttpHeaders.CONTENT_LENGTH));
-			response.setContentType(httpResponse.header(HttpHeaders.CONTENT_TYPE));
+			response.setStatus(httpResponse.getStatus());
+			for (Map.Entry<String, List<String>> stringListEntry : httpResponse.headers().entrySet()) {
+				String key = stringListEntry.getKey();
+				List<String> values = stringListEntry.getValue();
+				if (key != null && CollUtil.isNotEmpty(values)) {
+					response.setHeader(key, stringListEntry.getValue().get(0));
+				}
+			}
 			OutputStream outputStream = response.getOutputStream();
 			httpResponse.writeBody(outputStream, true, null);
 		} catch (IOException e) {
@@ -299,13 +311,13 @@ public class GoogleDriveServiceImpl extends AbstractProxyTransferService<GoogleD
 		}
 		return null;
 	}
-	
-	
+
+
 	@Override
 	public StorageTypeEnum getStorageTypeEnum() {
 		return StorageTypeEnum.GOOGLE_DRIVE;
 	}
-	
+
 	/**
 	 * 根据 RefreshToken 刷新 AccessToken, 返回刷新后的 Token.
 	 *
@@ -314,42 +326,42 @@ public class GoogleDriveServiceImpl extends AbstractProxyTransferService<GoogleD
 	public OAuth2TokenDTO getRefreshToken() {
 		StorageSourceConfig refreshStorageSourceConfig =
 				storageSourceConfigService.findByStorageIdAndName(storageId, StorageConfigConstant.REFRESH_TOKEN_KEY);
-		
+
 		String paramStr = "client_id=" + param.getClientId() +
 				"&client_secret=" + param.getClientSecret() +
 				"&refresh_token=" + refreshStorageSourceConfig.getValue() +
 				"&grant_type=refresh_token" +
 				"&access_type=offline";
-		
+
 		log.info("存储源 {}({}) 尝试刷新令牌", storageId, this.getStorageTypeEnum().getDescription());
-		
+
 		if (log.isDebugEnabled()) {
 			log.debug("存储源 {}({}) 尝试刷新令牌, 参数信息为: {}", storageId, this.getStorageTypeEnum().getDescription(), param);
 		}
-		
+
 		HttpRequest post = HttpUtil.createPost(REFRESH_TOKEN_URL);
-		
+
 		post.body(paramStr);
 		HttpResponse response = post.execute();
 		String responseBody = response.body();
-		
+
 		log.info("存储源 {}({}) 刷新令牌完成, 响应信息为: httpStatus: {}", storageId, this.getStorageTypeEnum().getDescription(), response.getStatus());
-		
+
 		if (log.isDebugEnabled()) {
 			log.debug("存储源 {}({}) 刷新令牌完成, 响应信息为: {}", storageId, this.getStorageTypeEnum().getDescription(), responseBody);
 		}
-		
-		
+
+
 		JSONObject jsonBody = JSONObject.parseObject(responseBody);
-		
+
 		if (response.getStatus() != HttpStatus.OK.value()) {
 			return OAuth2TokenDTO.fail(param.getClientId(), param.getClientSecret(), param.getRedirectUri(), responseBody);
 		}
-		
+
 		String accessToken = jsonBody.getString("access_token");
 		return OAuth2TokenDTO.success(param.getClientId(), param.getClientSecret(), param.getRedirectUri(), accessToken, null, responseBody);
 	}
-	
+
 	/**
 	 * 刷新当前存储源 AccessToken
 	 */
@@ -357,15 +369,15 @@ public class GoogleDriveServiceImpl extends AbstractProxyTransferService<GoogleD
 	public void refreshAccessToken() {
 		try {
 			OAuth2TokenDTO refreshToken = getRefreshToken();
-			
+
 			if (refreshToken.getAccessToken() == null) {
 				throw new StorageSourceRefreshTokenException("存储源刷新令牌失败, 获取到令牌为空.", storageId);
 			}
-			
+
 			StorageSourceConfig accessTokenConfig =
 					storageSourceConfigService.findByStorageIdAndName(storageId, StorageConfigConstant.ACCESS_TOKEN_KEY);
 			accessTokenConfig.setValue(refreshToken.getAccessToken());
-			
+
 			storageSourceConfigService.updateBatch(storageId, Collections.singletonList(accessTokenConfig));
 			RefreshTokenCacheBO.putRefreshTokenInfo(storageId, RefreshTokenCacheBO.RefreshTokenInfo.success());
 			param.setAccessToken(refreshToken.getAccessToken());
@@ -376,7 +388,7 @@ public class GoogleDriveServiceImpl extends AbstractProxyTransferService<GoogleD
 			throw new StorageSourceRefreshTokenException("存储源刷新令牌失败，获取时发生异常", e, storageId);
 		}
 	}
-	
+
 	/**
 	 * 转换 api 返回的 json array 为 zfile 文件对象列表
 	 *
@@ -390,15 +402,15 @@ public class GoogleDriveServiceImpl extends AbstractProxyTransferService<GoogleD
 	 */
 	public List<FileItemResult> jsonArrayToFileList(JSONArray jsonArray, String folderPath) {
 		ArrayList<FileItemResult> fileList = new ArrayList<>();
-		
+
 		for (int i = 0; i < jsonArray.size(); i++) {
 			fileList.add(jsonObjectToFileItem(jsonArray.getJSONObject(i), folderPath));
 		}
-		
+
 		return fileList;
 	}
-	
-	
+
+
 	/**
 	 * 转换 api 返回的 json object 为 zfile 文件对象
 	 *
@@ -415,62 +427,62 @@ public class GoogleDriveServiceImpl extends AbstractProxyTransferService<GoogleD
 		fileItemResult.setName(jsonObject.getString("name"));
 		fileItemResult.setPath(folderPath);
 		fileItemResult.setSize(jsonObject.getLong("size"));
-		
+
 		String mimeType = jsonObject.getString("mimeType");
 		if (ObjectUtil.equals(SHORTCUT_MIME_TYPE, mimeType)) {
 			JSONObject shortcutDetails = jsonObject.getJSONObject("shortcutDetails");
 			mimeType = shortcutDetails.getString("targetMimeType");
 		}
-		
+
 		if (StrUtil.equals(mimeType, FOLDER_MIME_TYPE)) {
 			fileItemResult.setType(FileTypeEnum.FOLDER);
 		} else {
 			fileItemResult.setType(FileTypeEnum.FILE);
 			fileItemResult.setUrl(getDownloadUrl(StringUtils.concat(folderPath, fileItemResult.getName())));
 		}
-		
+
 		fileItemResult.setTime(jsonObject.getDate("modifiedTime"));
-		
+
 		if (fileItemResult.getSize() == null) {
 			fileItemResult.setSize(-1L);
 		}
-		
+
 		return fileItemResult;
 	}
-	
-	
+
+
 	/**
 	 * 请求参数类
 	 */
 	@Data
 	class GoogleDriveAPIParam {
-		
+
 		private final Integer DEFAULT_PAGE_SIZE = 1000;
-		
+
 		// 存储源 id
 		private String driveId;
-		
+
 		// 是否返回共享驱动器或团队盘的内容
 		private boolean includeItemsFromAllDrives;
-		
+
 		// 查询适用的文件分组, 支持 'user', 'drive', 'allDrives'
 		private String corpora;
-		
+
 		// 请求的应用程序是否同时支持“我的云端硬盘”和共享云端硬盘
 		private boolean supportsAllDrives;
-		
+
 		// 请求的字段
 		private String fields;
-		
+
 		// 查询参数
 		private String q;
-		
+
 		// 每页多少条
 		private Integer pageSize;
-		
+
 		// 下页的页码
 		private String pageToken;
-		
+
 		/**
 		 * 根据路径获取 id 的 api 请求参数
 		 *
@@ -479,20 +491,20 @@ public class GoogleDriveServiceImpl extends AbstractProxyTransferService<GoogleD
 		 */
 		public String getDriveIdByPathParam(String folderPath, String parentId) {
 			GoogleDriveAPIParam googleDriveApiParam = getBasicParam();
-			
+
 			String parentIdParam = "";
-			
+
 			if (StrUtil.isNotEmpty(parentId)) {
 				parentIdParam = "'" + parentId + "' in parents and ";
 			}
-			
-			googleDriveApiParam.setFields("files(id)");
+
+			googleDriveApiParam.setFields("files(id,shortcutDetails)");
 			googleDriveApiParam.setQ(parentIdParam + " name = '" + folderPath + "'  and trashed = false");
-			
+
 			return googleDriveApiParam.toString();
 		}
-		
-		
+
+
 		/**
 		 * 根据路径获取 id 的 api 请求参数
 		 *
@@ -504,15 +516,15 @@ public class GoogleDriveServiceImpl extends AbstractProxyTransferService<GoogleD
 		 */
 		public String getFileListParam(String folderId, String pageToken) {
 			GoogleDriveAPIParam googleDriveAPIParam = getBasicParam();
-			
+
 			googleDriveAPIParam.setFields("files(id,name,mimeType,shortcutDetails,size,modifiedTime),nextPageToken");
 			googleDriveAPIParam.setQ("'" + folderId + "' in parents and trashed = false");
 			googleDriveAPIParam.setPageToken(pageToken);
 			googleDriveAPIParam.setPageSize(DEFAULT_PAGE_SIZE);
 			return googleDriveAPIParam.toString();
 		}
-		
-		
+
+
 		/**
 		 * 根据关键字和路径搜索文件 api 请求参数
 		 *
@@ -527,41 +539,41 @@ public class GoogleDriveServiceImpl extends AbstractProxyTransferService<GoogleD
 		 */
 		public String getSearchParam(String folderId, String pageToken, String keyword) {
 			GoogleDriveAPIParam googleDriveAPIParam = getBasicParam();
-			
+
 			String parentIdParam = "";
 			if (StrUtil.isNotEmpty(folderId)) {
 				parentIdParam = "'" + folderId + "' in parents and ";
 			}
-			
+
 			googleDriveAPIParam.setFields("files(id,name,mimeType,shortcutDetails,size,modifiedTime),nextPageToken");
 			googleDriveAPIParam.setQ(parentIdParam + " name contains '" + keyword + "' and trashed = false");
 			googleDriveAPIParam.setPageToken(pageToken);
 			googleDriveAPIParam.setPageSize(DEFAULT_PAGE_SIZE);
 			return googleDriveAPIParam.toString();
 		}
-		
-		
+
+
 		/**
 		 * 判断是否是团队盘，填充基础参数
 		 */
 		public GoogleDriveAPIParam getBasicParam() {
 			GoogleDriveAPIParam googleDriveAPIParam = new GoogleDriveAPIParam();
 			String driveId = param.getDriveId();
-			
+
 			// 判断是否是团队盘，如果是，则需要添加团队盘的参数
 			boolean isTeamDrive = StrUtil.isNotEmpty(driveId);
-			
+
 			googleDriveAPIParam.setCorpora("user");
+			googleDriveAPIParam.setIncludeItemsFromAllDrives(true);
+			googleDriveAPIParam.setSupportsAllDrives(true);
 			if (isTeamDrive) {
 				googleDriveAPIParam.setDriveId(driveId);
-				googleDriveAPIParam.setIncludeItemsFromAllDrives(true);
-				googleDriveAPIParam.setSupportsAllDrives(true);
 				googleDriveAPIParam.setCorpora("drive");
 			}
-			
+
 			return googleDriveAPIParam;
 		}
-		
+
 		/**
 		 * 请求对象转 url param string
 		 *
@@ -570,26 +582,26 @@ public class GoogleDriveServiceImpl extends AbstractProxyTransferService<GoogleD
 		@Override
 		public String toString() {
 			Field[] fields = ReflectUtil.getFields(this.getClass());
-			
+
 			StringBuilder param = new StringBuilder();
-			
+
 			for (Field field : fields) {
 				if (StrUtil.startWith(field.getName(), "this")) {
 					continue;
 				}
 				Object fieldValue = ReflectUtil.getFieldValue(this, field);
-				
+
 				if (ObjectUtil.isNotEmpty(fieldValue) && ObjectUtil.notEqual(fieldValue, false)) {
 					param.append(field.getName()).append("=").append(fieldValue).append("&");
 				}
 			}
-			
+
 			param.deleteCharAt(param.length() - 1);
 			return param.toString();
 		}
 	}
-	
-	
+
+
 	/**
 	 * 检查 http 响应是否为 5xx, 如果是，则抛出异常
 	 *
@@ -604,7 +616,7 @@ public class GoogleDriveServiceImpl extends AbstractProxyTransferService<GoogleD
 			throw new HttpResponseStatusErrorException(msg);
 		}
 	}
-	
+
 	/**
 	 * 检查 http 响应是否为 5xx, 如果是，则抛出异常  (http client)
 	 *