From fd9756db8280007572de40fc5fe8890d12863cbd Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 02 七月 2024 10:41:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/util/ControllerUtil.java | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/util/ControllerUtil.java b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/util/ControllerUtil.java
index 876a80b..7c9b4d6 100644
--- a/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/util/ControllerUtil.java
+++ b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/util/ControllerUtil.java
@@ -1,19 +1,17 @@
package com.vci.starter.web.util;
-import com.vci.starter.web.pagemodel.PageHelper;
+import com.vci.starter.web.constant.VConstant;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.http.MediaType;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
+import java.net.URLDecoder;
import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -292,7 +290,7 @@
* @param isQueryTotal 鏄惁鏌ヨ鎬绘暟
*/
public static void setQueryTotal(HttpServletRequest request, boolean isQueryTotal){
- WebThreadLocalUtil.getNeedQueryTotalInThread().set(isQueryTotal?"true":"false");
+ WebThreadLocalUtil.setNeedQueryTotalInThread(isQueryTotal?"true":"false");
//request.setAttribute(webProperties.getQueryTotalSessionName(), isQueryTotal);
}
@@ -323,4 +321,32 @@
tempFileForDownloadMap.remove(uuid);
}
}
+
+ /**
+ * 鍐呭缂栫爜
+ *
+ * @param str 鍐呭
+ * @return 缂栫爜鍚庣殑鍐呭
+ */
+ public static String urlEncode(String str) {
+ try {
+ return URLEncoder.encode(str, VConstant.UTF8);
+ } catch (UnsupportedEncodingException e) {
+ return StringUtils.EMPTY;
+ }
+ }
+
+ /**
+ * 鍐呭瑙ｇ爜
+ *
+ * @param str 鍐呭
+ * @return 瑙ｇ爜鍚庣殑鍐呭
+ */
+ public static String urlDecode(String str) {
+ try {
+ return URLDecoder.decode(str, VConstant.UTF8);
+ } catch (UnsupportedEncodingException e) {
+ return StringUtils.EMPTY;
+ }
+ }
}
--
Gitblit v1.9.3