utils

WebRoot/index.html

@@ -5,7 +5,7 @@
     <meta charset='UTF-8'>
     <meta http-equiv='X-UA-Compatible' content='IE=edge'>
     <meta name='viewport' content='width=device-width, initial-scale=1.0'>
-    <title>顺诚百宝箱</title>
+    <title>支付测试- 顺诚百宝箱</title>
     <style>
         * {
             margin: 10px auto;
@@ -39,7 +39,7 @@
             }
 
             let response = await fetch('/pay/createOrder?n=' + n + '&t=test');
-            let res = eval("(" + await response.text() + ")");
+            let res = JSON.parse(await response.text());
 
             if (res.code == 1) {
 
@@ -54,7 +54,7 @@
                     alert('获取二维码失败');
                     return;
                 }
-                $('.imgs').html("<img src='data:image/jpg;base64," + img + "'><br><a href='" + code + "'>手机点这里打开支付宝APP</a><br>使用支付宝扫一扫<br><button onclick='selectPay(" + id + ")'>查询支付状态</button> <button onclick='getPayQr()'>刷新二维码</button>");
+                $('.imgs').html("<img src='data:image/jpg;base64," + img + "'><br><a href='alipays://platformapi/startapp?saId=10000007&qrcode=" + code + "'>手机点这里打开支付宝APP</a><br>使用支付宝扫一扫<br><button onclick='selectPay(" + id + ")'>查询支付状态</button> <button onclick='getPayQr()'>刷新二维码</button>");
                 subscribe(id);
 
             } else alert('遇到错误 ' + res.msg);
@@ -77,7 +77,7 @@
                 await subscribe(id);
             } else {
                 // 获取并显示消息
-                let message = eval("(" + await response.text() + ")");
+                let message = JSON.parse(await response.text());
 
                 // 再次调用 subscribe() 以获取下一条消息
                 if (message.msg == "已支付") {
@@ -94,7 +94,7 @@
          */
         async function selectPay(id) {
             let response = await fetch('/pay/queryPay?id=' + id);
-            let res = eval("(" + await response.text() + ")");
+            let res = JSON.parse(await response.text());
 
             if (response.status == 200 && res.msg == "已支付") {
                 return okPay();

src/sc545/pay/utils/FileUtils.java

@@ -359,7 +359,7 @@ public static String putImg(ServletContext servletContext,MultipartFile file,Str
         	saveSql(realurl, towhere,fileName);
     }
     
-	if(servletContext != null) return "/getFile/"+rid;
+    if(servletContext != null) return "/getImg/"+rid;
     else return realurl;
 }
 
@@ -452,7 +452,7 @@ public static String putImgAsName(ServletContext servletContext,MultipartFile fi
         	saveSql(realurl, towhere,fileName);
     }
 
-    if(servletContext != null) return "/getFile/"+rid;
+    if(servletContext != null) return "/getImg/"+rid;
     else return realurl;
 }
 
@@ -548,7 +548,7 @@ public static String putVideo(ServletContext servletContext,MultipartFile file,S
         	saveSql(realurl, towhere,fileName);
     }
 
-    if(servletContext != null) return "/getFile/"+rid;
+    if(servletContext != null) return "/getImg/"+rid;
     else return realurl;
 }
 
@@ -669,8 +669,8 @@ public static void saveSql(String realurl, String towhere, String saveName) {
 		String msid = towhere.split("#")[1];
 		String mstag = towhere.split("#")[2];
 		
-	    if(realurl.indexOf("/getFile/")==0) {
+	    if(realurl.indexOf("/getImg/")==0) {
-	    	realurl=realurl.replace("/getFile/", "");
+	    	realurl=realurl.replace("/getImg/", "");
 	    	if(db.execSql("select * from savefile where id = '"+realurl+"'", null)>0){//已存在
 				db.execUpdate("update savefile set mstab=?,msid=?,mstag=?,savename=? where id=?",  new String[]{mstab.trim(),msid.trim(),mstag.trim(),realurl.trim(),saveName==null?"":saveName.trim()});
 			}else{//不存在
@@ -780,8 +780,8 @@ public static void delfile(ServletContext servletContext, String path) {
 		if(path.indexOf(":") <= 0)
 			path1 = "D:\\" + path;
 	} else {
-		if(path.indexOf("/getFile/")==0){
+		if(path.indexOf("/getImg/")==0){
-			String rid = path.replace("/getFile/", "");
+			String rid = path.replace("/getImg/", "");
 			DBUtil db = new DBUtil();
 			List<Map<String, Object>> rs = db.execQuery("select * from savefile where id ="+rid, null);
 			if(rs!=null&&rs.size()>0){ 
@@ -828,8 +828,8 @@ public static void delFileForStr(ServletContext servletContext, String str) {
 			if(path.indexOf(":") <= 0)
 				path1 = "D:\\" + path;
 		} else {
-			if(path.indexOf("/getFile/")==0){
+			if(path.indexOf("/getImg/")==0){
-				String rid = path.replace("/getFile/", "");
+				String rid = path.replace("/getImg/", "");
 				List<Map<String, Object>> rs = db.execQuery("select * from savefile where id ="+rid, null);
 				if(rs!=null&&rs.size()>0){ 
 					oldpath=rs.get(0).get("realurl")+"";
@@ -867,8 +867,8 @@ public static void intoSqlForStr(String str,String towhere,String saveName) {
 		mstag = towhere.split("#")[2];
 	
 	for (String path : imgs) {
-		if(path.indexOf("/getFile/")==0){
+		if(path.indexOf("/getImg/")==0){
-			String rid = path.replace("/getFile/", "");
+			String rid = path.replace("/getImg/", "");
 			List<Map<String, Object>> rs = db.execQuery("select * from savefile where id ="+rid, null);
 			if(rs!=null&&rs.size()>0){ 
 				path=rs.get(0).get("realurl")+"";

src/sc545/pay/utils/HttpUtils.java

@@ -22,7 +22,6 @@ import javax.net.ssl.X509TrustManager;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
 import org.apache.http.NameValuePair;
 import org.apache.http.client.CookieStore;
 import org.apache.http.client.HttpClient;
@@ -49,14 +48,7 @@ import org.apache.http.util.EntityUtils;
  */
 public class HttpUtils {
 
-	private static final CloseableHttpClient httpClient;
 	public static final String CHARSET = "UTF-8";
-	// 采用静态代码块，初始化超时时间配置，再根据配置生成默认httpClient对象
-	static {
-		//10秒相应超时
-		RequestConfig config = RequestConfig.custom().setConnectTimeout(10000).setSocketTimeout(10000).setConnectionRequestTimeout(5000).build();
-		httpClient = HttpClientBuilder.create().setDefaultRequestConfig(config).build();
-	}
 
 	public static String doGet(String url, Map<String, String> params) {
 		return doGet(url, params, CHARSET);
@@ -82,7 +74,10 @@ public class HttpUtils {
 		if (StringUtils.isBlank(url)) {
 			return null;
 		}
-		
+		CloseableHttpResponse response = null;
+		HttpGet httpGet = null;
+		RequestConfig config = RequestConfig.custom().setConnectTimeout(10000).setSocketTimeout(10000).setConnectionRequestTimeout(5000).build();
+		CloseableHttpClient httpClient = HttpClientBuilder.create().setDefaultRequestConfig(config).build();
 		try {
 			if (params != null && !params.isEmpty()) {
 				List<NameValuePair> pairs = new ArrayList<NameValuePair>(params.size());
@@ -95,8 +90,8 @@ public class HttpUtils {
 				// 将请求参数和url进行拼接
 				url += "?" + EntityUtils.toString(new UrlEncodedFormEntity(pairs, charset));
 			}
-			HttpGet httpGet = new HttpGet(url);
+			httpGet = new HttpGet(url);
-			CloseableHttpResponse response = httpClient.execute(httpGet);
+			response = httpClient.execute(httpGet);
 			int statusCode = response.getStatusLine().getStatusCode();
 			if (statusCode != 200) {
 				httpGet.abort();
@@ -114,7 +109,20 @@ public class HttpUtils {
 			return result;
 		} catch (Exception e) {
 			System.out.println("url错误:::"+e.toString());
+			try {
+				response.close();
+			} catch (IOException e1) {
+				e1.printStackTrace();
+			}
 			e.printStackTrace();
+		}finally{
+			try {
+				response.close();
+				httpClient.close();
+				httpGet.reset();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
 		}
 		return null;
 	}
@@ -146,6 +154,8 @@ public class HttpUtils {
 		}
 		HttpPost httpPost = new HttpPost(url);
 		CloseableHttpResponse response = null;
+		RequestConfig config = RequestConfig.custom().setConnectTimeout(10000).setSocketTimeout(10000).setConnectionRequestTimeout(5000).build();
+		CloseableHttpClient httpClient = HttpClientBuilder.create().setDefaultRequestConfig(config).build();
 		try {
 			if (pairs != null && pairs.size() > 0) {
 				httpPost.setEntity(new UrlEncodedFormEntity(pairs, CHARSET));
@@ -165,14 +175,19 @@ public class HttpUtils {
 			EntityUtils.consume(entity);
 			if(!"UTF-8".equals(getEncoding(result))) result=GBKtoUTF8(result);
 			return result;
-		} catch (Exception e) {
+		}catch (Exception e) {
-			return "";
+			System.out.println("url错误:::"+e.toString());
-		} finally {
+			e.printStackTrace();
-			if (response != null)
+		}finally{
-				try {
+			try {
-					response.close();
+				response.close();
-				} catch (IOException e) {}
+				httpClient.close();
+				httpPost.reset();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
 		}
+		return null;
 	}
 
 	/**
@@ -187,7 +202,9 @@ public class HttpUtils {
 		if (StringUtils.isBlank(url)) {
 			return null;
 		}
-		
+		CloseableHttpResponse response = null;
+		HttpGet httpGet = null;
+		CloseableHttpClient httpsClient = null;
 		try {
 			if (params != null && !params.isEmpty()) {
 				List<NameValuePair> pairs = new ArrayList<NameValuePair>(params.size());
@@ -199,11 +216,11 @@ public class HttpUtils {
 				}
 				url += "?" + EntityUtils.toString(new UrlEncodedFormEntity(pairs, charset));
 			}
-			HttpGet httpGet = new HttpGet(url);
+			httpGet = new HttpGet(url);
 
 			// https  注意这里获取https内容，使用了忽略证书的方式，当然还有其他的方式来获取https内容
-			CloseableHttpClient httpsClient = HttpUtils.createSSLClientDefault();
+			httpsClient = HttpUtils.createSSLClientDefault();
-			CloseableHttpResponse response = httpsClient.execute(httpGet);
+			response = httpsClient.execute(httpGet);
 			int statusCode = response.getStatusLine().getStatusCode();
 			if (statusCode != 200) {
 				httpGet.abort();
@@ -218,8 +235,17 @@ public class HttpUtils {
 			response.close();
 			if(!"UTF-8".equals(getEncoding(result))) result=GBKtoUTF8(result);
 			return result;
-		} catch (Exception e) {
+		}catch (Exception e) {
+			System.out.println("url错误:::"+e.toString());
 			e.printStackTrace();
+		}finally{
+			try {
+				response.close();
+				httpsClient.close();
+				httpGet.reset();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
 		}
 		return null;
 	}
@@ -287,6 +313,7 @@ public class HttpUtils {
         CloseableHttpClient client = httpClientBuilder.build();
         client = (CloseableHttpClient) wrapClient(client);
         HttpPost post = new HttpPost(url);
+        CloseableHttpResponse res = null;
         try {
             StringEntity s = new StringEntity(json, "utf-8");
             if (StringUtils.isBlank(contentType)) {
@@ -294,14 +321,23 @@ public class HttpUtils {
             }
             s.setContentType(contentType);
             post.setEntity(s);
-            HttpResponse res = client.execute(post);
+            res = client.execute(post);
             HttpEntity entity = res.getEntity();
             String str = EntityUtils.toString(entity, charset);
             if(!"UTF-8".equals(getEncoding(str))) str=GBKtoUTF8(str);
             return str;
-        } catch (Exception e) {
+        }catch (Exception e) {
-            e.printStackTrace();
+			System.out.println("url错误:::"+e.toString());
-        }
+			e.printStackTrace();
+		}finally{
+			try {
+				res.close();
+				client.close();
+				post.reset();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
         return null;
     }
     
@@ -358,6 +394,8 @@ public class HttpUtils {
 			return false;
 		}
 		HttpGet httpGet = new HttpGet(url);
+		RequestConfig config = RequestConfig.custom().setConnectTimeout(10000).setSocketTimeout(10000).setConnectionRequestTimeout(5000).build();
+		CloseableHttpClient httpClient = HttpClientBuilder.create().setDefaultRequestConfig(config).build();
 		try {
 			CloseableHttpResponse response = httpClient.execute(httpGet);
 			int statusCode = response.getStatusLine().getStatusCode();
@@ -508,12 +546,13 @@ public class HttpUtils {
 		}
 		
 		CloseableHttpResponse response = null;
+		CloseableHttpClient httpClientc = null;
 		try {
 			if (pairs != null && pairs.size() > 0) {
 				httpPost.setEntity(new UrlEncodedFormEntity(pairs, CHARSET));
 			}
 			
-			CloseableHttpClient httpClientc = HttpUtils.createSSLClientCookie(cookie);
+			httpClientc = HttpUtils.createSSLClientCookie(cookie);
 			response = httpClientc.execute(httpPost);
 			int statusCode = response.getStatusLine().getStatusCode();
 			if (statusCode != 200) {
@@ -529,16 +568,28 @@ public class HttpUtils {
 			if(!"UTF-8".equals(getEncoding(result))) result=GBKtoUTF8(result);
 			return result;
 		} catch (Exception e) {
+			System.out.println("url错误:::"+e.toString());
 			e.printStackTrace();
-		} finally {
+		}finally{
-			if (response != null)
+			try {
-				try {
+				response.close();
-					response.close();
+				httpClientc.close();
-				} catch (IOException e) {e.printStackTrace();}
+				httpPost.reset();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
 		}
 		return null;
 	}
 	
+    /**
+     * 带有cookie和header 的get请求
+     * @param url
+     * @param params
+     * @param cookie
+     * @param header
+     * @return
+     */
 	@SuppressWarnings("rawtypes")
 	public static String doGet2(String url, Map<String, String> params, CookieStore cookie,Map<String, String> header,String charset) {
 		if(charset==null||charset.trim().length()<1) charset="UTF-8";
@@ -546,6 +597,9 @@ public class HttpUtils {
 			return null;
 		}
 		
+		HttpGet httpGet = null;
+		CloseableHttpClient httpsClient = null;
+		CloseableHttpResponse response = null;
 		try {
 			if (params != null && !params.isEmpty()) {
 				List<NameValuePair> pairs = new ArrayList<NameValuePair>(params.size());
@@ -557,7 +611,7 @@ public class HttpUtils {
 				}
 				url += "?" + EntityUtils.toString(new UrlEncodedFormEntity(pairs, charset));
 			}
-			HttpGet httpGet = new HttpGet(url);
+			httpGet = new HttpGet(url);
 			
 			Set<Entry<String, String>> set = header.entrySet();
 			Iterator<Entry<String, String>> s = set.iterator();
@@ -567,8 +621,8 @@ public class HttpUtils {
 			}
 
 			// https  注意这里获取https内容，使用了忽略证书的方式，当然还有其他的方式来获取https内容
-			CloseableHttpClient httpsClient = HttpUtils.createSSLClientCookie(cookie);
+			httpsClient = HttpUtils.createSSLClientCookie(cookie);
-			CloseableHttpResponse response = httpsClient.execute(httpGet);
+			response = httpsClient.execute(httpGet);
 			int statusCode = response.getStatusLine().getStatusCode();
 			if (statusCode != 200) {
 				httpGet.abort();
@@ -583,8 +637,17 @@ public class HttpUtils {
 			response.close();
 			if(!"UTF-8".equals(getEncoding(result))) result=GBKtoUTF8(result);
 			return result;
-		} catch (Exception e) {
+		}catch (Exception e) {
+			System.out.println("url错误:::"+e.toString());
 			e.printStackTrace();
+		}finally{
+			try {
+				response.close();
+				httpsClient.close();
+				httpGet.reset();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
 		}
 		return null;
 	}

src/sc545/pay/utils/Utils.java

@@ -1088,7 +1088,8 @@ public class Utils {
 		DecimalFormat decimalFormat=new DecimalFormat(f);//构造方法的字符格式这里如果小数不足2位,会以0补足.
 		String p=decimalFormat.format(d);//format 返回的是字符串
 		if(p.split("\\.")[0].length()<1) p="0"+p;
-		String nn = p.split("\\.")[1];
+		String nn ="0";
+		if(p.split("\\.").length>1) nn = p.split("\\.")[1];
 		if(!x){
 			if(nn.replaceAll("0", "").length()<1) p=p.split("\\.")[0];
 		}