--no commit message

app/file/src/main/java/com/zrqx/file/commons/model/AppVersionRecord.java

@@ -5,7 +5,6 @@ import java.util.Date;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.Table;
-import javax.persistence.Transient;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

app/file/src/main/java/com/zrqx/file/commons/model/ChapterLibrary.java

 package com.zrqx.file.commons.model;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 
@@ -23,7 +22,7 @@ import lombok.Data;
 */ 
 @Data
 @ApiModel(value="chapterLibrary",description="文章库")
-@Table(name = "res_chapter_Library")
+@Table(name = "res_chapter_library")
 public class ChapterLibrary implements java.io.Serializable {
 
 	// Fields

app/file/src/main/java/com/zrqx/file/mapper/FileMapper.java

 package com.zrqx.file.mapper;
 
+import java.util.List;
+
+import org.apache.ibatis.annotations.Select;
+
 import com.zrqx.core.commons.model.file.FileInfo;
 import com.zrqx.core.mapper.BaseMapper;
 
 public interface FileMapper extends BaseMapper<FileInfo>{
+	
+	@Select("<script>" 
+		 	+ "SELECT * FROM fileinfo where suffixName='.jpg' or suffixName='.png' or suffixName='.gif' or suffixName='.jpeg' or suffixName='.JPG' or suffixName='.wbmp'" 
+		    + "</script>")
+	List<FileInfo> selectImages();
 
 }

app/file/src/main/java/com/zrqx/file/service/FileService.java

@@ -2,6 +2,7 @@ package com.zrqx.file.service;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.List;
 
 import org.springframework.web.multipart.MultipartFile;
 
@@ -22,4 +23,6 @@ public interface FileService extends BaseService<FileInfo, Integer>{
 	 * @date: 2019年11月18日 下午4:52:31
 	 */
 	FileInfo uploadImg(MultipartFile file,String type);
+	
+	public List<FileInfo> selectImages();
 }

app/file/src/main/java/com/zrqx/file/service/impl/FileServiceImpl.java

@@ -7,6 +7,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.List;
 
 import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
@@ -93,11 +94,13 @@ public class FileServiceImpl extends BaseServiceImpl<FileInfo, Integer> implemen
 			entity.setContentType(contentType);
 			entity.setSize(file.getSize());
 			entity.setCreateTime(new Date());
-			if (entity.getOriginalFileName().contains(".pdf")) {
-				String param = "pdfFilename=" + entity.getPath() + "/" + entity.getFileName() + ".pdf" + "&pdfSlice=10";
-				String url = "http://192.168.2.173:8690/file/dividePDFByPage?" + param;
-				HttpClientUtil.doGet(url, "utf-8");
-			}
+			/*
+			 * if (entity.getOriginalFileName().contains(".pdf")) { String param =
+			 * "pdfFilename=" + entity.getPath() + "/" + entity.getFileName() + ".pdf" +
+			 * "&pdfSlice=10"; String url =
+			 * "http://192.168.2.173:8690/file/dividePDFByPage?" + param;
+			 * HttpClientUtil.doGet(url, "utf-8"); }
+			 */
 		} catch (Exception e) {
 			logger.error("上传异常：" + e);
 			e.printStackTrace();
@@ -275,5 +278,11 @@ public class FileServiceImpl extends BaseServiceImpl<FileInfo, Integer> implemen
 		
 		return entity;
 	}
+
+	@Override
+	public List<FileInfo> selectImages() {
+		List<FileInfo> list = mapper.selectImages();
+		return list;
+	}
 	
 }

app/file/src/main/java/com/zrqx/file/util/EpubUtil.java

@@ -167,7 +167,6 @@ public class EpubUtil {
 				new MediaType("image/png","png")
 				);
 	}
-	
 	/**
 	 *获取根据阅读顺序获取图书的内容资源（html）文件资源
 	 * @return