--no commit message

com.zrqx.file/src/main/java/com/zrqx/file/controller/EpubController.java

@@ -81,7 +81,7 @@ public class EpubController {
 		// epub解析方法类
 		EpubResolve er = new EpubResolve();
 		//book.setNationsType(nationsType);
-		epubUtil.setEpubFile(file.getInputStream());
+		//epubUtil.setEpubFile(file.getInputStream());
  		FileInfo entity = er.uploadFile(file, rootPath + fileName);
 		if (!service.insert(entity)) {
 			throw new BaseException("上传失败！");

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

@@ -299,6 +299,8 @@ public class EpubUtil {
 				if(p.contains("-")){
 					publisher = publisher + "、" + p;
 					break;
+				}else {
+					publisher = p;
 				}
 			}
 		} catch (Exception e) {