From 66db1d15cf5d4b51a346a42b66f0505bd7f31ce0 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期三, 03 一月 2024 15:23:47 +0800
Subject: [PATCH] 解压

---
 src/main/java/com/whyc/util/ActionUtil.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/whyc/util/ActionUtil.java b/src/main/java/com/whyc/util/ActionUtil.java
index f35444e..2cc114a 100644
--- a/src/main/java/com/whyc/util/ActionUtil.java
+++ b/src/main/java/com/whyc/util/ActionUtil.java
@@ -28,14 +28,18 @@
 	public static SimpleDateFormat sdfwithOutday = new SimpleDateFormat("yyyy_MM");
 	public static SimpleDateFormat sdfwithday = new SimpleDateFormat("yyyy-MM-dd");
 	public static SimpleDateFormat sdfwithFTP = new SimpleDateFormat("yyyy_MM_dd_HH_mm_ss");
-
+	public static SimpleDateFormat sdfwithALL = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 	/*
 	 * 鑾峰彇HttpServletRequest
 	 */
 	public static HttpServletRequest getRequest(){
 		ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
-		HttpServletRequest request = requestAttributes.getRequest();
-		return request;
+		if(requestAttributes!=null) {
+			HttpServletRequest request = requestAttributes.getRequest();
+			return request;
+		}else{
+			return null;
+		}
 	}
 	
 	/*
@@ -86,7 +90,7 @@
 		msg = sdf.format(time);
 		return msg;
 	}
-	
+
 	
 	/**
 	 * 

--
Gitblit v1.9.1