图片旋转处理宽高

ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/AdminStorageController.java

@@ -92,8 +92,7 @@ public class AdminStorageController {
 		} catch (Exception e) {
 			logger.error("get image  size failed : ", e);
 		}
-		String url = storageService.store(targetInput, file.getSize(), file.getContentType(),
-				name, MediaUtil.isRotation(file));
+		String url = storageService.store(targetInput, file.getSize(), file.getContentType(), name);
 		Map<String, Object> data = new HashMap<>();
 		data.put("url", url);
 		logger.info("【请求结束】系统管理->对象存储->查询:响应结果:{}", JSONObject.toJSONString(data));

ch-core/src/main/java/com/wwdz/ch/core/qcode/QCodeService.java

@@ -66,7 +66,7 @@ public class QCodeService {
 			byte[] imageData = drawPicture(inputStream, goodPicUrl,goodName,price);
 			ByteArrayInputStream inputStream2 = new ByteArrayInputStream(imageData);
 			// 存储分享图
-			String url = storageService.store(inputStream2, imageData.length, "image/jpeg", getKeyName(goodId), false);
+			String url = storageService.store(inputStream2, imageData.length, "image/jpeg", getKeyName(goodId));
 			logger.info("创建商品分享图 URL:{}",url);
 			return url;
 		} catch (WxErrorException e) {
@@ -215,7 +215,7 @@ public class QCodeService {
 			FileInputStream inputStream = new FileInputStream(file);
 			
 			fileStream = new FileInputStream(file);
-			url = storageService.store(inputStream, fileStream.available(), "image/jpeg", getShareUserKey(userId), false);
+			url = storageService.store(inputStream, fileStream.available(), "image/jpeg", getShareUserKey(userId));
 			logger.info("创建商品分享图 URL:{}",url);
 			
 		} catch (WxErrorException e) {
@@ -277,7 +277,7 @@ public class QCodeService {
 			byte[] imageData = drawTopicPicture(inputStream, picUrl,subtitle,price);
 			ByteArrayInputStream inputStream2 = new ByteArrayInputStream(imageData);
 			// 存储分享图
-			String url = storageService.store(inputStream2, imageData.length, "image/jpeg", getTopicKey(topicId),false);
+			String url = storageService.store(inputStream2, imageData.length, "image/jpeg", getTopicKey(topicId));
 			logger.info("创建活动主题分享图 URL:{}",url);
 			return url;
 		} catch (WxErrorException e) {
@@ -363,7 +363,7 @@ public class QCodeService {
 			byte[] imageData = drawBrandPicture(inputStream, picUrl,name,defaultCategory);
 			ByteArrayInputStream inputStream2 = new ByteArrayInputStream(imageData);
 			// 存储分享图
-			String url = storageService.store(inputStream2, imageData.length, "image/jpeg", getBrandKey(brandId), false);
+			String url = storageService.store(inputStream2, imageData.length, "image/jpeg", getBrandKey(brandId));
 			logger.info("创建品牌商铺主题分享图 URL:{}",url);
 			return url;
 		} catch (WxErrorException e) {

ch-core/src/main/java/com/wwdz/ch/core/storage/StorageService.java

@@ -67,7 +67,7 @@ public class StorageService {
 	 * @param fileName
 	 *            文件索引名
 	 */
-	public String store(InputStream inputStream, long contentLength, String contentType, String fileName, boolean rotation) {
+	public String store(InputStream inputStream, long contentLength, String contentType, String fileName) {
 		BufferedImage bufferedImage = null;
 		try {
 			bufferedImage = ImageIO.read(inputStream);
@@ -75,14 +75,9 @@ public class StorageService {
 			logger.error("存储图片error:{}", e);
 		}
 		String type = MediaTypeEnum.getByMime(contentType) == null ? MediaTypeEnum.IMAGE_JPG.getExt() : MediaTypeEnum.getByMime(contentType).getExt();
-		String keyName;
 		//宽x高
-		if (rotation) {
-			keyName = CommConsts.UPLOAD_PRE_DIRECTORY + CommonUtils.getUUID() + "_" + bufferedImage.getHeight() + "x" + bufferedImage.getWidth() + "." + type;
-		} else {
-			keyName = CommConsts.UPLOAD_PRE_DIRECTORY + CommonUtils.getUUID() + "_" + bufferedImage.getWidth() + "x" + bufferedImage.getHeight() + "." + type;
-		}
-		logger.info("上传图片 ============== rotation:{}, height:{}, width:{}", rotation, bufferedImage.getHeight(), bufferedImage.getWidth());
+		String keyName = CommConsts.UPLOAD_PRE_DIRECTORY + CommonUtils.getUUID() + "_" + bufferedImage.getWidth() + "x" + bufferedImage.getHeight() + "." + type;
+		logger.info("上传图片 ============== height:{}, width:{}", bufferedImage.getHeight(), bufferedImage.getWidth());
 		InputStream imageStream = bufferedImageToInputStream(bufferedImage, type);
 		storage.store(imageStream, contentLength, contentType, keyName);
 		return generateUrl(keyName);

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/ItemServiceImpl.java

@@ -1130,7 +1130,7 @@ public class ItemServiceImpl implements ItemService {
                 logger.error("get image  size failed : ", e);
             }
             String originalFilename = file.getOriginalFilename();
-            String url = storageService.store(targetInput, file.getSize(), file.getContentType(), originalFilename, MediaUtil.isRotation(file));
+            String url = storageService.store(targetInput, file.getSize(), file.getContentType(), originalFilename);
             Map<String, Object> map = new HashMap<>();
             map.put("url", url);
             return Result.success(map);

ch-wx-api/src/main/java/com/wwdz/ch/wx/web/WxStorageController.java

@@ -95,9 +95,7 @@ public class WxStorageController {
 			logger.error("get image  size failed : ", e);
 		}
 
-		String url = storageService.store(targetInput, file.getSize(), file.getContentType(),
-				originalFilename, MediaUtil.isRotation(file));
-
+		String url = storageService.store(targetInput, file.getSize(), file.getContentType(), originalFilename);
 		Map<String, Object> data = new HashMap<>();
 		data.put("url", url);