fix

src/main/java/cn/com/qmth/importpaper/ClearProp.java

@@ -14,17 +14,17 @@ import okhttp3.Response;
 public class ClearProp {
 
 	private static Logger logger = LogManager.getLogger(ClearProp.class);
-//	private static String batch = "230517";
-//	private static String host = "http://192.168.1.249:8008";
-//	private static String rootOrgId = "17351";
-//	private static String key = "U_C_17351_646523";
-//	private static String token = "eefd4ae8b29a4a61a85a9e56f56275f9";
-	
 	private static String batch = "230517";
-	private static String host = "http://localhost:8008";
-	private static String rootOrgId = "149";
-	private static String key = "U_C_149_170";
-	private static String token = "cac2f518a68346fe860fcb8a616bb458";
+	private static String host = "https://ynou.exam-cloud.cn";
+	private static String rootOrgId = "17351";
+	private static String key = "U_C_17351_646523";
+	private static String token = "4982461411c04d15a26cc2130a373a6f";
+	
+//	private static String batch = "230517";
+//	private static String host = "http://localhost:8008";
+//	private static String rootOrgId = "149";
+//	private static String key = "U_C_149_170";
+//	private static String token = "cac2f518a68346fe860fcb8a616bb458";
 
 	public static void main(String[] args) {
 		logger.debug("**********************开始");
@@ -51,6 +51,7 @@ public class ClearProp {
 			throw new RuntimeException(e);
 		} finally {
 			IOUtils.closeQuietly(resp);
+			OKHttpUtil.close();
 		}
 	}
 

src/main/java/cn/com/qmth/importpaper/ImportPaperByCourse.java

@@ -13,15 +13,15 @@ public class ImportPaperByCourse {
 	private static Logger logger = LogManager.getLogger(ImportPaperByCourse.class);
 	private final static String sourceDir = "d:/yunkai/";
 
-	private static String host = "http://localhost:8008";
-	private static String rootOrgId = "149";
-	private static String key = "U_C_149_170";
-	private static String token = "cac2f518a68346fe860fcb8a616bb458";
+//	private static String host = "http://localhost:8008";
+//	private static String rootOrgId = "149";
+//	private static String key = "U_C_149_170";
+//	private static String token = "cac2f518a68346fe860fcb8a616bb458";
 	
-//	private static String host = "http://192.168.1.249:8008";
-//	private static String rootOrgId = "17351";
-//	private static String key = "U_C_17351_646523";
-//	private static String token = "8a15aeba624d467baacbea082119f4f6";
+	private static String host = "http://192.168.1.249:8008";
+	private static String rootOrgId = "17351";
+	private static String key = "U_C_17351_646523";
+	private static String token = "96eca58f7102483f97ea4f1c8fbeca64";
 	
 	private static AtomicInteger count=new AtomicInteger(0);
 
@@ -36,11 +36,12 @@ public class ImportPaperByCourse {
 			param.put("key", key);
 			param.put("token", token);
 			MyProducer pro=new MyProducer();
-			pro.startDispose(MyConsumer.class, 8, param);
+			pro.startDispose(MyConsumer.class, 2, param);
 		} catch (Exception e) {
 			logger.error(e.getCause(), e);
 		}
 		Date end=new Date();
+		OKHttpUtil.close();
 		logger.debug("导入结束，耗时："+((end.getTime()-start.getTime())/1000));
 	}
 

src/main/java/cn/com/qmth/importpaper/ImportPropByCourse.java

@@ -27,17 +27,17 @@ public class ImportPropByCourse {
 	private static Logger logger = LogManager.getLogger(ImportPropByCourse.class);
 	private final static String sourceDir = "d:/yunkai/";
 
-	private static String batch = "230517";
-	private static String host = "http://localhost:8008";
-	private static String rootOrgId = "149";
-	private static String key = "U_C_149_170";
-	private static String token = "cac2f518a68346fe860fcb8a616bb458";
-	
 //	private static String batch = "230517";
-//	private static String host = "http://192.168.1.249:8008";
-//	private static String rootOrgId = "17351";
-//	private static String key = "U_C_17351_646523";
-//	private static String token = "8a15aeba624d467baacbea082119f4f6";
+//	private static String host = "http://localhost:8008";
+//	private static String rootOrgId = "149";
+//	private static String key = "U_C_149_170";
+//	private static String token = "cac2f518a68346fe860fcb8a616bb458";
+	
+	private static String batch = "230517";
+	private static String host = "https://ynou.exam-cloud.cn";
+	private static String rootOrgId = "17351";
+	private static String key = "U_C_17351_646523";
+	private static String token = "4982461411c04d15a26cc2130a373a6f";
 	
 
 	public static void main(String[] args) {
@@ -77,6 +77,7 @@ public class ImportPropByCourse {
 
 		logger.debug("**********************导入出错数：" + errnum);
 		logger.debug("**********************导入出错课程：" + sb.toString());
+		OKHttpUtil.close();
 	}
 
 	private static Map<String,ImportCourse> readSubjectCodes() {

src/main/java/cn/com/qmth/importpaper/MyConsumer.java

@@ -68,8 +68,9 @@ public class MyConsumer extends Consumer<ConsumerDto> {
 	private  void submitZip(ConsumerDto dto,File zfile) {
 		List<String> cs=dto.getIc().getCourses().stream().map(e->e.getCode()).collect(Collectors.toList());
 		Map<String, String> params = Maps.newHashMap();
+		String courseCodes=StringUtils.join(cs,",");
 		params.put("rootOrgId", dto.getRootOrgId());
-		params.put("courseCodes",StringUtils.join(cs,","));
+		params.put("courseCodes",courseCodes);
 		Map<String, String> headers = Maps.newHashMap();
 		headers.put("key", dto.getKey());
 		headers.put("token", dto.getToken());
@@ -80,7 +81,7 @@ public class MyConsumer extends Consumer<ConsumerDto> {
 //			OKHttpUtil.initOkHttpClient();
 			resp = OKHttpUtil.call(HttpMethod.POST, dto.getHost()+"/api/ecs_ques/importYunkaiPaper", headers, params, fileList);
 			if (resp.code() != 200) {
-				throw new Exception(zfile.getName() + ":body:" + resp.body().string());
+				throw new Exception(zfile.getName() +"| courseCodes:"+courseCodes+ "| body:" + resp.body().string());
 			}else {
 				logger.debug("成功处理：" + zfile.getName() );
 			}

src/main/java/cn/com/qmth/importpaper/OKHttpUtil.java

@@ -71,16 +71,21 @@ public class OKHttpUtil {
 
 	private static OkHttpClient okHttpClient;
 
+//	public static void initOkHttpClient() {
 	static {
 		okHttpClient = new OkHttpClient.Builder()
 				.sslSocketFactory(SSLSocketClient.getSSLSocketFactory(), SSLSocketClient.getX509TrustManager())
-				.hostnameVerifier(SSLSocketClient.getHostnameVerifier()).readTimeout(800, TimeUnit.SECONDS)
-				.writeTimeout(800, TimeUnit.SECONDS).build();
+				.hostnameVerifier(SSLSocketClient.getHostnameVerifier()).readTimeout(2000, TimeUnit.SECONDS)
+				.writeTimeout(2000, TimeUnit.SECONDS).build();
 	}
 
 	public static OkHttpClient getOkHttpClient() {
 		return okHttpClient;
 	}
+	
+	public static void close() {
+		okHttpClient.connectionPool().evictAll();
+	}
 
 	/**
 	 * 发送请求 (带json请求体)