add

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) {
-	    	realurl=realurl.replace("/getFile/", "");
+	    if(realurl.indexOf("/getImg/")==0) {
+	    	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){
-			String rid = path.replace("/getFile/", "");
+		if(path.indexOf("/getImg/")==0){
+			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){
-				String rid = path.replace("/getFile/", "");
+			if(path.indexOf("/getImg/")==0){
+				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){
-			String rid = path.replace("/getFile/", "");
+		if(path.indexOf("/getImg/")==0){
+			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

@@ -48,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);
@@ -83,6 +76,8 @@ public class HttpUtils {
 		}
 		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());
@@ -159,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));
@@ -397,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();

src/sc545/pay/utils/ReadTxt.java

@@ -617,6 +617,65 @@ public class ReadTxt {
 		/**************/
 		
 	}
+	
+
+	/**
+	 * 删除全部内容
+	 * 
+	 * @param path
+	 *            文件地址
+	 * @param nullString
+	 *            设置值为空时默认返回的内容
+	 * @return string
+	 */
+	public static void delAll(ServletContext servletContext, String path) {
+		
+
+		/**************/
+		// 如果存在，则追加内容；如果文件不存在，则创建文件
+		if(path.indexOf("./")==0)
+			 path =path.substring(1, path.length());
+		 
+		if (servletContext == null) {
+			if(path.indexOf(":") <= 0&&path.indexOf("/") <0)
+				path = "D:\\scbox_settings\\" + path;
+		} else {
+			path = servletContext.getRealPath(path);
+		}
+		
+		try {
+			File file = new File(path);
+			if (file.isFile() && file.exists()) { // 判断文件是否存在
+				
+				// 把新内容覆盖写入文件
+				PrintWriter out = new PrintWriter(new BufferedWriter(
+						new OutputStreamWriter(new FileOutputStream(path),
+								"UTF-8")));
+				out.write("".toString());
+				out.flush();
+				out.close();
+
+			} else {// 不存在，创建
+				String path2 = path.substring(0, path.replace("\\", "/").lastIndexOf("/"));
+				File file1 = new File(path2);
+				// 如果文件夹不存在则创建
+				if (!file1.exists() && !file1.isDirectory()) {
+					file1.mkdirs();
+				}
+				File file2 = new File(path);
+				if (!file2.exists()) {
+					file2.createNewFile();
+				}
+				
+			}
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		/**************/
+		
+	}
+	
 
 	
 	/**

src/sc545/pay/utils/Utils.java

@@ -162,6 +162,79 @@ public class Utils {
 	}
 	
 
+	/**
+	 * 判断某个时间是否过期。传进来一个旧时间，和有效天数，判断今天这个旧时间是否过期
+	 * 
+	 * @param d
+	 *            旧时间 "2019-8-5"
+	 * @param day
+	 *            有效天数
+	 * @return true:没有过期；false:过期了
+	 */
+	public static boolean dateout(String d, int day) {
+		if (d == null || "".equals(d) || "null".equals(d))
+			return false;
+		Date date = Utils.dateadd(Utils.string2Date(d), day);
+		Date newdate = new Date();
+		int i = date.compareTo(newdate);
+		if (i >= 0) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+
+	/**
+	 * 计算两个时间相差的秒数
+	 * 
+	 * @param endDate
+	 *            结束时间 null为当前
+	 * @param nowDate
+	 *            开始时间
+	 * @return 
+	 */
+	public static long datePoor(Date endDate, Date nowDate) {
+		
+		if(endDate==null) endDate = new Date();
+
+		long ns = 1000;// 一秒
+
+		// 获得两个时间的毫秒时间差异
+
+		long diff = endDate.getTime() - nowDate.getTime();
+
+		long sec = diff / ns;// 计算差多少秒
+		return sec;
+
+	}
+	
+	/**
+	 * 计算两个时间相差的秒数
+	 * 
+	 * @param endDate
+	 *            结束时间 null为当前
+	 * @param nowDate
+	 *            开始时间
+	 * @return 
+	 */
+	public static long datePoor(String endDates, String nowDates) {
+		if(endDates==null) endDates=Utils.date2String(null, null);
+		Date endDate = Utils.string2Date(endDates, null);
+		Date nowDate = Utils.string2Date(nowDates, null);
+		
+		long ns = 1000;// 一秒
+
+		// 获得两个时间的毫秒时间差异
+
+		long diff = endDate.getTime() - nowDate.getTime();
+
+		long sec = diff / ns;// 计算差多少秒
+		return sec;
+
+	}
+	
+
 	/**
 	 * 设置定时器启动时间
 	 * @param format 格式 yyyy-MM-dd 07:30:00
@@ -237,28 +310,6 @@ public class Utils {
 		return s2;
 	}
 
-	/**
-	 * 判断某个时间是否过期。传进来一个旧时间，和有效天数，判断今天这个旧时间是否过期
-	 * 
-	 * @param d
-	 *            旧时间 "2019-8-5"
-	 * @param day
-	 *            有效天数
-	 * @return true:没有过期；false:过期了
-	 */
-	public static boolean dateout(String d, int day) {
-		if (d == null || "".equals(d) || "null".equals(d))
-			return false;
-		Date date = Utils.dateadd(Utils.string2Date(d), day);
-		Date newdate = new Date();
-		int i = date.compareTo(newdate);
-		if (i >= 0) {
-			return true;
-		} else {
-			return false;
-		}
-	}
-
 	/**
 	 * URL解析与转义
 	 * 
@@ -690,28 +741,6 @@ public class Utils {
 		return Long.valueOf(str2);
 	}
 
-	/**
-	 * 计算两个时间相差的秒数
-	 * 
-	 * @param endDate
-	 *            结束时间
-	 * @param nowDate
-	 *            开始时间
-	 * @return 
-	 */
-	public static long getDatePoor(Date endDate, Date nowDate) {
-
-		long ns = 1000;// 一秒
-
-		// 获得两个时间的毫秒时间差异
-
-		long diff = endDate.getTime() - nowDate.getTime();
-
-		long sec = diff / ns;// 计算差多少秒
-		return sec;
-
-	}
-	
 	/**获取今天是周几，1-7*/
 	public static long getWeekNum() {
 		long[] weekDays = {7,1,2,3,4,5,6};