--no commit message

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

@@ -3,6 +3,7 @@ package com.zrqx.file.controller;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
+import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -10,6 +11,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import javax.servlet.http.HttpServletRequest;
+
 import nl.siegmann.epublib.domain.TOCReference;
 
 import org.slf4j.Logger;
@@ -51,7 +54,8 @@ public class EpubController {
 
 	@ApiOperation(value = "epub上传 返回token")
 	@RequestMapping(value = "/upload", method = RequestMethod.POST)
-	public String upload(String code, @RequestParam("file") MultipartFile file) {
+	public String upload(String code, @RequestParam("file") MultipartFile file,HttpServletRequest request) throws Exception {
+		request.setCharacterEncoding("UTF-8");
 		BookUtil bu = new BookUtil();
 		String token = "";
 		try {

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

@@ -12,6 +12,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.TimeZone;
 
+import javax.servlet.http.HttpServletRequest;
+
 import org.apache.commons.net.ftp.FTPClient;
 import org.apache.commons.net.ftp.FTPClientConfig;
 import org.apache.commons.net.ftp.FTPFile;
@@ -29,14 +31,12 @@ import org.springframework.web.multipart.MultipartFile;
 
 import com.zrqx.core.exception.BaseException;
 import com.zrqx.core.model.file.FileInfo;
-import com.zrqx.core.model.resource.ebook.Ebook;
 import com.zrqx.core.util.CallBack;
 import com.zrqx.core.vo.book.EpubVo;
 import com.zrqx.file.commons.Redis;
 import com.zrqx.file.config.FTPConfig;
 import com.zrqx.file.service.FileService;
 import com.zrqx.file.util.BookUtil;
-import com.zrqx.file.util.EpubUtil;
 import com.zrqx.file.util.MockMultipartFile;
 
 import io.swagger.annotations.Api;
@@ -392,13 +392,15 @@ public class FTPController {
 	 *            remoteDirectory
 	 * @param @return
 	 * @return boolean
+	 * @throws Exception 
 	 * @throws @author
 	 *             lizhuo
 	 * @date 2019年2月1日
 	 */
 	@ApiOperation(value = "文件夹解析")
 	@RequestMapping(value = "analysis/directory", method = RequestMethod.GET)
-	public CallBack<List<String>> analysisDirectory() {
+	public CallBack<List<String>> analysisDirectory(HttpServletRequest request) throws Exception {
+		request.setCharacterEncoding("UTF-8");
 		this.ftpLogin();
 		String code = "00";
 		String remoteDirectory = "/book";

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

@@ -7,6 +7,7 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
 import java.nio.channels.FileChannel;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -75,7 +76,8 @@ public class FileController {
 	// 处理文件上传
 	@ApiOperation(value = "文件上传 返回唯一标识")
 	@RequestMapping(value = "/upload", method = RequestMethod.POST)
-	public String uploadImg(@RequestParam("file") MultipartFile file) {
+	public String uploadImg(@RequestParam("file") MultipartFile file,HttpServletRequest request) throws Exception {
+		request.setCharacterEncoding("UTF-8");
 		FileInfo entity = service.uploadFile(file);
 		if (!service.insert(entity)) {
 			throw new BaseException("上传失败！");
@@ -95,7 +97,8 @@ public class FileController {
 
 	@ApiOperation(value = "文件上传 返回文件详细信息")
 	@RequestMapping(value = "/upload/info", method = RequestMethod.POST)
-	public FileInfo upload(@RequestParam("file") MultipartFile file) {
+	public FileInfo upload(@RequestParam("file") MultipartFile file,HttpServletRequest request) throws Exception {
+		request.setCharacterEncoding("UTF-8");
 		FileInfo entity = service.uploadFile(file);
 		if (!service.insert(entity)) {
 			throw new BaseException("上传失败！");
@@ -472,8 +475,9 @@ public class FileController {
 	// 处理文件上传
 	@ApiOperation(value = "文件上传")
 	@RequestMapping(value = "/upload/zip", method = RequestMethod.POST)
-	public List<Map<String, String>> upload(@RequestParam("file") MultipartFile file, HttpServletRequest request)
+	public List<Map<String, String>> uploadzip(@RequestParam("file") MultipartFile file, HttpServletRequest request)
 			throws Exception {
+		request.setCharacterEncoding("UTF-8");
 		String contentType = file.getContentType();
 
 		// 获取文件的后缀名