--no commit message

app/file/src/main/java/com/zrqx/file/controller/FileController.java

@@ -808,20 +808,21 @@ public class FileController {
 	}
 	@ApiOperation(value = "生成缩略图")
 	@RequestMapping(value = "/images", method = RequestMethod.GET)
-	public void getImages() {
+	public int getImages() {
+		int i=0;
 		try {
 			float width = 165;
 			float height = 215;
-
+			
 			BufferedImage image = null;
 			BufferedImage bfImage = null;
 			FileOutputStream os = null;
-			List<FileInfo> list = service.selectAll();
+			List<FileInfo> list = service.selectImages();
 			for (FileInfo fileInfo : list) {
-				if(fileInfo.getSuffixName().contains(".jpg") || fileInfo.getSuffixName().contains(".JPG") || 
+				/*if(fileInfo.getSuffixName().contains(".jpg") || fileInfo.getSuffixName().contains(".JPG") || 
 				   fileInfo.getSuffixName().contains(".png") || fileInfo.getSuffixName().contains(".jpeg")||
 				   fileInfo.getSuffixName().contains(".gif") || fileInfo.getSuffixName().contains(".bmp") ||
-				   fileInfo.getSuffixName().contains(".wbmp")) {
+				   fileInfo.getSuffixName().contains(".wbmp")) {*/
 					String fileName=fileInfo.getOriginalFileName();
 					String path=fileInfo.getPath();
 					
@@ -845,7 +846,6 @@ public class FileController {
 		            }// 类型和图片后缀全部小写，然后判断后缀是否合法
 		            if(suffix == null || types.toLowerCase().indexOf(suffix.toLowerCase()) < 0){
 		            	logger.error("Sorry, the image suffix is illegal. the standard image suffix is {}." + types);
-		                return ;
 		            }
 		            
 					int index = newUrl.lastIndexOf("/");
@@ -854,7 +854,7 @@ public class FileController {
 					String newPath = newUrl.substring(0, index + 1) + newName;
 					
 					image = ImageIO.read(imgFile);
-
+					
 					// 获得缩放的比例
 					double ratio = 1.0;
 					// 判断如果高、宽都不大于设定值，则不处理
@@ -874,14 +874,16 @@ public class FileController {
 
 					os = new FileOutputStream(newPath);
 					ImageIO.write(bfImage, "jpeg", os);
+					i++;
 					os.flush();
 					os.close();
 				}
-			}
+			//}
 		} catch (Exception e) {
 			System.out.println("创建缩略图发生异常" + e.getMessage());
 			e.printStackTrace();
 		}
+		return i;
 	}
 
 }