Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-biz/amos-boot-module-avic-biz/src/main/java/com/yeejoin/amos/avic/controller/WebServicesFileFransferResource.java

@@ -6,8 +6,10 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -21,6 +23,8 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.apache.cxf.endpoint.Client;
 import org.apache.cxf.jaxws.endpoint.dynamic.JaxWsDynamicClientFactory;
+import org.apache.cxf.transport.http.HTTPConduit;
+import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -77,6 +81,9 @@ public class WebServicesFileFransferResource {
 
 	@Value(value = "${upload.temp.dir}")
 	String tempDir;
+	
+	
+	SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSSS");
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@ApiOperation(value = "文件下载")
@@ -130,8 +137,9 @@ public class WebServicesFileFransferResource {
 		}
 		String fileName = file.getOriginalFilename();
 		String suffixName = fileName.substring(fileName.lastIndexOf("."));
+		String name = fileName.substring(0, fileName.lastIndexOf(".") -1);
 		String filePath = tempDir;
-		fileName = UUID.randomUUID() + suffixName;
+		fileName = name + "-" + sdf.format(new Date()) + suffixName;
 		File dest = new File(filePath + fileName);
 		if (!dest.getParentFile().exists()) {
 			dest.getParentFile().mkdirs();
@@ -210,6 +218,11 @@ public class WebServicesFileFransferResource {
 		try {
 			JaxWsDynamicClientFactory dcf = JaxWsDynamicClientFactory.newInstance();
 			Client client = dcf.createClient(webserviceUrl);
+			HTTPConduit conduit = (HTTPConduit) client.getConduit();
+	        HTTPClientPolicy policy = new HTTPClientPolicy();
+	        policy.setConnectionTimeout(1000000); // 连接超时时间
+	        policy.setReceiveTimeout(1000000);// 请求超时时间.
+	        conduit.setClient(policy);
 			if (ObjectUtils.isEmpty(transferModel.getAvicCode())) {
 				for (String file : transferModel.getFiles().stream().map(m -> m.getUrl())
 						.collect(Collectors.toList())) {